Merge branch 'dev-1' into 'dev'

代码审核

See merge request !3

Api_Sources/API_Device_Init.c

@@ -111,7 +111,20 @@ void Api_Sys_Off(void)
     DriverLamp_OUT =0;
     Cruise_OUT =0;
     DPF_OUT =0;
-    HOutputTempL_OUT =0;   
+    HOutputTempL_OUT =0;
+    
+    //bsp_CAN_Sleep();
+    //SCICR2 = 0;
+            
+    PERT_PERT1 = 0 ; //燃油零点
+    PERT_PERT0 = 0 ; //车速零点
+    PER1AD_PER1AD2 = 0 ; //温度零点
+    
+    //PERS_PERS6 = 0;
+    //PERP_PERP7 = 0;
+    //PERP_PERP6 = 0;    
+    LCD_SDA = 1;
+    LCD_SCL = 1; 
 }
 #pragma CODE_SEG OTHER_ROM
 /*-------------------------------------------------------------------------

Sources/main.c

@@ -96,16 +96,17 @@ void main(void)
         default:
           break;           
       }
-    }   
+    }
     GUI_CheckKeyProc((KeyType*)&G_Button);
     GUI_BeepProc((BeepType*)Beep);        
     GUI_Light_Out();
     GUI_LedRandomDisplay();
     App_CheckCanDrop() ;
     App_ChcekSleep(); 
-    if(Curkeyinput == KeyOFF)
+    
+    if (Curkeyinput == KeyOFF)
     { 
-       T_BOX_time=0;
+      T_BOX_time=0;
       RunStep = SysInit_Proc;
       App_State_Off();
       if(CarFlag.FlagBits.AccSaveState)
@@ -116,8 +117,8 @@ void main(void)
       if(CarFlag.FlagBits.SysOffEn)
       {
         CarFlag.FlagBits.SysOffEn = Disable;
-        GUI_Motor_Reset(); 
         GUI_LCD_Clear();
+        GUI_Motor_Reset(); 
       }    
       if(bcanbussleep==1)
       {            

TBDML.ini

@@ -10,7 +10,7 @@ Target=TBDML
 Layout=C_layout.hwl
 LoadDialogOptions=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
 CPU=HC12
-MainFrame=2,3,-32000,-32000,-1,-1,2328,134,3180,909
+MainFrame=2,3,-1,-1,-1,-1,2328,134,3180,909
 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
@@ -142,7 +142,7 @@ File0=H:\
 File1=E:\Edge下载\五征DG01_充电指示灯_20231005.s19
 File2=H:\五征DG01\DG01_16C22_20230314.s19
 File3=H:\五征DG01\程序源码\bin\Project.abs
-LoadFlags0=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main" 
+LoadFlags0=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
 LoadFlags1=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
 LoadFlags2=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
 LoadFlags3=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"

bin/Project.xpr

+Data < ADDXPR ONLY_ADD_IF_NEW "FuelMeter.DestPosition"
+Data < ADDXPR ONLY_ADD_IF_NEW "FuelMeter.CurPosition"
+Data < ADDXPR ONLY_ADD_IF_NEW "FuleSpeed"
+Data < ADDXPR ONLY_ADD_IF_NEW "Fuelnum"
+Data < ADDXPR ONLY_ADD_IF_NEW "FuelMeter.CurBoardVal"
+Data < ADDXPR ONLY_ADD_IF_NEW "FuleShowFlag"
+Data < ADDXPR ONLY_ADD_IF_NEW "main.c::AccKm"
+Data < ADDXPR ONLY_ADD_IF_NEW "G_Button.PushTime"
+Data < ADDXPR ONLY_ADD_IF_NEW "AccKm"
+Data < ADDXPR ONLY_ADD_IF_NEW "OldAccKm"
+Data < ADDXPR ONLY_ADD_IF_NEW "OUT_2000km_Clear"
+Data < ADDXPR ONLY_ADD_IF_NEW "FuelMeter"
+Data < ADDXPR ONLY_ADD_IF_NEW "FuelMeterParamer"
+Data < ADDXPR ONLY_ADD_IF_NEW "OBD_CheckTime"
+Data < ADDXPR ONLY_ADD_IF_NEW "CanMsg5F2.Data[7].bbyte"
+Data < ADDXPR ONLY_ADD_IF_NEW "ClearOdoCanTimes"
+Data < ADDXPR ONLY_ADD_IF_NEW "ClearOdoCanOut"
+Data < ADDXPR ONLY_ADD_IF_NEW "G_Button"