From ef72fe9a40f091cbd57346885acb74d799da6974 Mon Sep 17 00:00:00 2001
From: lumapu <lp@lufami.de>
Date: Mon, 31 Oct 2022 23:01:47 +0100
Subject: [PATCH] fix sync time from browser issue

---
 tools/esp8266/defines.h  |  2 +-
 tools/esp8266/webApi.cpp | 27 ++++++++++++++-------------
 tools/esp8266/webApi.h   |  6 +++---
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/tools/esp8266/defines.h b/tools/esp8266/defines.h
index 3acb352a..2f408e3e 100644
--- a/tools/esp8266/defines.h
+++ b/tools/esp8266/defines.h
@@ -13,7 +13,7 @@
 //-------------------------------------
 #define VERSION_MAJOR       0
 #define VERSION_MINOR       5
-#define VERSION_PATCH       28
+#define VERSION_PATCH       29
 
 //-------------------------------------
 typedef struct {
diff --git a/tools/esp8266/webApi.cpp b/tools/esp8266/webApi.cpp
index 1c52e81f..f2fb8678 100644
--- a/tools/esp8266/webApi.cpp
+++ b/tools/esp8266/webApi.cpp
@@ -80,14 +80,15 @@ void webApi::onApiPostBody(AsyncWebServerRequest *request, uint8_t *data, size_t
     AsyncJsonResponse* response = new AsyncJsonResponse(false, 200);
     JsonObject root = response->getRoot();
 
-    DeserializationError err = deserializeJson(json, (const char *)data);
+    DeserializationError err = deserializeJson(json, (const char *)data, len);
+    JsonObject obj = json.as<JsonObject>();
     root[F("success")] = (err) ? false : true;
     if(!err) {
         String path = request->url().substring(5);
         if(path == "ctrl")
-            root[F("success")] = setCtrl(json, root);
+            root[F("success")] = setCtrl(obj, root);
         else if(path == "setup")
-            root[F("success")] = setSetup(json, root);
+            root[F("success")] = setSetup(obj, root);
         else {
             root[F("success")] = false;
             root[F("error")]   = "Path not found: " + path;
@@ -400,21 +401,21 @@ void webApi::getRecord(JsonObject obj, record_t<> *rec) {
 
 
 //-----------------------------------------------------------------------------
-bool webApi::setCtrl(DynamicJsonDocument jsonIn, JsonObject jsonOut) {
+bool webApi::setCtrl(JsonObject jsonIn, JsonObject jsonOut) {
     uint8_t cmd = jsonIn[F("cmd")];
 
     // Todo: num is the inverter number 0-3. For better display in DPRINTLN
-    uint8_t num = jsonIn[F("inverter")]; 
-    uint8_t tx_request = jsonIn[F("tx_request")]; 
+    uint8_t num = jsonIn[F("inverter")];
+    uint8_t tx_request = jsonIn[F("tx_request")];
 
-    if(TX_REQ_DEVCONTROL == tx_request) 
+    if(TX_REQ_DEVCONTROL == tx_request)
     {
         DPRINTLN(DBG_INFO, F("devcontrol [") + String(num) + F("], cmd: 0x") + String(cmd, HEX));
-        
+
         Inverter<> *iv = getInverter(jsonIn, jsonOut);
         JsonArray payload = jsonIn[F("payload")].as<JsonArray>();
 
-        if(NULL != iv) 
+        if(NULL != iv)
         {
             switch (cmd)
             {
@@ -443,7 +444,7 @@ bool webApi::setCtrl(DynamicJsonDocument jsonIn, JsonObject jsonOut) {
                 default:
                     jsonOut["error"] = "unknown 'cmd' = " + String(cmd);
                     return false;
-            }            
+            }
         } else {
             return false;
         }
@@ -458,8 +459,8 @@ bool webApi::setCtrl(DynamicJsonDocument jsonIn, JsonObject jsonOut) {
 
 
 //-----------------------------------------------------------------------------
-bool webApi::setSetup(DynamicJsonDocument jsonIn, JsonObject jsonOut) {
-    if(F("scan_wifi"))
+bool webApi::setSetup(JsonObject jsonIn, JsonObject jsonOut) {
+    if(F("scan_wifi") == jsonIn[F("cmd")])
         mApp->scanAvailNetworks();
     else if(F("set_time") == jsonIn[F("cmd")])
         mApp->setTimestamp(jsonIn[F("ts")]);
@@ -479,7 +480,7 @@ bool webApi::setSetup(DynamicJsonDocument jsonIn, JsonObject jsonOut) {
 
 
 //-----------------------------------------------------------------------------
-Inverter<> *webApi::getInverter(DynamicJsonDocument jsonIn, JsonObject jsonOut) {
+Inverter<> *webApi::getInverter(JsonObject jsonIn, JsonObject jsonOut) {
     uint8_t id = jsonIn[F("inverter")];
     Inverter<> *iv = mApp->mSys->getInverterByPos(id);
     if(NULL == iv)
diff --git a/tools/esp8266/webApi.h b/tools/esp8266/webApi.h
index a45dcf8e..f44d1f3b 100644
--- a/tools/esp8266/webApi.h
+++ b/tools/esp8266/webApi.h
@@ -49,10 +49,10 @@ class webApi {
         void getLive(JsonObject obj);
         void getRecord(JsonObject obj, record_t<> *rec);
 
-        bool setCtrl(DynamicJsonDocument jsonIn, JsonObject jsonOut);
-        bool setSetup(DynamicJsonDocument jsonIn, JsonObject jsonOut);
+        bool setCtrl(JsonObject jsonIn, JsonObject jsonOut);
+        bool setSetup(JsonObject jsonIn, JsonObject jsonOut);
 
-        Inverter<> *getInverter(DynamicJsonDocument jsonIn, JsonObject jsonOut);
+        Inverter<> *getInverter(JsonObject jsonIn, JsonObject jsonOut);
 
         double round3(double value) {
            return (int)(value * 1000 + 0.5) / 1000.0;