docs: update changelog for version 1.3.4

docs: update webpages for version v1.3.4
Merge branch 'old'
2025-02-21 20:04:05 +01:00 · 2025-02-21 20:04:05 +01:00 · 2025-02-21 20:03:45 +01:00 · 2025-02-21 20:03:21 +01:00 · 2025-02-21 19:48:48 +01:00 · 2025-02-21 19:48:48 +01:00
6 changed files with 257 additions and 45 deletions
--- a/.github/workflows/providers/gitea-release.yml
+++ b/.github/workflows/providers/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)
--- a/.github/workflows/providers/github-release.yml
+++ b/.github/workflows/providers/github-release.yml
@ -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)
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -56,15 +56,182 @@ jobs:
  github-release:
    needs: [route, verify-provider]
    if: needs.route.outputs.provider == 'github'
-    uses: ./.github/workflows/providers/github-release.yml
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.x'
+    - name: Install PlatformIO
+      run: |
+        python -m pip install --upgrade pip
+        pip install --upgrade platformio esptool
+    - name: Install xxd
+      run: |
+        sudo apt-get update
+        sudo apt-get install xxd
+    - name: Check for Data changes
+      id: check_data
+      run: |
+        git fetch --unshallow || true
+        CHANGED_FILES=$(git diff --name-only HEAD^..HEAD)
+        if echo "$CHANGED_FILES" | grep -q "^data/"; then
+          echo "DATA_CHANGED=true" >> $GITHUB_OUTPUT
+        else
+          echo "DATA_CHANGED=false" >> $GITHUB_OUTPUT
+        fi
+    - name: Check for SPIFFS changes
+      id: check_spiffs
+      run: |
+        git fetch --unshallow || true
+        CHANGED_FILES=$(git diff --name-only HEAD^..HEAD)
+        if echo "$CHANGED_FILES" | grep -q "^data/\|^html/"; then
+          echo "SPIFFS_CHANGED=true" >> $GITHUB_OUTPUT
+        else
+          echo "SPIFFS_CHANGED=false" >> $GITHUB_OUTPUT
+        fi
+    - name: Build Firmware
+      run: |
+        VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2)
+        echo "Building firmware and SPIFFS..."
+        pio run -e esp32dev
+        pio run -t buildfs
+        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_${VERSION}.bin
+        cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/webpage_${VERSION}.bin
+        (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 0x1000 bootloader.bin 0x8000 partitions.bin 0x10000 firmware.bin 0x390000 spiffs.bin)
+        echo "File sizes:"
+        (cd .pio/build/esp32dev && ls -lh *.bin)
+    - name: Get version from platformio.ini
+      id: get_version
+      run: |
+        VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2)
+        echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
+    - name: Read CHANGELOG.md
+      id: changelog
+      run: |
+        VERSION=${{ steps.get_version.outputs.VERSION }}
+        CHANGELOG=$(awk "/## \[$VERSION\]/{p=1;print;next} /## \[/{p=0} p" CHANGELOG.md)
+        echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
+        echo "$CHANGELOG" >> $GITHUB_OUTPUT
+        echo "EOF" >> $GITHUB_OUTPUT
+    - name: Create GitHub Release
+      env:
+        GH_TOKEN: ${{ github.token }}
+      run: |
+        VERSION=${{ steps.get_version.outputs.VERSION }}
+        cd .pio/build/esp32dev
+        FILES_TO_UPLOAD=""
+        if [ -f "filaman_${VERSION}.bin" ]; then
+          FILES_TO_UPLOAD="$FILES_TO_UPLOAD filaman_${VERSION}.bin"
+        fi
+        if [ -f "webpage_${VERSION}.bin" ]; then
+          FILES_TO_UPLOAD="$FILES_TO_UPLOAD webpage_${VERSION}.bin"
+        fi
+        if [ -f "filaman_full_${VERSION}.bin" ]; then
+          FILES_TO_UPLOAD="$FILES_TO_UPLOAD filaman_full_${VERSION}.bin"
+        fi
+        if [ -n "$FILES_TO_UPLOAD" ]; then
+          gh release create "v${VERSION}" --title "Release ${VERSION}" --notes "${{ steps.changelog.outputs.CHANGES }}" $FILES_TO_UPLOAD
+        else
+          echo "Error: No files found to upload"
+          exit 1

  gitea-release:
    needs: [route, verify-provider]
    if: needs.route.outputs.provider == 'gitea'
-    uses: ./.github/workflows/providers/gitea-release.yml
-    with:
-      gitea_ref_name: ${{ needs.route.outputs.gitea_ref_name }}
-      gitea_server_url: ${{ needs.route.outputs.gitea_server_url }}
-      gitea_repository: ${{ needs.route.outputs.gitea_repository }}
-    secrets:
-      GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.x'
+    - name: Install PlatformIO
+      run: |
+        python -m pip install --upgrade pip
+        pip install --upgrade platformio esptool
+    - name: Install xxd
+      run: |
+        sudo apt-get update
+        sudo apt-get install xxd
+    - name: Check for SPIFFS changes
+      id: check_spiffs
+      run: |
+        git fetch --unshallow || true
+        CHANGED_FILES=$(git diff --name-only HEAD^..HEAD)
+        if echo "$CHANGED_FILES" | grep -q "^data/\|^html/"; then
+          echo "SPIFFS_CHANGED=true" >> $GITHUB_OUTPUT
+        else
+          echo "SPIFFS_CHANGED=false" >> $GITHUB_OUTPUT
+        fi
+    - name: Check for Data changes
+      id: check_data
+      run: |
+        git fetch --unshallow || true
+        CHANGED_FILES=$(git diff --name-only HEAD^..HEAD)
+        if echo "$CHANGED_FILES" | grep -q "^data/"; then
+          echo "DATA_CHANGED=true" >> $GITHUB_OUTPUT
+        else
+          echo "DATA_CHANGED=false" >> $GITHUB_OUTPUT
+        fi
+    - name: Get version from platformio.ini
+      id: get_version
+      run: |
+        VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2)
+        echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
+    - name: Build Firmware
+      run: |
+        VERSION=${{ steps.get_version.outputs.VERSION }}
+        echo "Building firmware and SPIFFS..."
+        pio run -e esp32dev
+        pio run -t buildfs
+        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_${VERSION}.bin
+        cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/webpage_${VERSION}.bin
+        (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 0x1000 bootloader.bin 0x8000 partitions.bin 0x10000 firmware.bin 0x390000 spiffs.bin)
+        echo "File sizes:"
+        (cd .pio/build/esp32dev && ls -lh *.bin)
+    - name: Prepare binaries
+      run: |
+        VERSION=${{ steps.get_version.outputs.VERSION }}
+        if [[ "${{ steps.check_spiffs.outputs.SPIFFS_CHANGED }}" == "true" ]]; then
+          echo "Creating full binary..."
+          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 0x8000 partitions.bin 0x10000 firmware.bin 0x390000 spiffs.bin
+        fi
+        echo "File sizes:"
+        cd .pio/build/esp32dev && ls -lh *.bin
+    - name: Read CHANGELOG.md
+      id: changelog
+      run: |
+        VERSION=${{ steps.get_version.outputs.VERSION }}
+        CHANGELOG=$(awk "/## \[$VERSION\]/{p=1;print;next} /## \[/{p=0} p" CHANGELOG.md)
+        echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
+        echo "$CHANGELOG" >> $GITHUB_OUTPUT
+        echo "EOF" >> $GITHUB_OUTPUT
+    - name: Create Release
+      env:
+        TOKEN: ${{ secrets.GITEA_TOKEN }}
+      run: |
+        API_URL="${{ needs.route.outputs.gitea_server_url }}/api/v1"
+        REPO="${{ needs.route.outputs.gitea_repository }}"
+        VERSION=${{ steps.get_version.outputs.VERSION }}
+        RESPONSE=$(curl -k -s -X POST -H "Authorization: token ${TOKEN}" -H "Content-Type: application/json" -d "{\"tag_name\":\"v${VERSION}\",\"name\":\"Release ${VERSION}\",\"body\":\"${{ steps.changelog.outputs.CHANGES }}\"}" "${API_URL}/repos/${REPO}/releases")
+        RELEASE_ID=$(echo "$RESPONSE" | grep -o '"id":[0-9]*' | cut -d':' -f2 | head -n1)
+        if [ -n "$RELEASE_ID" ]; then
+          echo "Release created with ID: $RELEASE_ID"
+          for file in filaman_${VERSION}.bin filaman_full_${VERSION}.bin; do
+            if [ -f ".pio/build/esp32dev/$file" ]; then
+              echo "Uploading $file..."
+              curl -k -s -X POST -H "Authorization: token ${TOKEN}" -H "Content-Type: application/octet-stream" --data-binary "@.pio/build/esp32dev/$file" "${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=$file"
+            fi
+          done
+          if [ -f ".pio/build/esp32dev/webpage_${VERSION}.bin" ]; then
+            echo "Uploading webpage binary..."
+            curl -k -s -X POST -H "Authorization: token ${TOKEN}" -H "Content-Type: application/octet-stream" --data-binary "@.pio/build/esp32dev/webpage_${VERSION}.bin" "${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=webpage_${VERSION}.bin"
+          fi
+        else
+          echo "Failed to create release. Response:"
+          echo "$RESPONSE"
+          exit 1
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,58 @@
 # Changelog

+## [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
--- a/platformio.ini
+++ b/platformio.ini
@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html

 [common]
-version = "1.2.100"
+version = "1.3.4"

 [env:esp32dev]
 platform = espressif32
--- a/src/scale.cpp
+++ b/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");
Author	SHA1	Message	Date
Manuel Weiser	ec399390e8	docs: update changelog for version 1.3.4 Some checks failed Release Workflow / route (push) Successful in 7s Details Release Workflow / verify-provider (push) Successful in 3s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Failing after 2m22s Details	2025-02-21 20:04:05 +01:00
Manuel Weiser	909c4e9b5e	docs: update webpages for version v1.3.4	2025-02-21 20:04:05 +01:00
Manuel Weiser	f4b20bfffd	Merge branch 'old'	2025-02-21 20:03:45 +01:00
Manuel Weiser	78464215a9	feat: add Gitea and GitHub release workflows	2025-02-21 20:03:21 +01:00
Manuel Weiser	4365f0463a	docs: update changelog for version 1.3.3 Some checks failed Release Workflow / route (push) Successful in 7s Details Release Workflow / verify-provider (push) Successful in 3s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Failing after 2m42s Details	2025-02-21 19:48:48 +01:00
Manuel Weiser	727bc0e760	docs: update webpages for version v1.3.3	2025-02-21 19:48:48 +01:00
Manuel Weiser	04604013eb	fix: correct directory path in GitHub workflows for SPIFFS binary	2025-02-21 19:48:45 +01:00
Manuel Weiser	cf5fc5f6f1	docs: update changelog for version 1.3.2 Some checks failed Release Workflow / route (push) Successful in 6s Details Release Workflow / verify-provider (push) Successful in 3s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Failing after 2m35s Details	2025-02-21 19:33:26 +01:00
Manuel Weiser	945a4ccce6	docs: update webpages for version v1.3.2	2025-02-21 19:33:26 +01:00
Manuel Weiser	7cf9e2d145	fix: add missing conditional exit in release workflow	2025-02-21 19:33:24 +01:00
Manuel Weiser	9db4e338ea	docs: update changelog for version 1.3.1 Some checks failed Release Workflow / route (push) Successful in 6s Details Release Workflow / verify-provider (push) Failing after 3s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Has been skipped Details	2025-02-21 19:10:52 +01:00
Manuel Weiser	dea6ca2c66	docs: update webpages for version v1.3.1	2025-02-21 19:10:52 +01:00
Manuel Weiser	e224e72e41	feat: enhance GitHub and Gitea release workflows with Python setup and binary preparation	2025-02-21 19:10:48 +01:00
Manuel Weiser	306c517da7	docs: update changelog for version 1.3.0 All checks were successful Release Workflow / route (push) Successful in 6s Details Release Workflow / verify-provider (push) Successful in 2s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Successful in 2m40s Details	2025-02-21 18:58:35 +01:00
Manuel Weiser	0337bbabe0	bump version to 1.3.0 in platformio.ini	2025-02-21 18:58:32 +01:00
Manuel Weiser	bde14e50e0	docs: update changelog for version 1.2.102 All checks were successful Release Workflow / route (push) Successful in 7s Details Release Workflow / verify-provider (push) Successful in 3s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Successful in 3m1s Details	2025-02-21 18:28:20 +01:00
Manuel Weiser	9c656a9bd0	docs: update webpages for version v1.2.102	2025-02-21 18:28:20 +01:00
Manuel Weiser	eae552017d	fix: adjust bootloader offset in binary merge for Gitea and GitHub workflows	2025-02-21 18:28:16 +01:00
Manuel Weiser	a77918da41	docs: update changelog for version 1.2.101 Some checks failed Release Workflow / route (push) Successful in 6s Details Release Workflow / verify-provider (push) Successful in 2s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Failing after 2m38s Details	2025-02-21 18:07:47 +01:00
Manuel Weiser	262dad38a6	docs: update webpages for version v1.2.101	2025-02-21 18:07:46 +01:00
Manuel Weiser	cfc9f103cf	refactor: always create SPIFFS binary in release workflows	2025-02-21 18:07:43 +01:00
Manuel Weiser	0117302672	refactor: migrate calibration value storage from EEPROM to NVS	2025-02-21 18:04:05 +01:00