pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-19 19:42:32 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge branch 'tft-gui-work' of https://github.com/meshtastic/firmware into tft-gui-work

Browse Source
This commit is contained in:
mverch67 2024-06-28 14:35:07 +02:00
commit 106db1facc
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.vscode/settings.json vendored
View File

@ -4,5 +4,8 @@
"trunk.enableWindows": true, "trunk.enableWindows": true,
"files.insertFinalNewline": false, "files.insertFinalNewline": false,
"files.trimFinalNewlines": false, "files.trimFinalNewlines": false,
"cmake.configureOnOpen": false "cmake.configureOnOpen": false,
"[cpp]": {
"editor.defaultFormatter": "trunk.io"
}
} }

13
src/mesh/PhoneAPI.cpp
View File

@ -354,15 +354,14 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
case STATE_SEND_FILEMANIFEST: { case STATE_SEND_FILEMANIFEST: {
LOG_INFO("getFromRadio=STATE_SEND_FILEMANIFEST\n"); LOG_INFO("getFromRadio=STATE_SEND_FILEMANIFEST\n");
fromRadioScratch.which_payload_variant = meshtastic_FromRadio_fileInfo_tag; // last element
if (config_state < filesManifest.size()) { if (config_state == filesManifest.size()) { // also handles an empty filesManifest
state = STATE_SEND_COMPLETE_ID;
config_state = 0;
} else {
fromRadioScratch.which_payload_variant = meshtastic_FromRadio_fileInfo_tag;
fromRadioScratch.fileInfo = filesManifest.at(config_state); fromRadioScratch.fileInfo = filesManifest.at(config_state);
config_state++; config_state++;
// last element
if (config_state == filesManifest.size()) {
state = STATE_SEND_COMPLETE_ID;
config_state = 0;
}
} }
break; break;
} }