Commit ce596ba3 authored by 梁百峰's avatar 梁百峰

feat:打点流程

parent 92c49461
......@@ -272,6 +272,41 @@ uint8_t Get_CAN_CH0_ID_18FEFC17_Sig_Fuel_level(void)
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_Send18FEFC17_Msg_Count, 0u) >> 0u) & 0xFFu));
}
uint8_t Get_CAN_CH0_ID_794_byte0_Sig(void)
{
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_UDS_REC_Msg_Count, 0u) >> 0u) & 0xFFu));
}
uint8_t Get_CAN_CH0_ID_794_byte1_Sig(void)
{
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_UDS_REC_Msg_Count, 1u) >> 0u) & 0xFFu));
}
uint8_t Get_CAN_CH0_ID_794_byte2_Sig(void)
{
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_UDS_REC_Msg_Count, 2u) >> 0u) & 0xFFu));
}
uint8_t Get_CAN_CH0_ID_794_byte3_Sig(void)
{
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_UDS_REC_Msg_Count, 3u) >> 0u) & 0xFFu));
}
uint8_t Get_CAN_CH0_ID_794_byte4_Sig(void)
{
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_UDS_REC_Msg_Count, 4u) >> 0u) & 0xFFu));
}
uint8_t Get_CAN_CH0_ID_794_byte5_Sig(void)
{
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_UDS_REC_Msg_Count, 5u) >> 0u) & 0xFFu));
}
uint8_t Get_CAN_CH0_ID_794_byte6_Sig(void)
{
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_UDS_REC_Msg_Count, 6u) >> 0u) & 0xFFu));
}
uint8_t Get_CAN_CH0_ID_794_byte7_Sig(void)
{
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_UDS_REC_Msg_Count, 7u) >> 0u) & 0xFFu));
}
......
......@@ -76,7 +76,14 @@ extern uint32_t Get_CAN_CH0_ID_18FEC1EE_Sig_Total_Vehicle_Distance(void);
extern uint16_t Get_CAN_CH0_ID_0CFE6CEE_Sig_Tachograph_vehicle_speed(void);
extern uint8_t Get_CAN_CH0_ID_18FEFC17_Sig_Fuel_level(void);
extern uint8_t Get_CAN_CH0_ID_794_byte0_Sig(void);
extern uint8_t Get_CAN_CH0_ID_794_byte1_Sig(void);
extern uint8_t Get_CAN_CH0_ID_794_byte2_Sig(void);
extern uint8_t Get_CAN_CH0_ID_794_byte3_Sig(void);
extern uint8_t Get_CAN_CH0_ID_794_byte4_Sig(void);
extern uint8_t Get_CAN_CH0_ID_794_byte5_Sig(void);
extern uint8_t Get_CAN_CH0_ID_794_byte6_Sig(void);
extern uint8_t Get_CAN_CH0_ID_794_byte7_Sig(void);
......
......@@ -72,7 +72,8 @@ void MENU_CHECK_STEP_ADD(void)
{
MENU_CHECK_STEP++;
if(MENU_CHECK_STEP > 17)
// if(MENU_CHECK_STEP > 17)
if(MENU_CHECK_STEP > 13)
{
MENU_CHECK_STEP = 0;
}
......
......@@ -3687,7 +3687,12 @@ void Display_Version_Info(uint32_t ON_OFF)
guominbanben[0] = CAN_MSG_Read(10, 7u);
guominhoumian = CAN_MSG_Read(10, 6u);
}
esp32banben[0] = CAN_MSG_Read(10, 3u);
esp32houmian = CAN_MSG_Read(10, 2u);
mbuffruanjian[0] = CAN_MSG_Read(9, 5u);
wifihoumian = CAN_MSG_Read(9, 4u);
guominbanben[0] = CAN_MSG_Read(10, 7u);
guominhoumian = CAN_MSG_Read(10, 6u);
General_Number_Disp(esp32banben, 5, 50);
GUI_General_Digit_Display(esp32houmian, Num_15, 2, 0, banebenhao1, 50);
......@@ -3752,7 +3757,22 @@ void Display_Version_Info(uint32_t ON_OFF)
wuliao[14] = CAN_MSG_Read(8, 0u);
wuliao[15] = 0xFF;
}
wuliao[0] = CAN_MSG_Read(6, 4u);
wuliao[1] = CAN_MSG_Read(6, 3u);
wuliao[2] = CAN_MSG_Read(6, 2u);
wuliao[3] = CAN_MSG_Read(6, 1u);
wuliao[4] = CAN_MSG_Read(6, 0u);
wuliao[5] = CAN_MSG_Read(7, 4u);
wuliao[6] = CAN_MSG_Read(7, 3u);
wuliao[7] = CAN_MSG_Read(7, 2u);
wuliao[8] = CAN_MSG_Read(7, 1u);
wuliao[9] = CAN_MSG_Read(7, 0u);
wuliao[10] = CAN_MSG_Read(8, 4u);
wuliao[11] = CAN_MSG_Read(8, 3u);
wuliao[12] = CAN_MSG_Read(8, 2u);
wuliao[13] = CAN_MSG_Read(8, 1u);
wuliao[14] = CAN_MSG_Read(8, 0u);
wuliao[15] = 0xFF;
if(CAN_MSG_Read(7, 2u) == 0x47 || (R485_ID4Dh.Sig.MaterialCode07 == 0x47))
{
nowbanbenhao = 1;
......
......@@ -65,7 +65,7 @@
#define NEG_8_Ctrl GPIO_OUT_PORT10_PIN03
#define NEG_9_Ctrl GPIO_OUT_PORT10_PIN04
#define NEG_10_Ctrl GPIO_OUT_PORT00_PIN08
#define can_std_io GPIO_OUT_PORT00_PIN04
#define queren GPIO_OUT_PORT00_PIN06
#define LINE_SafeBelt_1 NEG_1_Ctrl
#define LINE_SafeBelt_2 NEG_2_Ctrl
......
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