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

Fix for nodeInfo change to inform phone

Browse Source
This commit is contained in:
Manuel Verch 2023-04-11 13:16:19 +02:00 committed by Thomas Göttgens
parent 320bf57687
commit f0c4c18a79
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mesh/NodeDB.cpp
View File

@ -689,11 +689,11 @@ void NodeDB::updateTelemetry(uint32_t nodeId, const meshtastic_Telemetry &t, RxS
/** Update user info for this node based on received user data /** Update user info for this node based on received user data
*/ */
void NodeDB::updateUser(uint32_t nodeId, const meshtastic_User &p) bool NodeDB::updateUser(uint32_t nodeId, const meshtastic_User &p)
{ {
meshtastic_NodeInfo *info = getOrCreateNode(nodeId); meshtastic_NodeInfo *info = getOrCreateNode(nodeId);
if (!info) { if (!info) {
return; return false;
} }
LOG_DEBUG("old user %s/%s/%s\n", info->user.id, info->user.long_name, info->user.short_name); LOG_DEBUG("old user %s/%s/%s\n", info->user.id, info->user.long_name, info->user.short_name);
@ -713,6 +713,8 @@ void NodeDB::updateUser(uint32_t nodeId, const meshtastic_User &p)
// We just changed something important about the user, store our DB // We just changed something important about the user, store our DB
saveToDisk(SEGMENT_DEVICESTATE); saveToDisk(SEGMENT_DEVICESTATE);
} }
return changed;
} }
/// given a subpacket sniffed from the network, update our DB state /// given a subpacket sniffed from the network, update our DB state

2
src/mesh/NodeDB.h
View File

@ -86,7 +86,7 @@ class NodeDB
/** Update user info for this node based on received user data /** Update user info for this node based on received user data
*/ */
void updateUser(uint32_t nodeId, const meshtastic_User &p); bool updateUser(uint32_t nodeId, const meshtastic_User &p);
/// @return our node number /// @return our node number
NodeNum getNodeNum() { return myNodeInfo.my_node_num; } NodeNum getNodeNum() { return myNodeInfo.my_node_num; }

6
src/modules/NodeInfoModule.cpp
View File

@ -12,7 +12,7 @@ bool NodeInfoModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, mes
{ {
auto p = *pptr; auto p = *pptr;
nodeDB.updateUser(getFrom(&mp), p); bool hasChanged = nodeDB.updateUser(getFrom(&mp), p);
bool wasBroadcast = mp.to == NODENUM_BROADCAST; bool wasBroadcast = mp.to == NODENUM_BROADCAST;
@ -23,6 +23,10 @@ bool NodeInfoModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, mes
screen->print(lcd.c_str()); screen->print(lcd.c_str());
} }
// if user has changed while packet was not for us, inform phone
if (hasChanged && !wasBroadcast && mp.to != nodeDB.getNodeNum())
service.sendToPhone(packetPool.allocCopy(mp));
// LOG_DEBUG("did handleReceived\n"); // LOG_DEBUG("did handleReceived\n");
return false; // Let others look at this message also if they want return false; // Let others look at this message also if they want
} }