From ddab4a023596a00cd80801ffdd03238c39e855ce Mon Sep 17 00:00:00 2001 From: Kevin Hester Date: Sat, 28 Nov 2020 09:56:21 +0800 Subject: [PATCH] remove support for 8bit nodenums --- src/mesh/MeshService.cpp | 3 ++- src/mesh/MeshTypes.h | 2 +- src/mesh/NodeDB.cpp | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mesh/MeshService.cpp b/src/mesh/MeshService.cpp index 77c0f2c92..2c339f72e 100644 --- a/src/mesh/MeshService.cpp +++ b/src/mesh/MeshService.cpp @@ -93,7 +93,8 @@ const MeshPacket *MeshService::handleFromRadioUser(const MeshPacket *mp) bool wasBroadcast = mp->to == NODENUM_BROADCAST; // 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) { // we win if we have a lower macaddr diff --git a/src/mesh/MeshTypes.h b/src/mesh/MeshTypes.h index 7c58b2e3e..38f18c3a4 100644 --- a/src/mesh/MeshTypes.h +++ b/src/mesh/MeshTypes.h @@ -9,7 +9,7 @@ typedef uint32_t NodeNum; 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_NO_INTERFACES 33 #define ERRNO_UNKNOWN 32 // pick something that doesn't conflict with RH_ROUTER_ERROR_UNABLE_TO_DELIVER diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp index 61be815ec..2e245d214 100644 --- a/src/mesh/NodeDB.cpp +++ b/src/mesh/NodeDB.cpp @@ -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 (r == 0) - r = sizeof(NodeNum) == 1 ? ourMacAddr[5] - : ((ourMacAddr[2] << 24) | (ourMacAddr[3] << 16) | (ourMacAddr[4] << 8) | ourMacAddr[5]); + r = (ourMacAddr[2] << 24) | (ourMacAddr[3] << 16) | (ourMacAddr[4] << 8) | ourMacAddr[5]; if (r == NODENUM_BROADCAST || r < NUM_RESERVED) r = NUM_RESERVED; // don't pick a reserved node number