Commit a8485c07 authored by 何锐's avatar 何锐

feat:完成老化台程序

parent 8c680800
...@@ -221,8 +221,11 @@ void App_Can_Proc(void) ...@@ -221,8 +221,11 @@ void App_Can_Proc(void)
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_180); bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_180);
Clear_CAN_Msg((CAN_message *)&CanMsg_180); Clear_CAN_Msg((CAN_message *)&CanMsg_180);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_687); if(Key.CAN_Step != 0)
Clear_CAN_Msg((CAN_message *)&CanMsg_687); {
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_687);
Clear_CAN_Msg((CAN_message *)&CanMsg_687);
}
} }
...@@ -240,14 +243,13 @@ void App_Can_Proc(void) ...@@ -240,14 +243,13 @@ void App_Can_Proc(void)
ClearCtrlTime(CANMsgSend_100ms); ClearCtrlTime(CANMsgSend_100ms);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_100); bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_100);
Clear_CAN_Msg((CAN_message *)&CanMsg_100); Clear_CAN_Msg((CAN_message *)&CanMsg_100);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_200);
Clear_CAN_Msg((CAN_message *)&CanMsg_200);
} }
if(GetCtrlTime(CANMsgSend_200ms) >= 200){ if(GetCtrlTime(CANMsgSend_200ms) >= 200){
ClearCtrlTime(CANMsgSend_200ms); ClearCtrlTime(CANMsgSend_200ms);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_200);
Clear_CAN_Msg((CAN_message *)&CanMsg_200);
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);
......
This diff is collapsed.
...@@ -48,6 +48,7 @@ enum ...@@ -48,6 +48,7 @@ enum
OIL_TALE_STOP, OIL_TALE_STOP,
CENACC, CENACC,
ASR_indicator, ASR_indicator,
AB_SET,
Telephone_lcon, Telephone_lcon,
Device_connected, Device_connected,
App_lcon_status, App_lcon_status,
...@@ -111,6 +112,7 @@ static const s_CAN_List CAN_List[] = ...@@ -111,6 +112,7 @@ static const s_CAN_List CAN_List[] =
{&CanMsg_100, 5, 0, 1, 0, Offset_Plus, 1, 1, &CurValueStr[OIL_TALE_STOP ], Motorola}, {&CanMsg_100, 5, 0, 1, 0, Offset_Plus, 1, 1, &CurValueStr[OIL_TALE_STOP ], Motorola},
{&CanMsg_120, 4, 6, 1, 0, Offset_Plus, 1, 1, &CurValueStr[CENACC ], Motorola}, {&CanMsg_120, 4, 6, 1, 0, Offset_Plus, 1, 1, &CurValueStr[CENACC ], Motorola},
{&CanMsg_200, 4, 6, 2, 0, Offset_Plus, 1, 1, &CurValueStr[ASR_indicator ], Motorola}, {&CanMsg_200, 4, 6, 2, 0, Offset_Plus, 1, 1, &CurValueStr[ASR_indicator ], Motorola},
{&CanMsg_200, 2, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[AB_SET ], Motorola},
{&CanMsg_687, 1, 4, 1, 0, Offset_Plus, 1, 1, &CurValueStr[Telephone_lcon ], Motorola}, {&CanMsg_687, 1, 4, 1, 0, Offset_Plus, 1, 1, &CurValueStr[Telephone_lcon ], Motorola},
{&CanMsg_687, 1, 1, 1, 0, Offset_Plus, 1, 1, &CurValueStr[Device_connected ], Motorola}, {&CanMsg_687, 1, 1, 1, 0, Offset_Plus, 1, 1, &CurValueStr[Device_connected ], Motorola},
{&CanMsg_687, 1, 2, 1, 0, Offset_Plus, 1, 1, &CurValueStr[App_lcon_status ], Motorola}, {&CanMsg_687, 1, 2, 1, 0, Offset_Plus, 1, 1, &CurValueStr[App_lcon_status ], Motorola},
......
...@@ -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,-1,-1,-1,-1,332,132,1772,881 MainFrame=2,3,-1,-1,-1,-1,332,132,1772,881
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
...@@ -28,7 +28,7 @@ CHIPSECURE=CHIPSECURE SETUP 0xFF0F 0x3 0x2 ...@@ -28,7 +28,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=C:\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