feat: add rfid_bambu.html and update bambu connection handling
This commit is contained in:
		| @@ -27,6 +27,7 @@ const char* bambu_serialnr = nullptr; | ||||
| String g_bambu_ip = ""; | ||||
| String g_bambu_accesscode = ""; | ||||
| String g_bambu_serialnr = ""; | ||||
| bool bambuDisabled = false; | ||||
|  | ||||
| bool bambu_connected = false; | ||||
| bool autoSendToBambu = false; | ||||
| @@ -654,10 +655,7 @@ bool setupMqtt() { | ||||
|     }  | ||||
|     else  | ||||
|     { | ||||
|         Serial.println("Fehler: Keine MQTT-Daten vorhanden"); | ||||
|         oledShowMessage("Bambu Credentials Missing"); | ||||
|         oledShowTopRow(); | ||||
|         vTaskDelay(2000 / portTICK_PERIOD_MS); | ||||
|         bambuDisabled = true; | ||||
|         return false; | ||||
|     } | ||||
|     return true; | ||||
|   | ||||
| @@ -30,6 +30,7 @@ extern int ams_count; | ||||
| extern AMSData ams_data[MAX_AMS]; | ||||
| extern bool autoSendToBambu; | ||||
| extern int autoSetToBambuSpoolId; | ||||
| extern bool bambuDisabled; | ||||
|  | ||||
| bool loadBambuCredentials(); | ||||
| bool saveBambuCredentials(const String& bambu_ip, const String& bambu_serialnr, const String& bambu_accesscode, const bool autoSend, const String& autoSendTime); | ||||
|   | ||||
| @@ -29,7 +29,7 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp | ||||
|     if (type == WS_EVT_CONNECT) { | ||||
|         Serial.println("Neuer Client verbunden!"); | ||||
|         // Sende die AMS-Daten an den neuen Client | ||||
|         sendAmsData(client); | ||||
|         if (!bambuDisabled) sendAmsData(client); | ||||
|         sendNfcData(client); | ||||
|         foundNfcTag(client, 0); | ||||
|         sendWriteResult(client, 3); | ||||
| @@ -213,7 +213,10 @@ void setupWebserver(AsyncWebServer &server) { | ||||
|     // Route für RFID | ||||
|     server.on("/", HTTP_GET, [](AsyncWebServerRequest *request){ | ||||
|         Serial.println("Anfrage für /rfid erhalten"); | ||||
|         AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/rfid.html.gz", "text/html"); | ||||
|          | ||||
|         String page = (bambuDisabled) ? "/rfid.html.gz" : "/rfid_bambu.html.gz"; | ||||
|         AsyncWebServerResponse *response = request->beginResponse(LittleFS, page, "text/html"); | ||||
|          | ||||
|         response->addHeader("Content-Encoding", "gzip"); | ||||
|         response->addHeader("Cache-Control", CACHE_CONTROL); | ||||
|         request->send(response); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user