Skip to content

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

✨ feat:春风老化台修改逻辑

parent f5c27f46
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 327 additions and 507 deletions
TBDML.ini
View file @ faafe754
...@@ -91,19 +91,21 @@ File2= ...@@ -91,19 +91,21 @@ File2=
File3= File3=
[Recent HI-WAVE FindProcedure Search] [Recent HI-WAVE FindProcedure Search]
Search0=GJ_CS10_JS_ECUOUT_N Search0=app_Can_handle_PA5
Search1=app_Can_handle Search1=GJ_CS10_JS_ECUOUT_N
Search2=bsp_CANSendFrame Search2=app_Can_handle
Search3=Gui_ButtonProc Search3=bsp_CANSendFrame
Search4=bsp_API_isr Search4=Gui_ButtonProc
Search5=main Search5=bsp_API_isr
Search6=bsp_RTC_isr Search6=main
Search7=KeyProgIn Search7=bsp_RTC_isr
Search8=app_Can_handle Search8=KeyProgIn
Search9=UnlockPro Search9=app_Can_handle
Search10=App_Uds_Calc_Key Search10=UnlockPro
Search11=bsp_CAN_Rev_isr Search11=App_Uds_Calc_Key
Search12=TP_TransmitPDU Search12=bsp_CAN_Rev_isr
Search13=TP_TransmitPDU
......
app_Sources/app_CAN.c
View file @ faafe754
...@@ -154,6 +154,10 @@ void app_Can_handle(void) ...@@ -154,6 +154,10 @@ void app_Can_handle(void)
{ {
screentest.setstep++; screentest.setstep++;
} }
else
{
screentest.setstep = 0;
}
} }
g_bReturn = bsp_CANSendFrame(g_Msg772.id,g_Msg772.prio,g_Msg772.dlc,g_Msg772.data); g_bReturn = bsp_CANSendFrame(g_Msg772.id,g_Msg772.prio,g_Msg772.dlc,g_Msg772.data);
...@@ -204,6 +208,7 @@ void app_Can_IdInit(void) ...@@ -204,6 +208,7 @@ void app_Can_IdInit(void)
g_Msg772.prio = 0; g_Msg772.prio = 0;
g_Msg772.dlc = 8; g_Msg772.dlc = 8;
G_Button.LED_STEP = 3;
} }
...@@ -214,58 +219,53 @@ void app_Can_handle_PA5(void) { ...@@ -214,58 +219,53 @@ void app_Can_handle_PA5(void) {
#if PA5_EN #if PA5_EN
if(screentest.beginflag == 0) if(G_Button.LED_STEP == 3)
{ {
if(screentest.setstep == 1) //发送4条消息进入EOL if(screentest.setstep == 1) //发送4条消息进入EOL
{ {
g_Msg772.data[0].bbyte = 0x01; g_Msg772.data[0].bbyte = 0x01;
g_Msg772.data[1].bbyte = 0x01; g_Msg772.data[1].bbyte = 0x01;
g_Msg772.data[2].bbyte = 0x12; g_Msg772.data[2].bbyte = 0x12;
g_Msg772.data[3].bbyte = 0x34; g_Msg772.data[3].bbyte = 0x34;
g_Msg772.data[4].bbyte = 0x56; g_Msg772.data[4].bbyte = 0x56;
g_Msg772.data[5].bbyte = 0x78; g_Msg772.data[5].bbyte = 0x78;
g_Msg772.data[6].bbyte = 0x3E; g_Msg772.data[6].bbyte = 0x3E;
g_Msg772.data[7].bbyte = 0x7A; g_Msg772.data[7].bbyte = 0x7A;
} }
else if(screentest.setstep == 2) else if(screentest.setstep == 2)
{ {
g_Msg772.data[0].bbyte = 0x07; g_Msg772.data[0].bbyte = 0x07;
g_Msg772.data[1].bbyte = 0x35; g_Msg772.data[1].bbyte = 0x35;
g_Msg772.data[2].bbyte = 0xF1; g_Msg772.data[2].bbyte = 0xF1;
g_Msg772.data[3].bbyte = 0xB7; g_Msg772.data[3].bbyte = 0xB7;
g_Msg772.data[4].bbyte = 0x80; g_Msg772.data[4].bbyte = 0x80;
g_Msg772.data[5].bbyte = 0x00; g_Msg772.data[5].bbyte = 0x00;
g_Msg772.data[6].bbyte = 0x00; g_Msg772.data[6].bbyte = 0x00;
g_Msg772.data[7].bbyte = 0x00; g_Msg772.data[7].bbyte = 0x00;
} }
else if(screentest.setstep == 3) else if(screentest.setstep == 3)
{ {
g_Msg772.data[0].bbyte = 0x01; g_Msg772.data[0].bbyte = 0x01;
g_Msg772.data[1].bbyte = 0x02; g_Msg772.data[1].bbyte = 0x02;
g_Msg772.data[2].bbyte = 0x6D; g_Msg772.data[2].bbyte = 0x6D;
g_Msg772.data[3].bbyte = 0xE8; g_Msg772.data[3].bbyte = 0xE8;
g_Msg772.data[4].bbyte = 0xBB; g_Msg772.data[4].bbyte = 0xBB;
g_Msg772.data[5].bbyte = 0x30; g_Msg772.data[5].bbyte = 0x30;
g_Msg772.data[6].bbyte = 0x5B; g_Msg772.data[6].bbyte = 0x5B;
g_Msg772.data[7].bbyte = 0xB5; g_Msg772.data[7].bbyte = 0xB5;
} }
else if(screentest.setstep == 4) else if(screentest.setstep == 4)
{ {
g_Msg772.data[0].bbyte = 0x07; g_Msg772.data[0].bbyte = 0x07;
g_Msg772.data[1].bbyte = 0xE9; g_Msg772.data[1].bbyte = 0xE9;
g_Msg772.data[2].bbyte = 0x1C; g_Msg772.data[2].bbyte = 0x1C;
g_Msg772.data[3].bbyte = 0xA5; g_Msg772.data[3].bbyte = 0xA5;
g_Msg772.data[4].bbyte = 0xA9; g_Msg772.data[4].bbyte = 0xA9;
g_Msg772.data[5].bbyte = 0x00; g_Msg772.data[5].bbyte = 0x00;
g_Msg772.data[6].bbyte = 0x00; g_Msg772.data[6].bbyte = 0x00;
g_Msg772.data[7].bbyte = 0x00; g_Msg772.data[7].bbyte = 0x00;
}
screentest.beginflag = 1;
}
return ;
} }
if(G_Button.LED_STEP == 0) if(G_Button.LED_STEP == 0)
{ {
g_Msg772.data[0].bbyte = 0x00; g_Msg772.data[0].bbyte = 0x00;
...@@ -299,153 +299,9 @@ void app_Can_handle_PA5(void) { ...@@ -299,153 +299,9 @@ void app_Can_handle_PA5(void) {
g_Msg772.data[6].bbyte = 0x01; g_Msg772.data[6].bbyte = 0x01;
g_Msg772.data[7].bbyte = 0x00; g_Msg772.data[7].bbyte = 0x00;
} }
if(G_Button.LED_STEP == 3)
{
g_Msg1B5.data[3].bbyte = 0x3C;
g_Msg1B5.data[4].bbyte = 0x3C;
g_Msg1B5.data[5].bbyte = 0x3C;
g_Msg1B5.data[6].bbyte = 0x00;
g_Msg1B5.data[7].bbyte = 0x28; //ECO指示灯，READY指示灯,R档
}
if(G_Button.LED_STEP == 4)
{
g_Msg1B5.data[3].bbyte = 0x50;
g_Msg1B5.data[4].bbyte = 0x50;
g_Msg1B5.data[5].bbyte = 0x50;
g_Msg1B5.data[6].bbyte = 0x06; //OBD指示灯
g_Msg1B5.data[7].bbyte = 0x44; //保养指示灯，D档
}
if(G_Button.LED_STEP == 5)
{
g_Msg1B5.data[3].bbyte = 0x64;
g_Msg1B5.data[4].bbyte = 0x64;
g_Msg1B5.data[5].bbyte = 0x64;
g_Msg1B5.data[6].bbyte = 0x4C; //锁定状态
g_Msg1B5.data[7].bbyte = 0xB8; //N档，保养指示灯，驻车状态，故障指示灯
// g_Msg1B5.data[6].bbyte = 0xFF;
// g_Msg1B5.data[7].bbyte = 0xFF;
}
if(G_Button.LED_STEP == 6)
{
}
if(G_Button.LED_STEP == 7)
{
}
if(G_Button.LED_STEP >= 8)
{
g_Msg12B.data[2].bbyte=0x0D;
g_Msg12B.data[3].bbyte=0xA0;
g_Msg240.data[4].bbyte=0;
g_Msg240.data[7].bbyte=0;
g_Msg240.data[7].bbyte=240;
g_Msg125.data[2].bbyte=0x0;
g_Msg125.data[3].bbyte=0x1;
g_Msg125.data[4].bbyte=0x0;
g_Msg101.data[0].bbyte=0xBB;
g_Msg101.data[1].bbyte=0x80;
g_Msg7E8.data[0].bbyte=0x04;
g_Msg7E8.data[1].bbyte=0x62;
g_Msg7E8.data[2].bbyte=0x00;
g_Msg7E8.data[3].bbyte=0x05;
g_Msg7E8.data[4].bbyte=0xA0;
g_Msg0A31FFE8.data[0].bbyte=0xCA;
g_Msg0A31FFE8.data[1].bbyte=0x05;
g_Msg141.data[0].bbyte = 0x6E;
g_Msg141.data[1].bbyte = 0xA2;
g_Msg402.data[4].bbyte=0x04; //TCS指示灯开
g_Msg322.data[1].bbyte = 0x06; //变速箱指示灯，变速箱故障指示灯开
g_Msg323.data[0].bbyte=0x0F; //故障码指示灯
g_Msg323.data[1].bbyte=0xA1;
g_Msg321.data[4].bbyte=0x02; //S档开
}
if(G_Button.LED_STEP >= 9)
{
g_Msg12B.data[2].bbyte=0x0D;
g_Msg12B.data[3].bbyte=0xA0;
g_Msg240.data[4].bbyte=0;
g_Msg240.data[7].bbyte=240;
g_Msg125.data[2].bbyte=0x08;
g_Msg125.data[3].bbyte=0x0;
g_Msg125.data[4].bbyte=0x0;
g_Msg101.data[4].bbyte=0x0F;
g_Msg101.data[5].bbyte=0x80;
g_Msg7E8.data[0].bbyte=0x04;
g_Msg7E8.data[1].bbyte=0x62;
g_Msg7E8.data[2].bbyte=0x00;
g_Msg7E8.data[3].bbyte=0x05;
g_Msg7E8.data[4].bbyte=0xA0;
g_Msg0A31FFE8.data[0].bbyte=0x80;
g_Msg0A31FFE8.data[1].bbyte=0x06;
}
if(G_Button.LED_STEP >= 10)
{
g_Msg12B.data[2].bbyte=0x0E;
g_Msg12B.data[3].bbyte=0xA0;
g_Msg240.data[4].bbyte=0x08;
g_Msg240.data[7].bbyte=240;
g_Msg125.data[2].bbyte=0x0;
g_Msg125.data[3].bbyte=0x0;
g_Msg125.data[4].bbyte=0x0;
g_Msg402.data[7].bbyte=0x80;
g_Msg101.data[4].bbyte=0x0F;
g_Msg101.data[5].bbyte=0x80;
g_Msg125.data[3].bbyte=0x0;
g_Msg125.data[4].bbyte=0x0;
g_Msg7E8.data[0].bbyte=0x04;
g_Msg7E8.data[1].bbyte=0x62;
g_Msg7E8.data[2].bbyte=0x00;
g_Msg7E8.data[3].bbyte=0x05;
g_Msg7E8.data[4].bbyte=0xA0;
g_Msg7E82.data[0].bbyte=0x06;
g_Msg7E82.data[1].bbyte=0x41;
g_Msg7E82.data[2].bbyte=0x01;
g_Msg7E82.data[3].bbyte=0x80;
g_Msg0A31FFE8.data[0].bbyte=0x5B;
g_Msg0A31FFE8.data[1].bbyte=0x07;
g_Msg0A30FFE8.data[0].bbyte=0x09;
}
if(G_Button.LED_STEP >= 11)
{
// g_Msg240.data[7].bbyte=0xE4;
// g_Msg240.data[4].bbyte=0;
// // g_Msg402.data[7].bbyte=0;
// g_Msg101.data[0].bbyte=0x9C;
//_Msg101.data[1].bbyte=0x40;
//_Msg101.data[2].bbyte=0xC7;
//_Msg101.data[4].bbyte=0x0F;
//_Msg101.data[5].bbyte=0xBE;
//_Msg402.data[7].bbyte=0x80;
// g_Msg084.data[3].bbyte=0x01;
//
// g_Msg12B.data[0].bbyte=0;
// g_Msg12B.data[1].bbyte=0xC0;
// g_Msg125.data[3].bbyte=0x01;
// g_Msg125.data[2].bbyte=0x00;
// g_Msg125.data[4].bbyte=0x01;
G_Button.LED_STEP=0;
}
// if(G_Button.LED_STEP >= 12) // if(G_Button.LED_STEP >= 12)
// { // {
// g_Msg240.data[7].bbyte=0xE4; // g_Msg240.data[7].bbyte=0xE4;
......
bin/Project.abs
View file @ faafe754
No preview for this file type
bin/Project.abs.phy
View file @ faafe754
This diff is collapsed.
bin/Project.map
View file @ faafe754
This diff is collapsed.
bin/Project.xpr
View file @ faafe754
...@@ -12,3 +12,5 @@ Data:1 < ADDXPR ONLY_ADD_IF_NEW "g_Msg402" ...@@ -12,3 +12,5 @@ Data:1 < ADDXPR ONLY_ADD_IF_NEW "g_Msg402"
Data:1 < ADDXPR ONLY_ADD_IF_NEW "g_Msg08FFF00B" Data:1 < ADDXPR ONLY_ADD_IF_NEW "g_Msg08FFF00B"
Data:1 < ADDXPR ONLY_ADD_IF_NEW "CS_FR" Data:1 < ADDXPR ONLY_ADD_IF_NEW "CS_FR"
Data:1 < ADDXPR ONLY_ADD_IF_NEW "CS_OUT_CC" Data:1 < ADDXPR ONLY_ADD_IF_NEW "CS_OUT_CC"
Data:1 < ADDXPR ONLY_ADD_IF_NEW "screentest"
Data:1 < ADDXPR ONLY_ADD_IF_NEW "main.c::screentest.beginflag"
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