Commit 8e3d105a authored by 何锐's avatar 何锐

feat:五羊本田EV1高配老化台程序

parent a842a1bb
...@@ -99,16 +99,47 @@ void Format_CAN_Msg() ...@@ -99,16 +99,47 @@ void Format_CAN_Msg()
CanMsg_600.ID = 0x600; CanMsg_600.ID = 0x600;
CanMsg_611.ID = 0x611; CanMsg_611.ID = 0x611;
CanMsg_610.ID = 0x610; CanMsg_610.ID = 0x610;
CanMsg_200.ID = 0x200;
CanMsg_481.ID = 0x481;
CanMsg_020.ID = 0x020;
CanMsg_202.ID = 0x202;
CanMsg_280.ID = 0x280;
CanMsg_042.ID = 0x042;
CanMsg_480.ID = 0x480;
CanMsg_021.ID = 0x021;
CanMsg_001.ID = 0x001;
CanMsg_101.Length = 8; CanMsg_101.Length = 8;
CanMsg_067.Length = 8; CanMsg_067.Length = 8;
CanMsg_600.Length = 8; CanMsg_600.Length = 8;
CanMsg_611.Length = 8; CanMsg_611.Length = 8;
CanMsg_610.Length = 8; CanMsg_610.Length = 8;
CanMsg_200.Length = 8;
CanMsg_481.Length = 8;
CanMsg_020.Length = 8;
CanMsg_202.Length = 8;
CanMsg_280.Length = 8;
CanMsg_042.Length = 8;
CanMsg_480.Length = 8;
CanMsg_021.Length = 8;
CanMsg_001.Length = 8;
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;
CanMsg_611.ID_EN = 1; CanMsg_611.ID_EN = 1;
CanMsg_610.ID_EN = 1; CanMsg_610.ID_EN = 1;
CanMsg_200.ID_EN = 1;
CanMsg_481.ID_EN = 1;
CanMsg_020.ID_EN = 1;
CanMsg_202.ID_EN = 1;
CanMsg_280.ID_EN = 1;
CanMsg_042.ID_EN = 1;
CanMsg_480.ID_EN = 1;
CanMsg_021.ID_EN = 1;
CanMsg_001.ID_EN = 1;
} }
void Disable_CAN_Tx(void) void Disable_CAN_Tx(void)
...@@ -118,6 +149,15 @@ void Disable_CAN_Tx(void) ...@@ -118,6 +149,15 @@ void Disable_CAN_Tx(void)
CanMsg_600.ID_EN = 0; CanMsg_600.ID_EN = 0;
CanMsg_611.ID_EN = 0; CanMsg_611.ID_EN = 0;
CanMsg_610.ID_EN = 0; CanMsg_610.ID_EN = 0;
CanMsg_200.ID_EN = 0;
CanMsg_481.ID_EN = 0;
CanMsg_020.ID_EN = 0;
CanMsg_202.ID_EN = 0;
CanMsg_280.ID_EN = 0;
CanMsg_042.ID_EN = 0;
CanMsg_480.ID_EN = 0;
CanMsg_021.ID_EN = 0;
CanMsg_001.ID_EN = 0;
} }
void Set_Pin(INT16U pin) void Set_Pin(INT16U pin)
...@@ -147,6 +187,10 @@ void App_Can_Proc(void) ...@@ -147,6 +187,10 @@ void App_Can_Proc(void)
if(GetCtrlTime(CANMsgSend_10ms) >= 10){ if(GetCtrlTime(CANMsgSend_10ms) >= 10){
ClearCtrlTime(CANMsgSend_10ms); ClearCtrlTime(CANMsgSend_10ms);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_042);
Clear_CAN_Msg((CAN_message *)&CanMsg_042);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_001);
Clear_CAN_Msg((CAN_message *)&CanMsg_001);
} }
if(GetCtrlTime(CANMsgSend_20ms) >= 20){ if(GetCtrlTime(CANMsgSend_20ms) >= 20){
...@@ -167,6 +211,19 @@ void App_Can_Proc(void) ...@@ -167,6 +211,19 @@ void App_Can_Proc(void)
ClearCtrlTime(CANMsgSend_100ms); ClearCtrlTime(CANMsgSend_100ms);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_600); bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_600);
Clear_CAN_Msg((CAN_message *)&CanMsg_600); Clear_CAN_Msg((CAN_message *)&CanMsg_600);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_200);
Clear_CAN_Msg((CAN_message *)&CanMsg_200);
if(electricityclose == 0)
{
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_020);
Clear_CAN_Msg((CAN_message *)&CanMsg_020);
}
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_202);
Clear_CAN_Msg((CAN_message *)&CanMsg_202);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_280);
Clear_CAN_Msg((CAN_message *)&CanMsg_280);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_021);
Clear_CAN_Msg((CAN_message *)&CanMsg_021);
} }
if(GetCtrlTime(CANMsgSend_200ms) >= 200){ if(GetCtrlTime(CANMsgSend_200ms) >= 200){
...@@ -178,6 +235,10 @@ void App_Can_Proc(void) ...@@ -178,6 +235,10 @@ void App_Can_Proc(void)
flash_1Hz_process(); flash_1Hz_process();
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_611); bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_611);
Clear_CAN_Msg((CAN_message *)&CanMsg_611); Clear_CAN_Msg((CAN_message *)&CanMsg_611);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_481);
Clear_CAN_Msg((CAN_message *)&CanMsg_481);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_480);
Clear_CAN_Msg((CAN_message *)&CanMsg_480);
ClearCtrlTime(CANMsgSend_500ms); ClearCtrlTime(CANMsgSend_500ms);
} }
...@@ -219,6 +280,26 @@ void App_Can_Proc(void) ...@@ -219,6 +280,26 @@ void App_Can_Proc(void)
CurValueStr[Battery_status ].val = 0; CurValueStr[Battery_status ].val = 0;
CurValueStr[Battery_Current ].val = 0; CurValueStr[Battery_Current ].val = 0;
CurValueStr[Battery_SOC ].val = 0; CurValueStr[Battery_SOC ].val = 0;
CurValueStr[Vspeed ].val = 0;
CurValueStr[hour ].val = 0;
CurValueStr[minute ].val = 0;
CurValueStr[electricity ].val = 0;
CurValueStr[fault ].val = 0;
CurValueStr[Energy_recovery ].val = 0;
CurValueStr[Energy_recovery_level ].val = 0;
CurValueStr[Side_brackets ].val = 0;
CurValueStr[TCS_close ].val = 0;
CurValueStr[TCS_crotrul ].val = 0;
CurValueStr[TCS_mode ].val = 0;
CurValueStr[TCS_light ].val = 0;
CurValueStr[GPS ].val = 0;
CurValueStr[signal_4G ].val = 0;
CurValueStr[Battery_over ].val = 0;
CurValueStr[Motor_overheating ].val = 0;
CurValueStr[Cruise_control ].val = 0;
CurValueStr[Gear ].val = 0;
CurValueStr[Bluetooth_phone ].val = 0;
CurValueStr[year ].val = 0;
CurValueStr[ENUM_VSpeed ].fval = Value_Plus; CurValueStr[ENUM_VSpeed ].fval = Value_Plus;
CurValueStr[ECM_FaultIndicator ].fval = Value_Plus; CurValueStr[ECM_FaultIndicator ].fval = Value_Plus;
...@@ -237,6 +318,25 @@ void App_Can_Proc(void) ...@@ -237,6 +318,25 @@ void App_Can_Proc(void)
CurValueStr[Battery_status ].fval = Value_Plus; CurValueStr[Battery_status ].fval = Value_Plus;
CurValueStr[Battery_Current ].fval = Value_Plus; CurValueStr[Battery_Current ].fval = Value_Plus;
CurValueStr[Battery_SOC ].fval = Value_Plus; CurValueStr[Battery_SOC ].fval = Value_Plus;
CurValueStr[Vspeed ].fval = Value_Plus;
CurValueStr[hour ].fval = Value_Plus;
CurValueStr[minute ].fval = Value_Plus;
CurValueStr[electricity ].fval = Value_Plus;
CurValueStr[fault ].fval = Value_Plus;
CurValueStr[Energy_recovery_level ].fval = Value_Plus;
CurValueStr[Side_brackets ].fval = Value_Plus;
CurValueStr[TCS_close ].fval = Value_Plus;
CurValueStr[TCS_crotrul ].fval = Value_Plus;
CurValueStr[TCS_mode ].fval = Value_Plus;
CurValueStr[TCS_light ].fval = Value_Plus;
CurValueStr[GPS ].fval = Value_Plus;
CurValueStr[signal_4G ].fval = Value_Plus;
CurValueStr[Battery_over ].fval = Value_Plus;
CurValueStr[Motor_overheating ].fval = Value_Plus;
CurValueStr[Cruise_control ].fval = Value_Plus;
CurValueStr[Gear ].fval = Value_Plus;
CurValueStr[Bluetooth_phone ].fval = Value_Plus;
CurValueStr[year ].fval = Value_Plus;
// CurVehSpeed = 0; // CurVehSpeed = 0;
//LDW Open //LDW Open
......
This diff is collapsed.
...@@ -58,6 +58,28 @@ enum ...@@ -58,6 +58,28 @@ enum
Battery_status, Battery_status,
Battery_Current, Battery_Current,
Battery_SOC, Battery_SOC,
Vspeed,
hour,
minute,
electricity,
fault,
Ready,
Energy_recovery,
Energy_recovery_level,
Side_brackets,
TCS_close,
TCS_crotrul,
TCS_mode,
TCS_light,
GPS,
signal_4G,
Battery_over,
Motor_overheating,
Cruise_control,
Gear,
Bluetooth_phone,
year,
CAN_List_Num, CAN_List_Num,
}; };
...@@ -82,6 +104,29 @@ static const s_CAN_List CAN_List[] = ...@@ -82,6 +104,29 @@ static const s_CAN_List CAN_List[] =
{&CanMsg_610, 0, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Battery_status ], Motorola}, {&CanMsg_610, 0, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Battery_status ], Motorola},
{&CanMsg_610,2,0, 16,255,Offset_Minus, 10, 1, &CurValueStr[Battery_Current ], Motorola}, {&CanMsg_610,2,0, 16,255,Offset_Minus, 10, 1, &CurValueStr[Battery_Current ], Motorola},
{&CanMsg_611, 0, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Battery_SOC ], Motorola}, {&CanMsg_611, 0, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Battery_SOC ], Motorola},
{&CanMsg_200, 2, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Vspeed ], Motorola},
{&CanMsg_481, 3, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[hour ], Motorola},
{&CanMsg_481, 4, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[minute ], Motorola},
{&CanMsg_020, 3, 0, 16, 0, Offset_Plus, 1, 1, &CurValueStr[electricity ], Motorola},
{&CanMsg_202, 2, 2, 1, 0, Offset_Plus, 1, 1, &CurValueStr[fault ], Motorola},
{&CanMsg_202, 1, 4, 2, 0, Offset_Plus, 1, 1, &CurValueStr[Ready ], Motorola},
{&CanMsg_280, 3, 0, 1, 0, Offset_Plus, 1, 1, &CurValueStr[Energy_recovery ], Motorola},
{&CanMsg_280, 3, 5, 2, 0, Offset_Plus, 1, 1, &CurValueStr[Energy_recovery_level ], Motorola},
{&CanMsg_280, 3, 3, 1, 0, Offset_Plus, 1, 1, &CurValueStr[Side_brackets ], Motorola},
{&CanMsg_280, 4, 4, 1, 0, Offset_Plus, 1, 1, &CurValueStr[TCS_close ], Motorola},
{&CanMsg_042, 2, 7, 1, 0, Offset_Plus, 1, 1, &CurValueStr[TCS_crotrul ], Motorola},
{&CanMsg_042, 2, 6, 1, 0, Offset_Plus, 1, 1, &CurValueStr[TCS_mode ], Motorola},
{&CanMsg_042, 2, 0, 4, 0, Offset_Plus, 1, 1, &CurValueStr[TCS_light ], Motorola},
{&CanMsg_480, 1, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[GPS ], Motorola},
{&CanMsg_480, 0, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[signal_4G ], Motorola},
{&CanMsg_021, 5, 7, 1, 0, Offset_Plus, 1, 1, &CurValueStr[Battery_over ], Motorola},
{&CanMsg_001, 2, 4, 1, 0, Offset_Plus, 1, 1, &CurValueStr[Motor_overheating ], Motorola},
{&CanMsg_202, 1, 6, 1, 0, Offset_Plus, 1, 1, &CurValueStr[Cruise_control ], Motorola},
{&CanMsg_202, 0, 2, 2, 0, Offset_Plus, 1, 1, &CurValueStr[Gear ], Motorola},
{&CanMsg_480, 2, 6, 1, 0, Offset_Plus, 1, 1, &CurValueStr[Bluetooth_phone ], Motorola},
{&CanMsg_481, 0, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[year ], Motorola},
}; };
extern unsigned int Key_Dodging_flag; extern unsigned int Key_Dodging_flag;
extern unsigned int lost_flag; extern unsigned int lost_flag;
...@@ -89,6 +134,7 @@ extern unsigned int CAN_init_flag; ...@@ -89,6 +134,7 @@ extern unsigned int CAN_init_flag;
extern unsigned int water_value; extern unsigned int water_value;
extern unsigned int count_flag_a; extern unsigned int count_flag_a;
extern unsigned int speed_value; extern unsigned int speed_value;
extern unsigned int electricityclose;
EXTERN_APP_TEST void APP_Button_Proc(void); EXTERN_APP_TEST void APP_Button_Proc(void);
EXTERN_APP_TEST void Message_Value_Calculate(s_CAN_List list); EXTERN_APP_TEST void Message_Value_Calculate(s_CAN_List list);
......
...@@ -113,12 +113,30 @@ ...@@ -113,12 +113,30 @@
EXTERN_VAR CAN_message CanMsg_600; EXTERN_VAR CAN_message CanMsg_600;
EXTERN_VAR CAN_message CanMsg_611; EXTERN_VAR CAN_message CanMsg_611;
EXTERN_VAR CAN_message CanMsg_610; EXTERN_VAR CAN_message CanMsg_610;
EXTERN_VAR CAN_message CanMsg_200;
EXTERN_VAR CAN_message CanMsg_481;
EXTERN_VAR CAN_message CanMsg_020;
EXTERN_VAR CAN_message CanMsg_202;
EXTERN_VAR CAN_message CanMsg_280;
EXTERN_VAR CAN_message CanMsg_042;
EXTERN_VAR CAN_message CanMsg_480;
EXTERN_VAR CAN_message CanMsg_021;
EXTERN_VAR CAN_message CanMsg_001;
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;
extern CAN_message CanMsg_611; extern CAN_message CanMsg_611;
extern CAN_message CanMsg_610; extern CAN_message CanMsg_610;
extern CAN_message CanMsg_200;
extern CAN_message CanMsg_481;
extern CAN_message CanMsg_020;
extern CAN_message CanMsg_202;
extern CAN_message CanMsg_280;
extern CAN_message CanMsg_042;
extern CAN_message CanMsg_480;
extern CAN_message CanMsg_021;
extern CAN_message CanMsg_001;
/**/ /**/
/*:zh*/ /*:zh*/
......
...@@ -10,7 +10,7 @@ Target=TBDML ...@@ -10,7 +10,7 @@ Target=TBDML
Layout=C_layout.hwl Layout=C_layout.hwl
LoadDialogOptions=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main" LoadDialogOptions=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
CPU=HC12 CPU=HC12
MainFrame=0,1,-32000,-32000,-1,-1,412,144,1341,862 MainFrame=2,3,-1,-1,-1,-1,-1395,253,-466,971
TOOLBAR=57600 57601 32795 0 57635 57634 57637 0 57671 57669 0 32777 32776 32782 32780 32781 32778 0 32806 TOOLBAR=57600 57601 32795 0 57635 57634 57637 0 57671 57669 0 32777 32776 32782 32780 32781 32778 0 32806
AEFWarningDialog=FALSE AEFWarningDialog=FALSE
Configuration=TBDML.hwc Configuration=TBDML.hwc
...@@ -42,7 +42,7 @@ CHIPSECURE=CHIPSECURE SETUP 0xFF0F 0x3 0x2 ...@@ -42,7 +42,7 @@ CHIPSECURE=CHIPSECURE SETUP 0xFF0F 0x3 0x2
DBG0=DBG GENERAL DISARM_ON PROTECT_OFF ANALYZE_ON STEPATRUN_ON DBG0=DBG GENERAL DISARM_ON PROTECT_OFF ANALYZE_ON STEPATRUN_ON
DBG1=DBG PREDEFINED SELECT 0 DBG1=DBG PREDEFINED SELECT 0
DBG2=DBG PREDEFINED DBGENGINE TRACE ENABLE RECORDAFTER PUREPC DBG2=DBG PREDEFINED DBGENGINE TRACE ENABLE RECORDAFTER PUREPC
NV_PARAMETER_FILE=D:\Program Files (x86)\Freescale\CWS12v5.1\prog\FPP\mcu02F2.fpp NV_PARAMETER_FILE=D:\xhy\prog\FPP\mcu02F2.fpp
NV_SAVE_WSP=0 NV_SAVE_WSP=0
NV_AUTO_ID=1 NV_AUTO_ID=1
COMDEVICE=SETCOMM COMPORT LPT "TBDML #1" COMDEVICE=SETCOMM COMPORT LPT "TBDML #1"
......
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