feat: füge Unterstützung für Spoolman-Einstellungen hinzu und aktualisiere die Benutzeroberfläche

html/rfid.js

@@ -150,6 +150,13 @@ function initWebSocket() {
                     ramStatus.textContent = `${data.freeHeap}k`;
                 }
             }
+            else if (data.type === 'setSpoolmanSettings') {
+                if (data.payload == 'success') {
+                    showNotification(`Spoolman Settings set successfully`, true);
+                } else {
+                    showNotification(`Error setting Spoolman Settings`, false);
+                }
+            }
         };
     } catch (error) {
         isConnected = false;
@@ -285,6 +292,14 @@ function displayAmsData(amsData) {
                     <img src="spool_in.png" alt="Spool In" style="width: 48px; height: 48px; transform: rotate(180deg) scaleX(-1);">
                 </button>`;
 
+            const spoolmanButtonHtml = `
+                <button class="spool-button" onclick="handleSpoolmanSettings('${tray.tray_info_idx}', '${tray.setting_id}', '${tray.cali_idx}', '${tray.nozzle_temp_min}', '${tray.nozzle_temp_max}')" 
+                        style="position: absolute; bottom: 0px; right: 0px; 
+                               background: none; border: none; padding: 0; 
+                               cursor: pointer; display: none;">
+                    <img src="set_spoolman.png" alt="Spool In" style="width: 38px; height: 38px;">
+                </button>`;
+
             if (!hasAnyContent) {
                 return `
                     <div class="tray">
@@ -348,6 +363,7 @@ function displayAmsData(amsData) {
                         ${trayDetails}
                         ${tempHTML}
                         ${(ams.ams_id === 255 && tray.tray_type !== '') ? outButtonHtml : ''}
+                        ${(tray.setting_id != "" && tray.setting_id != "null") ? spoolmanButtonHtml : ''}
                     </div>
                     
                 </div>`;
@@ -373,6 +389,36 @@ function updateSpoolButtons(show) {
     });
 }
 
+function handleSpoolmanSettings(tray_info_idx, setting_id, cali_idx, nozzle_temp_min, nozzle_temp_max) {
+    // Hole das ausgewählte Filament
+    const selectedText = document.getElementById("selected-filament").textContent;
+
+    // Finde die ausgewählte Spule in den Daten
+    const selectedSpool = spoolsData.find(spool => 
+        `${spool.id} | ${spool.filament.name} (${spool.filament.material})` === selectedText
+    );
+
+    const payload = {
+        type: 'setSpoolmanSettings',
+        payload: {
+            filament_id: selectedSpool.filament.id,
+            tray_info_idx: tray_info_idx,
+            setting_id: setting_id,
+            cali_idx: cali_idx,
+            temp_min: nozzle_temp_min,
+            temp_max: nozzle_temp_max
+        }
+    };
+
+    try {
+        socket.send(JSON.stringify(payload));
+        showNotification(`Setting send to Spoolman`, true);
+    } catch (error) {
+        console.error("Error while sending settings to Spoolman:", error);
+        showNotification("Error while sending!", false);
+    }
+}
+
 function handleSpoolOut() {
     // Erstelle Payload
     const payload = {

html/spoolman.html

@@ -75,8 +75,9 @@
             const serial = document.getElementById('bambuSerial').value;
             const code = document.getElementById('bambuCode').value;
             const autoSend = document.getElementById('autoSend').checked;
+            const autoSendTime = document.getElementById('autoSendTime').value;
 
-            fetch(`/api/bambu?bambu_ip=${encodeURIComponent(ip)}&bambu_serialnr=${encodeURIComponent(serial)}&bambu_accesscode=${encodeURIComponent(code)}&autoSend=${autoSend}$autoSendTime=${autoSendTime}`)
+            fetch(`/api/bambu?bambu_ip=${encodeURIComponent(ip)}&bambu_serialnr=${encodeURIComponent(serial)}&bambu_accesscode=${encodeURIComponent(code)}&autoSend=${autoSend}&autoSendTime=${autoSendTime}`)
                 .then(response => response.json())
                 .then(data => {
                     if (data.healthy) {

html/style.css

@@ -761,17 +761,19 @@ a:hover {
     right: 20px;
     padding: 15px 25px;
     border-radius: 4px;
-    color: white;
+    color: black;
     z-index: 1000;
     animation: slideIn 0.3s ease-out;
 }
 
 .notification.success {
     background-color: #28a745;
+    color: black !important;
 }
 
 .notification.error {
     background-color: #dc3545;
+    color: white !important;
 }
 
 .notification.fade-out {
@@ -1013,6 +1015,7 @@ input[type="submit"]:disabled,
     color: #000;
     vertical-align: middle;
     margin-left: 0.5rem;
+    text-shadow: 0 !important;
 }
 
 .progress-container {

src/api.cpp

@@ -122,9 +122,9 @@ void sendToApi(void *parameter) {
     if (httpType == "PATCH") httpCode = http.PATCH(updatePayload);
 
     if (httpCode == HTTP_CODE_OK) {
-        Serial.println("Gewicht der Spule erfolgreich aktualisiert");
+        Serial.println("Spoolman erfolgreich aktualisiert");
     } else {
-        Serial.println("Fehler beim Aktualisieren des Gewichts der Spule");
+        Serial.println("Fehler beim Senden an Spoolman!");
         oledShowMessage("Spoolman update failed");
         vTaskDelay(2000 / portTICK_PERIOD_MS);
     }
@@ -223,6 +223,52 @@ uint8_t updateSpoolWeight(String spoolId, uint16_t weight) {
     return 1;
 }
 
+bool updateSpoolBambuData(String payload) {
+    JsonDocument doc;
+    DeserializationError error = deserializeJson(doc, payload);
+    if (error) {
+        Serial.print("Fehler beim JSON-Parsing: ");
+        Serial.println(error.c_str());
+        return false;
+    }
+
+    String spoolsUrl = spoolmanUrl + apiUrl + "/filament/" + doc["filament_id"].as<String>();
+    Serial.print("Update Spule mit URL: ");
+    Serial.println(spoolsUrl);
+
+    JsonDocument updateDoc;
+    updateDoc["extra"]["bambu_setting_id"] = "\"" + doc["setting_id"].as<String>() + "\"";
+    updateDoc["extra"]["bambu_cali_id"] = "\"" + doc["cali_idx"].as<String>() + "\"";
+    updateDoc["extra"]["bambu_idx"] = "\"" + doc["tray_info_idx"].as<String>() + "\"";
+    updateDoc["extra"]["nozzle_temperature"] = "[" + doc["temp_min"].as<String>() + "," + doc["temp_max"].as<String>() + "]";
+
+    String updatePayload;
+    serializeJson(updateDoc, updatePayload);
+    Serial.print("Update Payload: ");
+    Serial.println(updatePayload);
+
+    SendToApiParams* params = new SendToApiParams();
+    if (params == nullptr) {
+        Serial.println("Fehler: Kann Speicher für Task-Parameter nicht allokieren.");
+        return false;
+    }
+    params->httpType = "PATCH";
+    params->spoolsUrl = spoolsUrl;
+    params->updatePayload = updatePayload;
+
+    // Erstelle die Task
+    BaseType_t result = xTaskCreate(
+        sendToApi,                // Task-Funktion
+        "SendToApiTask",          // Task-Name
+        4096,                     // Stackgröße in Bytes
+        (void*)params,            // Parameter
+        0,                        // Priorität
+        NULL                      // Task-Handle (nicht benötigt)
+    );
+
+    return true;
+}
+
 // #### Spoolman init
 bool checkSpoolmanExtraFields() {
     HTTPClient http;

src/api.h

@@ -15,9 +15,9 @@ bool saveSpoolmanUrl(const String& url);
 String loadSpoolmanUrl(); // Neue Funktion zum Laden der URL
 bool checkSpoolmanExtraFields(); // Neue Funktion zum Überprüfen der Extrafelder
 JsonDocument fetchSingleSpoolInfo(int spoolId); // API-Funktion für die Webseite
-void sendAmsData(AsyncWebSocketClient *client); // Neue Funktion zum Senden von AMS-Daten
 bool updateSpoolTagId(String uidString, const char* payload); // Neue Funktion zum Aktualisieren eines Spools
 uint8_t updateSpoolWeight(String spoolId, uint16_t weight); // Neue Funktion zum Aktualisieren des Gewichts
 bool initSpoolman(); // Neue Funktion zum Initialisieren von Spoolman
+bool updateSpoolBambuData(String payload); // Neue Funktion zum Aktualisieren der Bambu-Daten
 
 #endif

src/bambu.cpp

@@ -393,13 +393,13 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
                     if (vtTray["tray_info_idx"].as<String>() != ams_data[i].trays[0].tray_info_idx ||
                         vtTray["tray_type"].as<String>() != ams_data[i].trays[0].tray_type ||
                         vtTray["tray_color"].as<String>() != ams_data[i].trays[0].tray_color ||
-                        vtTray["cali_idx"].as<String>() != ams_data[i].trays[0].cali_idx) {
+                        (vtTray["tray_type"].as<String>() != "" && vtTray["cali_idx"].as<String>() != ams_data[i].trays[0].cali_idx)) {
                         hasChanges = true;
                     }
                     break;
                 }
             }
-            if (!foundExternal) hasChanges = true;
+            //if (!foundExternal) hasChanges = true;
         }
 
         if (!hasChanges) return;
@@ -448,12 +448,14 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
                 ams_data[extIdx].trays[0].setting_id = vtTray["setting_id"].as<String>();
                 ams_data[extIdx].trays[0].cali_idx = vtTray["cali_idx"].as<String>();
             }
+            else
+            {
+                ams_data[extIdx].trays[0].setting_id = "";
+                ams_data[extIdx].trays[0].cali_idx = "";
+            }
             ams_count++;  // Erhöhe ams_count für die externe Spule
         }
 
-        // Sende die aktualisierten AMS-Daten
-        //sendAmsData(nullptr);
-
         // Erstelle JSON für WebSocket-Clients
         JsonDocument wsDoc;
         JsonArray wsArray = wsDoc.to<JsonArray>();
@@ -480,10 +482,12 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
         }
 
         serializeJson(wsArray, amsJsonData);
+        Serial.println("AMS data updated");
         sendAmsData(nullptr);
     }
+    
     // Neue Bedingung für ams_filament_setting
-    else if (doc["print"]["command"] == "ams_filament_setting") {
+    if (doc["print"]["command"] == "ams_filament_setting") {
         int amsId = doc["print"]["ams_id"].as<int>();
         int trayId = doc["print"]["tray_id"].as<int>();
         String settingId = doc["print"]["setting_id"].as<String>();
@@ -524,6 +528,7 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
                 serializeJson(wsArray, amsJsonData);
                 
                 // Sende an WebSocket Clients
+                Serial.println("Filament setting updated");
                 sendAmsData(nullptr);
                 break;
             }

src/bambu.h

@@ -32,7 +32,7 @@ extern bool autoSendToBambu;
 extern int autoSetToBambuSpoolId;
 
 bool loadBambuCredentials();
-bool saveBambuCredentials(const String& bambu_ip, const String& bambu_serialnr, const String& bambu_accesscode, const bool autoSend);
+bool saveBambuCredentials(const String& bambu_ip, const String& bambu_serialnr, const String& bambu_accesscode, const bool autoSend, const String& autoSendTime);
 bool setupMqtt();
 void mqtt_loop(void * parameter);
 bool setBambuSpool(String payload);

src/main.cpp

@@ -109,7 +109,7 @@ void loop() {
   if (currentMillis - lastAmsSendTime >= amsSendInterval) 
   {
     lastAmsSendTime = currentMillis;
-    sendAmsData(nullptr);
+    //sendAmsData(nullptr);
   }
 
   // Wenn Bambu auto set Spool aktiv

src/ota.cpp

@@ -86,6 +86,12 @@ void sendUpdateProgress(int progress, const char* status = nullptr, const char*
     }
     progressMsg += "}";
     
+    if (progress >= 100) {
+        // Sende die Nachricht nur einmal für den Abschluss
+        ws.textAll("{\"type\":\"updateProgress\",\"progress\":100,\"status\":\"success\",\"message\":\"Update successful! Restarting device...\"}");
+        delay(50);
+    }
+
     // Sende die Nachricht mehrmals mit Verzögerung für wichtige Updates
     if (status || abs(progress - lastSentProgress) >= 10 || progress == 100) {
         for (int i = 0; i < 2; i++) {
@@ -148,7 +154,7 @@ void handleUpdate(AsyncWebServer &server) {
             // Berechne den Fortschritt basierend auf dem Update-Typ
             if (isSpiffsUpdate) {
                 // SPIFFS: 5-75% für Upload
-                currentProgress = 5 + (updateWritten * 100) / updateTotalSize;
+                currentProgress = 6 + (updateWritten * 100) / updateTotalSize;
             } else {
                 // Firmware: 0-100% für Upload
                 currentProgress = 1 + (updateWritten * 100) / updateTotalSize;

src/website.cpp

@@ -95,6 +95,15 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp
             setBambuSpool(doc["payload"]);
         }
 
+        else if (doc["type"] == "setSpoolmanSettings") {
+            Serial.println(doc["payload"].as<String>());
+            if (updateSpoolBambuData(doc["payload"].as<String>())) {
+                ws.textAll("{\"type\":\"setSpoolmanSettings\",\"payload\":\"success\"}");
+            } else {
+                ws.textAll("{\"type\":\"setSpoolmanSettings\",\"payload\":\"error\"}");
+            }
+        }
+
         else {
             Serial.println("Unbekannter WebSocket-Typ: " + doc["type"].as<String>());
         }
@@ -247,6 +256,7 @@ void setupWebserver(AsyncWebServer &server) {
             html.replace("{{bambuSerial}}", bambuSerial ? bambuSerial : "");
             html.replace("{{bambuCode}}", bambuCode ? bambuCode : "");
             html.replace("{{autoSendToBambu}}", autoSendToBambu ? "checked" : "");
+            html.replace("{{autoSendTime}}", String(autoSetBambuAmsCounter));
         }
         else
         {
@@ -254,6 +264,7 @@ void setupWebserver(AsyncWebServer &server) {
             html.replace("{{bambuSerial}}", "");
             html.replace("{{bambuCode}}", "");
             html.replace("{{autoSendToBambu}}", "");
+            html.replace("{{autoSendTime}}", String(autoSetBambuAmsCounter));
         }
 
         request->send(200, "text/html", html);
@@ -287,7 +298,7 @@ void setupWebserver(AsyncWebServer &server) {
         String bambu_accesscode = request->getParam("bambu_accesscode")->value();
         bool autoSend = (request->getParam("autoSend")->value() == "true") ? true : false;
         String autoSendTime = request->getParam("autoSendTime")->value();
-        Serial.println(autoSend);
+        
         bambu_ip.trim();
         bambu_serialnr.trim();
         bambu_accesscode.trim();
@@ -344,6 +355,15 @@ void setupWebserver(AsyncWebServer &server) {
         Serial.println("spool_in.png gesendet");
     });
 
+    // Route für set_spoolman.png
+    server.on("/set_spoolman.png", HTTP_GET, [](AsyncWebServerRequest *request){
+        AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/set_spoolman.png.gz", "image/png");
+        response->addHeader("Content-Encoding", "gzip");
+        response->addHeader("Cache-Control", CACHE_CONTROL);
+        request->send(response);
+        Serial.println("set_spoolman.png gesendet");
+    });
+
     // Route für JavaScript Dateien
     server.on("/spoolman.js", HTTP_GET, [](AsyncWebServerRequest *request){
         Serial.println("Anfrage für /spoolman.js erhalten");