From 5cbbe1d23100b14a66100a3df669136b3ad953b1 Mon Sep 17 00:00:00 2001
From: Manuel Weiser <manuel.weiser@me.com>
Date: Fri, 21 Feb 2025 16:35:19 +0100
Subject: [PATCH] docs: update platformio.ini dependencies and improve version
 handling in website.cpp

---
 platformio.ini  |  9 +++++----
 src/website.cpp | 13 +++++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index cd26c67..9b692d4 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -19,10 +19,11 @@ monitor_speed = 115200
 
 lib_deps =
     tzapu/WiFiManager @ ^2.0.17
-    #https://github.com/me-no-dev/ESPAsyncWebServer.git#master
+    https://github.com/me-no-dev/ESPAsyncWebServer.git#master
     #me-no-dev/AsyncTCP @ ^1.1.1
-    mathieucarbou/ESPAsyncWebServer @ ^3.6.0
-    esp32async/AsyncTCP @ ^3.3.5
+    https://github.com/esphome/AsyncTCP.git
+    #mathieucarbou/ESPAsyncWebServer @ ^3.6.0
+    #esp32async/AsyncTCP @ ^3.3.5
     bogde/HX711 @ ^0.7.5
     adafruit/Adafruit SSD1306 @ ^2.5.13
     adafruit/Adafruit GFX Library @ ^1.11.11
@@ -45,7 +46,7 @@ build_flags =
     -fdata-sections
     -DNDEBUG
     -mtext-section-literals
-    '-D VERSION="${common.version}"'
+    -DVERSION=\"${common.version}\"
     -DASYNCWEBSERVER_REGEX
     -DCORE_DEBUG_LEVEL=3
     -DCONFIG_ARDUHAL_LOG_COLORS=1
diff --git a/src/website.cpp b/src/website.cpp
index fd1af79..289051c 100644
--- a/src/website.cpp
+++ b/src/website.cpp
@@ -10,6 +10,10 @@
 #include "ota.h"
 #include <Update.h>
 
+#ifndef VERSION
+  #define VERSION "1.1.0"
+#endif
+
 // Cache-Control Header definieren
 #define CACHE_CONTROL "max-age=604800" // Cache für 1 Woche
 
@@ -45,7 +49,7 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp
         }
 
         else if (doc["type"] == "writeNfcTag") {
-            if (doc.containsKey("payload")) {
+            if (doc["payload"].is<JsonObject>()) {
                 // Versuche NFC-Daten zu schreiben
                 String payloadString;
                 serializeJson(doc["payload"], payloadString);
@@ -152,7 +156,7 @@ void sendNfcData(AsyncWebSocketClient *client) {
 
 void sendAmsData(AsyncWebSocketClient *client) {
     if (ams_count > 0) {
-        ws.textAll("{\"type\":\"amsData\", \"payload\":" + amsJsonData + "}");
+        ws.textAll("{\"type\":\"amsData\",\"payload\":" + amsJsonData + "}");
     }
 }
 
@@ -231,7 +235,7 @@ void setupWebserver(AsyncWebServer &server) {
         html.replace("{{spoolmanUrl}}", spoolmanUrl);
 
         JsonDocument doc;
-        if (loadJsonValue("/bambu_credentials.json", doc) && doc.containsKey("bambu_ip")) {
+        if (loadJsonValue("/bambu_credentials.json", doc) && doc["bambu_ip"].is<JsonObject>()) {
             String bambuIp = doc["bambu_ip"].as<String>();
             String bambuSerial = doc["bambu_serialnr"].as<String>();
             String bambuCode = doc["bambu_accesscode"].as<String>();
@@ -417,7 +421,8 @@ void setupWebserver(AsyncWebServer &server) {
     );
 
     server.on("/api/version", HTTP_GET, [](AsyncWebServerRequest *request){
-        String jsonResponse = "{\"version\": \"" VERSION "\"}";
+        String fm_version = VERSION;
+        String jsonResponse = "{\"version\": \""+ fm_version +"\"}";
         request->send(200, "application/json", jsonResponse);
     });