备份

Core/Src/freertos.c

@@ -165,12 +165,13 @@ void start_tcp_task(void const *argument)
   MX_LWIP_Init();
   /* USER CODE BEGIN start_tcp_task */
   tcp_echo_init();
+  uart_lcd_draw_ipaddr(); // 初始化显示IP地址信息
   /* Infinite loop */
   for (;;)
   {
-    uart_lcd_draw_ipaddr(); // 初始化显示IP地址信息
 
-    osThreadTerminate(NULL);
+    vTaskDelay(1000);
+    // osThreadTerminate(NULL);
   }
   /* USER CODE END start_tcp_task */
 }

LWIP/App/lwip.c

@@ -216,4 +216,3 @@ u32_t sio_tryread(sio_fd_t fd, u8_t *data, u32_t len)
   return recved_bytes;
 }
 #endif /* MDK ARM Compiler */
-

MDK-ARM/semi-finished_product_testing.uvoptx

@@ -148,7 +148,24 @@
           <Name>-U090F00028316303030303032 -O2254 -SF1000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8004 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC800 -FN1 -FF0STM32F4xx_1024.FLM -FS08000000 -FL0100000 -FP0($$Device:STM32F407VGTx$CMSIS\Flash\STM32F4xx_1024.FLM)</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
-      <Breakpoint/>
+      <Breakpoint>
+        <Bp>
+          <Number>0</Number>
+          <Type>0</Type>
+          <LineNumber>52</LineNumber>
+          <EnabledFlag>1</EnabledFlag>
+          <Address>134250286</Address>
+          <ByteObject>0</ByteObject>
+          <HtxType>0</HtxType>
+          <ManyObjects>0</ManyObjects>
+          <SizeOfObject>0</SizeOfObject>
+          <BreakByAccess>0</BreakByAccess>
+          <BreakIfRCount>1</BreakIfRCount>
+          <Filename>..\User\application\src\tcpserverc.c</Filename>
+          <ExecCommand></ExecCommand>
+          <Expression>\\semi_finished_product_testing\../User/application/src/tcpserverc.c\52</Expression>
+        </Bp>
+      </Breakpoint>
       <WatchWindow1>
         <Ww>
           <count>0</count>
@@ -330,6 +347,31 @@
           <WinNumber>1</WinNumber>
           <ItemText>tcp_rx_data</ItemText>
         </Ww>
+        <Ww>
+          <count>36</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>server_pcb_hart1</ItemText>
+        </Ww>
+        <Ww>
+          <count>37</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>LAN8742</ItemText>
+        </Ww>
+        <Ww>
+          <count>38</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>server_pcb_ble1</ItemText>
+        </Ww>
+        <Ww>
+          <count>39</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>server_pcb_ble2</ItemText>
+        </Ww>
+        <Ww>
+          <count>40</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>tcp_echo_flags_hart1</ItemText>
+        </Ww>
       </WatchWindow1>
       <MemoryWindow1>
         <Mm>
@@ -421,7 +463,7 @@
       <GroupNumber>2</GroupNumber>
       <FileNumber>2</FileNumber>
       <FileType>1</FileType>
-      <tvExp>1</tvExp>
+      <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
       <PathWithFileName>../Core/Src/main.c</PathWithFileName>
@@ -973,7 +1015,7 @@
 
   <Group>
     <GroupName>Middlewares/LwIP</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>

Middlewares/Third_Party/LwIP/src/include/lwip/opt.h

@@ -1305,7 +1305,6 @@
 #define TCP_CALCULATE_EFF_SEND_MSS 1
 #endif
 
-
 /**
  * TCP_SND_BUF: TCP sender buffer space (bytes).
  * To achieve good performance, this should be at least 2 * TCP_MSS.

User/application/src/tcpserverc.c

@@ -40,7 +40,7 @@ static err_t tcpecho_recv_hart1(void *arg, struct tcp_pcb *tpcb, struct pbuf *p,
     if (p != NULL)
     {
         /* 更新窗口*/
-        tcp_echo_flags_hart1 = 1;
+
         tcp_recved(tpcb, p->tot_len); // 读取数据的控制块   得到所有数据的长度
         server_pcb_hart1 = tpcb;      // 直接赋值
         memcpy(hart1_uart5.tx_data, (int *)p->payload, p->tot_len);
@@ -54,6 +54,7 @@ static err_t tcpecho_recv_hart1(void *arg, struct tcp_pcb *tpcb, struct pbuf *p,
     else if (err == ERR_OK) // 检测到对方主动关闭连接时，也会调用recv函数，此时p为空
     {
         HAL_TIM_PWM_Start(&htim3, TIM_CHANNEL_3);
+        tcp_echo_flags_hart1 = 0;
         return tcp_close(tpcb);
     }
     return ERR_OK;
@@ -64,7 +65,6 @@ static err_t tcpecho_recv_hart2(void *arg, struct tcp_pcb *tpcb, struct pbuf *p,
     if (p != NULL)
     {
         /* 更新窗口*/
-        tcp_echo_flags_hart2 = 1;
         tcp_recved(tpcb, p->tot_len); // 读取数据的控制块   得到所有数据的长度
         server_pcb_hart2 = tpcb;      // 直接赋值
         memcpy(hart2_uart2.tx_data, (int *)p->payload, p->tot_len);
@@ -79,6 +79,7 @@ static err_t tcpecho_recv_hart2(void *arg, struct tcp_pcb *tpcb, struct pbuf *p,
     else if (err == ERR_OK) // 检测到对方主动关闭连接时，也会调用recv函数，此时p为空
     {
         HAL_TIM_PWM_Start(&htim3, TIM_CHANNEL_3);
+        tcp_echo_flags_hart2 = 0;
         return tcp_close(tpcb);
     }
     return ERR_OK;
@@ -114,7 +115,6 @@ static err_t tcpecho_recv_ble2(void *arg, struct tcp_pcb *tpcb, struct pbuf *p,
     if (p != NULL)
     {
         /* 更新窗口*/
-        tcp_echo_flags_ble2 = 1;
         tcp_recved(tpcb, p->tot_len); // 读取数据的控制块   得到所有数据的长度
         server_pcb_ble2 = tpcb;       // 直接赋值
         memcpy(ble2_uart3.tx_data, (int *)p->payload, p->tot_len);
@@ -127,6 +127,7 @@ static err_t tcpecho_recv_ble2(void *arg, struct tcp_pcb *tpcb, struct pbuf *p,
     else if (err == ERR_OK) // 检测到对方主动关闭连接时，也会调用recv函数，此时p为空
     {
         HAL_TIM_PWM_Start(&htim3, TIM_CHANNEL_3);
+        tcp_echo_flags_ble2 = 0;
         return tcp_close(tpcb);
     }
     return ERR_OK;
@@ -143,7 +144,6 @@ static err_t tcpecho_recv_control(void *arg, struct tcp_pcb *tpcb, struct pbuf *
     {
         HAL_GPIO_TogglePin(LED3_G_GPIO_Port, LED3_G_Pin);
         /* 更新窗口*/
-        tcp_echo_flags_control = 1;
         tcp_recved(tpcb, p->tot_len); // 读取数据的控制块   得到所有数据的长度
         server_pcb_control = tpcb;    // 直接赋值
         memcpy(tcp_rx_data, (int *)p->payload, p->tot_len);
@@ -228,6 +228,7 @@ static err_t tcpecho_recv_control(void *arg, struct tcp_pcb *tpcb, struct pbuf *
     else if (err == ERR_OK) // 检测到对方主动关闭连接时，也会调用recv函数，此时p为空
     {
         HAL_TIM_PWM_Start(&htim3, TIM_CHANNEL_3);
+        tcp_echo_flags_control = 2;
         return tcp_close(tpcb);
     }
 
@@ -237,6 +238,7 @@ static err_t tcpecho_accept_hart1(void *arg, struct tcp_pcb *newpcb, err_t err)
                                                                                 // 形参的数量和类型必须一致
 {
     tcp_recv(newpcb, tcpecho_recv_hart1); // 当收到数据时，回调用户自己写的tcpecho_recv
+    tcp_echo_flags_hart1 = 1;
     HAL_TIM_PWM_Stop(&htim3, TIM_CHANNEL_3); // 停止蜂鸣器PWM输出，用于关闭蜂鸣器发声
     return ERR_OK;
 }
@@ -244,6 +246,7 @@ static err_t tcpecho_accept_hart1(void *arg, struct tcp_pcb *newpcb, err_t err)
 static err_t tcpecho_accept_hart2(void *arg, struct tcp_pcb *newpcb, err_t err) // 由于这个函数是*tcp_accept_fn类型的
 {
     tcp_recv(newpcb, tcpecho_recv_hart2); // 当收到数据时，回调用户自己写的tcpecho_recv
+    tcp_echo_flags_hart2 = 1;
     HAL_TIM_PWM_Stop(&htim3, TIM_CHANNEL_3); // 停止蜂鸣器PWM输出，用于关闭蜂鸣器发声
     return ERR_OK;
 }
@@ -258,12 +261,14 @@ static err_t tcpecho_accept_ble1(void *arg, struct tcp_pcb *newpcb, err_t err) /
 static err_t tcpecho_accept_ble2(void *arg, struct tcp_pcb *newpcb, err_t err) // 由于这个函数是*tcp_accept_fn类型的
 {
     tcp_recv(newpcb, tcpecho_recv_ble2); // 当收到数据时，回调用户自己写的tcpecho_recv
+    tcp_echo_flags_ble2 = 1;
     HAL_TIM_PWM_Stop(&htim3, TIM_CHANNEL_3); // 停止蜂鸣器PWM输出，用于关闭蜂鸣器发声
     return ERR_OK;
 }
 static err_t tcpecho_accept_control(void *arg, struct tcp_pcb *newpcb, err_t err) // 由于这个函数是*tcp_accept_fn类型的
 {
     tcp_recv(newpcb, tcpecho_recv_control); // 当收到数据时，回调用户自己写的tcpecho_recv
+    tcp_echo_flags_control = 1;
     HAL_TIM_PWM_Stop(&htim3, TIM_CHANNEL_3); // 停止蜂鸣器PWM输出，用于关闭蜂鸣器发声
     return ERR_OK;
 }