diff --git a/src/networking/link_layer/msg_def.h b/src/networking/link_layer/msg_def.h index 5867194..91484ab 100644 --- a/src/networking/link_layer/msg_def.h +++ b/src/networking/link_layer/msg_def.h @@ -89,9 +89,9 @@ typedef struct typedef struct { L2_MSG_COMMON common; ///< common message header - double srcPosX; ///< position x - double srcPosY; ///< position y - double srcPosZ; ///< position z + float srcPosX; ///< position x + float srcPosY; ///< position y + float srcPosZ; ///< position z uint32_t srcNetStatTime;///< net start time uint32_t advDataId; ///< advertise payload id uint8_t advData[17]; ///< advertise payload data @@ -105,12 +105,12 @@ typedef struct typedef struct { L2_MSG_COMMON common; ///< common message header - double srcPosX; ///< position x - double srcPosY; ///< position y - double srcPosZ; ///< position z - double srcSpeedX; ///< speed x - double srcSpeedY; ///< speed y - double srcSpeedZ; ///< speed z + float srcPosX; ///< position x + float srcPosY; ///< position y + float srcPosZ; ///< position z + float srcSpeedX; ///< speed x + float srcSpeedY; ///< speed y + float srcSpeedZ; ///< speed z uint32_t ackDataId; ///< acknowledge payload id uint8_t ackData[9]; ///< acknowledge payload data uint8_t crc; ///< crc @@ -123,12 +123,12 @@ typedef struct typedef struct { L2_MSG_COMMON common; ///< common message header - double srcPosX; ///< position x - double srcPosY; ///< position y - double srcPosZ; ///< position z - double srcSpeedX; ///< speed x - double srcSpeedY; ///< speed y - double srcSpeedZ; ///< speed z + float srcPosX; ///< position x + float srcPosY; ///< position y + float srcPosZ; ///< position z + float srcSpeedX; ///< speed x + float srcSpeedY; ///< speed y + float srcSpeedZ; ///< speed z uint32_t svcDataId; ///< service payload id uint8_t svcData[42]; ///< service payload data uint8_t crc; ///< crc @@ -141,12 +141,12 @@ typedef struct typedef struct { L2_MSG_COMMON common; ///< common message header - double srcPosX; ///< position x - double srcPosY; ///< position y - double srcPosZ; ///< position z - double srcSpeedX; ///< speed x - double srcSpeedY; ///< speed y - double srcSpeedZ; ///< speed z + float srcPosX; ///< position x + float srcPosY; ///< position y + float srcPosZ; ///< position z + float srcSpeedX; ///< speed x + float srcSpeedY; ///< speed y + float srcSpeedZ; ///< speed z uint32_t svcDataId; ///< service payload id uint8_t svcData[267]; ///< service payload data uint8_t crc; ///< crc @@ -159,12 +159,12 @@ typedef struct typedef struct { L2_MSG_COMMON common; ///< common message header - double srcPosX; ///< position x - double srcPosY; ///< position y - double srcPosZ; ///< position z - double srcSpeedX; ///< speed x - double srcSpeedY; ///< speed y - double srcSpeedZ; ///< speed z + float srcPosX; ///< position x + float srcPosY; ///< position y + float srcPosZ; ///< position z + float srcSpeedX; ///< speed x + float srcSpeedY; ///< speed y + float srcSpeedZ; ///< speed z uint32_t svcDataId; ///< service payload id uint8_t svcData[1222]; ///< service payload data uint8_t crc; ///< crc diff --git a/src/networking/link_layer/scan.c b/src/networking/link_layer/scan.c index 9ca2c49..d98f059 100644 --- a/src/networking/link_layer/scan.c +++ b/src/networking/link_layer/scan.c @@ -199,9 +199,9 @@ int32_t L2_Scan_PktHandler(L2_INST *instPtr, uint8_t *msg) } // Update node info. - node->nodeInfo.pos.x = message->srcPosX; - node->nodeInfo.pos.y = message->srcPosY; - node->nodeInfo.pos.z = message->srcPosZ; + node->nodeInfo.pos.x = (double)message->srcPosX; + node->nodeInfo.pos.y = (double)message->srcPosY; + node->nodeInfo.pos.z = (double)message->srcPosZ; node->nodeInfo.antIndex = Phy_ReceiveAntIndex(instPtr->config.phyInstPtr); // Reset node ttl @@ -277,12 +277,12 @@ int32_t L2_Scan_PktHandler(L2_INST *instPtr, uint8_t *msg) } // Update node info. - node->nodeInfo.pos.x = message->srcPosX; - node->nodeInfo.pos.y = message->srcPosY; - node->nodeInfo.pos.z = message->srcPosZ; - node->nodeInfo.speed.x = message->srcSpeedX; - node->nodeInfo.speed.y = message->srcSpeedY; - node->nodeInfo.speed.z = message->srcSpeedZ; + node->nodeInfo.pos.x = (double)message->srcPosX; + node->nodeInfo.pos.y = (double)message->srcPosY; + node->nodeInfo.pos.z = (double)message->srcPosZ; + node->nodeInfo.speed.x = (double)message->srcSpeedX; + node->nodeInfo.speed.y = (double)message->srcSpeedY; + node->nodeInfo.speed.z = (double)message->srcSpeedZ; node->nodeInfo.antIndex = Phy_ReceiveAntIndex(instPtr->config.phyInstPtr); // Reset node ttl diff --git a/src/networking/link_layer/service.c b/src/networking/link_layer/service.c index e5ab9d4..0500d75 100644 --- a/src/networking/link_layer/service.c +++ b/src/networking/link_layer/service.c @@ -455,12 +455,12 @@ static int32_t Service_PktHandler128K(L2_INST *instPtr, uint8_t *msg) } // Update node info. - node->nodeInfo.pos.x = message->srcPosX; - node->nodeInfo.pos.y = message->srcPosY; - node->nodeInfo.pos.z = message->srcPosZ; - node->nodeInfo.speed.x = message->srcSpeedX; - node->nodeInfo.speed.y = message->srcSpeedY; - node->nodeInfo.speed.z = message->srcSpeedZ; + node->nodeInfo.pos.x = (double)message->srcPosX; + node->nodeInfo.pos.y = (double)message->srcPosY; + node->nodeInfo.pos.z = (double)message->srcPosZ; + node->nodeInfo.speed.x = (double)message->srcSpeedX; + node->nodeInfo.speed.y = (double)message->srcSpeedY; + node->nodeInfo.speed.z = (double)message->srcSpeedZ; node->nodeInfo.antIndex = Phy_ReceiveAntIndex(instPtr->config.phyInstPtr); // Reset node ttl @@ -530,12 +530,12 @@ static int32_t Service_PktHandler512K(L2_INST *instPtr, uint8_t *msg) } // Update node info. - node->nodeInfo.pos.x = message->srcPosX; - node->nodeInfo.pos.y = message->srcPosY; - node->nodeInfo.pos.z = message->srcPosZ; - node->nodeInfo.speed.x = message->srcSpeedX; - node->nodeInfo.speed.y = message->srcSpeedY; - node->nodeInfo.speed.z = message->srcSpeedZ; + node->nodeInfo.pos.x = (double)message->srcPosX; + node->nodeInfo.pos.y = (double)message->srcPosY; + node->nodeInfo.pos.z = (double)message->srcPosZ; + node->nodeInfo.speed.x = (double)message->srcSpeedX; + node->nodeInfo.speed.y = (double)message->srcSpeedY; + node->nodeInfo.speed.z = (double)message->srcSpeedZ; node->nodeInfo.antIndex = Phy_ReceiveAntIndex(instPtr->config.phyInstPtr); // Reset node ttl @@ -605,12 +605,12 @@ static int32_t Service_PktHandler2M(L2_INST *instPtr, uint8_t *msg) } // Update node info. - node->nodeInfo.pos.x = message->srcPosX; - node->nodeInfo.pos.y = message->srcPosY; - node->nodeInfo.pos.z = message->srcPosZ; - node->nodeInfo.speed.x = message->srcSpeedX; - node->nodeInfo.speed.y = message->srcSpeedY; - node->nodeInfo.speed.z = message->srcSpeedZ; + node->nodeInfo.pos.x = (double)message->srcPosX; + node->nodeInfo.pos.y = (double)message->srcPosY; + node->nodeInfo.pos.z = (double)message->srcPosZ; + node->nodeInfo.speed.x = (double)message->srcSpeedX; + node->nodeInfo.speed.y = (double)message->srcSpeedY; + node->nodeInfo.speed.z = (double)message->srcSpeedZ; node->nodeInfo.antIndex = Phy_ReceiveAntIndex(instPtr->config.phyInstPtr); // Reset node ttl