Merge branch 'master' into master

This commit is contained in:
Mictronics 2024-11-21 20:43:51 +01:00 committed by GitHub
commit 893d8cfc4f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions

View File

@ -53,7 +53,7 @@ IF EXIST %FILENAME% IF x%FILENAME:update=%==x%FILENAME% (
%ESPTOOL_CMD% --baud 115200 write_flash 0x260000 bleota-s3.bin %ESPTOOL_CMD% --baud 115200 write_flash 0x260000 bleota-s3.bin
) )
IF %WEB_APP%==1 ( IF %WEB_APP%==1 (
for %%f in (littlefsweb-*.bin) do ( for %%f in (littlefswebui-*.bin) do (
%ESPTOOL_CMD% --baud 115200 write_flash 0x300000 %%f %ESPTOOL_CMD% --baud 115200 write_flash 0x300000 %%f
) )
) else ( ) else (

View File

@ -85,7 +85,7 @@ if [ -f "${FILENAME}" ] && [ -n "${FILENAME##*"update"*}" ]; then
$ESPTOOL_CMD write_flash 0x260000 bleota-s3.bin $ESPTOOL_CMD write_flash 0x260000 bleota-s3.bin
fi fi
if [ "$WEB_APP" = true ]; then if [ "$WEB_APP" = true ]; then
$ESPTOOL_CMD write_flash 0x300000 littlefsweb-*.bin $ESPTOOL_CMD write_flash 0x300000 littlefswebui-*.bin
else else
$ESPTOOL_CMD write_flash 0x300000 littlefs-*.bin $ESPTOOL_CMD write_flash 0x300000 littlefs-*.bin
fi fi