Commit f4944397 authored by 李鑫3's avatar 李鑫3

feat:虬龙老化台提交

parent 060a98d8
...@@ -515,9 +515,7 @@ INT16U time_3s = 0; ...@@ -515,9 +515,7 @@ INT16U time_3s = 0;
RT_1s_En = 1; RT_1s_En = 1;
if(Key_Dodging_flag==0) if(Key_Dodging_flag==0)
{ {
time_3s++;
if(time_3s>2)
{
time_3s = 0; time_3s = 0;
if(Key.CAN_Step > 10) if(Key.CAN_Step > 10)
{ {
...@@ -527,7 +525,7 @@ INT16U time_3s = 0; ...@@ -527,7 +525,7 @@ INT16U time_3s = 0;
{ {
Key.CAN_Step++; Key.CAN_Step++;
} }
}
} }
RT_1s = null; RT_1s = null;
} }
......
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
#include "../Library/TimeCtrl.h" #include "../Library/TimeCtrl.h"
#include "../Library/FT_VehSpeedCalc.h" #include "../Library/FT_VehSpeedCalc.h"
#define LED_P_NUMBER 0 //���ص����� #define LED_P_NUMBER 0 //?????????
#define LED_N_NUMBER 0 //���ص����� #define LED_N_NUMBER 0 //?????????
#define CAN_MAGS_NUMBER 10 //can�������� #define CAN_MAGS_NUMBER 10 //can????????
#define OIL_MUMBER 0 //ˮ�ͼ����� #define OIL_MUMBER 0 //????????
INT8U led_P = 0, INT8U led_P = 0,
...@@ -94,19 +94,19 @@ void Set_CAN_CRC(CAN_message * CanMessage){ ...@@ -94,19 +94,19 @@ void Set_CAN_CRC(CAN_message * CanMessage){
*/ */
void Format_CAN_Msg() void Format_CAN_Msg()
{ {
CanMsg_101.ID = 0x101; CanMsg_112.ID = 0x112;
CanMsg_067.ID = 0x67; CanMsg_103.ID = 0x103;
CanMsg_600.ID = 0x600; CanMsg_116.ID = 0x116;
CanMsg_611.ID = 0x611; CanMsg_113.ID = 0x113;
CanMsg_610.ID = 0x610; CanMsg_104.ID = 0x104;
CanMsg_200.ID = 0x200; CanMsg_12F.ID = 0x12F;
CanMsg_481.ID = 0x481; CanMsg_331.ID = 0x331;
CanMsg_020.ID = 0x020; CanMsg_012.ID = 0x012;
CanMsg_202.ID = 0x202; CanMsg_115.ID = 0x115;
CanMsg_280.ID = 0x280; CanMsg_117.ID = 0x117;
CanMsg_042.ID = 0x042; CanMsg_317.ID = 0x317;
CanMsg_480.ID = 0x480; // CanMsg_480.ID = 0x480;
CanMsg_021.ID = 0x021; // CanMsg_021.ID = 0x021;
CanMsg_0A33FFE3.ID = 0x0A33FFE3; CanMsg_0A33FFE3.ID = 0x0A33FFE3;
CanMsg_0A10FFE0.ID = 0x0A10FFE0; CanMsg_0A10FFE0.ID = 0x0A10FFE0;
CanMsg_0A10FFE1.ID = 0x0A10FFE1; CanMsg_0A10FFE1.ID = 0x0A10FFE1;
...@@ -119,19 +119,19 @@ void Format_CAN_Msg() ...@@ -119,19 +119,19 @@ void Format_CAN_Msg()
CanMsg_0A18FFE0.ID = 0x0A18FFE0; CanMsg_0A18FFE0.ID = 0x0A18FFE0;
CanMsg_0A40FFE2.ID = 0x0A40FFE2; CanMsg_0A40FFE2.ID = 0x0A40FFE2;
CanMsg_101.Length = 8; CanMsg_112.Length = 8;
CanMsg_067.Length = 8; CanMsg_103.Length = 8;
CanMsg_600.Length = 8; CanMsg_116.Length = 8;
CanMsg_611.Length = 8; CanMsg_113.Length = 8;
CanMsg_610.Length = 8; CanMsg_104.Length = 8;
CanMsg_200.Length = 8; CanMsg_12F.Length = 8;
CanMsg_481.Length = 8; CanMsg_331.Length = 8;
CanMsg_020.Length = 8; CanMsg_012.Length = 8;
CanMsg_202.Length = 8; CanMsg_115.Length = 8;
CanMsg_280.Length = 8; CanMsg_117.Length = 8;
CanMsg_042.Length = 8; CanMsg_317.Length = 8;
CanMsg_480.Length = 8; // CanMsg_480.Length = 8;
CanMsg_021.Length = 8; // CanMsg_021.Length = 8;
CanMsg_0A33FFE3.Length = 8; CanMsg_0A33FFE3.Length = 8;
CanMsg_0A10FFE0.Length = 8; CanMsg_0A10FFE0.Length = 8;
CanMsg_0A10FFE1.Length = 8; CanMsg_0A10FFE1.Length = 8;
...@@ -145,19 +145,19 @@ void Format_CAN_Msg() ...@@ -145,19 +145,19 @@ void Format_CAN_Msg()
CanMsg_0A40FFE2.Length = 8; CanMsg_0A40FFE2.Length = 8;
CanMsg_101.ID_EN = 1; CanMsg_112.ID_EN = 1;
CanMsg_067.ID_EN = 1; CanMsg_103.ID_EN = 1;
CanMsg_600.ID_EN = 1; CanMsg_116.ID_EN = 1;
CanMsg_611.ID_EN = 1; CanMsg_113.ID_EN = 1;
CanMsg_610.ID_EN = 1; CanMsg_104.ID_EN = 1;
CanMsg_200.ID_EN = 1; CanMsg_12F.ID_EN = 1;
CanMsg_481.ID_EN = 1; CanMsg_331.ID_EN = 1;
CanMsg_020.ID_EN = 1; CanMsg_012.ID_EN = 1;
CanMsg_202.ID_EN = 1; CanMsg_115.ID_EN = 1;
CanMsg_280.ID_EN = 1; CanMsg_117.ID_EN = 1;
CanMsg_042.ID_EN = 1; CanMsg_317.ID_EN = 1;
CanMsg_480.ID_EN = 1; // CanMsg_480.ID_EN = 1;
CanMsg_021.ID_EN = 1; // CanMsg_021.ID_EN = 1;
CanMsg_0A33FFE3.ID_EN = 1; CanMsg_0A33FFE3.ID_EN = 1;
CanMsg_0A10FFE0.ID_EN = 1; CanMsg_0A10FFE0.ID_EN = 1;
CanMsg_0A10FFE1.ID_EN = 1; CanMsg_0A10FFE1.ID_EN = 1;
...@@ -173,19 +173,19 @@ void Format_CAN_Msg() ...@@ -173,19 +173,19 @@ void Format_CAN_Msg()
void Disable_CAN_Tx(void) void Disable_CAN_Tx(void)
{ {
CanMsg_101.ID_EN = 0; CanMsg_112.ID_EN = 0;
CanMsg_067.ID_EN = 0; CanMsg_103.ID_EN = 0;
CanMsg_600.ID_EN = 0; CanMsg_116.ID_EN = 0;
CanMsg_611.ID_EN = 0; CanMsg_113.ID_EN = 0;
CanMsg_610.ID_EN = 0; CanMsg_104.ID_EN = 0;
CanMsg_200.ID_EN = 0; CanMsg_12F.ID_EN = 0;
CanMsg_481.ID_EN = 0; CanMsg_331.ID_EN = 0;
CanMsg_020.ID_EN = 0; CanMsg_012.ID_EN = 0;
CanMsg_202.ID_EN = 0; CanMsg_115.ID_EN = 0;
CanMsg_280.ID_EN = 0; CanMsg_117.ID_EN = 0;
CanMsg_042.ID_EN = 0; CanMsg_317.ID_EN = 0;
CanMsg_480.ID_EN = 0; // CanMsg_480.ID_EN = 0;
CanMsg_021.ID_EN = 0; // CanMsg_021.ID_EN = 0;
CanMsg_0A33FFE3.ID_EN = 0; CanMsg_0A33FFE3.ID_EN = 0;
} }
...@@ -213,75 +213,72 @@ void App_Can_Proc(void) ...@@ -213,75 +213,72 @@ void App_Can_Proc(void)
Message_Value_Calculate(CAN_List[i]); Message_Value_Calculate(CAN_List[i]);
} }
// else if(Key.Flag_1==1)
// {
if(GetCtrlTime(CANMsgSend_10ms) >= 10) if(GetCtrlTime(CANMsgSend_10ms) >= 10)
{ {
ClearCtrlTime(CANMsgSend_10ms); ClearCtrlTime(CANMsgSend_10ms);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_0A30FFE8); bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_112);
Clear_CAN_Msg((CAN_message *)&CanMsg_0A30FFE8); Clear_CAN_Msg((CAN_message *)&CanMsg_112);
} bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_103);
Clear_CAN_Msg((CAN_message *)&CanMsg_103);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_116);
Clear_CAN_Msg((CAN_message *)&CanMsg_116);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_113);
Clear_CAN_Msg((CAN_message *)&CanMsg_113);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_104);
Clear_CAN_Msg((CAN_message *)&CanMsg_104);
}
if(GetCtrlTime(CANMsgSend_20ms) >= 20){ if(GetCtrlTime(CANMsgSend_20ms) >= 20){
ClearCtrlTime(CANMsgSend_20ms); ClearCtrlTime(CANMsgSend_20ms);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_101); bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_12F);
Clear_CAN_Msg((CAN_message *)&CanMsg_101); Clear_CAN_Msg((CAN_message *)&CanMsg_12F);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_067);
Clear_CAN_Msg((CAN_message *)&CanMsg_067);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_610);
Clear_CAN_Msg((CAN_message *)&CanMsg_610);
} }
if(GetCtrlTime(CANMsgSend_50ms) >= 50){ if(GetCtrlTime(CANMsgSend_50ms) >= 50){
ClearCtrlTime(CANMsgSend_50ms); ClearCtrlTime(CANMsgSend_50ms);
if(Key.CAN_Step != 0)
{
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_0A10FFE0);
Clear_CAN_Msg((CAN_message *)&CanMsg_0A10FFE0);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_0A10FFE1);
Clear_CAN_Msg((CAN_message *)&CanMsg_0A10FFE1);
}
} }
if(GetCtrlTime(CANMsgSend_100ms) >= 100){ if(GetCtrlTime(CANMsgSend_100ms) >= 100){
ClearCtrlTime(CANMsgSend_100ms); ClearCtrlTime(CANMsgSend_100ms);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_0A31FFE3); bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_331);
Clear_CAN_Msg((CAN_message *)&CanMsg_0A31FFE3); Clear_CAN_Msg((CAN_message *)&CanMsg_331);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_0A30FFE3);
Clear_CAN_Msg((CAN_message *)&CanMsg_0A30FFE3); // if(electricityclose == 0)
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_0A33FFE3); // {
Clear_CAN_Msg((CAN_message *)&CanMsg_0A33FFE3); // bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_020);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_0A20FFE2); // Clear_CAN_Msg((CAN_message *)&CanMsg_020);
Clear_CAN_Msg((CAN_message *)&CanMsg_0A20FFE2); // }
if(electricityclose == 0) // bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_202);
{ // Clear_CAN_Msg((CAN_message *)&CanMsg_202);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_020); // bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_280);
Clear_CAN_Msg((CAN_message *)&CanMsg_020); // Clear_CAN_Msg((CAN_message *)&CanMsg_280);
} // bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_021);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_202); // Clear_CAN_Msg((CAN_message *)&CanMsg_021);
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){
ClearCtrlTime(CANMsgSend_200ms); ClearCtrlTime(CANMsgSend_200ms);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_0A32FFE4);
Clear_CAN_Msg((CAN_message *)&CanMsg_0A32FFE4);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_0A37FFE3);
Clear_CAN_Msg((CAN_message *)&CanMsg_0A37FFE3);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_0A18FFE0);
Clear_CAN_Msg((CAN_message *)&CanMsg_0A18FFE0);
} }
if(GetCtrlTime(CANMsgSend_500ms) >= 500){ if(GetCtrlTime(CANMsgSend_500ms) >= 500){
flash_1Hz_process(); flash_1Hz_process();
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_0A40FFE2); Clear_CAN_Msg((CAN_message *)&CanMsg_331);
Clear_CAN_Msg((CAN_message *)&CanMsg_0A40FFE2); bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_012);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_481); Clear_CAN_Msg((CAN_message *)&CanMsg_012);
Clear_CAN_Msg((CAN_message *)&CanMsg_481); bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_115);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_480); Clear_CAN_Msg((CAN_message *)&CanMsg_115);
Clear_CAN_Msg((CAN_message *)&CanMsg_480); bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_117);
Clear_CAN_Msg((CAN_message *)&CanMsg_117);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_317);
Clear_CAN_Msg((CAN_message *)&CanMsg_317);
ClearCtrlTime(CANMsgSend_500ms); ClearCtrlTime(CANMsgSend_500ms);
} }
...@@ -296,6 +293,7 @@ void App_Can_Proc(void) ...@@ -296,6 +293,7 @@ void App_Can_Proc(void)
ClearCtrlTime(CANMsgSend_10s); ClearCtrlTime(CANMsgSend_10s);
} }
// }
//REV 0 //REV 0
/*CanMessageID0CF80AF0.Msg[0] = 0x98; /*CanMessageID0CF80AF0.Msg[0] = 0x98;
...@@ -306,84 +304,110 @@ void App_Can_Proc(void) ...@@ -306,84 +304,110 @@ void App_Can_Proc(void)
//CurValueStr[ENUM_VSpeed ].val = 0; //CurValueStr[ENUM_VSpeed ].val = 0;
CurValueStr[ENUM_VSpeed ].val = 0; // CurValueStr[ENUM_VSpeed ].val = 0;
CurValueStr[ECM_FaultIndicator ].val = 0; // CurValueStr[ECM_FaultIndicator ].val = 0;
CurValueStr[ECM_StautsInvalid ].val = 0; // CurValueStr[ECM_StautsInvalid ].val = 0;
CurValueStr[ECM_MotorOver ].val = 0; // CurValueStr[ECM_MotorOver ].val = 0;
CurValueStr[ECM_ReadyIndicator ].val = 0; // CurValueStr[ECM_ReadyIndicator ].val = 0;
CurValueStr[ECM_ChargeStatus ].val = 0; // CurValueStr[ECM_ChargeStatus ].val = 0;
CurValueStr[ECM_CruiseStatus ].val = 0; // CurValueStr[ECM_CruiseStatus ].val = 0;
CurValueStr[ECM_GearPositionStatus ].val = 0; // CurValueStr[ECM_GearPositionStatus ].val = 0;
CurValueStr[PFC_Relag ].val = 0; // CurValueStr[PFC_Relag ].val = 0;
CurValueStr[LLC_UnderOutput ].val = 0; // CurValueStr[LLC_UnderOutput ].val = 0;
CurValueStr[LLC_OverOutput ].val = 0; // CurValueStr[LLC_OverOutput ].val = 0;
CurValueStr[LLC_OutPut ].val = 0; // CurValueStr[LLC_OutPut ].val = 0;
CurValueStr[PFC_LLC_Interal_Communication].val = 0; // CurValueStr[PFC_LLC_Interal_Communication].val = 0;
CurValueStr[LLC_Temp ].val = 0; // CurValueStr[LLC_Temp ].val = 0;
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[Vspeed ].val = 0;
CurValueStr[hour ].val = 0; // CurValueStr[hour ].val = 0;
CurValueStr[minute ].val = 0; // CurValueStr[minute ].val = 0;
CurValueStr[electricity ].val = 0; // CurValueStr[electricity ].val = 0;
CurValueStr[fault ].val = 0; // CurValueStr[fault ].val = 0;
CurValueStr[Energy_recovery ].val = 0; // CurValueStr[Energy_recovery ].val = 0;
CurValueStr[Energy_recovery_level ].val = 0; // CurValueStr[Energy_recovery_level ].val = 0;
CurValueStr[Side_brackets ].val = 0; // CurValueStr[Side_brackets ].val = 0;
CurValueStr[TCS_close ].val = 0; // CurValueStr[TCS_close ].val = 0;
CurValueStr[TCS_crotrul ].val = 0; // CurValueStr[TCS_crotrul ].val = 0;
CurValueStr[TCS_mode ].val = 0; // CurValueStr[TCS_mode ].val = 0;
CurValueStr[TCS_light ].val = 0; // CurValueStr[TCS_light ].val = 0;
CurValueStr[GPS ].val = 0; // CurValueStr[GPS ].val = 0;
CurValueStr[signal_4G ].val = 0; // CurValueStr[signal_4G ].val = 0;
CurValueStr[Battery_over ].val = 0; // CurValueStr[Battery_over ].val = 0;
CurValueStr[Motor_overheating ].val = 0; // CurValueStr[Motor_overheating ].val = 0;
CurValueStr[Cruise_control ].val = 0; // CurValueStr[Cruise_control ].val = 0;
CurValueStr[Gear ].val = 0; // CurValueStr[Gear ].val = 0;
CurValueStr[Bluetooth_phone ].val = 0; // CurValueStr[Bluetooth_phone ].val = 0;
CurValueStr[year ].val = 0; // CurValueStr[year ].val = 0;
CurValueStr[Vvspeed_H ].val = 0; // CurValueStr[Power ].val = 0;
CurValueStr[Vvspeed_L ].val = 0; // CurValueStr[Vvspeed_L ].val = 0;
CurValueStr[ENUM_VSpeed ].fval = Value_Plus;
CurValueStr[ECM_FaultIndicator ].fval = Value_Plus; // CurValueStr[Vvspeed_L ].val = 0;
CurValueStr[ECM_StautsInvalid ].fval = Value_Plus; // CurValueStr[Power ].val = 0;
CurValueStr[ECM_MotorOver ].fval = Value_Plus; // CurValueStr[Electricity_H ].val = 0;
CurValueStr[ECM_ReadyIndicator ].fval = Value_Plus; // CurValueStr[Electricity_L ].val = 0;
CurValueStr[ECM_ChargeStatus ].fval = Value_Plus; // CurValueStr[Cruise_H ].val = 0;
CurValueStr[ECM_CruiseStatus ].fval = Value_Plus; // CurValueStr[Cruise ].val = 0;
CurValueStr[ECM_GearPositionStatus ].fval = Value_Plus; // CurValueStr[Power_Tem ].val = 0;
CurValueStr[PFC_Relag ].fval = Value_Plus; // CurValueStr[Gear ].val =0;
CurValueStr[LLC_UnderOutput ].fval = Value_Plus; // CurValueStr[ABS_off ].val=0;
CurValueStr[LLC_OverOutput ].fval = Value_Plus; // CurValueStr[Ready ].val=0;
CurValueStr[LLC_OutPut ].fval = Value_Plus; // CurValueStr[Charge ].val=0;
CurValueStr[PFC_LLC_Interal_Communication].fval = Value_Plus; // CurValueStr[Charge_H ].val=0;
CurValueStr[LLC_Temp ].fval = Value_Plus; // CurValueStr[ABS ].val=0;
CurValueStr[Battery_status ].fval = Value_Plus; // CurValueStr[Tubro ].val=0;
CurValueStr[Battery_Current ].fval = Value_Plus; // CurValueStr[Malfunction ].val=0;
CurValueStr[Battery_SOC ].fval = Value_Plus; // CurValueStr[Support ].val=0;
CurValueStr[Vspeed ].fval = Value_Plus; // CurValueStr[L_Power ].val=0;
CurValueStr[hour ].fval = Value_Plus; // CurValueStr[Throttle_117 ].val=0;
CurValueStr[minute ].fval = Value_Plus; // CurValueStr[Throttle_317 ].val=0;
CurValueStr[electricity ].fval = Value_Plus; // CurValueStr[RaiseHead ].val=0;
CurValueStr[fault ].fval = Value_Plus; // CurValueStr[LeftHand ].val=0;
CurValueStr[Energy_recovery_level ].fval = Value_Plus; // CurValueStr[Parking ].val=0;
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[ENUM_VSpeed ].fval = Value_Plus;
CurValueStr[TCS_light ].fval = Value_Plus; // CurValueStr[ECM_FaultIndicator ].fval = Value_Plus;
CurValueStr[GPS ].fval = Value_Plus; // CurValueStr[ECM_StautsInvalid ].fval = Value_Plus;
CurValueStr[signal_4G ].fval = Value_Plus; // CurValueStr[ECM_MotorOver ].fval = Value_Plus;
CurValueStr[Battery_over ].fval = Value_Plus; // CurValueStr[ECM_ReadyIndicator ].fval = Value_Plus;
CurValueStr[Motor_overheating ].fval = Value_Plus; // CurValueStr[ECM_ChargeStatus ].fval = Value_Plus;
CurValueStr[Cruise_control ].fval = Value_Plus; // CurValueStr[ECM_CruiseStatus ].fval = Value_Plus;
CurValueStr[Gear ].fval = Value_Plus; // CurValueStr[ECM_GearPositionStatus ].fval = Value_Plus;
CurValueStr[Bluetooth_phone ].fval = Value_Plus; // CurValueStr[PFC_Relag ].fval = Value_Plus;
CurValueStr[year ].fval = Value_Plus; // CurValueStr[LLC_UnderOutput ].fval = Value_Plus;
CurValueStr[Vvspeed_H ].fval = Value_Plus; // CurValueStr[LLC_OverOutput ].fval = Value_Plus;
CurValueStr[Vvspeed_L ].fval = Value_Plus; // CurValueStr[LLC_OutPut ].fval = Value_Plus;
// CurValueStr[PFC_LLC_Interal_Communication].fval = Value_Plus;
// CurValueStr[LLC_Temp ].fval = Value_Plus;
// CurValueStr[Battery_status ].fval = Value_Plus;
// CurValueStr[Battery_Current ].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;
// CurValueStr[Power ].fval = Value_Plus;
// CurValueStr[Vvspeed_L ].fval = Value_Plus;
// CurVehSpeed = 0; // CurVehSpeed = 0;
//LDW Open //LDW Open
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "../App_Headers/includes.h" #include "../App_Headers/includes.h"
#include "../Library/TimeCtrl.h" #include "../Library/TimeCtrl.h"
#define STEP_MAX 34//步数 #define STEP_MAX 34//????
void All_Lamp_TurnOn(void); void All_Lamp_TurnOn(void);
...@@ -53,280 +53,374 @@ unsigned int CAN_init_flag = 0; ...@@ -53,280 +53,374 @@ unsigned int CAN_init_flag = 0;
unsigned int CAN_lost_flag = 0; unsigned int CAN_lost_flag = 0;
unsigned int water_value = 0; unsigned int water_value = 0;
unsigned int electricityclose = 0; //电量表报文不外发标志 unsigned int electricityclose = 0; //????????????????
void APP_ICM_Proc(void) /*zh321*/ /*FS04*/ void APP_ICM_Proc(void) /*zh321*/ /*FS04*/
{ {
//if(Self_propelled_flag==1) //if(Self_propelled_flag==1)
{ {
{ {
CurValueStr[Vspeed ].val = 0; // CurValueStr[Vspeed ].val = 0;
CurValueStr[hour ].val = 0; // CurValueStr[hour ].val = 0;
CurValueStr[minute ].val = 0; // CurValueStr[minute ].val = 0;
CurValueStr[electricity ].val = 0; // CurValueStr[electricity ].val = 0;
CurValueStr[fault ].val = 0; // CurValueStr[fault ].val = 0;
CurValueStr[Ready ].val = 0; // CurValueStr[Ready ].val = 0;
CurValueStr[Energy_recovery ].val = 0; // CurValueStr[Energy_recovery ].val = 0;
CurValueStr[Energy_recovery_level ].val = 0; // CurValueStr[Energy_recovery_level ].val = 0;
CurValueStr[Side_brackets ].val = 0; // CurValueStr[Side_brackets ].val = 0;
CurValueStr[TCS_close ].val = 1; // CurValueStr[TCS_close ].val = 1;
CurValueStr[TCS_crotrul ].val = 1; // CurValueStr[TCS_crotrul ].val = 1;
CurValueStr[TCS_mode ].val = 1; // CurValueStr[TCS_mode ].val = 1;
CurValueStr[TCS_light ].val = 1; // CurValueStr[TCS_light ].val = 1;
CurValueStr[GPS ].val = 0; // CurValueStr[GPS ].val = 0;
CurValueStr[signal_4G ].val = 0; // CurValueStr[signal_4G ].val = 0;
CurValueStr[Battery_over ].val = 0; // CurValueStr[Battery_over ].val = 0;
CurValueStr[Motor_overheating ].val = 0; // CurValueStr[Motor_overheating ].val = 0;
CurValueStr[Cruise_control ].val = 0; // CurValueStr[Cruise_control ].val = 0;
CurValueStr[Gear ].val = 0; // CurValueStr[Gear ].val = 0;
CurValueStr[Bluetooth_phone ].val = 0; // CurValueStr[Bluetooth_phone ].val = 0;
// CurValueStr[Vvspeed_L ].val = 0;
// CurValueStr[Power ].val = 0;
// CurValueStr[Electricity_H ].val = 0;
// CurValueStr[Electricity_L ].val = 0;
// CurValueStr[Electricity_h ].val = 0;
// CurValueStr[Electricity_l ].val = 0;
// CurValueStr[Sidebrace ].val = 0;
// CurValueStr[Cruise ].val = 0;
// CurValueStr[ABS ].val = 0;
// CurValueStr[TCS ].val = 0;
// CurValueStr[Tire_pressure ].val = 0;
// CurValueStr[Bluetooth ].val = 0;
// CurValueStr[GPS ].val = 0;
// CurValueStr[Callalert ].val = 0x01;
// CurValueStr[GMS ].val = 0;
// CurValueStr[Parallelsignals ].val = 0;
// CurValueStr[Enginefailure ].val = 0;
// CurValueStr[P_dang ].val = 0x03;
CurValueStr[Vvspeed_L ].val = 0; CurValueStr[Vvspeed_L ].val = 0;
CurValueStr[Vvspeed_H ].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;
CurValueStr[Electricity_h ].val = 0; CurValueStr[Cruise_H ].val = 0;
CurValueStr[Electricity_l ].val = 0; CurValueStr[Cruise ].val = 0;
CurValueStr[Sidebrace ].val = 0; CurValueStr[Power_Tem ].val = 0;
CurValueStr[cruise ].val = 0; CurValueStr[Gear ].val =0;
CurValueStr[ABS ].val = 0; CurValueStr[ABS_off ].val=0;
CurValueStr[TCS ].val = 0; CurValueStr[Ready ].val=0;
CurValueStr[Tire_pressure ].val = 0; CurValueStr[Charge ].val=0;
CurValueStr[Bluetooth ].val = 0; CurValueStr[Charge_H ].val=0;
CurValueStr[GPS ].val = 0; CurValueStr[ABS ].val=0;
CurValueStr[Callalert ].val = 0x01; CurValueStr[Tubro ].val=0;
CurValueStr[GMS ].val = 0; CurValueStr[Malfunction ].val=0;
CurValueStr[Parallelsignals ].val = 0; CurValueStr[Support ].val=0;
CurValueStr[Enginefailure ].val = 0; CurValueStr[L_Power ].val=0;
CurValueStr[P_dang ].val = 0x03; CurValueStr[Throttle_117 ].val=0;
CurValueStr[Throttle_317 ].val=0;
CurValueStr[RaiseHead ].val=0;
CurValueStr[LeftHand ].val=0;
CurValueStr[Parking ].val=0;
#if 1 #if 1
// if(Key.Flag_1 == 1)
// {
switch(Key.CAN_Step) switch(Key.CAN_Step)
{ {
case 1: case 1:
{ {
CurValueStr[Vvspeed_L ].val = 0xC8; CurValueStr[Vvspeed_L ].val = 0xFF;
CurValueStr[Vvspeed_H ].val = 0x00; CurValueStr[Power ].val = 0x06;
CurValueStr[Electricity_H ].val = 0x00; CurValueStr[Power_H ].val = 0x00;
CurValueStr[Electricity_L ].val = 0x00; CurValueStr[Electricity_H ].val = 0x03;
CurValueStr[Electricity_h ].val = 0xE8; CurValueStr[Electricity_L ].val = 0xE8;
CurValueStr[Electricity_l ].val = 0x03; CurValueStr[Cruise_H ].val = 0xC7;
CurValueStr[Sidebrace ].val = 0x00; CurValueStr[Cruise ].val = 0x01;
CurValueStr[cruise ].val = 0x00; CurValueStr[Power_Tem ].val = 0x0A;
CurValueStr[ABS ].val = 0x00; CurValueStr[Gear ].val =0x00;
CurValueStr[TCS ].val = 0x00; CurValueStr[ABS_off ].val=0x00;
CurValueStr[Tire_pressure ].val = 0x00; CurValueStr[Ready ].val=0x00;
CurValueStr[Bluetooth ].val = 0x00; CurValueStr[Charge ].val=0x00;
CurValueStr[GPS ].val = 0x00; CurValueStr[Charge_H ].val=0x00;
CurValueStr[Callalert ].val = 0x01; CurValueStr[ABS ].val=0x00;
// CurValueStr[GMS ].val = 0x00; CurValueStr[Tubro ].val=0x00;
CurValueStr[Parallelsignals ].val = 0x00; CurValueStr[Malfunction ].val=0x00;
CurValueStr[Enginefailure ].val = 0x00; CurValueStr[Support ].val=0x00;
CurValueStr[L_Power ].val=0x00;
CurValueStr[Throttle_117 ].val=0x00;
CurValueStr[Throttle_317 ].val=0x00;
CurValueStr[RaiseHead ].val=0x00;
CurValueStr[LeftHand ].val=0x00;
CurValueStr[Parking ].val=0x00;
} }
break; break;
case 2: case 2:
{ {
CurValueStr[Vvspeed_L ].val = 0x90; CurValueStr[Vvspeed_L ].val = 0xFF;
CurValueStr[Vvspeed_H ].val = 0x01; CurValueStr[Power ].val = 0x04;
CurValueStr[Electricity_H ].val = 0x00; CurValueStr[Power_H ].val = 0x00;
CurValueStr[Electricity_L ].val = 0x64; CurValueStr[Electricity_H ].val = 0x07;
CurValueStr[Electricity_h ].val = 0x03; CurValueStr[Electricity_L ].val = 0xD0;
CurValueStr[Electricity_l ].val = 0x84;
CurValueStr[Sidebrace ].val = 0x04; CurValueStr[Cruise_H ].val = 0xC7;
CurValueStr[cruise ].val = 0x00; CurValueStr[Cruise ].val = 0x01;
CurValueStr[ABS ].val = 0x01; CurValueStr[Power_Tem ].val = 0x14;
// CurValueStr[TCS ].val = 0x00; CurValueStr[Gear ].val =0x01;
CurValueStr[Tire_pressure ].val = 0x00; CurValueStr[ABS_off ].val=0x20;
CurValueStr[Bluetooth ].val = 0x00; CurValueStr[Ready ].val=0x00;
CurValueStr[GPS ].val = 0x00; CurValueStr[Charge ].val=0x00;
CurValueStr[Callalert ].val = 0x01; CurValueStr[Charge_H ].val=0x00;
// CurValueStr[GMS ].val = 0x00; CurValueStr[ABS ].val=0x00;
CurValueStr[Parallelsignals ].val = 0x00; CurValueStr[Tubro ].val=0x00;
CurValueStr[Enginefailure ].val = 0x00; CurValueStr[Malfunction ].val=0x00;
CurValueStr[Support ].val=0x00;
CurValueStr[L_Power ].val=0x00;
CurValueStr[Throttle_117 ].val=0x00;
CurValueStr[Throttle_317 ].val=0x00;
CurValueStr[RaiseHead ].val=0x00;
CurValueStr[LeftHand ].val=0x00;
CurValueStr[Parking ].val=0x00;
} }
break; break;
case 3: case 3:
{ {
CurValueStr[Vvspeed_L ].val = 0x58; CurValueStr[Vvspeed_L ].val = 0xFF;
CurValueStr[Vvspeed_H ].val = 0x02; CurValueStr[Power ].val = 0x02;
CurValueStr[Electricity_H ].val = 0x00; CurValueStr[Power_H ].val = 0x00;
CurValueStr[Electricity_L ].val = 0xC8; CurValueStr[Electricity_H ].val = 0x0B;
CurValueStr[Electricity_h ].val = 0x03; CurValueStr[Electricity_L ].val = 0xB8;
CurValueStr[Electricity_l ].val = 0x20; CurValueStr[Cruise_H ].val = 0xC7;
CurValueStr[Sidebrace ].val = 0x00; CurValueStr[Cruise ].val = 0x01;
CurValueStr[cruise ].val = 0x00; CurValueStr[Power_Tem ].val = 0x21;
CurValueStr[ABS ].val = 0x00; CurValueStr[Gear ].val =0x03;
// CurValueStr[TCS ].val = 0x00; CurValueStr[ABS_off ].val=0x00;
CurValueStr[Tire_pressure ].val = 0x10; CurValueStr[Ready ].val=0x01;
CurValueStr[Bluetooth ].val = 0x00; CurValueStr[Charge ].val=0x00;
CurValueStr[GPS ].val = 0x00; CurValueStr[Charge_H ].val=0x00;
CurValueStr[Callalert ].val = 0x01; CurValueStr[ABS ].val=0x00;
// CurValueStr[GMS ].val = 0x00; CurValueStr[Tubro ].val=0x00;
CurValueStr[Parallelsignals ].val = 0x00; CurValueStr[Malfunction ].val=0x00;
CurValueStr[Enginefailure ].val = 0x10; CurValueStr[Support ].val=0x00;
CurValueStr[L_Power ].val=0x00;
CurValueStr[Throttle_117 ].val=0x00;
CurValueStr[Throttle_317 ].val=0x00;
CurValueStr[RaiseHead ].val=0x00;
CurValueStr[LeftHand ].val=0x00;
CurValueStr[Parking ].val=0x00;
}break; }break;
case 4: case 4:
{ {
CurValueStr[Vvspeed_L ].val = 0x20; CurValueStr[Vvspeed_L ].val = 0xFF;
CurValueStr[Vvspeed_H ].val = 0x03; CurValueStr[Power ].val = 0x00;
CurValueStr[Electricity_H ].val = 0x01; CurValueStr[Power_H ].val = 0x00;
CurValueStr[Electricity_L ].val = 0x2C; CurValueStr[Electricity_H ].val = 0x0F;
CurValueStr[Electricity_h ].val = 0x02; CurValueStr[Electricity_L ].val = 0xA0;
CurValueStr[Electricity_l ].val = 0xBC;
CurValueStr[Sidebrace ].val = 0x00; CurValueStr[Cruise_H ].val = 0xC7;
CurValueStr[cruise ].val = 0x00; CurValueStr[Cruise ].val = 0x01;
CurValueStr[ABS ].val = 0x00; CurValueStr[Power_Tem ].val = 0x22;
// CurValueStr[TCS ].val = 0x00; CurValueStr[Gear ].val =0x09;
CurValueStr[Tire_pressure ].val = 0x00; CurValueStr[ABS_off ].val=0x00;
CurValueStr[Bluetooth ].val = 0x00; CurValueStr[Ready ].val=0x00;
CurValueStr[GPS ].val = 0x00; CurValueStr[Charge ].val=0xCD;
CurValueStr[Callalert ].val = 0x01; CurValueStr[Charge_H ].val=0x0C;
// CurValueStr[GMS ].val = 0x00; CurValueStr[ABS ].val=0x20;
CurValueStr[Parallelsignals ].val = 0x00; CurValueStr[Tubro ].val=0x00;
CurValueStr[Enginefailure ].val = 0x00; CurValueStr[Malfunction ].val=0x00;
CurValueStr[Support ].val=0x00;
CurValueStr[L_Power ].val=0x00;
CurValueStr[Throttle_117 ].val=0x00;
CurValueStr[Throttle_317 ].val=0x00;
CurValueStr[RaiseHead ].val=0x00;
CurValueStr[LeftHand ].val=0x00;
CurValueStr[Parking ].val=0x00;
}break; }break;
case 5: case 5:
{ {
CurValueStr[Vvspeed_L ].val = 0XE8; CurValueStr[Vvspeed_L ].val = 0xFF;
CurValueStr[Vvspeed_H ].val = 0X03; CurValueStr[Power ].val = 0XFE;
CurValueStr[Electricity_H ].val = 0X01; CurValueStr[Power_H ].val = 0XFF;
CurValueStr[Electricity_L ].val = 0X90; CurValueStr[Electricity_H ].val = 0X13;
CurValueStr[Electricity_h ].val = 0X02; CurValueStr[Electricity_L ].val = 0X88;
CurValueStr[Electricity_l ].val = 0X58; CurValueStr[Cruise_H ].val = 0xC7;
CurValueStr[Sidebrace ].val = 0X00; CurValueStr[Cruise ].val = 0x01;
CurValueStr[cruise ].val = 0X00; CurValueStr[Power_Tem ].val = 0x32;
CurValueStr[ABS ].val = 0X00; CurValueStr[Gear ].val =0x05;
// CurValueStr[TCS ].val = 0X00; CurValueStr[ABS_off ].val=0x00;
CurValueStr[Tire_pressure ].val = 0X00; CurValueStr[Ready ].val=0x00;
CurValueStr[Bluetooth ].val = 0X80; CurValueStr[Charge ].val=0x00;
CurValueStr[GPS ].val = 0X00; CurValueStr[Charge_H ].val=0x00;
CurValueStr[Callalert ].val = 0X01; CurValueStr[ABS ].val=0x00;
// CurValueStr[GMS ].val = 0X00; CurValueStr[Tubro ].val=0x01;
CurValueStr[Parallelsignals ].val = 0X00; CurValueStr[Malfunction ].val=0x00;
CurValueStr[Enginefailure ].val = 0X00; CurValueStr[Support ].val=0x00;
CurValueStr[L_Power ].val=0x00;
CurValueStr[Throttle_117 ].val=0x00;
CurValueStr[Throttle_317 ].val=0x00;
CurValueStr[RaiseHead ].val=0x00;
CurValueStr[LeftHand ].val=0x00;
CurValueStr[Parking ].val=0x00;
} }
break; break;
case 6: case 6:
{ {
CurValueStr[Vvspeed_L ].val = 0xB0; CurValueStr[Vvspeed_L ].val = 0xFF;
CurValueStr[Vvspeed_H ].val = 0x04; CurValueStr[Power ].val = 0XFE;
CurValueStr[Electricity_H ].val = 0x01; CurValueStr[Power_H ].val = 0XFF;
CurValueStr[Electricity_L ].val = 0xF4; CurValueStr[Electricity_L ].val = 0x70;
CurValueStr[Electricity_h ].val = 0x01; CurValueStr[Electricity_H ].val = 0x17;
CurValueStr[Electricity_l ].val = 0xF4; CurValueStr[Cruise_H ].val = 0xC7;
CurValueStr[Sidebrace ].val = 0x00; CurValueStr[Cruise ].val = 0x01;
CurValueStr[cruise ].val = 0x00; CurValueStr[Power_Tem ].val = 0x42;
CurValueStr[ABS ].val = 0x00; CurValueStr[Gear ].val =0x04;
// CurValueStr[TCS ].val = 0x00; CurValueStr[ABS_off ].val=0x00;
CurValueStr[Tire_pressure ].val = 0x00; CurValueStr[Ready ].val=0x00;
CurValueStr[Bluetooth ].val = 0x00; CurValueStr[Charge ].val=0x00;
CurValueStr[GPS ].val = 0x02; CurValueStr[Charge_H ].val=0x00;
CurValueStr[Callalert ].val = 0x01; CurValueStr[ABS ].val=0x00;
// CurValueStr[GMS ].val = 0x00; CurValueStr[Tubro ].val=0x00;
CurValueStr[Parallelsignals ].val = 0x00; CurValueStr[Malfunction ].val=0x01;
CurValueStr[Enginefailure ].val = 0x00; CurValueStr[Support ].val=0x10;
CurValueStr[L_Power ].val=0x00;
CurValueStr[Throttle_117 ].val=0x00;
CurValueStr[Throttle_317 ].val=0x00;
CurValueStr[RaiseHead ].val=0x00;
CurValueStr[LeftHand ].val=0x00;
CurValueStr[Parking ].val=0x00;
} }
break; break;
case 7: case 7:
{ {
CurValueStr[Vvspeed_L ].val = 0x78; CurValueStr[Vvspeed_L ].val = 0xFF;
CurValueStr[Vvspeed_H ].val = 0x05; CurValueStr[Power ].val = 0XFA;
CurValueStr[Electricity_H ].val = 0x02; CurValueStr[Power_H ].val = 0XFF;
CurValueStr[Electricity_H ].val = 0x1B;
CurValueStr[Electricity_L ].val = 0x58; CurValueStr[Electricity_L ].val = 0x58;
CurValueStr[Electricity_h ].val = 0x01;
CurValueStr[Electricity_l ].val = 0x90; CurValueStr[Cruise_H ].val = 0xC7;
CurValueStr[Sidebrace ].val = 0x00; CurValueStr[Cruise ].val = 0x01;
CurValueStr[cruise ].val = 0x00; CurValueStr[Power_Tem ].val = 0x43;
CurValueStr[ABS ].val = 0x08; CurValueStr[Gear ].val =0x02;
// CurValueStr[TCS ].val = 0x00; CurValueStr[ABS_off ].val =0x00;
CurValueStr[Tire_pressure ].val = 0x00; CurValueStr[Ready ].val=0x00;
CurValueStr[Bluetooth ].val = 0x00; CurValueStr[Charge ].val=0x00;
CurValueStr[GPS ].val = 0x00; CurValueStr[Charge_H ].val=0x00;
CurValueStr[Callalert ].val = 0x00; CurValueStr[ABS ].val=0x00;
// CurValueStr[GMS ].val = 0x00; CurValueStr[Tubro ].val=0x00;
CurValueStr[Parallelsignals ].val = 0x00; CurValueStr[Malfunction ].val=0x00;
CurValueStr[Enginefailure ].val = 0x00; CurValueStr[Support ].val=0x00;
CurValueStr[L_Power ].val=0x01;
CurValueStr[Throttle_117 ].val=0x00;
CurValueStr[Throttle_317 ].val=0x00;
CurValueStr[RaiseHead ].val=0x00;
CurValueStr[LeftHand ].val=0x00;
CurValueStr[Parking ].val=0x00;
} }
break; break;
case 8: case 8:
{ {
CurValueStr[Vvspeed_L ].val = 0x40; CurValueStr[Vvspeed_L ].val = 0xFF;
CurValueStr[Vvspeed_H ].val = 0x06; CurValueStr[Power ].val = 0XF8;
CurValueStr[Electricity_H ].val = 0x02; CurValueStr[Power_H ].val = 0XFF;
CurValueStr[Electricity_L ].val = 0xBC; CurValueStr[Electricity_H ].val = 0x1F;
CurValueStr[Electricity_h ].val = 0x01; CurValueStr[Electricity_L ].val = 0x40;
CurValueStr[Electricity_l ].val = 0x2C;
CurValueStr[Sidebrace ].val = 0x00; CurValueStr[Cruise_H ].val = 0xC7;
CurValueStr[cruise ].val = 0x04; CurValueStr[Cruise ].val = 0x01;
CurValueStr[ABS ].val = 0x00; CurValueStr[Power_Tem ].val = 0x50;
// CurValueStr[TCS ].val = 0x00; CurValueStr[Gear ].val =0x06;
CurValueStr[Tire_pressure ].val = 0x00;
CurValueStr[Bluetooth ].val = 0x00; CurValueStr[ABS_off ].val=0x00;
CurValueStr[GPS ].val = 0x01; CurValueStr[Ready ].val=0x00;
CurValueStr[Callalert ].val = 0x01; CurValueStr[Charge ].val=0x00;
CurValueStr[GMS ].val = 0x00; CurValueStr[Charge_H ].val=0x00;
CurValueStr[Parallelsignals ].val = 0x00; CurValueStr[ABS ].val=0x00;
CurValueStr[Enginefailure ].val = 0x00; CurValueStr[Tubro ].val=0x00;
CurValueStr[Malfunction ].val=0x00;
CurValueStr[Support ].val=0x00;
CurValueStr[L_Power ].val=0x00;
CurValueStr[Throttle_117 ].val=0x10;
CurValueStr[Throttle_317 ].val=0x01;
CurValueStr[RaiseHead ].val=0x11;
CurValueStr[LeftHand ].val=0x00;
CurValueStr[Parking ].val=0x00;
} }
break; break;
case 9: case 9:
{ {
CurValueStr[Vvspeed_L ].val = 0x08; CurValueStr[Vvspeed_L ].val = 0xFF;
CurValueStr[Vvspeed_H ].val = 0x07; CurValueStr[Power ].val = 0XF6;
CurValueStr[Electricity_H ].val = 0x03; CurValueStr[Power_H ].val = 0XFF;
CurValueStr[Electricity_L ].val = 0x20; CurValueStr[Electricity_H ].val = 0x23;
CurValueStr[Electricity_h ].val = 0x00; CurValueStr[Electricity_L ].val = 0x28;
CurValueStr[Electricity_l ].val = 0xC8;
CurValueStr[Sidebrace ].val = 0x00; CurValueStr[Cruise_H ].val = 0xC7;
CurValueStr[cruise ].val = 0x00; CurValueStr[Cruise ].val = 0x01;
CurValueStr[ABS ].val = 0x00; CurValueStr[Power_Tem ].val = 0x5A;
// CurValueStr[TCS ].val = 0x00; CurValueStr[Gear ].val =0x02;
CurValueStr[Tire_pressure ].val = 0x00;
CurValueStr[Bluetooth ].val = 0x00; CurValueStr[ABS_off ].val=0x00;
CurValueStr[GPS ].val = 0x00; CurValueStr[Ready ].val=0x00;
CurValueStr[Callalert ].val = 0x01; CurValueStr[Charge ].val=0x00;
// CurValueStr[GMS ].val = 0x00; CurValueStr[Charge_H ].val=0x00;
CurValueStr[Parallelsignals ].val = 0x01; CurValueStr[ABS ].val=0x00;
CurValueStr[Enginefailure ].val = 0x00; CurValueStr[Tubro ].val=0x00;
CurValueStr[Malfunction ].val=0x00;
CurValueStr[Support ].val=0x00;
CurValueStr[L_Power ].val=0x00;
CurValueStr[Throttle_117 ].val=0x00;
CurValueStr[Throttle_317 ].val=0x00;
CurValueStr[RaiseHead ].val=0x00;
CurValueStr[LeftHand ].val=0x01;
CurValueStr[Parking ].val=0x04;
} }
break; break;
case 10: case 10:
{ {
CurValueStr[Vvspeed_L ].val = 0xD0; CurValueStr[Vvspeed_L ].val = 0xFF;
CurValueStr[Vvspeed_H ].val = 0x07; CurValueStr[Power ].val = 0XE8;
CurValueStr[Electricity_H ].val = 0x03; CurValueStr[Power_H ].val = 0XFF;
CurValueStr[Electricity_L ].val = 0xE8; CurValueStr[Electricity_H ].val = 0x27;
CurValueStr[Electricity_h ].val = 0x00; CurValueStr[Electricity_L ].val = 0x10;
CurValueStr[Electricity_l ].val = 0x00; CurValueStr[Cruise_H ].val = 0xC7;
CurValueStr[Sidebrace ].val = 0x04; CurValueStr[Cruise ].val = 0x01;
CurValueStr[cruise ].val = 0x04; CurValueStr[Power_Tem ].val = 0x63;
CurValueStr[ABS ].val = 0x09; CurValueStr[Gear ].val =0x05;
// CurValueStr[TCS ].val = 0x10; CurValueStr[ABS_off ].val=0x01;
CurValueStr[Tire_pressure ].val = 0x10; CurValueStr[Ready ].val=0x01;
CurValueStr[Bluetooth ].val = 0x80; CurValueStr[Charge ].val=0xCD;
CurValueStr[GPS ].val = 0x03; CurValueStr[Charge_H ].val=0x0C;
CurValueStr[Callalert ].val = 0x00; CurValueStr[ABS ].val=0x20;
CurValueStr[GMS ].val = 0x00; CurValueStr[Tubro ].val=0x01;
CurValueStr[Parallelsignals ].val = 0x01; CurValueStr[Malfunction ].val=0x01;
CurValueStr[Enginefailure ].val = 0x10; CurValueStr[Support ].val=0x10;
CurValueStr[L_Power ].val=0x01;
CurValueStr[Throttle_117 ].val=0x10;
CurValueStr[Throttle_317 ].val=0x01;
CurValueStr[RaiseHead ].val=0x11;
CurValueStr[LeftHand ].val=0x01;
CurValueStr[Parking ].val=0x04;
} }
break; break;
}
// else if(Key.Flag_1 =0 1)
#if 0 #if 0
case 12: case 12:
{ {
CurValueStr[ENUM_VSpeed ].val = speed_value;//车速 CurValueStr[ENUM_VSpeed ].val = speed_value;//????
CurValueStr[ENUM_RSpeed ].val = 12000; CurValueStr[ENUM_RSpeed ].val = 12000;
CurValueStr[ENUM_WaterTemp ].val = water_value;//水温 CurValueStr[ENUM_WaterTemp ].val = water_value;//???
if(direction_espeed==1) if(direction_espeed==1)
{ {
CurValueStr[ISG_Power ].val = 0; CurValueStr[ISG_Power ].val = 0;
...@@ -346,7 +440,7 @@ void APP_ICM_Proc(void) /*zh321*/ /*FS04*/ ...@@ -346,7 +440,7 @@ void APP_ICM_Proc(void) /*zh321*/ /*FS04*/
#endif #endif
} }
} }
} // }
void Message_ClearDatas(CAN_message *Message, unsigned char StartByte, unsigned char StartBit, unsigned char len, unsigned char Format){ void Message_ClearDatas(CAN_message *Message, unsigned char StartByte, unsigned char StartBit, unsigned char len, unsigned char Format){
...@@ -473,12 +567,12 @@ void Message_Value_Calculate(s_CAN_List list) ...@@ -473,12 +567,12 @@ void Message_Value_Calculate(s_CAN_List list)
temp = CurValue; temp = CurValue;
//璁$畻鍋忕Щ锟?? //计算偏移???
if(Offset != 0){ if(Offset != 0){
if(Offset_Flag == Offset_Minus){ if(Offset_Flag == Offset_Minus){
if(Value_Flag == Value_Minus){ if(Value_Flag == Value_Minus){
if(temp > Offset){ if(temp > Offset){
temp = 0; //閿欒??锛屾墍瑕佸疄鐜扮殑鍊煎皬浜庣墿鐞嗘渶灏忥拷? temp = 0; //错???,所要实现的值小于物理最小??
}else{ }else{
temp = Offset - temp; temp = Offset - temp;
} }
...@@ -487,7 +581,7 @@ void Message_Value_Calculate(s_CAN_List list) ...@@ -487,7 +581,7 @@ void Message_Value_Calculate(s_CAN_List list)
}else{;} }else{;}
}else if(Offset_Flag == Offset_Plus){ }else if(Offset_Flag == Offset_Plus){
if(temp < Offset){ if(temp < Offset){
temp = 0; //閿欒??锛屾墍瑕佸疄鐜扮殑鍊煎皬浜庣墿鐞嗘渶灏忥拷? temp = 0; //错???,所要实现的值小于物理最小??
}else{ }else{
temp -= Offset; temp -= Offset;
} }
...@@ -503,7 +597,7 @@ void Message_Value_Calculate(s_CAN_List list) ...@@ -503,7 +597,7 @@ void Message_Value_Calculate(s_CAN_List list)
Byte_Count += 1; Byte_Count += 1;
} }
//娓呰剰鏁版嵁 //清脏数据
Message_ClearDatas(CanMessage, Start_Byte, Start_Bit, len, Format_Flag); Message_ClearDatas(CanMessage, Start_Byte, Start_Bit, len, Format_Flag);
Message_FillDatas(CanMessage, Start_Byte, Start_Bit, len, Format_Flag, temp); Message_FillDatas(CanMessage, Start_Byte, Start_Bit, len, Format_Flag, temp);
......
...@@ -27,21 +27,21 @@ typedef struct ...@@ -27,21 +27,21 @@ typedef struct
typedef struct typedef struct
{ {
CAN_message *canMsg; CAN_message *canMsg;//ID
unsigned char StartByte; unsigned char StartByte;//开始字节
unsigned char StartBit; unsigned char StartBit;//开始位
unsigned char SignalLen; unsigned char SignalLen;//几个字节(1个字节,填8,证明8位)
unsigned int Offset; unsigned int Offset;//偏移量
unsigned char fOffset; unsigned char fOffset;//分辨率
unsigned int Factor_1; /*Denominator of Resolution*/ /*锟斤拷锟饺的凤拷母*/ unsigned int Factor_1; //分辨率,分子 /*Denominator of Resolution*/ /*???????*/
unsigned int Factor_2; /*Numerator of Resolution*/ /*锟斤拷锟饺的凤拷锟斤拷*/ unsigned int Factor_2; //分辨率,分母 /*Numerator of Resolution*/ /*????????*/
s_CurValue *CurValue; s_CurValue *CurValue;
unsigned char fFormat; unsigned char fFormat;
} s_CAN_List; } s_CAN_List;
enum enum
{ {
ENUM_VSpeed = 0, // 锟斤拷锟斤拷 ENUM_VSpeed = 0, // ????
ECM_FaultIndicator, ECM_FaultIndicator,
ECM_StautsInvalid, ECM_StautsInvalid,
ECM_MotorOver, ECM_MotorOver,
...@@ -63,6 +63,8 @@ enum ...@@ -63,6 +63,8 @@ enum
minute, minute,
electricity, electricity,
fault, fault,
Charge,
Charge_H,
Ready, Ready,
Energy_recovery, Energy_recovery,
Energy_recovery_level, Energy_recovery_level,
...@@ -78,95 +80,136 @@ enum ...@@ -78,95 +80,136 @@ enum
Gear, Gear,
Bluetooth_phone, Bluetooth_phone,
year, year,
Vvspeed_H, Power,
Tubro,
Power_H,
L_Power,
Throttle_117,
Throttle_317,
LeftHand,
Vvspeed_L, Vvspeed_L,
Electricity_H, Electricity_H,
Electricity_L, Electricity_L,
Electricity_h, Electricity_h,
Electricity_l, Electricity_l,
Sidebrace, //侧撑 Sidebrace, //???
cruise, //巡航 Cruise,
Cruise_H , //???
Power_Tem,
RaiseHead,
ABS, ABS,
Malfunction,
Support,
ABS_off,
Parking,
TCS, TCS,
Tire_pressure, Tire_pressure,
Bluetooth, Bluetooth,
GPS, GPS,
Callalert, //来电提醒 Callalert, //????????
GMS, //来电提醒 GMS, //????????
Parallelsignals, //并联信号 Parallelsignals, //???????
Enginefailure, //发动机故障 Enginefailure, //??????????
P_dang, P_dang,
CAN_List_Num, CAN_List_Num,
}; };
EXTERN_APP_TEST volatile s_CurValue CurValueStr[CAN_List_Num]; 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_101, 2, 0, 16,0,Offset_Plus, 1, 1, &CurValueStr[ENUM_VSpeed ], Motorola},
{&CanMsg_067, 2, 0, 16, 0,Offset_Plus, 1, 1, &CurValueStr[ECM_FaultIndicator ], Motorola}, {&CanMsg_112, 1, 0, 16, 0, Offset_Plus, 1, 1, &CurValueStr[Vvspeed_L], Motorola},
{&CanMsg_067, 3, 0, 2, 0, Offset_Plus, 1, 1, &CurValueStr[ECM_StautsInvalid ], Motorola}, {&CanMsg_103, 6, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Power], Motorola},
{&CanMsg_067, 3, 2, 2, 0, Offset_Plus, 1, 1, &CurValueStr[ECM_MotorOver ], Motorola}, {&CanMsg_103, 7, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Power_H], Motorola},
{&CanMsg_067, 3, 4, 1, 0, Offset_Plus, 1, 1, &CurValueStr[ECM_ReadyIndicator ], Motorola}, {&CanMsg_104,1,0,8,0,Offset_Plus,1,1,&CurValueStr[Electricity_H],Motorola},
{&CanMsg_067, 3, 6, 1, 0, Offset_Plus, 1, 1, &CurValueStr[ECM_ChargeStatus ], Motorola}, {&CanMsg_104,0,0,8,0,Offset_Plus,1,1,&CurValueStr[Electricity_L],Motorola},
{&CanMsg_067, 4, 2, 1, 0, Offset_Plus, 1, 1, &CurValueStr[ECM_CruiseStatus ], Motorola}, {&CanMsg_116,0,0,2,0,Offset_Plus,1,1,&CurValueStr[Cruise],Motorola},
{&CanMsg_067, 5, 0, 3, 0, Offset_Plus, 1, 1, &CurValueStr[ECM_GearPositionStatus ], Motorola}, {&CanMsg_116,1,0,8,0,Offset_Plus,1,1,&CurValueStr[Cruise_H],Motorola},
{&CanMsg_600, 0, 0, 1, 0, Offset_Plus, 1, 1, &CurValueStr[PFC_Relag ], Motorola}, {&CanMsg_113,6,0,8,0,Offset_Plus,1,1,&CurValueStr[Power_Tem],Motorola},
{&CanMsg_600, 0, 1, 1, 0, Offset_Plus, 1, 1, &CurValueStr[LLC_UnderOutput ], Motorola}, {&CanMsg_113,5,0,8,0,Offset_Plus,1,1,&CurValueStr[Gear],Motorola},
{&CanMsg_600, 0, 2, 1, 0, Offset_Plus, 1, 1, &CurValueStr[LLC_OverOutput ], Motorola}, {&CanMsg_12F,1,0,8,0,Offset_Plus,1,1,&CurValueStr[ABS_off],Motorola},
{&CanMsg_600, 0, 3, 1, 0, Offset_Plus, 1, 1, &CurValueStr[LLC_OutPut ], Motorola}, {&CanMsg_113,1,0,8,0,Offset_Plus,1,1,&CurValueStr[Ready],Motorola},
{&CanMsg_600, 0, 4, 1, 0, Offset_Plus, 1, 1, &CurValueStr[PFC_LLC_Interal_Communication ], Motorola}, {&CanMsg_331,2,0,8,0,Offset_Plus,1,1,&CurValueStr[Charge],Motorola},
{&CanMsg_600, 0, 5, 1, 0, Offset_Plus, 1, 1, &CurValueStr[LLC_Temp ], Motorola}, {&CanMsg_331,3,0,8,0,Offset_Plus,1,1,&CurValueStr[Charge_H],Motorola},
{&CanMsg_610, 0, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Battery_status ], Motorola}, {&CanMsg_12F,0,0,8,0,Offset_Plus,1,1,&CurValueStr[ABS],Motorola},
{&CanMsg_610,2,0, 16,255,Offset_Minus, 10, 1, &CurValueStr[Battery_Current ], Motorola}, {&CanMsg_113,3,0,8,0,Offset_Plus,1,1,&CurValueStr[Tubro],Motorola},
{&CanMsg_611, 0, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Battery_SOC ], Motorola}, {&CanMsg_012,0,0,8,0,Offset_Plus,1,1,&CurValueStr[Malfunction],Motorola},
{&CanMsg_200, 2, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Vspeed ], Motorola}, {&CanMsg_115,1,0,8,0,Offset_Plus,1,1,&CurValueStr[Support],Motorola},
{&CanMsg_481, 3, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[hour ], Motorola}, {&CanMsg_113,7,0,8,0,Offset_Plus,1,1,&CurValueStr[L_Power],Motorola},
{&CanMsg_481, 4, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[minute ], Motorola}, {&CanMsg_117,2,0,8,0,Offset_Plus,1,1,&CurValueStr[Throttle_117],Motorola},
{&CanMsg_020, 3, 0, 16, 0, Offset_Plus, 1, 1, &CurValueStr[electricity ], Motorola}, {&CanMsg_317,3,0,4,0,Offset_Plus,1,1,&CurValueStr[Throttle_317],Motorola},
{&CanMsg_202, 2, 2, 1, 0, Offset_Plus, 1, 1, &CurValueStr[fault ], Motorola}, {&CanMsg_116,2,0,8,0,Offset_Plus,1,1,&CurValueStr[RaiseHead],Motorola},
{&CanMsg_202, 1, 4, 2, 0, Offset_Plus, 1, 1, &CurValueStr[Ready ], Motorola}, {&CanMsg_317,5,0,4,0,Offset_Plus,1,1,&CurValueStr[LeftHand],Motorola},
{&CanMsg_280, 3, 0, 1, 0, Offset_Plus, 1, 1, &CurValueStr[Energy_recovery ], Motorola}, {&CanMsg_115,3,0,8,0,Offset_Plus,1,1,&CurValueStr[Parking],Motorola},
{&CanMsg_280, 3, 5, 2, 0, Offset_Plus, 1, 1, &CurValueStr[Energy_recovery_level ], Motorola}, // {&CanMsg_113, 0, 0, 0, 0, Offset_Plus, 1, 1, &CurValueStr[ABS], Motorola},
{&CanMsg_280, 3, 3, 1, 0, Offset_Plus, 1, 1, &CurValueStr[Side_brackets ], Motorola}, // {&CanMsg_101, 3, 0, 8,0,Offset_Plus, 1, 1, &CurValueStr[ENUM_VSpeed ], Motorola},
{&CanMsg_280, 4, 4, 1, 0, Offset_Plus, 1, 1, &CurValueStr[TCS_close ], Motorola}, // {&CanMsg_067, 2, 0, 16, 0,Offset_Plus, 1, 1, &CurValueStr[ECM_FaultIndicator ], Motorola},
{&CanMsg_042, 2, 7, 1, 0, Offset_Plus, 1, 1, &CurValueStr[TCS_crotrul ], Motorola}, // {&CanMsg_067, 3, 0, 2, 0, Offset_Plus, 1, 1, &CurValueStr[ECM_StautsInvalid ], Motorola},
{&CanMsg_042, 2, 6, 1, 0, Offset_Plus, 1, 1, &CurValueStr[TCS_mode ], Motorola}, // {&CanMsg_067, 3, 2, 2, 0, Offset_Plus, 1, 1, &CurValueStr[ECM_MotorOver ], Motorola},
{&CanMsg_042, 2, 0, 4, 0, Offset_Plus, 1, 1, &CurValueStr[TCS_light ], Motorola}, // {&CanMsg_067, 3, 4, 1, 0, Offset_Plus, 1, 1, &CurValueStr[ECM_ReadyIndicator ], Motorola},
{&CanMsg_480, 1, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[GPS ], Motorola}, // {&CanMsg_067, 3, 6, 1, 0, Offset_Plus, 1, 1, &CurValueStr[ECM_ChargeStatus ], Motorola},
{&CanMsg_480, 0, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[signal_4G ], Motorola}, // {&CanMsg_067, 4, 2, 1, 0, Offset_Plus, 1, 1, &CurValueStr[ECM_CruiseStatus ], Motorola},
{&CanMsg_021, 5, 7, 1, 0, Offset_Plus, 1, 1, &CurValueStr[Battery_over ], Motorola}, // {&CanMsg_067, 5, 0, 3, 0, Offset_Plus, 1, 1, &CurValueStr[ECM_GearPositionStatus ], Motorola},
{&CanMsg_202, 1, 6, 1, 0, Offset_Plus, 1, 1, &CurValueStr[Cruise_control ], Motorola}, // {&CanMsg_600, 0, 0, 1, 0, Offset_Plus, 1, 1, &CurValueStr[PFC_Relag ], Motorola},
{&CanMsg_202, 0, 2, 2, 0, Offset_Plus, 1, 1, &CurValueStr[Gear ], Motorola}, // {&CanMsg_600, 0, 1, 1, 0, Offset_Plus, 1, 1, &CurValueStr[LLC_UnderOutput ], Motorola},
{&CanMsg_480, 2, 6, 1, 0, Offset_Plus, 1, 1, &CurValueStr[Bluetooth_phone ], Motorola}, // {&CanMsg_600, 0, 2, 1, 0, Offset_Plus, 1, 1, &CurValueStr[LLC_OverOutput ], Motorola},
{&CanMsg_481, 0, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[year ], Motorola}, // {&CanMsg_600, 0, 3, 1, 0, Offset_Plus, 1, 1, &CurValueStr[LLC_OutPut ], Motorola},
{&CanMsg_0A33FFE3, 0, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Vvspeed_L ], Motorola}, // {&CanMsg_600, 0, 4, 1, 0, Offset_Plus, 1, 1, &CurValueStr[PFC_LLC_Interal_Communication ], Motorola},
{&CanMsg_0A33FFE3, 1, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Vvspeed_H ], Motorola}, // {&CanMsg_600, 0, 5, 1, 0, Offset_Plus, 1, 1, &CurValueStr[LLC_Temp ], Motorola},
// {&CanMsg_610, 0, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Battery_status ], Motorola},
{&CanMsg_0A10FFE0, 3, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Electricity_H ], Motorola}, // {&CanMsg_610,2,0, 16,255,Offset_Minus, 10, 1, &CurValueStr[Battery_Current ], Motorola},
{&CanMsg_0A10FFE0, 2, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Electricity_L ], 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_0A10FFE1, 3, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Electricity_h ], Motorola}, // {&CanMsg_481, 3, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[hour ], Motorola},
{&CanMsg_0A10FFE1, 2, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Electricity_l ], 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_0A20FFE2, 1, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Sidebrace ], Motorola}, // {&CanMsg_202, 2, 2, 1, 0, Offset_Plus, 1, 1, &CurValueStr[fault ], Motorola},
{&CanMsg_0A20FFE2, 4, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[cruise ], 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_0A30FFE8, 0, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[ABS ], 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_0A31FFE3, 4, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Tire_pressure ], 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_0A30FFE3, 7, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Bluetooth ], 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_0A32FFE4, 0, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[GPS ], 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_0A37FFE3, 7, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Callalert ], Motorola}, // {&CanMsg_021, 5, 7, 1, 0, Offset_Plus, 1, 1, &CurValueStr[Battery_over ], Motorola},
// {&CanMsg_202, 1, 6, 1, 0, Offset_Plus, 1, 1, &CurValueStr[Cruise_control ], Motorola},
{&CanMsg_0A18FFE0, 0, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Parallelsignals ], 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_0A40FFE2, 0, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Enginefailure ], Motorola}, // {&CanMsg_481, 0, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[year ], Motorola},
{&CanMsg_0A20FFE2, 0, 4, 2, 0, Offset_Plus, 1, 1, &CurValueStr[P_dang ], Motorola},
// {&CanMsg_0A33FFE3, 0, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Vvspeed_L ], Motorola},
// {&CanMsg_0A33FFE3, 1, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Vvspeed_H ], Motorola},
// {&CanMsg_0A10FFE0, 3, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Electricity_H ], Motorola},
// {&CanMsg_0A10FFE0, 2, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Electricity_L ], Motorola},
// {&CanMsg_0A10FFE1, 3, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Electricity_h ], Motorola},
// {&CanMsg_0A10FFE1, 2, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Electricity_l ], Motorola},
// {&CanMsg_0A20FFE2, 1, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Sidebrace ], Motorola},
// {&CanMsg_0A20FFE2, 4, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[cruise ], Motorola},
// {&CanMsg_0A30FFE8, 0, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[ABS ], Motorola},
// {&CanMsg_0A31FFE3, 4, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Tire_pressure ], Motorola},
// {&CanMsg_0A30FFE3, 7, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Bluetooth ], Motorola},
// {&CanMsg_0A32FFE4, 0, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[GPS ], Motorola},
// {&CanMsg_0A37FFE3, 7, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Callalert ], Motorola},
// {&CanMsg_0A18FFE0, 0, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Parallelsignals ], Motorola},
// {&CanMsg_0A40FFE2, 0, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Enginefailure ], Motorola},
// {&CanMsg_0A20FFE2, 0, 4, 2, 0, Offset_Plus, 1, 1, &CurValueStr[P_dang ], Motorola},
}; };
extern unsigned int Key_Dodging_flag; extern unsigned int Key_Dodging_flag;
......
...@@ -108,19 +108,19 @@ ...@@ -108,19 +108,19 @@
/*zh:*/ /*zh:*/
/*CS08 test*/ /*CS08 test*/
EXTERN_VAR CAN_message CanMsg_101; EXTERN_VAR CAN_message CanMsg_112;
EXTERN_VAR CAN_message CanMsg_067; EXTERN_VAR CAN_message CanMsg_103;
EXTERN_VAR CAN_message CanMsg_600; EXTERN_VAR CAN_message CanMsg_116;
EXTERN_VAR CAN_message CanMsg_611; EXTERN_VAR CAN_message CanMsg_113;
EXTERN_VAR CAN_message CanMsg_610; EXTERN_VAR CAN_message CanMsg_104;
EXTERN_VAR CAN_message CanMsg_200; EXTERN_VAR CAN_message CanMsg_12F;
EXTERN_VAR CAN_message CanMsg_481; EXTERN_VAR CAN_message CanMsg_331;
EXTERN_VAR CAN_message CanMsg_020; EXTERN_VAR CAN_message CanMsg_012;
EXTERN_VAR CAN_message CanMsg_202; EXTERN_VAR CAN_message CanMsg_115;
EXTERN_VAR CAN_message CanMsg_280; EXTERN_VAR CAN_message CanMsg_117;
EXTERN_VAR CAN_message CanMsg_042; EXTERN_VAR CAN_message CanMsg_317;
EXTERN_VAR CAN_message CanMsg_480; // EXTERN_VAR CAN_message CanMsg_480;
EXTERN_VAR CAN_message CanMsg_021; // EXTERN_VAR CAN_message CanMsg_021;
EXTERN_VAR CAN_message CanMsg_0A33FFE3; EXTERN_VAR CAN_message CanMsg_0A33FFE3;
EXTERN_VAR CAN_message CanMsg_0A10FFE0; EXTERN_VAR CAN_message CanMsg_0A10FFE0;
EXTERN_VAR CAN_message CanMsg_0A10FFE1; EXTERN_VAR CAN_message CanMsg_0A10FFE1;
...@@ -133,19 +133,19 @@ ...@@ -133,19 +133,19 @@
EXTERN_VAR CAN_message CanMsg_0A18FFE0; EXTERN_VAR CAN_message CanMsg_0A18FFE0;
EXTERN_VAR CAN_message CanMsg_0A40FFE2; EXTERN_VAR CAN_message CanMsg_0A40FFE2;
extern CAN_message CanMsg_101; extern CAN_message CanMsg_112;
extern CAN_message CanMsg_067; extern CAN_message CanMsg_103;
extern CAN_message CanMsg_600; extern CAN_message CanMsg_116;
extern CAN_message CanMsg_611; extern CAN_message CanMsg_113;
extern CAN_message CanMsg_610; extern CAN_message CanMsg_104;
extern CAN_message CanMsg_200; extern CAN_message CanMsg_12F;
extern CAN_message CanMsg_481; extern CAN_message CanMsg_331;
extern CAN_message CanMsg_020; extern CAN_message CanMsg_012;
extern CAN_message CanMsg_202; extern CAN_message CanMsg_115;
extern CAN_message CanMsg_280; extern CAN_message CanMsg_117;
extern CAN_message CanMsg_042; extern CAN_message CanMsg_317;
extern CAN_message CanMsg_480; // extern CAN_message CanMsg_480;
extern CAN_message CanMsg_021; // extern CAN_message CanMsg_021;
extern CAN_message CanMsg_0A33FFE3; extern CAN_message CanMsg_0A33FFE3;
extern CAN_message CanMsg_0A10FFE0; extern CAN_message CanMsg_0A10FFE0;
extern CAN_message CanMsg_0A10FFE1; extern CAN_message CanMsg_0A10FFE1;
......
...@@ -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:\xhy\prog\FPP\mcu02F2.fpp NV_PARAMETER_FILE=C:\Program Files (x86)\Freescale\CWS12v5.1\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