1.增加git信息

BoardInterface/one_chip_git_inf.h

@@ -1,5 +1,5 @@
 #ifndef _ONE_CHIP_GITINF_H 
 #define _ONE_CHIP_GITINF_H 
-#define ONE_CHIP_GIT_SHA  "0b9ed908bfa34eb94d95c042d84c78abe308d261"
-#define ONE_CHIP_GIT_SHA_SHORT  "0b9ed908bf"
+#define ONE_CHIP_GIT_SHA  "a03a00e3fdefd932108f21a7a4f4380b1a806737"
+#define ONE_CHIP_GIT_SHA_SHORT  "a03a00e3fd"
 #endif 

BoardInterface/onechip_devinf_define.h

@@ -6,7 +6,7 @@
 #include "state_mini.h"
 #include "user_heater.h"
 #include "usr_lysis.h"
-#define OFFLINE_TIME 20*60  /*一分钟*/
+#define OFFLINE_TIME 20*20  /*一分钟*/
 
 
 #define CMD_BUF_SIZE (128)	// 调试串口缓冲区长度

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  8	//软件版本号
+#define SOFT_VERSION_4  9	//软件版本号
 
 
 

Core/Src/main.c

@@ -31,6 +31,7 @@
 /* USER CODE BEGIN Includes */
 
 #include "onechip_include_header.h"
+#include "one_chip_git_inf.h"
 /* USER CODE END Includes */
 
 /* Private typedef -----------------------------------------------------------*/

DriverInterface/communication.c

@@ -1,9 +1,10 @@
 
 
 #include "onechip_include_header.h"
+#include "one_chip_git_inf.h"
 
 
-char DeviceNum[60] = "mini7 2312230001 v1.1, ";
+char DeviceNum[64] = "mini7 2312230001 v1.1, ";
 uint8_t pc_send_wait = 0;     //数据发送等待，0可以立即发送；>0正在发送请等待
 uint8_t pc_send_cmd = 0;     //当前发送cmd
 
@@ -172,7 +173,12 @@ void PackDeviceNum(void){
 	hex_to_ascii((const void *)uid, &DeviceNum[len], 12);	//uid
 	strcat(DeviceNum, ",");
 	strcat(DeviceNum, (const char *)sysinf.SN);
-	strcat(DeviceNum, " ");
+	strcat(DeviceNum, ",");
+#ifdef ONE_CHIP_GIT_SHA
+     uint8_t gitinf[10] = {0};
+     memcpy(gitinf, ONE_CHIP_GIT_SHA, 9);
+	 strcat(DeviceNum, gitinf);
+#endif  
 	Van_Device_Printf(VAN_LOG_INFO,"DeviceNum:%s\n", DeviceNum);
 }
 

DriverInterface/onchip_flash.c

@@ -306,7 +306,7 @@ void iap_load_app(uint32_t appxaddr)
     {
         /* 用户代码区第二个字为程序开始地址(复位地址) */
         iapfun jump2app = (iapfun) * (volatile uint32_t *)(appxaddr + 4);
-        HAL_DeInit();
+        // HAL_DeInit();
         /* 初始化APP堆栈指针(用户代码区的第一个字用于存放栈顶地址) */
         __set_MSP(*(volatile uint32_t *)appxaddr);
         

MDK-ARM/mini7_V2.uvoptx

@@ -152,70 +152,54 @@
         <Bp>
           <Number>0</Number>
           <Type>0</Type>
-          <LineNumber>151</LineNumber>
+          <LineNumber>547</LineNumber>
           <EnabledFlag>1</EnabledFlag>
-          <Address>134336862</Address>
+          <Address>134321174</Address>
           <ByteObject>0</ByteObject>
           <HtxType>0</HtxType>
           <ManyObjects>0</ManyObjects>
           <SizeOfObject>0</SizeOfObject>
           <BreakByAccess>0</BreakByAccess>
           <BreakIfRCount>1</BreakIfRCount>
-          <Filename>../Core/Src/main.c</Filename>
+          <Filename>..\DriverInterface\ESP32_WROOM_32D.c</Filename>
           <ExecCommand></ExecCommand>
-          <Expression>\\mini7_V2\../Core/Src/main.c\151</Expression>
+          <Expression>\\mini7_V2\../DriverInterface/ESP32_WROOM_32D.c\547</Expression>
         </Bp>
         <Bp>
           <Number>1</Number>
           <Type>0</Type>
-          <LineNumber>480</LineNumber>
+          <LineNumber>167</LineNumber>
           <EnabledFlag>1</EnabledFlag>
-          <Address>0</Address>
+          <Address>134341504</Address>
           <ByteObject>0</ByteObject>
           <HtxType>0</HtxType>
           <ManyObjects>0</ManyObjects>
           <SizeOfObject>0</SizeOfObject>
           <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>0</BreakIfRCount>
-          <Filename>..\DriverInterface\state_mini.c</Filename>
+          <BreakIfRCount>1</BreakIfRCount>
+          <Filename>..\DriverInterface\van_BSP_Scanner.c</Filename>
           <ExecCommand></ExecCommand>
-          <Expression></Expression>
+          <Expression>\\mini7_V2\../DriverInterface/van_BSP_Scanner.c\167</Expression>
         </Bp>
         <Bp>
           <Number>2</Number>
           <Type>0</Type>
-          <LineNumber>482</LineNumber>
+          <LineNumber>151</LineNumber>
           <EnabledFlag>1</EnabledFlag>
-          <Address>0</Address>
+          <Address>134336890</Address>
           <ByteObject>0</ByteObject>
           <HtxType>0</HtxType>
           <ManyObjects>0</ManyObjects>
           <SizeOfObject>0</SizeOfObject>
           <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>0</BreakIfRCount>
-          <Filename>..\DriverInterface\state_mini.c</Filename>
+          <BreakIfRCount>1</BreakIfRCount>
+          <Filename>../Core/Src/main.c</Filename>
           <ExecCommand></ExecCommand>
-          <Expression></Expression>
+          <Expression>\\mini7_V2\../Core/Src/main.c\151</Expression>
         </Bp>
         <Bp>
           <Number>3</Number>
           <Type>0</Type>
-          <LineNumber>724</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>
-        <Bp>
-          <Number>4</Number>
-          <Type>0</Type>
           <LineNumber>233</LineNumber>
           <EnabledFlag>1</EnabledFlag>
           <Address>0</Address>
@@ -229,38 +213,6 @@
           <ExecCommand></ExecCommand>
           <Expression></Expression>
         </Bp>
-        <Bp>
-          <Number>5</Number>
-          <Type>0</Type>
-          <LineNumber>547</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>
-        <Bp>
-          <Number>6</Number>
-          <Type>0</Type>
-          <LineNumber>167</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\van_BSP_Scanner.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression></Expression>
-        </Bp>
       </Breakpoint>
       <WatchWindow1>
         <Ww>
@@ -517,7 +469,7 @@
           <Type>0</Type>
           <LineNumber>547</LineNumber>
           <EnabledFlag>1</EnabledFlag>
-          <Address>134255478</Address>
+          <Address>134321174</Address>
           <ByteObject>0</ByteObject>
           <HtxType>0</HtxType>
           <ManyObjects>0</ManyObjects>
@@ -533,7 +485,7 @@
           <Type>0</Type>
           <LineNumber>167</LineNumber>
           <EnabledFlag>1</EnabledFlag>
-          <Address>134275804</Address>
+          <Address>134341504</Address>
           <ByteObject>0</ByteObject>
           <HtxType>0</HtxType>
           <ManyObjects>0</ManyObjects>
@@ -547,6 +499,22 @@
         <Bp>
           <Number>2</Number>
           <Type>0</Type>
+          <LineNumber>151</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>../Core/Src/main.c</Filename>
+          <ExecCommand></ExecCommand>
+          <Expression></Expression>
+        </Bp>
+        <Bp>
+          <Number>3</Number>
+          <Type>0</Type>
           <LineNumber>233</LineNumber>
           <EnabledFlag>1</EnabledFlag>
           <Address>0</Address>
@@ -634,6 +602,11 @@
           <WinNumber>2</WinNumber>
           <ItemText>g_uart2_rx_buf</ItemText>
         </Ww>
+        <Ww>
+          <count>4</count>
+          <WinNumber>2</WinNumber>
+          <ItemText>sysinf</ItemText>
+        </Ww>
       </WatchWindow2>
       <MemoryWindow1>
         <Mm>
@@ -685,16 +658,6 @@
       <pszMrulep></pszMrulep>
       <pSingCmdsp></pSingCmdsp>
       <pMultCmdsp></pMultCmdsp>
-      <SystemViewers>
-        <Entry>
-          <Name>System Viewer\GPIOA</Name>
-          <WinId>35904</WinId>
-        </Entry>
-        <Entry>
-          <Name>System Viewer\GPIOC</Name>
-          <WinId>35905</WinId>
-        </Entry>
-      </SystemViewers>
       <DebugDescription>
         <Enable>1</Enable>
         <EnableFlashSeq>1</EnableFlashSeq>

MDK-ARM/mini7_V2.uvprojx

@@ -70,9 +70,9 @@
             <nStopU2X>0</nStopU2X>
           </BeforeCompile>
           <BeforeMake>
-            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg1>1</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
+            <UserProg1Name>.\build_get_git.bat</UserProg1Name>
             <UserProg2Name></UserProg2Name>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>