Add JSON structure comments for filament and spool creation

.gitignore

@@ -32,7 +32,6 @@ test/README
 data/*
 !data/
 !data/.gitkeep
-# important
 html/bambu_credentials.json
 html/spoolman_url.json
 _local/*

CHANGELOG.md

@@ -1,437 +1,5 @@
 # Changelog
 
-## [2.0.0-beta1] - 2025-08-29
-### Changed
-- update platformio.ini for beta version v2.0.0-beta1
-- update version to 2.0.0 in platformio.ini
-
-
-## [1.5.12-beta18] - 2025-08-29
-### Added
-- add display delay for vendor, filament, and spool creation processes
-
-### Changed
-- update platformio.ini for beta version v1.5.12-beta18
-
-### Fixed
-- replace progress bar with message display for remaining weight in sendToApi function
-
-
-## [1.5.12-beta17] - 2025-08-29
-### Added
-- add progress bar updates for vendor and filament creation processes
-
-### Changed
-- update platformio.ini for beta version v1.5.12-beta17
-- optimize page limit detection and remove redundant verification code
-
-### Fixed
-- update vendor check to use shorthand key in payload
-
-
-## [1.5.12-beta16] - 2025-08-29
-### Changed
-- update platformio.ini for beta version v1.5.12-beta16
-- Refactor NFC interface handling and improve error diagnostics
-
-
-## [1.5.12-beta15] - 2025-08-29
-### Changed
-- update platformio.ini for beta version v1.5.12-beta15
-- enhance NFC write operation diagnostics and improve error handling
-- enhance NFC write operation handling and prevent tag operations during write
-
-
-## [1.5.12-beta14] - 2025-08-29
-### Changed
-- update platformio.ini for beta version v1.5.12-beta14
-- optimize JSON payload structure and enhance NFC tag validation process
-
-
-## [1.5.12-beta13] - 2025-08-29
-### Changed
-- update platformio.ini for beta version v1.5.12-beta13
-- reorganize clearUserDataArea function for improved clarity and safety
-
-
-## [1.5.12-beta12] - 2025-08-29
-### Changed
-- update platformio.ini for beta version v1.5.12-beta12
-
-### Fixed
-- reset NFC state on API send failure to allow retry
-- update createdFilamentId reset value to 65535 for better task handling
-- update createdVendorId reset value to 65535 for improved API handling
-
-
-## [1.5.12-beta11] - 2025-08-29
-### Changed
-- update platformio.ini for beta version v1.5.12-beta11
-
-### Fixed
-- update spoolman ID reset values to 65535 for better API response detection
-
-
-## [1.5.12-beta10] - 2025-08-29
-### Changed
-- update platformio.ini for beta version v1.5.12-beta10
-- streamline task creation in checkVendor and checkFilament functions
-
-
-## [1.5.12-beta9] - 2025-08-29
-### Added
-- update vendor and filament ID handling to use NULL and add delays for stability
-
-### Changed
-- update platformio.ini for beta version v1.5.12-beta9
-
-
-## [1.5.12-beta8] - 2025-08-29
-### Added
-- add delay to ensure proper setting of vendor and filament IDs after API state changes
-
-### Changed
-- update platformio.ini for beta version v1.5.12-beta8
-
-### Fixed
-- correct color_hex key usage and comment out unused date fields in spool creation
-
-
-## [1.5.12-beta7] - 2025-08-29
-### Changed
-- update platformio.ini for beta version v1.5.12-beta7
-
-### Fixed
-- improve API state handling and vendor name formatting
-
-
-## [1.5.12-beta6] - 2025-08-29
-### Changed
-- update platformio.ini for beta version v1.5.12-beta6
-- improve task synchronization in vendor, filament, and spool creation functions
-
-
-## [1.5.12-beta5] - 2025-08-29
-### Added
-- enhance NDEF decoding with detailed validation and debugging output
-
-### Changed
-- update platformio.ini for beta version v1.5.12-beta5
-
-
-## [1.5.12-beta4] - 2025-08-29
-### Added
-- enhance NDEF decoding to validate structure and extract JSON payload
-
-### Changed
-- update platformio.ini for beta version v1.5.12-beta4
-
-
-## [1.5.12-beta3] - 2025-08-29
-### Added
-- add logging for decoded JSON data in NFC processing
-
-### Changed
-- update platformio.ini for beta version v1.5.12-beta3
-
-
-## [1.5.12-beta2] - 2025-08-29
-### Changed
-- update platformio.ini for beta version v1.5.12-beta2
-
-### Fixed
-- enhance filament creation logic to include dynamic comments based on payload
-
-
-## [1.5.12-beta1] - 2025-08-28
-### Added
-- implement filament and spool creation in Spoolman API
-- Add JSON structure comments for filament and spool creation
-- Add vendor and filament management to API; implement recycling factory handling in NFC
-
-### Changed
-- update platformio.ini for beta version v1.5.12-beta1
-- Merge branch 'main' into recyclingfabrik
-- Merge branch 'main' into recyclingfabrik
-
-
-## [1.5.12] - 2025-08-28
-### Added
-- add numbering to update sections in upgrade.html refactor: improve readability of checkSpoolmanInstance function
-
-### Changed
-- update platformio.ini for version v1.5.12
-- clean up library dependencies in platformio.ini
-
-
-## [1.5.11-beta4] - 2025-08-28
-### Changed
-- update platformio.ini for beta version v1.5.11-beta4
-
-### Fixed
-- remove debug logging from checkSpoolmanInstance function
-
-
-## [1.5.11-beta3] - 2025-08-28
-### Added
-- add logging for spoolman status in checkSpoolmanInstance function
-
-### Changed
-- update platformio.ini for beta version v1.5.11-beta3
-
-
-## [1.5.11-beta2] - 2025-08-28
-### Added
-- add logging for healthy spoolman instance check
-
-### Changed
-- update platformio.ini for beta version v1.5.11-beta2
-
-
-## [1.5.11-beta1] - 2025-08-28
-### Changed
-- update platformio.ini for beta version v1.5.11-beta1
-
-### Fixed
-- adjust spacing in loop structure and enable tare function in scale loop
-
-
-## [1.5.11] - 2025-08-27
-### Changed
-- update platformio.ini for version v1.5.11
-
-
-## [1.5.10] - 2025-08-27
-### Added
-- improve weight processing logic and add auto-send feature for Bambu spool ID
-- improve weight processing logic and add auto-send feature for Bambu spool ID
-- Adds a link to the spool in spoolman when reading a spool tag
-- Fixes types and some issues in the new graphics
-- Adds ENABLE_HEAP_DEBUGGING define as comment to the build flags
-- Adds data directory and further .vscode files to to .gitignore
-- Introduces new heap debugging feature and fixes some memory leaks in website feature
-- Fixes some issues with the new location tags
-- Adds new feature to write and read location tags
-- Adds slight debouncing to the scale loop weight logic
-- add loadcell desc.
-- implement multi-color filament display and styles for dropdown options
-- add remaining weight logging for PUT requests and improve error reporting in sendToApi function
-- add remaining weight logging and display after successful spool update
-- add weight field to update payload in updateSpoolTagId function
-- add auto-tare functionality and update scale handling based on touch sensor connection
-- add touch sensor connection check and update logic
-- add manual tare functionality for scale
-- add debounce handling for TTP223 touch sensor
-- add TTP223 touch sensor support and wiring configuration
-- Renamed states of NFC state machine and introduced new state machine for spoolman API
-- add forced cache refresh after removing and saving Bambu credentials
-- add functionality to remove Bambu credentials and update API handling
-- add rfid_bambu.html and update bambu connection handling
-- add error handling for missing vendor IDs in filament data
-- add WiFi connection check and restart Bambu if not connected
-- added new .step, now with correct individual parts
-- added changelog
-- Add files via upload
-- added .stp files of modifications
-- added merged picture
-- added pictures of components bought from AliE
-- Add files via upload
-- added pictures for heat insert location
-- added pictures showing heat insert location
-- remove unnecessary delay in MQTT setup and add delay before restart
-- add new 3D print file for Filaman scale
-- added Discord Server
-- add support for Spoolman Octoprint Plugin in README files
-- add OctoPrint integration with configurable fields and update functionality
-- add version comparison function and check for outdated versions before updates
-- remove unused version and protocol fields from JSON output; add error message for insufficient memory
-
-### Changed
-- update platformio.ini for version v1.5.10
-- Merge branch 'main' of https://gitlab.fire-devils.org/3D-Druck/Filaman
-- Changed Amazon Link for PN532
-- Changed Amazon Link for PN532
-- update changelog and header for version v1.5.9
-- update platformio.ini for version v1.5.9
-- Enhance API to support weight updates after successful spool tag updates
-- update changelog and header for version v1.5.8
-- update platformio.ini for version v1.5.8
-- Merge pull request #45 from janecker/nfc_write_improvements
-- Introduces periodic Spoolman Healthcheck
-- Improves init - NFC reading now only starts after boot is finished
-- Further improvements on NFC writing
-- Merge pull request #44 from janecker/graphics_rework
-- Graphic rework of the NFC writing process
-- Remove unused parameter of sendNfcData()
-- Reworks startup graphics and timings
-- update changelog and header for version v1.5.7
-- update platformio.ini for version v1.5.7
-- clean up unused variables and improve .gitignore entries
-- update changelog and header for version v1.5.6
-- update webpages for version v1.5.6
-- update platformio.ini for version v1.5.6
-- Merge pull request #42 from janecker/configuration_nvs_storage
-- Merge branch 'main' into configuration_nvs_storage
-- Changes configuration storage of spoolman and bambu values
-- update changelog and header for version v1.5.5
-- update platformio.ini for version v1.5.5
-- update changelog and header for version v1.5.4
-- update platformio.ini for version v1.5.4
-- Merge branch 'main' of github.com:ManuelW77/Filaman
-- Merge pull request #39 from janecker/location_tags
-- Merge pull request #38 from janecker/scale_debouncing
-- update changelog and header for version v1.5.3
-- update platformio.ini for version v1.5.3
-- Affiliate Links
-- update changelog and header for version v1.5.2
-- update platformio.ini for version v1.5.2
-- update changelog and header for version v1.5.1
-- update version to 1.5.1 and improve OTA update handling with task management
-- update changelog and header for version v1.4.14
-- update platformio.ini for version v1.4.14
-- update changelog and header for version v1.4.13
-- update platformio.ini for version v1.4.13
-- update changelog and header for version v1.4.12
-- update platformio.ini for version v1.4.12
-- update README files to clarify PN532 DIP switch settings
-- update changelog and header for version v1.4.11
-- update platformio.ini for version v1.4.11
-- Merge branch 'main' of github.com:ManuelW77/Filaman
-- update changelog and header for version v1.4.10
-- update platformio.ini for version v1.4.10
-- Merge pull request #31 from janecker/nfc_rework
-- Introducing enum for handling the NFC state to improve code readability
-- update changelog and header for version v1.4.9
-- update platformio.ini for version v1.4.9
-- update changelog and header for version v1.4.8
-- update platformio.ini for version v1.4.8
-- Merge pull request #30 from janecker/main
-- Merge branch 'testing' into main
-- update changelog and header for version v1.4.7
-- update platformio.ini for version v1.4.7
-- Merge branch 'testing'
-- update remove button for Bambu credentials with red background
-- Merge pull request #28 from tugsi/main
-- update changelog and header for version v1.4.6
-- update platformio.ini for version v1.4.6
-- update changelog and header for version v1.4.5
-- update platformio.ini for version v1.4.5
-- Merge branch 'testing'
-- remove unused request_topic subscription and reduce MQTT task stack size
-- Merge pull request #26 from tugsi/main
-- rename report_topic to topic and update MQTT subscription logic, switched publish topic to request
-- update changelog and header for version v1.4.4
-- update platformio.ini for version v1.4.4
-- update changelog and header for version v1.4.3
-- update platformio.ini for version v1.4.3
-- update changelog and header for version v1.4.2
-- update platformio.ini for version v1.4.2
-- increase stack size for BambuMqtt task
-- update Discord Link
-- update Discord Link
-- remove commented-out subscription topic in MQTT setup
-- update changelog and header for version v1.4.1
-- update platformio.ini for version v1.4.1
-- refactor length calculation to convert total length to meters before formatting
-- Merge pull request #16 from spitzbirne32/main
-- improved housing to show display better
-- removed CAD, as they were all duplicates
-- typo in AliE link
-- Delete usermod/spitzbirne32/STL/README.md
-- Update README.md
-- moved pictures of parts into dedicated folders
-- Update README.md
-- Update README.md
-- Update README.md
-- Delete usermod/spitzbirne32/STL/ScaleTop_Heatinsert_Location_usermod_spitzbirne32_.png
-- Delete usermod/spitzbirne32/STL/Housing_Heatinsert_Location_usermod_spitzbirne32_.png
-- created folders
-- Update README.md
-- Update README.md
-- Create README.md
-- Update README.md
-- Update README.md
-- Create README.md
-- Merge pull request #15 from ManuelW77/main
-- Merge pull request #14 from janecker/scale-calibration-rework
-- Reworks the scale calibration handling
-- remove redundant scale calibration checks and enhance task management
-- enhance AMS data handling and streamline spool auto-setting logic
-- adjust stack size and improve scale calibration logic
-- update labels and input types for better clarity and functionality
-- update documentation for clarity and accuracy
-- update changelog and header for version v1.4.0
-- update NFC tag references to include NTAG213 and clarify storage capacity
-- bump version to 1.4.0
-- remove unused version and protocol fields from NFC data packet
-- sort vendors alphabetically in the dropdown list
-- Merge pull request #10 from janecker/nfc-improvements
-
-### Fixed
-- Fixes issue that scale not calibrated message was not shown
-- Improves NFC writing workaround and removes debug output
-- Fixes typos in upgrade page
-- Reworks graphics of tag reading and some api fixes
-- Replaces usage of String with const char* in heap debug function
-- Merge pull request #41 from janecker/memory_leak_fixes
-- Fixes compiler warnings in nfc
-- Memory leak fixes in api and nfc, location tag fix
-- Merge pull request #40 from janecker/location_bambu_fix
-- uncomment monitor_port configuration in platformio.ini
-- update spool weight conditionally based on NFC ID
-- update weight field in update payload to only include values greater than 10
-- increase stack size for sendToApi task to improve stability
-- adjust tare weight tolerance to ignore deviations of 2g
-- improve weight stability check before sending to API
-- update touch sensor connection logic to correctly identify connection status
-- update TTP223 pin configuration and adjust touch sensor logic
-- enhance HTTP method handling in sendToApi function
-- improve HTTP client configuration and clear update documents after API calls
-- Fixes memory leak in HTTPClient by disabling connection reuse
-- update reload logic after removing and saving Bambu credentials for better cache handling
-- handle Bambu connection state by introducing bambuDisabled flag
-- handle potential undefined value for tray_info_idx in handleSpoolIn function, by @tugsi
-- Fix rfid.js-Failure with X1-Series, if you wanna send a Spool to AMS:  - Uncaught TypeError: Cannot read properties of undefined (reading 'replace')     at handleSpoolIn (rfid.js:493:67)     at HTMLButtonElement.onclick ((Index):1:1) handleSpoolIn	@	rfid.js:493 onclick	@	(Index):1
-- increase MQTT buffer size and adjust task stack size
-- Fix BufferSize for larger JSONs from X-Series
-- adjust weight threshold for tare check to allow negative values
-- use unique client ID for MQTT connection to avoid conflicts
-- reload page after firmware update completion
-- increase WiFi connection timeout from 5 to 10 seconds
-- ensure valid URL format and remove trailing slash in setupWebserver
-- correct typo in console log for total length
-
-
-## [1.5.9] - 2025-08-11
-### Changed
-- update platformio.ini for version v1.5.9
-- Enhance API to support weight updates after successful spool tag updates
-
-
-## [1.5.8] - 2025-08-10
-### Added
-- Adds a link to the spool in spoolman when reading a spool tag
-- Fixes types and some issues in the new graphics
-
-### Changed
-- update platformio.ini for version v1.5.8
-- Merge pull request #45 from janecker/nfc_write_improvements
-- Introduces periodic Spoolman Healthcheck
-- Improves init - NFC reading now only starts after boot is finished
-- Further improvements on NFC writing
-- Merge pull request #44 from janecker/graphics_rework
-- Graphic rework of the NFC writing process
-- Remove unused parameter of sendNfcData()
-- Reworks startup graphics and timings
-
-### Fixed
-- Fixes issue that scale not calibrated message was not shown
-- Improves NFC writing workaround and removes debug output
-- Fixes typos in upgrade page
-- Reworks graphics of tag reading and some api fixes
-- Replaces usage of String with const char* in heap debug function
-
-
 ## [1.5.7] - 2025-07-28
 ### Changed
 - update platformio.ini for version v1.5.7

README.de.md

@@ -62,7 +62,7 @@ Discord Server: [https://discord.gg/my7Gvaxj2v](https://discord.gg/my7Gvaxj2v)
 - **OLED 0.96 Zoll I2C white/yellow Display:** 128x64 SSD1306.
 [Amazon Link](https://amzn.to/445aaa9)
 - **PN532 NFC NXP RFID-Modul V3:** For NFC tag operations.
-[Amazon Link](https://amzn.eu/d/gy9vaBX)
+[Amazon Link](https://amzn.to/4iO6CO4)
 - **NFC Tags NTAG213 NTAG215:** RFID Tag
 [Amazon Link](https://amzn.to/3E071xO)
 - **TTP223 Touch Sensor (optional):** For reTARE per Button/Touch

README.md

@@ -66,7 +66,7 @@ Discord Server: [https://discord.gg/my7Gvaxj2v](https://discord.gg/my7Gvaxj2v)
 - **OLED 0.96 Zoll I2C white/yellow Display:** 128x64 SSD1306.
 [Amazon Link](https://amzn.to/445aaa9)
 - **PN532 NFC NXP RFID-Modul V3:** For NFC tag operations.
-[Amazon Link](https://amzn.eu/d/gy9vaBX)
+[Amazon Link](https://amzn.to/4iO6CO4)
 - **NFC Tags NTAG213 NTAG215:** RFID Tag
 [Amazon Link](https://amzn.to/3E071xO)
 - **TTP223 Touch Sensor (optional):** For reTARE per Button/Touch

html/rfid.js

@@ -7,7 +7,6 @@ let heartbeatTimer = null;
 let lastHeartbeatResponse = Date.now();
 const HEARTBEAT_TIMEOUT = 20000;
 let reconnectTimer = null;
-let spoolDetected = false;
 
 // WebSocket Funktionen
 function startHeartbeat() {
@@ -509,15 +508,12 @@ function updateNfcStatusIndicator(data) {
     if (data.found === 0) {
         // Kein NFC Tag gefunden
         indicator.className = 'status-circle';
-        spoolDetected = false;
     } else if (data.found === 1) {
         // NFC Tag erfolgreich gelesen
         indicator.className = 'status-circle success';
-        spoolDetected = true;
     } else {
         // Fehler beim Lesen
         indicator.className = 'status-circle error';
-        spoolDetected = true;
     }
 }
 
@@ -578,7 +574,7 @@ function updateNfcData(data) {
         `;
 
         // Spoolman ID anzeigen
-        html += `<p><strong>Spoolman ID:</strong> ${data.sm_id} (<a href="${spoolmanUrl}/spool/show/${data.sm_id}">Open in Spoolman</a>)</p>`;
+        html += `<p><strong>Spoolman ID:</strong> ${data.sm_id || 'No Spoolman ID'}</p>`;
      }
      else if(data.location)
      {
@@ -622,83 +618,78 @@ function updateNfcData(data) {
 }
 
 function writeNfcTag() {
-    if(!spoolDetected || confirm("Are you sure you want to overwrite the Tag?") == true){
+    const selectedText = document.getElementById("selected-filament").textContent;
-        const selectedText = document.getElementById("selected-filament").textContent;
+    if (selectedText === "Please choose...") {
-        if (selectedText === "Please choose...") {
+        alert('Please select a Spool first.');
-            alert('Please select a Spool first.');
+        return;
-            return;
+    }
-        }
 
-        const spoolsData = window.getSpoolData();
+    const spoolsData = window.getSpoolData();
-        const selectedSpool = spoolsData.find(spool => 
+    const selectedSpool = spoolsData.find(spool => 
-            `${spool.id} | ${spool.filament.name} (${spool.filament.material})` === selectedText
+        `${spool.id} | ${spool.filament.name} (${spool.filament.material})` === selectedText
-        );
+    );
 
-        if (!selectedSpool) {
+    if (!selectedSpool) {
-            alert('Ausgewählte Spule konnte nicht gefunden werden.');
+        alert('Ausgewählte Spule konnte nicht gefunden werden.');
-            return;
+        return;
-        }
+    }
 
-        // Temperaturwerte korrekt extrahieren
+    // Temperaturwerte korrekt extrahieren
-        let minTemp = "175";
+    let minTemp = "175";
-        let maxTemp = "275";
+    let maxTemp = "275";
-        
+    
-        if (Array.isArray(selectedSpool.filament.nozzle_temperature) && 
+    if (Array.isArray(selectedSpool.filament.nozzle_temperature) && 
-            selectedSpool.filament.nozzle_temperature.length >= 2) {
+        selectedSpool.filament.nozzle_temperature.length >= 2) {
-            minTemp = String(selectedSpool.filament.nozzle_temperature[0]);
+        minTemp = String(selectedSpool.filament.nozzle_temperature[0]);
-            maxTemp = String(selectedSpool.filament.nozzle_temperature[1]);
+        maxTemp = String(selectedSpool.filament.nozzle_temperature[1]);
-        }
+    }
 
-        // Erstelle das NFC-Datenpaket mit korrekten Datentypen
+    // Erstelle das NFC-Datenpaket mit korrekten Datentypen
-        const nfcData = {
+    const nfcData = {
-            color_hex: selectedSpool.filament.color_hex || "FFFFFF",
+        color_hex: selectedSpool.filament.color_hex || "FFFFFF",
-            type: selectedSpool.filament.material,
+        type: selectedSpool.filament.material,
-            min_temp: minTemp,
+        min_temp: minTemp,
-            max_temp: maxTemp,
+        max_temp: maxTemp,
-            brand: selectedSpool.filament.vendor.name,
+        brand: selectedSpool.filament.vendor.name,
-            sm_id: String(selectedSpool.id) // Konvertiere zu String
+        sm_id: String(selectedSpool.id) // Konvertiere zu String
-        };
+    };
 
-        if (socket?.readyState === WebSocket.OPEN) {
+    if (socket?.readyState === WebSocket.OPEN) {
-            const writeButton = document.getElementById("writeNfcButton");
+        const writeButton = document.getElementById("writeNfcButton");
-            writeButton.classList.add("writing");
+        writeButton.classList.add("writing");
-            writeButton.textContent = "Writing";
+        writeButton.textContent = "Writing";
-            socket.send(JSON.stringify({
+        socket.send(JSON.stringify({
-                type: 'writeNfcTag',
+            type: 'writeNfcTag',
-                tagType: 'spool',
+            tagType: 'spool',
-                payload: nfcData
+            payload: nfcData
-            }));
+        }));
-        } else {
+    } else {
-            alert('Not connected to Server. Please check connection.');
+        alert('Not connected to Server. Please check connection.');
-        }
     }
 }
 
 function writeLocationNfcTag() {
-    if(!spoolDetected || confirm("Are you sure you want to overwrite the Tag?") == true){
+    const selectedText = document.getElementById("locationSelect").value;
-        const selectedText = document.getElementById("locationSelect").value;
+    if (selectedText === "Please choose...") {
-        if (selectedText === "Please choose...") {
+        alert('Please select a location first.');
-            alert('Please select a location first.');
+        return;
-            return;
+    }
-        }
+    // Erstelle das NFC-Datenpaket mit korrekten Datentypen
-        // Erstelle das NFC-Datenpaket mit korrekten Datentypen
+    const nfcData = {
-        const nfcData = {
+        location: String(selectedText)
-            location: String(selectedText)
+    };
-        };
 
-
+    if (socket?.readyState === WebSocket.OPEN) {
-        if (socket?.readyState === WebSocket.OPEN) {
+        const writeButton = document.getElementById("writeLocationNfcButton");
-            const writeButton = document.getElementById("writeLocationNfcButton");
+        writeButton.classList.add("writing");
-            writeButton.classList.add("writing");
+        writeButton.textContent = "Writing";
-            writeButton.textContent = "Writing";
+        socket.send(JSON.stringify({
-            socket.send(JSON.stringify({
+            type: 'writeNfcTag',
-                type: 'writeNfcTag',
+            tagType: 'location',
-                tagType: 'location',
+            payload: nfcData
-                payload: nfcData
+        }));
-            }));
+    } else {
-        } else {
+        alert('Not connected to Server. Please check connection.');
-            alert('Not connected to Server. Please check connection.');
-        }
     }
 }
 

html/upgrade.html

@@ -56,7 +56,7 @@
 
         <div class="update-options">
             <div class="update-section">
-                <h2>1) Firmware Update</h2>
+                <h2>Firmware Update</h2>
                 <p>Upload a new firmware file (upgrade_filaman_firmware_*.bin)</p>
                 <div class="update-form">
                     <form id="firmwareForm" enctype='multipart/form-data' data-type="firmware">
@@ -67,7 +67,7 @@
             </div>
 
             <div class="update-section">
-                <h2>2) Webpage Update</h2>
+                <h2>Webpage Update</h2>
                 <p>Upload a new webpage file (upgrade_filaman_website_*.bin)</p>
                 <div class="update-form">
                     <form id="webpageForm" enctype='multipart/form-data' data-type="webpage">

platformio.ini

@@ -9,8 +9,8 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [common]
-version = "2.0.0-beta1"
+version = "1.5.7"
-to_old_version = "2.0.0"
+to_old_version = "1.5.0"
 
 ##
 [env:esp32dev]
@@ -23,7 +23,10 @@ monitor_speed = 115200
 lib_deps =
     tzapu/WiFiManager @ ^2.0.17
     https://github.com/me-no-dev/ESPAsyncWebServer.git#master
+    #me-no-dev/AsyncTCP @ ^1.1.1
     https://github.com/esphome/AsyncTCP.git
+    #mathieucarbou/ESPAsyncWebServer @ ^3.6.0
+    #esp32async/AsyncTCP @ ^3.3.5
     bogde/HX711 @ ^0.7.5
     adafruit/Adafruit SSD1306 @ ^2.5.13
     adafruit/Adafruit GFX Library @ ^1.11.11
@@ -33,6 +36,7 @@ lib_deps =
     digitaldragon/SSLClient @ ^1.3.2
     
 ; Enable SPIFFS upload
+#board_build.filesystem = spiffs
 board_build.filesystem = littlefs
 ; Update partition settings
 board_build.partitions = partitions.csv

src/api.h

@@ -20,9 +20,7 @@ typedef enum {
     API_REQUEST_SPOOL_LOCATION_UPDATE,
     API_REQUEST_VENDOR_CREATE,
     API_REQUEST_VENDOR_CHECK,
-    API_REQUEST_FILAMENT_CHECK,
+    API_REQUEST_FILAMENT_CHECK
-    API_REQUEST_FILAMENT_CREATE,
-    API_REQUEST_SPOOL_CREATE
 } SpoolmanApiRequestType;
 
 extern volatile spoolmanApiStateType spoolmanApiState;
@@ -32,9 +30,12 @@ extern bool octoEnabled;
 extern bool sendOctoUpdate;
 extern String octoUrl;
 extern String octoToken;
+extern uint16_t createdVendorId;  // ID of newly created vendor
+extern uint16_t foundVendorId;    // ID of found vendor
+extern uint16_t foundFilamentId;  // ID of found filament
 extern bool spoolmanConnected;
 
-bool checkSpoolmanInstance();
+bool checkSpoolmanInstance(const String& url);
 bool saveSpoolmanUrl(const String& url, bool octoOn, const String& octoWh, const String& octoTk);
 String loadSpoolmanUrl(); // Neue Funktion zum Laden der URL
 bool checkSpoolmanExtraFields(); // Neue Funktion zum Überprüfen der Extrafelder
@@ -45,6 +46,12 @@ uint8_t updateSpoolLocation(String spoolId, String location);
 bool initSpoolman(); // Neue Funktion zum Initialisieren von Spoolman
 bool updateSpoolBambuData(String payload); // Neue Funktion zum Aktualisieren der Bambu-Daten
 bool updateSpoolOcto(int spoolId); // Neue Funktion zum Aktualisieren der Octo-Daten
-bool createBrandFilament(JsonDocument& payload, String uidString);
+uint16_t checkVendor(String vendor); // Check if vendor exists, return ID
+uint16_t createVendor(String vendor); // Create vendor, return ID
+uint16_t checkFilament(); // Check if filament exists, return ID
+bool createFilament(); // Create filament
+uint16_t checkSpool(); // Check if spool exists, return ID
+bool createSpool(); // Create spool
+void createFilamentFabrik(JsonDocument payload);
 
 #endif

src/bambu.cpp

@@ -33,7 +33,6 @@ AMSData ams_data[MAX_AMS];  // Definition des Arrays;
 bool removeBambuCredentials() {
     if (BambuMqttTask) {
         vTaskDelete(BambuMqttTask);
-        BambuMqttTask = NULL;
     }
     
     Preferences preferences;
@@ -64,7 +63,6 @@ bool removeBambuCredentials() {
 bool saveBambuCredentials(const String& ip, const String& serialnr, const String& accesscode, bool autoSend, const String& autoSendTime) {
     if (BambuMqttTask) {
         vTaskDelete(BambuMqttTask);
-        BambuMqttTask = NULL;
     }
 
     bambuCredentials.ip = ip.c_str();
@@ -595,7 +593,6 @@ void reconnect() {
                 Serial.println("Disable Bambu MQTT Task after 5 retries");
                 //vTaskSuspend(BambuMqttTask);
                 vTaskDelete(BambuMqttTask);
-                BambuMqttTask = NULL;
                 break;
             }
 
@@ -684,7 +681,6 @@ void bambu_restart() {
 
     if (BambuMqttTask) {
         vTaskDelete(BambuMqttTask);
-        BambuMqttTask = NULL;
         delay(10);
     }
     setupMqtt();

src/config.cpp

@@ -16,6 +16,7 @@ const uint8_t LOADCELL_DOUT_PIN = 16; //16;
 const uint8_t LOADCELL_SCK_PIN = 17; //17;
 const uint8_t calVal_eepromAdress = 0;
 const uint16_t SCALE_LEVEL_WEIGHT = 500;
+uint16_t defaultScaleCalibrationValue = 430;
 // ***** HX711
 
 // ***** TTP223 (Touch Sensor)

src/config.h

@@ -3,39 +3,36 @@
 
 #include <Arduino.h>
 
-#define BAMBU_DEFAULT_AUTOSEND_TIME         60
+#define BAMBU_DEFAULT_AUTOSEND_TIME 60
 
-#define NVS_NAMESPACE_API                   "api"
-#define NVS_KEY_SPOOLMAN_URL                "spoolmanUrl"
-#define NVS_KEY_OCTOPRINT_ENABLED           "octoEnabled"
-#define NVS_KEY_OCTOPRINT_URL               "octoUrl"
-#define NVS_KEY_OCTOPRINT_TOKEN             "octoToken"
 
-#define NVS_NAMESPACE_BAMBU                 "bambu"
+#define NVS_NAMESPACE_API "api"
-#define NVS_KEY_BAMBU_IP                    "bambuIp"
+#define NVS_KEY_SPOOLMAN_URL "spoolmanUrl"
-#define NVS_KEY_BAMBU_ACCESSCODE            "bambuCode"
+#define NVS_KEY_OCTOPRINT_ENABLED "octoEnabled"
-#define NVS_KEY_BAMBU_SERIAL                "bambuSerial"
+#define NVS_KEY_OCTOPRINT_URL "octoUrl"
-#define NVS_KEY_BAMBU_AUTOSEND_ENABLE       "autosendEnable"
+#define NVS_KEY_OCTOPRINT_TOKEN "octoToken"
-#define NVS_KEY_BAMBU_AUTOSEND_TIME         "autosendTime"
 
-#define NVS_NAMESPACE_SCALE                 "scale"
+#define NVS_NAMESPACE_BAMBU "bambu"
-#define NVS_KEY_CALIBRATION                 "cal_value"
+#define NVS_KEY_BAMBU_IP "bambuIp"
-#define NVS_KEY_AUTOTARE                    "auto_tare"
+#define NVS_KEY_BAMBU_ACCESSCODE "bambuCode"
-#define SCALE_DEFAULT_CALIBRATION_VALUE     430.0f;
+#define NVS_KEY_BAMBU_SERIAL "bambuSerial"
+#define NVS_KEY_BAMBU_AUTOSEND_ENABLE "autosendEnable"
+#define NVS_KEY_BAMBU_AUTOSEND_TIME "autosendTime"
 
-#define BAMBU_USERNAME                      "bblp"
+#define NVS_NAMESPACE_SCALE "scale"
+#define NVS_KEY_CALIBRATION "cal_value"
+#define NVS_KEY_AUTOTARE "auto_tare"
 
-#define OLED_RESET                          -1      // Reset pin # (or -1 if sharing Arduino reset pin)
+#define BAMBU_USERNAME "bblp"
-#define SCREEN_ADDRESS                      0x3CU   // See datasheet for Address; 0x3D for 128x64, 0x3C for 128x32
+
-#define SCREEN_WIDTH                        128U
+#define OLED_RESET                  -1      // Reset pin # (or -1 if sharing Arduino reset pin)
-#define SCREEN_HEIGHT                       64U
+#define SCREEN_ADDRESS              0x3CU   // See datasheet for Address; 0x3D for 128x64, 0x3C for 128x32
-#define SCREEN_TOP_BAR_HEIGHT               16U
+#define SCREEN_WIDTH                128U
-#define SCREEN_PROGRESS_BAR_HEIGHT          12U
+#define SCREEN_HEIGHT               64U
-#define DISPLAY_BOOT_TEXT                   "FilaMan"
+#define SCREEN_TOP_BAR_HEIGHT       16U
+#define SCREEN_PROGRESS_BAR_HEIGHT  12U
+#define DISPLAY_BOOT_TEXT           "FilaMan"
 
-#define WIFI_CHECK_INTERVAL                 60000U
-#define DISPLAY_UPDATE_INTERVAL             1000U
-#define SPOOLMAN_HEALTHCHECK_INTERVAL       60000U
 
 extern const uint8_t PN532_IRQ;
 extern const uint8_t PN532_RESET;

src/display.cpp

@@ -235,7 +235,7 @@ void oledShowIcon(const char* icon) {
     display.display();
 }
 
-void oledShowProgressBar(const uint8_t step, const uint8_t numSteps, const char* largeText, const char* statusMessage) {
+void oledShowProgressBar(const uint8_t step, const uint8_t numSteps, const char* largeText, const char* statusMessage){
     assert(step <= numSteps);
 
     // clear data and bar area

src/main.cpp

@@ -97,8 +97,7 @@ int16_t lastWeight = 0;
 
 // WIFI check variables
 unsigned long lastWifiCheckTime = 0;
-unsigned long lastTopRowUpdateTime = 0;
+const unsigned long wifiCheckInterval = 60000; // Überprüfe alle 60 Sekunden (60000 ms)
-unsigned long lastSpoolmanHealcheckTime = 0;
 
 // Button debounce variables
 unsigned long lastButtonPress = 0;
@@ -116,23 +115,17 @@ void loop() {
   }
 
   // Überprüfe regelmäßig die WLAN-Verbindung
-  if (intervalElapsed(currentMillis, lastWifiCheckTime, WIFI_CHECK_INTERVAL)) 
+  if (intervalElapsed(currentMillis, lastWifiCheckTime, wifiCheckInterval)) 
   {
     checkWiFiConnection();
   }
 
   // Periodic display update
-  if (intervalElapsed(currentMillis, lastTopRowUpdateTime, DISPLAY_UPDATE_INTERVAL)) 
+  if (intervalElapsed(currentMillis, lastWifiCheckTime, 1000)) 
   {
     oledShowTopRow();
   }
 
-  // Periodic spoolman health check
-  if (intervalElapsed(currentMillis, lastSpoolmanHealcheckTime, SPOOLMAN_HEALTHCHECK_INTERVAL)) 
-  {
-    checkSpoolmanInstance();
-  }
-
   // Wenn Bambu auto set Spool aktiv
   if (bambuCredentials.autosend_enable && autoSetToBambuSpoolId > 0) 
   {
@@ -163,97 +156,94 @@ void loop() {
     }
   }
 
-  // If scale is not calibrated, only show a warning
+  // Wenn Waage nicht Kalibriert
-  if (!scaleCalibrated) 
+  if (scaleCalibrated == 3) 
   {
-    // Do not show the warning if the calibratin process is onging
+    oledShowMessage("Scale not calibrated!");
-    if(!scaleCalibrationActive){
+    vTaskDelay(5000 / portTICK_PERIOD_MS);
-      oledShowMessage("Scale not calibrated");
+    yield();
-      vTaskDelay(1000 / portTICK_PERIOD_MS);
+    esp_task_wdt_reset();
-    }
+    
+    return;
   } 
-  else 
+
+  // Ausgabe der Waage auf Display
+  if(pauseMainTask == 0)
   {
-    // Ausgabe der Waage auf Display
+    if (mainTaskWasPaused || (weight != lastWeight && nfcReaderState == NFC_IDLE && (!bambuCredentials.autosend_enable || autoSetToBambuSpoolId == 0)))
-    if(pauseMainTask == 0)
     {
-      if (mainTaskWasPaused || (weight != lastWeight && nfcReaderState == NFC_IDLE && (!bambuCredentials.autosend_enable || autoSetToBambuSpoolId == 0)))
+      (weight < 2) ? ((weight < -2) ? oledShowMessage("!! -0") : oledShowWeight(0)) : oledShowWeight(weight);
-      {
+    }
-        (weight < 2) ? ((weight < -2) ? oledShowMessage("!! -0") : oledShowWeight(0)) : oledShowWeight(weight);
+    mainTaskWasPaused = false;
-      }
+  }
-      mainTaskWasPaused = false;
+  else
+  {
+    mainTaskWasPaused = true;
+  }
+
+
+  // Wenn Timer abgelaufen und nicht gerade ein RFID-Tag geschrieben wird
+  if (currentMillis - lastWeightReadTime >= weightReadInterval && nfcReaderState < NFC_WRITING)
+  {
+    lastWeightReadTime = currentMillis;
+
+    // Prüfen ob die Waage korrekt genullt ist
+    // Abweichung von 2g ignorieren
+    if (autoTare && (weight > 2 && weight < 7) || weight < -2)
+    {
+      scale_tare_counter++;
     }
     else
     {
-      mainTaskWasPaused = true;
+      scale_tare_counter = 0;
     }
 
-
+    // Prüfen ob das Gewicht gleich bleibt und dann senden
-    // Wenn Timer abgelaufen und nicht gerade ein RFID-Tag geschrieben wird
+    if (abs(weight - lastWeight) <= 2 && weight > 5)
-    if (currentMillis - lastWeightReadTime >= weightReadInterval && nfcReaderState < NFC_WRITING)
     {
-      lastWeightReadTime = currentMillis;
+      weigthCouterToApi++;
-
+    } 
-      // Prüfen ob die Waage korrekt genullt ist
+    else 
-      // Abweichung von 2g ignorieren
-      if (autoTare && (weight > 2 && weight < 7) || weight < -2)
-      {
-        scale_tare_counter++;
-      }
-      else
-      {
-        scale_tare_counter = 0;
-      }
-
-      // Prüfen ob das Gewicht gleich bleibt und dann senden
-      if (abs(weight - lastWeight) <= 2 && weight > 5)
-      {
-        weigthCouterToApi++;
-      } 
-      else 
-      {
-        weigthCouterToApi = 0;
-        weightSend = 0;
-      }
-    }
-
-    // reset weight counter after writing tag
-    // TBD: what exactly is the logic behind this?
-    if (currentMillis - lastWeightReadTime >= weightReadInterval && nfcReaderState != NFC_IDLE && nfcReaderState != NFC_READ_SUCCESS)
     {
       weigthCouterToApi = 0;
+      weightSend = 0;
     }
-    
+  }
-    lastWeight = weight;
 
-    // Wenn ein Tag mit SM id erkannte wurde und der Waage Counter anspricht an SM Senden
+  // reset weight counter after writing tag
-    if (activeSpoolId != "" && weigthCouterToApi > 3 && weightSend == 0 && nfcReaderState == NFC_READ_SUCCESS && tagProcessed == false && spoolmanApiState == API_IDLE) 
+  // TBD: what exactly is the logic behind this?
+  if (currentMillis - lastWeightReadTime >= weightReadInterval && nfcReaderState != NFC_IDLE && nfcReaderState != NFC_READ_SUCCESS)
+  {
+    weigthCouterToApi = 0;
+  }
+  
+  lastWeight = weight;
+
+  // Wenn ein Tag mit SM id erkannte wurde und der Waage Counter anspricht an SM Senden
+  if (activeSpoolId != "" && weigthCouterToApi > 3 && weightSend == 0 && nfcReaderState == NFC_READ_SUCCESS && tagProcessed == false && spoolmanApiState == API_IDLE) {
+    // set the current tag as processed to prevent it beeing processed again
+    tagProcessed = true;
+
+    if (updateSpoolWeight(activeSpoolId, weight)) 
     {
-      // set the current tag as processed to prevent it beeing processed again
+      weightSend = 1;
-      tagProcessed = true;
+      
-
-      if (updateSpoolWeight(activeSpoolId, weight)) 
-      {
-        weightSend = 1;
-        
-        // Set Bambu spool ID for auto-send if enabled
-        if (bambuCredentials.autosend_enable) 
-        {
-          autoSetToBambuSpoolId = activeSpoolId.toInt();
-        }
-      }
-      else
-      {
-        oledShowIcon("failed");
-        vTaskDelay(2000 / portTICK_PERIOD_MS);
-      }
     }
+    else
+    {
+      oledShowIcon("failed");
+      vTaskDelay(2000 / portTICK_PERIOD_MS);
+    }
+  }
 
-    if(octoEnabled && sendOctoUpdate && spoolmanApiState == API_IDLE)
+  if(sendOctoUpdate && spoolmanApiState == API_IDLE){
+    autoSetToBambuSpoolId = activeSpoolId.toInt();
+
+    if(octoEnabled) 
     {
       updateSpoolOcto(autoSetToBambuSpoolId);
-      sendOctoUpdate = false;
     }
+    sendOctoUpdate = false;
   }
   
   esp_task_wdt_reset();

src/nfc.h

@@ -16,7 +16,6 @@ typedef enum{
 void startNfc();
 void scanRfidTask(void * parameter);
 void startWriteJsonToTag(const bool isSpoolTag, const char* payload);
-bool quickSpoolIdCheck(String uidString);
 
 extern TaskHandle_t RfidReaderTask;
 extern String nfcJsonData;
@@ -24,7 +23,6 @@ extern String activeSpoolId;
 extern String lastSpoolId;
 extern volatile nfcReaderStateType nfcReaderState;
 extern volatile bool pauseBambuMqttTask;
-extern volatile bool nfcWriteInProgress;
 extern bool tagProcessed;
 
 

src/scale.cpp

@@ -17,9 +17,8 @@ uint8_t weigthCouterToApi = 0;
 uint8_t scale_tare_counter = 0;
 bool scaleTareRequest = false;
 uint8_t pauseMainTask = 0;
-bool scaleCalibrated;
+uint8_t scaleCalibrated = 1;
 bool autoTare = true;
-bool scaleCalibrationActive = false;
 
 // ##### Funktionen für Waage #####
 uint8_t setAutoTare(bool autoTareValue) {
@@ -89,13 +88,7 @@ void start_scale(bool touchSensorConnected) {
   // NVS lesen
   Preferences preferences;
   preferences.begin(NVS_NAMESPACE_SCALE, true); // true = readonly
-  if(preferences.isKey(NVS_KEY_CALIBRATION)){
+  calibrationValue = preferences.getFloat(NVS_KEY_CALIBRATION, defaultScaleCalibrationValue);
-    calibrationValue = preferences.getFloat(NVS_KEY_CALIBRATION);
-    scaleCalibrated = true;
-  }else{
-    calibrationValue = SCALE_DEFAULT_CALIBRATION_VALUE;
-    scaleCalibrated = false;
-  }
   
   // auto Tare
   // Wenn Touch Sensor verbunden, dann autoTare auf false setzen
@@ -110,6 +103,18 @@ void start_scale(bool touchSensorConnected) {
 
   scale.begin(LOADCELL_DOUT_PIN, LOADCELL_SCK_PIN);
 
+  if (isnan(calibrationValue) || calibrationValue < 1) {
+    calibrationValue = defaultScaleCalibrationValue;
+    scaleCalibrated = 0;
+
+    oledShowMessage("Scale not calibrated!");
+    for (uint16_t i = 0; i < 50000; i++) {
+      yield();
+      vTaskDelay(pdMS_TO_TICKS(1));
+      esp_task_wdt_reset();
+    }
+  }
+
   oledShowProgressBar(6, 7, DISPLAY_BOOT_TEXT, "Tare scale");
   for (uint16_t i = 0; i < 2000; i++) {
     yield();
@@ -117,13 +122,12 @@ void start_scale(bool touchSensorConnected) {
     esp_task_wdt_reset();
   }
 
-  while(!scale.is_ready()) {
+  if (scale.wait_ready_timeout(1000))
-    vTaskDelay(pdMS_TO_TICKS(5000));
+  {
+    scale.set_scale(calibrationValue); // this value is obtained by calibrating the scale with known weights; see the README for details
+    scale.tare();
   }
 
-  scale.set_scale(calibrationValue); // this value is obtained by calibrating the scale with known weights; see the README for details
-  scale.tare();
-
   // Display Gewicht
   oledShowWeight(0);
 
@@ -148,8 +152,6 @@ uint8_t calibrate_scale() {
   uint8_t returnState = 0;
   float newCalibrationValue;
 
-  scaleCalibrationActive = true;
-
   vTaskSuspend(RfidReaderTask);
   vTaskSuspend(ScaleTask);
 
@@ -226,7 +228,6 @@ uint8_t calibrate_scale() {
         esp_task_wdt_reset();
       }
 
-      scaleCalibrated = true;
       returnState = 1;
     }
     else
@@ -261,7 +262,6 @@ uint8_t calibrate_scale() {
   vTaskResume(ScaleTask);
   pauseBambuMqttTask = false;
   pauseMainTask = 0;
-  scaleCalibrationActive = false;
 
   return returnState;
 }

src/scale.h

@@ -15,9 +15,8 @@ extern uint8_t weigthCouterToApi;
 extern uint8_t scale_tare_counter;
 extern uint8_t scaleTareRequest;
 extern uint8_t pauseMainTask;
-extern bool scaleCalibrated;
+extern uint8_t scaleCalibrated;
 extern bool autoTare;
-extern bool scaleCalibrationActive;
 
 extern TaskHandle_t ScaleTask;
 

src/website.cpp

@@ -48,15 +48,9 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp
     } else if (type == WS_EVT_PONG) {
         Serial.printf("WebSocket Client #%u pong\n", client->id());
     } else if (type == WS_EVT_DATA) {
+        String message = String((char*)data);
         JsonDocument doc;
-        DeserializationError error = deserializeJson(doc, (char*)data, len);
+        deserializeJson(doc, message);
-        //String message = String((char*)data);
-        //deserializeJson(doc, message);
-
-        if (error) {
-            Serial.println("JSON deserialization failed: " + String(error.c_str()));
-            return;
-        }
 
         if (doc["type"] == "heartbeat") {
             // Sende Heartbeat-Antwort