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

Merge branch 'master' into ble_output_gpwpl

Browse Source
This commit is contained in:
lcflyr 2025-05-29 13:45:09 +08:00 committed by GitHub
commit 6ffc295736
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
protobufs

@ -1 +1 @@
Subproject commit 022ea79bad79b70d0bee286cd9184916ab47c1b1
Subproject commit 24c7a3d287a4bd269ce191827e5dabd8ce8f57a7

4
src/mesh/generated/meshtastic/mesh.pb.h
View File

@ -252,10 +252,10 @@ typedef enum _meshtastic_HardwareModel {
meshtastic_HardwareModel_LINK_32 = 98,
/* *
Seeed Tracker L1 */
meshtastic_HardwareModel_SEEED_TRACKER_L1 = 99,
meshtastic_HardwareModel_SEEED_WIO_TRACKER_L1 = 99,
/* *
Seeed Tracker L1 EINK driver */
meshtastic_HardwareModel_SEEED_TRACKER_L1_EINK = 100,
meshtastic_HardwareModel_SEEED_WIO_TRACKER_L1_EINK = 100,
/* Reserved ID for future and past use */
meshtastic_HardwareModel_QWANTZ_TINY_ARMS = 101,
/* ------------------------------------------------------------------------------------------------------------------------------------------

3
src/modules/NodeInfoModule.cpp
View File

@ -14,6 +14,9 @@ bool NodeInfoModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, mes
{
auto p = *pptr;
// Coerce user.id to be derived from the node number
snprintf(p.id, sizeof(p.id), "!%08x", getFrom(&mp));
bool hasChanged = nodeDB->updateUser(getFrom(&mp), p, mp.channel);
bool wasBroadcast = isBroadcast(mp.to);