Explorar el Código

fix web for bt6702/bt6706

balbekova hace 5 años
padre
commit
71fca495c0
Se han modificado 2 ficheros con 11 adiciones y 2 borrados
  1. 7 1
      modules/HTTP_Server/http_server.c
  2. 4 1
      modules/HTTP_Server/web_params_api.c

+ 7 - 1
modules/HTTP_Server/http_server.c

@@ -150,8 +150,12 @@ static void close_conn(struct tcp_pcb *pcb, struct http_state *hs)
   tcp_arg(pcb, NULL);
   tcp_sent(pcb, NULL);
   tcp_recv(pcb, NULL);
+  tcp_poll(pcb, NULL, 0);
   mem_free(hs);
-  tcp_close(pcb);
+  err_t err = tcp_close(pcb);
+  DBG printf("%p close = %d (pcb: %d, pbuf_pool: %d)\r\n", pcb, err,
+  lwip_stats.memp[MEMP_TCP_PCB]->used,
+  lwip_stats.memp[MEMP_PBUF_POOL]->used);
 }
 
 /**
@@ -896,6 +900,7 @@ void HTTP_SetSettings(char *buf, uint16_t lenBuf)
       memset(str, 0, len);
   }
   
+#ifdef HARDWARE_BT6708
   GetParamValue(buf, "ups_cell_min=", value, &valueLen);
   SetUPSVoltCellMinStr(value);
   memset(value, 0, len);
@@ -903,6 +908,7 @@ void HTTP_SetSettings(char *buf, uint16_t lenBuf)
   GetParamValue(buf, "ups_cell_max=", value, &valueLen);
   SetUPSVoltCellMaxStr(value);
   memset(value, 0, len);
+#endif
 
   GetParamValue(buf, "mainvolt_high=", value, &valueLen);
   SetVACAlarmHighRangeStr(value);

+ 4 - 1
modules/HTTP_Server/web_params_api.c

@@ -262,11 +262,14 @@ void HTTP_GetSettings(char *buf)
 	    strncat(buf, str, len);
   }
 
+  strcat(buf, "\"");
+  strncat(buf, str, len);
+
 #endif
 
   /* Параметры даты и времени */
   GetDateStr(str, &len);
-  strcat(buf, "\",\"date\":\"");
+  strcat(buf, ",\"date\":\"");
   strncat(buf, str, len);
 
   GetTimeStr(str, &len);