✨ feat:硕上传

Test_Bench/Api_Sources/API_RTC.c

@@ -348,7 +348,8 @@ INT16U  direction_espeed = 1;
 INT16U kseenSeven  = 0;
 INT16U speed_count = 0; 
 INT16U water_temp[]= {55,65,75,85,95,119,125};
-interrupt void Api_RTC_isr(void)
+INT16U time_3s = 0;
+ interrupt void Api_RTC_isr(void)
 {        
 
     RT_10ms++; 
@@ -369,83 +370,11 @@ interrupt void Api_RTC_isr(void)
     if(pSB2 == 0){
       Key.PushTime_2++;
     }
-    if(count_flag_a==1)
-    {
-        a++;
-        if(a>=300)
+    if(RT_10ms >= 10){
+        if(Key.CAN_Step>9||Key.CAN_Step<1)
         {
-
-            if(direction_speed == 1)
-            {
-                speed_count++;
-                if(speed_count>199)
-                {
-                    direction_speed = 0;
-                }
-            }
-            else
-            {
-                speed_count--;
-                if(speed_count < 1)
-                {
-                    direction_speed = 1;
-                }
-
-            }
-
-            c++;
-            if(c>4)
-            {
-                c = 0;
-                i++;
-                if(i>=11)
-                {
-                    i = 0;
-                    if(direction_water==1)
-                    {
-                        j++;
-                        if(j>6)
-                        {
-                            direction_water = 0;
-                        }
-                    }
-                    else
-                    {
-                        j--;
-                        if(j==1)
-                        {
-                            direction_water = 1;
-                        }
-                    }
-                }
-                if(direction_espeed==1)
-                {
-                    k++;
-                    if(k>12)
-                    {
-                        direction_espeed = 0;
-                    }
-                }
-                else
-                {
-                    k--;
-                    if(k==2)
-                    {
-                        direction_espeed = 1;
-                    }
-                }
-            }
-            
-
-            water_value = water_temp[j-1];
-
-
-            speed_value = speed_count;
-            Key.CAN_Step = k-1;         
-            a = 0;
+            Key.CAN_Step = 1;
         }
-    }
-    if(RT_10ms >= 10){
         RT_10ms_En = 1;
         RT_10ms = null;
     }
@@ -489,21 +418,17 @@ interrupt void Api_RTC_isr(void)
     
     if(RT_1s >= T_1s){
         RT_1s_En = 1;
-        RT_1s = null;
-    }
-    
-    if(Key.StepAuto == 1){
-        if(RT_2s >= T_2s){
-            RT_2s = null;
-            
-            //Key.CAN_Step++;
+        if(Key_Dodging_flag==0)
+        {
+            time_3s++;
+            if(time_3s>2)
+            {
+                time_3s = 0;
+                Key.CAN_Step++;
+            }
         }
+        RT_1s = null;
     }
-    else
-    {
-        RT_2s = null;
-    }
-    
 
     Timer_1ms_Base();
         

Test_Bench/App_Headers/APP_Test.h

@@ -40,7 +40,7 @@ typedef struct{
 enum
 {
     ENUM_VSpeed          = 0,//锟斤拷锟斤拷
-    ENUM_RSpeed          ,//�??�??
+    ENUM_RSpeed          ,//锟???锟???
     ENUM_WaterTemp       ,//   娓╁害
     TCS_Warning_Lamp   ,//鍓嶈疆鑳庡帇
     TCS_Work_Mode   ,//鍚庤疆鑳庡帇
@@ -68,7 +68,7 @@ static const s_CAN_List CAN_List[] =
 };
 
 
-
+extern unsigned int Key_Dodging_flag;
 extern unsigned int lost_flag;
 extern unsigned int CAN_init_flag;
 extern unsigned int water_value;

Test_Bench/C_Layout.hwl

-OPEN source 0 0 60 39
+OPEN source 0 0 60 70
 Source < attributes TOOLTIP on,TOOLTIP_FORMAT signed,TOOLTIP_MODE details,FREEZE off,MARKS off
 OPEN assembly 60 0 40 31
-Assembly < attributes ADR on,CODE off,ABSADR on,SYMB off,FORMAT Auto,FREEZE off,TOPPC 0xC054
+Assembly < attributes ADR on,CODE off,ABSADR on,SYMB off,FORMAT Auto,FREEZE off,TOPPC 0x49F8
 OPEN procedure 0 39 60 17
 Procedure < attributes VALUES on,TYPES off
 OPEN register 60 31 40 25

Test_Bench/Sources/main.c

@@ -8,7 +8,6 @@ void main(void) {
   unsigned char i;
 
   step_cycle = 0;
-  count_flag_a = 0;
   Api_Sys_Init();
   App_State_Init();
   App_Load_Data();

Test_Bench/TBDML.ini

@@ -10,7 +10,7 @@ Target=TBDML
 Layout=C_layout.hwl
 LoadDialogOptions=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
 CPU=HC12
-MainFrame=0,1,-1,-1,-1,-1,508,143,1438,860
+MainFrame=0,1,-1,-1,-1,-1,412,144,1341,862
 TOOLBAR=57600 57601 32795 0 57635 57634 57637 0 57671 57669 0 32777 32776 32782 32780 32781 32778 0 32806
 AEFWarningDialog=FALSE
 Configuration=TBDML.hwc
@@ -65,14 +65,14 @@ NV_AUTO_ID=1
 
 
 [Recent Applications File List]
-File0=D:\GIT\일뺏憩\列떴쇱꿎憩\Test_Bench\bin\Project.abs.s19
-File1=C:\Users\葺屢퓻\Desktop\莖團일뺏憩\Project.abs.s19
-File2=D:\TYW1\列떴쇱꿎憩\Test_Bench\bin\Project.abs
-File3=C:\Users\葺屢퓻\Desktop\TYW\列떴쇱꿎憩\Test_Bench\bin\Project.abs
-LoadFlags0=CODEONLY AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
-LoadFlags1=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
+File0=E:\일뺏憩\긍陋匡숭\750va_key_9_6.s19
+File1=E:\일뺏憩\긍陋匡숭\750va_Can_AllLight.s19
+File2=E:\일뺏憩\750va일뺏憩\Project.abs.s19
+File3=D:\GIT\일뺏憩\列떴쇱꿎憩\Test_Bench\bin\Project.abs.s19
+LoadFlags0=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main" 
+LoadFlags1=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main" 
 LoadFlags2=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
-LoadFlags3=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
+LoadFlags3=CODEONLY AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
 
 
 [Recent Layout File List]