From 119c1082c2a091a907105e4524e5a98e4dfc6834 Mon Sep 17 00:00:00 2001
From: livello <livello@bk.ru>
Date: Tue, 22 May 2018 23:52:00 +0300
Subject: [PATCH] dht support in progress

---
 lighthub/main.cpp | 27 +++++++++++++++------------
 my_build_flags.py | 32 ++++++++++++++++++++++++++++++++
 platformio.ini    |  6 +++---
 3 files changed, 50 insertions(+), 15 deletions(-)
 create mode 100644 my_build_flags.py

diff --git a/lighthub/main.cpp b/lighthub/main.cpp
index 17c8c23..f0ff577 100644
--- a/lighthub/main.cpp
+++ b/lighthub/main.cpp
@@ -91,6 +91,7 @@ aJsonObject *mqttArr = NULL;
 aJsonObject *modbusArr = NULL;
 aJsonObject *owArr = NULL;
 aJsonObject *dmxArr = NULL;
+aJsonObject *dhtArr = NULL;
 
 unsigned long nextPollingCheck = 0;
 unsigned long nextInputCheck = 0;
@@ -595,15 +596,18 @@ void cmdFunctionKill(int arg_cnt, char **args) {
 
 void applyConfig() {
   if (!root) return;
-  #ifdef _dmxin
-      int itemsCount;
-      dmxArr = aJson.getObjectItem(root, "dmxin");
-      if (dmxArr && (itemsCount = aJson.getArraySize(dmxArr))) {
-          DMXinSetup(itemsCount * 4);
-          Serial.print(F("DMX in started. Channels:"));
-          Serial.println(itemsCount * 4);
-      }
-  #endif
+#ifdef DHT_ENABLE
+    dhtArr = aJson.getObjectItem(root, "dht");
+#endif
+#ifdef _dmxin
+    int itemsCount;
+    dmxArr = aJson.getObjectItem(root, "dmxin");
+    if (dmxArr && (itemsCount = aJson.getArraySize(dmxArr))) {
+        DMXinSetup(itemsCount * 4);
+        Serial.print(F("DMX in started. Channels:"));
+        Serial.println(itemsCount * 4);
+    }
+#endif
 #ifdef _dmxout
     int maxChannels;
     aJsonObject *dmxoutArr = aJson.getObjectItem(root, "dmx");
@@ -620,9 +624,6 @@ void applyConfig() {
 
 #ifdef _owire
     owArr = aJson.getObjectItem(root, "ow");
-#endif
-
-#ifdef _owire
     if (owArr && !owReady) {
         aJsonObject *item = owArr->child;
         owReady = owSetup(&Changed);
@@ -687,6 +688,8 @@ void printConfigSummary() {
     printBool(mqttArr);
     Serial.print(F("1-wire "));
     printBool(owArr);
+    Serial.print(F("dht "));
+    printBool(dhtArr);
 }
 
 void cmdFunctionLoad(int arg_cnt, char **args) {
diff --git a/my_build_flags.py b/my_build_flags.py
new file mode 100644
index 0000000..43992c8
--- /dev/null
+++ b/my_build_flags.py
@@ -0,0 +1,32 @@
+# from time import time
+#
+# from SCons.Script import DefaultEnvironment
+#
+# print("==============================================Custom build flags are:=====================================================")
+# #FLAGS="-MY_CONFIG_SERVER=192.168.10.110"
+# #FLAGS+=" -WATCH_DOG_TICKER_DISABLE"
+# #FLAGS+=" -USE_1W_PIN=12"
+# #FLAGS+=" -SD_CARD_INSERTED"
+# #FLAGS+=" -SERIAL_BAUD=115200"
+# #FLAGS+=" -Wiz5500"
+# #FLAGS+=" -DISABLE_FREERAM_PRINT"
+# #FLAGS+=" -CUSTOM_FIRMWARE_MAC=C4:3E:1f:03:1B:1B"
+# #FLAGS+=" -DMX_DISABLE"
+# FLAGS="MODBUS_DISABLE"
+# #FLAGS+=" -OWIRE_DISABLE"
+# #FLAGS+=" -ARTNET_ENABLE"
+# #FLAGS+=" -CONTROLLINO"
+# #FLAGS+=" -AVR_DMXOUT_PIN=18"
+#
+# print(FLAGS)
+# print("==============================================Custom build flags END=====================================================")
+#
+# env = DefaultEnvironment()
+# env.Append(CPPDEFINES=['MODBUS_DISABLE=1'])
+
+from time import time
+
+from SCons.Script import DefaultEnvironment
+
+env = DefaultEnvironment()
+env.Append(CPPDEFINES=['BUILD_TIMESTAMP=%d' % time()])
diff --git a/platformio.ini b/platformio.ini
index 91dbbb8..3b44b58 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -11,8 +11,8 @@
 src_dir = lighthub
 env_default =
 ;         megaatmega2560
-;          due
-         esp8266
+          due
+;         esp8266
 [env:due]
 platform = atmelsam
 framework = arduino
@@ -68,7 +68,7 @@ framework = arduino
 board = nodemcuv2
 lib_ldf_mode = chain+
 build_flags = !echo -n "-DPIO_SRC_REV="$(git log --pretty=format:%h_%ad -1 --date=short)
-extra_scripts = pre:my_build_flags.py
+;extra_scripts = pre:my_build_flags.py
 lib_deps =
           https://github.com/anklimov/Arduino-Temperature-Control-Library.git
           https://github.com/anklimov/DS2482_OneWire