Skip to content

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

✨ feat:电春风车速老化程序

parent 76514bb8
Show whitespace changes
Inline Side-by-side
Showing with 201 additions and 262 deletions
Test_Bench/Api_Sources/API_RTC.c
View file @ 584303e0
......@@ -15,7 +15,7 @@ INT16U RT_10ms = 0,
/*-------------------------------------------------------------------------
* Function Name : Api_SetTimer1
* Description : 设置定时器
* Description : ���ö�ʱ��
* Input :
* Output : None
* Return : None
......@@ -29,7 +29,7 @@ void Api_SetTimer0(INT16U Second,ClockType *T)
}
/*-------------------------------------------------------------------------
* Function Name : API_TimerOver
* Description : 设置定时器
* Description : ���ö�ʱ��
* Input :
* Output : None
* Return : None
......@@ -50,7 +50,7 @@ INT8U Api_TimerOver0(ClockType *T)
}
/*-------------------------------------------------------------------------
* Function Name : Api_SetTimer1
* Description : 设置定时器
* Description : ���ö�ʱ��
* Input :
* Output : None
* Return : None
......@@ -64,7 +64,7 @@ void Api_SetTimer1(INT16U Second,ClockType *T)
}
/*-------------------------------------------------------------------------
* Function Name : API_TimerOver
* Description : 设置定时器
* Description : ���ö�ʱ��
* Input :
* Output : None
* Return : None
......@@ -85,7 +85,7 @@ INT8U Api_TimerOver1(ClockType *T)
}
/*-------------------------------------------------------------------------
* Function Name : Api_SetTimer1
* Description : 设置定时器
* Description : ���ö�ʱ��
* Input :
* Output : None
* Return : None
......@@ -99,7 +99,7 @@ void Api_SetTimer2(INT16U Second,ClockType *T)
}
/*-------------------------------------------------------------------------
* Function Name : API_TimerOver
* Description : 设置定时器
* Description : ���ö�ʱ��
* Input :
* Output : None
* Return : None
......@@ -120,7 +120,7 @@ INT8U Api_TimerOver2(ClockType *T)
}
/*-------------------------------------------------------------------------
* Function Name : Api_SetTimer3
* Description : 设置定时器
* Description : ���ö�ʱ��
* Input :
* Output : None
* Return : None
......@@ -134,7 +134,7 @@ void Api_SetTimer3(INT16U Second,ClockType *T)
}
/*-------------------------------------------------------------------------
* Function Name : Api_TimerOver3
* Description : 设置定时器
* Description : ���ö�ʱ��
* Input :
* Output : None
* Return : None
......@@ -155,7 +155,7 @@ INT8U Api_TimerOver3(ClockType *T)
}
/*-------------------------------------------------------------------------
* Function Name : Api_SetTimer4
* Description : 设置定时器
* Description : ���ö�ʱ��
* Input :
* Output : None
* Return : None
......@@ -169,7 +169,7 @@ void Api_SetTimer4(INT16U Second,ClockType *T)
}
/*-------------------------------------------------------------------------
* Function Name : Api_TimerOver4
* Description : 设置定时器
* Description : ���ö�ʱ��
* Input :
* Output : None
* Return : None
......@@ -190,7 +190,7 @@ INT8U Api_TimerOver4(ClockType *T)
}
/*-------------------------------------------------------------------------
* Function Name : Api_SetTimer5
* Description : 设置定时器
* Description : ���ö�ʱ��
* Input :
* Output : None
* Return : None
......@@ -204,7 +204,7 @@ void Api_SetTimer5(INT16U Second,ClockType *T)
}
/*-------------------------------------------------------------------------
* Function Name : Api_TimerOver5
* Description : 设置定时器
* Description : ���ö�ʱ��
* Input :
* Output : None
* Return : None
......@@ -225,7 +225,7 @@ INT8U Api_TimerOver5(ClockType *T)
}
/*-------------------------------------------------------------------------
* Function Name : Api_SetTimer6
* Description : 设置定时器
* Description : ���ö�ʱ��
* Input :
* Output : None
* Return : None
......@@ -239,7 +239,7 @@ void Api_SetTimer6(INT16U Second,ClockType *T)
}
/*-------------------------------------------------------------------------
* Function Name : Api_TimerOver5
* Description : 设置定时器
* Description : ���ö�ʱ��
* Input :
* Output : None
* Return : None
......@@ -260,7 +260,7 @@ INT8U Api_TimerOver6(ClockType *T)
}
/*-------------------------------------------------------------------------
* Function Name : Api_SetTimer7
* Description : 设置定时器
* Description : ���ö�ʱ��
* Input :
* Output : None
* Return : None
......@@ -274,7 +274,7 @@ void Api_SetTimer7(INT16U Second,ClockType *T)
}
/*-------------------------------------------------------------------------
* Function Name : Api_TimerOver7
* Description : 设置定时器
* Description : ���ö�ʱ��
* Input :
* Output : None
* Return : None
......@@ -296,7 +296,7 @@ INT8U Api_TimerOver7(ClockType *T)
/*-------------------------------------------------------------------------
* Function Name : Api_SetAutoTimer
* Description : 设置自动切换定时器
* Description : �����Զ��л���ʱ��
* Input :
* Output : None
* Return : None
......@@ -310,7 +310,7 @@ void Api_SetAutoTimer(INT16U Second,ClockType *T)
}
/*-------------------------------------------------------------------------
* Function Name : Api_AutoTimerOver
* Description : 设置自动切换定时器
* Description : �����Զ��л���ʱ��
* Input :
* Output : None
* Return : None
......@@ -403,7 +403,7 @@ INT16U time_3s = 0;
{
if(Key_Dodging_flag)
{
if(Key.CAN_Step < 10)
if(Key.CAN_Step < 5)
{
Key.CAN_Step++;
}
......@@ -519,7 +519,7 @@ INT16U time_3s = 0;
if(time_3s>2)
{
time_3s = 0;
if(Key.CAN_Step > 10)
if(Key.CAN_Step > 5)
{
Key.CAN_Step = 1;
}
......
Test_Bench/Api_Sources/APP_CAN.c
View file @ 584303e0
......@@ -96,6 +96,7 @@ void Format_CAN_Msg()
{
CanMsg_521.ID = 0x521;
CanMsg_522.ID = 0x522;
CanMsg_260.ID = 0x260; //车速
// CanMsg_101.ID = 0x101;
// CanMsg_067.ID = 0x67;
// CanMsg_600.ID = 0x600;
......@@ -123,6 +124,7 @@ void Format_CAN_Msg()
CanMsg_521.Length = 8;
CanMsg_522.Length = 8;
CanMsg_260.Length = 8;
// CanMsg_101.Length = 8;
// CanMsg_067.Length = 8;
// CanMsg_600.Length = 8;
......@@ -151,6 +153,7 @@ void Format_CAN_Msg()
CanMsg_521.ID_EN = 1;
CanMsg_522.ID_EN = 1;
CanMsg_260.ID_EN = 1;
// CanMsg_101.ID_EN = 1;
// CanMsg_067.ID_EN = 1;
// CanMsg_600.ID_EN = 1;
......@@ -272,6 +275,8 @@ void App_Can_Proc(void)
// Clear_CAN_Msg((CAN_message *)&CanMsg_021);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_521);
Clear_CAN_Msg((CAN_message *)&CanMsg_521);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_260);
Clear_CAN_Msg((CAN_message *)&CanMsg_260);
}
if(GetCtrlTime(CANMsgSend_200ms) >= 200){
......
Test_Bench/Api_Sources/APP_Test.c
View file @ 584303e0
......@@ -2,14 +2,14 @@
#include "../App_Headers/includes.h"
#include "../Library/TimeCtrl.h"
#define STEP_MAX 34//步数
#define STEP_MAX 34//����
void All_Lamp_TurnOn(void);
void APP_Test_Init(void){
Key.StepAuto = null;
Key.CAN_Step = null;
Key.CAN_Step = null;
Key.CAN_Step = 1;
Key.CAN_Step = 1;
// CurValueStr[ENUM_BatteryCurrent].val = 0;
//CurValueStr[CoolTemp].val = 0;
......@@ -34,8 +34,8 @@ void APP_Test_Init(void){
EOLStep = 0;
EOLError = 0;
}
unsigned int Self_propelled_flag = 0;//自走
unsigned int Key_Dodging_flag = 1;//按键打点
unsigned int Self_propelled_flag = 0;//����
unsigned int Key_Dodging_flag = 1;//�������
unsigned int speed_value = 0;
void APP_Button_Proc(void){
;
......@@ -53,16 +53,16 @@ unsigned int CAN_init_flag = 0;
unsigned int CAN_lost_flag = 0;
unsigned int water_value = 0;
unsigned int electricityclose = 0; //电量表报文不外发标志
unsigned int electricityclose = 0; //���������IJ��ⷢ��־
void APP_ICM_Proc(void) /*zh321*/ /*FS04*/
{
//if(Self_propelled_flag==1)
{
{
CurValueStr[Engine_water_temperature_display].val = 0x64;
CurValueStr[EVpeed_L].val = 0xE8;
CurValueStr[EVpeed_H].val = 0x03;
// //if(Self_propelled_flag==1)
// {
// {
// CurValueStr[Engine_water_temperature_display].val = 0x64;
// CurValueStr[EVpeed_L].val = 0xE8;
// CurValueStr[EVpeed_H].val = 0x03;
// CurValueStr[Vspeed ].val = 0;
// CurValueStr[hour ].val = 0;
// CurValueStr[minute ].val = 0;
......@@ -103,252 +103,179 @@ void APP_ICM_Proc(void) /*zh321*/ /*FS04*/
// CurValueStr[P_dang ].val = 0x03;
#if 0
// #if 1
switch(Key.CAN_Step)
{
case 1:
{
CurValueStr[Vvspeed_L ].val = 0xC8;
CurValueStr[Vvspeed_H ].val = 0x00;
CurValueStr[Electricity_H ].val = 0x00;
CurValueStr[Electricity_L ].val = 0x00;
CurValueStr[Electricity_h ].val = 0xE8;
CurValueStr[Electricity_l ].val = 0x03;
CurValueStr[Sidebrace ].val = 0x00;
CurValueStr[cruise ].val = 0x00;
CurValueStr[ABS ].val = 0x00;
CurValueStr[TCS ].val = 0x00;
CurValueStr[Tire_pressure ].val = 0x00;
CurValueStr[Bluetooth ].val = 0x00;
CurValueStr[GPS ].val = 0x00;
CurValueStr[Callalert ].val = 0x01;
// CurValueStr[GMS ].val = 0x00;
CurValueStr[Parallelsignals ].val = 0x00;
CurValueStr[Enginefailure ].val = 0x00;
}
break;
case 2:
{
CurValueStr[Vvspeed_L ].val = 0x90;
CurValueStr[Vvspeed_H ].val = 0x01;
CurValueStr[Electricity_H ].val = 0x00;
CurValueStr[Electricity_L ].val = 0x64;
CurValueStr[Electricity_h ].val = 0x03;
CurValueStr[Electricity_l ].val = 0x84;
CurValueStr[Sidebrace ].val = 0x04;
CurValueStr[cruise ].val = 0x00;
CurValueStr[ABS ].val = 0x01;
// CurValueStr[TCS ].val = 0x00;
CurValueStr[Tire_pressure ].val = 0x00;
CurValueStr[Bluetooth ].val = 0x00;
CurValueStr[GPS ].val = 0x00;
CurValueStr[Callalert ].val = 0x01;
// CurValueStr[GMS ].val = 0x00;
CurValueStr[Parallelsignals ].val = 0x00;
CurValueStr[Enginefailure ].val = 0x00;
CurValueStr[Vspeed_L ].val = 0x07;
CurValueStr[Vspeed_H ].val = 0xD0;
}
break;
case 3:
{
CurValueStr[Vvspeed_L ].val = 0x58;
CurValueStr[Vvspeed_H ].val = 0x02;
CurValueStr[Electricity_H ].val = 0x00;
CurValueStr[Electricity_L ].val = 0xC8;
CurValueStr[Electricity_h ].val = 0x03;
CurValueStr[Electricity_l ].val = 0x20;
CurValueStr[Sidebrace ].val = 0x00;
CurValueStr[cruise ].val = 0x00;
CurValueStr[ABS ].val = 0x00;
// CurValueStr[TCS ].val = 0x00;
CurValueStr[Tire_pressure ].val = 0x10;
CurValueStr[Bluetooth ].val = 0x00;
CurValueStr[GPS ].val = 0x00;
CurValueStr[Callalert ].val = 0x01;
// CurValueStr[GMS ].val = 0x00;
CurValueStr[Parallelsignals ].val = 0x00;
CurValueStr[Enginefailure ].val = 0x10;
}break;
case 4:
{
CurValueStr[Vvspeed_L ].val = 0x20;
CurValueStr[Vvspeed_H ].val = 0x03;
CurValueStr[Electricity_H ].val = 0x01;
CurValueStr[Electricity_L ].val = 0x2C;
CurValueStr[Electricity_h ].val = 0x02;
CurValueStr[Electricity_l ].val = 0xBC;
CurValueStr[Sidebrace ].val = 0x00;
CurValueStr[cruise ].val = 0x00;
CurValueStr[ABS ].val = 0x00;
// CurValueStr[TCS ].val = 0x00;
CurValueStr[Tire_pressure ].val = 0x00;
CurValueStr[Bluetooth ].val = 0x00;
CurValueStr[GPS ].val = 0x00;
CurValueStr[Callalert ].val = 0x01;
// CurValueStr[GMS ].val = 0x00;
CurValueStr[Parallelsignals ].val = 0x00;
CurValueStr[Enginefailure ].val = 0x00;
}break;
case 5:
case 2: //40
{
CurValueStr[Vvspeed_L ].val = 0XE8;
CurValueStr[Vvspeed_H ].val = 0X03;
CurValueStr[Electricity_H ].val = 0X01;
CurValueStr[Electricity_L ].val = 0X90;
CurValueStr[Electricity_h ].val = 0X02;
CurValueStr[Electricity_l ].val = 0X58;
CurValueStr[Sidebrace ].val = 0X00;
CurValueStr[cruise ].val = 0X00;
CurValueStr[ABS ].val = 0X00;
// CurValueStr[TCS ].val = 0X00;
CurValueStr[Tire_pressure ].val = 0X00;
CurValueStr[Bluetooth ].val = 0X80;
CurValueStr[GPS ].val = 0X00;
CurValueStr[Callalert ].val = 0X01;
// CurValueStr[GMS ].val = 0X00;
CurValueStr[Parallelsignals ].val = 0X00;
CurValueStr[Enginefailure ].val = 0X00;
CurValueStr[Vspeed_L ].val = 0x0F;
CurValueStr[Vspeed_H ].val = 0xA0;
}
break;
case 6:
case 3: //60
{
CurValueStr[Vvspeed_L ].val = 0xB0;
CurValueStr[Vvspeed_H ].val = 0x04;
CurValueStr[Electricity_H ].val = 0x01;
CurValueStr[Electricity_L ].val = 0xF4;
CurValueStr[Electricity_h ].val = 0x01;
CurValueStr[Electricity_l ].val = 0xF4;
CurValueStr[Sidebrace ].val = 0x00;
CurValueStr[cruise ].val = 0x00;
CurValueStr[ABS ].val = 0x00;
// CurValueStr[TCS ].val = 0x00;
CurValueStr[Tire_pressure ].val = 0x00;
CurValueStr[Bluetooth ].val = 0x00;
CurValueStr[GPS ].val = 0x02;
CurValueStr[Callalert ].val = 0x01;
// CurValueStr[GMS ].val = 0x00;
CurValueStr[Parallelsignals ].val = 0x00;
CurValueStr[Enginefailure ].val = 0x00;
CurValueStr[Vspeed_L ].val = 0x17;
CurValueStr[Vspeed_H ].val = 0x70;
}
break;
case 7:
case 4: //80
{
CurValueStr[Vvspeed_L ].val = 0x78;
CurValueStr[Vvspeed_H ].val = 0x05;
CurValueStr[Electricity_H ].val = 0x02;
CurValueStr[Electricity_L ].val = 0x58;
CurValueStr[Electricity_h ].val = 0x01;
CurValueStr[Electricity_l ].val = 0x90;
CurValueStr[Sidebrace ].val = 0x00;
CurValueStr[cruise ].val = 0x00;
CurValueStr[ABS ].val = 0x08;
// CurValueStr[TCS ].val = 0x00;
CurValueStr[Tire_pressure ].val = 0x00;
CurValueStr[Bluetooth ].val = 0x00;
CurValueStr[GPS ].val = 0x00;
CurValueStr[Callalert ].val = 0x00;
// CurValueStr[GMS ].val = 0x00;
CurValueStr[Parallelsignals ].val = 0x00;
CurValueStr[Enginefailure ].val = 0x00;
CurValueStr[Vspeed_L ].val = 0x1F;
CurValueStr[Vspeed_H ].val = 0x40;
}
break;
case 8:
case 5: //80
{
CurValueStr[Vvspeed_L ].val = 0x40;
CurValueStr[Vvspeed_H ].val = 0x06;
CurValueStr[Electricity_H ].val = 0x02;
CurValueStr[Electricity_L ].val = 0xBC;
CurValueStr[Electricity_h ].val = 0x01;
CurValueStr[Electricity_l ].val = 0x2C;
CurValueStr[Sidebrace ].val = 0x00;
CurValueStr[cruise ].val = 0x04;
CurValueStr[ABS ].val = 0x00;
// CurValueStr[TCS ].val = 0x00;
CurValueStr[Tire_pressure ].val = 0x00;
CurValueStr[Bluetooth ].val = 0x00;
CurValueStr[GPS ].val = 0x01;
CurValueStr[Callalert ].val = 0x01;
CurValueStr[GMS ].val = 0x00;
CurValueStr[Parallelsignals ].val = 0x00;
CurValueStr[Enginefailure ].val = 0x00;
CurValueStr[Vspeed_L ].val = 0x27;
CurValueStr[Vspeed_H ].val = 0x10;
}
break;
case 9:
{
CurValueStr[Vvspeed_L ].val = 0x08;
CurValueStr[Vvspeed_H ].val = 0x07;
CurValueStr[Electricity_H ].val = 0x03;
CurValueStr[Electricity_L ].val = 0x20;
CurValueStr[Electricity_h ].val = 0x00;
CurValueStr[Electricity_l ].val = 0xC8;
CurValueStr[Sidebrace ].val = 0x00;
CurValueStr[cruise ].val = 0x00;
CurValueStr[ABS ].val = 0x00;
// CurValueStr[TCS ].val = 0x00;
CurValueStr[Tire_pressure ].val = 0x00;
CurValueStr[Bluetooth ].val = 0x00;
CurValueStr[GPS ].val = 0x00;
CurValueStr[Callalert ].val = 0x01;
// case 6:
// {
// CurValueStr[Vvspeed_L ].val = 0xB0;
// CurValueStr[Vvspeed_H ].val = 0x04;
// CurValueStr[Electricity_H ].val = 0x01;
// CurValueStr[Electricity_L ].val = 0xF4;
// CurValueStr[Electricity_h ].val = 0x01;
// CurValueStr[Electricity_l ].val = 0xF4;
// CurValueStr[Sidebrace ].val = 0x00;
// CurValueStr[cruise ].val = 0x00;
// CurValueStr[ABS ].val = 0x00;
// // CurValueStr[TCS ].val = 0x00;
// CurValueStr[Tire_pressure ].val = 0x00;
// CurValueStr[Bluetooth ].val = 0x00;
// CurValueStr[GPS ].val = 0x02;
// CurValueStr[Callalert ].val = 0x01;
// // CurValueStr[GMS ].val = 0x00;
// CurValueStr[Parallelsignals ].val = 0x00;
// CurValueStr[Enginefailure ].val = 0x00;
// }
// break;
// case 7:
// {
// CurValueStr[Vvspeed_L ].val = 0x78;
// CurValueStr[Vvspeed_H ].val = 0x05;
// CurValueStr[Electricity_H ].val = 0x02;
// CurValueStr[Electricity_L ].val = 0x58;
// CurValueStr[Electricity_h ].val = 0x01;
// CurValueStr[Electricity_l ].val = 0x90;
// CurValueStr[Sidebrace ].val = 0x00;
// CurValueStr[cruise ].val = 0x00;
// CurValueStr[ABS ].val = 0x08;
// // CurValueStr[TCS ].val = 0x00;
// CurValueStr[Tire_pressure ].val = 0x00;
// CurValueStr[Bluetooth ].val = 0x00;
// CurValueStr[GPS ].val = 0x00;
// CurValueStr[Callalert ].val = 0x00;
// // CurValueStr[GMS ].val = 0x00;
// CurValueStr[Parallelsignals ].val = 0x00;
// CurValueStr[Enginefailure ].val = 0x00;
// }
// break;
// case 8:
// {
// CurValueStr[Vvspeed_L ].val = 0x40;
// CurValueStr[Vvspeed_H ].val = 0x06;
// CurValueStr[Electricity_H ].val = 0x02;
// CurValueStr[Electricity_L ].val = 0xBC;
// CurValueStr[Electricity_h ].val = 0x01;
// CurValueStr[Electricity_l ].val = 0x2C;
// CurValueStr[Sidebrace ].val = 0x00;
// CurValueStr[cruise ].val = 0x04;
// CurValueStr[ABS ].val = 0x00;
// // CurValueStr[TCS ].val = 0x00;
// CurValueStr[Tire_pressure ].val = 0x00;
// CurValueStr[Bluetooth ].val = 0x00;
// CurValueStr[GPS ].val = 0x01;
// CurValueStr[Callalert ].val = 0x01;
// CurValueStr[GMS ].val = 0x00;
CurValueStr[Parallelsignals ].val = 0x01;
CurValueStr[Enginefailure ].val = 0x00;
}
break;
case 10:
{
CurValueStr[Vvspeed_L ].val = 0xD0;
CurValueStr[Vvspeed_H ].val = 0x07;
CurValueStr[Electricity_H ].val = 0x03;
CurValueStr[Electricity_L ].val = 0xE8;
CurValueStr[Electricity_h ].val = 0x00;
CurValueStr[Electricity_l ].val = 0x00;
CurValueStr[Sidebrace ].val = 0x04;
CurValueStr[cruise ].val = 0x04;
CurValueStr[ABS ].val = 0x09;
// CurValueStr[TCS ].val = 0x10;
CurValueStr[Tire_pressure ].val = 0x10;
CurValueStr[Bluetooth ].val = 0x80;
CurValueStr[GPS ].val = 0x03;
CurValueStr[Callalert ].val = 0x00;
CurValueStr[GMS ].val = 0x00;
CurValueStr[Parallelsignals ].val = 0x01;
CurValueStr[Enginefailure ].val = 0x10;
}
break;
#if 0
case 12:
{
CurValueStr[ENUM_VSpeed ].val = speed_value;//车速
CurValueStr[ENUM_RSpeed ].val = 12000;
CurValueStr[ENUM_WaterTemp ].val = water_value;//水温
if(direction_espeed==1)
{
CurValueStr[ISG_Power ].val = 0;
CurValueStr[ISG_Power_Enable ].val = 0;
CurValueStr[TCS_Warning_Lamp ].val = 1;
CurValueStr[TCS_Work_Mode ].val = 0;
}
else
{
CurValueStr[ISG_Ready ].val = 1;
CurValueStr[TCS_Warning_Lamp ].val = 0;
CurValueStr[TCS_Work_Mode ].val = 1;
}
}break;
#endif
}
#endif
}
}
// CurValueStr[Parallelsignals ].val = 0x00;
// CurValueStr[Enginefailure ].val = 0x00;
// }
// break;
// case 9:
// {
// CurValueStr[Vvspeed_L ].val = 0x08;
// CurValueStr[Vvspeed_H ].val = 0x07;
// CurValueStr[Electricity_H ].val = 0x03;
// CurValueStr[Electricity_L ].val = 0x20;
// CurValueStr[Electricity_h ].val = 0x00;
// CurValueStr[Electricity_l ].val = 0xC8;
// CurValueStr[Sidebrace ].val = 0x00;
// CurValueStr[cruise ].val = 0x00;
// CurValueStr[ABS ].val = 0x00;
// // CurValueStr[TCS ].val = 0x00;
// CurValueStr[Tire_pressure ].val = 0x00;
// CurValueStr[Bluetooth ].val = 0x00;
// CurValueStr[GPS ].val = 0x00;
// CurValueStr[Callalert ].val = 0x01;
// // CurValueStr[GMS ].val = 0x00;
// CurValueStr[Parallelsignals ].val = 0x01;
// CurValueStr[Enginefailure ].val = 0x00;
// }
// break;
// case 10:
// {
// CurValueStr[Vvspeed_L ].val = 0xD0;
// CurValueStr[Vvspeed_H ].val = 0x07;
// CurValueStr[Electricity_H ].val = 0x03;
// CurValueStr[Electricity_L ].val = 0xE8;
// CurValueStr[Electricity_h ].val = 0x00;
// CurValueStr[Electricity_l ].val = 0x00;
// CurValueStr[Sidebrace ].val = 0x04;
// CurValueStr[cruise ].val = 0x04;
// CurValueStr[ABS ].val = 0x09;
// // CurValueStr[TCS ].val = 0x10;
// CurValueStr[Tire_pressure ].val = 0x10;
// CurValueStr[Bluetooth ].val = 0x80;
// CurValueStr[GPS ].val = 0x03;
// CurValueStr[Callalert ].val = 0x00;
// CurValueStr[GMS ].val = 0x00;
// CurValueStr[Parallelsignals ].val = 0x01;
// CurValueStr[Enginefailure ].val = 0x10;
// }
// break;
// #if 0
// case 12:
// {
// CurValueStr[ENUM_VSpeed ].val = speed_value;//����
// CurValueStr[ENUM_RSpeed ].val = 12000;
// CurValueStr[ENUM_WaterTemp ].val = water_value;//ˮ��
// if(direction_espeed==1)
// {
// CurValueStr[ISG_Power ].val = 0;
// CurValueStr[ISG_Power_Enable ].val = 0;
// CurValueStr[TCS_Warning_Lamp ].val = 1;
// CurValueStr[TCS_Work_Mode ].val = 0;
// }
// else
// {
// CurValueStr[ISG_Ready ].val = 1;
// CurValueStr[TCS_Warning_Lamp ].val = 0;
// CurValueStr[TCS_Work_Mode ].val = 1;
// }
// }break;
// #endif
}
// #endif
// }
// }
}
......@@ -476,12 +403,12 @@ void Message_Value_Calculate(s_CAN_List list)
temp = CurValue;
//璁＄畻鍋忕Щ锟??
//计算偏移�??
if(Offset != 0){
if(Offset_Flag == Offset_Minus){
if(Value_Flag == Value_Minus){
if(temp > Offset){
temp = 0; //閿欒??锛屾墍瑕佸疄鐜扮殑鍊煎皬浜庣墿鐞嗘渶灏忥拷?
temp = 0; //错�??，所要实现的值小于物理最小�?
}else{
temp = Offset - temp;
}
......@@ -490,7 +417,7 @@ void Message_Value_Calculate(s_CAN_List list)
}else{;}
}else if(Offset_Flag == Offset_Plus){
if(temp < Offset){
temp = 0; //閿欒??锛屾墍瑕佸疄鐜扮殑鍊煎皬浜庣墿鐞嗘渶灏忥拷?
temp = 0; //错�??，所要实现的值小于物理最小�?
}else{
temp -= Offset;
}
......
Test_Bench/App_Headers/APP_Test.h
View file @ 584303e0
......@@ -84,21 +84,23 @@ enum
// Electricity_L,
// Electricity_h,
// Electricity_l,
// Sidebrace, //侧撑
// cruise, //巡航
// Sidebrace, //���
// cruise, //Ѳ��
// ABS,
// TCS,
// Tire_pressure,
// Bluetooth,
// GPS,
// Callalert, //来电提醒
// GMS, //来电提醒
// Parallelsignals, //并联信号
// Enginefailure, //发动机故障
// Callalert, //��������
// GMS, //��������
// Parallelsignals, //�����ź�
// Enginefailure, //����������
// P_dang,
Engine_water_temperature_display = 0,
EVpeed_H,
EVpeed_L,
Vspeed_L,
Vspeed_H,
CAN_List_Num,
};
......@@ -174,6 +176,9 @@ static const s_CAN_List CAN_List[] =
{&CanMsg_522, 4, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[EVpeed_L ], Motorola},
{&CanMsg_522, 5, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[EVpeed_H ], Motorola},
{&CanMsg_260, 0, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Vspeed_L ], Motorola},
{&CanMsg_260, 1, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Vspeed_H ], Motorola},
};
extern unsigned int Key_Dodging_flag;
extern unsigned int lost_flag;
......
Test_Bench/App_Headers/Globals_Var.h
View file @ 584303e0
......@@ -110,6 +110,7 @@
/*CS08 test*/
EXTERN_VAR CAN_message CanMsg_521;
EXTERN_VAR CAN_message CanMsg_522;
EXTERN_VAR CAN_message CanMsg_260;
// EXTERN_VAR CAN_message CanMsg_101;
// EXTERN_VAR CAN_message CanMsg_067;
// EXTERN_VAR CAN_message CanMsg_600;
......@@ -137,6 +138,7 @@
extern CAN_message CanMsg_521;
extern CAN_message CanMsg_522;
extern CAN_message CanMsg_260;
// extern CAN_message CanMsg_101;
// extern CAN_message CanMsg_067;
// extern CAN_message CanMsg_600;
......
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