Explorar o código

解决潜在电机复位异常问题
版本V7.4.0.12

yidongFan hai 4 semanas
pai
achega
a395fb9a4e

+ 1 - 1
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  11	//软件版本号
+#define SOFT_VERSION_4  12	//软件版本号
 
 
 

+ 7 - 7
DriverInterface/ESP32_WROOM_32D.c

@@ -542,13 +542,13 @@ void WIFI_recv_deal(void)
 			WriteComm2((char *)wifi_tx_buf, wifi_tx_len+1);
             wifi_ack_delay = 3000;
 		}
-		 else if(NULL != find_str_loop(g_wifi_rx_buf, WIFI_RX_BUF_SIZE ,&g_wifi_rx_head, g_wifi_rx_last, ">"))
-		{
-             wifi_receive_clear();
-		    Van_Device_Printf(VAN_LOG_WIFI,"\n--> > W %d", wifi_tx_len); 
-			WriteComm2((char *)wifi_tx_buf, wifi_tx_len+1);
-            wifi_ack_delay = 3000;
-		}
+		//  else if(NULL != find_str_loop(g_wifi_rx_buf, WIFI_RX_BUF_SIZE ,&g_wifi_rx_head, g_wifi_rx_last, ">"))
+		// {
+        //      wifi_receive_clear();
+		//     Van_Device_Printf(VAN_LOG_WIFI,"\n--> > W %d", wifi_tx_len); 
+		// 	WriteComm2((char *)wifi_tx_buf, wifi_tx_len+1);
+        //     wifi_ack_delay = 3000;
+		// }
 
 		if(NULL != find_str_loop(g_wifi_rx_buf, WIFI_RX_BUF_SIZE ,&g_wifi_rx_head, g_wifi_rx_last, "DISCONNECT"))
 		{

+ 1 - 1
DriverInterface/usr_motor.c

@@ -127,7 +127,7 @@ uint32_t Read_key(void) {
 
 
 uint32_t TIMER_GetCounter(void) {
-  return htim3.Instance->CNT;
+  return htim4.Instance->CNT;
 }
 
 /**

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
MDK-ARM/mini7_V2.uvguix.Administrator


+ 61 - 8
MDK-ARM/mini7_V2.uvoptx

@@ -181,6 +181,38 @@
           <ExecCommand></ExecCommand>
           <Expression>\\mini7_V2\../DriverInterface/van_BSP_Scanner.c\167</Expression>
         </Bp>
+        <Bp>
+          <Number>2</Number>
+          <Type>0</Type>
+          <LineNumber>303</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\usr_motor.c</Filename>
+          <ExecCommand></ExecCommand>
+          <Expression></Expression>
+        </Bp>
+        <Bp>
+          <Number>3</Number>
+          <Type>0</Type>
+          <LineNumber>510</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\usr_motor.c</Filename>
+          <ExecCommand></ExecCommand>
+          <Expression></Expression>
+        </Bp>
       </Breakpoint>
       <WatchWindow1>
         <Ww>
@@ -442,34 +474,50 @@
         <Bp>
           <Number>0</Number>
           <Type>0</Type>
-          <LineNumber>547</LineNumber>
+          <LineNumber>167</LineNumber>
           <EnabledFlag>1</EnabledFlag>
-          <Address>134255526</Address>
+          <Address>134275948</Address>
           <ByteObject>0</ByteObject>
           <HtxType>0</HtxType>
           <ManyObjects>0</ManyObjects>
           <SizeOfObject>0</SizeOfObject>
           <BreakByAccess>0</BreakByAccess>
           <BreakIfRCount>1</BreakIfRCount>
-          <Filename>..\DriverInterface\ESP32_WROOM_32D.c</Filename>
+          <Filename>..\DriverInterface\van_BSP_Scanner.c</Filename>
           <ExecCommand></ExecCommand>
-          <Expression>\\mini7_V2\../DriverInterface/ESP32_WROOM_32D.c\547</Expression>
+          <Expression>\\mini7_V2\../DriverInterface/van_BSP_Scanner.c\167</Expression>
         </Bp>
         <Bp>
           <Number>1</Number>
           <Type>0</Type>
-          <LineNumber>167</LineNumber>
+          <LineNumber>303</LineNumber>
           <EnabledFlag>1</EnabledFlag>
-          <Address>134276032</Address>
+          <Address>134247580</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\usr_motor.c</Filename>
           <ExecCommand></ExecCommand>
-          <Expression>\\mini7_V2\../DriverInterface/van_BSP_Scanner.c\167</Expression>
+          <Expression>\\mini7_V2\../DriverInterface/usr_motor.c\303</Expression>
+        </Bp>
+        <Bp>
+          <Number>2</Number>
+          <Type>0</Type>
+          <LineNumber>510</LineNumber>
+          <EnabledFlag>1</EnabledFlag>
+          <Address>134246142</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>
+          <ExecCommand></ExecCommand>
+          <Expression>\\mini7_V2\../DriverInterface/usr_motor.c\510</Expression>
         </Bp>
       </Breakpoint>
       <WatchWindow1>
@@ -523,6 +571,11 @@
           <WinNumber>1</WinNumber>
           <ItemText>wifi_set_ssid</ItemText>
         </Ww>
+        <Ww>
+          <count>10</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>timerBuf</ItemText>
+        </Ww>
       </WatchWindow1>
       <WatchWindow2>
         <Ww>

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio