docs: add wiring diagrams to README for PN532 I2C setup

.github/workflows/github-release.yml

@@ -151,35 +151,35 @@ jobs:
           exit 1
         fi
 
-      - name: Install lftp
+    - name: Install lftp
-        run: sudo apt-get install -y lftp
+      run: sudo apt-get install -y lftp
-          
+        
-      - name: Upload Firmware via FTP
+    - name: Upload Firmware via FTP
-        if: success()
+      if: success()
-        env:
+      env:
-          FTP_PASSWORD: ${{ vars.FTP_PASSWORD }}
+        FTP_PASSWORD: ${{ vars.FTP_PASSWORD }}
-          FTP_USER: ${{ vars.FTP_USER }}
+        FTP_USER: ${{ vars.FTP_USER }}
-          FTP_HOST: ${{ vars.FTP_HOST }}
+        FTP_HOST: ${{ vars.FTP_HOST }}
-          VERSION: ${{ steps.get_version.outputs.VERSION }}
+        VERSION: ${{ steps.get_version.outputs.VERSION }}
-        run: |
+      run: |
-          echo "Environment variables:"
+        echo "Environment variables:"
-          env | grep -E '^FTP_' | while read -r line; do
+        env | grep -E '^FTP_' | while read -r line; do
-            var_name=$(echo "$line" | cut -d= -f1)
+          var_name=$(echo "$line" | cut -d= -f1)
-            var_value=$(echo "$line" | cut -d= -f2-)
+          var_value=$(echo "$line" | cut -d= -f2-)
-            echo "$var_name is $(if [ -n "$var_value" ]; then echo "set"; else echo "empty"; fi)"
+          echo "$var_name is $(if [ -n "$var_value" ]; then echo "set"; else echo "empty"; fi)"
-          done
+        done
-          
+        
-          cd .pio/build/esp32dev
+        cd .pio/build/esp32dev
-          if [ -n "$FTP_USER" ] && [ -n "$FTP_PASSWORD" ] && [ -n "$FTP_HOST" ]; then
+        if [ -n "$FTP_USER" ] && [ -n "$FTP_PASSWORD" ] && [ -n "$FTP_HOST" ]; then
-            echo "All FTP credentials are present, attempting upload..."
+          echo "All FTP credentials are present, attempting upload..."
-            lftp -c "set ssl:verify-certificate no; \
+          lftp -c "set ssl:verify-certificate no; \
-                     set ftp:ssl-protect-data true; \
+                    set ftp:ssl-protect-data true; \
-                     set ftp:ssl-force true; \
+                    set ftp:ssl-force true; \
-                     set ssl:check-hostname false; \
+                    set ssl:check-hostname false; \
-                     set ftp:ssl-auth TLS; \
+                    set ftp:ssl-auth TLS; \
-                     open -u $FTP_USER,$FTP_PASSWORD $FTP_HOST; \
+                    open -u $FTP_USER,$FTP_PASSWORD $FTP_HOST; \
-                     put -O / filaman_full_${VERSION}.bin -o filaman_full.bin"
+                    put -O / filaman_full_${VERSION}.bin -o filaman_full.bin"
-          else
+        else
-            echo "Error: Some FTP credentials are missing"
+          echo "Error: Some FTP credentials are missing"
-            exit 1
+          exit 1
-          fi
+        fi

CHANGELOG.md

@@ -1,5 +1,26 @@
 # 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

README.de.md

@@ -71,14 +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 SDA         | 21        |
-| PN532 MOSI        | 13        |
+| PN532 SCL         | 22        |
-| PN532 MISO        | 12        |
-| PN532 CS/SS       | 15        |
 
-Ich nutze die HSPI default PINs + IRQ und RESET am PN532
+**Achte darauf, dass am PN532 die DIP-Schalter auf I2C gestellt sind**
 
-![ESP32](./img/ESP32-SPI-Pins.png)
+![Wiring](./img/Schaltplan.png)
+
+![myWiring](./img/IMG_2589.jpeg)
+![myWiring](./img/IMG_2590.jpeg)
 
 ## Software-Abhängigkeiten
 
@@ -105,21 +106,20 @@ Ich nutze die HSPI default PINs + IRQ und RESET am PN532
   - PN532 NFC Modul
   - Verbindungskabel
 
-### Schritt-für-Schritt Installation
+## Schritt-für-Schritt Installation
-## Einfache Installation
+### Einfache Installation
-1. **Gehe auf https://www.filaman.app/installer.html
+1. **Gehe auf [FilaMan Installer](https://www.filaman.app/installer.html)**
 
-2. **Stecke dein ESP an den Rechner und klicke Connect
+2. **Stecke dein ESP an den Rechner und klicke Connect**
 
-3. **Wähle dein Device Port und klicke Intall
+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
+### Compile by yourself
-
 1. **Repository klonen:**
     ```bash
     git clone https://github.com/ManuelW77/Filaman.git

README.md

@@ -75,14 +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 SDA         | 21        |
-| PN532 MOSI    	| 13        |
+| PN532 SCL         | 22        |
-| PN532 MISO       	| 12        |
-| PN532 CS/SS       | 15        |
 
-I use the HSPI default PINs + IRQ and RESET at the PN532
+**Make sure that the DIP switches on the PN532 are set to I2C**
 
-![ESP32](./img/ESP32-SPI-Pins.png)
+![Wiring](./img/Schaltplan.png)
+
+![myWiring](./img/IMG_2589.jpeg)
+![myWiring](./img/IMG_2590.jpeg)
 
 ## Software Dependencies
 
@@ -95,9 +96,9 @@ I use the HSPI default PINs + IRQ and RESET at the PN532
 - `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
@@ -109,20 +110,20 @@ I use the HSPI default PINs + IRQ and RESET at the PN532
   - PN532 NFC Module
   - Connecting wires
 
-### Step-by-Step Installation
+## Step-by-Step Installation
-## Easy Installation
+### Easy Installation
-1. **Go to https://www.filaman.app/installer.html
+1. **Go to [FilaMan Installer](https://www.filaman.app/installer.html)**
 
-2. **Plug you device in and push Connect button
+2. **Plug you device in and push Connect button**
 
-3. **Select your Device Port and push Intall
+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
+### Compile by yourself
 1. **Clone the Repository:**
     ```bash
     git clone https://github.com/ManuelW77/Filaman.git

platformio.ini

@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [common]
-version = "1.3.90"
+version = "1.3.92"
 ##
 [env:esp32dev]
 platform = espressif32

src/bambu.cpp

@@ -218,37 +218,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;
 }

src/main.cpp

@@ -122,7 +122,7 @@ void loop() {
   // Ausgabe der Waage auf Display
   if (pauseMainTask == 0 && weight != lastWeight && hasReadRfidTag == 0)
   {
-    (weight < 0) ? oledShowMessage("!! -1") : oledShowWeight(weight);
+    (weight < 2) ? oledShowMessage("0") : oledShowWeight(weight);
   }
 
 

src/scale.cpp

@@ -55,7 +55,7 @@ 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();