fix: use unique client ID for MQTT connection to avoid conflicts

Reviewed-on: http://10.10.10.101:3000/tugsi/Filaman_V2/pulls/1

.gitignore

@@ -1,7 +0,0 @@
-.pio
-.vscode
-.vscode/.browse.c_cpp.db*
-.vscode/c_cpp_properties.json
-.vscode/launch.json
-.vscode/ipch
-data

.vscode/extensions.json

@@ -1,10 +0,0 @@
-{
-    // See http://go.microsoft.com/fwlink/?LinkId=827846
-    // for the documentation about the extensions.json format
-    "recommendations": [
-        "platformio.platformio-ide"
-    ],
-    "unwantedRecommendations": [
-        "ms-vscode.cpptools-extension-pack"
-    ]
-}

html/rfid.js

@@ -11,7 +11,7 @@ let reconnectTimer = null;
 // WebSocket Funktionen
 function startHeartbeat() {
     if (heartbeatTimer) clearInterval(heartbeatTimer);
-
+    
     heartbeatTimer = setInterval(() => {
         // Prüfe ob zu lange keine Antwort kam
         if (Date.now() - lastHeartbeatResponse > HEARTBEAT_TIMEOUT) {
@@ -29,7 +29,7 @@ function startHeartbeat() {
             updateConnectionStatus();
             return;
         }
-
+        
         try {
             // Sende Heartbeat
             socket.send(JSON.stringify({ type: 'heartbeat' }));
@@ -59,18 +59,18 @@ function initWebSocket() {
 
     try {
         socket = new WebSocket('ws://' + window.location.host + '/ws');
-
-        socket.onopen = function () {
+        
+        socket.onopen = function() {
             isConnected = true;
             updateConnectionStatus();
             startHeartbeat(); // Starte Heartbeat nach erfolgreicher Verbindung
         };
-
-        socket.onclose = function () {
+        
+        socket.onclose = function() {
             isConnected = false;
             updateConnectionStatus();
             if (heartbeatTimer) clearInterval(heartbeatTimer);
-
+            
             // Nur neue Verbindung versuchen, wenn kein Timer läuft
             if (!reconnectTimer) {
                 reconnectTimer = setTimeout(() => {
@@ -78,22 +78,22 @@ function initWebSocket() {
                 }, RECONNECT_INTERVAL);
             }
         };
-
-        socket.onerror = function (error) {
+        
+        socket.onerror = function(error) {
             isConnected = false;
             updateConnectionStatus();
             if (heartbeatTimer) clearInterval(heartbeatTimer);
-
+            
             // Bei Fehler Verbindung schließen und neu aufbauen
             if (socket) {
                 socket.close();
                 socket = null;
             }
         };
-
-        socket.onmessage = function (event) {
+        
+        socket.onmessage = function(event) {
             lastHeartbeatResponse = Date.now(); // Aktualisiere Zeitstempel bei jeder Server-Antwort
-
+            
             const data = JSON.parse(event.data);
             if (data.type === 'amsData') {
                 displayAmsData(data.payload);
@@ -109,13 +109,13 @@ function initWebSocket() {
                 const bambuDot = document.getElementById('bambuDot');
                 const spoolmanDot = document.getElementById('spoolmanDot');
                 const ramStatus = document.getElementById('ramStatus');
-
+                
                 if (bambuDot) {
                     bambuDot.className = 'status-dot ' + (data.bambu_connected ? 'online' : 'offline');
                     // Add click handler only when offline
                     if (!data.bambu_connected) {
                         bambuDot.style.cursor = 'pointer';
-                        bambuDot.onclick = function () {
+                        bambuDot.onclick = function() {
                             if (socket && socket.readyState === WebSocket.OPEN) {
                                 socket.send(JSON.stringify({
                                     type: 'reconnect',
@@ -133,7 +133,7 @@ function initWebSocket() {
                     // Add click handler only when offline
                     if (!data.spoolman_connected) {
                         spoolmanDot.style.cursor = 'pointer';
-                        spoolmanDot.onclick = function () {
+                        spoolmanDot.onclick = function() {
                             if (socket && socket.readyState === WebSocket.OPEN) {
                                 socket.send(JSON.stringify({
                                     type: 'reconnect',
@@ -161,7 +161,7 @@ function initWebSocket() {
     } catch (error) {
         isConnected = false;
         updateConnectionStatus();
-
+        
         // Nur neue Verbindung versuchen, wenn kein Timer läuft
         if (!reconnectTimer) {
             reconnectTimer = setTimeout(() => {
@@ -189,26 +189,26 @@ function updateConnectionStatus() {
 }
 
 // Event Listeners
-document.addEventListener("DOMContentLoaded", function () {
+document.addEventListener("DOMContentLoaded", function() {
     initWebSocket();
-
+    
     // Event Listener für Checkbox
-    document.getElementById("onlyWithoutSmId").addEventListener("change", function () {
+    document.getElementById("onlyWithoutSmId").addEventListener("change", function() {
         const spoolsData = window.getSpoolData();
         window.populateVendorDropdown(spoolsData);
     });
 });
 
 // Event Listener für Spoolman Events
-document.addEventListener('spoolDataLoaded', function (event) {
+document.addEventListener('spoolDataLoaded', function(event) {
     window.populateVendorDropdown(event.detail);
 });
 
-document.addEventListener('spoolmanError', function (event) {
+document.addEventListener('spoolmanError', function(event) {
     showNotification(`Spoolman Error: ${event.detail.message}`, false);
 });
 
-document.addEventListener('filamentSelected', function (event) {
+document.addEventListener('filamentSelected', function(event) {
     updateNfcInfo();
     // Zeige Spool-Buttons wenn ein Filament ausgewählt wurde
     const selectedText = document.getElementById("selected-filament").textContent;
@@ -218,13 +218,13 @@ document.addEventListener('filamentSelected', function (event) {
 // Hilfsfunktion für kontrastreiche Textfarbe
 function getContrastColor(hexcolor) {
     // Konvertiere Hex zu RGB
-    const r = parseInt(hexcolor.substr(0, 2), 16);
-    const g = parseInt(hexcolor.substr(2, 2), 16);
-    const b = parseInt(hexcolor.substr(4, 2), 16);
-
+    const r = parseInt(hexcolor.substr(0,2),16);
+    const g = parseInt(hexcolor.substr(2,2),16);
+    const b = parseInt(hexcolor.substr(4,2),16);
+    
     // Berechne Helligkeit (YIQ Formel)
-    const yiq = ((r * 299) + (g * 587) + (b * 114)) / 1000;
-
+    const yiq = ((r*299)+(g*587)+(b*114))/1000;
+    
     // Return schwarz oder weiß basierend auf Helligkeit
     return (yiq >= 128) ? '#000000' : '#FFFFFF';
 }
@@ -242,7 +242,7 @@ function updateNfcInfo() {
     }
 
     // Finde die ausgewählte Spule in den Daten
-    const selectedSpool = spoolsData.find(spool =>
+    const selectedSpool = spoolsData.find(spool => 
         `${spool.id} | ${spool.filament.name} (${spool.filament.material})` === selectedText
     );
 
@@ -255,18 +255,18 @@ function updateNfcInfo() {
 
 function displayAmsData(amsData) {
     const amsDataContainer = document.getElementById('amsData');
-    amsDataContainer.innerHTML = '';
+    amsDataContainer.innerHTML = ''; 
 
     amsData.forEach((ams) => {
         // Bestimme den Anzeigenamen für das AMS
         const amsDisplayName = ams.ams_id === 255 ? 'External Spool' : `AMS ${ams.ams_id}`;
-
+        
         const trayHTML = ams.tray.map(tray => {
             // Prüfe ob überhaupt Daten vorhanden sind
             const relevantFields = ['tray_type', 'tray_sub_brands', 'tray_info_idx', 'setting_id', 'cali_idx'];
-            const hasAnyContent = relevantFields.some(field =>
-                tray[field] !== null &&
-                tray[field] !== undefined &&
+            const hasAnyContent = relevantFields.some(field => 
+                tray[field] !== null && 
+                tray[field] !== undefined && 
                 tray[field] !== '' &&
                 tray[field] !== 'null'
             );
@@ -282,8 +282,8 @@ function displayAmsData(amsData) {
                                cursor: pointer; display: none;">
                     <img src="spool_in.png" alt="Spool In" style="width: 48px; height: 48px;">
                 </button>`;
-
-            // Nur für nicht-leere Trays den Button-HTML erstellen
+            
+                        // Nur für nicht-leere Trays den Button-HTML erstellen
             const outButtonHtml = `
                 <button class="spool-button" onclick="handleSpoolOut()" 
                         style="position: absolute; top: -35px; right: -15px; 
@@ -313,7 +313,7 @@ function displayAmsData(amsData) {
             }
 
             // Generiere den Type mit Color-Box zusammen
-            const typeWithColor = tray.tray_type ?
+            const typeWithColor = tray.tray_type ? 
                 `<p>Typ: ${tray.tray_type} ${tray.tray_color ? `<span style="
                     background-color: #${tray.tray_color}; 
                     width: 20px; 
@@ -334,9 +334,9 @@ function displayAmsData(amsData) {
 
             // Nur gültige Felder anzeigen
             const trayDetails = trayProperties
-                .filter(prop =>
-                    tray[prop.key] !== null &&
-                    tray[prop.key] !== undefined &&
+                .filter(prop => 
+                    tray[prop.key] !== null && 
+                    tray[prop.key] !== undefined && 
                     tray[prop.key] !== '' &&
                     tray[prop.key] !== 'null'
                 )
@@ -350,7 +350,7 @@ function displayAmsData(amsData) {
                 .join('');
 
             // Temperaturen nur anzeigen, wenn beide nicht 0 sind
-            const tempHTML = (tray.nozzle_temp_min > 0 && tray.nozzle_temp_max > 0)
+            const tempHTML = (tray.nozzle_temp_min > 0 && tray.nozzle_temp_max > 0) 
                 ? `<p>Nozzle Temp: ${tray.nozzle_temp_min}°C - ${tray.nozzle_temp_max}°C</p>`
                 : '';
 
@@ -376,7 +376,7 @@ function displayAmsData(amsData) {
                     ${trayHTML}
                 </div>
             </div>`;
-
+        
         amsDataContainer.innerHTML += amsInfo;
     });
 }
@@ -394,7 +394,7 @@ function handleSpoolmanSettings(tray_info_idx, setting_id, cali_idx, nozzle_temp
     const selectedText = document.getElementById("selected-filament").textContent;
 
     // Finde die ausgewählte Spule in den Daten
-    const selectedSpool = spoolsData.find(spool =>
+    const selectedSpool = spoolsData.find(spool => 
         `${spool.id} | ${spool.filament.name} (${spool.filament.material})` === selectedText
     );
 
@@ -460,7 +460,7 @@ function handleSpoolIn(amsId, trayId) {
     }
 
     // Finde die ausgewählte Spule in den Daten
-    const selectedSpool = spoolsData.find(spool =>
+    const selectedSpool = spoolsData.find(spool => 
         `${spool.id} | ${spool.filament.name} (${spool.filament.material})` === selectedText
     );
 
@@ -473,7 +473,7 @@ function handleSpoolIn(amsId, trayId) {
     let minTemp = "175";
     let maxTemp = "275";
 
-    if (Array.isArray(selectedSpool.filament.nozzle_temperature) &&
+    if (Array.isArray(selectedSpool.filament.nozzle_temperature) && 
         selectedSpool.filament.nozzle_temperature.length >= 2) {
         minTemp = selectedSpool.filament.nozzle_temperature[0];
         maxTemp = selectedSpool.filament.nozzle_temperature[1];
@@ -490,7 +490,7 @@ function handleSpoolIn(amsId, trayId) {
             nozzle_temp_max: parseInt(maxTemp),
             type: selectedSpool.filament.material,
             brand: selectedSpool.filament.vendor.name,
-            tray_info_idx: selectedSpool.filament.extra.bambu_idx?.replace(/['"]+/g, '').trim() || '',
+            tray_info_idx: selectedSpool.filament.extra.bambu_idx.replace(/['"]+/g, '').trim(),
             cali_idx: "-1"  // Default-Wert setzen
         }
     };
@@ -518,7 +518,7 @@ function handleSpoolIn(amsId, trayId) {
 
 function updateNfcStatusIndicator(data) {
     const indicator = document.getElementById('nfcStatusIndicator');
-
+    
     if (data.found === 0) {
         // Kein NFC Tag gefunden
         indicator.className = 'status-circle';
@@ -534,7 +534,7 @@ function updateNfcStatusIndicator(data) {
 function updateNfcData(data) {
     // Den Container für den NFC Status finden
     const nfcStatusContainer = document.querySelector('.nfc-status-display');
-
+    
     // Bestehende Daten-Anzeige entfernen falls vorhanden
     const existingData = nfcStatusContainer.querySelector('.nfc-data');
     if (existingData) {
@@ -593,7 +593,7 @@ function updateNfcData(data) {
         if (matchingSpool) {
             // Zuerst Hersteller-Dropdown aktualisieren
             document.getElementById("vendorSelect").value = matchingSpool.filament.vendor.id;
-
+            
             // Dann Filament-Dropdown aktualisieren und Spule auswählen
             updateFilamentDropdown();
             setTimeout(() => {
@@ -606,7 +606,7 @@ function updateNfcData(data) {
     html += '</div>';
     nfcDataDiv.innerHTML = html;
 
-
+    
     // Neues div zum Container hinzufügen
     nfcStatusContainer.appendChild(nfcDataDiv);
 }
@@ -619,7 +619,7 @@ function writeNfcTag() {
     }
 
     const spoolsData = window.getSpoolData();
-    const selectedSpool = spoolsData.find(spool =>
+    const selectedSpool = spoolsData.find(spool => 
         `${spool.id} | ${spool.filament.name} (${spool.filament.material})` === selectedText
     );
 
@@ -631,8 +631,8 @@ function writeNfcTag() {
     // Temperaturwerte korrekt extrahieren
     let minTemp = "175";
     let maxTemp = "275";
-
-    if (Array.isArray(selectedSpool.filament.nozzle_temperature) &&
+    
+    if (Array.isArray(selectedSpool.filament.nozzle_temperature) && 
         selectedSpool.filament.nozzle_temperature.length >= 2) {
         minTemp = String(selectedSpool.filament.nozzle_temperature[0]);
         maxTemp = String(selectedSpool.filament.nozzle_temperature[1]);
@@ -686,4 +686,4 @@ function showNotification(message, isSuccess) {
             notification.remove();
         }, 300);
     }, 3000);
-}
+}

html/upgrade.html

@@ -129,6 +129,7 @@
                             if (data.status === 'success' || lastReceivedProgress >= 98) {
                                 clearTimeout(wsReconnectTimer);
                                 setTimeout(() => {
+                                    window.location.reload(true);
                                     window.location.href = '/';
                                 }, 30000);
                             }
@@ -164,6 +165,7 @@
                     status.className = 'status success';
                     status.style.display = 'block';
                     setTimeout(() => {
+                        window.location.reload(true);
                         window.location.href = '/';
                     }, 30000);
                 }

src/bambu.cpp

@@ -18,7 +18,7 @@ PubSubClient client(sslClient);
 TaskHandle_t BambuMqttTask;
 
 String report_topic = "";
-String request_topic = "";
+//String request_topic = "";
 const char* bambu_username = "bblp";
 const char* bambu_ip = nullptr;
 const char* bambu_accesscode = nullptr;
@@ -92,7 +92,7 @@ bool loadBambuCredentials() {
         bambu_serialnr = g_bambu_serialnr.c_str();
 
         report_topic = "device/" + String(bambu_serialnr) + "/report";
-        request_topic = "device/" + String(bambu_serialnr) + "/request";
+        //request_topic = "device/" + String(bambu_serialnr) + "/request";
         return true;
     }
     Serial.println("Keine gültigen Bambu-Credentials gefunden.");
@@ -197,69 +197,18 @@ FilamentResult findFilamentIdx(String brand, String type) {
 }
 
 bool sendMqttMessage(const String& payload) {
-    // Check MQTT client state first
-    if (!client.connected()) {
-        Serial.println("Error: MQTT client not connected when trying to send message");
-        Serial.print("MQTT client state: ");
-        Serial.println(client.state());
-        return false;
-    }
-
-    // Check if request_topic is empty
-    if (request_topic.isEmpty()) {
-        Serial.println("Error: request_topic is empty!");
-        return false;
-    }
-
-    // Check payload
-    if (payload.isEmpty()) {
-        Serial.println("Error: Empty payload!");
-        return false;
-    }
-
-    Serial.println("Attempting to send MQTT message:");
-    Serial.println("Topic: " + request_topic);
-    Serial.println("Payload: " + payload);
-    Serial.println("Payload length: " + String(payload.length()));
-    
-    // Try to publish with QoS 1 and retain flag false
-    bool published = client.publish(request_topic.c_str(), payload.c_str(), false);
-    
-    if (published) {
-        Serial.println("MQTT message published successfully");
+    Serial.println("Sending MQTT message");
+    Serial.println(payload);
+    if (client.publish(report_topic.c_str(), payload.c_str())) 
+    {
         return true;
-    } else {
-        Serial.println("Failed to publish MQTT message");
-        Serial.print("MQTT client state after publish attempt: ");
-        Serial.println(client.state());
-        
-        // Additional error information
-        switch(client.state()) {
-            case -4:
-                Serial.println("Reason: Connection timeout");
-                break;
-            case -3:
-                Serial.println("Reason: Connection lost");
-                break;
-            case -2:
-                Serial.println("Reason: Connect failed");
-                break;
-            case -1:
-                Serial.println("Reason: Disconnected");
-                break;
-            case 0:
-                Serial.println("Reason: Connected but publish failed");
-                break;
-            default:
-                Serial.println("Reason: Unknown error");
-                break;
-        }
-        return false;
     }
+    
+    return false;
 }
 
 bool setBambuSpool(String payload) {
-    Serial.println("Spool settings received from WebSocket");
+    Serial.println("Spool settings in");
     Serial.println(payload);
 
     // Parse the JSON
@@ -271,28 +220,21 @@ bool setBambuSpool(String payload) {
         return false;
     }
 
-    // Check if we have all required fields
-    if (!doc["amsId"].is<int>() || !doc["trayId"].is<int>()) {
-        Serial.println("Error: Missing or invalid required fields in payload");
-        return false;
-    }
-
-    int amsId = doc["amsId"].as<int>();
-    int trayId = doc["trayId"].as<int>();
+    int amsId = doc["amsId"];
+    int trayId = doc["trayId"];
     String color = doc["color"].as<String>();
     color.toUpperCase();
-    int minTemp = doc["nozzle_temp_min"] | 0;  // Default to 0 if not present
-    int maxTemp = doc["nozzle_temp_max"] | 0;  // Default to 0 if not present
-    String type = doc["type"] | "";  // Default to empty string if not present
+    int minTemp = doc["nozzle_temp_min"];
+    int maxTemp = doc["nozzle_temp_max"];
+    String type = doc["type"].as<String>();
     (type == "PLA+") ? type = "PLA" : type;
-    String brand = doc["brand"] | "";  // Default to empty string if not present
+    String brand = doc["brand"].as<String>();
     String tray_info_idx = (doc["tray_info_idx"].as<String>() != "-1") ? doc["tray_info_idx"].as<String>() : "";
     if (tray_info_idx == "") {
         if (brand != "" && type != "") {
             FilamentResult result = findFilamentIdx(brand, type);
             tray_info_idx = result.key;
             type = result.type;  // Aktualisiere den type mit dem gefundenen Basistyp
-            Serial.println("Found filament idx: " + tray_info_idx + " for type: " + type);
         }
     }
     String setting_id = doc["bambu_setting_id"].as<String>();
@@ -300,7 +242,6 @@ bool setBambuSpool(String payload) {
 
     doc.clear();
 
-    // Create MQTT message
     doc["print"]["sequence_id"] = "0";
     doc["print"]["command"] = "ams_filament_setting";
     doc["print"]["ams_id"] = amsId < 200 ? amsId : 255;
@@ -309,25 +250,26 @@ bool setBambuSpool(String payload) {
     doc["print"]["nozzle_temp_min"] = minTemp;
     doc["print"]["nozzle_temp_max"] = maxTemp;
     doc["print"]["tray_type"] = type;
+    //doc["print"]["cali_idx"] = (cali_idx != "") ? cali_idx : "";
     doc["print"]["tray_info_idx"] = tray_info_idx;
     doc["print"]["setting_id"] = setting_id;
     
-    // Serialize and send MQTT message
+    // Serialize the JSON
     String output;
     serializeJson(doc, output);
-    Serial.println("Sending to Bambu printer:");
-    Serial.println(output);
 
-    if (!sendMqttMessage(output)) {
-        Serial.println("Failed to send filament settings to printer");
+    if (sendMqttMessage(output)) {
+        Serial.println("Spool successfully set");
+    }
+    else
+    {
+        Serial.println("Failed to set spool");
         return false;
     }
     
-    Serial.println("Filament settings sent successfully");
     doc.clear();
     yield();
 
-    // Send calibration if available
     if (cali_idx != "") {
         yield();
         doc["print"]["sequence_id"] = "0";
@@ -336,18 +278,21 @@ bool setBambuSpool(String payload) {
         doc["print"]["nozzle_diameter"] = "0.4";
         doc["print"]["cali_idx"] = cali_idx.toInt();
         doc["print"]["tray_id"] = trayId < 200 ? trayId : 254;
+        //doc["print"]["ams_id"] = amsId < 200 ? amsId : 255;
 
+        // Serialize the JSON
         String output;
         serializeJson(doc, output);
-        Serial.println("Sending calibration to printer:");
-        Serial.println(output);
 
-        if (!sendMqttMessage(output)) {
-            Serial.println("Failed to send calibration settings to printer");
+        if (sendMqttMessage(output)) {
+            Serial.println("Extrusion calibration successfully set");
+        }
+        else
+        {
+            Serial.println("Failed to set extrusion calibration");
             return false;
         }
 
-        Serial.println("Calibration settings sent successfully");
         doc.clear();
         yield();
     }
@@ -604,90 +549,54 @@ void reconnect() {
     uint8_t retries = 0;
     while (!client.connected()) {
         Serial.println("Attempting MQTT re/connection...");
-        Serial.print("State before connect: ");
-        Serial.println(client.state());
         bambu_connected = false;
         oledShowTopRow();
 
-        // Generate a random client ID suffix
-        String clientId = String(bambu_serialnr) + "_" + String(random(0xffff), HEX);
-        Serial.print("Reconnecting with client ID: ");
-        Serial.println(clientId);
+        // Attempt to connect
+        String clientId = String(bambu_serialnr) + "_" + String(random(0, 100));
+            if (client.connect(clientId.c_str(), bambu_username, bambu_accesscode)){
+                Serial.println("MQTT re/connected");
 
-        // Attempt to connect with clean session and will message
-        if (client.connect(clientId.c_str(), bambu_username, bambu_accesscode, nullptr, 0, true, nullptr)) {
-            Serial.println("MQTT re/connected");
-            
-            // Subscribe with QoS 1
-            if (client.subscribe(report_topic.c_str(), 1)) {
-                Serial.println("Successfully subscribed to topic with QoS 1: " + report_topic);
-            } else {
-                Serial.println("Failed to subscribe to topic: " + report_topic);
+                client.subscribe(report_topic.c_str());
+                bambu_connected = true;
+                oledShowTopRow();
             }
-            bambu_connected = true;
-            oledShowTopRow();
-        } else {
-            int state = client.state();
-            Serial.print("failed, rc=");
-            Serial.print(state);
-            Serial.print(" (");
-            // Print detailed error message
-            switch(state) {
-                case -4: Serial.print("MQTT_CONNECTION_TIMEOUT"); break;
-                case -3: Serial.print("MQTT_CONNECTION_LOST"); break;
-                case -2: Serial.print("MQTT_CONNECT_FAILED"); break;
-                case -1: Serial.print("MQTT_DISCONNECTED"); break;
-                case 1: Serial.print("MQTT_CONNECT_BAD_PROTOCOL"); break;
-                case 2: Serial.print("MQTT_CONNECT_BAD_CLIENT_ID"); break;
-                case 3: Serial.print("MQTT_CONNECT_UNAVAILABLE"); break;
-                case 4: Serial.print("MQTT_CONNECT_BAD_CREDENTIALS"); break;
-                case 5: Serial.print("MQTT_CONNECT_UNAUTHORIZED"); break;
-                default: Serial.print("UNKNOWN"); break;
+            else
+            {
+                Serial.print("failed, rc=");
+                Serial.print(client.state());
+                Serial.println(" try again in 5 seconds");
+                bambu_connected = false;
+                oledShowTopRow();
+
+                yield();
+                vTaskDelay(5000 / portTICK_PERIOD_MS);
+                if (retries > 5)
+                {
+                    Serial.println("Disable Bambu MQTT Task after 5 retries");
+                    // vTaskSuspend(BambuMqttTask);
+                    vTaskDelete(BambuMqttTask);
+                    break;
+                }
+
+                retries++;
             }
-            Serial.println(") try again in 5 seconds");
-            bambu_connected = false;
-            oledShowTopRow();
-            
-            yield();
-            vTaskDelay(5000 / portTICK_PERIOD_MS);
-            if (retries > 5) {
-                Serial.println("Disable Bambu MQTT Task after 5 retries");
-                vTaskDelete(BambuMqttTask);
-                break;
-            }
-            retries++;
-        }
     }
 }
 
 void mqtt_loop(void * parameter) {
     Serial.println("Bambu MQTT Task gestartet");
-    unsigned long lastCheck = 0;
-    
     for(;;) {
         if (pauseBambuMqttTask) {
             vTaskDelay(10000);
-            continue;
         }
 
-        unsigned long now = millis();
-        
         if (!client.connected()) {
-            Serial.println("Connection lost, attempting reconnect...");
             reconnect();
             yield();
             esp_task_wdt_reset();
             vTaskDelay(100);
-            continue;
         }
-
-        // Periodically check connection status
-        if (now - lastCheck > 30000) {  // Check every 30 seconds
-            Serial.print("MQTT Status Check - Connected: ");
-            Serial.println(client.connected() ? "Yes" : "No");
-            lastCheck = now;
-        }
-
         client.loop();
         yield();
         esp_task_wdt_reset();
@@ -712,56 +621,42 @@ bool setupMqtt() {
         sslClient.setInsecure();
         client.setServer(bambu_ip, 8883);
 
-        // Generate a random client ID suffix
-        String clientId = String(bambu_serialnr) + "_" + String(random(0xffff), HEX);
-        
-        // MQTT Connection Options
-        client.setKeepAlive(60);
-        client.setSocketTimeout(60);  // Increase socket timeout
-        
-        Serial.print("Connecting with client ID: ");
-        Serial.println(clientId);
-
         // Verbinden mit dem MQTT-Server
         bool connected = true;
-        if (client.connect(clientId.c_str(), bambu_username, bambu_accesscode, nullptr, 0, true, nullptr)) 
-        {
-            client.setCallback(mqtt_callback);
-            client.setBufferSize(16384);  // Increased to 16KB to handle larger JSON
-            
-            // Subscribe with QoS 1
-            if (client.subscribe(report_topic.c_str(), 1)) {
-                Serial.println("Successfully subscribed to topic with QoS 1: " + report_topic);
-            } else {
-                Serial.println("Failed to subscribe to topic: " + report_topic);
+        String clientId = String(bambu_serialnr) + "_" + String(random(0, 100));
+        if (client.connect(clientId.c_str(), bambu_username, bambu_accesscode))
+            {
+                client.setCallback(mqtt_callback);
+                client.setBufferSize(5120);
+                client.subscribe(report_topic.c_str());
+                // client.subscribe(request_topic.c_str());
+                Serial.println("MQTT-Client initialisiert");
+
+                oledShowMessage("Bambu Connected");
+                bambu_connected = true;
+                oledShowTopRow();
+
+                xTaskCreatePinnedToCore(
+                    mqtt_loop,      /* Function to implement the task */
+                    "BambuMqtt",    /* Name of the task */
+                    10240,          /* Stack size in words */
+                    NULL,           /* Task input parameter */
+                    mqttTaskPrio,   /* Priority of the task */
+                    &BambuMqttTask, /* Task handle. */
+                    mqttTaskCore);  /* Core where the task should run */
+            }
+            else
+            {
+                Serial.println("Fehler: Konnte sich nicht beim MQTT-Server anmelden");
+                oledShowMessage("Bambu Connection Failed");
+                vTaskDelay(2000 / portTICK_PERIOD_MS);
+                connected = false;
+                oledShowTopRow();
             }
-            
-            Serial.println("MQTT-Client initialisiert");
 
-            oledShowMessage("Bambu Connected");
-            bambu_connected = true;
-            oledShowTopRow();
-
-            xTaskCreatePinnedToCore(
-                mqtt_loop, /* Function to implement the task */
-                "BambuMqtt", /* Name of the task */
-                16384,  /* Stack size in words */
-                NULL,  /* Task input parameter */
-                mqttTaskPrio,  /* Priority of the task */
-                &BambuMqttTask,  /* Task handle. */
-                mqttTaskCore); /* Core where the task should run */
-        } 
-        else 
-        {
-            Serial.println("Fehler: Konnte sich nicht beim MQTT-Server anmelden");
-            oledShowMessage("Bambu Connection Failed");
-            vTaskDelay(2000 / portTICK_PERIOD_MS);
-            connected = false;
-            oledShowTopRow();
+            if (!connected)
+                return false;
         }
-
-        if (!connected) return false;
-    } 
     else 
     {
         Serial.println("Fehler: Keine MQTT-Daten vorhanden");

src/config.cpp

@@ -6,6 +6,8 @@
 //#define PN532_MOSI  23
 //#define PN532_SS    5
 //#define PN532_MISO  19
+const uint8_t PN532_IRQ = 32;
+const uint8_t PN532_RESET = 33;
 // ***** PN532
 
 // ***** HX711 (Waage)

src/config.h

@@ -1,13 +1,10 @@
-#pragma once
+#ifndef CONFIG_H
+#define CONFIG_H
 
 #include <Arduino.h>
 
-// ***** PN532 (RFID)
-//#define PN532_SCK   18
-//#define PN532_MOSI  23
-//#define PN532_SS    5
-//#define PN532_MISO  19
-// ***** PN532
+extern const uint8_t PN532_IRQ;
+extern const uint8_t PN532_RESET;
 
 extern const uint8_t LOADCELL_DOUT_PIN;
 extern const uint8_t LOADCELL_SCK_PIN;
@@ -50,9 +47,4 @@ extern uint8_t scaleTaskCore;
 extern uint8_t scaleTaskPrio;
 
 extern uint16_t defaultScaleCalibrationValue;
-
-#define PN532_SCK  (18)
-#define PN532_MISO (19)
-#define PN532_MOSI (23)
-#define PN532_CS1  (5)
-#define PN532_CS2  (4)
+#endif

src/main.cpp

@@ -98,6 +98,10 @@ void loop() {
 
   // Wenn Bambu auto set Spool aktiv
   if (autoSendToBambu && autoSetToBambuSpoolId > 0) {
+    if (!bambu_connected)
+    {
+      bambu_restart();
+    }
     if (intervalElapsed(currentMillis, lastAutoSetBambuAmsTime, autoSetBambuAmsInterval)) 
     {
       if (hasReadRfidTag == 0)

src/nfc.cpp

@@ -7,23 +7,9 @@
 #include "api.h"
 #include "esp_task_wdt.h"
 #include "scale.h"
-#include <SPI.h>
 
-// Pin definitions for both PN532 chips
-#define PN532_SCK  (18)  // SPI SCK
-#define PN532_MISO (19)  // SPI MISO
-#define PN532_MOSI (23)  // SPI MOSI
-
-// CS pins for each PN532
-#define PN532_CS1  (5)   // CS for first PN532
-#define PN532_CS2  (4)   // CS for second PN532
-
-// Mifare authentication key
-uint8_t keyA[6] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
-
-// Create two PN532 instances
-Adafruit_PN532 nfc1(PN532_SCK, PN532_MISO, PN532_MOSI, PN532_CS1);
-Adafruit_PN532 nfc2(PN532_SCK, PN532_MISO, PN532_MOSI, PN532_CS2);
+//Adafruit_PN532 nfc(PN532_SCK, PN532_MISO, PN532_MOSI, PN532_SS);
+Adafruit_PN532 nfc(PN532_IRQ, PN532_RESET);
 
 TaskHandle_t RfidReaderTask;
 
@@ -42,165 +28,6 @@ volatile uint8_t hasReadRfidTag = 0;
 // 6 = reading
 // ***** PN532
 
-// Buffer for reading data
-uint8_t data[32];
-
-// Function to initialize a specific PN532
-bool initPN532(Adafruit_PN532 &pn532) {
-    pn532.begin();
-    uint32_t versiondata = pn532.getFirmwareVersion();
-    if (!versiondata) {
-        Serial.println("Didn't find PN532 board");
-        return false;
-    }
-    
-    // Got valid data, print it out!
-    Serial.print("Found chip PN5"); Serial.println((versiondata >> 24) & 0xFF, HEX);
-    Serial.print("Firmware ver. "); Serial.print((versiondata >> 16) & 0xFF, DEC);
-    Serial.print('.'); Serial.println((versiondata >> 8) & 0xFF, DEC);
-    
-    // Configure board to read RFID tags
-    pn532.SAMConfig();
-    Serial.println("Waiting for an ISO14443A Card ...");
-    return true;
-}
-
-void initNfc() {
-    // Configure CS pins as outputs
-    pinMode(PN532_CS1, OUTPUT);
-    pinMode(PN532_CS2, OUTPUT);
-    digitalWrite(PN532_CS1, HIGH);  // Deselect both chips initially
-    digitalWrite(PN532_CS2, HIGH);
-
-    // Initialize SPI
-    SPI.begin(PN532_SCK, PN532_MISO, PN532_MOSI);
-    SPI.setFrequency(1000000); // 1MHz SPI clock
-    
-    // Initialize both PN532 chips
-    if (!initPN532(nfc1)) {
-        Serial.println("Failed to initialize PN532 #1");
-        return;
-    }
-    if (!initPN532(nfc2)) {
-        Serial.println("Failed to initialize PN532 #2");
-        return;
-    }
-    
-    Serial.println("Both PN532 chips initialized successfully");
-}
-
-// Function to read a specific PN532
-bool readPN532(Adafruit_PN532 &pn532, uint8_t *uid, uint8_t *uidLength) {
-    uint8_t success;
-    success = pn532.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, uidLength);
-    return success;
-}
-
-// Function to write to a specific PN532
-bool writePN532(Adafruit_PN532 &pn532, uint8_t *uid, uint8_t uidLength, uint8_t *data, uint8_t dataLen) {
-    if (!pn532.mifareclassic_AuthenticateBlock(uid, uidLength, 4, 1, keyA)) {
-        Serial.println("Failed to authenticate block");
-        return false;
-    }
-    
-    if (!pn532.mifareclassic_WriteDataBlock(4, data)) {
-        Serial.println("Failed to write block");
-        return false;
-    }
-    
-    return true;
-}
-
-void loopNfc() {
-    uint8_t uid1[] = {0, 0, 0, 0, 0, 0, 0};
-    uint8_t uid2[] = {0, 0, 0, 0, 0, 0, 0};
-    uint8_t uidLength1 = 0;
-    uint8_t uidLength2 = 0;
-    
-    // Try to read from both PN532 chips
-    bool success1 = readPN532(nfc1, uid1, &uidLength1);
-    bool success2 = readPN532(nfc2, uid2, &uidLength2);
-    
-    if (success1 || success2) {
-        // Process the first tag if found
-        if (success1) {
-            processTag(uid1, uidLength1, 1);
-        }
-        
-        // Process the second tag if found
-        if (success2) {
-            processTag(uid2, uidLength2, 2);
-        }
-    }
-}
-
-void processTag(uint8_t *uid, uint8_t uidLength, uint8_t readerNumber) {
-    Adafruit_PN532 &pn532 = (readerNumber == 1) ? nfc1 : nfc2;
-    
-    Serial.print("Reader "); Serial.print(readerNumber); Serial.println(" found tag:");
-    Serial.print("UID Length: "); Serial.println(uidLength);
-    Serial.print("UID Value: ");
-    for (uint8_t i = 0; i < uidLength; i++) {
-        Serial.print(" 0x"); Serial.print(uid[i], HEX);
-    }
-    Serial.println("");
-
-    if (uidLength == 7) {
-        uint16_t tagSize = readTagSize(pn532);
-        if(tagSize > 0) {
-            Serial.print("Tag size: "); Serial.println(tagSize);
-            uint8_t* data = (uint8_t*)malloc(tagSize);
-            memset(data, 0, tagSize);
-            
-            // Mehrere Leseversuche
-            bool readSuccess = false;
-            for(int attempt = 0; attempt < 3 && !readSuccess; attempt++) {
-                readSuccess = true;
-                uint8_t numPages = tagSize / 4;
-                for (uint8_t i = 4; i < 4 + numPages; i++) {
-                    if (!pn532.ntag2xx_ReadPage(i, data + (i - 4) * 4)) {
-                        Serial.print("Failed to read page "); Serial.println(i);
-                        readSuccess = false;
-                        break;
-                    }
-                    delay(5);  // Kleine Pause zwischen den Seiten
-                }
-                if (!readSuccess) {
-                    delay(50);  // Pause vor erneutem Versuch
-                }
-            }
-
-            if (readSuccess) {
-                Serial.println("Successfully read tag data.");
-                processNfcData(data, createTagId(uid, uidLength));
-            } else {
-                Serial.println("Failed to read tag data after 3 attempts");
-                oledShowMessage("Read Error");
-            }
-            free(data);
-        }
-    }
-}
-
-void processNfcData(uint8_t *data, String tagId) {
-    // Process the data and send it via WebSocket
-    if (decodeNdefAndReturnJson(data)) {
-        hasReadRfidTag = 1;
-        sendNfcData(nullptr);
-    } else {
-        hasReadRfidTag = 2;
-        oledShowMessage("NFC-Tag unknown");
-        vTaskDelay(2000 / portTICK_PERIOD_MS);
-    }
-}
-
-// Function to write to a specific tag
-bool writeNfcTag(uint8_t *uid, uint8_t uidLength, uint8_t *data, uint8_t dataLen, uint8_t readerNumber) {
-    // Select the appropriate PN532 based on reader number
-    Adafruit_PN532 &pn532 = (readerNumber == 1) ? nfc1 : nfc2;
-    
-    return writePN532(pn532, uid, uidLength, data, dataLen);
-}
 
 // ##### Funktionen für RFID #####
 void payloadToJson(uint8_t *data) {
@@ -253,7 +80,7 @@ bool formatNdefTag() {
   
     // Schreibe die Initialisierungsnachricht auf die ersten Seiten
     for (int i = 0; i < sizeof(ndefInit); i += 4) {
-      if (!nfc1.ntag2xx_WritePage(pageOffset + (i / 4), &ndefInit[i])) {
+      if (!nfc.ntag2xx_WritePage(pageOffset + (i / 4), &ndefInit[i])) {
           success = false;
           break;
       }
@@ -262,15 +89,16 @@ bool formatNdefTag() {
     return success;
   }
 
-uint16_t readTagSize(Adafruit_PN532 &pn532) {
-    uint8_t buffer[4];
-    memset(buffer, 0, 4);
-    pn532.ntag2xx_ReadPage(3, buffer);
-    return buffer[2] * 8;
+uint16_t readTagSize()
+{
+  uint8_t buffer[4];
+  memset(buffer, 0, 4);
+  nfc.ntag2xx_ReadPage(3, buffer);
+  return buffer[2]*8;
 }
 
-uint8_t ntag2xx_WriteNDEF(const char *payload, Adafruit_PN532 &pn532) {
-  uint16_t tagSize = readTagSize(pn532);
+uint8_t ntag2xx_WriteNDEF(const char *payload) {
+  uint16_t tagSize = readTagSize();
   Serial.print("Tag Size: ");Serial.println(tagSize);
 
   uint8_t pageBuffer[4] = {0, 0, 0, 0};
@@ -329,7 +157,11 @@ uint8_t ntag2xx_WriteNDEF(const char *payload, Adafruit_PN532 &pn532) {
     int bytesToWrite = (totalSize < 4) ? totalSize : 4;
     memcpy(pageBuffer, combinedData + a, bytesToWrite);
 
-    if (!(pn532.ntag2xx_WritePage(4+i, pageBuffer))) 
+    //uint8_t uid[] = { 0, 0, 0, 0, 0, 0, 0 };  // Buffer to store the returned UID
+    //uint8_t uidLength;
+    //nfc.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 100);
+
+    if (!(nfc.ntag2xx_WritePage(4+i, pageBuffer))) 
     {
       Serial.println("Fehler beim Schreiben der Seite.");
       free(combinedData);
@@ -337,6 +169,8 @@ uint8_t ntag2xx_WriteNDEF(const char *payload, Adafruit_PN532 &pn532) {
     }
 
     yield();
+    //esp_task_wdt_reset();
+
     i++;
     a += 4;
     totalSize -= bytesToWrite;
@@ -345,7 +179,7 @@ uint8_t ntag2xx_WriteNDEF(const char *payload, Adafruit_PN532 &pn532) {
   // Ensure the NDEF message is properly terminated
   memset(pageBuffer, 0, 4);
   pageBuffer[0] = 0xFE; // NDEF record footer
-  if (!(pn532.ntag2xx_WritePage(4+i, pageBuffer))) 
+  if (!(nfc.ntag2xx_WritePage(4+i, pageBuffer))) 
   {
     Serial.println("Fehler beim Schreiben des End-Bits.");
     free(combinedData);
@@ -404,6 +238,7 @@ bool decodeNdefAndReturnJson(const byte* encodedMessage) {
 void writeJsonToTag(void *parameter) {
   const char* payload = (const char*)parameter;
 
+  // Gib die erstellte NDEF-Message aus
   Serial.println("Erstelle NDEF-Message...");
   Serial.println(payload);
 
@@ -411,36 +246,24 @@ void writeJsonToTag(void *parameter) {
   vTaskSuspend(RfidReaderTask);
   vTaskDelay(50 / portTICK_PERIOD_MS);
 
+  //pauseBambuMqttTask = true;
+  // aktualisieren der Website wenn sich der Status ändert
   sendNfcData(nullptr);
   vTaskDelay(100 / portTICK_PERIOD_MS);
   oledShowMessage("Waiting for NFC-Tag");
   
-  // Try both readers
+  // Wait 10sec for tag
   uint8_t success = 0;
   String uidString = "";
-  Adafruit_PN532* activeReader = nullptr;
-  
   for (uint16_t i = 0; i < 20; i++) {
-    // Try first reader
-    uint8_t uid[] = { 0, 0, 0, 0, 0, 0, 0 };
+    uint8_t uid[] = { 0, 0, 0, 0, 0, 0, 0 };  // Buffer to store the returned UID
     uint8_t uidLength;
-    success = nfc1.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 250);
-    
-    if (!success) {
-      // Try second reader
-      success = nfc2.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 250);
-      if (success) {
-        activeReader = &nfc2;
-      }
-    } else {
-      activeReader = &nfc1;
-    }
-
+    success = nfc.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 500);
     if (success) {
       for (uint8_t i = 0; i < uidLength; i++) {
         uidString += String(uid[i], HEX);
         if (i < uidLength - 1) {
-            uidString += ":";
+            uidString += ":"; // Optional: Trennzeichen hinzufügen
         }
       }
       foundNfcTag(nullptr, success);
@@ -454,36 +277,44 @@ void writeJsonToTag(void *parameter) {
     vTaskDelay(pdMS_TO_TICKS(1));
   }
 
-  if (success && activeReader != nullptr) {
+  if (success)
+  {
     oledShowIcon("transfer");
     // Schreibe die NDEF-Message auf den Tag
-    success = ntag2xx_WriteNDEF(payload, *activeReader);
-    if (success) {
+    success = ntag2xx_WriteNDEF(payload);
+    if (success) 
+    {
         Serial.println("NDEF-Message erfolgreich auf den Tag geschrieben");
+        //oledShowMessage("NFC-Tag written");
         oledShowIcon("success");
         vTaskDelay(1000 / portTICK_PERIOD_MS);
         hasReadRfidTag = 5;
+        // aktualisieren der Website wenn sich der Status ändert
         sendNfcData(nullptr);
         pauseBambuMqttTask = false;
         
         if (updateSpoolTagId(uidString, payload)) {
-          uint8_t uid[] = { 0, 0, 0, 0, 0, 0, 0 };
+          uint8_t uid[] = { 0, 0, 0, 0, 0, 0, 0 };  // Buffer to store the returned UID
           uint8_t uidLength;
           oledShowIcon("success");
-          while (activeReader->readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 500)) {
+          while (nfc.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 500)) {
             yield();
           }
         }
           
         vTaskResume(RfidReaderTask);
         vTaskDelay(500 / portTICK_PERIOD_MS);        
-    } else {
+    } 
+    else 
+    {
         Serial.println("Fehler beim Schreiben der NDEF-Message auf den Tag");
         oledShowIcon("failed");
         vTaskDelay(2000 / portTICK_PERIOD_MS);
         hasReadRfidTag = 4;
     }
-  } else {
+  }
+  else
+  {
     Serial.println("Fehler: Kein Tag zu schreiben gefunden.");
     oledShowMessage("No NFC-Tag found");
     vTaskDelay(2000 / portTICK_PERIOD_MS);
@@ -517,110 +348,137 @@ void startWriteJsonToTag(const char* payload) {
 }
 
 void scanRfidTask(void * parameter) {
-    Serial.println("RFID Task gestartet");
-    for(;;) {
-        if (hasReadRfidTag != 3) {
-            yield();
+  Serial.println("RFID Task gestartet");
+  for(;;) {
+    // Wenn geschrieben wird Schleife aussetzen
+    if (hasReadRfidTag != 3)
+    {
+      yield();
 
-            uint8_t success = 0;
-            uint8_t uid[] = { 0, 0, 0, 0, 0, 0, 0 };
-            uint8_t uidLength;
-            Adafruit_PN532* activeReader = nullptr;
+      uint8_t success;
+      uint8_t uid[] = { 0, 0, 0, 0, 0, 0, 0 };  // Buffer to store the returned UID
+      uint8_t uidLength;
 
-            // Try first reader with increased timeout
-            success = nfc1.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 150);
-            if (success) {
-                activeReader = &nfc1;
-            } else {
-                delay(50); // Small delay between readers
-                // Try second reader with increased timeout
-                success = nfc2.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 150);
-                if (success) {
-                    activeReader = &nfc2;
-                }
-            }
+      success = nfc.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 1000);
 
-            foundNfcTag(nullptr, success);
+      foundNfcTag(nullptr, success);
+      
+      if (success && hasReadRfidTag != 1)
+      {
+        // Display some basic information about the card
+        Serial.println("Found an ISO14443A card");
+
+        hasReadRfidTag = 6;
+
+        oledShowIcon("transfer");
+        vTaskDelay(500 / portTICK_PERIOD_MS);
+
+        if (uidLength == 7)
+        {
+          uint16_t tagSize = readTagSize();
+          if(tagSize > 0)
+          {
+            // Create a buffer depending on the size of the tag
+            uint8_t* data = (uint8_t*)malloc(tagSize);
+            memset(data, 0, tagSize);
+
+            // We probably have an NTAG2xx card (though it could be Ultralight as well)
+            Serial.println("Seems to be an NTAG2xx tag (7 byte UID)");
             
-            if (success && hasReadRfidTag != 1 && activeReader != nullptr) {
-                Serial.println("Found an ISO14443A card");
+            uint8_t numPages = readTagSize()/4;
+            for (uint8_t i = 4; i < 4+numPages; i++) {
+              if (!nfc.ntag2xx_ReadPage(i, data+(i-4) * 4))
+              {
+                break; // Stop if reading fails
+              }
+              // Check for NDEF message end
+              if (data[(i - 4) * 4] == 0xFE) 
+              {
+                break; // End of NDEF message
+              }
 
-                hasReadRfidTag = 6;
-                oledShowIcon("transfer");
-                vTaskDelay(500 / portTICK_PERIOD_MS);
-
-                if (uidLength == 7) {
-                    uint16_t tagSize = readTagSize(*activeReader);
-                    if(tagSize > 0) {
-                        uint8_t* data = (uint8_t*)malloc(tagSize);
-                        memset(data, 0, tagSize);
-
-                        Serial.println("Seems to be an NTAG2xx tag (7 byte UID)");
-                        
-                        uint8_t numPages = readTagSize(*activeReader)/4;
-                        for (uint8_t i = 4; i < 4+numPages; i++) {
-                            if (!activeReader->ntag2xx_ReadPage(i, data+(i-4) * 4)) {
-                                break;
-                            }
-                            if (data[(i - 4) * 4] == 0xFE) {
-                                break;
-                            }
-
-                            yield();
-                            esp_task_wdt_reset();
-                            vTaskDelay(pdMS_TO_TICKS(5)); // Increased delay between page reads
-                        }
-
-                        if (!decodeNdefAndReturnJson(data)) {
-                            oledShowMessage("NFC-Tag unknown");
-                            vTaskDelay(2000 / portTICK_PERIOD_MS);
-                            hasReadRfidTag = 2;
-                        } else {
-                            hasReadRfidTag = 1;
-                        }
-
-                        free(data);
-                    } else {
-                        oledShowMessage("NFC-Tag read error");
-                        hasReadRfidTag = 2;
-                    }
-                } else {
-                    Serial.println("This doesn't seem to be an NTAG2xx tag (UUID length != 7 bytes)!");
-                }
+              yield();
+              esp_task_wdt_reset();
+              vTaskDelay(pdMS_TO_TICKS(1));
             }
 
-            if (!success && hasReadRfidTag > 0) {
-                hasReadRfidTag = 0;
-                nfcJsonData = "";
-                Serial.println("Tag entfernt");
-                if (!autoSendToBambu) oledShowWeight(weight);
+            if (!decodeNdefAndReturnJson(data)) 
+            {
+              oledShowMessage("NFC-Tag unknown");
+              vTaskDelay(2000 / portTICK_PERIOD_MS);
+              hasReadRfidTag = 2;
+            }
+            else 
+            {
+              hasReadRfidTag = 1;
             }
 
-            sendNfcData(nullptr);
-            delay(100); // Add small delay at end of loop
+            free(data);
+          }
+          else
+          {
+            oledShowMessage("NFC-Tag read error");
+            hasReadRfidTag = 2;
+          }
         }
-        yield();
+        else
+        {
+          Serial.println("This doesn't seem to be an NTAG2xx tag (UUID length != 7 bytes)!");
+        }
+      }
+
+      if (!success && hasReadRfidTag > 0)
+      {
+        hasReadRfidTag = 0;
+        //uidString = "";
+        nfcJsonData = "";
+        Serial.println("Tag entfernt");
+        if (!autoSendToBambu) oledShowWeight(weight);
+      }
+
+      // aktualisieren der Website wenn sich der Status ändert
+      sendNfcData(nullptr);
     }
-}
-
-void startNfc() {
-  initNfc();
-  BaseType_t result = xTaskCreatePinnedToCore(
-    scanRfidTask, /* Function to implement the task */
-    "RfidReader", /* Name of the task */
-    5115,  /* Stack size in words */
-    NULL,  /* Task input parameter */
-    rfidTaskPrio,  /* Priority of the task */
-    &RfidReaderTask,  /* Task handle. */
-    rfidTaskCore); /* Core where the task should run */
-
-  if (result != pdPASS) {
-    Serial.println("Fehler beim Erstellen des RFID Tasks");
-  } else {
-    Serial.println("RFID Task erfolgreich erstellt");
+    yield();
   }
 }
 
-String createTagId(uint8_t *uid, uint8_t uidLength) {
-    // Implementierung der Funktion
+void startNfc() {
+  nfc.begin();                                           // Beginne Kommunikation mit RFID Leser
+  delay(1000);
+  unsigned long versiondata = nfc.getFirmwareVersion();  // Lese Versionsnummer der Firmware aus
+  if (! versiondata) {                                   // Wenn keine Antwort kommt
+    Serial.println("Kann kein RFID Board finden !");            // Sende Text "Kann kein..." an seriellen Monitor
+    //delay(5000);
+    //ESP.restart();
+    oledShowMessage("No RFID Board found");
+    delay(2000);
+  }
+  else {
+    Serial.print("Chip PN5 gefunden"); Serial.println((versiondata >> 24) & 0xFF, HEX); // Sende Text und Versionsinfos an seriellen
+    Serial.print("Firmware ver. "); Serial.print((versiondata >> 16) & 0xFF, DEC);      // Monitor, wenn Antwort vom Board kommt
+    Serial.print('.'); Serial.println((versiondata >> 8) & 0xFF, DEC);                  // 
+
+    nfc.SAMConfig();
+    // Set the max number of retry attempts to read from a card
+    // This prevents us from waiting forever for a card, which is
+    // the default behaviour of the PN532.
+    //nfc.setPassiveActivationRetries(0x7F);
+    //nfc.setPassiveActivationRetries(0xFF);
+
+    BaseType_t result = xTaskCreatePinnedToCore(
+      scanRfidTask, /* Function to implement the task */
+      "RfidReader", /* Name of the task */
+      5115,  /* Stack size in words */
+      NULL,  /* Task input parameter */
+      rfidTaskPrio,  /* Priority of the task */
+      &RfidReaderTask,  /* Task handle. */
+      rfidTaskCore); /* Core where the task should run */
+
+      if (result != pdPASS) {
+        Serial.println("Fehler beim Erstellen des RFID Tasks");
+    } else {
+        Serial.println("RFID Task erfolgreich erstellt");
+    }
+  }
 }

src/nfc.h

@@ -1,15 +1,11 @@
-#pragma once
+#ifndef NFC_H
+#define NFC_H
 
 #include <Arduino.h>
-#include <Adafruit_PN532.h>
 
 void startNfc();
-void startWriteJsonToTag(const char* payload);
-void writeJsonToTag(void *parameter);
 void scanRfidTask(void * parameter);
-void processTag(uint8_t *uid, uint8_t uidLength, uint8_t readerNumber);
-void processNfcData(uint8_t *data, String tagId);
-bool decodeNdefAndReturnJson(const byte* encodedMessage);
+void startWriteJsonToTag(const char* payload);
 
 extern TaskHandle_t RfidReaderTask;
 extern String nfcJsonData;
@@ -17,6 +13,4 @@ extern String spoolId;
 extern volatile uint8_t hasReadRfidTag;
 extern volatile bool pauseBambuMqttTask;
 
-// Function declarations
-uint16_t readTagSize(Adafruit_PN532 &pn532);
-String createTagId(uint8_t *uid, uint8_t uidLength);
+#endif

src/website.cpp

@@ -286,6 +286,16 @@ void setupWebserver(AsyncWebServer &server) {
         }
 
         String url = request->getParam("url")->value();
+        if (url.indexOf("http://") == -1 && url.indexOf("https://") == -1)
+        {
+            url = "http://" + url;
+        }
+        // Remove trailing slash if exists
+        if (url.length() > 0 && url.charAt(url.length() - 1) == '/')
+        {
+            url = url.substring(0, url.length() - 1);
+        }
+
         bool octoEnabled = (request->getParam("octoEnabled")->value() == "true") ? true : false;
         String octoUrl = request->getParam("octoUrl")->value();
         String octoToken = (request->getParam("octoToken")->value() != "") ? request->getParam("octoToken")->value() : "";
@@ -300,7 +310,7 @@ void setupWebserver(AsyncWebServer &server) {
         request->send(200, "application/json", jsonResponse);
     });
 
-    // Route für das Überprüfen der Spoolman-Instanz
+    // Route für das Überprüfen der Bambu-Instanz
     server.on("/api/bambu", HTTP_GET, [](AsyncWebServerRequest *request){
         if (!request->hasParam("bambu_ip") || !request->hasParam("bambu_serialnr") || !request->hasParam("bambu_accesscode")) {
             request->send(400, "application/json", "{\"success\": false, \"error\": \"Missing parameter\"}");

src/wlan.cpp

@@ -59,7 +59,7 @@ void initWiFi() {
   if(wm_nonblocking) wm.setConfigPortalBlocking(false);
   //wm.setConfigPortalTimeout(320); // Portal nach 5min schließen
   wm.setWiFiAutoReconnect(true);
-  wm.setConnectTimeout(5);
+  wm.setConnectTimeout(10);
 
   oledShowTopRow();
   oledShowMessage("WiFi Setup");