liyi hace 9 meses
padre
commit
3f105abeeb

+ 1 - 1
f427/applications/main.c

@@ -121,7 +121,7 @@ uint8_t flah_status = 1;
 
 void flash_clear()
 {
-	gpio_set(LEDR_GPIO,0);
+	gpio_set(LEDR_GPIO,1);
 }
 
 

+ 1 - 2
f427/applications/packages/mongoose-v6.7/mongoose.c

@@ -3611,6 +3611,7 @@ void mg_mgr_handle_conn(struct mg_connection *nc, int fd_flags, double now) {
     DBG(("%p after fd=%d nc_flags=%lu rmbl=%d smbl=%d", nc, nc->sock, nc->flags,
          (int) nc->recv_mbuf.len, (int) nc->send_mbuf.len));
   }
+
 }
 
 #if MG_ENABLE_BROADCAST
@@ -3738,7 +3739,6 @@ time_t mg_socket_if_poll(struct mg_iface *iface, int timeout_ms) {
       num_timers++;
     }
   }
-
   /*
    * If there is a timer to be fired earlier than the requested timeout,
    * adjust the timeout.
@@ -3789,7 +3789,6 @@ time_t mg_socket_if_poll(struct mg_iface *iface, int timeout_ms) {
     tmp = nc->next;
     mg_mgr_handle_conn(nc, fd_flags, now);
   }
-
   for (nc = mgr->active_connections; nc != NULL; nc = tmp) {
     tmp = nc->next;
     if ((nc->flags & MG_F_CLOSE_IMMEDIATELY) ||

+ 2 - 2
f427/applications/rtconfig.h

@@ -204,9 +204,9 @@
 #define RT_LWIP_TCP_WND 8196
 #define RT_LWIP_TCPTHREAD_PRIORITY 10
 #define RT_LWIP_TCPTHREAD_MBOX_SIZE 8
-#define RT_LWIP_TCPTHREAD_STACKSIZE 4096
+#define RT_LWIP_TCPTHREAD_STACKSIZE  2048                 
 #define RT_LWIP_ETHTHREAD_PRIORITY 12
-#define RT_LWIP_ETHTHREAD_STACKSIZE 4096
+#define RT_LWIP_ETHTHREAD_STACKSIZE  2048            
 #define RT_LWIP_ETHTHREAD_MBOX_SIZE 8
 #define RT_LWIP_REASSEMBLY_FRAG
 #define LWIP_NETIF_STATUS_CALLBACK 1

+ 1 - 1
f427/applications/ui/led.c

@@ -106,7 +106,7 @@ int led_init(void)
         gpio_init(h->data[i].io, GPIO_OUT, led_info[i].off_level);
     }
     h->mode = -1;
-    
+    gpio_set(LEDR_GPIO,1);
     //led_set(LED_MODE_UPGRADING);
     
     return 0;

+ 1 - 0
f427/applications/ui/menu.c

@@ -985,6 +985,7 @@ int menu_init(void)
     }
    key_init();
    led_init();
+		
 	 //led_set(0);
    beep_init();
    lcd_init(LCD_WIDTH,LCD_HEIGHT, misc->rotate);

+ 1 - 1
f427/applications/wanning.h

@@ -4,7 +4,7 @@
 
 #include "stdint.h"
 
-#define MAX_WANIING_LENTH   20
+#define MAX_WANIING_LENTH   10
 
 
 

+ 3 - 3
f427/applications/web.c

@@ -761,7 +761,7 @@ static int ws_handle(web_handle_t *h, pkt_hdr_t *hdr, mg_conn_t *c)
             }
             else {
                 send_powerc(h, c, hdr->addr);
-								time_t t=time(NULL);
+								//time_t t=time(NULL);
 								//LOGD("_____ send_powerc   time=%ld\n",t);
             }
         }
@@ -771,7 +771,7 @@ static int ws_handle(web_handle_t *h, pkt_hdr_t *hdr, mg_conn_t *c)
         {
             
             send_powert(h, c, hdr->addr);
-						time_t t=time(NULL);
+						//time_t t=time(NULL);
 						//LOGD("xxxxxxx send_powert   time=%ld\n",t);
         }
         break;
@@ -935,7 +935,7 @@ static void web_thread(void *arg)
     mg_log_set(MG_LL_ERROR);
     mg_mgr_init(&h->mgr);
 
-    //mg_timer_add(&h->mgr, TIMER_INTERVAL, MG_TIMER_REPEAT, timer_fn, h);
+    mg_timer_add(&h->mgr, TIMER_INTERVAL, MG_TIMER_REPEAT, timer_fn, h);
     if (mg_http_listen(&h->mgr, http_addr, http_fn, NULL) == NULL) {
         MG_ERROR(("cannot listen on %s\n", http_addr));
     }

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 221 - 185
f427/project/all.uvmpw.uvgui.Gowon


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 66561 - 44885
f427/project/app/JLinkLog.txt


+ 4 - 3
f427/project/app/Listings/context_rvds.lst

@@ -370,9 +370,10 @@ ARM Macro Assembler    Page 6
               FFFF0000 
               E000ED08 
 Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M4.fp.sp --apcs=
-interwork --depend=.\build\context_rvds.d -o.\build\context_rvds.o --predefine=
-"__UVISION_VERSION SETA 536" --predefine="STM32F427xx SETA 1" --list=.\listings
-\context_rvds.lst ..\..\rt-thread\libcpu\arm\cortex-m4\context_rvds.S
+interwork --depend=.\build\context_rvds.d -o.\build\context_rvds.o -ID:\Keil_v5
+\pack\GigaDevice\GD32F4xx_DFP\3.3.0\Device\F4XX\Include --predefine="__UVISION_
+VERSION SETA 536" --predefine="GD32F427 SETA 1" --list=.\listings\context_rvds.
+lst ..\..\rt-thread\libcpu\arm\cortex-m4\context_rvds.S
 
 
 

+ 4 - 3
f427/project/app/Listings/startup_stm32f427xx.lst

@@ -873,9 +873,10 @@ ARM Macro Assembler    Page 14
               00000000 
 Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M4.fp.sp --apcs=
 interwork --depend=.\build\startup_stm32f427xx.d -o.\build\startup_stm32f427xx.
-o --predefine="__UVISION_VERSION SETA 536" --predefine="STM32F427xx SETA 1" --l
-ist=.\listings\startup_stm32f427xx.lst ..\..\drivers\libraries\CMSIS\Device\ST\
-STM32F4xx\Source\startup_stm32f427xx.s
+o -ID:\Keil_v5\pack\GigaDevice\GD32F4xx_DFP\3.3.0\Device\F4XX\Include --predefi
+ne="__UVISION_VERSION SETA 536" --predefine="GD32F427 SETA 1" --list=.\listings
+\startup_stm32f427xx.lst ..\..\drivers\libraries\CMSIS\Device\ST\STM32F4xx\Sour
+ce\startup_stm32f427xx.s
 
 
 

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 397 - 181
f427/project/app/app.uvguix.Gowon


+ 70 - 43
f427/project/app/app.uvoptx

@@ -77,7 +77,7 @@
         <tvExpOptDlg>0</tvExpOptDlg>
         <IsCurrentTarget>1</IsCurrentTarget>
       </OPTFL>
-      <CpuCode>18</CpuCode>
+      <CpuCode>255</CpuCode>
       <DebugOpt>
         <uSim>0</uSim>
         <uTrg>1</uTrg>
@@ -119,17 +119,13 @@
       <TargetDriverDllRegistry>
         <SetRegEntry>
           <Number>0</Number>
-          <Key>DLGUARM</Key>
+          <Key>UL2CM3</Key>
+          <Name>UL2CM3(-S0 -C0 -P0 )  -FN1 -FC1000 -FD20000000 -FF0GD32F4xx_1MB -FL0100000 -FS08000000 -FP0($$Device:GD32F427ZG$Flash\GD32F4xx_1MB.FLM)</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
           <Key>JL2CM3</Key>
-          <Name>-U69545260 -O70 -S1 -ZTIFSpeedSel10000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8001 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F4xx_1024.FLM -FS08000000 -FL0100000 -FP0($$Device:STM32F427ZGTx$CMSIS\Flash\STM32F4xx_1024.FLM)</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>UL2CM3</Key>
-          <Name>UL2CM3(-S0 -C0 -P0 )  -FN1 -FC1000 -FD20000000 -FF0STM32F4xx_1024 -FL0100000 -FS08000000 -FP0($$Device:STM32F427ZGTx$CMSIS\Flash\STM32F4xx_1024.FLM)</Name>
+          <Name>-U69545264 -O70 -S1 -ZTIFSpeedSel10000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8001 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC1000 -FN1 -FF0GD32F4xx_1MB.FLM -FS08000000 -FL0100000 -FP0($$Device:GD32F427ZG$Flash\GD32F4xx_1MB.FLM)</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -147,30 +143,68 @@
           <Name></Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
-      <Breakpoint>
-        <Bp>
-          <Number>0</Number>
-          <Type>0</Type>
-          <LineNumber>314</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>134589158</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>1</BreakIfRCount>
-          <Filename>&lt;1&gt;..\..\applications\sensor.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression>\\app\../../applications/sensor.c\314</Expression>
-        </Bp>
-      </Breakpoint>
+      <Breakpoint/>
       <WatchWindow1>
         <Ww>
           <count>0</count>
           <WinNumber>1</WinNumber>
           <ItemText>new_node-&gt;data[0]</ItemText>
         </Ww>
+        <Ww>
+          <count>1</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>pwrHandle.pbrd[1]-&gt;pch[1].status</ItemText>
+        </Ww>
+        <Ww>
+          <count>2</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>uart_obj[0].serial.config.rx_bufsz</ItemText>
+        </Ww>
+        <Ww>
+          <count>3</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>serial</ItemText>
+        </Ww>
+        <Ww>
+          <count>4</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>pbrd-&gt;pch[1]</ItemText>
+        </Ww>
+        <Ww>
+          <count>5</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>pch-&gt;thr.c_upper</ItemText>
+        </Ww>
+        <Ww>
+          <count>6</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>tmp</ItemText>
+        </Ww>
+        <Ww>
+          <count>7</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>info</ItemText>
+        </Ww>
+        <Ww>
+          <count>8</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>data_buf</ItemText>
+        </Ww>
+        <Ww>
+          <count>9</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>all-&gt;pch[1+1].status</ItemText>
+        </Ww>
+        <Ww>
+          <count>10</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>tmp</ItemText>
+        </Ww>
+        <Ww>
+          <count>11</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>c</ItemText>
+        </Ww>
       </WatchWindow1>
       <Tracepoint>
         <THDelay>0</THDelay>
@@ -180,7 +214,7 @@
         <periodic>1</periodic>
         <aLwin>1</aLwin>
         <aCover>0</aCover>
-        <aSer1>1</aSer1>
+        <aSer1>0</aSer1>
         <aSer2>0</aSer2>
         <aPa>0</aPa>
         <viewmode>1</viewmode>
@@ -214,13 +248,6 @@
       <pszMrulep></pszMrulep>
       <pSingCmdsp></pSingCmdsp>
       <pMultCmdsp></pMultCmdsp>
-      <DebugDescription>
-        <Enable>1</Enable>
-        <EnableFlashSeq>1</EnableFlashSeq>
-        <EnableLog>0</EnableLog>
-        <Protocol>2</Protocol>
-        <DbgClock>10000000</DbgClock>
-      </DebugDescription>
     </TargetOption>
   </Target>
 
@@ -686,7 +713,7 @@
 
   <Group>
     <GroupName>packages/mb</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -857,7 +884,7 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\applications\packages\mongoose-v6.7\mongoose.c</PathWithFileName>
+      <PathWithFileName>..\..\applications\packages\mongoose-v6.7\7.14\mongoose.c</PathWithFileName>
       <FilenameWithoutPath>mongoose.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
@@ -2822,7 +2849,7 @@
 
   <Group>
     <GroupName>drivers/drv</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -3754,7 +3781,7 @@
 
   <Group>
     <GroupName>rt-thread/comp/lwip2.1.2</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -4710,7 +4737,7 @@
 
   <Group>
     <GroupName>rt-thread/comp/drivers</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -5078,7 +5105,7 @@
 
   <Group>
     <GroupName>rt-thread/comp/sal</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -5170,7 +5197,7 @@
 
   <Group>
     <GroupName>rt-thread/comp/finsh</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -5238,7 +5265,7 @@
 
   <Group>
     <GroupName>rt-thread/comp/dfs</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -5434,7 +5461,7 @@
 
   <Group>
     <GroupName>rt-thread/comp/fal</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 10 - 10
f427/project/app/app.uvprojx


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 11 - 11
f427/project/boot/boot.uvguix.Gowon