Commit 90819ea8 authored by 李冠华's avatar 李冠华

feat:新增报文0x234及相关信号

parent 7e98b832
...@@ -156,6 +156,16 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] = ...@@ -156,6 +156,16 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =
(CAN_0x225_Receive), (CAN_0x225_Receive),
((void *)0), ((void *)0),
}, },
{
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
1000ul,
0x234ul,
((void *)0),
((void *)0),
((void *)0),
},
}; };
void System_Indicator_ON_callback(canlib_uint8_t CopyData[]) void System_Indicator_ON_callback(canlib_uint8_t CopyData[])
{ {
...@@ -381,6 +391,11 @@ uint8_t Get_CAN_CH0_ID_225_Sig_VCU_EmsFltLv3(void) ...@@ -381,6 +391,11 @@ uint8_t Get_CAN_CH0_ID_225_Sig_VCU_EmsFltLv3(void)
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x225_Msg_Count, 7u) >> 1u) & 0x01u)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x225_Msg_Count, 7u) >> 1u) & 0x01u));
} }
uint8_t Get_CAN_CH0_ID_234_Sig_EMS_EngineOilLow(void)
{
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x234_Msg_Count, 3u) >> 4u) & 0x01u));
}
uint8_t Co_Can_ConvertSubID_CAN_CH0(uint32_t MsgID) uint8_t Co_Can_ConvertSubID_CAN_CH0(uint32_t MsgID)
{ {
uint8_t u8Result = CAN_CH0_ID_TOTAL_MAX; uint8_t u8Result = CAN_CH0_ID_TOTAL_MAX;
...@@ -428,6 +443,9 @@ uint8_t Co_Can_ConvertSubID_CAN_CH0(uint32_t MsgID) ...@@ -428,6 +443,9 @@ uint8_t Co_Can_ConvertSubID_CAN_CH0(uint32_t MsgID)
case CAN_CH0_ID_CAN_0x225_Msg: case CAN_CH0_ID_CAN_0x225_Msg:
u8Result = CAN_CH0_ID_CAN_0x225_Msg_Count; u8Result = CAN_CH0_ID_CAN_0x225_Msg_Count;
break; break;
case CAN_CH0_ID_CAN_0x234_Msg:
u8Result = CAN_CH0_ID_CAN_0x234_Msg_Count;
break;
default: default:
u8Result = CAN_CH0_ID_TOTAL_MAX; u8Result = CAN_CH0_ID_TOTAL_MAX;
break; break;
......
...@@ -25,6 +25,7 @@ typedef enum ...@@ -25,6 +25,7 @@ typedef enum
CAN_CH0_ID_CAN_0x134_Msg_Count, CAN_CH0_ID_CAN_0x134_Msg_Count,
CAN_CH0_ID_CAN_0x220_Msg_Count, CAN_CH0_ID_CAN_0x220_Msg_Count,
CAN_CH0_ID_CAN_0x225_Msg_Count, CAN_CH0_ID_CAN_0x225_Msg_Count,
CAN_CH0_ID_CAN_0x234_Msg_Count,
CAN_CH0_ID_TOTAL_MAX, CAN_CH0_ID_TOTAL_MAX,
} CAN_CH0_CAN_MSG_ID_t; } CAN_CH0_CAN_MSG_ID_t;
...@@ -67,6 +68,7 @@ extern const st_CAN_SendAttribute CAN_CH0_CANSendAttr[CAN_CH0_ID_SEND_TOTAL] ...@@ -67,6 +68,7 @@ extern const st_CAN_SendAttribute CAN_CH0_CANSendAttr[CAN_CH0_ID_SEND_TOTAL]
#define CAN_CH0_ID_CAN_0x134_Msg 0x134ul #define CAN_CH0_ID_CAN_0x134_Msg 0x134ul
#define CAN_CH0_ID_CAN_0x220_Msg 0x220ul #define CAN_CH0_ID_CAN_0x220_Msg 0x220ul
#define CAN_CH0_ID_CAN_0x225_Msg 0x225ul #define CAN_CH0_ID_CAN_0x225_Msg 0x225ul
#define CAN_CH0_ID_CAN_0x234_Msg 0x234ul
...@@ -111,6 +113,7 @@ extern uint8_t Get_CAN_CH0_ID_18200A21_Sig_SBMS_Soc(void); ...@@ -111,6 +113,7 @@ extern uint8_t Get_CAN_CH0_ID_18200A21_Sig_SBMS_Soc(void);
extern uint8_t Get_CAN_CH0_ID_134_Sig_SMCU_ErrorGrage(void); extern uint8_t Get_CAN_CH0_ID_134_Sig_SMCU_ErrorGrage(void);
extern uint8_t Get_CAN_CH0_ID_220_Sig_VCU_KeySts(void); extern uint8_t Get_CAN_CH0_ID_220_Sig_VCU_KeySts(void);
extern uint8_t Get_CAN_CH0_ID_225_Sig_VCU_EmsFltLv3(void); extern uint8_t Get_CAN_CH0_ID_225_Sig_VCU_EmsFltLv3(void);
extern uint8_t Get_CAN_CH0_ID_234_Sig_EMS_EngineOilLow(void);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment