From a9bcba3d7cc869de3020348a5e3242afe1d613e0 Mon Sep 17 00:00:00 2001
From: Andrey Klimov <anklimov@gmail.com>
Date: Wed, 22 Sep 2021 01:03:57 +0300
Subject: [PATCH 1/2] restart on MQTT err fix, Float storage & RAW fix

---
 build-flags/build_flags_mega2560slim2 |  2 +-
 lighthub/item.cpp                     |  8 +++++
 lighthub/item.h                       |  1 +
 lighthub/itemCmd.cpp                  | 42 +++++++++++++++++++++++----
 lighthub/main.cpp                     | 27 +++++++++--------
 lighthub/modules/out_ac.h             |  2 +-
 6 files changed, 63 insertions(+), 19 deletions(-)

diff --git a/build-flags/build_flags_mega2560slim2 b/build-flags/build_flags_mega2560slim2
index a9d219e..ef80113 100644
--- a/build-flags/build_flags_mega2560slim2
+++ b/build-flags/build_flags_mega2560slim2
@@ -10,7 +10,7 @@
 -DNO_HOMIE
 -DCSSHDC_DISABLE
 -DSPILED_DISABLE
--DAC_DISABLE
+#-DAC_DISABLE
 -DSYSLOG_ENABLE
 -DPID_DISABLE
 -DOTA
diff --git a/lighthub/item.cpp b/lighthub/item.cpp
index 775a0f5..8e2e9f5 100644
--- a/lighthub/item.cpp
+++ b/lighthub/item.cpp
@@ -388,6 +388,14 @@ void Item::setVal(long int par)  // Only store if VAL is int (autogenerated or c
     itemVal->type = aJson_Int;
 }
 
+void Item::setFloatVal(float par)  // Only store if VAL is int (autogenerated or config-defined)
+{
+    if (!itemVal || (itemVal->type != aJson_Int && itemVal->type != aJson_Float && itemVal->type != aJson_NULL)) return;
+    //debugSerial<<F(" Store ")<<F(" Val=")<<par<<endl;
+    itemVal->valuefloat = par;
+    itemVal->type = aJson_Float;
+}
+
 void Item::setSubtype(uint8_t par)  // Only store if VAL is int (autogenerated or config-defined)
 {
     if (!itemVal || (itemVal->type != aJson_Int && itemVal->type != aJson_Float && itemVal->type != aJson_NULL)) return;
diff --git a/lighthub/item.h b/lighthub/item.h
index 2609233..f554a50 100644
--- a/lighthub/item.h
+++ b/lighthub/item.h
@@ -131,6 +131,7 @@ class Item
   void setFlag   (short flag);
   void clearFlag (short flag);
   void setVal(long int par);
+  void setFloatVal(float par);
   void setSubtype(uint8_t par);
   int Poll(int cause);
   int SendStatus(int sendFlags);
diff --git a/lighthub/itemCmd.cpp b/lighthub/itemCmd.cpp
index aad3727..22ba71b 100644
--- a/lighthub/itemCmd.cpp
+++ b/lighthub/itemCmd.cpp
@@ -361,13 +361,19 @@ itemCmd itemCmd::assignFrom(itemCmd from, short chanType)
                           param.v=constrain(from.param.asfloat,0.,255.);
                   break;   
               case ST_VOID:
-                  break;     
+                  break; 
+              case ST_STRING:
+                   cmd.itemArgType=from.cmd.itemArgType;
+                   param.asString=from.param.asString;
+                  break;    
               default:
                        debugSerial<<F("Wrong Assignment ")<<from.cmd.itemArgType<<F("->")<<cmd.itemArgType<<endl;
               }
              break;
         case ST_VOID:
              cmd.itemArgType=from.cmd.itemArgType;
+             param=from.param;
+        break;     
 
         case ST_INT32:
         case ST_UINT32:
@@ -379,12 +385,17 @@ itemCmd itemCmd::assignFrom(itemCmd from, short chanType)
               param.h=from.param.h;
               param.s=from.param.s; 
               cmd.itemArgType=ST_HSV255;  
+            break;  
+            case ST_STRING:
+                  cmd.itemArgType=from.cmd.itemArgType;
+                  param.asString=from.param.asString;
+            break;               
            default:
               param.asInt32=from.param.asInt32;
               cmd.itemArgType=from.cmd.itemArgType;
            }
            break;
-        case ST_HS:
+        case ST_HS: //ToDo - string ?
            param.v=from.getPercents255();
            cmd.itemArgType=ST_HSV255; 
            break;     
@@ -394,6 +405,11 @@ itemCmd itemCmd::assignFrom(itemCmd from, short chanType)
         case ST_FLOAT_CELSIUS:
            switch (from.cmd.itemArgType)
            {
+             case ST_STRING:
+              cmd.itemArgType=from.cmd.itemArgType;
+              param.asString=from.param.asString;
+             break; 
+
              case ST_TENS:
               param.asfloat=from.param.asInt32/10.;
              break;
@@ -427,7 +443,7 @@ itemCmd itemCmd::assignFrom(itemCmd from, short chanType)
                    param.h=from.param.h;
                    param.s=from.param.s; 
                    cmd.itemArgType=ST_HSV255;
-              break;    
+              break;                
               case ST_VOID:
               break; 
            default:
@@ -441,6 +457,10 @@ itemCmd itemCmd::assignFrom(itemCmd from, short chanType)
         case ST_RGB:
         switch (from.cmd.itemArgType)
           {
+            case ST_STRING:
+                  cmd.itemArgType=from.cmd.itemArgType;
+                  param.asString=from.param.asString;
+            break; 
             case ST_RGBW:
                  // RGBW_flag=true;
             case ST_RGB:
@@ -950,13 +970,13 @@ bool itemCmd::loadItem(Item * item, uint16_t optionsFlag)
 
             Int((int32_t)item->itemVal->valueint);
                //debugSerial<<F("Loaded Int:");
-               debugOut();
+               //debugOut();
             return true;
             
             case aJson_Float:
             Float(item->itemVal->valueint);
                //debugSerial<<F("Loaded Float:");
-               debugOut();
+               //debugOut();
             return true;
           }
 
@@ -988,7 +1008,19 @@ bool itemCmd::saveItem(Item * item, uint16_t optionsFlag)
   {
   if (optionsFlag & SEND_COMMAND)    item->setCmd(cmd.cmdCode);
   if (optionsFlag & SEND_PARAMETERS) 
+                                    switch (cmd.itemArgType)
                                     {
+                                     case ST_FLOAT:
+                                     item->setFloatVal(param.asfloat);
+                                     //case ST_FLOAT_CELSIUS:
+                                     break;
+
+                                     case ST_INT32:
+                                     case ST_UINT32:
+                                     item->setVal(param.asInt32);
+                                     break;
+
+                                     default: 
                                      item->setSubtype(cmd.itemArgType); 
                                      item->setVal(param.asInt32);
                                     }
diff --git a/lighthub/main.cpp b/lighthub/main.cpp
index 1296bb3..4cdbd08 100644
--- a/lighthub/main.cpp
+++ b/lighthub/main.cpp
@@ -1468,16 +1468,15 @@ lan_status loadConfigFromHttp(int arg_cnt, char **args)
         } else {
             errorSerial<<F("ERROR: Server returned ");
             errorSerial<<responseStatusCode<<endl;
-//            timerLanCheckTime = millis();// + 5000;
-            return READ_RE_CONFIG;//-11;
-        }
+        if (configLoaded) return IP_READY_CONFIG_LOADED_CONNECTING_TO_BROKER;
+           else return READ_RE_CONFIG; //Load from NVRAM        
+           }
 
     } else {
         debugSerial<<F("failed to connect\n");
-//        debugSerial<<F(" try again in 5 seconds\n");
-//        timerLanCheckTime = millis();// + 5000;
-        return READ_RE_CONFIG;//-11;
-    }
+        if (configLoaded) return IP_READY_CONFIG_LOADED_CONNECTING_TO_BROKER;
+           else return READ_RE_CONFIG; //Load from NVRAM    
+           }
 #endif
 #if defined(__SAM3X8E__) || defined(ARDUINO_ARCH_STM32) || defined (NRF5) //|| defined(ARDUINO_ARCH_ESP32) //|| defined(ARDUINO_ARCH_ESP8266)
     #if defined(WIFI_ENABLE)
@@ -1524,11 +1523,13 @@ lan_status loadConfigFromHttp(int arg_cnt, char **args)
         }
       } else  {
           errorSerial<<F("Config retrieving failed\n");
-          return READ_RE_CONFIG;//-11; //Load from NVRAM
+        if (configLoaded) return IP_READY_CONFIG_LOADED_CONNECTING_TO_BROKER;
+           else return READ_RE_CONFIG; //Load from NVRAM
       }
     } else {
         errorSerial<<F("Connect failed\n");
-        return READ_RE_CONFIG;//-11; //Load from NVRAM
+        if (configLoaded) return IP_READY_CONFIG_LOADED_CONNECTING_TO_BROKER;
+           else return READ_RE_CONFIG; //Load from NVRAM
     }
 #endif
 
@@ -1568,13 +1569,15 @@ lan_status loadConfigFromHttp(int arg_cnt, char **args)
             }
         } else {
             errorSerial<<F("Config retrieving failed\n");
-            return READ_RE_CONFIG;//-11; //Load from NVRAM
+        if (configLoaded) return IP_READY_CONFIG_LOADED_CONNECTING_TO_BROKER;
+           else return READ_RE_CONFIG; //Load from NVRAM
         }
     } else {
         errorSerial.printf("[HTTP] GET... failed, error: %s\n", httpClient.errorToString(httpResponseCode).c_str());
         httpClient.end();
-        return READ_RE_CONFIG;
-    }
+        if (configLoaded) return IP_READY_CONFIG_LOADED_CONNECTING_TO_BROKER;
+           else return READ_RE_CONFIG; //Load from NVRAM
+        }
     httpClient.end();
 #endif
 
diff --git a/lighthub/modules/out_ac.h b/lighthub/modules/out_ac.h
index 302b13a..6c19ab0 100644
--- a/lighthub/modules/out_ac.h
+++ b/lighthub/modules/out_ac.h
@@ -18,7 +18,7 @@
 #define S_LOCK S_ADDITIONAL+1
 #define S_QUIET S_ADDITIONAL+2
 #define S_SWING S_ADDITIONAL+3
-#define S_RAW S_ADDITIONAL+4
+//#define S_RAW S_ADDITIONAL+4
 
 extern void modbusIdle(void) ;
 class out_AC : public abstractOut {

From 3df1eb1cc532b9c164df78b397be9d21845ec55d Mon Sep 17 00:00:00 2001
From: Andrey Klimov <anklimov@gmail.com>
Date: Mon, 4 Oct 2021 18:53:32 +0300
Subject: [PATCH 2/2] NoMQTT mode, float config val, small fixes

---
 lighthub/abstractch.cpp |  2 +-
 lighthub/item.cpp       |  4 ++--
 lighthub/itemCmd.cpp    |  5 +++--
 lighthub/main.cpp       | 15 ++++++++++++---
 lighthub/main.h         |  2 +-
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/lighthub/abstractch.cpp b/lighthub/abstractch.cpp
index 57e1ade..fdccd18 100644
--- a/lighthub/abstractch.cpp
+++ b/lighthub/abstractch.cpp
@@ -31,7 +31,7 @@ int abstractCh::publishTopic(const char* topic, const char * value, const char*
      {
        strncpy(addrstr,topic,sizeof(addrstr));
        if (!strchr(addrstr,'/')) setTopic(addrstr,sizeof(addrstr),T_OUT,topic);
-       strncat(addrstr,subtopic,sizeof(addrstr));
+       strncat(addrstr,subtopic,sizeof(addrstr)-1);
        if (mqttClient.connected() && lanStatus == OPERATION  && !ethernetIdleCount)
                        {
                         mqttClient.publish(addrstr, value, true);
diff --git a/lighthub/item.cpp b/lighthub/item.cpp
index 8e2e9f5..291e4bb 100644
--- a/lighthub/item.cpp
+++ b/lighthub/item.cpp
@@ -1074,9 +1074,9 @@ switch (itemType) {
                       pinMode(iaddr, OUTPUT);
 
                       if (inverse)
-                          digitalWrite(iaddr, k = ((icmd == CMD_ON) ? LOW : HIGH));
+                          digitalWrite(iaddr, k = ((icmd == CMD_ON || icmd == CMD_AUTO) ? LOW : HIGH));
                       else
-                          digitalWrite(iaddr, k = ((icmd == CMD_ON) ? HIGH : LOW));
+                          digitalWrite(iaddr, k = ((icmd == CMD_ON || icmd == CMD_AUTO) ? HIGH : LOW));
                       debugSerial<<F("Pin:")<<iaddr<<F("=")<<k<<endl;
                       status2Send |= SEND_COMMAND | SEND_IMMEDIATE; 
                       res=1;
diff --git a/lighthub/itemCmd.cpp b/lighthub/itemCmd.cpp
index 22ba71b..a90b39e 100644
--- a/lighthub/itemCmd.cpp
+++ b/lighthub/itemCmd.cpp
@@ -974,7 +974,7 @@ bool itemCmd::loadItem(Item * item, uint16_t optionsFlag)
             return true;
             
             case aJson_Float:
-            Float(item->itemVal->valueint);
+            Float(item->itemVal->valuefloat);
                //debugSerial<<F("Loaded Float:");
                //debugOut();
             return true;
@@ -1011,8 +1011,9 @@ bool itemCmd::saveItem(Item * item, uint16_t optionsFlag)
                                     switch (cmd.itemArgType)
                                     {
                                      case ST_FLOAT:
+                                     case ST_FLOAT_CELSIUS:
                                      item->setFloatVal(param.asfloat);
-                                     //case ST_FLOAT_CELSIUS:
+                                     //
                                      break;
 
                                      case ST_INT32:
diff --git a/lighthub/main.cpp b/lighthub/main.cpp
index 4cdbd08..9ad197e 100644
--- a/lighthub/main.cpp
+++ b/lighthub/main.cpp
@@ -257,6 +257,8 @@ int httpHandler(Client& client, String request, long contentLength, bool authori
 
          itemCmd ic;
          ic.loadItem(&item,SEND_COMMAND|SEND_PARAMETERS);
+         if (item.itemType == CH_GROUP)
+           {if (item.isActive()) item.setCmd(CMD_ON); else item.setCmd(CMD_OFF);} 
          char buf[32];
          response=ic.toString(buf, sizeof(buf));
         
@@ -270,7 +272,7 @@ int httpHandler(Client& client, String request, long contentLength, bool authori
         request+=body;
 
         debugSerial<<F("Cmd: ")<<request<<endl;
-        if (request=="reboot") client.stop();
+        if (request=="reboot ") client.stop();
         const char* res=request.c_str();
         cmd_parse((char*) res);        
         } 
@@ -518,7 +520,12 @@ lan_status lanLoop() {
         case IP_READY_CONFIG_LOADED_CONNECTING_TO_BROKER:
             wdt_res();
             statusLED.set(ledRED|ledGREEN|((configLoaded)?ledBLINK:0));
-            ip_ready_config_loaded_connecting_to_broker();
+            if (!mqttArr || ((aJson.getArraySize(mqttArr)) < 2)) 
+                {
+                infoSerial<<F("No MQTT configured")<<endl;    
+                lanStatus=OPERATION_NO_MQTT;
+                } 
+            else ip_ready_config_loaded_connecting_to_broker();
             break;
 
         case RETAINING_COLLECTING:
@@ -579,7 +586,9 @@ lan_status lanLoop() {
             }
             break;
 
-        case DO_NOTHING:;
+        case DO_NOTHING:
+        case OPERATION_NO_MQTT:
+        ;
     }
 
 
diff --git a/lighthub/main.h b/lighthub/main.h
index d77544c..a02ce2d 100644
--- a/lighthub/main.h
+++ b/lighthub/main.h
@@ -207,7 +207,7 @@ enum lan_status {
     IP_READY_CONFIG_LOADED_CONNECTING_TO_BROKER = 4,
     RETAINING_COLLECTING = 5,
     OPERATION = 6,
-
+    OPERATION_NO_MQTT = 7,
     DO_REINIT = -10,
     REINIT = - 11,
     DO_RECONNECT =  12,