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

Fix flakey phone api transition from file manifest to complete (#4209)

Browse Source 
* Try fix flakey phone api transition from file manifest to complete

* Skip
This commit is contained in:
Ben Meadors 2024-06-30 08:22:24 -05:00 committed by GitHub
parent b5d7718319
commit 469ae0ff84
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/mesh/PhoneAPI.cpp
View File

@ -355,9 +355,10 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
LOG_INFO("getFromRadio=STATE_SEND_FILEMANIFEST\n"); LOG_INFO("getFromRadio=STATE_SEND_FILEMANIFEST\n");
// last element // last element
if (config_state == filesManifest.size()) { // also handles an empty filesManifest if (config_state == filesManifest.size()) { // also handles an empty filesManifest
state = STATE_SEND_COMPLETE_ID;
config_state = 0; config_state = 0;
filesManifest.clear(); filesManifest.clear();
// Skip to complete packet
sendConfigComplete();
} else { } else {
fromRadioScratch.which_payload_variant = meshtastic_FromRadio_fileInfo_tag; fromRadioScratch.which_payload_variant = meshtastic_FromRadio_fileInfo_tag;
fromRadioScratch.fileInfo = filesManifest.at(config_state); fromRadioScratch.fileInfo = filesManifest.at(config_state);
@ -368,12 +369,7 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
} }
case STATE_SEND_COMPLETE_ID: case STATE_SEND_COMPLETE_ID:
LOG_INFO("getFromRadio=STATE_SEND_COMPLETE_ID\n"); sendConfigComplete();
fromRadioScratch.which_payload_variant = meshtastic_FromRadio_config_complete_id_tag;
fromRadioScratch.config_complete_id = config_nonce;
config_nonce = 0;
state = STATE_SEND_PACKETS;
pauseBluetoothLogging = false;
break; break;
case STATE_SEND_PACKETS: case STATE_SEND_PACKETS:
@ -419,6 +415,16 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
return 0; return 0;
} }
void PhoneAPI::sendConfigComplete()
{
LOG_INFO("getFromRadio=STATE_SEND_COMPLETE_ID\n");
fromRadioScratch.which_payload_variant = meshtastic_FromRadio_config_complete_id_tag;
fromRadioScratch.config_complete_id = config_nonce;
config_nonce = 0;
state = STATE_SEND_PACKETS;
pauseBluetoothLogging = false;
}
void PhoneAPI::handleDisconnect() void PhoneAPI::handleDisconnect()
{ {
filesManifest.clear(); filesManifest.clear();

2
src/mesh/PhoneAPI.h
View File

@ -104,6 +104,8 @@ class PhoneAPI
*/ */
size_t getFromRadio(uint8_t *buf); size_t getFromRadio(uint8_t *buf);
void sendConfigComplete();
/** /**
* Return true if we have data available to send to the phone * Return true if we have data available to send to the phone
*/ */