Fix core panic due to HTTPClient

displayCryptoPrice() and taskUpdateHUE() both used the same HTTPClient instance, thus crashing the core once either called http.end()

Author: ThisIsntTheWay

src/system/nixie.h

@@ -22,6 +22,7 @@
 #define SH_CP   26   // Clock
 #define ST_CP   25   // Latch
 
+bool nixieSetupComplete = false;
 bool nixieAutonomous = true;
 bool cycleNixies = false;
 bool crypto = false;
@@ -44,6 +45,8 @@ int opto2 = 15;
 int opto3 = 4;
 int opto4 = 5;
 
+HTTPClient httpNIXIE;
+
 // Structs
 struct nixieConfigStruct {
     char crypto_asset[8];
@@ -93,16 +96,16 @@ int displayCryptoPrice(String ticker, String quote) {
         return 0;
 
     // Obtain ticker price from binance
-    http.useHTTP10(true);
-    http.begin("https://api.binance.com/api/v3/ticker/price?symbol=" + ticker + quote);
+    httpNIXIE.useHTTP10(true);
+    httpNIXIE.begin("https://api.binance.com/api/v3/ticker/price?symbol=" + ticker + quote);
 
-    http.GET();
+    httpNIXIE.GET();
 
-    if (http.connected()) {
+    if (httpNIXIE.connected()) {
         DynamicJsonDocument doc(1024);
-        DeserializationError error = deserializeJson(doc, http.getStream());
+        DeserializationError error = deserializeJson(doc, httpNIXIE.getStream());
 
-        http.end();
+        httpNIXIE.end();
 
         if (error) {
             Serial.print(F("[X] Crypto: Could not deserialize JSON: "));
@@ -196,19 +199,6 @@ String parseNixieConfig(int mode) {
 
 void taskSetupNixie(void* parameter) {
     while (!FlashFSready) { vTaskDelay(500); }
-    
-    // opto-Isolator stuff
-    pinMode(opto1, OUTPUT);
-    pinMode(opto2, OUTPUT);
-    pinMode(opto3, OUTPUT);
-    pinMode(opto4, OUTPUT);
-
-    // Prepare PWM
-    ledcSetup(1, 200, 8);
-    ledcAttachPin(opto1, 1);
-    ledcAttachPin(opto2, 1);
-    ledcAttachPin(opto3, 1);
-    ledcAttachPin(opto4, 1);
 
     if (!(LITTLEFS.exists("/config/nixieConfig.json"))) {
         Serial.println(F("[T] Nixie: No config found."));
@@ -239,6 +229,7 @@ void taskSetupNixie(void* parameter) {
         Serial.println(F("[T] Nixie: Config found."));
     }
 
+    nixieSetupComplete = true;
     vTaskDelete(NULL);
 }
 
@@ -329,12 +320,28 @@ void taskUpdateNixie(void* parameter) {
 }
 
 void taskUpdateNixieBrightness(void* parameter) {
-    while (!FlashFSready) { vTaskDelay(500); }
+    // Wait for LittleFS and taskSetupNixie to be ready
+    while (!FlashFSready && !nixieSetupComplete) { vTaskDelay(500); }
+
+    // opto-Isolator stuff
+    pinMode(opto1, OUTPUT);
+    pinMode(opto2, OUTPUT);
+    pinMode(opto3, OUTPUT);
+    pinMode(opto4, OUTPUT);
+
+    // Prepare PWM
+    ledcSetup(1, 200, 8);
+    ledcAttachPin(opto1, 1);
+    ledcAttachPin(opto2, 1);
+    ledcAttachPin(opto3, 1);
+    ledcAttachPin(opto4, 1);
+
+    Serial.println("[T] Nixie: Starting brightness updater...");
     for (;;) {
         // Set brightness of nixies
         ledcWrite(1, parseNixieConfig(5).toInt());
 
-        vTaskDelay(20);
+        vTaskDelay(100);
     }
 }
 

src/system/philipsHue.h

@@ -19,7 +19,7 @@
 //  VARIABLES
 //  ---------------------
 
-HTTPClient http;
+HTTPClient httpHUE;
 
 // Structs
 struct hueConfigStruct {
@@ -77,14 +77,14 @@ int getHueLightIndex() {
     String URI = "http://" + parseHUEconfig(1) + "/api/" + parseHUEconfig(2) + "/lights";
     int lightsAmount = 0;
 
-    http.useHTTP10(true);
+    httpHUE.useHTTP10(true);
 
-    if (http.begin(URI)) {
-        if (http.GET() > 0) {
+    if (httpHUE.begin(URI)) {
+        if (httpHUE.GET() > 0) {
             // Deserialize JSON response from HUE bridge
             // Ref: https://arduinojson.org/v6/how-to/use-arduinojson-with-httpclient/
             DynamicJsonDocument doc(3200);
-            deserializeJson(doc, http.getStream());
+            deserializeJson(doc, httpHUE.getStream());
 
             JsonObject root = doc.as<JsonObject>();
 
@@ -103,7 +103,7 @@ int getHueLightIndex() {
         Serial.println("[!] HUE: Cannot init http for lights index.");
     }
 
-    http.end();
+    httpHUE.end();
 
     return lightsAmount;
 }
@@ -115,21 +115,21 @@ char sendHUELightReq(int lightID, bool state) {
     String URI = "http://" + parseHUEconfig(1) + "/api/" + parseHUEconfig(2) + "/lights/" + lightID + "/state";
         //Serial.println(URI);
 
-    http.begin(URI);
+    httpHUE.begin(URI);
 
     // POST and return response
     String request;
 
-    http.addHeader("Content-Type", "application/json");
+    httpHUE.addHeader("Content-Type", "application/json");
     if (state == false) { request = "{\"on\": false}"; }
     else { request = "{\"on\": true}"; }
 
-    int httpResponse = http.PUT(request);
+    int httpResponse = httpHUE.PUT(request);
 
     /*Serial.print("[i] HUE: HTTP Response: ");
         Serial.println(httpResponse);*/
 
-    http.end();
+    httpHUE.end();
 
     return httpResponse;
 }
@@ -142,16 +142,7 @@ void taskSetupHUE(void* paramter) {
     Serial.println("[T] HUE: Looking for config...");
 
     // Wait for FS mount
-    int i = 0;
-    while (!FlashFSready) {
-        if (i > 10) {
-            Serial.println("[X] HUE: FS mount timeout.");
-            vTaskDelete(NULL);
-        }
-
-        i++;
-        vTaskDelay(500);
-    }
+    while (!FlashFSready) { vTaskDelay(1000); }
 
     // Open HUE config
     if (!(LITTLEFS.exists("/config/hueConfig.json"))) {