Merge branch 'dev' of http://tyw-server.synology.me:12345/shihao/haojin750tft into wjw_dev

6147cc6e · 张金硕 · 46613689 · 8d0b9d9a · 6147cc6e · 6147cc6e
Commit 6147cc6e authored Aug 17, 2024 by 张金硕
Showing with 214 additions and 257 deletions

CAN_CH0_CAN_Communication_Matrix.c ...are/Source/Application/CAN_CH0_CAN_Communication_Matrix.c +1 -1

AMT630H_Datas.c Firmware/Source/Component/AMT630H/AMT630H_Datas.c +213 -256

No files found.
--- a/Firmware/Source/Application/CAN_CH0_CAN_Communication_Matrix.c
+++ b/Firmware/Source/Application/CAN_CH0_CAN_Communication_Matrix.c
@@ -75,7 +75,7 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =
        {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
        {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
        {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
-        5000ul,
+        500ul,
        0x37Bul,
        (( void * )0),
        (( void * )0),

--- a/Firmware/Source/Component/AMT630H/AMT630H_Datas.c
+++ b/Firmware/Source/Component/AMT630H/AMT630H_Datas.c