Commit 26b8ac48 authored by 何锐's avatar 何锐

feat:发送水温报文

parent 060a98d8
...@@ -94,99 +94,102 @@ void Set_CAN_CRC(CAN_message * CanMessage){ ...@@ -94,99 +94,102 @@ void Set_CAN_CRC(CAN_message * CanMessage){
*/ */
void Format_CAN_Msg() void Format_CAN_Msg()
{ {
CanMsg_101.ID = 0x101; CanMsg_521.ID = 0x521;
CanMsg_067.ID = 0x67; // CanMsg_101.ID = 0x101;
CanMsg_600.ID = 0x600; // CanMsg_067.ID = 0x67;
CanMsg_611.ID = 0x611; // CanMsg_600.ID = 0x600;
CanMsg_610.ID = 0x610; // CanMsg_611.ID = 0x611;
CanMsg_200.ID = 0x200; // CanMsg_610.ID = 0x610;
CanMsg_481.ID = 0x481; // CanMsg_200.ID = 0x200;
CanMsg_020.ID = 0x020; // CanMsg_481.ID = 0x481;
CanMsg_202.ID = 0x202; // CanMsg_020.ID = 0x020;
CanMsg_280.ID = 0x280; // CanMsg_202.ID = 0x202;
CanMsg_042.ID = 0x042; // CanMsg_280.ID = 0x280;
CanMsg_480.ID = 0x480; // CanMsg_042.ID = 0x042;
CanMsg_021.ID = 0x021; // CanMsg_480.ID = 0x480;
CanMsg_0A33FFE3.ID = 0x0A33FFE3; // CanMsg_021.ID = 0x021;
CanMsg_0A10FFE0.ID = 0x0A10FFE0; // CanMsg_0A33FFE3.ID = 0x0A33FFE3;
CanMsg_0A10FFE1.ID = 0x0A10FFE1; // CanMsg_0A10FFE0.ID = 0x0A10FFE0;
CanMsg_0A20FFE2.ID = 0x0A20FFE2; // CanMsg_0A10FFE1.ID = 0x0A10FFE1;
CanMsg_0A30FFE8.ID = 0x0A30FFE8; // CanMsg_0A20FFE2.ID = 0x0A20FFE2;
CanMsg_0A31FFE3.ID = 0x0A31FFE3; // CanMsg_0A30FFE8.ID = 0x0A30FFE8;
CanMsg_0A30FFE3.ID = 0x0A30FFE3; // CanMsg_0A31FFE3.ID = 0x0A31FFE3;
CanMsg_0A32FFE4.ID = 0x0A32FFE4; // CanMsg_0A30FFE3.ID = 0x0A30FFE3;
CanMsg_0A37FFE3.ID = 0x0A37FFE3; // CanMsg_0A32FFE4.ID = 0x0A32FFE4;
CanMsg_0A18FFE0.ID = 0x0A18FFE0; // CanMsg_0A37FFE3.ID = 0x0A37FFE3;
CanMsg_0A40FFE2.ID = 0x0A40FFE2; // CanMsg_0A18FFE0.ID = 0x0A18FFE0;
// CanMsg_0A40FFE2.ID = 0x0A40FFE2;
CanMsg_101.Length = 8;
CanMsg_067.Length = 8; CanMsg_521.Length = 8;
CanMsg_600.Length = 8; // CanMsg_101.Length = 8;
CanMsg_611.Length = 8; // CanMsg_067.Length = 8;
CanMsg_610.Length = 8; // CanMsg_600.Length = 8;
CanMsg_200.Length = 8; // CanMsg_611.Length = 8;
CanMsg_481.Length = 8; // CanMsg_610.Length = 8;
CanMsg_020.Length = 8; // CanMsg_200.Length = 8;
CanMsg_202.Length = 8; // CanMsg_481.Length = 8;
CanMsg_280.Length = 8; // CanMsg_020.Length = 8;
CanMsg_042.Length = 8; // CanMsg_202.Length = 8;
CanMsg_480.Length = 8; // CanMsg_280.Length = 8;
CanMsg_021.Length = 8; // CanMsg_042.Length = 8;
CanMsg_0A33FFE3.Length = 8; // CanMsg_480.Length = 8;
CanMsg_0A10FFE0.Length = 8; // CanMsg_021.Length = 8;
CanMsg_0A10FFE1.Length = 8; // CanMsg_0A33FFE3.Length = 8;
CanMsg_0A20FFE2.Length = 8; // CanMsg_0A10FFE0.Length = 8;
CanMsg_0A30FFE8.Length = 8; // CanMsg_0A10FFE1.Length = 8;
CanMsg_0A31FFE3.Length = 8; // CanMsg_0A20FFE2.Length = 8;
CanMsg_0A30FFE3.Length = 8; // CanMsg_0A30FFE8.Length = 8;
CanMsg_0A32FFE4.Length = 8; // CanMsg_0A31FFE3.Length = 8;
CanMsg_0A37FFE3.Length = 8; // CanMsg_0A30FFE3.Length = 8;
CanMsg_0A18FFE0.Length = 8; // CanMsg_0A32FFE4.Length = 8;
CanMsg_0A40FFE2.Length = 8; // CanMsg_0A37FFE3.Length = 8;
// CanMsg_0A18FFE0.Length = 8;
// CanMsg_0A40FFE2.Length = 8;
CanMsg_101.ID_EN = 1;
CanMsg_067.ID_EN = 1;
CanMsg_600.ID_EN = 1; CanMsg_521.ID_EN = 1;
CanMsg_611.ID_EN = 1; // CanMsg_101.ID_EN = 1;
CanMsg_610.ID_EN = 1; // CanMsg_067.ID_EN = 1;
CanMsg_200.ID_EN = 1; // CanMsg_600.ID_EN = 1;
CanMsg_481.ID_EN = 1; // CanMsg_611.ID_EN = 1;
CanMsg_020.ID_EN = 1; // CanMsg_610.ID_EN = 1;
CanMsg_202.ID_EN = 1; // CanMsg_200.ID_EN = 1;
CanMsg_280.ID_EN = 1; // CanMsg_481.ID_EN = 1;
CanMsg_042.ID_EN = 1; // CanMsg_020.ID_EN = 1;
CanMsg_480.ID_EN = 1; // CanMsg_202.ID_EN = 1;
CanMsg_021.ID_EN = 1; // CanMsg_280.ID_EN = 1;
CanMsg_0A33FFE3.ID_EN = 1; // CanMsg_042.ID_EN = 1;
CanMsg_0A10FFE0.ID_EN = 1; // CanMsg_480.ID_EN = 1;
CanMsg_0A10FFE1.ID_EN = 1; // CanMsg_021.ID_EN = 1;
CanMsg_0A20FFE2.ID_EN = 1; // CanMsg_0A33FFE3.ID_EN = 1;
CanMsg_0A30FFE8.ID_EN = 1; // CanMsg_0A10FFE0.ID_EN = 1;
CanMsg_0A31FFE3.ID_EN = 1; // CanMsg_0A10FFE1.ID_EN = 1;
CanMsg_0A30FFE3.ID_EN = 1; // CanMsg_0A20FFE2.ID_EN = 1;
CanMsg_0A32FFE4.ID_EN = 1; // CanMsg_0A30FFE8.ID_EN = 1;
CanMsg_0A37FFE3.ID_EN = 1; // CanMsg_0A31FFE3.ID_EN = 1;
CanMsg_0A18FFE0.ID_EN = 1; // CanMsg_0A30FFE3.ID_EN = 1;
CanMsg_0A40FFE2.ID_EN = 1; // CanMsg_0A32FFE4.ID_EN = 1;
// CanMsg_0A37FFE3.ID_EN = 1;
// CanMsg_0A18FFE0.ID_EN = 1;
// CanMsg_0A40FFE2.ID_EN = 1;
} }
void Disable_CAN_Tx(void) void Disable_CAN_Tx(void)
{ {
CanMsg_101.ID_EN = 0; // CanMsg_101.ID_EN = 0;
CanMsg_067.ID_EN = 0; // CanMsg_067.ID_EN = 0;
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_200.ID_EN = 0;
CanMsg_481.ID_EN = 0; // CanMsg_481.ID_EN = 0;
CanMsg_020.ID_EN = 0; // CanMsg_020.ID_EN = 0;
CanMsg_202.ID_EN = 0; // CanMsg_202.ID_EN = 0;
CanMsg_280.ID_EN = 0; // CanMsg_280.ID_EN = 0;
CanMsg_042.ID_EN = 0; // CanMsg_042.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;
} }
void Set_Pin(INT16U pin) void Set_Pin(INT16U pin)
...@@ -216,72 +219,74 @@ void App_Can_Proc(void) ...@@ -216,72 +219,74 @@ 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_0A30FFE8); // bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_0A30FFE8);
Clear_CAN_Msg((CAN_message *)&CanMsg_0A30FFE8); // Clear_CAN_Msg((CAN_message *)&CanMsg_0A30FFE8);
} }
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_101);
Clear_CAN_Msg((CAN_message *)&CanMsg_101); // Clear_CAN_Msg((CAN_message *)&CanMsg_101);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_067); // bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_067);
Clear_CAN_Msg((CAN_message *)&CanMsg_067); // Clear_CAN_Msg((CAN_message *)&CanMsg_067);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_610); // bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_610);
Clear_CAN_Msg((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) // if(Key.CAN_Step != 0)
{ // {
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_0A10FFE0); // bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_0A10FFE0);
Clear_CAN_Msg((CAN_message *)&CanMsg_0A10FFE0); // Clear_CAN_Msg((CAN_message *)&CanMsg_0A10FFE0);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_0A10FFE1); // bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_0A10FFE1);
Clear_CAN_Msg((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_0A31FFE3);
Clear_CAN_Msg((CAN_message *)&CanMsg_0A31FFE3); // Clear_CAN_Msg((CAN_message *)&CanMsg_0A31FFE3);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_0A30FFE3); // bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_0A30FFE3);
Clear_CAN_Msg((CAN_message *)&CanMsg_0A30FFE3); // Clear_CAN_Msg((CAN_message *)&CanMsg_0A30FFE3);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_0A33FFE3); // bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_0A33FFE3);
Clear_CAN_Msg((CAN_message *)&CanMsg_0A33FFE3); // Clear_CAN_Msg((CAN_message *)&CanMsg_0A33FFE3);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_0A20FFE2); // bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_0A20FFE2);
Clear_CAN_Msg((CAN_message *)&CanMsg_0A20FFE2); // Clear_CAN_Msg((CAN_message *)&CanMsg_0A20FFE2);
if(electricityclose == 0) // if(electricityclose == 0)
{ // {
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_020); // bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_020);
Clear_CAN_Msg((CAN_message *)&CanMsg_020); // Clear_CAN_Msg((CAN_message *)&CanMsg_020);
} // }
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_202); // bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_202);
Clear_CAN_Msg((CAN_message *)&CanMsg_202); // Clear_CAN_Msg((CAN_message *)&CanMsg_202);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_280); // bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_280);
Clear_CAN_Msg((CAN_message *)&CanMsg_280); // Clear_CAN_Msg((CAN_message *)&CanMsg_280);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_021); // bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_021);
Clear_CAN_Msg((CAN_message *)&CanMsg_021); // Clear_CAN_Msg((CAN_message *)&CanMsg_021);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_521);
Clear_CAN_Msg((CAN_message *)&CanMsg_521);
} }
if(GetCtrlTime(CANMsgSend_200ms) >= 200){ if(GetCtrlTime(CANMsgSend_200ms) >= 200){
ClearCtrlTime(CANMsgSend_200ms); ClearCtrlTime(CANMsgSend_200ms);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_0A32FFE4); // bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_0A32FFE4);
Clear_CAN_Msg((CAN_message *)&CanMsg_0A32FFE4); // Clear_CAN_Msg((CAN_message *)&CanMsg_0A32FFE4);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_0A37FFE3); // bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_0A37FFE3);
Clear_CAN_Msg((CAN_message *)&CanMsg_0A37FFE3); // Clear_CAN_Msg((CAN_message *)&CanMsg_0A37FFE3);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_0A18FFE0); // bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_0A18FFE0);
Clear_CAN_Msg((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); // bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_0A40FFE2);
Clear_CAN_Msg((CAN_message *)&CanMsg_0A40FFE2); // Clear_CAN_Msg((CAN_message *)&CanMsg_0A40FFE2);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_481); // bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_481);
Clear_CAN_Msg((CAN_message *)&CanMsg_481); // Clear_CAN_Msg((CAN_message *)&CanMsg_481);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_480); // bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_480);
Clear_CAN_Msg((CAN_message *)&CanMsg_480); // Clear_CAN_Msg((CAN_message *)&CanMsg_480);
ClearCtrlTime(CANMsgSend_500ms); ClearCtrlTime(CANMsgSend_500ms);
} }
...@@ -306,84 +311,86 @@ void App_Can_Proc(void) ...@@ -306,84 +311,86 @@ 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[Vvspeed_H ].val = 0;
CurValueStr[Vvspeed_L ].val = 0; // CurValueStr[Vvspeed_L ].val = 0;
CurValueStr[Engine_water_temperature_display].val = 0;
CurValueStr[ENUM_VSpeed ].fval = Value_Plus;
CurValueStr[ECM_FaultIndicator ].fval = Value_Plus; CurValueStr[Engine_water_temperature_display].fval = Value_Plus;
CurValueStr[ECM_StautsInvalid ].fval = Value_Plus; // CurValueStr[ENUM_VSpeed ].fval = Value_Plus;
CurValueStr[ECM_MotorOver ].fval = Value_Plus; // CurValueStr[ECM_FaultIndicator ].fval = Value_Plus;
CurValueStr[ECM_ReadyIndicator ].fval = Value_Plus; // CurValueStr[ECM_StautsInvalid ].fval = Value_Plus;
CurValueStr[ECM_ChargeStatus ].fval = Value_Plus; // CurValueStr[ECM_MotorOver ].fval = Value_Plus;
CurValueStr[ECM_CruiseStatus ].fval = Value_Plus; // CurValueStr[ECM_ReadyIndicator ].fval = Value_Plus;
CurValueStr[ECM_GearPositionStatus ].fval = Value_Plus; // CurValueStr[ECM_ChargeStatus ].fval = Value_Plus;
CurValueStr[PFC_Relag ].fval = Value_Plus; // CurValueStr[ECM_CruiseStatus ].fval = Value_Plus;
CurValueStr[LLC_UnderOutput ].fval = Value_Plus; // CurValueStr[ECM_GearPositionStatus ].fval = Value_Plus;
CurValueStr[LLC_OverOutput ].fval = Value_Plus; // CurValueStr[PFC_Relag ].fval = Value_Plus;
CurValueStr[LLC_OutPut ].fval = Value_Plus; // CurValueStr[LLC_UnderOutput ].fval = Value_Plus;
CurValueStr[PFC_LLC_Interal_Communication].fval = Value_Plus; // CurValueStr[LLC_OverOutput ].fval = Value_Plus;
CurValueStr[LLC_Temp ].fval = Value_Plus; // CurValueStr[LLC_OutPut ].fval = Value_Plus;
CurValueStr[Battery_status ].fval = Value_Plus; // CurValueStr[PFC_LLC_Interal_Communication].fval = Value_Plus;
CurValueStr[Battery_Current ].fval = Value_Plus; // CurValueStr[LLC_Temp ].fval = Value_Plus;
CurValueStr[Battery_SOC ].fval = Value_Plus; // CurValueStr[Battery_status ].fval = Value_Plus;
CurValueStr[Vspeed ].fval = Value_Plus; // CurValueStr[Battery_Current ].fval = Value_Plus;
CurValueStr[hour ].fval = Value_Plus; // CurValueStr[Battery_SOC ].fval = Value_Plus;
CurValueStr[minute ].fval = Value_Plus; // CurValueStr[Vspeed ].fval = Value_Plus;
CurValueStr[electricity ].fval = Value_Plus; // CurValueStr[hour ].fval = Value_Plus;
CurValueStr[fault ].fval = Value_Plus; // CurValueStr[minute ].fval = Value_Plus;
CurValueStr[Energy_recovery_level ].fval = Value_Plus; // CurValueStr[electricity ].fval = Value_Plus;
CurValueStr[Side_brackets ].fval = Value_Plus; // CurValueStr[fault ].fval = Value_Plus;
CurValueStr[TCS_close ].fval = Value_Plus; // CurValueStr[Energy_recovery_level ].fval = Value_Plus;
CurValueStr[TCS_crotrul ].fval = Value_Plus; // CurValueStr[Side_brackets ].fval = Value_Plus;
CurValueStr[TCS_mode ].fval = Value_Plus; // CurValueStr[TCS_close ].fval = Value_Plus;
CurValueStr[TCS_light ].fval = Value_Plus; // CurValueStr[TCS_crotrul ].fval = Value_Plus;
CurValueStr[GPS ].fval = Value_Plus; // CurValueStr[TCS_mode ].fval = Value_Plus;
CurValueStr[signal_4G ].fval = Value_Plus; // CurValueStr[TCS_light ].fval = Value_Plus;
CurValueStr[Battery_over ].fval = Value_Plus; // CurValueStr[GPS ].fval = Value_Plus;
CurValueStr[Motor_overheating ].fval = Value_Plus; // CurValueStr[signal_4G ].fval = Value_Plus;
CurValueStr[Cruise_control ].fval = Value_Plus; // CurValueStr[Battery_over ].fval = Value_Plus;
CurValueStr[Gear ].fval = Value_Plus; // CurValueStr[Motor_overheating ].fval = Value_Plus;
CurValueStr[Bluetooth_phone ].fval = Value_Plus; // CurValueStr[Cruise_control ].fval = Value_Plus;
CurValueStr[year ].fval = Value_Plus; // CurValueStr[Gear ].fval = Value_Plus;
CurValueStr[Vvspeed_H ].fval = Value_Plus; // CurValueStr[Bluetooth_phone ].fval = Value_Plus;
CurValueStr[Vvspeed_L ].fval = Value_Plus; // CurValueStr[year ].fval = Value_Plus;
// CurValueStr[Vvspeed_H ].fval = Value_Plus;
// CurValueStr[Vvspeed_L ].fval = Value_Plus;
// CurVehSpeed = 0; // CurVehSpeed = 0;
//LDW Open //LDW Open
......
...@@ -60,47 +60,48 @@ void APP_ICM_Proc(void) /*zh321*/ /*FS04*/ ...@@ -60,47 +60,48 @@ void APP_ICM_Proc(void) /*zh321*/ /*FS04*/
//if(Self_propelled_flag==1) //if(Self_propelled_flag==1)
{ {
{ {
CurValueStr[Vspeed ].val = 0; CurValueStr[Engine_water_temperature_display].val = 0x64;
CurValueStr[hour ].val = 0; // CurValueStr[Vspeed ].val = 0;
CurValueStr[minute ].val = 0; // CurValueStr[hour ].val = 0;
CurValueStr[electricity ].val = 0; // CurValueStr[minute ].val = 0;
CurValueStr[fault ].val = 0; // CurValueStr[electricity ].val = 0;
CurValueStr[Ready ].val = 0; // CurValueStr[fault ].val = 0;
CurValueStr[Energy_recovery ].val = 0; // CurValueStr[Ready ].val = 0;
CurValueStr[Energy_recovery_level ].val = 0; // CurValueStr[Energy_recovery ].val = 0;
CurValueStr[Side_brackets ].val = 0; // CurValueStr[Energy_recovery_level ].val = 0;
CurValueStr[TCS_close ].val = 1; // CurValueStr[Side_brackets ].val = 0;
CurValueStr[TCS_crotrul ].val = 1; // CurValueStr[TCS_close ].val = 1;
CurValueStr[TCS_mode ].val = 1; // CurValueStr[TCS_crotrul ].val = 1;
CurValueStr[TCS_light ].val = 1; // CurValueStr[TCS_mode ].val = 1;
CurValueStr[GPS ].val = 0; // CurValueStr[TCS_light ].val = 1;
CurValueStr[signal_4G ].val = 0; // CurValueStr[GPS ].val = 0;
CurValueStr[Battery_over ].val = 0; // CurValueStr[signal_4G ].val = 0;
CurValueStr[Motor_overheating ].val = 0; // CurValueStr[Battery_over ].val = 0;
CurValueStr[Cruise_control ].val = 0; // CurValueStr[Motor_overheating ].val = 0;
CurValueStr[Gear ].val = 0; // CurValueStr[Cruise_control ].val = 0;
CurValueStr[Bluetooth_phone ].val = 0; // CurValueStr[Gear ].val = 0;
CurValueStr[Vvspeed_L ].val = 0; // CurValueStr[Bluetooth_phone ].val = 0;
CurValueStr[Vvspeed_H ].val = 0; // CurValueStr[Vvspeed_L ].val = 0;
CurValueStr[Electricity_H ].val = 0; // CurValueStr[Vvspeed_H ].val = 0;
CurValueStr[Electricity_L ].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[Sidebrace ].val = 0; // CurValueStr[Electricity_l ].val = 0;
CurValueStr[cruise ].val = 0; // CurValueStr[Sidebrace ].val = 0;
CurValueStr[ABS ].val = 0; // CurValueStr[cruise ].val = 0;
CurValueStr[TCS ].val = 0; // CurValueStr[ABS ].val = 0;
CurValueStr[Tire_pressure ].val = 0; // CurValueStr[TCS ].val = 0;
CurValueStr[Bluetooth ].val = 0; // CurValueStr[Tire_pressure ].val = 0;
CurValueStr[GPS ].val = 0; // CurValueStr[Bluetooth ].val = 0;
CurValueStr[Callalert ].val = 0x01; // CurValueStr[GPS ].val = 0;
CurValueStr[GMS ].val = 0; // CurValueStr[Callalert ].val = 0x01;
CurValueStr[Parallelsignals ].val = 0; // CurValueStr[GMS ].val = 0;
CurValueStr[Enginefailure ].val = 0; // CurValueStr[Parallelsignals ].val = 0;
CurValueStr[P_dang ].val = 0x03; // CurValueStr[Enginefailure ].val = 0;
// CurValueStr[P_dang ].val = 0x03;
#if 1 #if 0
switch(Key.CAN_Step) switch(Key.CAN_Step)
{ {
case 1: case 1:
......
...@@ -41,61 +41,62 @@ typedef struct ...@@ -41,61 +41,62 @@ typedef struct
enum enum
{ {
ENUM_VSpeed = 0, // 锟斤拷锟斤拷 // ENUM_VSpeed = 0, // 锟斤拷锟斤拷
ECM_FaultIndicator, // ECM_FaultIndicator,
ECM_StautsInvalid, // ECM_StautsInvalid,
ECM_MotorOver, // ECM_MotorOver,
ECM_ReadyIndicator, // ECM_ReadyIndicator,
ECM_ChargeStatus, // ECM_ChargeStatus,
ECM_CruiseStatus, // ECM_CruiseStatus,
ECM_GearPositionStatus, // ECM_GearPositionStatus,
PFC_Relag, // PFC_Relag,
LLC_UnderOutput, // LLC_UnderOutput,
LLC_OverOutput, // LLC_OverOutput,
LLC_OutPut, // LLC_OutPut,
PFC_LLC_Interal_Communication, // PFC_LLC_Interal_Communication,
LLC_Temp, // LLC_Temp,
Battery_status, // Battery_status,
Battery_Current, // Battery_Current,
Battery_SOC, // Battery_SOC,
Vspeed, // Vspeed,
hour, // hour,
minute, // minute,
electricity, // electricity,
fault, // fault,
Ready, // Ready,
Energy_recovery, // Energy_recovery,
Energy_recovery_level, // Energy_recovery_level,
Side_brackets, // Side_brackets,
TCS_close, // TCS_close,
TCS_crotrul, // TCS_crotrul,
TCS_mode, // TCS_mode,
TCS_light, // TCS_light,
signal_4G, // signal_4G,
Battery_over, // Battery_over,
Motor_overheating, // Motor_overheating,
Cruise_control, // Cruise_control,
Gear, // Gear,
Bluetooth_phone, // Bluetooth_phone,
year, // year,
Vvspeed_H, // Vvspeed_H,
Vvspeed_L, // Vvspeed_L,
Electricity_H, // Electricity_H,
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,
CAN_List_Num, CAN_List_Num,
}; };
...@@ -103,71 +104,71 @@ EXTERN_APP_TEST volatile s_CurValue CurValueStr[CAN_List_Num]; ...@@ -103,71 +104,71 @@ 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_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_067, 2, 0, 16, 0,Offset_Plus, 1, 1, &CurValueStr[ECM_FaultIndicator ], Motorola},
{&CanMsg_067, 3, 0, 2, 0, Offset_Plus, 1, 1, &CurValueStr[ECM_StautsInvalid ], Motorola}, // {&CanMsg_067, 3, 0, 2, 0, Offset_Plus, 1, 1, &CurValueStr[ECM_StautsInvalid ], Motorola},
{&CanMsg_067, 3, 2, 2, 0, Offset_Plus, 1, 1, &CurValueStr[ECM_MotorOver ], Motorola}, // {&CanMsg_067, 3, 2, 2, 0, Offset_Plus, 1, 1, &CurValueStr[ECM_MotorOver ], Motorola},
{&CanMsg_067, 3, 4, 1, 0, Offset_Plus, 1, 1, &CurValueStr[ECM_ReadyIndicator ], Motorola}, // {&CanMsg_067, 3, 4, 1, 0, Offset_Plus, 1, 1, &CurValueStr[ECM_ReadyIndicator ], Motorola},
{&CanMsg_067, 3, 6, 1, 0, Offset_Plus, 1, 1, &CurValueStr[ECM_ChargeStatus ], Motorola}, // {&CanMsg_067, 3, 6, 1, 0, Offset_Plus, 1, 1, &CurValueStr[ECM_ChargeStatus ], Motorola},
{&CanMsg_067, 4, 2, 1, 0, Offset_Plus, 1, 1, &CurValueStr[ECM_CruiseStatus ], Motorola}, // {&CanMsg_067, 4, 2, 1, 0, Offset_Plus, 1, 1, &CurValueStr[ECM_CruiseStatus ], Motorola},
{&CanMsg_067, 5, 0, 3, 0, Offset_Plus, 1, 1, &CurValueStr[ECM_GearPositionStatus ], Motorola}, // {&CanMsg_067, 5, 0, 3, 0, Offset_Plus, 1, 1, &CurValueStr[ECM_GearPositionStatus ], Motorola},
{&CanMsg_600, 0, 0, 1, 0, Offset_Plus, 1, 1, &CurValueStr[PFC_Relag ], Motorola}, // {&CanMsg_600, 0, 0, 1, 0, Offset_Plus, 1, 1, &CurValueStr[PFC_Relag ], Motorola},
{&CanMsg_600, 0, 1, 1, 0, Offset_Plus, 1, 1, &CurValueStr[LLC_UnderOutput ], Motorola}, // {&CanMsg_600, 0, 1, 1, 0, Offset_Plus, 1, 1, &CurValueStr[LLC_UnderOutput ], Motorola},
{&CanMsg_600, 0, 2, 1, 0, Offset_Plus, 1, 1, &CurValueStr[LLC_OverOutput ], Motorola}, // {&CanMsg_600, 0, 2, 1, 0, Offset_Plus, 1, 1, &CurValueStr[LLC_OverOutput ], Motorola},
{&CanMsg_600, 0, 3, 1, 0, Offset_Plus, 1, 1, &CurValueStr[LLC_OutPut ], Motorola}, // {&CanMsg_600, 0, 3, 1, 0, Offset_Plus, 1, 1, &CurValueStr[LLC_OutPut ], Motorola},
{&CanMsg_600, 0, 4, 1, 0, Offset_Plus, 1, 1, &CurValueStr[PFC_LLC_Interal_Communication ], Motorola}, // {&CanMsg_600, 0, 4, 1, 0, Offset_Plus, 1, 1, &CurValueStr[PFC_LLC_Interal_Communication ], Motorola},
{&CanMsg_600, 0, 5, 1, 0, Offset_Plus, 1, 1, &CurValueStr[LLC_Temp ], 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_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_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, 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_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_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, 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_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, 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, 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, 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_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, 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, 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_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, 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_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_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_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_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_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}, // {&CanMsg_481, 0, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[year ], Motorola},
{&CanMsg_0A33FFE3, 0, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Vvspeed_L ], 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_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, 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_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, 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_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, 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_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_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_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_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_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_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_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_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}, // {&CanMsg_0A20FFE2, 0, 4, 2, 0, Offset_Plus, 1, 1, &CurValueStr[P_dang ], Motorola},
{&CanMsg_521, 1, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Engine_water_temperature_display ], Motorola},
}; };
extern unsigned int Key_Dodging_flag; extern unsigned int Key_Dodging_flag;
extern unsigned int lost_flag; extern unsigned int lost_flag;
......
...@@ -108,55 +108,57 @@ ...@@ -108,55 +108,57 @@
/*zh:*/ /*zh:*/
/*CS08 test*/ /*CS08 test*/
EXTERN_VAR CAN_message CanMsg_101; EXTERN_VAR CAN_message CanMsg_521;
EXTERN_VAR CAN_message CanMsg_067; // EXTERN_VAR CAN_message CanMsg_101;
EXTERN_VAR CAN_message CanMsg_600; // EXTERN_VAR CAN_message CanMsg_067;
EXTERN_VAR CAN_message CanMsg_611; // EXTERN_VAR CAN_message CanMsg_600;
EXTERN_VAR CAN_message CanMsg_610; // EXTERN_VAR CAN_message CanMsg_611;
EXTERN_VAR CAN_message CanMsg_200; // EXTERN_VAR CAN_message CanMsg_610;
EXTERN_VAR CAN_message CanMsg_481; // EXTERN_VAR CAN_message CanMsg_200;
EXTERN_VAR CAN_message CanMsg_020; // EXTERN_VAR CAN_message CanMsg_481;
EXTERN_VAR CAN_message CanMsg_202; // EXTERN_VAR CAN_message CanMsg_020;
EXTERN_VAR CAN_message CanMsg_280; // EXTERN_VAR CAN_message CanMsg_202;
EXTERN_VAR CAN_message CanMsg_042; // EXTERN_VAR CAN_message CanMsg_280;
EXTERN_VAR CAN_message CanMsg_480; // EXTERN_VAR CAN_message CanMsg_042;
EXTERN_VAR CAN_message CanMsg_021; // EXTERN_VAR CAN_message CanMsg_480;
EXTERN_VAR CAN_message CanMsg_0A33FFE3; // EXTERN_VAR CAN_message CanMsg_021;
EXTERN_VAR CAN_message CanMsg_0A10FFE0; // EXTERN_VAR CAN_message CanMsg_0A33FFE3;
EXTERN_VAR CAN_message CanMsg_0A10FFE1; // EXTERN_VAR CAN_message CanMsg_0A10FFE0;
EXTERN_VAR CAN_message CanMsg_0A20FFE2; // EXTERN_VAR CAN_message CanMsg_0A10FFE1;
EXTERN_VAR CAN_message CanMsg_0A30FFE8; // EXTERN_VAR CAN_message CanMsg_0A20FFE2;
EXTERN_VAR CAN_message CanMsg_0A31FFE3; // EXTERN_VAR CAN_message CanMsg_0A30FFE8;
EXTERN_VAR CAN_message CanMsg_0A30FFE3; // EXTERN_VAR CAN_message CanMsg_0A31FFE3;
EXTERN_VAR CAN_message CanMsg_0A32FFE4; // EXTERN_VAR CAN_message CanMsg_0A30FFE3;
EXTERN_VAR CAN_message CanMsg_0A37FFE3; // EXTERN_VAR CAN_message CanMsg_0A32FFE4;
EXTERN_VAR CAN_message CanMsg_0A18FFE0; // EXTERN_VAR CAN_message CanMsg_0A37FFE3;
EXTERN_VAR CAN_message CanMsg_0A40FFE2; // EXTERN_VAR CAN_message CanMsg_0A18FFE0;
// EXTERN_VAR CAN_message CanMsg_0A40FFE2;
extern CAN_message CanMsg_101;
extern CAN_message CanMsg_067; extern CAN_message CanMsg_521;
extern CAN_message CanMsg_600; // extern CAN_message CanMsg_101;
extern CAN_message CanMsg_611; // extern CAN_message CanMsg_067;
extern CAN_message CanMsg_610; // extern CAN_message CanMsg_600;
extern CAN_message CanMsg_200; // extern CAN_message CanMsg_611;
extern CAN_message CanMsg_481; // extern CAN_message CanMsg_610;
extern CAN_message CanMsg_020; // extern CAN_message CanMsg_200;
extern CAN_message CanMsg_202; // extern CAN_message CanMsg_481;
extern CAN_message CanMsg_280; // extern CAN_message CanMsg_020;
extern CAN_message CanMsg_042; // extern CAN_message CanMsg_202;
extern CAN_message CanMsg_480; // extern CAN_message CanMsg_280;
extern CAN_message CanMsg_021; // extern CAN_message CanMsg_042;
extern CAN_message CanMsg_0A33FFE3; // extern CAN_message CanMsg_480;
extern CAN_message CanMsg_0A10FFE0; // extern CAN_message CanMsg_021;
extern CAN_message CanMsg_0A10FFE1; // extern CAN_message CanMsg_0A33FFE3;
extern CAN_message CanMsg_0A20FFE2; // extern CAN_message CanMsg_0A10FFE0;
extern CAN_message CanMsg_0A30FFE8; // extern CAN_message CanMsg_0A10FFE1;
extern CAN_message CanMsg_0A31FFE3; // extern CAN_message CanMsg_0A20FFE2;
extern CAN_message CanMsg_0A30FFE3; // extern CAN_message CanMsg_0A30FFE8;
extern CAN_message CanMsg_0A32FFE4; // extern CAN_message CanMsg_0A31FFE3;
extern CAN_message CanMsg_0A37FFE3; // extern CAN_message CanMsg_0A30FFE3;
extern CAN_message CanMsg_0A18FFE0; // extern CAN_message CanMsg_0A32FFE4;
extern CAN_message CanMsg_0A40FFE2; // extern CAN_message CanMsg_0A37FFE3;
// extern CAN_message CanMsg_0A18FFE0;
// extern CAN_message CanMsg_0A40FFE2;
/**/ /**/
/*:zh*/ /*:zh*/
......
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