fix: enhance weight display logic for negative values

refactor: simplify filament names in JSON configuration
refactor: update findFilamentIdx to return structured result and improve type searching logic
2025-02-24 12:28:18 +01:00 · 2025-02-24 12:21:27 +01:00 · 2025-02-24 12:11:27 +01:00 · 2025-02-24 10:10:15 +01:00 · 2025-02-24 09:36:28 +01:00 · 2025-02-24 09:20:44 +01:00
19 changed files with 412 additions and 182 deletions
--- a/.github/workflows/gitea-release.yml
+++ b/.github/workflows/gitea-release.yml
@@ -6,13 +6,17 @@ on:
      GITEA_TOKEN:
        description: 'Token für Gitea API-Zugriff'
        required: true
-      FTP_PASSWORD:
-        description: 'FTP Password for firmware upload'
-        required: true
+
+    outputs:
+      version:
+        description: 'The version that was released'
+        value: ${{ jobs.create-release.outputs.version }}

 jobs:
  create-release:
    runs-on: ubuntu-latest
+    outputs:
+      version: ${{ steps.get_version.outputs.VERSION }}
    steps:
    - uses: actions/checkout@v4
      with:
@@ -202,16 +206,3 @@ jobs:
            fi
          fi
        done
-
-    - name: Upload Firmware via FTP
-      if: success()
-      uses: sebastianpopp/ftp-action@releases/v2
-      with:
-        host: "filaman.app"
-        port: 21
-        user: ${{ secrets.FTP_USER }}
-        password: ${{ secrets.FTP_PASSWORD }}
-        forceSsl: true
-        localDir: ".pio/build/esp32dev"
-        remoteDir: "/"
-        options: "set ftp:ssl-force true; set ftp:ssl-protect-data true; set ssl:verify-certificate no; set ftp:ssl-auth TLS; put filaman_full_*.bin -o filaman_full.bin"
--- a/.github/workflows/github-release.yml
+++ b/.github/workflows/github-release.yml
@@ -150,3 +150,36 @@ jobs:
          echo "Error: No files found to upload"
          exit 1
        fi
+
+    - name: Install lftp
+      run: sudo apt-get install -y lftp
+        
+    - name: Upload Firmware via FTP
+      if: success()
+      env:
+        FTP_PASSWORD: ${{ vars.FTP_PASSWORD }}
+        FTP_USER: ${{ vars.FTP_USER }}
+        FTP_HOST: ${{ vars.FTP_HOST }}
+        VERSION: ${{ steps.get_version.outputs.VERSION }}
+      run: |
+        echo "Environment variables:"
+        env | grep -E '^FTP_' | while read -r line; do
+          var_name=$(echo "$line" | cut -d= -f1)
+          var_value=$(echo "$line" | cut -d= -f2-)
+          echo "$var_name is $(if [ -n "$var_value" ]; then echo "set"; else echo "empty"; fi)"
+        done
+        
+        cd .pio/build/esp32dev
+        if [ -n "$FTP_USER" ] && [ -n "$FTP_PASSWORD" ] && [ -n "$FTP_HOST" ]; then
+          echo "All FTP credentials are present, attempting upload..."
+          lftp -c "set ssl:verify-certificate no; \
+                    set ftp:ssl-protect-data true; \
+                    set ftp:ssl-force true; \
+                    set ssl:check-hostname false; \
+                    set ftp:ssl-auth TLS; \
+                    open -u $FTP_USER,$FTP_PASSWORD $FTP_HOST; \
+                    put -O / filaman_full_${VERSION}.bin -o filaman_full.bin"
+        else
+          echo "Error: Some FTP credentials are missing"
+          exit 1
+        fi
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,153 @@
 # Changelog

+## [1.3.92] - 2025-02-24
+### Changed
+- update webpages for version v1.3.92
+- remove commented-out code in setBambuSpool function
+- update installation instructions and formatting in README files
+
+### Fixed
+- configure CPU frequency settings in setup function only for testing
+- update comment to clarify NVS reading process
+- adjust weight display logic to handle cases for weight less than 2
+- update weight display logic to handle negative and specific weight cases
+
+
+## [1.3.91] - 2025-02-23
+### Added
+- update GitHub Actions workflow for FTP firmware upload with improved credential checks
+
+### Changed
+- update webpages for version v1.3.91
+
+
+## [1.3.90] - 2025-02-23
+### Added
+- update index.html for improved content structure and additional links
+- improve UI for Spoolman and Bambu Lab printer credentials, enhancing layout and styling
+- update README files with HSPI default PINs and add ESP32 pin diagram
+- implement scale calibration checks and update start_scale function to return calibration status
+- add FTP upload functionality to GitHub release workflow and update installation instructions in README
+
+### Changed
+- update webpages for version v1.3.90
+
+### Fixed
+- remove debug secrets check from Gitea release workflow
+
+
+## [1.3.89] - 2025-02-23
+### Changed
+- update webpages for version v1.3.89
+
+### Fixed
+- update Gitea release workflow to use vars for FTP credentials
+
+
+## [1.3.88] - 2025-02-23
+### Changed
+- update webpages for version v1.3.88
+
+### Fixed
+- update Gitea release workflow to use secrets for FTP credentials
+
+
+## [1.3.87] - 2025-02-23
+### Changed
+- update webpages for version v1.3.87
+
+### Fixed
+- enhance FTP upload workflow with credential checks and version output
+
+
+## [1.3.86] - 2025-02-23
+### Changed
+- update webpages for version v1.3.86
+
+### Fixed
+- streamline FTP credentials usage in Gitea release workflow
+
+
+## [1.3.85] - 2025-02-23
+### Added
+- add FTP_USER variable for Gitea release workflow
+
+### Changed
+- update webpages for version v1.3.85
+
+
+## [1.3.84] - 2025-02-23
+### Added
+- add FTP_HOST variable for firmware upload in Gitea release workflow
+
+### Changed
+- update webpages for version v1.3.84
+
+
+## [1.3.83] - 2025-02-23
+### Changed
+- update webpages for version v1.3.83
+
+### Fixed
+- correct variable interpolation for FTP credentials in Gitea release workflow
+
+
+## [1.3.82] - 2025-02-23
+### Added
+- update Gitea release workflow to use variable interpolation for FTP credentials
+
+### Changed
+- update webpages for version v1.3.82
+
+
+## [1.3.81] - 2025-02-23
+### Added
+- update Gitea release workflow to use environment variables for FTP credentials and version
+
+### Changed
+- update webpages for version v1.3.81
+
+
+## [1.3.80] - 2025-02-23
+### Added
+- add FTP_USER and FTP_PASSWORD secrets for firmware upload in Gitea release workflow
+
+### Changed
+- update webpages for version v1.3.80
+
+
+## [1.3.79] - 2025-02-23
+### Added
+- add FTP_USER input for firmware upload in Gitea release workflow
+
+### Changed
+- update webpages for version v1.3.79
+
+
+## [1.3.78] - 2025-02-23
+### Changed
+- update webpages for version v1.3.78
+
+### Fixed
+- change FTP protocol from FTPS to FTP for file upload in workflow
+
+
+## [1.3.77] - 2025-02-23
+### Changed
+- update webpages for version v1.3.77
+
+### Fixed
+- replace ncftp with lftp for secure firmware upload
+
+
+## [1.3.76] - 2025-02-23
+### Changed
+- update webpages for version v1.3.76
+
+### Fixed
+- replace FTP action with curl for secure firmware upload and install ncftp
+
+
 ## [1.3.75] - 2025-02-23
 ### Changed
 - update webpages for version v1.3.75
--- a/README.de.md
+++ b/README.de.md
@@ -71,10 +71,15 @@ Deutsches Erklärvideo: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62zaO
 | OLED SCL          | 22        |
 | PN532 IRQ         | 32        |
 | PN532 RESET       | 33        |
-| PN532 SCK         | 14        |
-| PN532 MOSI        | 13        |
-| PN532 MISO        | 12        |
-| PN532 CS/SS       | 15        |
+| PN532 SDA         | 21        |
+| PN532 SCL         | 22        |
+
+**Achte darauf, dass am PN532 die DIP-Schalter auf I2C gestellt sind**
+
+![Wiring](./img/Schaltplan.png)
+
+![myWiring](./img/IMG_2589.jpeg)
+![myWiring](./img/IMG_2590.jpeg)

 ## Software-Abhängigkeiten

@@ -101,7 +106,20 @@ Deutsches Erklärvideo: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62zaO
  - PN532 NFC Modul
  - Verbindungskabel

-### Schritt-für-Schritt Installation
+## Schritt-für-Schritt Installation
+### Einfache Installation
+1. **Gehe auf [FilaMan Installer](https://www.filaman.app/installer.html)**
+
+2. **Stecke dein ESP an den Rechner und klicke Connect**
+
+3. **Wähle dein Device Port und klicke Intall**
+
+4. **Ersteinrichtung:**
+    - Mit dem "FilaMan" WLAN-Zugangspunkt verbinden.
+    - WLAN-Einstellungen über das Konfigurationsportal vornehmen.
+    - Weboberfläche unter `http://filaman.local` oder der IP-Adresse aufrufen.
+
+### Compile by yourself
 1. **Repository klonen:**
    ```bash
    git clone https://github.com/ManuelW77/Filaman.git
--- a/README.md
+++ b/README.md
@@ -75,10 +75,15 @@ german explanatory video: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62z
 | OLED SCL          | 22        |
 | PN532 IRQ         | 32        |
 | PN532 RESET       | 33        |
-| PN532 SCK  	    | 14        |
-| PN532 MOSI    	| 13        |
-| PN532 MISO       	| 12        |
-| PN532 CS/SS       | 15        |
+| PN532 SDA         | 21        |
+| PN532 SCL         | 22        |
+
+**Make sure that the DIP switches on the PN532 are set to I2C**
+
+![Wiring](./img/Schaltplan.png)
+
+![myWiring](./img/IMG_2589.jpeg)
+![myWiring](./img/IMG_2590.jpeg)

 ## Software Dependencies

@@ -91,9 +96,9 @@ german explanatory video: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62z
 - `Adafruit_SSD1306`: OLED display control
 - `HX711`: Load cell communication

-## Installation
+### Installation

-### Prerequisites
+## Prerequisites
 - **Software:**
  - [PlatformIO](https://platformio.org/) in VS Code
  - [Spoolman](https://github.com/Donkie/Spoolman) instance
@@ -105,7 +110,20 @@ german explanatory video: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62z
  - PN532 NFC Module
  - Connecting wires

-### Step-by-Step Installation
+## Step-by-Step Installation
+### Easy Installation
+1. **Go to [FilaMan Installer](https://www.filaman.app/installer.html)**
+
+2. **Plug you device in and push Connect button**
+
+3. **Select your Device Port and push Intall**
+
+4. **Initial Setup:**
+    - Connect to the "FilaMan" WiFi access point.
+    - Configure WiFi settings through the captive portal.
+    - Access the web interface at `http://filaman.local` or the IP address.
+
+### Compile by yourself
 1. **Clone the Repository:**
    ```bash
    git clone https://github.com/ManuelW77/Filaman.git
@@ -124,25 +142,6 @@ german explanatory video: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62z
    - Configure WiFi settings through the captive portal.
    - Access the web interface at `http://filaman.local` or the IP address.

-## GitHub Actions Configuration
-
-### Required Secrets for Gitea Releases
-
-When using Gitea as your repository host, you need to configure the following secrets in your repository:
-
- `GITEA_API_URL`: The base URL of your Gitea instance, including protocol (e.g., `https://git.example.com`)
- `GITEA_TOKEN`: Your Gitea access token with permissions to create releases
- `GITEA_REPOSITORY`: The repository name in format `owner/repo` (e.g., `username/filaman`)
-
-Example values:
-```
-GITEA_API_URL=https://git.example.com
-GITEA_TOKEN=abcdef1234567890
-GITEA_REPOSITORY=username/filaman
-```
-
-Make sure to set these secrets in your repository settings under Settings > Secrets and Variables > Actions.
-
 ## Documentation

 ### Relevant Links
--- a/html/bambu_filaments.json
+++ b/html/bambu_filaments.json
@@ -1,7 +1,31 @@
 {
-    "GFU99": "Generic TPU",
-    "GFN99": "Generic PA",
-    "GFN98": "Generic PA-CF",
+    "GFU99": "TPU",
+    "GFN99": "PA",
+    "GFN98": "PA-CF",
+    "GFL99": "PLA",
+    "GFL96": "PLA Silk",
+    "GFL98": "PLA-CF",
+    "GFL95": "PLA High Speed",
+    "GFG99": "PETG",
+    "GFG98": "PETG-CF",
+    "GFG97": "PCTG",
+    "GFB99": "ABS",
+    "GFC99": "PC",
+    "GFB98": "ASA",
+    "GFS99": "PVA",
+    "GFS98": "HIPS",
+    "GFT98": "PPS-CF",
+    "GFT97": "PPS",
+    "GFN97": "PPA-CF",
+    "GFN96": "PPA-GF",
+    "GFP99": "PE",
+    "GFP98": "PE-CF",
+    "GFP97": "PP",
+    "GFP96": "PP-CF",
+    "GFP95": "PP-GF",
+    "GFR99": "EVA",
+    "GFR98": "PHA",
+    "GFS97": "BVOH",
    "GFA01": "Bambu PLA Matte",
    "GFA00": "Bambu PLA Basic",
    "GFA09": "Bambu PLA Tough",
@@ -13,15 +37,11 @@
    "GFL03": "eSUN PLA+",
    "GFL01": "PolyTerra PLA",
    "GFL00": "PolyLite PLA",
-    "GFL99": "Generic PLA",
-    "GFL96": "Generic PLA Silk",
-    "GFL98": "Generic PLA-CF",
    "GFA50": "Bambu PLA-CF",
    "GFS02": "Bambu Support For PLA",
    "GFA11": "Bambu PLA Aero",
    "GFL04": "Overture PLA",
    "GFL05": "Overture Matte PLA",
-    "GFL95": "Generic PLA High Speed",
    "GFA12": "Bambu PLA Glow",
    "GFA13": "Bambu PLA Dynamic",
    "GFA15": "Bambu PLA Galaxy",
@@ -30,41 +50,21 @@
    "GFU00": "Bambu TPU 95A HF",
    "GFG00": "Bambu PETG Basic",
    "GFT01": "Bambu PET-CF",
-    "GFG99": "Generic PETG",
-    "GFG98": "Generic PETG-CF",
    "GFG50": "Bambu PETG-CF",
    "GFG60": "PolyLite PETG",
    "GFG01": "Bambu PETG Translucent",
-    "GFG97": "Generic PCTG",
    "GFB00": "Bambu ABS",
-    "GFB99": "Generic ABS",
    "GFB60": "PolyLite ABS",
    "GFB50": "Bambu ABS-GF",
    "GFC00": "Bambu PC",
-    "GFC99": "Generic PC",
-    "GFB98": "Generic ASA",
    "GFB01": "Bambu ASA",
    "GFB61": "PolyLite ASA",
    "GFB02": "Bambu ASA-Aero",
-    "GFS99": "Generic PVA",
    "GFS04": "Bambu PVA",
    "GFS01": "Bambu Support G",
    "GFN03": "Bambu PA-CF",
    "GFN04": "Bambu PAHT-CF",
    "GFS03": "Bambu Support For PA/PET",
    "GFN05": "Bambu PA6-CF",
-    "GFN08": "Bambu PA6-GF",
-    "GFS98": "Generic HIPS",
-    "GFT98": "Generic PPS-CF",
-    "GFT97": "Generic PPS",
-    "GFN97": "Generic PPA-CF",
-    "GFN96": "Generic PPA-GF",
-    "GFP99": "Generic PE",
-    "GFP98": "Generic PE-CF",
-    "GFP97": "Generic PP",
-    "GFP96": "Generic PP-CF",
-    "GFP95": "Generic PP-GF",
-    "GFR99": "Generic EVA",
-    "GFR98": "Generic PHA",
-    "GFS97": "Generic BVOH"
+    "GFN08": "Bambu PA6-GF"
 }
--- a/html/index.html
+++ b/html/index.html
@@ -47,7 +47,7 @@

 <!-- head -->

-    <div class="container">
+    <div class="content">
        <h1>FilaMan</h1>
        <p>Filament Management Tool</p>
        <p>Your smart solution for <strong>Filament Management</strong> in 3D printing.</p>
@@ -55,10 +55,11 @@
        <h2>About FilaMan</h2>
        <p>
            FilaMan is a tool designed to simplify filament spool management. It allows you to identify and weigh filament spools, 
-            automatically sync data with the self-hosted <a href="https://github.com/Donkie/Spoolman" target="_blank">Spoolman</a> platform, 
-            and ensure compatibility with <a href="https://github.com/spuder/OpenSpool" target="_blank">OpenSpool</a> for Bambu printers.
+            automatically sync data with the self-hosted <a href="https://github.com/Donkie/Spoolman" target="_blank">Spoolman</a> platform.
        </p>

+        <p>Get more information at <a href="https://www.filaman.app" target="_blank">https://www.filaman.app</a> and <a href="https://github.com/ManuelW77/Filaman" target="_blank">https://github.com/ManuelW77/Filaman</a>.</p>
+
        <div class="features">
            <div class="feature">
                <h3>Spool Identification</h3>
@@ -73,12 +74,6 @@
                <p>Works with OpenSpool to recognize and activate spools on Bambu printers.</p>
            </div>
        </div>
-
-        <h2>Future Plans</h2>
-        <p>
-            We are working on expanding compatibility to support smaller NFC tags like NTag213 
-            and developing custom software to enhance the OpenSpool experience.
-        </p>
    </div>
 </body>
 </html>
--- a/html/spoolman.html
+++ b/html/spoolman.html
@@ -95,12 +95,19 @@
    
    <div class="content">
        <h1>Spoolman API URL / Bambu Credentials</h1>
-        <label for="spoolmanUrl">Set URL/IP to your Spoolman-Instanz:</label>
+
+        <div class="card">
+            <div class="card-body">
+                <h5 class="card-title">Set URL/IP to your Spoolman-Instanz</h5>
                <input type="text" id="spoolmanUrl" placeholder="http://ip-or-url-of-your-spoolman-instanz:port">
                <button onclick="checkSpoolmanInstance()">Save Spoolman URL</button>
                <p id="statusMessage"></p>
+            </div>
+        </div>

-        <h2>Bambu Lab Printer Credentials</h2>
+        <div class="card">
+            <div class="card-body">
+                <h5 class="card-title">Bambu Lab Printer Credentials</h5>
                <div class="bambu-settings">
                    <div class="input-group">
                        <label for="bambuIp">Bambu Drucker IP-Adresse:</label>
@@ -118,5 +125,7 @@
                    <p id="bambuStatusMessage"></p>
                </div>
            </div>
+        </div>
+    </div>
 </body>
 </html>
--- a/html/style.css
+++ b/html/style.css
@@ -279,9 +279,10 @@ a:hover {

 /* Karten-Stil für optische Trennung */
 .card {
-    background: #f9f9f9;
+    background: var(--primary-color);
+    width: 500px;
    padding: 15px;
-    margin: 20px 0;
+    margin: 20px auto;
    border-radius: 8px;
    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
 }
@@ -959,7 +960,6 @@ input[type="submit"]:disabled,

 /* Bambu Settings Erweiterung */
 .bambu-settings {
-    background: white;
    padding: 20px;
    border-radius: 8px;
    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
--- a/img/ESP32-SPI-Pins.png
+++ b/img/ESP32-SPI-Pins.png
--- a/img/IMG_2589.jpeg
+++ b/img/IMG_2589.jpeg
--- a/img/IMG_2590.jpeg
+++ b/img/IMG_2590.jpeg
--- a/img/Schaltplan.png
+++ b/img/Schaltplan.png
--- a/platformio.ini
+++ b/platformio.ini
@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html

 [common]
-version = "1.3.75"
+version = "1.3.92"
 ##
 [env:esp32dev]
 platform = espressif32
--- a/src/bambu.cpp
+++ b/src/bambu.cpp
@@ -81,19 +81,23 @@ bool loadBambuCredentials() {
    return false;
 }

-String findFilamentIdx(String brand, String type) {
+struct FilamentResult {
+    String key;
+    String type;
+};
+
+FilamentResult findFilamentIdx(String brand, String type) {
    // JSON-Dokument für die Filament-Daten erstellen
    JsonDocument doc;
    
    // Laden der bambu_filaments.json
    if (!loadJsonValue("/bambu_filaments.json", doc)) {
        Serial.println("Fehler beim Laden der Filament-Daten");
-        return "GFL99"; // Fallback auf Generic PLA
+        return {"GFL99", "PLA"}; // Fallback auf Generic PLA
    }

+    // 1. Erst versuchen wir die exakte Brand + Type Kombination zu finden
    String searchKey;
-    
-    // 1. Suche nach Brand + Type Kombination
    if (brand == "Bambu" || brand == "Bambulab") {
        searchKey = "Bambu " + type;
    } else if (brand == "PolyLite") {
@@ -109,20 +113,43 @@ String findFilamentIdx(String brand, String type) {
    // Durchsuche alle Einträge nach der Brand + Type Kombination
    for (JsonPair kv : doc.as<JsonObject>()) {
        if (kv.value().as<String>() == searchKey) {
-            return kv.key().c_str();
+            return {kv.key().c_str(), kv.value().as<String>()};
        }
    }

-    // 2. Wenn nicht gefunden, suche nach Generic + Type
-    searchKey = "Generic " + type;
+    // 2. Wenn nicht gefunden, zerlege den type String in Wörter und suche nach jedem Wort
+    // Sammle alle vorhandenen Filamenttypen aus der JSON
+    std::vector<String> knownTypes;
    for (JsonPair kv : doc.as<JsonObject>()) {
-        if (kv.value().as<String>() == searchKey) {
-            return kv.key().c_str();
+        String value = kv.value().as<String>();
+        // Extrahiere den Typ ohne Markennamen
+        if (value.indexOf(" ") != -1) {
+            value = value.substring(value.indexOf(" ") + 1);
+        }
+        if (!value.isEmpty()) {
+            knownTypes.push_back(value);
+        }
+    }
+
+    // Zerlege den Input-Type in Wörter
+    String typeStr = type;
+    typeStr.trim();
+    
+    // Durchsuche für jedes bekannte Filament, ob es im Input vorkommt
+    for (const String& knownType : knownTypes) {
+        if (typeStr.indexOf(knownType) != -1) {
+            // Suche nach diesem Typ in der Original-JSON
+            for (JsonPair kv : doc.as<JsonObject>()) {
+                String value = kv.value().as<String>();
+                if (value.indexOf(knownType) != -1) {
+                    return {kv.key().c_str(), knownType};
+                }
+            }
        }
    }

    // 3. Wenn immer noch nichts gefunden, gebe GFL99 zurück (Generic PLA)
-    return "GFL99";
+    return {"GFL99", "PLA"};
 }

 bool sendMqttMessage(String payload) {
@@ -156,15 +183,22 @@ bool setBambuSpool(String payload) {
    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"].as<String>();
    String tray_info_idx = (doc["tray_info_idx"].as<String>() != "-1") ? doc["tray_info_idx"].as<String>() : "";
-    if (tray_info_idx == "") tray_info_idx = (brand != "" && type != "") ? findFilamentIdx(brand, type) : "";
+    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
+        }
+    }
    String setting_id = doc["bambu_setting_id"].as<String>();
    String cali_idx = doc["cali_idx"].as<String>();

    doc.clear();

-    doc["print"]["sequence_id"] = 0;
+    doc["print"]["sequence_id"] = "0";
    doc["print"]["command"] = "ams_filament_setting";
    doc["print"]["ams_id"] = amsId < 200 ? amsId : 255;
    doc["print"]["tray_id"] = trayId < 200 ? trayId : 254;
@@ -172,7 +206,7 @@ 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"]["cali_idx"] = (cali_idx != "") ? cali_idx : "";
    doc["print"]["tray_info_idx"] = tray_info_idx;
    doc["print"]["setting_id"] = setting_id;
    
@@ -194,13 +228,13 @@ bool setBambuSpool(String payload) {

    if (cali_idx != "") {
        yield();
-        doc["print"]["sequence_id"] = 0;
+        doc["print"]["sequence_id"] = "0";
        doc["print"]["command"] = "extrusion_cali_sel";
        doc["print"]["filament_id"] = tray_info_idx;
        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;
+        //doc["print"]["ams_id"] = amsId < 200 ? amsId : 255;

        // Serialize the JSON
        String output;
@@ -218,37 +252,6 @@ bool setBambuSpool(String payload) {
        doc.clear();
        yield();
    }
-/*
-    if (setting_id != "") {
-        yield();
-        doc["print"]["sequence_id"] = 0;
-        doc["print"]["command"] = "ams_filament_setting";
-        doc["print"]["nozzle_temp_min"] = minTemp;
-        doc["print"]["nozzle_temp_max"] = maxTemp;
-        doc["print"]["setting_id"] = setting_id;
-        doc["print"]["tray_color"] = color.length() == 8 ? color : color+"FF";
-        doc["print"]["ams_id"] = amsId < 200 ? amsId : 255;
-        doc["print"]["tray_id"] = trayId < 200 ? trayId : 254;
-        doc["print"]["tray_info_idx"] = tray_info_idx;
-        doc["print"]["tray_type"] = type;
-
-        // Serialize the JSON
-        String output;
-        serializeJson(doc, output);
-
-        if (sendMqttMessage(output)) {
-            Serial.println("Filament Setting successfully set");
-        }
-        else
-        {
-            Serial.println("Failed to set Filament setting");
-            return false;
-        }
-
-        doc.clear();
-        yield();
-    }
-*/

    return true;
 }
@@ -256,6 +259,7 @@ bool setBambuSpool(String payload) {
 // init
 void mqtt_callback(char* topic, byte* payload, unsigned int length) {
    String message;
+
    for (int i = 0; i < length; i++) {
        message += (char)payload[i];
    }
@@ -270,9 +274,9 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
    }

    // Prüfen, ob "print->upgrade_state" und "print.ams.ams" existieren
-    if (doc["print"]["upgrade_state"].is<String>()) {
+    if (doc["print"]["upgrade_state"].is<JsonObject>()) {
        // Prüfen ob AMS-Daten vorhanden sind
-        if (!doc["print"]["ams"].is<String>() || !doc["print"]["ams"]["ams"].is<String>()) {
+        if (!doc["print"]["ams"].is<JsonObject>() || !doc["print"]["ams"]["ams"].is<JsonArray>()) {
            return;
        }

@@ -315,7 +319,7 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
        }

        // Prüfe die externe Spule
-        if (!hasChanges && doc["print"]["vt_tray"].is<String>()) {
+        if (!hasChanges && doc["print"]["vt_tray"].is<JsonObject>()) {
            JsonObject vtTray = doc["print"]["vt_tray"];
            bool foundExternal = false;
            
@@ -363,7 +367,7 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
        ams_count = amsArray.size();

        // Wenn externe Spule vorhanden, füge sie hinzu
-        if (doc["print"]["vt_tray"].is<String>()) {
+        if (doc["print"]["vt_tray"].is<JsonObject>()) {
            JsonObject vtTray = doc["print"]["vt_tray"];
            int extIdx = ams_count;  // Index für externe Spule
            ams_data[extIdx].ams_id = 255;  // Spezielle ID für externe Spule
@@ -374,8 +378,12 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
            ams_data[extIdx].trays[0].tray_color = vtTray["tray_color"].as<String>();
            ams_data[extIdx].trays[0].nozzle_temp_min = vtTray["nozzle_temp_min"].as<int>();
            ams_data[extIdx].trays[0].nozzle_temp_max = vtTray["nozzle_temp_max"].as<int>();
+
+            if (doc["print"]["vt_tray"]["tray_type"].as<String>() != "")
+            {
                ams_data[extIdx].trays[0].setting_id = vtTray["setting_id"].as<String>();
                ams_data[extIdx].trays[0].cali_idx = vtTray["cali_idx"].as<String>();
+            }
            ams_count++;  // Erhöhe ams_count für die externe Spule
        }

--- a/src/main.cpp
+++ b/src/main.cpp
@@ -58,7 +58,22 @@ void setup() {
  
  startNfc();

-  start_scale();
+  uint8_t scaleCalibrated = start_scale();
+  if (scaleCalibrated == 3) {
+    oledShowMessage("Scale not calibrated!");
+    for (uint16_t i = 0; i < 50000; i++) {
+      yield();
+      vTaskDelay(pdMS_TO_TICKS(1));
+      esp_task_wdt_reset();
+    }
+  } else if (scaleCalibrated == 0) {
+    oledShowMessage("HX711 not found");
+    for (uint16_t i = 0; i < 50000; i++) {
+      yield();
+      vTaskDelay(pdMS_TO_TICKS(1));
+      esp_task_wdt_reset();
+    }
+  }
  
  // WDT initialisieren mit 10 Sekunden Timeout
  bool panic = true; // Wenn true, löst ein WDT-Timeout einen System-Panik aus
@@ -84,33 +99,33 @@ uint8_t wifiErrorCounter = 0;

 // ##### PROGRAM START #####
 void loop() {
-
-  /*
-  // Überprüfe den WLAN-Status
-  if (WiFi.status() != WL_CONNECTED) {
-    wifiErrorCounter++;
-    wifiOn = false;
-  } else {
-    wifiErrorCounter = 0;
-    wifiOn = true;
-  }
-  if (wifiErrorCounter > 20) ESP.restart();
-  */
- 
  unsigned long currentMillis = millis();

  // Send AMS Data min every Minute
-  if (currentMillis - lastAmsSendTime >= amsSendInterval) {
+  if (currentMillis - lastAmsSendTime >= amsSendInterval) 
+  {
    lastAmsSendTime = currentMillis;
    sendAmsData(nullptr);
  }

+  // Wenn Waage nicht Kalibriert
+  if (scaleCalibrated == 3) 
+  {
+    oledShowMessage("Scale not calibrated!");
+    vTaskDelay(5000 / portTICK_PERIOD_MS);
+    yield();
+    esp_task_wdt_reset();
+    
+    return;
+  } 
+
  // Ausgabe der Waage auf Display
  if (pauseMainTask == 0 && weight != lastWeight && hasReadRfidTag == 0)
  {
-    (weight < 0) ? oledShowMessage("!! -1") : oledShowWeight(weight);
+    (weight < 2) ? ((weight < -2) ? oledShowMessage("!! -0") : oledShowWeight(0)) : oledShowWeight(weight);
  }

+
  // Wenn Timer abgelaufen und nicht gerade ein RFID-Tag geschrieben wird
  if (currentMillis - lastWeightReadTime >= weightReadInterval && hasReadRfidTag < 3)
  {
--- a/src/scale.cpp
+++ b/src/scale.cpp
@@ -16,6 +16,7 @@ int16_t weight = 0;
 uint8_t weigthCouterToApi = 0;
 uint8_t scale_tare_counter = 0;
 uint8_t pauseMainTask = 0;
+uint8_t scaleCalibrated = 1;

 Preferences preferences;
 const char* NVS_NAMESPACE = "scale";
@@ -50,11 +51,11 @@ void scale_loop(void * parameter) {
  }
 }

-void start_scale() {
+uint8_t start_scale() {
  Serial.println("Prüfe Calibration Value");
  long calibrationValue;

-  // NVS
+  // NVS lesen
  preferences.begin(NVS_NAMESPACE, true); // true = readonly
  calibrationValue = preferences.getLong(NVS_KEY_CALIBRATION, defaultScaleCalibrationValue);
  preferences.end();
@@ -64,7 +65,10 @@ void start_scale() {

  scale.begin(LOADCELL_DOUT_PIN, LOADCELL_SCK_PIN);

-  if (isnan(calibrationValue) || calibrationValue < 1) calibrationValue = defaultScaleCalibrationValue;
+  if (isnan(calibrationValue) || calibrationValue < 1) {
+    calibrationValue = defaultScaleCalibrationValue;
+    scaleCalibrated = 0;
+  }

  oledShowMessage("Scale Tare Please remove all");
  for (uint16_t i = 0; i < 2000; i++) {
@@ -97,6 +101,8 @@ void start_scale() {
  } else {
      Serial.println("ScaleLoop-Task erfolgreich erstellt");
  }
+
+  return (scaleCalibrated == 1) ? 1 : 3;
 }

 uint8_t calibrate_scale() {
--- a/src/scale.h
+++ b/src/scale.h
@@ -5,7 +5,7 @@
 #include "HX711.h"


-void start_scale();
+uint8_t start_scale();
 uint8_t calibrate_scale();
 uint8_t tareScale();

@@ -14,6 +14,7 @@ extern int16_t weight;
 extern uint8_t weigthCouterToApi;
 extern uint8_t scale_tare_counter;
 extern uint8_t pauseMainTask;
+extern uint8_t scaleCalibrated;

 extern TaskHandle_t ScaleTask;

--- a/src/website.cpp
+++ b/src/website.cpp
@@ -384,7 +384,8 @@ void setupWebserver(AsyncWebServer &server) {
        html.replace("{{spoolmanUrl}}", spoolmanUrl);

        JsonDocument doc;
-        if (loadJsonValue("/bambu_credentials.json", doc) && doc["bambu_ip"].is<String>()) {
+        if (loadJsonValue("/bambu_credentials.json", doc) && doc["bambu_ip"].is<String>()) 
+        {
            String bambuIp = doc["bambu_ip"].as<String>();
            String bambuSerial = doc["bambu_serialnr"].as<String>();
            String bambuCode = doc["bambu_accesscode"].as<String>();
@@ -396,6 +397,12 @@ void setupWebserver(AsyncWebServer &server) {
            html.replace("{{bambuSerial}}", bambuSerial ? bambuSerial : "");
            html.replace("{{bambuCode}}", bambuCode ? bambuCode : "");
        }
+        else
+        {
+            html.replace("{{bambuIp}}", "");
+            html.replace("{{bambuSerial}}", "");
+            html.replace("{{bambuCode}}", "");
+        }

        request->send(200, "text/html", html);
    });
Author	SHA1	Message	Date
Manuel Weiser	de67cdbff3	fix: enhance weight display logic for negative values	2025-02-24 12:28:18 +01:00
Manuel Weiser	98fce15ccc	refactor: simplify filament names in JSON configuration	2025-02-24 12:21:27 +01:00
Manuel Weiser	ab417ba64b	refactor: update findFilamentIdx to return structured result and improve type searching logic	2025-02-24 12:11:27 +01:00
Manuel Weiser	320057bc49	docs: add wiring diagrams to README for PN532 I2C setup	2025-02-24 10:10:15 +01:00
Manuel Weiser	9007a65fc2	docs: update README to reflect PN532 I2C configuration and remove SPI pin details	2025-02-24 09:36:28 +01:00
Manuel Weiser	2214f5f5de	fix: remove unnecessary CPU frequency configuration from setup function	2025-02-24 09:20:44 +01:00
Manuel Weiser	5c5846c52c	docs: update changelog and header for version v1.3.92 All checks were successful Release Workflow / detect-provider (push) Successful in 4s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Successful in 2m49s Details	2025-02-24 07:47:58 +01:00
Manuel Weiser	517fa37a3d	docs: update webpages for version v1.3.92	2025-02-24 07:47:58 +01:00
Manuel Weiser	aaa7a6ee9c	fix: configure CPU frequency settings in setup function only for testing	2025-02-24 07:47:50 +01:00
Manuel Weiser	a0b8639488	fix: update comment to clarify NVS reading process	2025-02-23 21:29:38 +01:00
Manuel Weiser	a16c05287e	fix: adjust weight display logic to handle cases for weight less than 2	2025-02-23 21:23:46 +01:00
Manuel Weiser	ecb35a97bd	fix: update weight display logic to handle negative and specific weight cases	2025-02-23 21:22:50 +01:00
Manuel Weiser	ba968611ec	refactor: remove commented-out code in setBambuSpool function	2025-02-23 21:17:55 +01:00
Manuel Weiser	6bd11ddce3	docs: update installation instructions and formatting in README files	2025-02-23 20:35:46 +01:00
Manuel Weiser	3eb313e61a	docs: update changelog and header for version v1.3.91 All checks were successful Release Workflow / detect-provider (push) Successful in 5s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Successful in 2m51s Details	2025-02-23 20:29:45 +01:00
Manuel Weiser	aad35dc296	docs: update webpages for version v1.3.91	2025-02-23 20:29:45 +01:00
Manuel Weiser	85ac636b1e	feat: update GitHub Actions workflow for FTP firmware upload with improved credential checks	2025-02-23 20:29:40 +01:00
Manuel Weiser	6f1804c3fe	docs: update changelog and header for version v1.3.90 All checks were successful Release Workflow / detect-provider (push) Successful in 2s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Successful in 2m52s Details	2025-02-23 20:28:25 +01:00
Manuel Weiser	89716920dc	docs: update webpages for version v1.3.90	2025-02-23 20:28:25 +01:00
Manuel Weiser	78b5078651	feat: update index.html for improved content structure and additional links	2025-02-23 20:27:38 +01:00
Manuel Weiser	6098c3b052	feat: improve UI for Spoolman and Bambu Lab printer credentials, enhancing layout and styling	2025-02-23 20:23:09 +01:00
Manuel Weiser	e7537f94d4	docs: update README files with HSPI default PINs and add ESP32 pin diagram	2025-02-23 20:12:35 +01:00
Manuel Weiser	37717392d0	feat: implement scale calibration checks and update start_scale function to return calibration status	2025-02-23 16:44:43 +01:00
Manuel Weiser	c6da28ad6f	feat: add FTP upload functionality to GitHub release workflow and update installation instructions in README	2025-02-23 16:13:42 +01:00
Manuel Weiser	d6e38a4e73	fix: remove debug secrets check from Gitea release workflow	2025-02-23 16:01:42 +01:00
Manuel Weiser	4e0d9353c8	docs: update changelog and header for version v1.3.89 All checks were successful Release Workflow / detect-provider (push) Successful in 3s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Successful in 2m59s Details	2025-02-23 15:57:14 +01:00
Manuel Weiser	7059826659	docs: update webpages for version v1.3.89	2025-02-23 15:57:13 +01:00
Manuel Weiser	41faa8bb1c	fix: update Gitea release workflow to use vars for FTP credentials	2025-02-23 15:57:09 +01:00
Manuel Weiser	b38e3fa5ef	docs: update changelog and header for version v1.3.88 Some checks failed Release Workflow / detect-provider (push) Successful in 2s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Failing after 2m48s Details	2025-02-23 15:49:37 +01:00
Manuel Weiser	5280d7e341	docs: update webpages for version v1.3.88	2025-02-23 15:49:37 +01:00
Manuel Weiser	2f95c66d39	fix: update Gitea release workflow to use secrets for FTP credentials	2025-02-23 15:49:33 +01:00
Manuel Weiser	df1b87465c	docs: update changelog and header for version v1.3.87 Some checks failed Release Workflow / detect-provider (push) Successful in 2s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Failing after 2m43s Details	2025-02-23 15:39:09 +01:00
Manuel Weiser	84f1420999	docs: update webpages for version v1.3.87	2025-02-23 15:39:09 +01:00
Manuel Weiser	b14dd5475d	fix: enhance FTP upload workflow with credential checks and version output	2025-02-23 15:38:59 +01:00
Manuel Weiser	975845421b	docs: update changelog and header for version v1.3.86 Some checks failed Release Workflow / detect-provider (push) Successful in 2s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Failing after 2m55s Details	2025-02-23 15:29:14 +01:00
Manuel Weiser	044ddbe0eb	docs: update webpages for version v1.3.86	2025-02-23 15:29:14 +01:00
Manuel Weiser	c385544d67	fix: streamline FTP credentials usage in Gitea release workflow	2025-02-23 15:29:10 +01:00
Manuel Weiser	c6cfd85687	docs: update changelog and header for version v1.3.85 Some checks failed Release Workflow / detect-provider (push) Successful in 3s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Failing after 2m41s Details	2025-02-23 15:20:13 +01:00
Manuel Weiser	84632322e2	docs: update webpages for version v1.3.85	2025-02-23 15:20:13 +01:00
Manuel Weiser	86e55a8696	fix: add FTP_USER variable for Gitea release workflow	2025-02-23 15:20:09 +01:00
Manuel Weiser	d2b40daaca	docs: update changelog and header for version v1.3.84 Some checks failed Release Workflow / detect-provider (push) Successful in 5s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Failing after 2m47s Details	2025-02-23 15:13:49 +01:00
Manuel Weiser	9d58cbc31c	docs: update webpages for version v1.3.84	2025-02-23 15:13:48 +01:00
Manuel Weiser	d09aeaf47c	fix: add FTP_HOST variable for firmware upload in Gitea release workflow	2025-02-23 15:13:45 +01:00
Manuel Weiser	9fb82fe51e	docs: update changelog and header for version v1.3.83 Some checks failed Release Workflow / detect-provider (push) Successful in 3s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Failing after 2m57s Details	2025-02-23 15:07:40 +01:00
Manuel Weiser	5e0e2c5f6b	docs: update webpages for version v1.3.83	2025-02-23 15:07:40 +01:00
Manuel Weiser	a8460503ff	fix: correct variable interpolation for FTP credentials in Gitea release workflow	2025-02-23 15:07:35 +01:00
Manuel Weiser	6700a1761f	docs: update changelog and header for version v1.3.82 Some checks failed Release Workflow / detect-provider (push) Successful in 3s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Failing after 2m51s Details	2025-02-23 14:59:03 +01:00
Manuel Weiser	7207f36e06	docs: update webpages for version v1.3.82	2025-02-23 14:59:03 +01:00
Manuel Weiser	e79bee3381	feat: update Gitea release workflow to use variable interpolation for FTP credentials	2025-02-23 14:58:57 +01:00
Manuel Weiser	c3918f075b	docs: update changelog and header for version v1.3.81 Some checks failed Release Workflow / detect-provider (push) Successful in 2s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Failing after 2m41s Details	2025-02-23 14:53:03 +01:00
Manuel Weiser	0c384219c5	docs: update webpages for version v1.3.81	2025-02-23 14:53:03 +01:00
Manuel Weiser	42b9daf4be	feat: update Gitea release workflow to use environment variables for FTP credentials and version	2025-02-23 14:53:00 +01:00
Manuel Weiser	13a771682f	docs: update changelog and header for version v1.3.80 Some checks failed Release Workflow / detect-provider (push) Successful in 4s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Failing after 2m39s Details	2025-02-23 14:43:41 +01:00
Manuel Weiser	f79f87bf09	docs: update webpages for version v1.3.80	2025-02-23 14:43:41 +01:00
Manuel Weiser	9fe3f6c0ff	feat: add FTP_USER and FTP_PASSWORD secrets for firmware upload in Gitea release workflow	2025-02-23 14:43:36 +01:00
Manuel Weiser	55e89948bb	docs: update changelog and header for version v1.3.79 Some checks failed Release Workflow / detect-provider (push) Successful in 3s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Failing after 2m47s Details	2025-02-23 14:36:19 +01:00
Manuel Weiser	6c5e8c4d07	docs: update webpages for version v1.3.79	2025-02-23 14:36:19 +01:00
Manuel Weiser	4f79700d74	feat: add FTP_USER input for firmware upload in Gitea release workflow	2025-02-23 14:36:14 +01:00
Manuel Weiser	1b4fecf409	docs: update changelog and header for version v1.3.78 Some checks failed Release Workflow / detect-provider (push) Successful in 4s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Failing after 3m7s Details	2025-02-23 12:35:14 +01:00
Manuel Weiser	89a6101d97	docs: update webpages for version v1.3.78	2025-02-23 12:35:14 +01:00
Manuel Weiser	ee45a74fee	fix: change FTP protocol from FTPS to FTP for file upload in workflow	2025-02-23 12:35:09 +01:00
Manuel Weiser	db365aba3c	docs: update changelog and header for version v1.3.77 Some checks failed Release Workflow / detect-provider (push) Successful in 3s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Failing after 2m49s Details	2025-02-23 12:05:24 +01:00
Manuel Weiser	63cdfaee6c	docs: update webpages for version v1.3.77	2025-02-23 12:05:24 +01:00
Manuel Weiser	eb2e360c35	fix: replace ncftp with lftp for secure firmware upload	2025-02-23 12:05:19 +01:00
Manuel Weiser	7d578640e2	docs: update changelog and header for version v1.3.76 Some checks failed Release Workflow / detect-provider (push) Successful in 3s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Failing after 2m44s Details	2025-02-23 12:00:38 +01:00
Manuel Weiser	b006533a91	docs: update webpages for version v1.3.76	2025-02-23 12:00:37 +01:00
Manuel Weiser	9fa7526623	fix: replace FTP action with curl for secure firmware upload and install ncftp	2025-02-23 12:00:33 +01:00