docs: update changelog for version 1.3.10

.github/workflows/gitea-release.yml

@@ -74,21 +74,18 @@ jobs:
         # Copy firmware binary
         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_${VERSION}.bin
         
-        # Copy SPIFFS binary if SPIFFS changed
-        if [[ "${{ steps.check_spiffs.outputs.SPIFFS_CHANGED }}" == "true" ]]; then
-          echo "SPIFFS changes detected, copying SPIFFS binary..."
-          cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/webpage_${VERSION}.bin
-        fi
+        # Always create SPIFFS binary
+        cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/webpage_${VERSION}.bin
         
         # Create full binary (always)
-        (cd .pio/build/esp32dev && \
+        (cd .pio/build/esp32dev && 
         esptool.py --chip esp32 merge_bin \
           --fill-flash-size 4MB \
           --flash_mode dio \
           --flash_freq 40m \
           --flash_size 4MB \
           -o filaman_full_${VERSION}.bin \
-          0x0000 bootloader.bin \
+          0x1000 bootloader.bin \
           0x8000 partitions.bin \
           0x10000 firmware.bin \
           0x390000 spiffs.bin)

.github/workflows/github-release.yml

@@ -6,8 +6,8 @@ on:
 jobs:
   create-release:
     runs-on: ubuntu-latest
-    permissions:
-      contents: write
+    #permissions:
+    #  contents: write
     steps:
     - uses: actions/checkout@v4
     
@@ -60,31 +60,22 @@ jobs:
         # Copy firmware binary
         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_${VERSION}.bin
         
-        # Copy SPIFFS binary if SPIFFS changed
-        if [[ "${{ steps.check_spiffs.outputs.SPIFFS_CHANGED }}" == "true" ]]; then
-          echo "SPIFFS changes detected, copying SPIFFS binary..."
-          cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/webpage_${VERSION}.bin
-        fi
+        # Always create SPIFFS binary
+        cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/webpage_${VERSION}.bin
         
         # Create full binary (always)
-        (cd .pio/build/esp32dev && \
+        (cd .pio/build/esp32dev && 
         esptool.py --chip esp32 merge_bin \
           --fill-flash-size 4MB \
           --flash_mode dio \
           --flash_freq 40m \
           --flash_size 4MB \
           -o filaman_full_${VERSION}.bin \
-          0x0000 bootloader.bin \
+          0x1000 bootloader.bin \
           0x8000 partitions.bin \
           0x10000 firmware.bin \
           0x390000 spiffs.bin)
         
-        # Only copy SPIFFS binary if data changed
-        if [[ "${{ steps.check_data.outputs.DATA_CHANGED }}" == "true" ]]; then
-          echo "Data changes detected, copying SPIFFS binary..."
-          cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/webpage_${VERSION}.bin
-        fi
-        
         # Verify file sizes
         echo "File sizes:"
         (cd .pio/build/esp32dev && ls -lh *.bin)

.github/workflows/release.yml

@@ -35,33 +35,19 @@ jobs:
             echo "gitea_ref_name=${GITHUB_REF_NAME}" >> "$GITHUB_OUTPUT"
             echo "gitea_server_url=${GITHUB_SERVER_URL}" >> "$GITHUB_OUTPUT"
             echo "gitea_repository=${GITHUB_REPOSITORY}" >> "$GITHUB_OUTPUT"
-          elif [ "${GITHUB_ACTIONS}" = "true" ]; then
-            echo "provider=github" >> "$GITHUB_OUTPUT"
           else
-            echo "provider=unknown" >> "$GITHUB_OUTPUT"
-          fi
-
-  verify-provider:
-    needs: route
-    runs-on: ubuntu-latest
-    steps:
-      - name: Echo detected provider
-        run: |
-          echo "Detected CI Provider: ${{ needs.route.outputs.provider }}"
-          if [ "${{ needs.route.outputs.provider }}" = "unknown" ]; then
-            echo "::error::Failed to detect CI provider!"
-            exit 1
+            echo "provider=github" >> "$GITHUB_OUTPUT"
           fi
 
   github-release:
-    needs: [route, verify-provider]
+    needs: route
     if: needs.route.outputs.provider == 'github'
-    uses: ./.github/workflows/providers/github-release.yml
+    uses: ./.github/workflows/github-release.yml
 
   gitea-release:
-    needs: [route, verify-provider]
+    needs: route
     if: needs.route.outputs.provider == 'gitea'
-    uses: ./.github/workflows/providers/gitea-release.yml
+    uses: ./.github/workflows/gitea-release.yml
     with:
       gitea_ref_name: ${{ needs.route.outputs.gitea_ref_name }}
       gitea_server_url: ${{ needs.route.outputs.gitea_server_url }}

CHANGELOG.md

@@ -1,5 +1,102 @@
 # Changelog
 
+## [1.3.10] - 2025-02-21
+### Changed
+- update webpages for version v1.3.10
+- ci: simplify GitHub release workflow by removing provider verification step
+
+
+## [1.3.9] - 2025-02-21
+### Changed
+- update webpages for version v1.3.9
+- ci: comment out permissions for GitHub release workflow
+
+
+## [1.3.8] - 2025-02-21
+### Added
+- add Gitea and GitHub release workflows
+
+### Changed
+- update webpages for version v1.3.8
+
+
+## [1.3.7] - 2025-02-21
+### Added
+- add GitHub and Gitea release workflows
+
+### Changed
+- update webpages for version v1.3.7
+
+
+## [1.3.6] - 2025-02-21
+### Changed
+- update webpages for version v1.3.6
+
+### Fixed
+- update GitHub token reference and correct file path in release workflow
+
+
+## [1.3.5] - 2025-02-21
+### Added
+- enhance release workflow to support Gitea alongside GitHub
+
+### Changed
+- update webpages for version v1.3.5
+
+
+## [1.3.4] - 2025-02-21
+### Added
+- add Gitea and GitHub release workflows
+
+### Changed
+- update webpages for version v1.3.4
+- Merge branch 'old'
+
+
+## [1.3.3] - 2025-02-21
+### Changed
+- update webpages for version v1.3.3
+
+### Fixed
+- correct directory path in GitHub workflows for SPIFFS binary
+
+
+## [1.3.2] - 2025-02-21
+### Added
+- add missing conditional exit in release workflow
+
+### Changed
+- update webpages for version v1.3.2
+
+
+## [1.3.1] - 2025-02-21
+### Added
+- enhance GitHub and Gitea release workflows with Python setup and binary preparation
+
+### Changed
+- update webpages for version v1.3.1
+
+
+## [1.3.0] - 2025-02-21
+### Changed
+- bump version to 1.3.0 in platformio.ini
+
+
+## [1.2.102] - 2025-02-21
+### Changed
+- update webpages for version v1.2.102
+
+### Fixed
+- adjust bootloader offset in binary merge for Gitea and GitHub workflows
+
+
+## [1.2.101] - 2025-02-21
+### Changed
+- update webpages for version v1.2.101
+- always create SPIFFS binary in release workflows
+- migrate calibration value storage from EEPROM to NVS
+
+
 ## [1.2.100] - 2025-02-21
 ### Changed
 - update webpages for version v1.2.100

platformio.ini

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

src/scale.cpp

@@ -3,9 +3,9 @@
 #include <ArduinoJson.h>
 #include "config.h"
 #include "HX711.h"
-#include <EEPROM.h>
 #include "display.h"
 #include "esp_task_wdt.h"
+#include <Preferences.h>
 
 HX711 scale;
 
@@ -17,6 +17,10 @@ uint8_t weigthCouterToApi = 0;
 uint8_t scale_tare_counter = 0;
 uint8_t pauseMainTask = 0;
 
+Preferences preferences;
+const char* NVS_NAMESPACE = "scale";
+const char* NVS_KEY_CALIBRATION = "cal_value";
+
 // ##### Funktionen für Waage #####
 uint8_t tareScale() {
   Serial.println("Tare scale");
@@ -48,13 +52,12 @@ void scale_loop(void * parameter) {
 
 void start_scale() {
   Serial.println("Prüfe Calibration Value");
-  long calibrationValue; // calibration value (see example file "Calibration.ino")
-  //calibrationValue = 696.0; // uncomment this if you want to set the calibration value in the sketch
+  long calibrationValue;
 
-  EEPROM.begin(512);
-  EEPROM.get(calVal_eepromAdress, calibrationValue); // uncomment this if you want to fetch the calibration value from eeprom
-
-  //calibrationValue = EEPROM.read(calVal_eepromAdress);
+  // NVS
+  preferences.begin(NVS_NAMESPACE, true); // true = readonly
+  calibrationValue = preferences.getLong(NVS_KEY_CALIBRATION, defaultScaleCalibrationValue);
+  preferences.end();
 
   Serial.print("Read Scale Calibration Value ");
   Serial.println(calibrationValue);
@@ -137,18 +140,19 @@ uint8_t calibrate_scale() {
     {
       Serial.print("New calibration value has been set to: ");
       Serial.println(newCalibrationValue);
-      Serial.print("Save this value to EEPROM adress ");
-      Serial.println(calVal_eepromAdress);
 
-      //EEPROM.put(calVal_eepromAdress, newCalibrationValue);
-      EEPROM.put(calVal_eepromAdress, newCalibrationValue);
-      EEPROM.commit();
+      // Speichern mit NVS
+      preferences.begin(NVS_NAMESPACE, false); // false = readwrite
+      preferences.putLong(NVS_KEY_CALIBRATION, newCalibrationValue);
+      preferences.end();
 
-      EEPROM.get(calVal_eepromAdress, newCalibrationValue);
-      //newCalibrationValue = EEPROM.read(calVal_eepromAdress);
+      // Verifizieren
+      preferences.begin(NVS_NAMESPACE, true);
+      long verifyValue = preferences.getLong(NVS_KEY_CALIBRATION, 0);
+      preferences.end();
 
-      Serial.print("Read Value ");
-      Serial.println(newCalibrationValue);
+      Serial.print("Verified stored value: ");
+      Serial.println(verifyValue);
 
       Serial.println("End calibration, revome weight");