Commit 584303e0 authored by 何锐's avatar 何锐

feat:电春风车速老化程序

parent 76514bb8
...@@ -15,7 +15,7 @@ INT16U RT_10ms = 0, ...@@ -15,7 +15,7 @@ INT16U RT_10ms = 0,
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Function Name : Api_SetTimer1 * Function Name : Api_SetTimer1
* Description : 设置定时器 * Description : ���ö�ʱ��
* Input : * Input :
* Output : None * Output : None
* Return : None * Return : None
...@@ -29,7 +29,7 @@ void Api_SetTimer0(INT16U Second,ClockType *T) ...@@ -29,7 +29,7 @@ void Api_SetTimer0(INT16U Second,ClockType *T)
} }
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Function Name : API_TimerOver * Function Name : API_TimerOver
* Description : 设置定时器 * Description : ���ö�ʱ��
* Input : * Input :
* Output : None * Output : None
* Return : None * Return : None
...@@ -50,7 +50,7 @@ INT8U Api_TimerOver0(ClockType *T) ...@@ -50,7 +50,7 @@ INT8U Api_TimerOver0(ClockType *T)
} }
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Function Name : Api_SetTimer1 * Function Name : Api_SetTimer1
* Description : 设置定时器 * Description : ���ö�ʱ��
* Input : * Input :
* Output : None * Output : None
* Return : None * Return : None
...@@ -64,7 +64,7 @@ void Api_SetTimer1(INT16U Second,ClockType *T) ...@@ -64,7 +64,7 @@ void Api_SetTimer1(INT16U Second,ClockType *T)
} }
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Function Name : API_TimerOver * Function Name : API_TimerOver
* Description : 设置定时器 * Description : ���ö�ʱ��
* Input : * Input :
* Output : None * Output : None
* Return : None * Return : None
...@@ -85,7 +85,7 @@ INT8U Api_TimerOver1(ClockType *T) ...@@ -85,7 +85,7 @@ INT8U Api_TimerOver1(ClockType *T)
} }
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Function Name : Api_SetTimer1 * Function Name : Api_SetTimer1
* Description : 设置定时器 * Description : ���ö�ʱ��
* Input : * Input :
* Output : None * Output : None
* Return : None * Return : None
...@@ -99,7 +99,7 @@ void Api_SetTimer2(INT16U Second,ClockType *T) ...@@ -99,7 +99,7 @@ void Api_SetTimer2(INT16U Second,ClockType *T)
} }
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Function Name : API_TimerOver * Function Name : API_TimerOver
* Description : 设置定时器 * Description : ���ö�ʱ��
* Input : * Input :
* Output : None * Output : None
* Return : None * Return : None
...@@ -120,7 +120,7 @@ INT8U Api_TimerOver2(ClockType *T) ...@@ -120,7 +120,7 @@ INT8U Api_TimerOver2(ClockType *T)
} }
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Function Name : Api_SetTimer3 * Function Name : Api_SetTimer3
* Description : 设置定时器 * Description : ���ö�ʱ��
* Input : * Input :
* Output : None * Output : None
* Return : None * Return : None
...@@ -134,7 +134,7 @@ void Api_SetTimer3(INT16U Second,ClockType *T) ...@@ -134,7 +134,7 @@ void Api_SetTimer3(INT16U Second,ClockType *T)
} }
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Function Name : Api_TimerOver3 * Function Name : Api_TimerOver3
* Description : 设置定时器 * Description : ���ö�ʱ��
* Input : * Input :
* Output : None * Output : None
* Return : None * Return : None
...@@ -155,7 +155,7 @@ INT8U Api_TimerOver3(ClockType *T) ...@@ -155,7 +155,7 @@ INT8U Api_TimerOver3(ClockType *T)
} }
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Function Name : Api_SetTimer4 * Function Name : Api_SetTimer4
* Description : 设置定时器 * Description : ���ö�ʱ��
* Input : * Input :
* Output : None * Output : None
* Return : None * Return : None
...@@ -169,7 +169,7 @@ void Api_SetTimer4(INT16U Second,ClockType *T) ...@@ -169,7 +169,7 @@ void Api_SetTimer4(INT16U Second,ClockType *T)
} }
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Function Name : Api_TimerOver4 * Function Name : Api_TimerOver4
* Description : 设置定时器 * Description : ���ö�ʱ��
* Input : * Input :
* Output : None * Output : None
* Return : None * Return : None
...@@ -190,7 +190,7 @@ INT8U Api_TimerOver4(ClockType *T) ...@@ -190,7 +190,7 @@ INT8U Api_TimerOver4(ClockType *T)
} }
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Function Name : Api_SetTimer5 * Function Name : Api_SetTimer5
* Description : 设置定时器 * Description : ���ö�ʱ��
* Input : * Input :
* Output : None * Output : None
* Return : None * Return : None
...@@ -204,7 +204,7 @@ void Api_SetTimer5(INT16U Second,ClockType *T) ...@@ -204,7 +204,7 @@ void Api_SetTimer5(INT16U Second,ClockType *T)
} }
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Function Name : Api_TimerOver5 * Function Name : Api_TimerOver5
* Description : 设置定时器 * Description : ���ö�ʱ��
* Input : * Input :
* Output : None * Output : None
* Return : None * Return : None
...@@ -225,7 +225,7 @@ INT8U Api_TimerOver5(ClockType *T) ...@@ -225,7 +225,7 @@ INT8U Api_TimerOver5(ClockType *T)
} }
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Function Name : Api_SetTimer6 * Function Name : Api_SetTimer6
* Description : 设置定时器 * Description : ���ö�ʱ��
* Input : * Input :
* Output : None * Output : None
* Return : None * Return : None
...@@ -239,7 +239,7 @@ void Api_SetTimer6(INT16U Second,ClockType *T) ...@@ -239,7 +239,7 @@ void Api_SetTimer6(INT16U Second,ClockType *T)
} }
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Function Name : Api_TimerOver5 * Function Name : Api_TimerOver5
* Description : 设置定时器 * Description : ���ö�ʱ��
* Input : * Input :
* Output : None * Output : None
* Return : None * Return : None
...@@ -260,7 +260,7 @@ INT8U Api_TimerOver6(ClockType *T) ...@@ -260,7 +260,7 @@ INT8U Api_TimerOver6(ClockType *T)
} }
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Function Name : Api_SetTimer7 * Function Name : Api_SetTimer7
* Description : 设置定时器 * Description : ���ö�ʱ��
* Input : * Input :
* Output : None * Output : None
* Return : None * Return : None
...@@ -274,7 +274,7 @@ void Api_SetTimer7(INT16U Second,ClockType *T) ...@@ -274,7 +274,7 @@ void Api_SetTimer7(INT16U Second,ClockType *T)
} }
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Function Name : Api_TimerOver7 * Function Name : Api_TimerOver7
* Description : 设置定时器 * Description : ���ö�ʱ��
* Input : * Input :
* Output : None * Output : None
* Return : None * Return : None
...@@ -296,7 +296,7 @@ INT8U Api_TimerOver7(ClockType *T) ...@@ -296,7 +296,7 @@ INT8U Api_TimerOver7(ClockType *T)
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Function Name : Api_SetAutoTimer * Function Name : Api_SetAutoTimer
* Description : 设置自动切换定时器 * Description : �����Զ��л���ʱ��
* Input : * Input :
* Output : None * Output : None
* Return : None * Return : None
...@@ -310,7 +310,7 @@ void Api_SetAutoTimer(INT16U Second,ClockType *T) ...@@ -310,7 +310,7 @@ void Api_SetAutoTimer(INT16U Second,ClockType *T)
} }
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Function Name : Api_AutoTimerOver * Function Name : Api_AutoTimerOver
* Description : 设置自动切换定时器 * Description : �����Զ��л���ʱ��
* Input : * Input :
* Output : None * Output : None
* Return : None * Return : None
...@@ -403,7 +403,7 @@ INT16U time_3s = 0; ...@@ -403,7 +403,7 @@ INT16U time_3s = 0;
{ {
if(Key_Dodging_flag) if(Key_Dodging_flag)
{ {
if(Key.CAN_Step < 10) if(Key.CAN_Step < 5)
{ {
Key.CAN_Step++; Key.CAN_Step++;
} }
...@@ -519,7 +519,7 @@ INT16U time_3s = 0; ...@@ -519,7 +519,7 @@ INT16U time_3s = 0;
if(time_3s>2) if(time_3s>2)
{ {
time_3s = 0; time_3s = 0;
if(Key.CAN_Step > 10) if(Key.CAN_Step > 5)
{ {
Key.CAN_Step = 1; Key.CAN_Step = 1;
} }
......
...@@ -96,6 +96,7 @@ void Format_CAN_Msg() ...@@ -96,6 +96,7 @@ void Format_CAN_Msg()
{ {
CanMsg_521.ID = 0x521; CanMsg_521.ID = 0x521;
CanMsg_522.ID = 0x522; CanMsg_522.ID = 0x522;
CanMsg_260.ID = 0x260; //车速
// CanMsg_101.ID = 0x101; // CanMsg_101.ID = 0x101;
// CanMsg_067.ID = 0x67; // CanMsg_067.ID = 0x67;
// CanMsg_600.ID = 0x600; // CanMsg_600.ID = 0x600;
...@@ -123,6 +124,7 @@ void Format_CAN_Msg() ...@@ -123,6 +124,7 @@ void Format_CAN_Msg()
CanMsg_521.Length = 8; CanMsg_521.Length = 8;
CanMsg_522.Length = 8; CanMsg_522.Length = 8;
CanMsg_260.Length = 8;
// CanMsg_101.Length = 8; // CanMsg_101.Length = 8;
// CanMsg_067.Length = 8; // CanMsg_067.Length = 8;
// CanMsg_600.Length = 8; // CanMsg_600.Length = 8;
...@@ -151,6 +153,7 @@ void Format_CAN_Msg() ...@@ -151,6 +153,7 @@ void Format_CAN_Msg()
CanMsg_521.ID_EN = 1; CanMsg_521.ID_EN = 1;
CanMsg_522.ID_EN = 1; CanMsg_522.ID_EN = 1;
CanMsg_260.ID_EN = 1;
// CanMsg_101.ID_EN = 1; // CanMsg_101.ID_EN = 1;
// CanMsg_067.ID_EN = 1; // CanMsg_067.ID_EN = 1;
// CanMsg_600.ID_EN = 1; // CanMsg_600.ID_EN = 1;
...@@ -272,6 +275,8 @@ void App_Can_Proc(void) ...@@ -272,6 +275,8 @@ void App_Can_Proc(void)
// Clear_CAN_Msg((CAN_message *)&CanMsg_021); // Clear_CAN_Msg((CAN_message *)&CanMsg_021);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_521); bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_521);
Clear_CAN_Msg((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){ if(GetCtrlTime(CANMsgSend_200ms) >= 200){
......
This diff is collapsed.
...@@ -84,21 +84,23 @@ enum ...@@ -84,21 +84,23 @@ enum
// Electricity_L, // Electricity_L,
// Electricity_h, // Electricity_h,
// Electricity_l, // Electricity_l,
// Sidebrace, //侧撑 // Sidebrace, //���
// cruise, //巡 // cruise, //Ѳ��
// ABS, // ABS,
// TCS, // TCS,
// Tire_pressure, // Tire_pressure,
// Bluetooth, // Bluetooth,
// GPS, // GPS,
// Callalert, //来电提醒 // Callalert, //��������
// GMS, //来电提醒 // GMS, //��������
// Parallelsignals, //并联信号 // Parallelsignals, //�����ź�
// Enginefailure, //发动机故障 // Enginefailure, //����������
// P_dang, // P_dang,
Engine_water_temperature_display = 0, Engine_water_temperature_display = 0,
EVpeed_H, EVpeed_H,
EVpeed_L, EVpeed_L,
Vspeed_L,
Vspeed_H,
CAN_List_Num, CAN_List_Num,
}; };
...@@ -174,6 +176,9 @@ static const s_CAN_List CAN_List[] = ...@@ -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, 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_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 Key_Dodging_flag;
extern unsigned int lost_flag; extern unsigned int lost_flag;
......
...@@ -110,6 +110,7 @@ ...@@ -110,6 +110,7 @@
/*CS08 test*/ /*CS08 test*/
EXTERN_VAR CAN_message CanMsg_521; EXTERN_VAR CAN_message CanMsg_521;
EXTERN_VAR CAN_message CanMsg_522; EXTERN_VAR CAN_message CanMsg_522;
EXTERN_VAR CAN_message CanMsg_260;
// EXTERN_VAR CAN_message CanMsg_101; // EXTERN_VAR CAN_message CanMsg_101;
// EXTERN_VAR CAN_message CanMsg_067; // EXTERN_VAR CAN_message CanMsg_067;
// EXTERN_VAR CAN_message CanMsg_600; // EXTERN_VAR CAN_message CanMsg_600;
...@@ -137,6 +138,7 @@ ...@@ -137,6 +138,7 @@
extern CAN_message CanMsg_521; extern CAN_message CanMsg_521;
extern CAN_message CanMsg_522; extern CAN_message CanMsg_522;
extern CAN_message CanMsg_260;
// extern CAN_message CanMsg_101; // extern CAN_message CanMsg_101;
// extern CAN_message CanMsg_067; // extern CAN_message CanMsg_067;
// extern CAN_message CanMsg_600; // 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