CloneRepos/CYD-Klipper
2
0
Fork 0
mirror of https://github.com/suchmememanyskill/CYD-Klipper.git synced 2026-03-21 05:33:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try 4

Browse Source
This commit is contained in:
suchmememanyskill
2023-11-13 16:30:12 +01:00
parent ed024077ee
commit ecc9e5ea99
5 changed files with 40 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.github/workflows/compile.yaml vendored
View File

@@ -30,7 +30,6 @@ jobs:
- name: Make output dir - name: Make output dir
run: | run: |
mkdir -p output mkdir -p output
mkdir -p _site
- name: Build Binary - name: Build Binary
run: | run: |
@@ -39,20 +38,13 @@ jobs:
cp ./CYD-Klipper-Display/.pio/build/esp32dev/firmware.bin output cp ./CYD-Klipper-Display/.pio/build/esp32dev/firmware.bin output
cp ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin output cp ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin output
python3 -m esptool --chip esp32 merge_bin -o ./output/merged-firmware.bin --flash_mode dio --flash_freq 40m --flash_size 4MB 0x1000 ./output/bootloader.bin 0x8000 ./output/partitions.bin 0xe000 ./output/boot_app0.bin 0x10000 ./output/firmware.bin python3 -m esptool --chip esp32 merge_bin -o ./output/merged-firmware.bin --flash_mode dio --flash_freq 40m --flash_size 4MB 0x1000 ./output/bootloader.bin 0x8000 ./output/partitions.bin 0xe000 ./output/boot_app0.bin 0x10000 ./output/firmware.bin
cp -r ./output ./_site
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: firmware name: firmware
path: ./output path: ./output
- name: Make webpage
run: |
cp -r ./output ./_site
python3 generate_manifest.py
cp manifest.json ./_site
cp manifest_wipe.json ./_site
cp index.html ./_site
- name: Upload GitHub Page Artifact - name: Upload GitHub Page Artifact
uses: actions/upload-pages-artifact@v2 uses: actions/upload-pages-artifact@v2

0
index.html → _site/index.html
View File

27
_site/manifest.json Normal file
View File

@@ -0,0 +1,27 @@
{
"name": "CYD-Klipper-Display",
"new_install_prompt_erase": false,
"builds": [
{
"chipFamily": "ESP32",
"parts": [
{
"path": "output/bootloader.bin",
"offset": 4096
},
{
"path": "output/partitions.bin",
"offset": 32768
},
{
"path": "output/boot_app0.bin",
"offset": 57344
},
{
"path": "output/firmware.bin",
"offset": 65536
}
]
}
]
}

10
_site/manifest_wipe.json Normal file
View File

@@ -0,0 +1,10 @@
{
"name": "CYD-Klipper-Display",
"new_install_prompt_erase": false,
"builds": [
{
"path": "output/merged-firmware.bin",
"offset": 0
}
]
}

50
generate_manifest.py
View File

@@ -1,50 +0,0 @@
import subprocess, json
latest_tag = subprocess.check_output(["git", "describe", "--tags", "--abbrev=0"])
data_without_wipe = {
"name": "CYD-Klipper-Display",
"new_install_prompt_erase": False,
"version": latest_tag.decode("utf-8").strip(),
"builds": [
{
"chipFamily": "ESP32",
"parts": [
{
"path": "output/bootloader.bin",
"offset": 4096
},
{
"path": "output/partitions.bin",
"offset": 32768
},
{
"path": "output/boot_app0.bin",
"offset": 57344
},
{
"path": "output/firmware.bin",
"offset": 65536
}
]
}
]
}
data_with_wipe = {
"name": "CYD-Klipper-Display",
"new_install_prompt_erase": False,
"version": latest_tag.decode("utf-8").strip(),
"builds": [
{
"path": "output/merged-firmware.bin",
"offset": 0
}
]
}
with open("manifest.json", "w") as f:
json.dump(data_without_wipe, f, indent=4)
with open("manifest_wipe.json", "w") as f:
json.dump(data_with_wipe, f, indent=4)