Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

--web littlefswebui-* typo fix #5416

Merged
merged 7 commits into from
Nov 21, 2024
Merged

--web littlefswebui-* typo fix #5416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a935b00
Add --web
gjelsoe Nov 18, 2024
eef6014
Update device-install.bat
gjelsoe Nov 20, 2024
c0fb75c
Merge branch 'meshtastic:master' into web
gjelsoe Nov 20, 2024
bc0fa75
Merge branch 'master' into web
thebentern Nov 20, 2024
070c343
Typo fix.
gjelsoe Nov 21, 2024
2fbec87
Typo fix
gjelsoe Nov 21, 2024
7b283ba
Merge branch 'master' into web
GUVWAF Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/device-install.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ IF EXIST %FILENAME% IF x%FILENAME:update=%==x%FILENAME% (
%ESPTOOL_CMD% --baud 115200 write_flash 0x260000 bleota-s3.bin
)
IF %WEB_APP%==1 (
for %%f in (littlefsweb-*.bin) do (
for %%f in (littlefswebui-*.bin) do (
%ESPTOOL_CMD% --baud 115200 write_flash 0x300000 %%f
)
) else (
Expand Down
2 changes: 1 addition & 1 deletion bin/device-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ if [ -f "${FILENAME}" ] && [ -n "${FILENAME##*"update"*}" ]; then
$ESPTOOL_CMD write_flash 0x260000 bleota-s3.bin
fi
if [ "$WEB_APP" = true ]; then
$ESPTOOL_CMD write_flash 0x300000 littlefsweb-*.bin
$ESPTOOL_CMD write_flash 0x300000 littlefswebui-*.bin
else
$ESPTOOL_CMD write_flash 0x300000 littlefs-*.bin
fi
Expand Down