From 10a9bb119d83d4770c56be4374ba221f0214a82a Mon Sep 17 00:00:00 2001
From: Andrey Klimov <anklimov@gmail.com>
Date: Tue, 14 Jul 2020 01:54:42 +0300
Subject: [PATCH] building flags & small bugfix (MQTT&TOGGLE)

---
 build-flags/build_flags_due-5100     |  3 ++-
 build-flags/build_flags_esp32-wifi   | 16 +++++++++-------
 build-flags/build_flags_esp8266-wifi |  4 ++--
 build-flags/build_flags_m5stack      |  2 +-
 lighthub/inputs.cpp                  |  2 +-
 lighthub/main.cpp                    | 10 +++++++++-
 lighthub/options.h                   |  6 ++++++
 platformio.ini                       |  8 ++++----
 8 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/build-flags/build_flags_due-5100 b/build-flags/build_flags_due-5100
index dce8b50..c7cd24c 100644
--- a/build-flags/build_flags_due-5100
+++ b/build-flags/build_flags_due-5100
@@ -1,3 +1,4 @@
-#NO special flags
+-DARTNET_ENABLE
+-DDMX_SMOOTH
 -DSTATUSLED
 -DSYSLOG_ENABLE
diff --git a/build-flags/build_flags_esp32-wifi b/build-flags/build_flags_esp32-wifi
index 2cb155e..d61532f 100644
--- a/build-flags/build_flags_esp32-wifi
+++ b/build-flags/build_flags_esp32-wifi
@@ -1,11 +1,13 @@
 -DWIFI_ENABLE
--DDMX_DISABLE
+#-DDMX_DISABLE
+#-DSPILED_DISABLE
+#-DAC_DISABLE
+#-DSYSLOG_ENABLE - udp errors
 -DMODBUS_DISABLE
-#-DOWIRE_DISABLE
--DDHT_DISABLE
 -DCOUNTER_DISABLE
--DSPILED_DISABLE
--DAC_DISABLE
-#-DM5STACK
 -DOTA
--DSYSLOG_ENABLE
+#-DMCP23017
+-DMODBUS_TX_PIN=13
+#-DARTNET_ENABLE - udp rx errors ((
+-DUSE_1W_PIN=16
+-DW5500_CS_PIN=15
diff --git a/build-flags/build_flags_esp8266-wifi b/build-flags/build_flags_esp8266-wifi
index ef1c7f2..bdbe26d 100644
--- a/build-flags/build_flags_esp8266-wifi
+++ b/build-flags/build_flags_esp8266-wifi
@@ -5,5 +5,5 @@
 -DSYSLOG_ENABLE
 -DMCP23017
 -DARTNET_ENABLE
--DUSE_1W_PIN=2
--DW5500_CS_PIN=53
+-DUSE_1W_PIN=16
+-DW5500_CS_PIN=15
diff --git a/build-flags/build_flags_m5stack b/build-flags/build_flags_m5stack
index f8e317a..ef56c94 100644
--- a/build-flags/build_flags_m5stack
+++ b/build-flags/build_flags_m5stack
@@ -7,4 +7,4 @@
 -DSPILED_DISABLE
 -DAC_DISABLE
 -DM5STACK
--DSYSLOG_ENABLE
+#-DSYSLOG_ENABLE
diff --git a/lighthub/inputs.cpp b/lighthub/inputs.cpp
index 0fba93f..795880a 100644
--- a/lighthub/inputs.cpp
+++ b/lighthub/inputs.cpp
@@ -959,7 +959,7 @@ if (!strchr(addrstr,'/')) setTopic(addrstr,sizeof(addrstr),T_OUT,emit->valuestri
             else if (strlen(scmd->valuestring))
                 mqttClient.publish(addrstr, scmd->valuestring, true);
         } else {  //send reset command
-            if (!rcmd || rcmd->type == aJson_String) mqttClient.publish(addrstr, "OFF", true);
+            if (!rcmd || rcmd->type != aJson_String) mqttClient.publish(addrstr, "OFF", true);
             else if (strlen(rcmd->valuestring))mqttClient.publish(addrstr, rcmd->valuestring, true);
         }
 }
diff --git a/lighthub/main.cpp b/lighthub/main.cpp
index d166be2..6870f08 100644
--- a/lighthub/main.cpp
+++ b/lighthub/main.cpp
@@ -1561,7 +1561,9 @@ void printFirmwareVersionAndBuildOptions() {
     infoSerial<<F("\n(+)DS2482-100");
 #endif
 
-#ifdef Wiz5500
+#ifdef WIFI_ENABLE
+    infoSerial<<F("\n(+)WiFi");
+#elif Wiz5500
     infoSerial<<F("\n(+)WizNet5500");
 #else
     infoSerial<<F("\n(+)Wiznet5x00");
@@ -1650,6 +1652,12 @@ infoSerial<<F("\n(+)ARTNET");
 infoSerial<<F("\n(-)ARTNET");
 #endif
 
+#ifdef MCP23017
+infoSerial<<F("\n(+)MCP23017");
+#else
+infoSerial<<F("\n(-)MCP23017");
+#endif
+
 infoSerial<<endl;
 
 //    WDT_Disable( WDT ) ;
diff --git a/lighthub/options.h b/lighthub/options.h
index 608845f..c16f9ee 100644
--- a/lighthub/options.h
+++ b/lighthub/options.h
@@ -20,7 +20,12 @@
 #define ORDER BRG
 #endif
 
+#ifndef MODBUS_TX_PIN
 #define TXEnablePin 13
+#else
+#define TXEnablePin MODBUS_TX_PIN
+#endif
+
 #define ESP_EEPROM_SIZE 2048
 
 #ifndef AVR_DMXOUT_PIN
@@ -191,6 +196,7 @@
 //#undef _dmxout
 //#undef modbusSerial
 #define modbusSerial Serial2
+#define AC_Serial Serial2
 #endif
 
 #ifndef _dmxout
diff --git a/platformio.ini b/platformio.ini
index 11e4542..7b35721 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -34,10 +34,10 @@ default_envs =
 ;   due-5500
 
 ; ESP 8266
-    esp8266-wifi
+;    esp8266-wifi
 
 ; ESP-32
-;    esp32-wifi
+    esp32-wifi
 
 ; M5Stack core (ESP32 based)
 ;    m5stack
@@ -175,7 +175,8 @@ board = esp32-evb
 upload_speed = 115200
 build_flags = !python get_build_flags.py esp32-wifi
 lib_ignore =
-    ;DS2482_OneWire   //UNCOMMENT for software 1-wire driver
+    ;COMMENT/UNCOMMENT next line for software 1-wire driver on/off
+    DS2482_OneWire   
     DmxSimple
     DMXSerial
     DmxDue
@@ -187,7 +188,6 @@ lib_ignore =
     Ethernet3
     Ethernet5100
     EEPROM
-    Artnet
     UIPEthernet
     ESP_EEPROM
     httpClient