Merge pull request #727 from MartinMueller2003/main

Added Temperature Sensor for Dig uno
forkineye · Jan 15, 2024 · 5301e20 · 5301e20
2 parents ff2dccd + 12cc8d4
commit 5301e20
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 15 deletions.
diff --git a/ESPixelStick/src/network/WiFiDriver.cpp b/ESPixelStick/src/network/WiFiDriver.cpp
@@ -956,20 +956,18 @@ void fsm_WiFi_state_ConnectionFailed::Init ()
         pWiFiDriver->SetIsWiFiConnected (false);
         NetworkMgr.SetWiFiIsConnected (false);
     }
+
+    if (true == pWiFiDriver->Get_RebootOnWiFiFailureToConnect())
+    {
+        logcon (F ("WiFi Requesting Reboot"));
+        RequestReboot(100000);
+    }
     else
     {
-        if (true == pWiFiDriver->Get_RebootOnWiFiFailureToConnect())
-        {
-            logcon (F ("WiFi Requesting Reboot"));
-            RequestReboot(100000);
-        }
-        else
-        {
-            // DEBUG_V ("WiFi Reboot Disabled.");
+        // DEBUG_V ("WiFi Reboot Disabled. Try Again");
 
-            // start over
-            fsm_WiFi_state_Boot_imp.Init ();
-        }
+        // start over
+        fsm_WiFi_state_Boot_imp.Init ();
     }
 
     // DEBUG_END;

diff --git a/ESPixelStick/src/platformDefinitions/GPIO_Defs_ESP32_QUINLED_QUAD.hpp b/ESPixelStick/src/platformDefinitions/GPIO_Defs_ESP32_QUINLED_QUAD.hpp
@@ -41,7 +41,7 @@
 
 // Temperature Sensor
 #define SUPPORT_SENSOR_DS18B20
-#define ONEWIRE_PIN             gpio_num_t::GPIO_NUM_13
+#define ONEWIRE_PIN             gpio_num_t::GPIO_NUM_18
 
 // Output Types
 // Not Finished - #define SUPPORT_OutputType_TLS3001

diff --git a/ESPixelStick/src/platformDefinitions/GPIO_Defs_ESP32_QUINLED_QUAD_AE_Plus.hpp b/ESPixelStick/src/platformDefinitions/GPIO_Defs_ESP32_QUINLED_QUAD_AE_Plus.hpp
@@ -46,7 +46,7 @@
 
 // Temperature Sensor
 #define SUPPORT_SENSOR_DS18B20
-#define ONEWIRE_PIN             gpio_num_t::GPIO_NUM_13
+#define ONEWIRE_PIN             gpio_num_t::GPIO_NUM_18
 
 // Output Types
 // Not Finished - #define SUPPORT_OutputType_TLS3001

diff --git a/ESPixelStick/src/platformDefinitions/GPIO_Defs_ESP32_QUINLED_QUAD_AE_Plus_8.hpp b/ESPixelStick/src/platformDefinitions/GPIO_Defs_ESP32_QUINLED_QUAD_AE_Plus_8.hpp
@@ -41,7 +41,7 @@
 
 // Temperature Sensor
 #define SUPPORT_SENSOR_DS18B20
-#define ONEWIRE_PIN         gpio_num_t::GPIO_NUM_13
+#define ONEWIRE_PIN         gpio_num_t::GPIO_NUM_18
 
 // Output Types
 // Not Finished - #define SUPPORT_OutputType_TLS3001

diff --git a/ESPixelStick/src/platformDefinitions/GPIO_Defs_ESP32_QUINLED_QUAD_ETH.hpp b/ESPixelStick/src/platformDefinitions/GPIO_Defs_ESP32_QUINLED_QUAD_ETH.hpp
@@ -43,7 +43,7 @@
 
 // Temperature Sensor
 #define SUPPORT_SENSOR_DS18B20
-#define ONEWIRE_PIN             gpio_num_t::GPIO_NUM_13
+#define ONEWIRE_PIN             gpio_num_t::GPIO_NUM_18
 
 #include <ETH.h>
 

diff --git a/ESPixelStick/src/platformDefinitions/GPIO_Defs_ESP32_QUINLED_UNO.hpp b/ESPixelStick/src/platformDefinitions/GPIO_Defs_ESP32_QUINLED_UNO.hpp
@@ -36,6 +36,10 @@
 #define SD_CARD_CLK_PIN         gpio_num_t::GPIO_NUM_18
 #define SD_CARD_CS_PIN          gpio_num_t::GPIO_NUM_5
 
+// Temperature Sensor
+#define SUPPORT_SENSOR_DS18B20
+#define ONEWIRE_PIN         gpio_num_t::GPIO_NUM_13
+
 // Output Types
 // Not Finished - #define SUPPORT_OutputType_TLS3001
 // #define SUPPORT_OutputType_APA102           // SPI

diff --git a/ESPixelStick/src/platformDefinitions/GPIO_Defs_ESP32_QUINLED_UNO_AE_Plus.hpp b/ESPixelStick/src/platformDefinitions/GPIO_Defs_ESP32_QUINLED_UNO_AE_Plus.hpp
@@ -34,6 +34,10 @@
 #define DEFAULT_I2C_SDA gpio_num_t::GPIO_NUM_2
 #define DEFAULT_I2C_SCL gpio_num_t::GPIO_NUM_32
 
+// Temperature Sensor
+#define SUPPORT_SENSOR_DS18B20
+#define ONEWIRE_PIN         gpio_num_t::GPIO_NUM_13
+
 // File Manager
 #define SUPPORT_SD
 #define SD_CARD_MISO_PIN        gpio_num_t::GPIO_NUM_19

diff --git a/ESPixelStick/src/platformDefinitions/GPIO_Defs_ESP32_QUINLED_UNO_ETH.hpp b/ESPixelStick/src/platformDefinitions/GPIO_Defs_ESP32_QUINLED_UNO_ETH.hpp
@@ -38,6 +38,10 @@
 #define SD_CARD_CLK_PIN         gpio_num_t::GPIO_NUM_18
 #define SD_CARD_CS_PIN          gpio_num_t::GPIO_NUM_5
 
+// Temperature Sensor
+#define SUPPORT_SENSOR_DS18B20
+#define ONEWIRE_PIN             gpio_num_t::GPIO_NUM_13
+
 #include <ETH.h>
 
 /*