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;
} }
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -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