CyberKerb edition of light logic

.vscode/settings.json

@@ -29,7 +29,10 @@
         "filesystem": "cpp",
         "fstream": "cpp",
         "locale": "cpp",
-        "random": "cpp"
+        "random": "cpp",
+        "sstream": "cpp",
+        "cmath": "cpp",
+        "algorithm": "cpp"
     },
     "cmake.configureOnOpen": false
 }

esphome.html

@@ -0,0 +1,7 @@
+<script
+  type="module"
+  src="https://unpkg.com/esp-web-tools@9/dist/web/install-button.js?module"
+></script>
+<esp-web-install-button
+  manifest="https://raw.githubusercontent.com/DutchDevelop/BLLEDController/main/firmware/manifest.json"
+></esp-web-install-button>

firmware/manifestexpirimental.json

@@ -1,12 +1,12 @@
 {
   "name": "BLLEDCONTROLLER",
-  "version": "Experimental 25 2 24",
+  "version": "Experimental 16 3 24",
   "new_install_prompt_erase": true,
   "builds": [
     {
       "chipFamily": "ESP32",
       "parts": [
-        { "path": "esp32dev/BLLC_Experimental_25.2.24.bin", "offset": 0 }
+        { "path": "esp32dev/BLLC_Experimental_16.3.24.bin", "offset": 0 }
         ]
     }
   ]

src/AutoGrowBufferStream.h

@@ -29,7 +29,7 @@ class AutoGrowBufferStream : public Stream
         if (this->_len + 1 > this->buffer_size) {
             auto tmp = (char*)realloc(this->_buffer, this->buffer_size + BUFFER_INCREMENTS);
             if (tmp == NULL) {
-                Serial.println("Failed to grow buffer");
+                Serial.println(F("Failed to grow buffer"));
                 return 0;
             }
             this->_buffer = tmp;

src/filesystem.h

@@ -26,29 +26,50 @@ char* generateRandomString(int length) {
 
 void saveFileSystem(){
     Serial.println(F("Saving config"));
-
-    DynamicJsonDocument json(512);
-    json["brightness"] = printerConfig.brightness;
+
+    JsonDocument json;
     json["printerIp"] = printerConfig.printerIP;
     json["accessCode"] = printerConfig.accessCode;
     json["serialNumber"] = printerConfig.serialNumber;
+    json["ssid"] = globalVariables.SSID;
+    json["appw"] = globalVariables.APPW;
     //json["webpagePassword"] = printerConfig.webpagePassword;
-
+    json["bssi"] = printerConfig.BSSID;
+    json["brightness"] = printerConfig.brightness;
+    // BLLED Settings
     json["replicatestate"] = printerConfig.replicatestate;
     json["errordetection"] = printerConfig.errordetection;
     json["finishindication"] = printerConfig.finishindication;
+    json["lidarLightsOff"] = printerConfig.lidarLightsOff;
+    json["inactivityEnabled"] = printerConfig.inactivityEnabled;
+    json["inactivityTimeOut"] = printerConfig.inactivityTimeOut;
+    json["discoMode"] = printerConfig.discoMode;
+    json["maintMode"] = printerConfig.maintMode;
+    // Debugging
+    json["debuging"] = printerConfig.debuging;
+    json["debugingchange"] = printerConfig.debugingchange;
     json["mqttdebug"] = printerConfig.mqttdebug;
-
-    json["ssid"] = globalVariables.SSID;
-    json["appw"] = globalVariables.APPW;
-
+    // Test - Fixed LED Colors
+    json["testRGB"] = printerConfig.testRGB;
+    json["testwarmwhite"] = printerConfig.testwarmwhite;
+    json["testcoldwhite"] = printerConfig.testcoldwhite;
+    // Customise LED Colors
+    json["wifiRGB"] = printerConfig.wifiRGB;
+    json["finishRGB"] = printerConfig.finishRGB;
+    json["pauseRGB"] = printerConfig.pauseRGB;
+    json["firstlayerRGB"] = printerConfig.firstlayerRGB;
+    json["nozzleclogRGB"] = printerConfig.nozzleclogRGB;
+    json["hmsSeriousRGB"] = printerConfig.hmsSeriousRGB;
+    json["hmsFatalRGB"] = printerConfig.hmsFatalRGB;
+    json["filamentRunoutRGB"] = printerConfig.filamentRunoutRGB;
+    json["frontCoverRGB"] = printerConfig.frontCoverRGB;
+    json["nozzleTempRGB"] = printerConfig.nozzleTempRGB;
+    json["bedTempRGB"] = printerConfig.bedTempRGB;
     File configFile = LittleFS.open(configPath, "w");
-
     if (!configFile) {
         Serial.println(F("Failed to save config"));
         return;
     }
-
     serializeJson(json, configFile);
     configFile.close();
     Serial.println(F("Config Saved"));
@@ -66,41 +87,63 @@ void loadFileSystem(){
         }
         attempts++;
         Serial.println(F("Failed to open config file, retrying.."));
-        delay(3000);
+        delay(2000);
     }
-
     if (!configFile) {
-        Serial.println(F("Failed to open config file after retries"));
+        Serial.print(F("Failed to open config file after "));
+        Serial.print(attempts);
+        Serial.println(F(" retries"));
+
         Serial.println(F("Clearing config"));
         // LittleFS.remove(configPath);
         saveFileSystem();
         return;
     }
-
     size_t size = configFile.size();
-
     std::unique_ptr<char[]> buf(new char[size]);
     configFile.readBytes(buf.get(), size);
 
-    DynamicJsonDocument json(512);
-
+    JsonDocument json;
     auto deserializeError = deserializeJson(json, buf.get());
 
     if (!deserializeError) {
-        printerConfig.brightness = json["brightness"];
-
+        strcpy(globalVariables.SSID, json["ssid"]);
+        strcpy(globalVariables.APPW, json["appw"]);
         strcpy(printerConfig.printerIP, json["printerIp"]);
         strcpy(printerConfig.accessCode, json["accessCode"]);
         strcpy(printerConfig.serialNumber, json["serialNumber"]);
         //strcpy(printerConfig.webpagePassword, json["webpagePassword"]);
-
-        strcpy(globalVariables.SSID, json["ssid"]);
-        strcpy(globalVariables.APPW, json["appw"]);
-
+        strcpy(printerConfig.BSSID, json["bssi"]);
+        printerConfig.brightness = json["brightness"];
+        //BLLED Settings
         printerConfig.replicatestate = json["replicatestate"];
         printerConfig.errordetection = json["errordetection"];
         printerConfig.finishindication = json["finishindication"];
+        printerConfig.lidarLightsOff = json["lidarLightsOff"];
+        printerConfig.inactivityEnabled = json["inactivityEnabled"];
+        printerConfig.inactivityTimeOut = json["inactivityTimeOut"];
+        printerConfig.discoMode = json["discoMode"];
+        printerConfig.maintMode = json["maintMode"];
+        //Debugging
+        printerConfig.debuging = json["debuging"];
+        printerConfig.debugingchange = json["debugingchange"];
         printerConfig.mqttdebug = json["mqttdebug"];
+        //Test - Fixed LED Colors
+        strcpy(printerConfig.testRGB, json["testRGB"]);
+        printerConfig.testwarmwhite = json["testwarmwhite"];
+        printerConfig.testcoldwhite = json["testcoldwhite"];
+        // Customise LED Colors
+        strcpy(printerConfig.wifiRGB, json["wifiRGB"]);
+        strcpy(printerConfig.finishRGB, json["finishRGB"]);
+        strcpy(printerConfig.pauseRGB, json["pauseRGB"]);
+        strcpy(printerConfig.firstlayerRGB, json["firstlayerRGB"]);
+        strcpy(printerConfig.nozzleclogRGB, json["nozzleclogRGB"]);
+        strcpy(printerConfig.hmsSeriousRGB, json["hmsSeriousRGB"]);
+        strcpy(printerConfig.hmsFatalRGB, json["hmsFatalRGB"]);
+        strcpy(printerConfig.filamentRunoutRGB, json["filamentRunoutRGB"]);
+        strcpy(printerConfig.frontCoverRGB, json["frontCoverRGB"]);
+        strcpy(printerConfig.nozzleTempRGB, json["nozzleTempRGB"]);
+        strcpy(printerConfig.bedTempRGB, json["bedTempRGB"]);
 
         Serial.println(F("Loaded config"));
     } else {
@@ -131,6 +174,8 @@ void setupFileSystem(){
         Serial.println(F("Failed to mount LittleFS"));
         LittleFS.format();
         Serial.println(F("Formatting LittleFS"));
+        Serial.println(F("Restarting Device"));
+        delay(1000);
         ESP.restart();
     }
     Serial.println(F("Mounted LittleFS"));