Commit 56d295ec authored by 李鑫3's avatar 李鑫3

feat:添加车速

parent 2e9715de
...@@ -100,6 +100,8 @@ void APP_ICM_Proc(void) /*zh321*/ /*FS04*/ ...@@ -100,6 +100,8 @@ void APP_ICM_Proc(void) /*zh321*/ /*FS04*/
// CurValueStr[P_dang ].val = 0x03; // CurValueStr[P_dang ].val = 0x03;
CurValueStr[Vvspeed_L ].val = 0; CurValueStr[Vvspeed_L ].val = 0;
CurValueStr[Vspeed ].val = 0;
CurValueStr[Power ].val = 0; CurValueStr[Power ].val = 0;
CurValueStr[Electricity_H ].val = 0; CurValueStr[Electricity_H ].val = 0;
CurValueStr[Electricity_L ].val = 0; CurValueStr[Electricity_L ].val = 0;
...@@ -129,6 +131,8 @@ void APP_ICM_Proc(void) /*zh321*/ /*FS04*/ ...@@ -129,6 +131,8 @@ void APP_ICM_Proc(void) /*zh321*/ /*FS04*/
case 0: case 0:
{ {
CurValueStr[Vvspeed_L ].val = 0x00; CurValueStr[Vvspeed_L ].val = 0x00;
CurValueStr[Vspeed ].val = 0x00;
CurValueStr[Power ].val = 0x00; CurValueStr[Power ].val = 0x00;
CurValueStr[Power_H ].val = 0x00; CurValueStr[Power_H ].val = 0x00;
CurValueStr[Electricity_H ].val = 0x00; CurValueStr[Electricity_H ].val = 0x00;
...@@ -154,8 +158,10 @@ void APP_ICM_Proc(void) /*zh321*/ /*FS04*/ ...@@ -154,8 +158,10 @@ void APP_ICM_Proc(void) /*zh321*/ /*FS04*/
} }
case 1: case 1:
{ {
CurValueStr[Vvspeed_L ].val = 0xFF; CurValueStr[Vvspeed_L ].val = 0xE8;
CurValueStr[Power ].val = 0x06; CurValueStr[Vspeed ].val = 0x03;
CurValueStr[Power ].val = 0x3C;
CurValueStr[Power_H ].val = 0x00; CurValueStr[Power_H ].val = 0x00;
CurValueStr[Electricity_H ].val = 0x03; CurValueStr[Electricity_H ].val = 0x03;
CurValueStr[Electricity_L ].val = 0xE8; CurValueStr[Electricity_L ].val = 0xE8;
...@@ -181,8 +187,9 @@ void APP_ICM_Proc(void) /*zh321*/ /*FS04*/ ...@@ -181,8 +187,9 @@ void APP_ICM_Proc(void) /*zh321*/ /*FS04*/
break; break;
case 2: case 2:
{ {
CurValueStr[Vvspeed_L ].val = 0xFF; CurValueStr[Vvspeed_L ].val = 0x9E;
CurValueStr[Power ].val = 0x04; CurValueStr[Vspeed ].val = 0x07;
CurValueStr[Power ].val = 0x28;
CurValueStr[Power_H ].val = 0x00; CurValueStr[Power_H ].val = 0x00;
CurValueStr[Electricity_H ].val = 0x07; CurValueStr[Electricity_H ].val = 0x07;
CurValueStr[Electricity_L ].val = 0xD0; CurValueStr[Electricity_L ].val = 0xD0;
...@@ -209,8 +216,9 @@ void APP_ICM_Proc(void) /*zh321*/ /*FS04*/ ...@@ -209,8 +216,9 @@ void APP_ICM_Proc(void) /*zh321*/ /*FS04*/
break; break;
case 3: case 3:
{ {
CurValueStr[Vvspeed_L ].val = 0xFF; CurValueStr[Vvspeed_L ].val = 0x40;
CurValueStr[Power ].val = 0x02; CurValueStr[Vspeed ].val = 0x0B;
CurValueStr[Power ].val = 0x14;
CurValueStr[Power_H ].val = 0x00; CurValueStr[Power_H ].val = 0x00;
CurValueStr[Electricity_H ].val = 0x0B; CurValueStr[Electricity_H ].val = 0x0B;
CurValueStr[Electricity_L ].val = 0xB8; CurValueStr[Electricity_L ].val = 0xB8;
...@@ -236,7 +244,8 @@ void APP_ICM_Proc(void) /*zh321*/ /*FS04*/ ...@@ -236,7 +244,8 @@ void APP_ICM_Proc(void) /*zh321*/ /*FS04*/
case 4: case 4:
{ {
CurValueStr[Vvspeed_L ].val = 0xFF; CurValueStr[Vvspeed_L ].val = 0x28;
CurValueStr[Vspeed ].val = 0x0F;
CurValueStr[Power ].val = 0x00; CurValueStr[Power ].val = 0x00;
CurValueStr[Power_H ].val = 0x00; CurValueStr[Power_H ].val = 0x00;
CurValueStr[Electricity_H ].val = 0x0F; CurValueStr[Electricity_H ].val = 0x0F;
...@@ -265,8 +274,9 @@ void APP_ICM_Proc(void) /*zh321*/ /*FS04*/ ...@@ -265,8 +274,9 @@ void APP_ICM_Proc(void) /*zh321*/ /*FS04*/
case 5: case 5:
{ {
CurValueStr[Vvspeed_L ].val = 0xFF; CurValueStr[Vvspeed_L ].val = 0x14;
CurValueStr[Power ].val = 0XFE; CurValueStr[Vspeed ].val = 0x1E;
CurValueStr[Power ].val = 0XEC;
CurValueStr[Power_H ].val = 0XFF; CurValueStr[Power_H ].val = 0XFF;
CurValueStr[Electricity_H ].val = 0X13; CurValueStr[Electricity_H ].val = 0X13;
CurValueStr[Electricity_L ].val = 0X88; CurValueStr[Electricity_L ].val = 0X88;
...@@ -295,8 +305,9 @@ void APP_ICM_Proc(void) /*zh321*/ /*FS04*/ ...@@ -295,8 +305,9 @@ void APP_ICM_Proc(void) /*zh321*/ /*FS04*/
case 6: case 6:
{ {
CurValueStr[Vvspeed_L ].val = 0xFF; CurValueStr[Vvspeed_L ].val = 0x48;
CurValueStr[Power ].val = 0XFE; CurValueStr[Vspeed ].val = 0x26;
CurValueStr[Power ].val = 0XD8;
CurValueStr[Power_H ].val = 0XFF; CurValueStr[Power_H ].val = 0XFF;
CurValueStr[Electricity_L ].val = 0x70; CurValueStr[Electricity_L ].val = 0x70;
CurValueStr[Electricity_H ].val = 0x17; CurValueStr[Electricity_H ].val = 0x17;
...@@ -323,8 +334,9 @@ void APP_ICM_Proc(void) /*zh321*/ /*FS04*/ ...@@ -323,8 +334,9 @@ void APP_ICM_Proc(void) /*zh321*/ /*FS04*/
case 7: case 7:
{ {
CurValueStr[Vvspeed_L ].val = 0xFF; CurValueStr[Vvspeed_L ].val = 0x30;
CurValueStr[Power ].val = 0XFA; CurValueStr[Vspeed ].val = 0x2A;
CurValueStr[Power ].val = 0XC4;
CurValueStr[Power_H ].val = 0XFF; CurValueStr[Power_H ].val = 0XFF;
CurValueStr[Electricity_H ].val = 0x1B; CurValueStr[Electricity_H ].val = 0x1B;
CurValueStr[Electricity_L ].val = 0x58; CurValueStr[Electricity_L ].val = 0x58;
...@@ -352,8 +364,9 @@ void APP_ICM_Proc(void) /*zh321*/ /*FS04*/ ...@@ -352,8 +364,9 @@ void APP_ICM_Proc(void) /*zh321*/ /*FS04*/
case 8: case 8:
{ {
CurValueStr[Vvspeed_L ].val = 0xFF; CurValueStr[Vvspeed_L ].val = 0x00;
CurValueStr[Power ].val = 0XF8; CurValueStr[Vspeed ].val = 0x32;
CurValueStr[Power ].val = 0XB0;
CurValueStr[Power_H ].val = 0XFF; CurValueStr[Power_H ].val = 0XFF;
CurValueStr[Electricity_H ].val = 0x1F; CurValueStr[Electricity_H ].val = 0x1F;
CurValueStr[Electricity_L ].val = 0x40; CurValueStr[Electricity_L ].val = 0x40;
...@@ -382,8 +395,9 @@ void APP_ICM_Proc(void) /*zh321*/ /*FS04*/ ...@@ -382,8 +395,9 @@ void APP_ICM_Proc(void) /*zh321*/ /*FS04*/
case 9: case 9:
{ {
CurValueStr[Vvspeed_L ].val = 0xFF; CurValueStr[Vvspeed_L ].val = 0xD0;
CurValueStr[Power ].val = 0XF6; CurValueStr[Vspeed ].val = 0X39;
CurValueStr[Power ].val = 0X9C;
CurValueStr[Power_H ].val = 0XFF; CurValueStr[Power_H ].val = 0XFF;
CurValueStr[Electricity_H ].val = 0x23; CurValueStr[Electricity_H ].val = 0x23;
CurValueStr[Electricity_L ].val = 0x28; CurValueStr[Electricity_L ].val = 0x28;
...@@ -412,9 +426,10 @@ void APP_ICM_Proc(void) /*zh321*/ /*FS04*/ ...@@ -412,9 +426,10 @@ void APP_ICM_Proc(void) /*zh321*/ /*FS04*/
case 10: case 10:
{ {
CurValueStr[Vvspeed_L ].val = 0xFF; CurValueStr[Vvspeed_L ].val = 0xFF;
CurValueStr[Vspeed ].val = 0XFF;
CurValueStr[Power ].val = 0XE8; CurValueStr[Power ].val = 0XE8;
CurValueStr[Power_H ].val = 0XFF; CurValueStr[Power_H ].val = 0XFD;
CurValueStr[Electricity_H ].val = 0x27; CurValueStr[Electricity_H ].val = 0x27;
CurValueStr[Electricity_L ].val = 0x10; CurValueStr[Electricity_L ].val = 0x10;
CurValueStr[Cruise_H ].val = 0xC7; CurValueStr[Cruise_H ].val = 0xC7;
......
...@@ -120,7 +120,9 @@ EXTERN_APP_TEST volatile s_CurValue CurValueStr[CAN_List_Num]; ...@@ -120,7 +120,9 @@ EXTERN_APP_TEST volatile s_CurValue CurValueStr[CAN_List_Num];
static const s_CAN_List CAN_List[] = static const s_CAN_List CAN_List[] =
{ {
{&CanMsg_112, 1, 0, 16, 0, Offset_Plus, 1, 1, &CurValueStr[Vvspeed_L], Motorola}, {&CanMsg_112, 0, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Vvspeed_L], Motorola},
{&CanMsg_112, 1, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Vspeed], Motorola},
{&CanMsg_103, 6, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Power], Motorola}, {&CanMsg_103, 6, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Power], Motorola},
{&CanMsg_103, 7, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Power_H], Motorola}, {&CanMsg_103, 7, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Power_H], Motorola},
{&CanMsg_104,1,0,8,0,Offset_Plus,1,1,&CurValueStr[Electricity_H],Motorola}, {&CanMsg_104,1,0,8,0,Offset_Plus,1,1,&CurValueStr[Electricity_H],Motorola},
......
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