Compare commits
114 Commits
v1.2.10
...
ef9ef7257a
Author | SHA1 | Date | |
---|---|---|---|
ef9ef7257a | |||
e86fd229dc | |||
b940a166da | |||
c857e16de2 | |||
8b2a537b72 | |||
88ec151c4c | |||
0a203f02eb | |||
04b59f4809 | |||
b31861af67 | |||
ce3b423dc1 | |||
05f275142f | |||
72af54bd20 | |||
a1e30a3b7f | |||
8f8322e629 | |||
1e386c49af | |||
3070d75d07 | |||
34ee9badea | |||
6594af9540 | |||
c21bd2d4ec | |||
e5f895b560 | |||
bb0f50ce1d | |||
499a08aa75 | |||
745d960f62 | |||
531d0fe9a2 | |||
2af23e8084 | |||
cd204fdaa8 | |||
d04ad42b5b | |||
8d80a8fb5a | |||
77032bf9ae | |||
3967366ae6 | |||
cd391378c2 | |||
3fc3a689cb | |||
bd5b32a3b0 | |||
a5c999234c | |||
f64d3e51ce | |||
a650b7d860 | |||
14e98072aa | |||
0bc4c0565f | |||
4aa8e844ac | |||
d7135fddc8 | |||
6e3e978839 | |||
33b0e79c18 | |||
787d878e83 | |||
1e24179b82 | |||
67027840f4 | |||
2755e9c863 | |||
7ae26fb0a9 | |||
98bcf98f1e | |||
bc8ac32fee | |||
ba74eca21d | |||
d4e1cf1322 | |||
5170784e44 | |||
ac323167d0 | |||
003de5bc00 | |||
83595cfadf | |||
cfe21d63d7 | |||
63e72076ed | |||
2a011ee244 | |||
84dd2bd40b | |||
1449cacc0e | |||
f1c2b2eb87 | |||
0f1a3b1d5b | |||
6190cf04db | |||
680aed0e10 | |||
fadb122d28 | |||
4347f89c16 | |||
9856757e49 | |||
afb7b5f42b | |||
ba8506247b | |||
61f3f90d6d | |||
a143527dd0 | |||
f2c9818e61 | |||
9e23af29ff | |||
095885442a | |||
359c9b5a6d | |||
b16a7a4c17 | |||
b4ea175757 | |||
ca4671a7dd | |||
7a4b1a934f | |||
77d90bbe83 | |||
c99d802184 | |||
ca15d2abe4 | |||
bddb48ba9a | |||
f4b67e52b8 | |||
00f6a4b0ae | |||
ab3937a69d | |||
0c4bae48d4 | |||
b4b17cb999 | |||
5ff3864d9d | |||
9b8736d35f | |||
cf0ba20637 | |||
e06c0b9a76 | |||
4cb370ddff | |||
0b9c1711da | |||
e2449030c5 | |||
5a91e87afa | |||
5e66c3bd45 | |||
61c82f796f | |||
7661e0eb20 | |||
c06e6de89a | |||
262bed84df | |||
c710e5d7f8 | |||
5d39f04786 | |||
d955e26b82 | |||
c20e7de5c3 | |||
55c3b3688a | |||
fea5932125 | |||
04f557939d | |||
58549a53e4 | |||
64a46e3e7d | |||
c2bd0982ab | |||
e0b8da079e | |||
8c88827a2d | |||
6128bc2827 |
169
.github/workflows/providers/gitea-release.yml
vendored
169
.github/workflows/providers/gitea-release.yml
vendored
@ -1,42 +1,61 @@
|
||||
name: Gitea Release
|
||||
|
||||
on:
|
||||
workflow_call: # This workflow will only be triggered when called by another workflow
|
||||
|
||||
permissions:
|
||||
contents: write # Required for creating releases
|
||||
issues: read # Required for reading changelog
|
||||
pull-requests: read # Required for reading changelog
|
||||
workflow_call:
|
||||
inputs:
|
||||
gitea_ref_name:
|
||||
description: 'Gitea ref name'
|
||||
required: true
|
||||
type: string
|
||||
gitea_server_url:
|
||||
description: 'Gitea server URL'
|
||||
required: true
|
||||
type: string
|
||||
gitea_repository:
|
||||
description: 'Gitea repository'
|
||||
required: true
|
||||
type: string
|
||||
secrets:
|
||||
GITEA_TOKEN:
|
||||
required: true
|
||||
|
||||
jobs:
|
||||
build:
|
||||
create-release:
|
||||
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
|
||||
- name: Checkout Repository
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Install System Dependencies
|
||||
run: |
|
||||
python -m pip install --upgrade pip
|
||||
pip install --upgrade platformio
|
||||
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y python3 python3-venv build-essential curl git
|
||||
|
||||
- name: Set up Python Virtual Environment
|
||||
run: |
|
||||
python3 -m venv venv
|
||||
source venv/bin/activate
|
||||
pip install --upgrade pip
|
||||
pip install platformio esptool
|
||||
|
||||
echo "Verifying installations:"
|
||||
platformio --version
|
||||
python3 --version
|
||||
esptool.py version
|
||||
|
||||
- name: Build Firmware
|
||||
run: |
|
||||
pio run -t buildfs # Build SPIFFS
|
||||
pio run # Build firmware
|
||||
source venv/bin/activate
|
||||
echo "Building SPIFFS..."
|
||||
platformio run -t buildfs
|
||||
|
||||
- name: Install esptool
|
||||
run: |
|
||||
pip install esptool
|
||||
|
||||
- name: Merge firmware and SPIFFS
|
||||
echo "Building firmware..."
|
||||
platformio run
|
||||
|
||||
- name: Create Release Files
|
||||
run: |
|
||||
source venv/bin/activate
|
||||
echo "Creating release files..."
|
||||
esptool.py --chip esp32 merge_bin \
|
||||
--flash_mode dio \
|
||||
--flash_freq 40m \
|
||||
@ -45,57 +64,71 @@ 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
|
||||
|
||||
- name: Prepare OTA firmware
|
||||
run: |
|
||||
0x3D0000 .pio/build/esp32dev/spiffs.bin
|
||||
|
||||
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
|
||||
|
||||
- name: Get version from tag
|
||||
id: get_version
|
||||
run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
|
||||
|
||||
|
||||
- name: Read CHANGELOG.md
|
||||
id: changelog
|
||||
run: |
|
||||
CHANGELOG=$(awk "/## \\[${{ steps.get_version.outputs.VERSION }}\\]/{p=1;print;next} /## \\[/{p=0} p" CHANGELOG.md)
|
||||
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:
|
||||
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
||||
GITEA_API_URL: ${{ secrets.GITEA_API_URL }}
|
||||
GITEA_REPOSITORY: ${{ secrets.GITEA_REPOSITORY }}
|
||||
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: |
|
||||
# Create release using Gitea API
|
||||
RESPONSE=$(curl -X POST \
|
||||
-H "Authorization: token ${GITEA_TOKEN}" \
|
||||
-H "Content-Type: application/json" \
|
||||
-H "accept: application/json" \
|
||||
"${GITEA_API_URL}/repos/${GITEA_REPOSITORY}/releases" \
|
||||
-d '{
|
||||
"tag_name": "${{ github.ref_name }}",
|
||||
"name": "Release ${{ steps.get_version.outputs.VERSION }}",
|
||||
"body": "${{ steps.changelog.outputs.CHANGES }}",
|
||||
"draft": false,
|
||||
"prerelease": false
|
||||
}')
|
||||
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}"
|
||||
|
||||
# Extract release ID from response
|
||||
RELEASE_ID=$(echo $RESPONSE | jq -r .id)
|
||||
TAG="${GITEA_REF_NAME}"
|
||||
API_URL="${GITEA_SERVER_URL}/api/v1"
|
||||
REPO="${GITEA_REPOSITORY}"
|
||||
|
||||
# Upload full firmware
|
||||
curl -X POST \
|
||||
-H "Authorization: token ${GITEA_TOKEN}" \
|
||||
-H "Content-Type: application/octet-stream" \
|
||||
"${GITEA_API_URL}/repos/${GITEA_REPOSITORY}/releases/${RELEASE_ID}/assets?name=filaman_full.bin" \
|
||||
--data-binary @.pio/build/esp32dev/filaman_full.bin
|
||||
echo "Creating release for ${TAG} on ${REPO}..."
|
||||
|
||||
# Upload OTA firmware
|
||||
curl -X POST \
|
||||
-H "Authorization: token ${GITEA_TOKEN}" \
|
||||
-H "Content-Type: application/octet-stream" \
|
||||
"${GITEA_API_URL}/repos/${GITEA_REPOSITORY}/releases/${RELEASE_ID}/assets?name=filaman_ota.bin" \
|
||||
--data-binary @.pio/build/esp32dev/filaman_ota.bin
|
||||
# Create release
|
||||
RESPONSE=$(curl -k -s \
|
||||
-X POST \
|
||||
-H "Authorization: token ${TOKEN}" \
|
||||
-H "Content-Type: application/json" \
|
||||
-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)
|
||||
UPLOAD_URL=$(echo "$RESPONSE" | grep -o '"upload_url":"[^"]*' | cut -d':' -f2- | tr -d '"')
|
||||
|
||||
if [ -n "$RELEASE_ID" ]; then
|
||||
echo "Release created with ID: $RELEASE_ID"
|
||||
|
||||
# Upload files
|
||||
for file in "filaman_full.bin" "filaman_ota.bin"; do
|
||||
echo "Uploading $file..."
|
||||
curl -k -s \
|
||||
-X POST \
|
||||
-H "Authorization: token ${TOKEN}" \
|
||||
-H "Content-Type: application/octet-stream" \
|
||||
--data-binary "@.pio/build/esp32dev/$file" \
|
||||
"${UPLOAD_URL}?name=$file"
|
||||
done
|
||||
else
|
||||
echo "Failed to create release. Response:"
|
||||
echo "$RESPONSE"
|
||||
exit 1
|
||||
fi
|
38
.github/workflows/providers/github-release.yml
vendored
38
.github/workflows/providers/github-release.yml
vendored
@ -1,18 +1,13 @@
|
||||
name: GitHub Release
|
||||
|
||||
on:
|
||||
workflow_call: # This workflow will only be triggered when called by another workflow
|
||||
|
||||
permissions:
|
||||
contents: write # Required for creating releases
|
||||
issues: read # Required for reading changelog
|
||||
pull-requests: read # Required for reading changelog
|
||||
workflow_call:
|
||||
|
||||
jobs:
|
||||
build:
|
||||
create-release:
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
contents: write # Required for creating releases at job level
|
||||
contents: write
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
@ -45,39 +40,32 @@ 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: |
|
||||
# Use PlatformIO to create a proper OTA image
|
||||
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
|
||||
|
||||
- name: Get version from tag
|
||||
id: get_version
|
||||
run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
|
||||
run: |
|
||||
echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Read CHANGELOG.md
|
||||
id: changelog
|
||||
run: |
|
||||
CHANGELOG=$(awk "/## \\[${{ steps.get_version.outputs.VERSION }}\\]/{p=1;print;next} /## \\[/{p=0} p" CHANGELOG.md)
|
||||
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: Install and Configure GitHub CLI
|
||||
run: |
|
||||
curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg \
|
||||
&& sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg \
|
||||
&& echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null \
|
||||
&& sudo apt update \
|
||||
&& sudo apt install gh -y
|
||||
|
||||
- name: Create Release with GitHub CLI
|
||||
|
||||
- name: Create GitHub Release
|
||||
env:
|
||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
run: |
|
||||
gh release create "${{ github.ref_name }}" \
|
||||
--title "Release ${{ steps.get_version.outputs.VERSION }}" \
|
||||
--notes "${{ steps.changelog.outputs.CHANGES }}" \
|
||||
".pio/build/esp32dev/filaman_full.bin#filaman_full.bin" \
|
||||
".pio/build/esp32dev/filaman_ota.bin#filaman_ota.bin"
|
||||
.pio/build/esp32dev/filaman_full.bin \
|
||||
.pio/build/esp32dev/filaman_ota.bin
|
367
.github/workflows/release.yml
vendored
367
.github/workflows/release.yml
vendored
@ -1,4 +1,4 @@
|
||||
name: Release
|
||||
name: Release Workflow
|
||||
|
||||
on:
|
||||
push:
|
||||
@ -6,320 +6,65 @@ on:
|
||||
- 'v*'
|
||||
|
||||
jobs:
|
||||
release:
|
||||
route:
|
||||
runs-on: ubuntu-latest
|
||||
outputs:
|
||||
provider: ${{ steps.provider.outputs.provider }}
|
||||
gitea_ref_name: ${{ steps.provider.outputs.gitea_ref_name }}
|
||||
gitea_server_url: ${{ steps.provider.outputs.gitea_server_url }}
|
||||
gitea_repository: ${{ steps.provider.outputs.gitea_repository }}
|
||||
steps:
|
||||
- name: Checkout Repository
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Debug Environment
|
||||
run: |
|
||||
echo "CI Environment Details:"
|
||||
echo "GITHUB_ACTIONS=${GITHUB_ACTIONS:-not set}"
|
||||
echo "GITEA_ACTIONS=${GITEA_ACTIONS:-not set}"
|
||||
echo "GITEA_REPOSITORY=${GITEA_REPOSITORY:-not set}"
|
||||
echo "GITEA_SERVER_URL=${GITEA_SERVER_URL:-not set}"
|
||||
echo "RUNNER_NAME=${RUNNER_NAME:-not set}"
|
||||
|
||||
- name: Determine CI Provider
|
||||
id: provider
|
||||
shell: bash
|
||||
run: |
|
||||
if [ -n "${GITEA_ACTIONS}" ] || [ -n "${GITEA_REPOSITORY}" ] || [[ "${RUNNER_NAME}" == *"gitea"* ]]; then
|
||||
echo "provider=gitea" >> "$GITHUB_OUTPUT"
|
||||
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:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Verify Gitea API Connection
|
||||
if: github.server_url != 'https://github.com'
|
||||
env:
|
||||
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
||||
GITEA_API_URL: ${{ secrets.GITEA_API_URL }}
|
||||
- name: Echo detected provider
|
||||
run: |
|
||||
# Sanitize URL
|
||||
GITEA_BASE_URL=$(echo "$GITEA_API_URL" | sed 's#/\+$##' | sed 's#/api/v1$##')
|
||||
GITEA_API_ENDPOINT="${GITEA_BASE_URL}/api/v1"
|
||||
|
||||
echo "Testing connection to Gitea API..."
|
||||
echo "API Endpoint: ${GITEA_API_ENDPOINT}"
|
||||
|
||||
# Try to get Gitea version
|
||||
RESPONSE=$(curl -sSf -w "\nHTTP_STATUS:%{http_code}" \
|
||||
-H "Authorization: token ${GITEA_TOKEN}" \
|
||||
"${GITEA_API_ENDPOINT}/version")
|
||||
|
||||
HTTP_STATUS=$(echo "$RESPONSE" | grep "HTTP_STATUS:" | cut -d":" -f2)
|
||||
API_RESPONSE=$(echo "$RESPONSE" | grep -v "HTTP_STATUS:")
|
||||
|
||||
echo "HTTP Status: ${HTTP_STATUS}"
|
||||
echo "API Response: ${API_RESPONSE}"
|
||||
|
||||
if [ "$HTTP_STATUS" != "200" ]; then
|
||||
echo "Error: Could not connect to Gitea API"
|
||||
echo "Detected CI Provider: ${{ needs.route.outputs.provider }}"
|
||||
if [ "${{ needs.route.outputs.provider }}" = "unknown" ]; then
|
||||
echo "::error::Failed to detect CI provider!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Gitea API connection successful"
|
||||
|
||||
- name: Parse and validate Gitea URL
|
||||
if: github.server_url != 'https://github.com'
|
||||
env:
|
||||
GITEA_API_URL: ${{ secrets.GITEA_API_URL }}
|
||||
run: |
|
||||
validate_url() {
|
||||
local url="$1"
|
||||
# Check if URL starts with protocol
|
||||
if [[ ! "$url" =~ ^https?:// ]]; then
|
||||
echo "Error: URL must start with http:// or https://"
|
||||
return 1
|
||||
fi
|
||||
|
||||
# Extract host part
|
||||
local host=$(echo "$url" | sed -E 's#^https?://##' | cut -d'/' -f1)
|
||||
if [ -z "$host" ]; then
|
||||
echo "Error: No host found in URL"
|
||||
return 1
|
||||
fi
|
||||
|
||||
# Validate host format (domain or IP)
|
||||
if [[ ! "$host" =~ ^[a-zA-Z0-9.-]+$ ]]; then
|
||||
echo "Error: Invalid host format"
|
||||
return 1
|
||||
fi
|
||||
|
||||
echo "URL validation passed"
|
||||
return 0
|
||||
}
|
||||
|
||||
echo "Validating Gitea API URL: $GITEA_API_URL"
|
||||
if ! validate_url "$GITEA_API_URL"; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Store validated base URL for later use
|
||||
GITEA_BASE_URL=$(echo "$GITEA_API_URL" | sed 's#/\+$##' | sed 's#/api/v1$##')
|
||||
echo "GITEA_BASE_URL=$GITEA_BASE_URL" >> $GITHUB_ENV
|
||||
|
||||
# Test URL resolution
|
||||
echo "Testing DNS resolution..."
|
||||
host=$(echo "$GITEA_BASE_URL" | sed -E 's#^https?://##' | cut -d'/' -f1)
|
||||
if ! ping -c 1 "$host" > /dev/null 2>&1; then
|
||||
echo "Warning: Could not ping host (this might be normal if ICMP is blocked)"
|
||||
fi
|
||||
|
||||
# Test HTTPS connection
|
||||
echo "Testing HTTPS connection..."
|
||||
if ! curl -sSf -o /dev/null "$GITEA_BASE_URL"; then
|
||||
echo "Error: Could not establish HTTPS connection to $GITEA_BASE_URL"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "URL validation and connection test passed"
|
||||
|
||||
- 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: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Read CHANGELOG.md
|
||||
id: changelog
|
||||
run: |
|
||||
CHANGELOG=$(awk "/## \\[${{ steps.get_version.outputs.VERSION }}\\]/{p=1;print;next} /## \\[/{p=0} p" CHANGELOG.md)
|
||||
echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
|
||||
echo "$CHANGELOG" >> $GITHUB_OUTPUT
|
||||
echo "EOF" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Install jq
|
||||
if: ${{ github.server_url != 'https://github.com' }}
|
||||
run: sudo apt-get install -y jq
|
||||
|
||||
- name: Debug Environment Variables
|
||||
run: |
|
||||
echo "GITHUB_SERVER_URL: $GITHUB_SERVER_URL"
|
||||
if [ -n "$GITEA_TOKEN" ]; then
|
||||
echo "GITEA_TOKEN is set"
|
||||
else
|
||||
echo "GITEA_TOKEN is not set"
|
||||
fi
|
||||
if [ -n "${{ secrets.GITEA_API_URL }}" ]; then
|
||||
echo "GITEA_API_URL from secrets: ${{ secrets.GITEA_API_URL }}"
|
||||
else
|
||||
echo "GITEA_API_URL is not set in secrets"
|
||||
fi
|
||||
if [ -n "${{ secrets.GITEA_REPOSITORY }}" ]; then
|
||||
echo "GITEA_REPOSITORY from secrets: ${{ secrets.GITEA_REPOSITORY }}"
|
||||
else
|
||||
echo "GITEA_REPOSITORY is not set in secrets"
|
||||
fi
|
||||
|
||||
- name: Validate Gitea Configuration
|
||||
if: github.server_url != 'https://github.com'
|
||||
run: |
|
||||
if [ -z "${{ secrets.GITEA_API_URL }}" ]; then
|
||||
echo "::error::GITEA_API_URL is not configured in repository secrets"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -z "${{ secrets.GITEA_TOKEN }}" ]; then
|
||||
echo "::error::GITEA_TOKEN is not configured in repository secrets"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -z "${{ secrets.GITEA_REPOSITORY }}" ]; then
|
||||
echo "::error::GITEA_REPOSITORY is not configured in repository secrets"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Validate URL format
|
||||
if [[ ! "${{ secrets.GITEA_API_URL }}" =~ ^https?:// ]]; then
|
||||
echo "::error::GITEA_API_URL must start with http:// or https://"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Gitea configuration is valid"
|
||||
github-release:
|
||||
needs: [route, verify-provider]
|
||||
if: needs.route.outputs.provider == 'github'
|
||||
uses: ./.github/workflows/providers/github-release.yml
|
||||
|
||||
- name: Determine and run release process
|
||||
env:
|
||||
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
||||
GITEA_API_URL: ${{ secrets.GITEA_API_URL }}
|
||||
GITEA_REPOSITORY: ${{ secrets.GITEA_REPOSITORY }}
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: |
|
||||
if [[ "$GITHUB_SERVER_URL" == "https://github.com" ]]; then
|
||||
echo "Creating GitHub Release..."
|
||||
curl -X POST \
|
||||
-H "Authorization: token ${GITHUB_TOKEN}" \
|
||||
-H "Accept: application/vnd.github.v3+json" \
|
||||
https://api.github.com/repos/${{ github.repository }}/releases \
|
||||
-d '{
|
||||
"tag_name": "${{ github.ref_name }}",
|
||||
"name": "Release ${{ steps.get_version.outputs.VERSION }}",
|
||||
"body": "${{ steps.changelog.outputs.CHANGES }}",
|
||||
"draft": false,
|
||||
"prerelease": false
|
||||
}' > release.json
|
||||
|
||||
UPLOAD_URL=$(jq -r .upload_url release.json | sed 's/{?name,label}//')
|
||||
|
||||
# Upload full firmware
|
||||
curl -X POST \
|
||||
-H "Authorization: token ${GITHUB_TOKEN}" \
|
||||
-H "Content-Type: application/octet-stream" \
|
||||
"${UPLOAD_URL}?name=filaman_full.bin" \
|
||||
--data-binary @.pio/build/esp32dev/filaman_full.bin
|
||||
|
||||
# Upload OTA firmware
|
||||
curl -X POST \
|
||||
-H "Authorization: token ${GITHUB_TOKEN}" \
|
||||
-H "Content-Type: application/octet-stream" \
|
||||
"${UPLOAD_URL}?name=filaman_ota.bin" \
|
||||
--data-binary @.pio/build/esp32dev/filaman_ota.bin
|
||||
else
|
||||
echo "Creating Gitea Release..."
|
||||
|
||||
# Validate and sanitize inputs
|
||||
if [ -z "$GITEA_TOKEN" ] || [ -z "$GITEA_API_URL" ] || [ -z "$GITEA_REPOSITORY" ]; then
|
||||
echo "Error: Missing required Gitea configuration"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Remove trailing slash and /api/v1 if present
|
||||
GITEA_BASE_URL=$(echo "$GITEA_API_URL" | sed 's#/\+$##' | sed 's#/api/v1$##')
|
||||
|
||||
# Construct proper API URL
|
||||
GITEA_API_ENDPOINT="${GITEA_BASE_URL}/api/v1"
|
||||
|
||||
echo "Debug: URL Components"
|
||||
echo "GITEA_BASE_URL: ${GITEA_BASE_URL}"
|
||||
echo "GITEA_API_ENDPOINT: ${GITEA_API_ENDPOINT}"
|
||||
echo "GITEA_REPOSITORY: ${GITEA_REPOSITORY}"
|
||||
|
||||
# Test API connection with verbose output
|
||||
echo "Testing API connection..."
|
||||
curl -v "${GITEA_API_ENDPOINT}/version" 2>&1 | tee api_test.log
|
||||
if [ ${PIPESTATUS[0]} -ne 0 ]; then
|
||||
echo "Error: Could not connect to Gitea API"
|
||||
echo "API Test Log:"
|
||||
cat api_test.log
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Prepare release data
|
||||
RELEASE_DATA=$(cat << EOF
|
||||
{
|
||||
"tag_name": "${{ github.ref_name }}",
|
||||
"name": "Release ${{ steps.get_version.outputs.VERSION }}",
|
||||
"body": $(echo "${{ steps.changelog.outputs.CHANGES }}" | jq -R -s .),
|
||||
"draft": false,
|
||||
"prerelease": false
|
||||
}
|
||||
EOF
|
||||
)
|
||||
|
||||
echo "Debug: Release Payload"
|
||||
echo "$RELEASE_DATA" | jq .
|
||||
|
||||
# Create release with full debug output
|
||||
echo "Creating release at ${GITEA_API_ENDPOINT}/repos/${GITEA_REPOSITORY}/releases"
|
||||
RESPONSE=$(curl -v -X POST \
|
||||
-H "Authorization: token ${GITEA_TOKEN}" \
|
||||
-H "Content-Type: application/json" \
|
||||
-H "Accept: application/json" \
|
||||
"${GITEA_API_ENDPOINT}/repos/${GITEA_REPOSITORY}/releases" \
|
||||
-d "$RELEASE_DATA" 2>&1 | tee release_creation.log)
|
||||
|
||||
if [ ${PIPESTATUS[0]} -ne 0 ]; then
|
||||
echo "Error: Failed to create release"
|
||||
echo "Release Creation Log:"
|
||||
cat release_creation.log
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Extract and validate release ID
|
||||
RELEASE_ID=$(echo "$RESPONSE" | jq -r .id)
|
||||
if [ -z "$RELEASE_ID" ] || [ "$RELEASE_ID" = "null" ]; then
|
||||
echo "Error: Failed to get release ID"
|
||||
echo "API Response:"
|
||||
echo "$RESPONSE" | jq .
|
||||
echo "Full Response Log:"
|
||||
cat release_creation.log
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Upload assets with debug output
|
||||
for asset in "filaman_full.bin" "filaman_ota.bin"; do
|
||||
echo "Uploading ${asset}..."
|
||||
ASSET_URL="${GITEA_API_ENDPOINT}/repos/${GITEA_REPOSITORY}/releases/${RELEASE_ID}/assets?name=${asset}"
|
||||
echo "Debug: Uploading to ${ASSET_URL}"
|
||||
|
||||
curl -v -X POST \
|
||||
-H "Authorization: token ${GITEA_TOKEN}" \
|
||||
-H "Content-Type: application/octet-stream" \
|
||||
"${ASSET_URL}" \
|
||||
--data-binary "@.pio/build/esp32dev/${asset}" 2>&1 | tee "upload_${asset}.log"
|
||||
|
||||
if [ ${PIPESTATUS[0]} -ne 0 ]; then
|
||||
echo "Error: Failed to upload ${asset}"
|
||||
echo "Upload Log:"
|
||||
cat "upload_${asset}.log"
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
|
||||
echo "Release process completed successfully"
|
||||
fi
|
||||
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 }}
|
286
CHANGELOG.md
286
CHANGELOG.md
@ -1,5 +1,291 @@
|
||||
# Changelog
|
||||
|
||||
## [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
|
||||
|
||||
|
||||
## [1.2.44] - 2025-02-19
|
||||
### Added
|
||||
- update Gitea release workflow to include additional outputs and increment version to 1.2.44
|
||||
|
||||
|
||||
## [1.2.43] - 2025-02-19
|
||||
### Added
|
||||
- update Gitea release workflow by removing unnecessary outputs and increment version to 1.2.43
|
||||
|
||||
|
||||
## [1.2.42] - 2025-02-19
|
||||
### Added
|
||||
- update Gitea release workflow to include additional outputs and increment version to 1.2.42
|
||||
|
||||
|
||||
## [1.2.41] - 2025-02-19
|
||||
### Added
|
||||
- update Gitea release workflow debug output and increment version to 1.2.41
|
||||
|
||||
|
||||
## [1.2.40] - 2025-02-19
|
||||
### Added
|
||||
- add inputs for Gitea release workflow and increment version to 1.2.40
|
||||
|
||||
|
||||
## [1.2.39] - 2025-02-19
|
||||
### Added
|
||||
- update Gitea release workflow to use Python virtual environment and increment version to 1.2.39
|
||||
|
||||
|
||||
## [1.2.38] - 2025-02-19
|
||||
### Added
|
||||
- update Gitea release workflow and increment version to 1.2.38
|
||||
|
||||
|
||||
## [1.2.37] - 2025-02-19
|
||||
### Added
|
||||
- update Gitea release workflow and increment version to 1.2.37
|
||||
|
||||
|
||||
## [1.2.36] - 2025-02-19
|
||||
### Added
|
||||
- update Gitea release workflow and increment version to 1.2.36
|
||||
|
||||
|
||||
## [1.2.35] - 2025-02-19
|
||||
### Added
|
||||
- update Gitea release workflow and version to 1.2.35
|
||||
|
||||
|
||||
## [1.2.34] - 2025-02-19
|
||||
### Added
|
||||
- update version to 1.2.34 and enhance Gitea and GitHub release workflows
|
||||
|
||||
|
||||
## [1.2.33] - 2025-02-19
|
||||
### Added
|
||||
- update version to 1.2.33 and refactor release workflows for Gitea and GitHub
|
||||
|
||||
|
||||
## [1.2.32] - 2025-02-19
|
||||
### Added
|
||||
- update version to 1.2.32 and adjust workflow dependencies for GitHub and Gitea releases
|
||||
|
||||
|
||||
## [1.2.31] - 2025-02-19
|
||||
### Added
|
||||
- update version to 1.2.31
|
||||
|
||||
|
||||
## [1.2.30] - 2025-02-19
|
||||
### Added
|
||||
- update version to 1.2.30 and enhance release workflows for Gitea and GitHub with improved artifact handling and changelog integration
|
||||
|
||||
|
||||
## [1.2.29] - 2025-02-19
|
||||
### Added
|
||||
- update version to 1.2.29 and enhance Gitea release workflow with improved error handling and debugging
|
||||
|
||||
|
||||
## [1.2.28] - 2025-02-19
|
||||
### Added
|
||||
- add build and release workflows for Gitea and GitHub, increment version to 1.2.28
|
||||
|
||||
|
||||
## [1.2.27] - 2025-02-19
|
||||
### Added
|
||||
- enhance CI workflows with provider detection and update version to 1.2.27
|
||||
|
||||
|
||||
## [1.2.26] - 2025-02-19
|
||||
### Added
|
||||
- update release workflows for Gitea and GitHub, increment version to 1.2.26
|
||||
|
||||
|
||||
## [1.2.25] - 2025-02-19
|
||||
### Added
|
||||
- update GitHub release workflows and increment version to 1.2.25
|
||||
|
||||
|
||||
## [1.2.24] - 2025-02-19
|
||||
### Added
|
||||
- update GitHub release workflow and increment version to 1.2.24
|
||||
|
||||
|
||||
## [1.2.23] - 2025-02-19
|
||||
### Added
|
||||
- update Gitea release workflow and increment version to 1.2.23
|
||||
|
||||
|
||||
## [1.2.22] - 2025-02-19
|
||||
### Added
|
||||
- update Gitea runner configuration and increment version to 1.2.22
|
||||
|
||||
|
||||
## [1.2.21] - 2025-02-19
|
||||
### Added
|
||||
- update Gitea release condition and increment version to 1.2.21
|
||||
|
||||
|
||||
## [1.2.20] - 2025-02-19
|
||||
### Added
|
||||
- update release workflows for GitHub and Gitea, increment version to 1.2.20
|
||||
|
||||
|
||||
## [1.2.19] - 2025-02-19
|
||||
### Added
|
||||
- add Gitea and GitHub release workflows for version 1.2.19
|
||||
|
||||
|
||||
## [1.2.18] - 2025-02-19
|
||||
### Added
|
||||
- remove Gitea and GitHub release workflows and increment version to 1.2.18
|
||||
|
||||
|
||||
## [1.2.17] - 2025-02-19
|
||||
### Added
|
||||
- update Gitea release workflow for version 1.2.17 and improve job structure
|
||||
|
||||
|
||||
## [1.2.16] - 2025-02-19
|
||||
### Added
|
||||
- update Gitea release workflow and increment version to 1.2.16
|
||||
|
||||
|
||||
## [1.2.15] - 2025-02-19
|
||||
### Added
|
||||
- update version to 1.2.15 and clean up Gitea release workflow
|
||||
|
||||
|
||||
## [1.2.14] - 2025-02-19
|
||||
### Added
|
||||
- update version to 1.2.14 and refactor release workflows for improved GitHub and Gitea support
|
||||
|
||||
|
||||
## [1.2.13] - 2025-02-19
|
||||
### Added
|
||||
- update version to 1.2.13 and enhance release workflow with Python setup and Gitea support
|
||||
|
||||
|
||||
## [1.2.12] - 2025-02-19
|
||||
### Added
|
||||
- update version to 1.2.12 and refactor release workflows for improved provider detection and execution
|
||||
|
||||
|
||||
## [1.2.11] - 2025-02-18
|
||||
### Added
|
||||
- update version to 1.2.11 and enhance GitHub and Gitea release workflows with input validation and improved error handling
|
||||
|
||||
|
||||
## [1.2.10] - 2025-02-18
|
||||
### Added
|
||||
- enhance Gitea release workflow with API connection verification and URL validation; update version to 1.2.10
|
||||
|
@ -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.4</span></h1>
|
||||
<h1>FilaMan<span class="version">v1.2.63</span></h1>
|
||||
<h4>Filament Management Tool</h4>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -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.4</span></h1>
|
||||
<h1>FilaMan<span class="version">v1.2.63</span></h1>
|
||||
<h4>Filament Management Tool</h4>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -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.4</span></h1>
|
||||
<h1>FilaMan<span class="version">v1.2.63</span></h1>
|
||||
<h4>Filament Management Tool</h4>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -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.4</span></h1>
|
||||
<h1>FilaMan<span class="version">v1.2.63</span></h1>
|
||||
<h4>Filament Management Tool</h4>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -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.4</span></h1>
|
||||
<h1>FilaMan<span class="version">v1.2.63</span></h1>
|
||||
<h4>Filament Management Tool</h4>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -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.4</span></h1>
|
||||
<h1>FilaMan<span class="version">v1.2.63</span></h1>
|
||||
<h4>Filament Management Tool</h4>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -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.4</span></h1>
|
||||
<h1>FilaMan<span class="version">v1.2.63</span></h1>
|
||||
<h4>Filament Management Tool</h4>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -9,7 +9,7 @@
|
||||
; https://docs.platformio.org/page/projectconf.html
|
||||
|
||||
[common]
|
||||
version = "1.2.10"
|
||||
version = "1.2.63"
|
||||
|
||||
[env:esp32dev]
|
||||
platform = espressif32
|
||||
|
37
src/ota.cpp
37
src/ota.cpp
@ -4,8 +4,14 @@
|
||||
#include <SPIFFS.h>
|
||||
#include "commonFS.h"
|
||||
|
||||
// Magic byte patterns für verschiedene Image-Typen
|
||||
const uint8_t FIRMWARE_MAGIC = 0xE9;
|
||||
const uint8_t ESP_MAGIC = 0xE9;
|
||||
|
||||
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;
|
||||
|
||||
if (!index) {
|
||||
contentLength = request->contentLength();
|
||||
@ -16,20 +22,34 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
|
||||
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\"}");
|
||||
// Prüfe Magic Byte für Image-Typ
|
||||
if (data[0] == ESP_MAGIC) {
|
||||
// Normales Firmware Image oder full.bin
|
||||
isFullImage = (contentLength > 0x3D0000);
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
Serial.println(isFullImage ? "Full image update started" : "Firmware update started");
|
||||
} else {
|
||||
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid image format\"}");
|
||||
return;
|
||||
}
|
||||
|
||||
Serial.println("Update started");
|
||||
currentOffset = 0;
|
||||
}
|
||||
|
||||
|
||||
// Schreibe Daten
|
||||
if (Update.write(data, len) != len) {
|
||||
Update.printError(Serial);
|
||||
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update\"}");
|
||||
String errorMsg = Update.errorString();
|
||||
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update: " + errorMsg + "\"}");
|
||||
return;
|
||||
}
|
||||
|
||||
currentOffset += len;
|
||||
|
||||
if (final) {
|
||||
if (Update.end(true)) {
|
||||
@ -38,8 +58,9 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
|
||||
delay(1000);
|
||||
ESP.restart();
|
||||
} else {
|
||||
String errorMsg = Update.errorString();
|
||||
Update.printError(Serial);
|
||||
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update failed\"}");
|
||||
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update failed: " + errorMsg + "\"}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user