ElixirForge/firmware
1
0
Fork 0
mirror of https://github.com/alexhopeoconnor/firmware.git synced 2026-10-17 17:11:30 +10:00
Code Releases Activity

Merge branch 'pioarduino' into crowpanel-p4

Browse Source
This commit is contained in:
Manuel
2026-04-23 18:05:07 +02:00
committed by GitHub
parent 407ab7abda c6282d3a3c
commit 91314c40f5
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/build-esp32.sh
+2 -2
View File
@@ -33,9 +33,9 @@ echo "Copying ESP32 update bin file"
cp $BUILDDIR/$basename.bin $OUTDIR/$basename.bin
echo "Copying Filesystem for ESP32 targets"
cp $BUILDDIR/littlefs-$1-$VERSION.bin $OUTDIR/littlefs-$1-$VERSION.bin || true
cp $BUILDDIR/littlefs-$1-$VERSION.bin $OUTDIR/littlefs-$1-$VERSION.bin
cp bin/device-install.* $OUTDIR/
cp bin/device-update.* $OUTDIR/
echo "Copying manifest"
cp $BUILDDIR/$basename.mt.json $OUTDIR/$basename.mt.json || true
cp $BUILDDIR/$basename.mt.json $OUTDIR/$basename.mt.json
bin/platformio-custom.py
+1 -2
View File
@@ -301,8 +301,7 @@ if not should_skip_manifest and platform.name == "espressif32":
target_lfs = env.DataToBin(
join("$BUILD_DIR", "${ESP32_FS_IMAGE_NAME}"), "$PROJECT_DATA_DIR"
)
# prepend the littlefs target to the mtjson dependencies
# mtjson_deps.insert(0, target_lfs)
mtjson_deps.append(target_lfs)
if should_skip_manifest:
def skip_manifest(source, target, env):
variants/esp32/esp32-common.ini
+3
View File
@@ -7,6 +7,9 @@ platform =
# TODO renovate
https://github.com/pioarduino/platform-espressif32/releases/download/55.03.38-1/platform-espressif32.zip
; https://github.com/pioarduino/platform-espressif32.git#develop
platform_packages =
# renovate: datasource=custom.pio depName=platformio/tool-mklittlefs packageName=platformio/tool/tool-mklittlefs
platformio/tool-mklittlefs@1.203.210628
extra_scripts =
${env.extra_scripts}
variants/esp32/esp32.ini
-1
View File
@@ -47,7 +47,6 @@ lib_deps =
${radiolib_base.lib_deps}
${environmental_base.lib_deps}
${environmental_extra_no_bsec.lib_deps}
${radiolib_base.lib_deps}
# TODO renovate
https://github.com/mverch67/libpax/archive/6f52ee989301cdabaeef00bcbf93bff55708ce2f.zip
# renovate: datasource=custom.pio depName=XPowersLib packageName=lewisxhe/library/XPowersLib
variants/esp32s3/rak3312/platformio.ini
+1 -1
View File
@@ -29,7 +29,7 @@ board_level = extra
upload_protocol = esptool
build_flags =
${esp32_base.build_flags}
${esp32s3_base.build_flags}
-D RAK3312
-D _VARIANT_RAK3112_
-I variants/esp32s3/rak3312