解决扩增时间异常问题，固化参数

BoardInterface/onechip_load_inf.h

@@ -8,7 +8,7 @@
 #define SOFT_VERSION_1  7	//软件版本号
 #define SOFT_VERSION_2  4	//软件版本号
 #define SOFT_VERSION_3  0	//软件版本号
-#define SOFT_VERSION_4  15	//软件版本号
+#define SOFT_VERSION_4  16	//软件版本号
 
 
 

DriverInterface/onchip_flash.c

@@ -183,7 +183,7 @@ uint32_t checksum_calc1(uint8_t *wdata, int len)
 ********************************************************************/
 void cfg_load_default_param(void)
 {
-	sysinf.lysis_offset = 0;
+	sysinf.lysis_offset = -6;
 	sysinf.lysis_overHeat = 3;
 	sysinf.lysis_overHeatTime    = 10;
 	sysinf.lysis_Kp = 5;
@@ -205,9 +205,9 @@ void cfg_load_default_param(void)
 	sysinf.adjtemp = -0.5;
 	sysinf.log_level =  VAN_LOG_ERROR|VAN_LOG_INFO|VAN_LOG_TEMP|VAN_LOG_WIFI;
 	sysinf.skip_CheckOrRun = 0;
-	sysinf.timeinner = 6000;
-	sysinf.swingtime = 100;
-	sysinf.swingspeed = 60;	
+	sysinf.timeinner =12000;
+	sysinf.swingtime = 150;
+	sysinf.swingspeed = 20;	
 	// sysinf.swingtimeRight = 40;
 	// sysinf.swingtimePause = 100;
 	// sysinf.runLoopTime = 600;

DriverInterface/user_heater.c

@@ -55,7 +55,7 @@ void updatParm_heater_master(void) {
 void heater_work(heat_ctrl_def *heater)
 {
     if(heater->needpreheat){
-        heater->stabletime ++;
+        // heater->stabletime ++;
         if(heater->stabletime > heater->PreHeatTime * 600){
             /*提前预热阶段完成，进入正式控温流程*/
             sysinf.heaterMaster.needpreheat = 0;

MDK-ARM/mini7_V2.uvoptx

@@ -216,7 +216,7 @@
         <Bp>
           <Number>4</Number>
           <Type>0</Type>
-          <LineNumber>305</LineNumber>
+          <LineNumber>61</LineNumber>
           <EnabledFlag>1</EnabledFlag>
           <Address>0</Address>
           <ByteObject>0</ByteObject>
@@ -225,7 +225,23 @@
           <SizeOfObject>0</SizeOfObject>
           <BreakByAccess>0</BreakByAccess>
           <BreakIfRCount>0</BreakIfRCount>
-          <Filename>..\DriverInterface\usr_motor.c</Filename>
+          <Filename>..\DriverInterface\user_heater.c</Filename>
+          <ExecCommand></ExecCommand>
+          <Expression></Expression>
+        </Bp>
+        <Bp>
+          <Number>5</Number>
+          <Type>0</Type>
+          <LineNumber>864</LineNumber>
+          <EnabledFlag>1</EnabledFlag>
+          <Address>0</Address>
+          <ByteObject>0</ByteObject>
+          <HtxType>0</HtxType>
+          <ManyObjects>0</ManyObjects>
+          <SizeOfObject>0</SizeOfObject>
+          <BreakByAccess>0</BreakByAccess>
+          <BreakIfRCount>0</BreakIfRCount>
+          <Filename>..\DriverInterface\ESP32_WROOM_32D.c</Filename>
           <ExecCommand></ExecCommand>
           <Expression></Expression>
         </Bp>
@@ -490,34 +506,34 @@
         <Bp>
           <Number>0</Number>
           <Type>0</Type>
-          <LineNumber>167</LineNumber>
+          <LineNumber>61</LineNumber>
           <EnabledFlag>1</EnabledFlag>
-          <Address>134275948</Address>
+          <Address>134267832</Address>
           <ByteObject>0</ByteObject>
           <HtxType>0</HtxType>
           <ManyObjects>0</ManyObjects>
           <SizeOfObject>0</SizeOfObject>
           <BreakByAccess>0</BreakByAccess>
           <BreakIfRCount>1</BreakIfRCount>
-          <Filename>..\DriverInterface\van_BSP_Scanner.c</Filename>
+          <Filename>..\DriverInterface\user_heater.c</Filename>
           <ExecCommand></ExecCommand>
-          <Expression>\\mini7_V2\../DriverInterface/van_BSP_Scanner.c\167</Expression>
+          <Expression>\\mini7_V2\../DriverInterface/user_heater.c\61</Expression>
         </Bp>
         <Bp>
           <Number>1</Number>
           <Type>0</Type>
-          <LineNumber>305</LineNumber>
+          <LineNumber>864</LineNumber>
           <EnabledFlag>1</EnabledFlag>
-          <Address>134247520</Address>
+          <Address>134278642</Address>
           <ByteObject>0</ByteObject>
           <HtxType>0</HtxType>
           <ManyObjects>0</ManyObjects>
           <SizeOfObject>0</SizeOfObject>
           <BreakByAccess>0</BreakByAccess>
           <BreakIfRCount>1</BreakIfRCount>
-          <Filename>..\DriverInterface\usr_motor.c</Filename>
+          <Filename>..\DriverInterface\ESP32_WROOM_32D.c</Filename>
           <ExecCommand></ExecCommand>
-          <Expression>\\mini7_V2\../DriverInterface/usr_motor.c\305</Expression>
+          <Expression>\\mini7_V2\../DriverInterface/ESP32_WROOM_32D.c\864</Expression>
         </Bp>
       </Breakpoint>
       <WatchWindow1>
@@ -576,6 +592,11 @@
           <WinNumber>1</WinNumber>
           <ItemText>timerBuf</ItemText>
         </Ww>
+        <Ww>
+          <count>11</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>wifi_state</ItemText>
+        </Ww>
       </WatchWindow1>
       <WatchWindow2>
         <Ww>

MDK-ARM/mini7_V2.uvprojx

@@ -845,7 +845,7 @@
             <nStopB2X>0</nStopB2X>
           </BeforeMake>
           <AfterMake>
-            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>1</RunUserProg2>
             <UserProg1Name>C:\Keil_v5\ARM\ARMCC\bin\fromelf   --bin --output ./mini7_V2/mini7_V2.bin ./mini7_V2/mini7_V2.axf</UserProg1Name>
             <UserProg2Name></UserProg2Name>