From e21541aa7ac0c6203040a041d25ea6d2cb9700ff Mon Sep 17 00:00:00 2001
From: Andrey <anklimov@gmail.com>
Date: Thu, 22 Aug 2024 00:35:47 +0300
Subject: [PATCH] cleanup and odd cleanConf fix

---
 lighthub/candriver.cpp |  2 +-
 lighthub/main.cpp      | 79 +++++++++++++++---------------------------
 lighthub/utils.cpp     |  6 ++--
 3 files changed, 31 insertions(+), 56 deletions(-)

diff --git a/lighthub/candriver.cpp b/lighthub/candriver.cpp
index ba79fc2..e27163c 100644
--- a/lighthub/candriver.cpp
+++ b/lighthub/candriver.cpp
@@ -322,8 +322,8 @@ switch (state)
 
     if (CANConfStream.peek() == '{') {
                 debugSerial<<F("CAN: JSON detected")<<endl;
-                aJsonStream as = aJsonStream(&CANConfStream);
                 cleanConf(1);
+                aJsonStream as = aJsonStream(&CANConfStream);
                 root = aJson.parse(&as);
                 CANConfStream.close();
                 if (!root) {
diff --git a/lighthub/main.cpp b/lighthub/main.cpp
index 520f708..0152715 100644
--- a/lighthub/main.cpp
+++ b/lighthub/main.cpp
@@ -115,24 +115,24 @@ UID UniqueID;
 #endif
 uint8_t brokers = 0;
 char *deviceName = NULL;
-aJsonObject *topics = NULL;
-aJsonObject *root = NULL;
-aJsonObject *items = NULL;
-aJsonObject *inputs = NULL;
-aJsonObject *brokersArr = NULL;
-aJsonObject *mqttArr = NULL;
+ aJsonObject *topics = NULL;
+ aJsonObject *root = NULL;
+ aJsonObject *items = NULL;
+ aJsonObject *inputs = NULL;
+ aJsonObject *brokersArr = NULL;
+ aJsonObject *mqttArr = NULL;
 #ifdef _modbus
-aJsonObject *modbusObj = NULL;
+ aJsonObject *modbusObj = NULL;
 #endif
 #ifdef _owire
-aJsonObject *owArr = NULL;
+ aJsonObject *owArr = NULL;
 #endif
 #ifdef _dmxout
-aJsonObject *dmxArr = NULL;
+ aJsonObject *dmxArr = NULL;
 #endif
 
 #ifdef SYSLOG_ENABLE
-bool syslogInitialized = false;
+volatile bool syslogInitialized = false;
 #endif
 
 #ifdef WIFI_ENABLE
@@ -153,11 +153,11 @@ volatile uint32_t ultrasonicInputCheck=0;
 
 aJsonObject *pollingItem = NULL;
 
-bool owReady = false;
-bool configOk = false; // At least once connected to MQTT
-bool configLoaded = false;
-bool initializedListeners = false;
-uint8_t DHCP_failures = 0;
+volatile bool owReady = false;
+volatile bool configOk = false; // At least once connected to MQTT
+volatile bool configLoaded = false;
+volatile bool initializedListeners = false;
+volatile uint8_t DHCP_failures = 0;
 volatile int8_t ethernetIdleCount =0;
 volatile int8_t configLocked = 0;
 
@@ -179,43 +179,17 @@ void watchdogSetup(void) {}    //Do not remove - strong re-definition WDT Init f
 
 bool cleanConf(short locksAlowed )
 {
-  if (!root) return true;
-  bool clean = true;
+  if (!root) 
+    {
+    //debugSerial<<F("No root")<<endl;    
+    return true;
+    }
+
 if (configLocked>locksAlowed)
                 {
                     errorSerial<<F("Can not clean - locked")<<endl;
                     return false;
                 }
-/*
-No more unsafe operations  
-if (wait)
-{  
-debugSerial<<F("Unlocking config ...")<<endl;
-uint32_t stamp=millis();
-while (configLocked && !isTimeOver(stamp,millis(),10000))
-{
-          //wdt_res();
-          cmdPoll();
-          #ifdef _owire
-          if (owReady && owArr) owLoop();
-          #endif
-          #ifdef _dmxin
-          DMXCheck();
-          #endif
-          if (isNotRetainingStatus())  pollingLoop();
-          thermoLoop();
-          inputLoop(CHECK_INPUT);
-          yield();
-}
-
-if (configLocked)
-{
-    errorSerial<<F("Not unlocked in 10s - continue ...")<<endl;
-    clean = false;
-}
-} //wait
-*/
-
 debugSerial<<F("Stopping channels ...")<<endl;
 timerHandlerBusy++;
 //Stoping the channels
@@ -265,7 +239,7 @@ debugSerial<<F("Deleting conf. RAM was:")<<freeRam();
      
      configOk=false;
  timerHandlerBusy--;     
- return clean;
+ return true;
 }
 
 bool isNotRetainingStatus() {
@@ -1671,8 +1645,9 @@ int loadConfigFromEEPROM()
 
     if (sysConfStream.peek() == '{') {
         debugSerial<<F("JSON detected")<<endl;
+        cleanConf(1);  
+
         aJsonStream as = aJsonStream(&sysConfStream);
-        cleanConf(0);  ///WTF!
         root = aJson.parse(&as);
         sysConfStream.close();
         if (!root) {
@@ -1974,7 +1949,7 @@ if (!sysConf.getServer(configServer,sizeof(configServer)))
             infoSerial<<F("got Config\n"); delay(500);
             aJsonFileStream as = aJsonFileStream(configStream);
             noInterrupts();
-        if (!cleanConf(true))
+        if (!cleanConf(0))
         {
             errorSerial<<F("Get aborted")<<endl;
             hclient.closeStream(configStream); 
@@ -2051,7 +2026,7 @@ if (!sysConf.getServer(configServer,sizeof(configServer)))
     if (responseStatusCode == 200) {
         aJsonStream socketStream = aJsonStream(&htclient);
         debugSerial<<F("Free:")<<freeRam()<<endl;
-        if (!cleanConf(true))
+        if (!cleanConf(0))
         {
             errorSerial<<F("Get aborted")<<endl;
             htclient.stop();
@@ -2130,7 +2105,7 @@ if (!sysConf.getServer(configServer,sizeof(configServer)))
             sysConf.setETAG(httpClient.header("ETag"));
             //String response = httpClient.getString();
             //debugSerial<<response;
-        if (!cleanConf(true))
+        if (!cleanConf(0))
         {
             errorSerial<<F("Get aborted")<<endl;
             httpClient.end();
diff --git a/lighthub/utils.cpp b/lighthub/utils.cpp
index b3e80d9..e85400c 100644
--- a/lighthub/utils.cpp
+++ b/lighthub/utils.cpp
@@ -983,10 +983,10 @@ uint16_t getCRC(aJsonObject * in)
 if (!in)  return 0;
 CRCStream crcStream;
 aJsonStream aJsonCrcStream = aJsonStream(&crcStream);
-debugSerial<<"CRC: in";
-debugSerial.print(aJson.print(in));
+//debugSerial<<"CRC: in";
+//debugSerial.print(aJson.print(in));
 aJson.print(in,&aJsonCrcStream,false);
-debugSerial<<"\nCRC:"<<crcStream.getCRC16();
+//debugSerial<<"\nCRC:"<<crcStream.getCRC16();
 return crcStream.getCRC16();
 }