josh/hj_datalink
1
0
Fork 0
forked from gatsby/df_datalink
Code Issues Pull Requests Releases Activity

fix: 更新message格式 (#1)

Browse Source
This commit is contained in:
josh
2025-05-25 23:24:28 +08:00
parent e94f2b3848
commit 652d2b220b
3 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/networking/link_layer/msg_def.h
+27 -27
View File
@@ -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
src/networking/link_layer/scan.c
+9 -9
View File
@@ -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
src/networking/link_layer/service.c
+18 -18
View File
@@ -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