From ff8997fb0287f056d1875741470a6e39ee028841 Mon Sep 17 00:00:00 2001
From: Andrey <anklimov@gmail.com>
Date: Fri, 23 Aug 2024 00:12:12 +0300
Subject: [PATCH] post-refactoring fixes: $command, Items-Parse

---
 lighthub/item.cpp  | 19 +++++++++----------
 lighthub/main.cpp  |  4 ++--
 lighthub/utils.cpp |  5 +++--
 lighthub/utils.h   |  2 ++
 platformio.ini     |  8 +++++---
 5 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/lighthub/item.cpp b/lighthub/item.cpp
index 3640f9a..1d082bc 100644
--- a/lighthub/item.cpp
+++ b/lighthub/item.cpp
@@ -156,24 +156,23 @@ void Item::Parse() {
     if (isValid()) {
         // Todo - avoid static enlarge for every types
         for (int i = aJson.getArraySize(itemArr); i < 4; i++)
-            aJson.addItemToArray(itemArr, aJson.createNull());//( (long int) 0));
-                   // int(defval[i]) )); //Enlarge item to 4 elements. VAL=int if no other definition in conf
-        //itemType = aJson.getArrayItem(itemArr, I_TYPE)->valueint;
-        /*
+            aJson.addItemToArray(itemArr, aJson.createNull());
+                
+     /*
         itemType = replaceTypeToInt (aJson.getArrayItem(itemArr, I_TYPE));
         itemArg = aJson.getArrayItem(itemArr, I_ARG);
         itemVal = aJson.getArrayItem(itemArr, I_VAL);
-        itemExt = aJson.getArrayItem(itemArr, I_EXT);
-        */
-
+        itemExt = aJson.getArrayItem(itemArr, I_EXT); */
+        
+        aJsonObject * cmdObj = NULL;
         aJsonObject * itemTypeObj = itemArr->child;
         if (itemTypeObj) itemArg = itemTypeObj->next;
-        if (itemArg) itemVal = itemArg->next;
-        if (itemVal) itemExt = itemVal->next;
+        if (itemArg) itemVal = itemArg->next;        
+        if (itemVal) cmdObj = itemVal->next;
+        if (cmdObj) itemExt = cmdObj->next;
 
         itemType = replaceTypeToInt (itemTypeObj);
 
-
         switch (itemType)
         {
 #ifndef  PWM_DISABLE            
diff --git a/lighthub/main.cpp b/lighthub/main.cpp
index 0152715..c76fa00 100644
--- a/lighthub/main.cpp
+++ b/lighthub/main.cpp
@@ -486,7 +486,7 @@ else
     // debugSerial<<itemName<<endl;
     if(!strcmp_P(itemName,CMDTOPIC_P) && payload && (strlen((char*) payload)>1)) {
         mqttClient.deleteTopic(topic);
-        if (forLocal || forBcast)((char *)payload);
+        if (forLocal || forBcast)  cmd_parse ((char *)payload);
         //TODO implement for remote
         return;// -4;
     }
@@ -1645,7 +1645,7 @@ int loadConfigFromEEPROM()
 
     if (sysConfStream.peek() == '{') {
         debugSerial<<F("JSON detected")<<endl;
-        cleanConf(1);  
+        if (root) cleanConf(1);  
 
         aJsonStream as = aJsonStream(&sysConfStream);
         root = aJson.parse(&as);
diff --git a/lighthub/utils.cpp b/lighthub/utils.cpp
index e85400c..4e174be 100644
--- a/lighthub/utils.cpp
+++ b/lighthub/utils.cpp
@@ -977,7 +977,7 @@ return true;
 }
 
 
-
+#ifdef CANDRV
 uint16_t getCRC(aJsonObject * in)
 {
 if (!in)  return 0;
@@ -987,8 +987,9 @@ aJsonStream aJsonCrcStream = aJsonStream(&crcStream);
 //debugSerial.print(aJson.print(in));
 aJson.print(in,&aJsonCrcStream,false);
 //debugSerial<<"\nCRC:"<<crcStream.getCRC16();
-return crcStream.getCRC16();
+return crcStream.getCRC16(); 
 }
+#endif
 
 #pragma message(VAR_NAME_VALUE(debugSerial))
 #pragma message(VAR_NAME_VALUE(SERIAL_BAUD))
diff --git a/lighthub/utils.h b/lighthub/utils.h
index a3c3194..370d363 100644
--- a/lighthub/utils.h
+++ b/lighthub/utils.h
@@ -83,6 +83,7 @@ bool checkToken(char * token, char * data);
  bool i2cReset();
  uint16_t getCRC(aJsonObject * in);
 
+#ifdef CANDRV
 #include "util/crc16_.h"
 class CRCStream : public Stream
 {
@@ -102,3 +103,4 @@ public:
     virtual int availableForWrite(){return 1;};
 
 };
+#endif
\ No newline at end of file
diff --git a/platformio.ini b/platformio.ini
index 5b25b33..db94943 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -356,9 +356,11 @@ lib_ignore =
 	DMXSerial
 	Adafruit NeoPixel
 	DmxSimple
-	
+	ModbusMaster
 	ClosedCube HDC1080
 	SparkFun CCS811 Arduino Library
+	;ArduinoOTA
+	ArduinoMDNS
 	;Adafruit BusIO
 	;Adafruit MCP23017 Arduino Library
 	;Adafruit Unified Sensor
@@ -369,7 +371,7 @@ lib_deps =
 	https://github.com/anklimov/httpClient
 	https://github.com/anklimov/aJson
 	https://github.com/anklimov/CmdArduino
-	https://github.com/anklimov/ModbusMaster
+	;https://github.com/anklimov/ModbusMaster
 	;https://github.com/anklimov/DMXSerial
 	;https://github.com/anklimov/Ethernet5100
     ;5100 lib have ~90 bytes less footprint of RAM
@@ -388,7 +390,7 @@ lib_deps =
 	Adafruit MCP23017 Arduino Library
 	Adafruit BusIO
 	br3ttb/PID@^1.2.1
-	ArduinoMDNS
+	;ArduinoMDNS
 	;https://github.com/khoih-prog/TimerInterrupt_Generic.git
 
 monitor_speed = 115200