From c7bed971ba88158b9a5986b9ac03945683eba1f7 Mon Sep 17 00:00:00 2001
From: Andrey Klimov <anklimov@gmail.com>
Date: Fri, 17 Apr 2020 23:14:17 +0300
Subject: [PATCH] Fixes: negative pin# hung, compilation error, double ON
 ->white color, analog mapping on the edges of interval, macaddr mask,
 potential unrelability on LAN re-interability

---
 lighthub/abstractch.cpp |  3 ++-
 lighthub/inputs.cpp     | 11 +++++++++--
 lighthub/item.cpp       |  7 ++++---
 lighthub/main.cpp       | 12 ++++++++----
 lighthub/utils.cpp      |  2 +-
 5 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/lighthub/abstractch.cpp b/lighthub/abstractch.cpp
index 48f3bf8..c54238b 100644
--- a/lighthub/abstractch.cpp
+++ b/lighthub/abstractch.cpp
@@ -7,6 +7,7 @@
 
 extern lan_status lanStatus;
 extern PubSubClient mqttClient;
+extern int8_t ethernetIdleCount;
 
 int abstractCh::publishTopic(const char* topic, long value, const char* subtopic)
 {
@@ -31,7 +32,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));
-       if (mqttClient.connected() && lanStatus == OPERATION)
+       if (mqttClient.connected() && lanStatus == OPERATION  && !ethernetIdleCount)
                        {
                         mqttClient.publish(addrstr, value, true);
                         return 1;
diff --git a/lighthub/inputs.cpp b/lighthub/inputs.cpp
index 829d7ac..34ad5b9 100644
--- a/lighthub/inputs.cpp
+++ b/lighthub/inputs.cpp
@@ -852,8 +852,15 @@ void Input::analogPoll(short cause) {
 
       if (aJson.getArraySize(inputMap)==5) Noize = aJson.getArrayItem(inputMap, 4)->valueint;
 
-      if (mappedInputVal>max) mappedInputVal = max;
-      if (mappedInputVal<min) mappedInputVal = min;
+      if (mappedInputVal>max)
+                              {
+                              mappedInputVal = max;
+                              inputVal = 1023;
+                              }
+      if (mappedInputVal<min) {
+                              mappedInputVal = min;
+                              inputVal = 0;
+                              }
 
       if (aJson.getArraySize(inputMap)==2)
         {
diff --git a/lighthub/item.cpp b/lighthub/item.cpp
index bb44f5d..c453579 100644
--- a/lighthub/item.cpp
+++ b/lighthub/item.cpp
@@ -555,6 +555,7 @@ int Item::Ctrl(short cmd, short n, int *Parameters, boolean send, int suffixCode
     CHstore st;
     switch (cmd) {
         int t;
+/*
        case CMD_ON:
               if (getChanType()==CH_RGBW && getCmd() == CMD_ON && send  && (chActive>0)) {
                           debugSerial<<F("Force White\n");
@@ -564,7 +565,7 @@ int Item::Ctrl(short cmd, short n, int *Parameters, boolean send, int suffixCode
                           Par[1] = 0;   //Zero saturation
                           Par[2] = 100; //Full power
                           n=3;
-                          cmd=CMD_NUM;
+                          cmd=CMD_NUM; */
                           // Store
 /*
                           st.h = Par[0];
@@ -574,8 +575,8 @@ int Item::Ctrl(short cmd, short n, int *Parameters, boolean send, int suffixCode
                           setCmd(cmd);
                           //Send to OH
                           if (send) SendStatus(SEND_COMMAND | SEND_PARAMETERS ); */
-                } // if forcewhite
-        break;
+//                } // if forcewhite
+//        break;
 
 
         case CMD_TOGGLE:
diff --git a/lighthub/main.cpp b/lighthub/main.cpp
index d07ec0f..e163824 100644
--- a/lighthub/main.cpp
+++ b/lighthub/main.cpp
@@ -1637,7 +1637,7 @@ void publishStat(){
   char topic[64];
   char intbuf[16];
   uint32_t ut = millis()/1000UL;
-  if (!mqttClient.connected()) return;
+  if (!mqttClient.connected()  || ethernetIdleCount) return;
 
 //    debugSerial<<F("\nfree RAM: ")<<fr;
     setTopic(topic,sizeof(topic),T_DEV);
@@ -1670,6 +1670,9 @@ if (!isMacValid) {
     const char *macStr = QUOTE(CUSTOM_FIRMWARE_MAC);//colon(:) separated from build options
     parseBytes(macStr, ':', mac, 6, 16);
 
+    mac[0]&=0xFE;
+    mac[0]|=2;
+
     #elif defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_ESP8266)
     //Using original MPU MAC
     WiFi.begin();
@@ -1688,6 +1691,7 @@ if (!isMacValid) {
     #endif
     }
 
+
     printMACAddress();
 }
 
@@ -1937,17 +1941,17 @@ void thermoLoop(void) {
                             << F(" cmd:") << thermoStateCommand;
                 if (thermoPin<0) pinMode(-thermoPin, OUTPUT); else pinMode(thermoPin, OUTPUT);
                 if (thermoDisabledOrDisconnected(thermoExtensionArray, thermoStateCommand)) {
-                    if (thermoPin<0) digitalWrite(-thermoPin, LOW); digitalWrite(thermoPin, LOW);
+                    if (thermoPin<0) digitalWrite(-thermoPin, LOW); else digitalWrite(thermoPin, LOW);
                     // Caution - for water heaters (negative pin#) if some comes wrong (or no connection with termometers output is LOW - valve OPEN)
                     // OFF - also VALVE is OPEN (no teat control)
                     debugSerial<<F(" OFF");
                 } else {
                     if (curTemp < thermoSetting - THERMO_GIST_CELSIUS) {
-                        if (thermoPin<0) digitalWrite(-thermoPin, LOW); digitalWrite(thermoPin, HIGH);
+                        if (thermoPin<0) digitalWrite(-thermoPin, LOW); else digitalWrite(thermoPin, HIGH);
                         debugSerial<<F(" ON");
                     } //too cold
                     else if (curTemp >= thermoSetting) {
-                        if (thermoPin<0) digitalWrite(-thermoPin, HIGH); digitalWrite(thermoPin, LOW);
+                        if (thermoPin<0) digitalWrite(-thermoPin, HIGH); else digitalWrite(thermoPin, LOW);
                         debugSerial<<F(" OFF");
                     } //Reached settings
                     else debugSerial<<F(" -target zone-"); // Nothing to do
diff --git a/lighthub/utils.cpp b/lighthub/utils.cpp
index 124a927..53fc98a 100644
--- a/lighthub/utils.cpp
+++ b/lighthub/utils.cpp
@@ -21,7 +21,7 @@ e-mail    anklimov@gmail.com
 #include "utils.h"
 #include "options.h"
 #include "stdarg.h"
-#include <wire.h>
+#include <Wire.h>
 
 #if defined(__SAM3X8E__) || defined(ARDUINO_ARCH_STM32)
 #include <malloc.h>