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

fix: 修改UART上传帧长, 修改节点配置主节点ID识别

Browse Source
This commit is contained in:
josh
2025-06-24 10:02:07 +08:00
parent d3d45fbfb0
commit 6b9a2c8cc4
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system_monitor.h
+2 -2
View File
@@ -16,7 +16,7 @@
* @name SystemMonitor_Constants * @name SystemMonitor_Constants
* @{ * @{
*/ */
#define PAYLOAD_LEN_MAX 2048 #define PAYLOAD_LEN_MAX 1000
#define DATA_ID_NONE UINT32_MAX #define DATA_ID_NONE UINT32_MAX
#define DATA_ID_TEST 0x02030203 #define DATA_ID_TEST 0x02030203
@@ -232,7 +232,7 @@ typedef struct
uint32_t dataId; ///< data identifier uint32_t dataId; ///< data identifier
uint8_t nodeId; ///< destination ID for tx, source ID for rx uint8_t nodeId; ///< destination ID for tx, source ID for rx
uint16_t dataLen; ///< data length uint16_t dataLen; ///< data length
uint8_t data[PAYLOAD_LEN_MAX]; uint8_t data[1000];
} SYSMON_SVC_PAYLOAD; } SYSMON_SVC_PAYLOAD;
/************************** Function Prototypes ******************************/ /************************** Function Prototypes ******************************/
src/systembus/systembus.c
+2 -2
View File
@@ -237,7 +237,7 @@ static int32_t SystemBus_SystemConfig(SYSBUS *instPtr, uint8_t *msg)
if (msg[WD_ID_CMD] >= 0 && msg[WD_ID_CMD] < linkConfig.netScale) if (msg[WD_ID_CMD] >= 0 && msg[WD_ID_CMD] < linkConfig.netScale)
{ {
reconfig |= (msg[WD_ID_CMD] != linkConfig.myId); reconfig |= (msg[WD_ID_CMD] != linkConfig.myId);
linkConfig.myType = (msg[WD_ID_CMD] == 0) ? L2_NODE_HEAD : L2_NODE_MEMBER; linkConfig.myType = (msg[WD_ID_CMD] == L2_HEAD_ID) ? L2_NODE_HEAD : L2_NODE_MEMBER;
linkConfig.myId = msg[WD_ID_CMD]; linkConfig.myId = msg[WD_ID_CMD];
} }
else else
@@ -399,7 +399,7 @@ int32_t SystemBus_GenRecvRsp(SYSBUS *instPtr, SYSMON_SVC_PAYLOAD *payload)
ASSERT(instPtr != NULL); ASSERT(instPtr != NULL);
ASSERT(payload != NULL); ASSERT(payload != NULL);
SYSBUS_UART_FRAME *sysbusRsp = malloc(sizeof(SYSBUS_UART_FRAME)); SYSBUS_UART_FRAME *sysbusRsp = malloc(NORMALIZE_SIZE(sizeof(SYSBUS_UART_FRAME)));
if (sysbusRsp == NULL) if (sysbusRsp == NULL)
{ {
DBG_ERROR("Failed to allocate memory for Receive Response!\n"); DBG_ERROR("Failed to allocate memory for Receive Response!\n");
src/systembus/systembus_uart.h
+1 -1
View File
@@ -119,4 +119,4 @@ bool SysbusUart_IsTxBusy(SYSBUS_UART *instPtr);
/** @} SystemBus_UART*/ /** @} SystemBus_UART*/
/** @} SystemBus*/ /** @} SystemBus*/