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

remove support for 8bit nodenums

Browse Source
This commit is contained in:
Kevin Hester 2020-11-28 09:56:21 +08:00
parent f5e42b2533
commit ddab4a0235
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mesh/MeshService.cpp
View File

@ -93,7 +93,8 @@ const MeshPacket *MeshService::handleFromRadioUser(const MeshPacket *mp)
bool wasBroadcast = mp->to == NODENUM_BROADCAST; bool wasBroadcast = mp->to == NODENUM_BROADCAST;
// Disable this collision testing if we use 32 bit nodenums // Disable this collision testing if we use 32 bit nodenums
bool isCollision = (sizeof(NodeNum) == 1) && (mp->from == myNodeInfo.my_node_num); // (We do this always now, because we don't use 8 bit nodenums since 0.6 ish)
bool isCollision = false; // (sizeof(NodeNum) == 1) && (mp->from == myNodeInfo.my_node_num);
if (isCollision) { if (isCollision) {
// we win if we have a lower macaddr // we win if we have a lower macaddr

2
src/mesh/MeshTypes.h
View File

@ -9,7 +9,7 @@
typedef uint32_t NodeNum; typedef uint32_t NodeNum;
typedef uint32_t PacketId; // A packet sequence number typedef uint32_t PacketId; // A packet sequence number
#define NODENUM_BROADCAST (sizeof(NodeNum) == 4 ? UINT32_MAX : UINT8_MAX) #define NODENUM_BROADCAST UINT32_MAX
#define ERRNO_OK 0 #define ERRNO_OK 0
#define ERRNO_NO_INTERFACES 33 #define ERRNO_NO_INTERFACES 33
#define ERRNO_UNKNOWN 32 // pick something that doesn't conflict with RH_ROUTER_ERROR_UNABLE_TO_DELIVER #define ERRNO_UNKNOWN 32 // pick something that doesn't conflict with RH_ROUTER_ERROR_UNABLE_TO_DELIVER

3
src/mesh/NodeDB.cpp
View File

@ -273,8 +273,7 @@ void NodeDB::pickNewNodeNum()
// If we don't have a nodenum at app - pick an initial nodenum based on the macaddr // If we don't have a nodenum at app - pick an initial nodenum based on the macaddr
if (r == 0) if (r == 0)
r = sizeof(NodeNum) == 1 ? ourMacAddr[5] r = (ourMacAddr[2] << 24) | (ourMacAddr[3] << 16) | (ourMacAddr[4] << 8) | ourMacAddr[5];
: ((ourMacAddr[2] << 24) | (ourMacAddr[3] << 16) | (ourMacAddr[4] << 8) | ourMacAddr[5]);
if (r == NODENUM_BROADCAST || r < NUM_RESERVED) if (r == NODENUM_BROADCAST || r < NUM_RESERVED)
r = NUM_RESERVED; // don't pick a reserved node number r = NUM_RESERVED; // don't pick a reserved node number