0.6.10

- Fix OneWire reading on Omilex #19 (comment) 0.6.9 - Olizig POE support
xyzroe · Nov 18, 2022 · fd1efcc · fd1efcc
1 parent ba8c0f9
commit fd1efcc
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,6 @@
 .vscode
 .gcc-flags.json
 .clang_complete
-#bin
+bin/ZigStarGW_*
 commit
 TASK-LIST.md
diff --git a/bin/ZigStarGW.bin b/bin/ZigStarGW.bin
diff --git a/bin/ZigStarGW_v0.6.9.full.bin b/bin/ZigStarGW_v0.6.9.full.bin
diff --git a/src/Version.h b/src/Version.h
@@ -1,9 +1,9 @@
 
     // AUTO GENERATED FILE, DO NOT EDIT
     #ifndef VERSION
-        #define VERSION "0.6.9"
+        #define VERSION "0.6.10"
     #endif
     #ifndef BUILD_TIMESTAMP
-        #define BUILD_TIMESTAMP "2022-09-08 12:09:01.835139"
+        #define BUILD_TIMESTAMP "2022-11-18 22:52:29.540593"
     #endif
 
diff --git a/src/etc.cpp b/src/etc.cpp
@@ -22,15 +22,13 @@ extern struct ConfigSettingsStruct ConfigSettings;
 
 void oneWireBegin()
 {
-  if (ConfigSettings.board == 2) {
-    sensor.begin();
-    DEBUG_PRINTLN(F("oneWire begin OK"));
-  }
+  sensor.begin();
+  DEBUG_PRINTLN(F("oneWire begin OK"));
 }
 
 float oneWireRead()
 { 
-  if (ConfigSettings.board == 2) {
+  if (ConfigSettings.board == 2 || ConfigSettings.board == 4) { //ttgo or omilex
     sensor.requestTemperatures();
     float tempC = sensor.getTempC();
     DEBUG_PRINTLN(tempC);

diff --git a/src/main.cpp b/src/main.cpp
@@ -671,6 +671,8 @@ void setupEthernetAndZigbeeSerial()
       DEBUG_PRINT(F("Zigbee serial setup @ "));
       DEBUG_PRINTLN(ConfigSettings.serialSpeed);
       Serial2.begin(ConfigSettings.serialSpeed, SERIAL_8N1, ZRXD_4, ZTXD_4);
+
+      oneWireBegin();
     }
     else
     {

diff --git a/tools/version b/tools/version
@@ -1 +1 @@
-0.6.9
+0.6.10