feat: 添加上位机报文，扩展帧发送成功

GHS/App/CAN_APP/CAN_CH0_APP.c

@@ -137,3 +137,24 @@ void Can_Set_Buff_18F10217(uint8_t CopyData [])
     }
 }
 
+uint16_t ADC_U16 = 0;
+uint16_t ADC_U48 = 0;
+void Can_Set_Buff_18000001(uint8_t CopyData[])
+{
+  CopyData[0] = 0;
+  CopyData[1] = 0;
+  CopyData[2] = 0;
+  CopyData[3] = 0;
+
+  /*U16电流*/
+  CopyData[0] = (uint8_t)(ADC_U16 & 0xFFu);
+  CopyData[1] = (uint8_t)((uint8_t)(ADC_U16 >> 8) & 0xFFu);
+  /*U48电流*/
+  CopyData[2] = (uint8_t)(ADC_U16 & 0xFFu);
+  CopyData[3] = (uint8_t)((uint8_t)(ADC_U16 >> 8) & 0xFFu);
+
+  CopyData[4] = 0;
+  CopyData[5] = 0;
+  CopyData[6] = 0;
+  CopyData[7] = 0;
+}
\ No newline at end of file

GHS/App/CAN_APP/CAN_CH0_APP.h

@@ -3,6 +3,7 @@
 
 #include "TYW_stdint.h"
 
+extern void Can_Set_Buff_18000001(uint8_t CopyData []);
 
 extern void Can_Set_Buff_18FEF117(uint8_t CopyData []);
 extern void Can_Set_Buff_18FEF100(uint8_t CopyData []);

GHS/App/CAN_APP/CAN_CH0_CAN_Communication_Matrix.c

@@ -8,12 +8,13 @@ st_CanMsgTxOp CAN_CH0_CanMsgTxOp;
 
 const st_CAN_SendAttribute    CAN_CH0_CANSendAttr[CAN_CH0_ID_SEND_TOTAL] =
 {
-    {0x18FEF117ul,  100ul * 1000ul,  25ul * 1000ul, 0u, MSG_EXT, 4u, 8u, CAN_MSG_CYCLE, Can_Set_Buff_18FEF117, ( void * )0},
-    {0x18FEF100ul,  100ul * 1000ul,   0ul * 1000ul, 0u, MSG_EXT, 5u, 8u, CAN_MSG_CYCLE, Can_Set_Buff_18FEF100, ( void * )0},
-    {0x18F10117ul,  100ul * 1000ul,  25ul * 1000ul, 0u, MSG_EXT, 6u, 8u, CAN_MSG_CYCLE, Can_Set_Buff_18F10117, ( void * )0},
-    {0x18FEAE17ul,  100ul * 1000ul,  30ul * 1000ul, 0u, MSG_EXT, 7u, 8u, CAN_MSG_CYCLE, Can_Set_Buff_18FEAE17, ( void * )0},
-    {0x18FEAE30ul,  100ul * 1000ul,   0ul * 1000ul, 0u, MSG_EXT, 8u, 8u, CAN_MSG_CYCLE, Can_Set_Buff_18FEAE30, ( void * )0},
-    {0x18F10217ul,  100ul * 1000ul,   0ul * 1000ul, 0u, MSG_EXT, 9u, 8u, CAN_MSG_CYCLE, Can_Set_Buff_18F10217, ( void * )0},
+  {0x18FEF117ul,  100ul * 1000ul,   5ul * 1000ul, 0u, MSG_EXT, 4u, 8u, CAN_MSG_CYCLE, Can_Set_Buff_18FEF117, ( void * )0},
+  {0x18FEF100ul,  100ul * 1000ul,   0ul * 1000ul, 0u, MSG_EXT, 5u, 8u, CAN_MSG_CYCLE, Can_Set_Buff_18FEF100, ( void * )0},
+  {0x18F10117ul,  100ul * 1000ul,   7ul * 1000ul, 0u, MSG_EXT, 6u, 8u, CAN_MSG_CYCLE, Can_Set_Buff_18F10117, ( void * )0},
+  {0x18FEAE17ul,  100ul * 1000ul,  13ul * 1000ul, 0u, MSG_EXT, 7u, 8u, CAN_MSG_CYCLE, Can_Set_Buff_18FEAE17, ( void * )0},
+  {0x18FEAE30ul,  100ul * 1000ul,   9ul * 1000ul, 0u, MSG_EXT, 8u, 8u, CAN_MSG_CYCLE, Can_Set_Buff_18FEAE30, ( void * )0},
+  {0x18F10217ul,  100ul * 1000ul,  12ul * 1000ul, 0u, MSG_EXT, 9u, 8u, CAN_MSG_CYCLE, Can_Set_Buff_18F10217, ( void * )0},
+  {0x18000001ul,  100ul * 1000ul,  11ul * 1000ul, 0u, MSG_EXT,10u, 8u, CAN_MSG_CYCLE, Can_Set_Buff_18000001, ( void * )0},
 };
 
 const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =
@@ -755,11 +756,19 @@ uint8_t  Get_ID_18000000_Sig_PC_Control_U48_Power(void)
 {
     return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,ID_ID0x18000000_Msg_Count, 0u) >> 1u) & 0x01u));
 }
-uint8_t  Get_ID_18000000_Sig_PC_Control_U48_CurrentControlSet(void)
+uint16_t  Get_ID_18000000_Sig_PC_Control_U48_CurrentControlSet(void)
 {
     return (((uint16_t)((uint16_t)((uint16_t)CAN_MSG_Read(CAN_CH0,ID_ID0x18000000_Msg_Count, 2u) >> 0u) & 0xFFu) << 8u) + \
     ((uint16_t)((uint16_t)CAN_MSG_Read(CAN_CH0,ID_ID0x18000000_Msg_Count, 1u) >> 0u) & 0xFFu));
 }
+uint8_t  Get_ID_18000000_Sig_PC_Control_U48_LOW(void)
+{
+    return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,ID_ID0x18000000_Msg_Count, 1u) >> 0u) & 0x07u));
+}
+uint8_t  Get_ID_18000000_Sig_PC_Control_U48_HIGH(void)
+{
+    return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,ID_ID0x18000000_Msg_Count, 1u) >> 3u) & 0x01u));
+}
 
 uint8_t  Co_Can_ConvertSubID_CAN_CH0(uint32_t MsgID)
 {

GHS/App/CAN_APP/CAN_CH0_CAN_Communication_Matrix.h

@@ -39,12 +39,13 @@ typedef enum
 
 typedef enum
 {
-    CAN_CH0_MSGID_217,
-    CAN_CH0_MSGID_317,
-    CAN_CH0_MSGID_31C,
-    CAN_CH0_MSGID_257,
-    CAN_CH0_MSGID_43C,
-    CAN_CH0_MSGID_254,
+    CAN_CH0_MSGID_18FEF117,
+    CAN_CH0_MSGID_18FEF100,
+    CAN_CH0_MSGID_18F10117,
+    CAN_CH0_MSGID_18FEAE17,
+    CAN_CH0_MSGID_18FEAE30,
+    CAN_CH0_MSGID_18F10217,
+    CAN_CH0_MSGID_18000001,
     CAN_CH0_ID_SEND_TOTAL,
 } CAN_MSG_SEND_ID_t;
 
@@ -75,6 +76,9 @@ extern const st_CAN_SendAttribute    CAN_CH0_CANSendAttr[CAN_CH0_ID_SEND_TOTAL]
 #define  ID_ID0x18FFA017_Msg    0x98FFA017u
 #define  ID_ID0x18000000_Msg    0x98000000u
 
+extern uint16_t ADC_U16;
+extern uint16_t ADC_U48;
+
 extern uint8_t  Get_ID_18FF30E1_Sig_ECAS_Decrease(void);
 extern uint8_t  Get_ID_18FE4F0B_Sig_VDC_Brake_Light_quest(void);
 extern uint8_t  Get_ID_18FE4F0B_Sig_VDC_Lamp_State(void);
@@ -176,7 +180,9 @@ extern uint8_t  Get_ID_18FFA017_Sig_Hand_Brake(void);
 extern uint8_t  Get_ID_18FFA017_Sig_Instrument_Igon_Wake_Up_Power(void);
 extern uint8_t  Get_ID_18000000_Sig_PC_Control_U16_Power(void);
 extern uint8_t  Get_ID_18000000_Sig_PC_Control_U48_Power(void);
-extern uint8_t  Get_ID_18000000_Sig_PC_Control_U48_CurrentControlSet(void);
+extern uint16_t Get_ID_18000000_Sig_PC_Control_U48_CurrentControlSet(void);
+extern uint8_t  Get_ID_18000000_Sig_PC_Control_U48_LOW(void);
+extern uint8_t  Get_ID_18000000_Sig_PC_Control_U48_HIGH(void);
 
 extern uint8_t  Co_Can_ConvertSubID_CAN_CH0(uint32_t MsgID);
 extern uint8_t  Co_Can_ConvertSubID(uint32_t MsgID);

GHS/App/CAN_APP/RTE_CAN.c

@@ -135,7 +135,7 @@ uint8_t Can0_Write0(_CAN_Msg *Msg)
     // LucHthId = CanConf_CanHardwareObject_CanHardwareObject2;
     LddCanPduType1.length =  Msg->MsgDLC;
     LddCanPduType1.swPduHandle = 0x00;
-    LddCanPduType1.id = Msg->MsgID;
+    LddCanPduType1.id = Msg->MsgID|0x80000000;
     LddCanPduType1.sdu = &GaaByteArrayTx01[0];
     // App_GenReturnValue = 
     Can_Write(2, &LddCanPduType1);