Skip to content

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

✨ feat:初版完成，车速更新为向下取整

parent 43736a6a
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 109 deletions
app_Sources/app_CAN.c
View file @ 1dea94cb
...@@ -729,7 +729,8 @@ void app_Can_handle_PA5(void) { ...@@ -729,7 +729,8 @@ void app_Can_handle_PA5(void) {
g_Msg0A30FFE8.data[0].bbyte=0x00; g_Msg0A30FFE8.data[0].bbyte=0x00;
g_Msg141.data[0].bbyte=0x05; //车速 g_Msg141.data[0].bbyte=0x05; //车速
g_Msg322.data[1].bbyte = 0x00; //变速箱指示灯关 g_Msg141.data[1].bbyte=0x90; //车速
g_Msg322.data[1].bbyte = 0x02; //变速箱指示灯开
} }
if(G_Button.LED_STEP == 2) if(G_Button.LED_STEP == 2)
{ {
...@@ -755,10 +756,11 @@ void app_Can_handle_PA5(void) { ...@@ -755,10 +756,11 @@ void app_Can_handle_PA5(void) {
g_Msg0A31FFE8.data[0].bbyte=0x72; g_Msg0A31FFE8.data[0].bbyte=0x72;
g_Msg0A31FFE8.data[1].bbyte=0x01; g_Msg0A31FFE8.data[1].bbyte=0x01;
g_Msg141.data[0].bbyte = 0x0C; g_Msg141.data[0].bbyte = 0x0D;
g_Msg141.data[1].bbyte = 0xC8; g_Msg141.data[1].bbyte = 0x58;
g_Msg322.data[1].bbyte = 0x02; //变速箱指示灯开 g_Msg322.data[1].bbyte = 0x04;
g_Msg323.data[1].bbyte=0x00;
g_Msg402.data[4].bbyte=0x00; //TCS指示灯关 g_Msg402.data[4].bbyte=0x00; //TCS指示灯关
} }
if(G_Button.LED_STEP == 3) if(G_Button.LED_STEP == 3)
...@@ -788,10 +790,10 @@ g_Msg12B.data[2].bbyte=0x05; ...@@ -788,10 +790,10 @@ g_Msg12B.data[2].bbyte=0x05;
g_Msg0A30FFE8.data[0].bbyte=0x00; g_Msg0A30FFE8.data[0].bbyte=0x00;
g_Msg141.data[0].bbyte = 0x14; g_Msg141.data[0].bbyte = 0x14;
g_Msg141.data[1].bbyte = 0x90; g_Msg141.data[1].bbyte = 0xD8;
g_Msg322.data[1].bbyte = 0x04; //变速箱故障指示灯 g_Msg322.data[1].bbyte = 0x00; //变速箱故障指示灯
g_Msg323.data[1].bbyte=0x00; //故障码指示灯 g_Msg323.data[1].bbyte=0x01;
} }
if(G_Button.LED_STEP == 4) if(G_Button.LED_STEP == 4)
{ {
...@@ -826,8 +828,8 @@ g_Msg12B.data[2].bbyte=0x07; ...@@ -826,8 +828,8 @@ g_Msg12B.data[2].bbyte=0x07;
g_Msg101.data[1].bbyte=0x60; g_Msg101.data[1].bbyte=0x60;
g_Msg322.data[1].bbyte = 0x00; //变速箱故障指示灯关 g_Msg322.data[1].bbyte = 0x00; //变速箱故障指示灯关
g_Msg323.data[1].bbyte=0x01; //故障码指示灯 g_Msg323.data[1].bbyte=0x00; //故障码指示灯
g_Msg321.data[4].bbyte=0x00; //S档关 g_Msg321.data[4].bbyte=0x02; //S档关
} }
if(G_Button.LED_STEP == 5) if(G_Button.LED_STEP == 5)
{ {
...@@ -861,7 +863,7 @@ g_Msg12B.data[2].bbyte=0x09; ...@@ -861,7 +863,7 @@ g_Msg12B.data[2].bbyte=0x09;
g_Msg101.data[0].bbyte=0x8C; g_Msg101.data[0].bbyte=0x8C;
g_Msg101.data[1].bbyte=0xA0; g_Msg101.data[1].bbyte=0xA0;
g_Msg321.data[4].bbyte=0x02; //S档开 g_Msg321.data[4].bbyte=0x00; //S档开
g_Msg323.data[1].bbyte=0x00; //故障码指示灯TCU关 g_Msg323.data[1].bbyte=0x00; //故障码指示灯TCU关
} }
if(G_Button.LED_STEP == 6) if(G_Button.LED_STEP == 6)
...@@ -891,7 +893,7 @@ g_Msg12B.data[2].bbyte=0x0B; ...@@ -891,7 +893,7 @@ g_Msg12B.data[2].bbyte=0x0B;
g_Msg0A30FFE8.data[0].bbyte=0x00; g_Msg0A30FFE8.data[0].bbyte=0x00;
g_Msg141.data[0].bbyte = 0x3D; g_Msg141.data[0].bbyte = 0x3D;
g_Msg141.data[1].bbyte = 0xA8; g_Msg141.data[1].bbyte = 0xC8;
g_Msg321.data[4].bbyte=0x00; //S档关 g_Msg321.data[4].bbyte=0x00; //S档关
} }
...@@ -920,7 +922,7 @@ g_Msg240.data[7].bbyte=240; ...@@ -920,7 +922,7 @@ g_Msg240.data[7].bbyte=240;
g_Msg0A31FFE8.data[1].bbyte=0x05; g_Msg0A31FFE8.data[1].bbyte=0x05;
g_Msg141.data[0].bbyte = 0x52; g_Msg141.data[0].bbyte = 0x52;
g_Msg141.data[1].bbyte = 0x38; //车速最大199 g_Msg141.data[1].bbyte = 0x64; //车速最大199
g_Msg321.data[0].bbyte=0x00; //N档 g_Msg321.data[0].bbyte=0x00; //N档
g_Msg402.data[4].bbyte=0x00; //TCS指示灯关 g_Msg402.data[4].bbyte=0x00; //TCS指示灯关
g_Msg322.data[1].bbyte = 0x00; //变速箱指示灯，变速箱故障码指示灯 g_Msg322.data[1].bbyte = 0x00; //变速箱指示灯，变速箱故障码指示灯
......
bsp_Sources/bsp_System.c
View file @ 1dea94cb
...@@ -110,138 +110,53 @@ void GJ_CS10_JS_ECUOUT_N(void) ...@@ -110,138 +110,53 @@ void GJ_CS10_JS_ECUOUT_N(void)
//glz--20170428 ����PWM //glz--20170428 ����PWM
if(g_FRStep==0) if(g_FRStep==0)
{ {
CS_FR=7812; //1HZ ZS_FR=7812; //1HZ
ZS_FR=7812; //1HZ
} }
if(g_FRStep==1) if(g_FRStep==1)
{ {
// CS_FR=326; //20KM //===== CS_FR=651;10KM 12HZ =====// ZS_FR=475;//16.5Hz
ZS_FR=467;//1000r
} }
if(g_FRStep==2) if(g_FRStep==2)
{ {
// CS_FR=163; //40KM ZS_FR=163;//50Hz
ZS_FR=234;//2000r
} }
if(g_FRStep==3) if(g_FRStep==3)
{ {
// CS_FR=108; //60KM ZS_FR=96;//33.1Hz
ZS_FR=156;//3000
} }
if(g_FRStep==4) if(g_FRStep==4)
{ {
// CS_FR=81; //80KM ZS_FR=70;//50Hz
ZS_FR=117;//4000r
} }
if(g_FRStep==5) if(g_FRStep==5)
{ {
// CS_FR=65; //100KM ZS_FR=54;//83Hz
ZS_FR=94;//5000
} }
if(g_FRStep==6) if(g_FRStep==6)
{ {
// CS_FR=54; //120KM // CS_FR=54; //120KM
ZS_FR=78;//6000 ZS_FR=44;//6000
} }
if(g_FRStep==7) if(g_FRStep==7)
{ {
// CS_FR=47; //140KM // CS_FR=47; //140KM
ZS_FR=67;//7000 ZS_FR=39;//7000
} }
if(g_FRStep==8) if(g_FRStep==8)
{ {
// CS_FR=30; //160KM // CS_FR=30; //160KM
ZS_FR=58;//8000 ZS_FR=39;//8000
} }
if(g_FRStep==9) if(g_FRStep==9)
{ {
// CS_FR=30; //160KM // CS_FR=30; //160KM
ZS_FR=52;//9000 // ZS_FR=52;//9000
} }
if(g_FRStep==10) if(g_FRStep==10)
{ {
// CS_FR=30; //160KM // CS_FR=30; //160KM
ZS_FR=45;//9000 // ZS_FR=45;//9000
} }
/* //====1/2����=======//
if(g_FRStep==9)
{
CS_FR=7812; //0KM
ZS_FR=7812; //0
}
if(g_FRStep==11)
{
CS_FR=81; //80KM
ZS_FR=58; //4000
}
if(g_FRStep==13)
{
CS_FR=7812; //0KM
ZS_FR=7812; //0
}
if(g_FRStep==15)
{
CS_FR=65; //100KM
ZS_FR=47; //5000
}
if(g_FRStep==17)
{
CS_FR=7812; //0KM
ZS_FR=7812; //0
}
if(g_FRStep==19)
{
CS_FR=54; //120KM
ZS_FR=39; //6000
}
if(g_FRStep==21)
{
CS_FR=7812; //0KM
ZS_FR=7812; //0
}
if(g_FRStep==23)
{
CS_FR=47; //140KM
ZS_FR=33; //7000
}
if(g_FRStep==26)
{
CS_FR=7812; //0KM
ZS_FR=7812; //0 //
}
if(g_FRStep==29)
{
CS_FR=40; //160KM
ZS_FR=31; //7600
}
if(g_FRStep==35)
{
CS_FR=7812; //0KM
ZS_FR=7812; //0
} */
//
cli(); cli();
CS_OUT_N=CS_FR; CS_OUT_N=CS_FR;
......
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