mirror of
https://github.com/meshtastic/firmware.git
synced 2025-06-19 19:42:32 +00:00
Merge branch 'master' into tft-gui-work
This commit is contained in:
commit
1776e99b0d
@ -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;
|
|
||||||
if (config_state < filesManifest.size()) {
|
|
||||||
fromRadioScratch.fileInfo = filesManifest.at(config_state);
|
|
||||||
config_state++;
|
|
||||||
// last element
|
// last element
|
||||||
if (config_state == filesManifest.size()) {
|
if (config_state == filesManifest.size()) { // also handles an empty filesManifest
|
||||||
state = STATE_SEND_COMPLETE_ID;
|
state = STATE_SEND_COMPLETE_ID;
|
||||||
config_state = 0;
|
config_state = 0;
|
||||||
}
|
} else {
|
||||||
|
fromRadioScratch.which_payload_variant = meshtastic_FromRadio_fileInfo_tag;
|
||||||
|
fromRadioScratch.fileInfo = filesManifest.at(config_state);
|
||||||
|
config_state++;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user