Merge pull request #41 from anklimov/develop

Develop branch merge

check_custom_build_flags_lighthub21.sh

@@ -0,0 +1,9 @@
+#! /bin/bash
+export FLAGS="$FLAGS -DWiz5500"
+export FLAGS="$FLAGS -DARTNET_ENABLE"
+export FLAGS="$FLAGS -DPIO_SRC_REV="$(git log --pretty=format:%h_%ad -1 --date=short)
+CUSTOM_BUILD_FLAGS_FILE=custom-build-flags/build_flags_due-5500.sh
+if [ -f $CUSTOM_BUILD_FLAGS_FILE ]; then
+    source $CUSTOM_BUILD_FLAGS_FILE
+fi
+ echo $FLAGS

lighthub/item.cpp

@@ -88,7 +88,7 @@ int txt2cmd(char *payload) {
     else if (*payload == '-' || (*payload >= '0' && *payload <= '9')) cmd = CMD_NUM; //0
     else if (*payload == '{') cmd = CMD_JSON;
     else if (*payload == '#') cmd = CMD_RGB;
-    else if (strncmp_P(payload, HSV_P, 3) == 0) cmd = CMD_HSV;
+    else if (strncmp_P(payload, HSV_P, strlen (HSV_P)) == 0) cmd = CMD_HSV;
     else if (strncmp_P(payload, RGB_P, strlen (RGB_P)) == 0) cmd = CMD_RGB;
     return cmd;
 }

lighthub/main.cpp

@@ -901,6 +901,10 @@ void applyConfig() {
                     switch (it.itemType) {
                         case CH_THERMO:
                             if (cmd<1) it.setCmd(CMD_OFF);
+                            pinMode(pin, OUTPUT);
+                            digitalWrite(pin, false); //Initially, all thermostates are LOW (OFF for electho heaters, open for water NO)
+                            debugSerial<<F("Thermo:")<<pin<<F("=LOW")<<F(",");
+                            break;
                         case CH_RELAY:
                         {
                             int k;
@@ -1199,8 +1203,8 @@ lan_status loadConfigFromHttp(int arg_cnt, char **args)
         }
 
     } else {
-        debugSerial<<F("failed to connect");
+        debugSerial<<F("failed to connect\n");
-        debugSerial<<F(" try again in 5 seconds\n");
+//        debugSerial<<F(" try again in 5 seconds\n");
         nextLanCheckTime = millis() + 5000;
         return READ_RE_CONFIG;//-11;
     }

lighthub/options.h

@@ -40,7 +40,7 @@
 
 #define INTERVAL_CHECK_MODBUS 2000
 #define INTERVAL_POLLING      100
-#define THERMOSTAT_CHECK_PERIOD 5000
+#define THERMOSTAT_CHECK_PERIOD 30000
 
 #ifndef OW_UPDATE_INTERVAL
 #define OW_UPDATE_INTERVAL 5000

platformio.ini

@@ -10,19 +10,19 @@
 [platformio]
 src_dir = lighthub
 ;monitor_speed = 115200
-;env_default = megaatmega2560-net
+env_default =
 ;    megaatmega2560
+;    lighthub21
 ;    megaatmega2560-net
 ;    due
 ;    esp8266
 ;    esp32
 ;    megaatmega2560-5500
-;    due-5500
+    due-5500
 ;    controllino
 ;    stm32
 ;    nrf52840
 
-
 ;build_dir = /tmp/pioenvs
 ;libdeps_dir = /tmp/piolibdeps
 [env:nrf52840]
@@ -302,7 +302,6 @@ lib_ignore =
     ESP_EEPROM
     EEPROM
 lib_deps =
-
     https://github.com/sebnil/DueFlashStorage
     https://github.com/anklimov/Arduino-Temperature-Control-Library.git
     https://github.com/anklimov/DS2482_OneWire
@@ -325,6 +324,49 @@ lib_deps =
     ClosedCube HDC1080
     SparkFun CCS811 Arduino Library
 
+[env:lighthub21]
+platform = atmelsam
+framework = arduino
+board = due
+build_flags = !bash check_custom_build_flags_lighthub21.sh
+lib_ignore =
+        DHT sensor library for ESPx
+        ESPDMX
+        ESP-Dmx
+        DMXSerial
+        WifiManager
+        DmxSimple
+        httpClient
+        Ethernet
+        Ethernet3
+        NRFFlashStorage
+        WebServer
+        UIPEthernet
+        ESP_EEPROM
+        EEPROM
+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
+        ArduinoHttpClient
+        https://github.com/anklimov/aJson
+        https://github.com/anklimov/CmdArduino
+        https://github.com/anklimov/ModbusMaster
+        https://github.com/anklimov/Ethernet2
+        https://github.com/knolleary/pubsubclient.git
+        https://github.com/anklimov/Artnet.git
+        FastLED
+        SD
+        SdFat
+        Adafruit Unified Sensor
+        DHT sensor library
+        https://github.com/arcao/Syslog.git
+        Streaming
+        https://github.com/livello/PrintEx#is-select-redecl
+        ClosedCube HDC1080
+        SparkFun CCS811 Arduino Library
+
 
 [env:controllino]
 platform = atmelavr