Commit c63c0ba9 authored by 何锐's avatar 何锐

feat:增加指示灯贴图与第九步外发显示

parent 9b35ab09
...@@ -786,7 +786,7 @@ void Meter_field_display(uint8_t Meter_field_step) ...@@ -786,7 +786,7 @@ void Meter_field_display(uint8_t Meter_field_step)
} }
} }
} }
uint8_t rolaconter = 0;
void can_submit(void) void can_submit(void)
{ {
//车速 //车速
......
...@@ -249,12 +249,30 @@ uint8_t Get_CAN_CH0_ID_7EB_byte7_Sig(void) ...@@ -249,12 +249,30 @@ uint8_t Get_CAN_CH0_ID_7EB_byte7_Sig(void)
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_0x7EB_Msg_Count, 7u) >> 0u) & 0xFFu)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_0x7EB_Msg_Count, 7u) >> 0u) & 0xFFu));
} }
uint8_t Get_CAN_CH0_ID_68B_Fuel_Divisions_Sig(void)
{
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_0x68B_Msg_Count, 6u) >> 0u) & 0x0Fu));
}
uint8_t Get_CAN_CH0_ID_590_High_TELL_Sig(void)
{
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_0x590_Msg_Count, 1u) >> 6u) & 0x01u));
}
uint8_t Get_CAN_CH0_ID_590_Engine_Fault_Sig(void)
{
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_0x590_Msg_Count, 2u) >> 6u) & 0x01u));
}
uint8_t Get_CAN_CH0_ID_100_oilPressuret_Sig(void)
{
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_0x590_Msg_Count, 5u) >> 0u) & 0x01u));
}
uint8_t Get_CAN_CH0_ID_590_low_fuel_level_Sig(void)
{
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_0x590_Msg_Count, 2u) >> 5u) & 0x01u));
}
...@@ -285,6 +303,15 @@ uint8_t Co_Can_ConvertSubID(uint32_t MsgID) ...@@ -285,6 +303,15 @@ uint8_t Co_Can_ConvertSubID(uint32_t MsgID)
case CAN_CH0_ID_Send0x7EB_Msg: case CAN_CH0_ID_Send0x7EB_Msg:
u8Result = CAN_CH0_ID_0x7EB_Msg_Count; u8Result = CAN_CH0_ID_0x7EB_Msg_Count;
break; break;
case CAN_CH0_ID_Send0x68B_Msg:
u8Result = CAN_CH0_ID_0x68B_Msg_Count;
break;
case CAN_CH0_ID_Send0x590_Msg:
u8Result = CAN_CH0_ID_0x590_Msg_Count;
break;
case CAN_CH0_ID_Send0x100_Msg:
u8Result = CAN_CH0_ID_0x100_Msg_Count;
break;
default : default :
u8Result = CAN_CH0_ID_TOTAL_MAX; u8Result = CAN_CH0_ID_TOTAL_MAX;
break; break;
......
...@@ -13,6 +13,9 @@ typedef enum ...@@ -13,6 +13,9 @@ typedef enum
CAN_CH0_ID_Send0CFE6CEE_Msg_Count, CAN_CH0_ID_Send0CFE6CEE_Msg_Count,
CAN_CH0_ID_Send18FEFC17_Msg_Count, CAN_CH0_ID_Send18FEFC17_Msg_Count,
CAN_CH0_ID_0x7EB_Msg_Count, CAN_CH0_ID_0x7EB_Msg_Count,
CAN_CH0_ID_0x68B_Msg_Count,
CAN_CH0_ID_0x590_Msg_Count,
CAN_CH0_ID_0x100_Msg_Count,
CAN_CH0_ID_TOTAL_MAX, CAN_CH0_ID_TOTAL_MAX,
} CAN_MSG_ID_t; } CAN_MSG_ID_t;
...@@ -35,6 +38,9 @@ extern const st_CAN_SendAttribute st_CANSendAttr[ID_SEND_TOTAL] ; ...@@ -35,6 +38,9 @@ extern const st_CAN_SendAttribute st_CANSendAttr[ID_SEND_TOTAL] ;
#define CAN_CH0_ID_Send18FEFC17_Msg 0x18FEFC17ul #define CAN_CH0_ID_Send18FEFC17_Msg 0x18FEFC17ul
#define CAN_CH0_ID_Send0x7E3_Msg 0x7E3ul #define CAN_CH0_ID_Send0x7E3_Msg 0x7E3ul
#define CAN_CH0_ID_Send0x7EB_Msg 0x7EBul #define CAN_CH0_ID_Send0x7EB_Msg 0x7EBul
#define CAN_CH0_ID_Send0x68B_Msg 0x68Bul
#define CAN_CH0_ID_Send0x590_Msg 0x590ul
#define CAN_CH0_ID_Send0x100_Msg 0x100ul
extern uint32_t Get_ID_ODO(void); extern uint32_t Get_ID_ODO(void);
extern uint32_t Get_ID_FUEL(void); extern uint32_t Get_ID_FUEL(void);
...@@ -67,11 +73,11 @@ extern uint8_t Get_CAN_CH0_ID_7EB_byte4_Sig(void); ...@@ -67,11 +73,11 @@ extern uint8_t Get_CAN_CH0_ID_7EB_byte4_Sig(void);
extern uint8_t Get_CAN_CH0_ID_7EB_byte5_Sig(void); extern uint8_t Get_CAN_CH0_ID_7EB_byte5_Sig(void);
extern uint8_t Get_CAN_CH0_ID_7EB_byte6_Sig(void); extern uint8_t Get_CAN_CH0_ID_7EB_byte6_Sig(void);
extern uint8_t Get_CAN_CH0_ID_7EB_byte7_Sig(void); extern uint8_t Get_CAN_CH0_ID_7EB_byte7_Sig(void);
extern uint8_t Get_CAN_CH0_ID_68B_Fuel_Divisions_Sig(void);
extern uint8_t Get_CAN_CH0_ID_100_oilPressuret_Sig(void);
extern uint8_t Get_CAN_CH0_ID_590_low_fuel_level_Sig(void);
extern uint8_t Get_CAN_CH0_ID_590_High_TELL_Sig(void);
extern uint8_t Get_CAN_CH0_ID_590_Engine_Fault_Sig(void);
extern uint8_t Co_Can_ConvertSubID(uint32_t MsgID); extern uint8_t Co_Can_ConvertSubID(uint32_t MsgID);
......
...@@ -69,7 +69,7 @@ void Function_Check_Ctrl(uint32_t cmd); ...@@ -69,7 +69,7 @@ void Function_Check_Ctrl(uint32_t cmd);
void MENU_CHECK_STEP_ADD(void) void MENU_CHECK_STEP_ADD(void)
{ {
if(MENU_CHECK_STEP > 13) if(MENU_CHECK_STEP > 10)
{ {
MENU_CHECK_STEP = 0; MENU_CHECK_STEP = 0;
} }
......
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