Merge remote-tracking branch 'origin/main' into main
This commit is contained in:
commit
4ee2c961ce
|
|
@ -1 +1 @@
|
||||||
Subproject commit a646e3ee0594ec2301e9b3fe6373ea274eb39e39
|
Subproject commit 03ff681a61cb03a43c6f008601a6e6090e9df2bd
|
||||||
|
|
@ -516,9 +516,9 @@ static HTTP_IO_RESULT HTTPPostSystemSettings(httpd_req_t *req, char *PostData)
|
||||||
{
|
{
|
||||||
if (!strcmp(tmp, (const char*) "1"))
|
if (!strcmp(tmp, (const char*) "1"))
|
||||||
{
|
{
|
||||||
ModemSendAT("AT\r");
|
|
||||||
return HTTP_IO_DONE_NOREFRESH;
|
return HTTP_IO_DONE_NOREFRESH;
|
||||||
}
|
}
|
||||||
|
#if CONFIG_WEBGUIAPP_GPRS_ENABLE
|
||||||
else if (!strcmp(tmp, (const char*) "2"))
|
else if (!strcmp(tmp, (const char*) "2"))
|
||||||
{
|
{
|
||||||
ModemSendAT("AT+CCLK?\r");
|
ModemSendAT("AT+CCLK?\r");
|
||||||
|
|
@ -534,6 +534,7 @@ static HTTP_IO_RESULT HTTPPostSystemSettings(httpd_req_t *req, char *PostData)
|
||||||
ModemSendAT("ATH\r");
|
ModemSendAT("ATH\r");
|
||||||
return HTTP_IO_DONE_NOREFRESH;
|
return HTTP_IO_DONE_NOREFRESH;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
else if (!strcmp(tmp, (const char*) "5"))
|
else if (!strcmp(tmp, (const char*) "5"))
|
||||||
{
|
{
|
||||||
return HTTP_IO_DONE_NOREFRESH;
|
return HTTP_IO_DONE_NOREFRESH;
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@
|
||||||
#include "esp_wifi.h"
|
#include "esp_wifi.h"
|
||||||
#include "NetTransport.h"
|
#include "NetTransport.h"
|
||||||
#include "esp_ota_ops.h"
|
#include "esp_ota_ops.h"
|
||||||
#include "ROMFS.h"
|
#include "romfs.h"
|
||||||
#include "esp_idf_version.h"
|
#include "esp_idf_version.h"
|
||||||
#include "jWrite.h"
|
#include "jWrite.h"
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user