Skip to content

J
jiancetai
Commit 3f713af5 authored by 何锐's avatar 何锐
Browse files
Options

✨ feat:检测台增加切图

parent 05dd5b3b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 378 additions and 337 deletions
YueJin_test_bench/source/Appliciation/CAN_APP.c
View file @ 3f713af5
...@@ -110,13 +110,13 @@ void CAN_Service(void) ...@@ -110,13 +110,13 @@ void CAN_Service(void)
{ {
init_CAN_Frame(&m_msg2, CAN_ID_2, 8, 0, data2); init_CAN_Frame(&m_msg2, CAN_ID_2, 8, 0, data2);
init_CAN_Frame(&m_msg3, CAN_ID_3, 8, 0, data3); init_CAN_Frame(&m_msg3, CAN_ID_3, 8, 0, data3);
// init_CAN_Frame(&m_msg4, CAN_ID_4, 8, 1, data4); init_CAN_Frame(&m_msg4, CAN_ID_4, 8, 1, data4);
init_CAN_Frame(&m_msg5, CAN_ID_5, 8, 0, data5); init_CAN_Frame(&m_msg5, CAN_ID_5, 8, 0, data5);
// init_CAN_Frame(&m_msg6, CAN_ID_6, 8, 0, data6); // init_CAN_Frame(&m_msg6, CAN_ID_6, 8, 0, data6);
can_mid(m_msg2); can_mid(m_msg2);
can_mid(m_msg3); can_mid(m_msg3);
// can_mid(m_msg4); can_mid(m_msg4);
can_mid(m_msg5); can_mid(m_msg5);
// can_mid(m_msg6); // can_mid(m_msg6);
} }
...@@ -146,101 +146,189 @@ void can_submit(void) ...@@ -146,101 +146,189 @@ void can_submit(void)
switch (MENU_CHECK_STEP) switch (MENU_CHECK_STEP)
{ {
case 0: case 0:
data4[0] = 0x00;
data5[2] = 0x00; data5[2] = 0x00;
data5[3] = 0x00; //N字不显示 data5[3] = 0x00; //N字不显示
data5[4] = 0x00; data5[4] = 0x00;
data5[5] = 0x00; //主题土星 data5[5] = 0x00; //主题土星
break; break;
case 1: case 1:
data4[0] = 0x00;
data5[2] = 0x54; data5[2] = 0x54;
data5[3] = 0x09; //N字显示，旋转85° data5[3] = 0x09; //N字显示，旋转85°
data5[4] = 0x00; data5[4] = 0x00;
data5[5] = 0x01; //主题火星 data5[5] = 0x01; //主题火星
break; break;
case 2: case 2:
data4[0] = 0x00;
data5[2] = 0xE4; data5[2] = 0xE4;
data5[3] = 0x0A; //N字显示，旋转185° data5[3] = 0x0A; //N字显示，旋转185°
data5[4] = 0x00; data5[4] = 0x00;
data5[5] = 0x02; //主题月球 data5[5] = 0x02; //主题月球
break; break;
case 3: case 3:
data4[0] = 0x00;
data5[2] = 0x48; data5[2] = 0x48;
data5[3] = 0x0C; //N字显示，旋转274° data5[3] = 0x0C; //N字显示，旋转274°
data5[4] = 0x00; data5[4] = 0x00;
data5[5] = 0x02; //主题月球 data5[5] = 0x02; //主题月球
break; break;
case 4: case 4:
data4[0] = 0x00;
data5[2] = 0x9C; data5[2] = 0x9C;
data5[3] = 0x0D; //N字显示，旋转359° data5[3] = 0x0D; //N字显示，旋转359°
data5[4] = 0x00; data5[4] = 0x00;
data5[5] = 0x02; //主题月球 data5[5] = 0x02; //主题月球
break; break;
case 5: case 5:
data4[0] = 0x00;
data5[2] = 0x00; data5[2] = 0x00;
data5[3] = 0x20; data5[3] = 0x20;
data5[4] = 0x11; //纪念日 data5[4] = 0x11; //纪念日
data5[5] = 0x02; //主题月球 data5[5] = 0x02; //主题月球
break; break;
case 6: case 6:
data4[0] = 0x00;
data5[2] = 0x00; data5[2] = 0x00;
data5[3] = 0x20; data5[3] = 0x20;
data5[4] = 0x21; //家 data5[4] = 0x21; //家
data5[5] = 0x02; //主题月球 data5[5] = 0x02; //主题月球
break; break;
case 7: case 7:
data4[0] = 0x00;
data5[2] = 0x00; data5[2] = 0x00;
data5[3] = 0x20; data5[3] = 0x20;
data5[4] = 0x31; //对象 data5[4] = 0x31; //对象
data5[5] = 0x02; //主题月球 data5[5] = 0x02; //主题月球
break; break;
case 8: case 8:
data4[0] = 0x00;
data5[2] = 0x00; data5[2] = 0x00;
data5[3] = 0x00; data5[3] = 0x00;
data5[4] = 0x00; data5[4] = 0x00;
data5[5] = 0x08; //天气 data5[5] = 0x08; //天气
break; break;
case 9: case 9:
data4[0] = 0x00;
data5[2] = 0x00; data5[2] = 0x00;
data5[3] = 0x00; data5[3] = 0x00;
data5[4] = 0x00; data5[4] = 0x00;
data5[5] = 0x10; //天气 data5[5] = 0x10; //天气
break; break;
case 10: case 10:
data4[0] = 0x00;
data5[2] = 0x00; data5[2] = 0x00;
data5[3] = 0x00; data5[3] = 0x00;
data5[4] = 0x00; data5[4] = 0x00;
data5[5] = 0x18; //天气 data5[5] = 0x18; //天气
break; break;
case 11: case 11:
data4[0] = 0x00;
data5[2] = 0x00; data5[2] = 0x00;
data5[3] = 0x00; data5[3] = 0x00;
data5[4] = 0x00; data5[4] = 0x00;
data5[5] = 0x20; //天气 data5[5] = 0x20; //天气
break; break;
case 12: case 12:
data4[0] = 0x00;
data5[2] = 0x00; data5[2] = 0x00;
data5[3] = 0x00; data5[3] = 0x00;
data5[4] = 0x00; data5[4] = 0x00;
data5[5] = 0x28; //天气 data5[5] = 0x28; //天气
break; break;
case 13: case 13:
data4[0] = 0x00;
data5[2] = 0x00; data5[2] = 0x00;
data5[3] = 0x00; data5[3] = 0x00;
data5[4] = 0x00; data5[4] = 0x00;
data5[5] = 0x30; //天气 data5[5] = 0x30; //天气
break; break;
case 14: case 14:
data4[0] = 0x00;
data5[2] = 0x00; data5[2] = 0x00;
data5[3] = 0x00; data5[3] = 0x00;
data5[4] = 0x00; data5[4] = 0x00;
data5[5] = 0x38; //天气 data5[5] = 0x38; //天气
break; break;
case 15: case 15:
data4[0] = 0x00;
data5[2] = 0x00; data5[2] = 0x00;
data5[3] = 0x00; data5[3] = 0x00;
data5[4] = 0x00; data5[4] = 0x00;
data5[5] = 0x40; //天气 data5[5] = 0x40; //天气
break; break;
case 16:
data4[0] = 0x01;
data5[2] = 0x00;
data5[3] = 0x00;
data5[4] = 0x00;
data5[5] = 0x00; //天气
break;
case 17:
data4[0] = 0x02;
data5[2] = 0x00;
data5[3] = 0x00;
data5[4] = 0x00;
data5[5] = 0x00; //天气
break;
case 18:
data4[0] = 0x03;
data5[2] = 0x00;
data5[3] = 0x00;
data5[4] = 0x00;
data5[5] = 0x00; //天气
break;
case 19:
data4[0] = 0x04;
data5[2] = 0x00;
data5[3] = 0x00;
data5[4] = 0x00;
data5[5] = 0x00; //天气
break;
case 20:
data4[0] = 0x05;
data5[2] = 0x00;
data5[3] = 0x00;
data5[4] = 0x00;
data5[5] = 0x00; //天气
break;
case 21:
data4[0] = 0x06;
data5[2] = 0x00;
data5[3] = 0x00;
data5[4] = 0x00;
data5[5] = 0x00; //天气
break;
case 22:
data4[0] = 0x07;
data5[2] = 0x00;
data5[3] = 0x00;
data5[4] = 0x00;
data5[5] = 0x00; //天气
break;
default: default:
break; break;
} }
......
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
View file @ 3f713af5
...@@ -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 >= 22)
{ {
MENU_CHECK_STEP = 0; MENU_CHECK_STEP = 0;
} }
...@@ -557,6 +557,8 @@ void Read_IPK_Session_Type(void)//请求仪表发送 软硬件版本号 等数 ...@@ -557,6 +557,8 @@ void Read_IPK_Session_Type(void)//请求仪表发送 软硬件版本号 等数
} }
} }
uint8_t LED_Waring = 0; uint8_t LED_Waring = 0;
uint8_t resettimer;
uint8_t MENU_CHECK_STEP_Last;
void Function_Check_Ctrl(uint32_t cmd) void Function_Check_Ctrl(uint32_t cmd)
{ {
uint8_t p [ 20 ]; uint8_t p [ 20 ];
...@@ -567,6 +569,30 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -567,6 +569,30 @@ void Function_Check_Ctrl(uint32_t cmd)
static uint32_t MENU_BACK = 0xff; static uint32_t MENU_BACK = 0xff;
static uint8_t UDS_EunD = 0; static uint8_t UDS_EunD = 0;
if(MENU_CHECK_STEP_Last != MENU_CHECK_STEP)
{
if(MENU_CHECK_STEP == 1 || MENU_CHECK_STEP == 2 || MENU_CHECK_STEP == 3 ||MENU_CHECK_STEP == 4)
{
if(resettimer <= 10)
{
resettimer++;
POWER_CTRL_KL30 = 0u; //B+
POWER_CTRL_KL15 = 0u; //KL15
}
else
{
resettimer = 0;
POWER_CTRL_KL30 = 1u; //B+
POWER_CTRL_KL15 = 1u; //KL15
MENU_CHECK_STEP_Last = MENU_CHECK_STEP;
}
}
else
{
MENU_CHECK_STEP_Last = MENU_CHECK_STEP;
}
}
if ( cmd == 0 ) if ( cmd == 0 )
{ {
; ;
...@@ -621,60 +647,6 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -621,60 +647,6 @@ void Function_Check_Ctrl(uint32_t cmd)
FUEL_RES_4 = 1; FUEL_RES_4 = 1;
break; break;
} }
case 5:
{
/*燃油*/
FUEL_RES_1 = 0;
FUEL_RES_2 = 0;
FUEL_RES_3 = 0;
FUEL_RES_4 = 0;
break;
}
case 6:
{
/*燃油*/
FUEL_RES_1 = 0;
FUEL_RES_2 = 0;
FUEL_RES_3 = 0;
FUEL_RES_4 = 0;
break;
}
case 7:
{
/*燃油*/
FUEL_RES_1 = 0;
FUEL_RES_2 = 0;
FUEL_RES_3 = 0;
FUEL_RES_4 = 0;
break;
}
case 8:
{
/*燃油*/
FUEL_RES_1 = 0;
FUEL_RES_2 = 0;
FUEL_RES_3 = 0;
FUEL_RES_4 = 0;
break;
}
case 9:
{
/*燃油*/
FUEL_RES_1 = 0;
FUEL_RES_2 = 0;
FUEL_RES_3 = 0;
FUEL_RES_4 = 0;
break;
}
case 10:
{
/*燃油*/
FUEL_RES_1 = 0;
FUEL_RES_2 = 0;
FUEL_RES_3 = 0;
FUEL_RES_4 = 0;
break;
}
} }
......
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