Commit 10016345 authored by 何锐's avatar 何锐

feat:增加清大计

parent 34a6e329
...@@ -291,6 +291,9 @@ void can_submit(void) ...@@ -291,6 +291,9 @@ void can_submit(void)
CAN_Frame_st_t m_msg13; CAN_Frame_st_t m_msg13;
uint8_t data13[8] = {0, 0, 0, 0, 0, 0, 0, 0}; uint8_t data13[8] = {0, 0, 0, 0, 0, 0, 0, 0};
CAN_Frame_st_t m_msg14;
uint8_t data14[8] = {0, 0, 0, 0, 0, 0, 0, 0};
switch (MENU_CHECK_STEP) switch (MENU_CHECK_STEP)
{ {
case 0: case 0:
...@@ -838,14 +841,27 @@ void can_submit(void) ...@@ -838,14 +841,27 @@ void can_submit(void)
init_CAN_Frame(&m_msg13, 0xA40FFE2, 8, 1, data13); init_CAN_Frame(&m_msg13, 0xA40FFE2, 8, 1, data13);
break; break;
case 11: case 11:
/* 车速 */
break; data1[0] = 0xF0;
data1[1] = 0xFF;
init_CAN_Frame(&m_msg1, 0xA33FFE3, 8, 1, data1);
case 12: data14[0] = 0xF0;
POWER_CTRL_KL30 = 0u; //B+ data14[1] = 0xFF;
POWER_CTRL_KL15 = 0u; //KL15 data14[2] = 0xF0;
break; data14[3] = 0xFF;
init_CAN_Frame(&m_msg14, 0xA22FFE2, 8, 1, data14);
/* 电量1 */
data2[2] = 0xF0;
data2[3] = 0xFF;
init_CAN_Frame(&m_msg2, 0xA10FFE0, 8, 1, data2);
/* 电量2 */
data3[2] = 0xF0;
data3[3] = 0xFF;
init_CAN_Frame(&m_msg3, 0xA10FFE1, 8, 1, data3);
break;
default: default:
break; break;
} }
...@@ -868,6 +884,13 @@ void can_submit(void) ...@@ -868,6 +884,13 @@ void can_submit(void)
{ {
can_mid(m_msg12); can_mid(m_msg12);
} }
else if(MENU_CHECK_STEP == 11)
{
can_mid(m_msg1);
can_mid(m_msg2);
can_mid(m_msg3);
can_mid(m_msg14);
}
} }
uint8_t u8get714msg[8]; uint8_t u8get714msg[8];
uint8_t u8getuidmsg[8]; uint8_t u8getuidmsg[8];
......
...@@ -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 >= 15) if(MENU_CHECK_STEP > 10)
{ {
MENU_CHECK_STEP = 0; MENU_CHECK_STEP = 0;
} }
...@@ -788,10 +788,8 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -788,10 +788,8 @@ void Function_Check_Ctrl(uint32_t cmd)
} }
case 11: case 11:
{ {
POWER_CTRL_KL30 = 0u; //B+ LINE_OUT_POS_01 = 1;
POWER_CTRL_KL15 = 0u; //KL15 LINE_OUT_POS_02 = 1;
LINE_OUT_POS_01 = 0;
LINE_OUT_POS_02 = 0;
LINE_OUT_POS_03 = 0; LINE_OUT_POS_03 = 0;
break; break;
} }
......
...@@ -78,19 +78,14 @@ void Sys_Run_Mode_10ms_Tasks_Group(void) ...@@ -78,19 +78,14 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
} }
else else
{ {
// send_uid_fuc(); send_0x714_fuc();
} }
send_0x714_fuc();
}
if(begin714)
{
can_submit();
}
if(writeflag == 1)
{
UIDWrite();
} }
can_submit();
// if(writeflag == 1)
// {
// UIDWrite();
// }
......
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