pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-23 17:13:38 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Backing out partition changes for testing

Browse Source
This commit is contained in:
Ben Meadors 2022-08-20 09:33:17 -05:00
parent 10c36da096
commit 191ed6489c
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/device-install.bat
View File

@ -31,7 +31,7 @@ IF EXIST %FILENAME% (
%PYTHON% -m esptool --baud 115200 erase_flash %PYTHON% -m esptool --baud 115200 erase_flash
%PYTHON% -m esptool --baud 115200 write_flash 0x1000 system-info.bin %PYTHON% -m esptool --baud 115200 write_flash 0x1000 system-info.bin
for %%f in (littlefs-*.bin) do ( for %%f in (littlefs-*.bin) do (
%PYTHON% -m esptool --baud 115200 write_flash 0x2B0000 %%f %PYTHON% -m esptool --baud 115200 write_flash 0x00390000 %%f
) )
%PYTHON% -m esptool --baud 115200 write_flash 0x10000 %FILENAME% %PYTHON% -m esptool --baud 115200 write_flash 0x10000 %FILENAME%
) else ( ) else (

2
bin/device-install.sh
View File

@ -48,7 +48,7 @@ if [ -f "${FILENAME}" ]; then
echo "Trying to flash ${FILENAME}, but first erasing and writing system information" echo "Trying to flash ${FILENAME}, but first erasing and writing system information"
"$PYTHON" -m esptool erase_flash "$PYTHON" -m esptool erase_flash
"$PYTHON" -m esptool write_flash 0x1000 system-info.bin "$PYTHON" -m esptool write_flash 0x1000 system-info.bin
"$PYTHON" -m esptool write_flash 0x2B0000 littlefs-*.bin "$PYTHON" -m esptool write_flash 0x00390000 littlefs-*.bin
"$PYTHON" -m esptool write_flash 0x10000 ${FILENAME} "$PYTHON" -m esptool write_flash 0x10000 ${FILENAME}
else else
echo "Invalid file: ${FILENAME}" echo "Invalid file: ${FILENAME}"

5
partition-table.csv
View File

@ -3,5 +3,6 @@
# Name, Type, SubType, Offset, Size, Flags # Name, Type, SubType, Offset, Size, Flags
nvs, data, nvs, 0x9000, 0x5000, nvs, data, nvs, 0x9000, 0x5000,
otadata, data, ota, 0xe000, 0x2000, otadata, data, ota, 0xe000, 0x2000,
app0, app, ota_0, 0x10000, 0x2A0000, app0, app, ota_0, 0x10000, 0x1c0000,
spiffs, data, spiffs, 0x2B0000,0x150000, app1, app, ota_1, 0x1d0000,0x1c0000,
spiffs, data, spiffs, 0x390000,0x070000,
1 # FIXME! using the genpartitions based table doesn't work on TTGO so for now I stay with my old memory map
3 # Name, Type, SubType, Offset, Size, Flags
4 nvs, data, nvs, 0x9000, 0x5000,
5 otadata, data, ota, 0xe000, 0x2000,
6 app0, app, ota_0, 0x10000, 0x2A0000, app0, app, ota_0, 0x10000, 0x1c0000,
7 spiffs, data, spiffs, 0x2B0000,0x150000, app1, app, ota_1, 0x1d0000,0x1c0000,
8 spiffs, data, spiffs, 0x390000,0x070000,

8
src/mesh/MeshService.cpp
View File

@ -177,11 +177,9 @@ void MeshService::sendNetworkPing(NodeNum dest, bool wantReplies)
DEBUG_MSG("Sending position ping to 0x%x, wantReplies=%d\n", dest, wantReplies); DEBUG_MSG("Sending position ping to 0x%x, wantReplies=%d\n", dest, wantReplies);
positionModule->sendOurPosition(dest, wantReplies); positionModule->sendOurPosition(dest, wantReplies);
} }
} else { } else if (nodeInfoModule) {
if (nodeInfoModule) { DEBUG_MSG("Sending nodeinfo ping to 0x%x, wantReplies=%d\n", dest, wantReplies);
DEBUG_MSG("Sending nodeinfo ping to 0x%x, wantReplies=%d\n", dest, wantReplies); nodeInfoModule->sendOurNodeInfo(dest, wantReplies);
nodeInfoModule->sendOurNodeInfo(dest, wantReplies);
}
} }
} }