mirror/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2026-03-19 23:58:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove owner from ToRadio

Browse Source
This commit is contained in:
geeksville
2020-04-23 10:30:14 -07:00
parent 562b227c73
commit c67b53b969
4 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/PhoneAPI.cpp
View File

@@ -34,6 +34,7 @@ void PhoneAPI::handleToRadio(const uint8_t *buf, size_t bufLength)
state = STATE_SEND_MY_INFO;
DEBUG_MSG("Reset nodeinfo read pointer\n");
nodeInfoForPhone = NULL; // Don't keep returning old nodeinfos
nodeDB.resetReadPointer(); // FIXME, this read pointer should be moved out of nodeDB and into this class - because
// this will break once we have multiple instances of PhoneAPI running independently
break;
@@ -62,10 +63,9 @@ void PhoneAPI::handleToRadio(const uint8_t *buf, size_t bufLength)
*
* We assume buf is at least FromRadio_size bytes long.
*
* Our sending states progress in the following sequence:
* Our sending states progress in the following sequence (the client app ASSUMES THIS SEQUENCE, DO NOT CHANGE IT):
* STATE_SEND_MY_INFO, // send our my info record
STATE_SEND_RADIO,
STATE_SEND_OWNER,
STATE_SEND_NODEINFO, // states progress in this order as the device sends to to the client
STATE_SEND_COMPLETE_ID,
STATE_SEND_PACKETS // send packets or debug strings
@@ -92,17 +92,11 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
case STATE_SEND_RADIO:
fromRadioScratch.which_variant = FromRadio_radio_tag;
fromRadioScratch.variant.radio = radioConfig;
state = STATE_SEND_OWNER;
break;
case STATE_SEND_OWNER:
fromRadioScratch.which_variant = FromRadio_owner_tag;
fromRadioScratch.variant.owner = owner;
state = STATE_SEND_NODEINFO;
break;
case STATE_SEND_NODEINFO: {
const NodeInfo *info = nodeDB.readNextInfo();
const NodeInfo *info = nodeInfoForPhone;
if (info) {
DEBUG_MSG("Sending nodeinfo: num=0x%x, lastseen=%u, id=%s, name=%s\n", info->num, info->position.time, info->user.id,
@@ -168,10 +162,9 @@ bool PhoneAPI::available()
return true;
case STATE_SEND_NODEINFO:
return true;
case STATE_SEND_OWNER:
return true;
if (!nodeInfoForPhone)
nodeInfoForPhone = nodeDB.readNextInfo();
return true; // Always say we have something, because we might need to advance our state machine
case STATE_SEND_RADIO:
return true;
@@ -225,7 +218,6 @@ void PhoneAPI::handleSetRadio(const RadioConfig &r)
service.reloadConfig();
}
/**
* Handle a packet that the phone wants us to send. It is our responsibility to free the packet to the pool
*/