Compare commits

..

77 Commits

Author SHA1 Message Date
5dc3563da6 docs: update changelog for version 1.2.74
All checks were successful
Release Workflow / route (push) Successful in 7s
Release Workflow / verify-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m17s
2025-02-20 14:46:12 +01:00
9e1b2943d6 docs: update webpages for version v1.2.74 2025-02-20 14:46:12 +01:00
7b89b04621 refactor: enhance OTA update process with improved handling of full image updates and SPIFFS data 2025-02-20 14:45:34 +01:00
e140f8e003 docs: update changelog for version 1.2.73
All checks were successful
Release Workflow / route (push) Successful in 6s
Release Workflow / verify-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m14s
2025-02-20 14:31:44 +01:00
3d0bdde476 docs: update webpages for version v1.2.73 2025-02-20 14:31:44 +01:00
3ac7d6b4f7 refactor: improve OTA update process with enhanced size checks and progress logging 2025-02-20 14:31:10 +01:00
5f52775984 refactor: enhance OTA update process with improved size checks and debugging output 2025-02-20 14:28:11 +01:00
463eaf4b6f docs: update changelog for version 1.2.72
All checks were successful
Release Workflow / route (push) Successful in 13s
Release Workflow / verify-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m16s
2025-02-20 14:17:34 +01:00
4bf6b11d3a docs: update webpages for version v1.2.72 2025-02-20 14:17:34 +01:00
b0c4af7c4e refactor: simplify OTA update process by removing unnecessary buffer and adjusting offsets 2025-02-20 14:16:49 +01:00
249e896ea4 docs: update changelog for version 1.2.71
Some checks failed
Release Workflow / route (push) Successful in 6s
Release Workflow / verify-provider (push) Successful in 2s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Has been cancelled
2025-02-20 14:09:21 +01:00
c74f587fff docs: update webpages for version v1.2.71 2025-02-20 14:09:21 +01:00
7a7ee72585 fix: update version number to v1.2.65 in HTML files and platformio.ini; add script to create full binary 2025-02-20 14:08:17 +01:00
3dd5fbc585 docs: update changelog for version 1.2.70
All checks were successful
Release Workflow / route (push) Successful in 7s
Release Workflow / verify-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m23s
2025-02-20 12:01:08 +01:00
ed9c1487ed docs: update webpages for version v1.2.70 2025-02-20 12:01:08 +01:00
d8756421a1 fix: add logging to stopAllTasks for better debugging 2025-02-20 12:00:45 +01:00
d92c78f9d0 docs: update changelog for version 1.2.69
All checks were successful
Release Workflow / route (push) Successful in 11s
Release Workflow / verify-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m21s
2025-02-20 11:54:38 +01:00
2d19ea745f docs: update webpages for version v1.2.69 2025-02-20 11:54:37 +01:00
13779cc9d7 docs: update changelog for version 1.2.68
Some checks failed
Release Workflow / route (push) Successful in 6s
Release Workflow / verify-provider (push) Successful in 2s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Has been cancelled
2025-02-20 11:53:15 +01:00
b6d5a8a00b docs: update webpages for version v1.2.68 2025-02-20 11:53:15 +01:00
f6319e79f0 fix: update stopAllTasks to suspend RfidReaderTask instead of NfcTask 2025-02-20 11:53:04 +01:00
6f24630a7d feat: add task handles for BambuMqttTask and ScaleTask; rename stopTasks to stopAllTasks 2025-02-20 11:52:36 +01:00
4475d21218 docs: update changelog for version 1.2.67
All checks were successful
Release Workflow / route (push) Successful in 6s
Release Workflow / verify-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m6s
2025-02-20 11:42:41 +01:00
01a926a38d feat: improve OTA upload handling and add SPIFFS update support 2025-02-20 11:42:36 +01:00
6b966c02b3 docs: update webpages for version v1.2.67 2025-02-20 11:42:25 +01:00
1450e1ad2e docs: update changelog for version 1.2.66
All checks were successful
Release Workflow / route (push) Successful in 8s
Release Workflow / verify-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m5s
2025-02-20 11:27:18 +01:00
3102a6c217 docs: update webpages for version v1.2.66 2025-02-20 11:27:18 +01:00
d5b2b2746d feat: enhance OTA upload to support SPIFFS updates 2025-02-20 11:27:11 +01:00
7e776d4816 docs: update changelog for version 1.2.65
All checks were successful
Release Workflow / route (push) Successful in 7s
Release Workflow / verify-provider (push) Successful in 5s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m8s
2025-02-20 11:16:54 +01:00
e84b2973c5 docs: update webpages for version v1.2.65 2025-02-20 11:16:53 +01:00
5793dc1a1f docs: update changelog for version 1.2.64
Some checks failed
Release Workflow / route (push) Successful in 7s
Release Workflow / verify-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Has been cancelled
2025-02-20 11:13:56 +01:00
1732491c48 docs: update webpages for version v1.2.64 2025-02-20 11:13:56 +01:00
0500bb6951 fix: improve error handling in OTA upload process 2025-02-20 11:13:49 +01:00
ef9ef7257a docs: update changelog for version 1.2.63
All checks were successful
Release Workflow / route (push) Successful in 7s
Release Workflow / verify-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m10s
2025-02-20 10:59:17 +01:00
e86fd229dc docs: update webpages for version v1.2.63 2025-02-20 10:59:17 +01:00
b940a166da feat: update version to 1.2.63 2025-02-20 10:59:10 +01:00
c857e16de2 feat: enhance OTA upload handling with magic byte checks for image types
Some checks failed
Release Workflow / route (push) Successful in 7s
Release Workflow / verify-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Failing after 3m4s
2025-02-20 10:53:23 +01:00
8b2a537b72 docs: update changelog for version 1.2.62
All checks were successful
Release Workflow / route (push) Successful in 7s
Release Workflow / verify-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m6s
2025-02-20 10:29:08 +01:00
88ec151c4c docs: update webpages for version 1.2.62 2025-02-20 10:29:08 +01:00
0a203f02eb feat: update version to 1.2.62 2025-02-20 10:29:04 +01:00
04b59f4809 docs: update changelog for version 1.2.61
All checks were successful
Release Workflow / route (push) Successful in 8s
Release Workflow / verify-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m9s
2025-02-20 10:06:15 +01:00
b31861af67 docs: update webpages for version 1.2.61 2025-02-20 10:06:15 +01:00
ce3b423dc1 feat: update version to 1.2.61 and enhance OTA update error handling 2025-02-20 10:06:06 +01:00
05f275142f docs: update changelog for version 1.2.60
All checks were successful
Release Workflow / route (push) Successful in 7s
Release Workflow / verify-provider (push) Successful in 4s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m11s
2025-02-20 01:28:56 +01:00
72af54bd20 docs: update webpages for version 1.2.60 2025-02-20 01:28:56 +01:00
a1e30a3b7f feat: update version to 1.2.60 in platformio configuration 2025-02-20 01:28:45 +01:00
8f8322e629 docs: update changelog for version 1.2.59
All checks were successful
Release Workflow / route (push) Successful in 6s
Release Workflow / verify-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m10s
2025-02-20 01:08:56 +01:00
1e386c49af docs: update webpages for version 1.2.59 2025-02-20 01:08:56 +01:00
3070d75d07 feat: update version to 1.2.59 and enhance OTA upload handling 2025-02-20 01:08:48 +01:00
34ee9badea docs: update changelog for version 1.2.58
All checks were successful
Release Workflow / route (push) Successful in 7s
Release Workflow / verify-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m16s
2025-02-20 00:50:53 +01:00
6594af9540 feat: update version to 1.2.58 in HTML files and platformio configuration 2025-02-20 00:50:48 +01:00
c21bd2d4ec docs: update changelog for version 1.2.57
All checks were successful
Release Workflow / route (push) Successful in 8s
Release Workflow / verify-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m15s
2025-02-20 00:33:35 +01:00
e5f895b560 feat: update version to 1.2.57 in platformio configuration 2025-02-20 00:33:31 +01:00
bb0f50ce1d fix: update spiffs offset and sizes in firmware and partitions configuration 2025-02-20 00:33:16 +01:00
499a08aa75 docs: update changelog for version 1.2.56
Some checks failed
Release Workflow / route (push) Successful in 8s
Release Workflow / verify-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Failing after 2m50s
2025-02-19 22:06:56 +01:00
745d960f62 feat: update version to 1.2.56 and adjust firmware and partition settings 2025-02-19 22:06:47 +01:00
531d0fe9a2 refactor: remove redundant comment from Gitea release workflow 2025-02-19 21:45:26 +01:00
2af23e8084 docs: update changelog for version 1.2.55
All checks were successful
Release Workflow / route (push) Successful in 7s
Release Workflow / verify-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m8s
2025-02-19 21:25:23 +01:00
cd204fdaa8 feat: update version to 1.2.55 and adjust Gitea release workflow to remove 'v' prefix from version 2025-02-19 21:24:38 +01:00
d04ad42b5b docs: update changelog for version 1.2.54
Some checks failed
Release Workflow / route (push) Successful in 10s
Release Workflow / verify-provider (push) Successful in 6s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Failing after 3m38s
2025-02-19 21:03:22 +01:00
8d80a8fb5a feat: update version to 1.2.54 and add check for missing changelog in Gitea release workflow 2025-02-19 21:03:17 +01:00
77032bf9ae docs: update changelog for version 1.2.53
Some checks failed
Release Workflow / route (push) Successful in 7s
Release Workflow / verify-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Failing after 2m56s
2025-02-19 20:54:26 +01:00
3967366ae6 feat: update version to 1.2.53 and enhance Gitea release workflow to handle missing changelog 2025-02-19 20:54:20 +01:00
cd391378c2 docs: update changelog for version 1.2.52
All checks were successful
Release Workflow / route (push) Successful in 7s
Release Workflow / verify-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 2m59s
2025-02-19 20:36:45 +01:00
3fc3a689cb feat: update version to 1.2.52 and improve Gitea release workflow output handling 2025-02-19 20:35:33 +01:00
bd5b32a3b0 docs: update changelog for version 1.2.51
All checks were successful
Release Workflow / route (push) Successful in 9s
Release Workflow / verify-provider (push) Successful in 4s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m14s
2025-02-19 20:14:54 +01:00
a5c999234c feat: update version to 1.2.51 and add debug output in Gitea release workflow 2025-02-19 20:14:43 +01:00
f64d3e51ce docs: update changelog for version 1.2.50
All checks were successful
Release Workflow / route (push) Successful in 7s
Release Workflow / verify-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m30s
2025-02-19 20:06:08 +01:00
a650b7d860 feat: update version to 1.2.50 and remove obsolete build workflow 2025-02-19 20:05:56 +01:00
14e98072aa docs: update changelog for version 1.2.49
All checks were successful
Release Workflow / route (push) Successful in 7s
Release Workflow / verify-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m0s
2025-02-19 18:24:09 +01:00
0bc4c0565f feat: update version to 1.2.49 and modify changelog reading in Gitea release workflow 2025-02-19 18:24:05 +01:00
4aa8e844ac docs: update changelog for version 1.2.48
All checks were successful
Release Workflow / route (push) Successful in 7s
Release Workflow / verify-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m16s
2025-02-19 18:03:35 +01:00
d7135fddc8 feat: update version to 1.2.48 and modify changelog reading in release workflows 2025-02-19 18:03:31 +01:00
6e3e978839 docs: update changelog for version 1.2.47
All checks were successful
Release Workflow / route (push) Successful in 7s
Release Workflow / verify-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m9s
2025-02-19 17:54:06 +01:00
33b0e79c18 feat: update version to 1.2.47 and modify changelog reading in GitHub release workflow 2025-02-19 17:53:54 +01:00
787d878e83 docs: update changelog for version 1.2.46
All checks were successful
Release Workflow / route (push) Successful in 8s
Release Workflow / verify-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m5s
2025-02-19 15:09:00 +01:00
1e24179b82 feat: update Gitea release workflow to include changelog and increment version to 1.2.46 2025-02-19 15:08:56 +01:00
17 changed files with 402 additions and 117 deletions

View File

@ -1,87 +0,0 @@
name: Build Firmware
on:
workflow_call:
outputs:
version:
description: "The version from the tag"
value: ${{ jobs.build.outputs.version }}
changelog:
description: "The changelog for the current version"
value: ${{ jobs.build.outputs.changelog }}
jobs:
build:
runs-on: ubuntu-latest
outputs:
version: ${{ steps.get_version.outputs.VERSION }}
changelog: ${{ steps.changelog.outputs.CHANGES }}
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
- name: Build Firmware
run: |
pio run -t buildfs # Build SPIFFS
pio run # Build firmware
- name: Install esptool
run: |
pip install esptool
- name: Merge firmware and SPIFFS
run: |
esptool.py --chip esp32 merge_bin \
--flash_mode dio \
--flash_freq 40m \
--flash_size 4MB \
-o .pio/build/esp32dev/filaman_full.bin \
0x1000 .pio/build/esp32dev/bootloader.bin \
0x8000 .pio/build/esp32dev/partitions.bin \
0x10000 .pio/build/esp32dev/firmware.bin \
0x290000 .pio/build/esp32dev/spiffs.bin
- name: Prepare OTA firmware
run: |
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
- name: Get version from tag
id: get_version
run: |
if [ -n "$GITEA_REF" ]; then
echo "VERSION=${GITEA_REF#refs/tags/v}" >> $GITEA_OUTPUT
else
echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
fi
- 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)
if [ -n "$GITEA_OUTPUT" ]; then
echo "CHANGES<<EOF" >> $GITEA_OUTPUT
echo "$CHANGELOG" >> $GITEA_OUTPUT
echo "EOF" >> $GITEA_OUTPUT
else
echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
echo "$CHANGELOG" >> $GITHUB_OUTPUT
echo "EOF" >> $GITHUB_OUTPUT
fi
- name: Upload artifacts
uses: actions/upload-artifact@v3
with:
name: firmware
path: |
.pio/build/esp32dev/filaman_full.bin
.pio/build/esp32dev/filaman_ota.bin

View File

@ -64,21 +64,38 @@ jobs:
0x1000 .pio/build/esp32dev/bootloader.bin \
0x8000 .pio/build/esp32dev/partitions.bin \
0x10000 .pio/build/esp32dev/firmware.bin \
0x290000 .pio/build/esp32dev/spiffs.bin
0x3D0000 .pio/build/esp32dev/spiffs.bin
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
- name: Read CHANGELOG.md
id: changelog
run: |
VERSION=$(echo "${{ inputs.gitea_ref_name }}" | sed 's/^v//')
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
echo "CHANGELOG CONTENT:"
echo "$CHANGELOG"
if [ -z "$CHANGELOG" ]; then
echo "No changelog found for version $VERSION"
exit 1
fi
- name: Create Release
env:
TOKEN: ${{ secrets.GITEA_TOKEN }}
GITEA_REF_NAME: ${{ inputs.gitea_ref_name }}
GITEA_SERVER_URL: ${{ inputs.gitea_server_url }}
GITEA_REPOSITORY: ${{ inputs.gitea_repository }}
CHANGELOG: ${{ steps.changelog.outputs.CHANGES }}
run: |
echo "Debug environment:"
echo "GITEA_REF_NAME: ${GITEA_REF_NAME}"
echo "GITEA_SERVER_URL: ${GITEA_SERVER_URL}"
echo "GITEA_REPOSITORY: ${GITEA_REPOSITORY}"
echo "CHANGELOG: ${CHANGELOG}"
TAG="${GITEA_REF_NAME}"
API_URL="${GITEA_SERVER_URL}/api/v1"
@ -91,7 +108,7 @@ jobs:
-X POST \
-H "Authorization: token ${TOKEN}" \
-H "Content-Type: application/json" \
-d "{\"tag_name\":\"${TAG}\",\"name\":\"Release ${TAG}\"}" \
-d "{\"tag_name\":\"${TAG}\",\"name\":\"Release ${TAG}\",\"body\":\"${CHANGELOG}\"}" \
"${API_URL}/repos/${REPO}/releases")
RELEASE_ID=$(echo "$RESPONSE" | grep -o '"id":[0-9]*' | cut -d':' -f2 | head -n1)

View File

@ -40,7 +40,7 @@ jobs:
0x1000 .pio/build/esp32dev/bootloader.bin \
0x8000 .pio/build/esp32dev/partitions.bin \
0x10000 .pio/build/esp32dev/firmware.bin \
0x290000 .pio/build/esp32dev/spiffs.bin
0x3D0000 .pio/build/esp32dev/spiffs.bin
- name: Prepare OTA firmware
run: |

View File

@ -1,5 +1,198 @@
# Changelog
## [1.2.74] - 2025-02-20
### Changed
- update webpages for version v1.2.74
- enhance OTA update process with improved handling of full image updates and SPIFFS data
## [1.2.73] - 2025-02-20
### Changed
- update webpages for version v1.2.73
- improve OTA update process with enhanced size checks and progress logging
### Fixed
- enhance OTA update process with improved size checks and debugging output
## [1.2.72] - 2025-02-20
### Changed
- update webpages for version v1.2.72
- simplify OTA update process by removing unnecessary buffer and adjusting offsets
## [1.2.71] - 2025-02-20
### Added
- update version number to v1.2.65 in HTML files and platformio.ini; add script to create full binary
### Changed
- update webpages for version v1.2.71
## [1.2.70] - 2025-02-20
### Added
- add logging to stopAllTasks for better debugging
### Changed
- update webpages for version v1.2.70
## [1.2.69] - 2025-02-20
### Changed
- update webpages for version v1.2.69
## [1.2.68] - 2025-02-20
### Added
- add task handles for BambuMqttTask and ScaleTask; rename stopTasks to stopAllTasks
### Changed
- update webpages for version v1.2.68
### Fixed
- update stopAllTasks to suspend RfidReaderTask instead of NfcTask
## [1.2.67] - 2025-02-20
### Added
- improve OTA upload handling and add SPIFFS update support
### Changed
- update webpages for version v1.2.67
## [1.2.66] - 2025-02-20
### Added
- enhance OTA upload to support SPIFFS updates
### Changed
- update webpages for version v1.2.66
## [1.2.65] - 2025-02-20
### Changed
- update webpages for version v1.2.65
## [1.2.64] - 2025-02-20
### Changed
- update webpages for version v1.2.64
### Fixed
- improve error handling in OTA upload process
## [1.2.63] - 2025-02-20
### Added
- update version to 1.2.63
### Changed
- update webpages for version v1.2.63
## [1.2.62] - 2025-02-20
### Added
- update version to 1.2.62
### Changed
- update webpages for version 1.2.62
## [1.2.61] - 2025-02-20
### Added
- update version to 1.2.61 and enhance OTA update error handling
### Changed
- update webpages for version 1.2.61
## [1.2.60] - 2025-02-20
### Added
- update version to 1.2.60 in platformio configuration
### Changed
- update webpages for version 1.2.60
## [1.2.59] - 2025-02-20
### Added
- update version to 1.2.59 and enhance OTA upload handling
### Changed
- update webpages for version 1.2.59
## [1.2.58] - 2025-02-20
### Added
- update version to 1.2.58 in HTML files and platformio configuration
## [1.2.57] - 2025-02-20
### Added
- update version to 1.2.57 in platformio configuration
### Fixed
- update spiffs offset and sizes in firmware and partitions configuration
## [1.2.56] - 2025-02-19
### Added
- update version to 1.2.56 and adjust firmware and partition settings
### Changed
- remove redundant comment from Gitea release workflow
## [1.2.55] - 2025-02-19
### Added
- update version to 1.2.55 and adjust Gitea release workflow to remove 'v' prefix from version
## [1.2.54] - 2025-02-19
### Added
- update version to 1.2.54 and add check for missing changelog in Gitea release workflow
## [1.2.53] - 2025-02-19
### Added
- update version to 1.2.53 and enhance Gitea release workflow to handle missing changelog
## [1.2.52] - 2025-02-19
### Added
- update version to 1.2.52 and improve Gitea release workflow output handling
## [1.2.51] - 2025-02-19
### Added
- update version to 1.2.51 and add debug output in Gitea release workflow
## [1.2.50] - 2025-02-19
### Added
- update version to 1.2.50 and remove obsolete build workflow
## [1.2.49] - 2025-02-19
### Added
- update version to 1.2.49 and modify changelog reading in Gitea release workflow
## [1.2.48] - 2025-02-19
### Added
- update version to 1.2.48 and modify changelog reading in release workflows
## [1.2.47] - 2025-02-19
### Added
- update version to 1.2.47 and modify changelog reading in GitHub release workflow
## [1.2.46] - 2025-02-19
### Added
- update Gitea release workflow to include changelog and increment version to 1.2.46
## [1.2.45] - 2025-02-19
### Added
- update Gitea release workflow to use dynamic upload URL and increment version to 1.2.45

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text">
<h1>FilaMan<span class="version">v1.2.29</span></h1>
<h1>FilaMan<span class="version">v1.2.74</span></h1>
<h4>Filament Management Tool</h4>
</div>
</div>

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text">
<h1>FilaMan<span class="version">v1.2.29</span></h1>
<h1>FilaMan<span class="version">v1.2.74</span></h1>
<h4>Filament Management Tool</h4>
</div>
</div>

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text">
<h1>FilaMan<span class="version">v1.2.29</span></h1>
<h1>FilaMan<span class="version">v1.2.74</span></h1>
<h4>Filament Management Tool</h4>
</div>
</div>

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text">
<h1>FilaMan<span class="version">v1.2.29</span></h1>
<h1>FilaMan<span class="version">v1.2.74</span></h1>
<h4>Filament Management Tool</h4>
</div>
</div>

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text">
<h1>FilaMan<span class="version">v1.2.29</span></h1>
<h1>FilaMan<span class="version">v1.2.74</span></h1>
<h4>Filament Management Tool</h4>
</div>
</div>

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text">
<h1>FilaMan<span class="version">v1.2.29</span></h1>
<h1>FilaMan<span class="version">v1.2.74</span></h1>
<h4>Filament Management Tool</h4>
</div>
</div>

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text">
<h1>FilaMan<span class="version">v1.2.29</span></h1>
<h1>FilaMan<span class="version">v1.2.74</span></h1>
<h4>Filament Management Tool</h4>
</div>
</div>

View File

@ -9,7 +9,7 @@
; https://docs.platformio.org/page/projectconf.html
[common]
version = "1.2.45"
version = "1.2.74"
[env:esp32dev]
platform = espressif32
@ -59,6 +59,12 @@ build_flags =
-DOTA_PARTITION_SUBTYPE=0x10
-DPARTITION_TABLE_OFFSET=0x8000
-DPARTITION_TABLE_SIZE=0x1000
-DCONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=1
-DCONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=1
-DCONFIG_BOOTLOADER_SKIP_VALIDATE_ON_POWER_ON=1
-DCONFIG_BOOTLOADER_RESERVE_RTC_SIZE=0x1000
-DCONFIG_PARTITION_TABLE_OFFSET=0x8000
-DCONFIG_PARTITION_TABLE_MD5=y
extra_scripts =
scripts/extra_script.py

View File

@ -36,4 +36,5 @@ void mqtt_loop(void * parameter);
bool setBambuSpool(String payload);
void bambu_restart();
extern TaskHandle_t BambuMqttTask;
#endif

View File

@ -3,44 +3,191 @@
#include <Update.h>
#include <SPIFFS.h>
#include "commonFS.h"
#include "bambu.h"
#include "scale.h"
#include "nfc.h"
// Magic byte patterns für verschiedene Image-Typen
const uint8_t FIRMWARE_MAGIC = 0xE9;
const uint8_t ESP_MAGIC = 0xE9;
static bool tasksAreStopped = false;
void stopAllTasks() {
// Stop all tasks
Serial.println("Stopping RFID Reader");
if (RfidReaderTask) vTaskSuspend(RfidReaderTask);
Serial.println("Stopping Bambu");
if (BambuMqttTask) vTaskSuspend(BambuMqttTask);
Serial.println("Stopping Scale");
if (ScaleTask) vTaskSuspend(ScaleTask);
vTaskDelay(100 / portTICK_PERIOD_MS);
Serial.println("All tasks stopped");
}
void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) {
static size_t contentLength = 0;
static bool isFullImage = false;
static uint32_t currentOffset = 0;
static uint8_t *spiffsBuffer = nullptr;
static size_t spiffsSize = 0x30000; // 192KB SPIFFS size
static size_t spiffsStored = 0;
if (!index) {
contentLength = request->contentLength();
Serial.printf("Update size: %u bytes\n", contentLength);
Serial.printf("Update size: %u bytes (0x%X)\n", contentLength, contentLength);
if (contentLength == 0) {
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid file size\"}");
return;
}
if (!Update.begin(contentLength)) {
Serial.printf("Not enough space: %u required\n", contentLength);
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Not enough space available\"}");
return;
if (!tasksAreStopped && (RfidReaderTask || BambuMqttTask || ScaleTask)) {
stopAllTasks();
tasksAreStopped = true;
}
isFullImage = (contentLength > 0x300000); // Über 3MB ist ein full image
if (isFullImage) {
// Alloziere Buffer für SPIFFS-Daten
spiffsBuffer = (uint8_t*)malloc(spiffsSize);
if (!spiffsBuffer) {
Serial.println("Failed to allocate SPIFFS buffer");
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Memory allocation failed\"}");
return;
}
memset(spiffsBuffer, 0xFF, spiffsSize);
spiffsStored = 0;
// Starte Update mit der Firmware-Größe
if (!Update.begin(0x3D0000, U_FLASH)) { // Nur bis zum SPIFFS-Start
Serial.println("Could not begin full image update");
free(spiffsBuffer);
spiffsBuffer = nullptr;
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Could not start full update\"}");
return;
}
} else {
// Normales Firmware-Update
if (!Update.begin(contentLength)) {
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Not enough space available\"}");
return;
}
}
Serial.println("Update started");
currentOffset = 0;
Serial.printf("%s update started\n", isFullImage ? "Full image" : "Firmware");
}
if (Update.write(data, len) != len) {
Update.printError(Serial);
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update\"}");
if (isFullImage && currentOffset >= 0x3D0000) {
// SPIFFS-Daten sammeln
size_t spiffsOffset = currentOffset - 0x3D0000;
if (spiffsOffset < spiffsSize) {
size_t copyLen = min(len, spiffsSize - spiffsOffset);
memcpy(spiffsBuffer + spiffsOffset, data, copyLen);
spiffsStored += copyLen;
Serial.printf("Stored SPIFFS data: offset=0x%X, len=%u\n", spiffsOffset, copyLen);
}
// Nur die Firmware-Daten an Update.write() übergeben
return;
}
if (final) {
if (Update.end(true)) {
Serial.println("Update complete");
request->send(200, "application/json", "{\"status\":\"success\",\"message\":\"Update successful! Device will restart...\",\"restart\":true}");
delay(1000);
ESP.restart();
} else {
Update.printError(Serial);
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update failed\"}");
// Schreibe Firmware-Daten
size_t writeLen = isFullImage ? min(len, 0x3D0000 - currentOffset) : len;
if (writeLen > 0) {
if (Update.write(data, writeLen) != writeLen) {
String errorMsg = Update.errorString();
if (errorMsg != "No Error") {
Update.printError(Serial);
if (spiffsBuffer) {
free(spiffsBuffer);
spiffsBuffer = nullptr;
}
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update: " + errorMsg + "\"}");
return;
}
}
}
currentOffset += len;
// Progress logging
if ((currentOffset % 0x40000) == 0) {
Serial.printf("Update progress: 0x%X of 0x%X bytes (%.1f%%)\n",
currentOffset, contentLength, (currentOffset * 100.0) / contentLength);
}
if (final) {
bool success = true;
// Beende Firmware-Update
if (!Update.end(true)) {
success = false;
String errorMsg = Update.errorString();
if (errorMsg != "No Error") {
Update.printError(Serial);
if (spiffsBuffer) {
free(spiffsBuffer);
spiffsBuffer = nullptr;
}
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Firmware update failed: " + errorMsg + "\"}");
return;
}
}
// SPIFFS aktualisieren wenn es ein full image war
if (success && isFullImage && spiffsBuffer && spiffsStored > 0) {
Serial.printf("Starting SPIFFS update (size: 0x%X)\n", spiffsStored);
if (SPIFFS.begin(true)) {
SPIFFS.end(); // Unmount first
}
if (!Update.begin(spiffsSize, U_SPIFFS)) {
Serial.println("Could not begin SPIFFS update");
free(spiffsBuffer);
spiffsBuffer = nullptr;
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"SPIFFS update failed to start\"}");
return;
}
if (Update.write(spiffsBuffer, spiffsSize) != spiffsSize) {
Serial.println("SPIFFS Write Failed");
Update.printError(Serial);
free(spiffsBuffer);
spiffsBuffer = nullptr;
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"SPIFFS write failed\"}");
return;
}
if (!Update.end(true)) {
Serial.println("SPIFFS End Failed");
Update.printError(Serial);
free(spiffsBuffer);
spiffsBuffer = nullptr;
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"SPIFFS finish failed\"}");
return;
}
// Cleanup
free(spiffsBuffer);
spiffsBuffer = nullptr;
// Verify SPIFFS
if (!SPIFFS.begin(true)) {
Serial.println("SPIFFS mount after update failed");
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"SPIFFS verification failed\"}");
return;
}
SPIFFS.end();
}
// Alles erfolgreich
Serial.printf("Update complete: 0x%X bytes written\n", currentOffset);
request->send(200, "application/json", "{\"status\":\"success\",\"message\":\"Update successful! Device will restart...\",\"restart\":true}");
delay(500);
ESP.restart();
}
}

View File

@ -3,6 +3,12 @@
#include <ESPAsyncWebServer.h>
// Update size unknown constant, falls nicht bereits definiert
#ifndef UPDATE_SIZE_UNKNOWN
#define UPDATE_SIZE_UNKNOWN 0xFFFFFFFF
#endif
void stopAllTasks();
void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final);
#endif

View File

@ -15,4 +15,6 @@ extern uint8_t weigthCouterToApi;
extern uint8_t scale_tare_counter;
extern uint8_t pauseMainTask;
extern TaskHandle_t ScaleTask;
#endif

View File

@ -12,7 +12,7 @@ bool wm_nonblocking = false;
void initWiFi() {
WiFi.mode(WIFI_STA); // explicitly set mode, esp defaults to STA+AP
esp_wifi_set_max_tx_power(72); // Setze maximale Sendeleistung auf 20dBm
//esp_wifi_set_max_tx_power(72); // Setze maximale Sendeleistung auf 20dBm
if(wm_nonblocking) wm.setConfigPortalBlocking(false);
wm.setConfigPortalTimeout(320); // Portal nach 5min schließen