Merge pull request #64 from anklimov/master

sync to master

build-flags/build_flags_lighthub21

@@ -1,11 +1,9 @@
 -DW5500_CS_PIN=53
 -DARTNET_ENABLE
 -DDMX_SMOOTH
--DMODBUS_DIMMER_PARAM=SERIAL_8E1
 -DMODBUS_SERIAL_BAUD=9600
 -DOTA
 -DSYSLOG_ENABLE
-#-DWiz5500
 -DSTATUSLED
 -DMCP23017
 #-DPID_DISABLE
@@ -13,6 +11,15 @@
 -DMDNS_ENABLE
 -DTIMER_INT
 
+# Serial parameters for LEGACY Modbus
+-DMODBUS_DIMMER_PARAM=SERIAL_8E1
+
+#Set Logariphmic law for DMX channels bright 
+-DBRIGHT_LOG
+
+#disable HOMIE topics publishing
+-DNO_HOMIE
+
 #Put modbus exchange in debug hex dump 
 #-DMODBUS_DEBUG
 

compiled/check_bin.sh

@@ -0,0 +1,15 @@
+diff ../.pio/build/due/firmware.bin due
+diff ../.pio/build/controllino/firmware.hex controllino
+diff ../.pio/build/m5stack/firmware.bin m5stack
+diff ../.pio/build/mega2560slim-5100/firmware.hex mega2560slim-5100
+diff ../.pio/build/mega2560slim-5100/firmware.bin mega2560slim-5100
+diff ../.pio/build/mega2560-optiboot/firmware.hex mega2560-optiboot
+diff ../.pio/build/mega2560-optiboot/firmware.bin mega2560-optiboot
+diff ../.pio/build/mega2560-5100/firmware.hex mega2560-5100
+diff ../.pio/build/nrf52840/firmware.hex nrf52840-5500
+diff ../.pio/build/esp32-wifi/firmware.bin esp32-wifi
+diff ../.pio/build/stm32-enc2860/firmware.bin stm32-enc2860
+diff ../.pio/build/esp8266-wifi/firmware.bin esp8266-wifi
+diff ../.pio/build/lighthub21/firmware.bin lighthub21
+diff ../.pio/build/mega2560-5500/firmware.hex mega2560-5500
+diff ../.pio/build/stm32/firmware.* stm32

lighthub/main.cpp

@@ -1378,8 +1378,6 @@ void printConfigSummary() {
     infoSerial<<F("\nArtnet ");
     printBool(artnet);
 #endif
-    infoSerial<<F("\nMQTT ");
-    printBool(mqttArr);
 
     infoSerial << endl;
     infoSerial<<F("RAM=")<<freeRam()<<endl;
@@ -2063,6 +2061,13 @@ void setup_main() {
 
 void printFirmwareVersionAndBuildOptions() {
     infoSerial<<F("\nLazyhome.ru LightHub controller ")<<F(QUOTE(PIO_SRC_REV))<<F(" C++ version:")<<F(QUOTE(__cplusplus))<<endl;
+
+infoSerial<<F("\nConfig server:")<<F(CONFIG_SERVER);
+
+#ifdef CUSTOM_FIRMWARE_MAC
+infoSerial<<F("\nFirmware MAC Address " QUOTE(CUSTOM_FIRMWARE_MAC));
+#endif
+
 #ifdef CONTROLLINO
     infoSerial<<F("\n(+)CONTROLLINO");
 #endif
@@ -2071,19 +2076,12 @@ void printFirmwareVersionAndBuildOptions() {
 #else
     infoSerial<<F("\n(-)WATCHDOG");
 #endif
-    infoSerial<<F("\nConfig server:")<<F(CONFIG_SERVER)<<F("\nFirmware MAC Address ")<<F(QUOTE(CUSTOM_FIRMWARE_MAC));
 #ifdef DISABLE_FREERAM_PRINT
     infoSerial<<F("\n(-)FreeRam printing");
 #else
     infoSerial<<F("\n(+)FreeRam printing");
 #endif
 
-#ifdef USE_1W_PIN
-    infoSerial<<F("\n(-)DS2482-100 USE_1W_PIN=")<<QUOTE(USE_1W_PIN);
-#else
-    infoSerial<<F("\n(+)DS2482-100");
-#endif
-
 #ifdef WIFI_ENABLE
     infoSerial<<F("\n(+)WiFi");
 #elif Wiz5500
@@ -2106,13 +2104,18 @@ void printFirmwareVersionAndBuildOptions() {
 #endif
 
 #ifdef _modbus
-    infoSerial<<F("\n(+)MODBUS");
+    infoSerial<<F("\n(+)MODBUS " QUOTE(MODBUS_DIMMER_PARAM) " at " QUOTE(modbusSerial) " speed:"  QUOTE(MODBUS_SERIAL_BAUD));
 #else
     infoSerial<<F("\n(-)MODBUS");
 #endif
 
 #ifndef OWIRE_DISABLE
     infoSerial<<F("\n(+)OWIRE");
+        #ifdef USE_1W_PIN
+        infoSerial<<F("\n(-)DS2482-100 USE_1W_PIN=")<<QUOTE(USE_1W_PIN);
+        #else
+        infoSerial<<F("\n(+)DS2482-100");
+        #endif
 #else
     infoSerial<<F("\n(-)OWIRE");
 #endif
@@ -2151,7 +2154,7 @@ void printFirmwareVersionAndBuildOptions() {
     infoSerial<<F("\n(-)CCS811 & HDC1080");
 #endif
 #ifndef AC_DISABLE
-    infoSerial<<F("\n(+)AC HAIER");
+    infoSerial<<F("\n(+)AC HAIER on " QUOTE(AC_Serial));
 #else
     infoSerial<<F("\n(-)AC HAIER");
 #endif
@@ -2197,7 +2200,7 @@ infoSerial<<F("\n(-)SYSLOG");
 #endif
 
 #ifdef UARTBRIDGE_ENABLE
-infoSerial<<F("\n(+)UARTBRIDGE");
+infoSerial<<F("\n(+)UARTBRIDGE " QUOTE(MODULE_UATRBRIDGE_UARTA) "<=>" QUOTE(MODULE_UATRBRIDGE_UARTB));
 #else
 infoSerial<<F("\n(-)UARTBRIDGE");
 #endif

platformio.bak

@@ -1,89 +0,0 @@
-; PlatformIO Project Configuration File (for copy and paste)
-;
-;   Build options: build flags, source filter
-;   Upload options: custom upload port, speed and extra flags
-;   Library options: dependencies, extra library storages
-;   Advanced options: extra scripting
-;
-; Please visit documentation for the other options and examples
-; http://docs.platformio.org/page/projectconf.html
-[platformio]
-src_dir = lighthub
-env_default =
-<<<<<<< HEAD
-          due-5500
-;          controllino
-;         megaatmega2560
-;         megaatmega2560-5500
-;          due
-=======
-;         megaatmega2560
-          due
->>>>>>> 2b56dcd8dd4e7b95e02c88bcbbbdec0a400a6dc4
-;         esp8266
-[env:due]
-platform = atmelsam
-framework = arduino
-board = due
-lib_ldf_mode = chain+
-build_flags = !echo -n "-DPIO_SRC_REV="$(git log --pretty=format:%h_%ad -1 --date=short)
-lib_deps =
-          https://github.com/sebnil/DueFlashStorage
-          https://github.com/anklimov/Arduino-Temperature-Control-Library.git
-          https://github.com/anklimov/DS2482_OneWire
-          https://github.com/anklimov/DmxDue
-          https://github.com/anklimov/ArduinoHttpClient
-          https://github.com/anklimov/aJson
-          https://github.com/anklimov/CmdArduino
-          https://github.com/anklimov/ModbusMaster
-          https://github.com/anklimov/Ethernet
-          https://github.com/anklimov/Ethernet2
-          https://github.com/knolleary/pubsubclient.git
-          https://github.com/anklimov/Artnet.git
-          FastLED
-          SD
-          SdFat
-
-
-[env:megaatmega2560]
-platform = atmelavr
-board = megaatmega2560
-framework = arduino
-;lib_ldf_mode = chain+
-build_flags = !echo -n "-DPIO_SRC_REV="$(git log --pretty=format:%h_%ad -1 --date=short)
-lib_deps =
-          https://github.com/anklimov/Arduino-Temperature-Control-Library.git
-          https://github.com/anklimov/DS2482_OneWire
-          https://github.com/anklimov/DmxSimple
-          https://github.com/anklimov/httpClient
-          https://github.com/anklimov/aJson
-          https://github.com/anklimov/CmdArduino
-          https://github.com/anklimov/ModbusMaster
-          https://github.com/anklimov/DMXSerial
-          https://github.com/anklimov/Ethernet
-          https://github.com/anklimov/Ethernet2
-          https://github.com/PaulStoffregen/SPI.git
-          https://github.com/knolleary/pubsubclient.git
-          https://github.com/anklimov/Artnet.git
-          FastLED
-          EEPROM
-
-
-[env:esp8266]
-platform = espressif8266
-framework = arduino
-board = nodemcuv2
-lib_ldf_mode = chain+
-build_flags = !echo -n "-DPIO_SRC_REV="$(git log --pretty=format:%h_%ad -1 --date=short)
-lib_deps =
-          https://github.com/anklimov/Arduino-Temperature-Control-Library.git
-          https://github.com/anklimov/DS2482_OneWire
-          https://github.com/anklimov/ESP-Dmx
-          https://github.com/arduino-libraries/ArduinoHttpClient
-          https://github.com/anklimov/aJson
-          https://github.com/anklimov/CmdArduino
-          https://github.com/anklimov/ModbusMaster
-          https://github.com/anklimov/DMXSerial
-          https://github.com/knolleary/pubsubclient.git
-          https://github.com/anklimov/Artnet.git
-          FastLED