From 0142db88598ffac4f35c59c7e207c0e1f3c42b51 Mon Sep 17 00:00:00 2001 From: Bogdan Pilyugin Date: Mon, 20 Feb 2023 15:32:00 +0200 Subject: [PATCH 1/9] added default GPIOs separately for esp32 and esp32S3 --- Kconfig | 28 +++++++++++++++++++++------- extlibs/libespfs | 2 +- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/Kconfig b/Kconfig index 9baaa32..78520c6 100644 --- a/Kconfig +++ b/Kconfig @@ -101,7 +101,18 @@ menu "WebGUIApp" Set enabled SPI bus if WEBGUIAPP_SPI_ENABLE - + + config GPIO_RANGE_MIN + int + default 0 + + config GPIO_RANGE_MAX + int + default 36 if IDF_TARGET_ESP32 + default 46 if IDF_TARGET_ESP32S2 + default 19 if IDF_TARGET_ESP32C3 + default 48 if IDF_TARGET_ESP32S3 + config SPI_HOST int "SPI Host Number" range 0 2 @@ -111,22 +122,25 @@ menu "WebGUIApp" config SPI_SCLK_GPIO int "SPI SCLK GPIO number" - range 0 33 - default 18 + range GPIO_RANGE_MIN GPIO_RANGE_MAX + default 18 if IDF_TARGET_ESP32 + default 36 if IDF_TARGET_ESP32S3 help Set the GPIO number used by SPI SCLK. config SPI_MOSI_GPIO int "SPI MOSI GPIO number" - range 0 33 - default 23 + range GPIO_RANGE_MIN GPIO_RANGE_MAX + default 23 if IDF_TARGET_ESP32 + default 35 if IDF_TARGET_ESP32S3 help Set the GPIO number used by SPI MOSI. config SPI_MISO_GPIO int "SPI MISO GPIO number" - range 0 33 - default 19 + range GPIO_RANGE_MIN GPIO_RANGE_MAX + default 19 if IDF_TARGET_ESP32 + default 37 if IDF_TARGET_ESP32S3 help Set the GPIO number used by SPI MISO. diff --git a/extlibs/libespfs b/extlibs/libespfs index a646e3e..03ff681 160000 --- a/extlibs/libespfs +++ b/extlibs/libespfs @@ -1 +1 @@ -Subproject commit a646e3ee0594ec2301e9b3fe6373ea274eb39e39 +Subproject commit 03ff681a61cb03a43c6f008601a6e6090e9df2bd From e4d1a8c953c516a41d550716bc7e267d2e571c63 Mon Sep 17 00:00:00 2001 From: Bogdan Pilyugin Date: Mon, 20 Feb 2023 16:33:43 +0200 Subject: [PATCH 2/9] i2c GPIOs default configuration separately for esp32 and esp32S3 --- Kconfig | 46 +++++++++++++++++++++------------------------- 1 file changed, 21 insertions(+), 25 deletions(-) diff --git a/Kconfig b/Kconfig index 78520c6..f3f2c7f 100644 --- a/Kconfig +++ b/Kconfig @@ -1,4 +1,18 @@ menu "WebGUIApp" + + + config GPIO_RANGE_MIN + int + default 0 + + config GPIO_RANGE_MAX + int + default 36 if IDF_TARGET_ESP32 + default 46 if IDF_TARGET_ESP32S2 + default 19 if IDF_TARGET_ESP32C3 + default 48 if IDF_TARGET_ESP32S3 + + config APP_PROJECT_VER string "Device firmware version" default "0.0.0.0000" @@ -102,16 +116,7 @@ menu "WebGUIApp" if WEBGUIAPP_SPI_ENABLE - config GPIO_RANGE_MIN - int - default 0 - - config GPIO_RANGE_MAX - int - default 36 if IDF_TARGET_ESP32 - default 46 if IDF_TARGET_ESP32S2 - default 19 if IDF_TARGET_ESP32C3 - default 48 if IDF_TARGET_ESP32S3 + config SPI_HOST int "SPI Host Number" @@ -165,13 +170,15 @@ menu "WebGUIApp" config I2C_SCL_GPIO int "I2C SCL GPIO number" - range 0 34 - default 22 + range GPIO_RANGE_MIN GPIO_RANGE_MAX + default 22 if IDF_TARGET_ESP32 + default 15 if IDF_TARGET_ESP32S3 config I2C_SDA_GPIO int "I2C SDA GPIO number" - range 0 34 - default 21 + range GPIO_RANGE_MIN GPIO_RANGE_MAX + default 21 if IDF_TARGET_ESP32 + default 16 if IDF_TARGET_ESP32S3 config I2C_CLOCK int "I2C clock" @@ -274,17 +281,6 @@ menu "WebGUIApp" config WEBGUIAPP_ETHERNET_DHCP_DEFAULT bool "Default Ethernet DHCP client on" default n - - config GPIO_RANGE_MIN - int - default 0 - - config GPIO_RANGE_MAX - int - default 36 if IDF_TARGET_ESP32 - default 46 if IDF_TARGET_ESP32S2 - default 19 if IDF_TARGET_ESP32C3 - default 48 if IDF_TARGET_ESP32S3 config USE_INTERNAL_ETHERNET depends on IDF_TARGET_ESP32 From d06c9abfc255c2cf182be2d059614df655458a9a Mon Sep 17 00:00:00 2001 From: Bogdan Pilyugin Date: Tue, 28 Feb 2023 15:47:03 +0200 Subject: [PATCH 3/9] updated libespfs --- extlibs/libespfs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extlibs/libespfs b/extlibs/libespfs index 03ff681..a646e3e 160000 --- a/extlibs/libespfs +++ b/extlibs/libespfs @@ -1 +1 @@ -Subproject commit 03ff681a61cb03a43c6f008601a6e6090e9df2bd +Subproject commit a646e3ee0594ec2301e9b3fe6373ea274eb39e39 From 26ddfea36e458c733f74250cffe955713f3f4b54 Mon Sep 17 00:00:00 2001 From: Bogdan Pilyugin Date: Wed, 1 Mar 2023 14:25:11 +0200 Subject: [PATCH 4/9] added AT commands interface to GSM transport --- include/NetTransport.h | 2 ++ src/GSMTransport.c | 12 ++++++++++++ src/HTTPPostSystem.c | 5 ++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/include/NetTransport.h b/include/NetTransport.h index 38f4b2f..fa33f83 100644 --- a/include/NetTransport.h +++ b/include/NetTransport.h @@ -70,6 +70,8 @@ void PPPModemSoftRestart(void); void PPPModemStart(void); void PPPModemGetRSSI(void); +void ModemSendSMS(void); +void ModemSendAT(char *cmd); void MQTTRun(void); diff --git a/src/GSMTransport.c b/src/GSMTransport.c index ac9002b..3c47531 100644 --- a/src/GSMTransport.c +++ b/src/GSMTransport.c @@ -298,5 +298,17 @@ void PPPModemGetRSSI(void) ESP_LOGW(TAG, "Signal %d, ber %d", rssi, ber); } +void ModemSendAT(char *cmd) +{ + char resp[128] = {0}; + esp_modem_at(dce, cmd, resp, 5000); + ESP_LOGW(TAG, "%s", resp); +} + +void ModemSendSMS(void) +{ + +} + #endif diff --git a/src/HTTPPostSystem.c b/src/HTTPPostSystem.c index 4eadab2..28cd36b 100644 --- a/src/HTTPPostSystem.c +++ b/src/HTTPPostSystem.c @@ -484,19 +484,22 @@ static HTTP_IO_RESULT HTTPPostSystemSettings(httpd_req_t *req, char *PostData) { if (!strcmp(tmp, (const char*) "1")) { + ModemSendAT("AT\r"); return HTTP_IO_DONE_NOREFRESH; } else if (!strcmp(tmp, (const char*) "2")) { - WiFiDisconnect(); + ModemSendAT("AT+CCLK?\r"); return HTTP_IO_DONE_NOREFRESH; } else if (!strcmp(tmp, (const char*) "3")) { + ModemSendAT("ATD+79022518532;\r"); return HTTP_IO_DONE_NOREFRESH; } else if (!strcmp(tmp, (const char*) "4")) { + ModemSendAT("ATH\r"); return HTTP_IO_DONE_NOREFRESH; } else if (!strcmp(tmp, (const char*) "5")) From 9d2f6dc3b446398619bf94ca58ad7a2394eedac2 Mon Sep 17 00:00:00 2001 From: Bogdan Pilyugin Date: Wed, 1 Mar 2023 14:26:11 +0200 Subject: [PATCH 5/9] increased MQTT reconnect timeout --- src/MQTT.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/MQTT.c b/src/MQTT.c index 7fdf8fa..cf225cf 100644 --- a/src/MQTT.c +++ b/src/MQTT.c @@ -29,6 +29,8 @@ #define MQTT_MESSAGE_BUFER_LENTH 5 //size of mqtt queue #define MQTT_RECONNECT_CHANGE_ADAPTER 3 +#define MQTT_RECONNECT_TIMEOUT 40 + #if CONFIG_WEBGUIAPP_MQTT_ENABLE static SemaphoreHandle_t xSemaphoreMQTTHandle = NULL; @@ -291,6 +293,7 @@ static void start_mqtt() strcat(tmp, "-"); strcat(tmp, GetSysConf()->ID); mqtt_cfg.client_id = tmp; + mqtt_cfg.reconnect_timeout_ms = MQTT_RECONNECT_TIMEOUT * 1000; mqtt[i].is_connected = false; mqtt[i].mqtt_index = i; //mqtt_cfg.user_context = (void*) &mqtt[i]; From 8d8418c8f0bd1f58eb6410c0d7e0695b29d2c15c Mon Sep 17 00:00:00 2001 From: Bogdan Pilyugin Date: Fri, 3 Mar 2023 16:25:50 +0200 Subject: [PATCH 6/9] conditional build added for gsm AT commands debug --- src/HTTPPostSystem.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/HTTPPostSystem.c b/src/HTTPPostSystem.c index 28cd36b..c406f46 100644 --- a/src/HTTPPostSystem.c +++ b/src/HTTPPostSystem.c @@ -484,9 +484,9 @@ static HTTP_IO_RESULT HTTPPostSystemSettings(httpd_req_t *req, char *PostData) { if (!strcmp(tmp, (const char*) "1")) { - ModemSendAT("AT\r"); return HTTP_IO_DONE_NOREFRESH; } +#if CONFIG_WEBGUIAPP_GPRS_ENABLE else if (!strcmp(tmp, (const char*) "2")) { ModemSendAT("AT+CCLK?\r"); @@ -502,6 +502,7 @@ static HTTP_IO_RESULT HTTPPostSystemSettings(httpd_req_t *req, char *PostData) ModemSendAT("ATH\r"); return HTTP_IO_DONE_NOREFRESH; } +#endif else if (!strcmp(tmp, (const char*) "5")) { return HTTP_IO_DONE_NOREFRESH; From 8ef70ab87a7a9b3906a523aae36b1ad2590da998 Mon Sep 17 00:00:00 2001 From: bogd Date: Sun, 5 Mar 2023 12:59:14 +0200 Subject: [PATCH 7/9] uppercase header fixed --- extlibs/libespfs | 2 +- src/HTTPPrintSystem.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extlibs/libespfs b/extlibs/libespfs index a646e3e..03ff681 160000 --- a/extlibs/libespfs +++ b/extlibs/libespfs @@ -1 +1 @@ -Subproject commit a646e3ee0594ec2301e9b3fe6373ea274eb39e39 +Subproject commit 03ff681a61cb03a43c6f008601a6e6090e9df2bd diff --git a/src/HTTPPrintSystem.c b/src/HTTPPrintSystem.c index d62da8f..4591edc 100644 --- a/src/HTTPPrintSystem.c +++ b/src/HTTPPrintSystem.c @@ -27,7 +27,7 @@ #include "esp_wifi.h" #include "NetTransport.h" #include "esp_ota_ops.h" -#include "ROMFS.h" +#include "romfs.h" #include "esp_idf_version.h" #include "jWrite.h" From 28cdda4bc7cf63ebc0ebf50430fa3e0e2a89d2f1 Mon Sep 17 00:00:00 2001 From: Bogdan Pilyugin Date: Tue, 7 Mar 2023 14:38:56 +0200 Subject: [PATCH 8/9] lora setting from web implemented --- src/HTTPPostSystem.c | 74 +++++++++++++++++++++++++++++++------------- src/LoRaWAN.c | 10 +++--- 2 files changed, 58 insertions(+), 26 deletions(-) diff --git a/src/HTTPPostSystem.c b/src/HTTPPostSystem.c index 28cd36b..3497b4c 100644 --- a/src/HTTPPostSystem.c +++ b/src/HTTPPostSystem.c @@ -23,6 +23,7 @@ #include "HTTPServer.h" #include "LoRaWAN.h" +#include "Helpers.h" static const char *TAG = "HTTPServerPost"; @@ -97,7 +98,7 @@ static HTTP_IO_RESULT AfterPostHandler(httpd_req_t *req, const char *filename, c static HTTP_IO_RESULT HTTPPostAdaptersSettings(httpd_req_t *req, char *PostData) { - char tmp[32]; + char tmp[33]; #if CONFIG_WEBGUIAPP_ETHERNET_ENABLE bool TempIsETHEnabled = false; @@ -105,26 +106,26 @@ static HTTP_IO_RESULT HTTPPostAdaptersSettings(httpd_req_t *req, char *PostData) if (httpd_query_key_value(PostData, "ethen", tmp, sizeof(tmp)) == ESP_OK) { if (!strcmp((const char*) tmp, (const char*) "1")) - TempIsETHEnabled = true; + TempIsETHEnabled = true; } if (httpd_query_key_value(PostData, "dhcp", tmp, sizeof(tmp)) == ESP_OK) { if (!strcmp((const char*) tmp, (const char*) "1")) - TempIsETHDHCPEnabled = true; + TempIsETHDHCPEnabled = true; } if (httpd_query_key_value(PostData, "ipa", tmp, 15) == ESP_OK) - esp_netif_str_to_ip4(tmp, (esp_ip4_addr_t*) &GetSysConf()->ethSettings.IPAddr); + esp_netif_str_to_ip4(tmp, (esp_ip4_addr_t*) &GetSysConf()->ethSettings.IPAddr); if (httpd_query_key_value(PostData, "mas", tmp, 15) == ESP_OK) - esp_netif_str_to_ip4(tmp, (esp_ip4_addr_t*) &GetSysConf()->ethSettings.Mask); + esp_netif_str_to_ip4(tmp, (esp_ip4_addr_t*) &GetSysConf()->ethSettings.Mask); if (httpd_query_key_value(PostData, "gte", tmp, 15) == ESP_OK) - esp_netif_str_to_ip4(tmp, (esp_ip4_addr_t*) &GetSysConf()->ethSettings.Gateway); + esp_netif_str_to_ip4(tmp, (esp_ip4_addr_t*) &GetSysConf()->ethSettings.Gateway); if (httpd_query_key_value(PostData, "dns1", tmp, 15) == ESP_OK) - esp_netif_str_to_ip4(tmp, (esp_ip4_addr_t*) &GetSysConf()->ethSettings.DNSAddr1); + esp_netif_str_to_ip4(tmp, (esp_ip4_addr_t*) &GetSysConf()->ethSettings.DNSAddr1); if (httpd_query_key_value(PostData, "dns2", tmp, 15) == ESP_OK) - esp_netif_str_to_ip4(tmp, (esp_ip4_addr_t*) &GetSysConf()->ethSettings.DNSAddr2); + esp_netif_str_to_ip4(tmp, (esp_ip4_addr_t*) &GetSysConf()->ethSettings.DNSAddr2); if (httpd_query_key_value(PostData, "dns3", tmp, 15) == ESP_OK) - esp_netif_str_to_ip4(tmp, (esp_ip4_addr_t*) &GetSysConf()->ethSettings.DNSAddr3); + esp_netif_str_to_ip4(tmp, (esp_ip4_addr_t*) &GetSysConf()->ethSettings.DNSAddr3); #endif @@ -218,6 +219,30 @@ static HTTP_IO_RESULT HTTPPostAdaptersSettings(httpd_req_t *req, char *PostData) } #endif +#if CONFIG_WEBGUIAPP_LORAWAN_ENABLE + bool TempIsLoRaEnabled = false; + if (httpd_query_key_value(PostData, "lren", tmp, sizeof(tmp)) == ESP_OK) + { + if (!strcmp((const char*) tmp, (const char*) "1")) + TempIsLoRaEnabled = true; + } + if (httpd_query_key_value(PostData, "lrdvid", tmp, sizeof(tmp)) == ESP_OK) + { + if (strlen(tmp) == 16) + StrToBytesLen((unsigned char*) tmp, (unsigned char*) GetSysConf()->lorawanSettings.DevEui, 16); + } + if (httpd_query_key_value(PostData, "lrapid", tmp, sizeof(tmp)) == ESP_OK) + { + if (strlen(tmp) == 16) + StrToBytesLen((unsigned char*) tmp, (unsigned char*) GetSysConf()->lorawanSettings.AppEui, 16); + } + if (httpd_query_key_value(PostData, "lrapkey", tmp, sizeof(tmp)) == ESP_OK) + { + if (strlen(tmp) == 32) + StrToBytesLen((unsigned char*) tmp, (unsigned char*) GetSysConf()->lorawanSettings.AppKey, 32); + } +#endif + if (httpd_query_key_value(PostData, "wifisc", tmp, 4) == ESP_OK) { if (!strcmp(tmp, (const char*) "prs")) @@ -259,6 +284,13 @@ static HTTP_IO_RESULT HTTPPostAdaptersSettings(httpd_req_t *req, char *PostData) GetSysConf()->gsmSettings.Flags1.bIsGSMEnabled = TempIsGSMEnabled; #endif } + else if (!strcmp(tmp, (const char*) "lora")) + { +#if CONFIG_WEBGUIAPP_LORAWAN_ENABLE + GetSysConf()->lorawanSettings.Flags1.bIsLoRaWANEnabled = TempIsLoRaEnabled; +#endif + } + if (httpd_query_key_value(PostData, "apply", tmp, 5) == ESP_OK) { @@ -317,29 +349,29 @@ static HTTP_IO_RESULT HTTPPostServicesSettings(httpd_req_t *req, char *PostData) #if CONFIG_WEBGUIAPP_MQTT_CLIENTS_NUM == 2 httpd_query_key_value(PostData, "mqurl2", GetSysConf()->mqttStation[1].ServerAddr, - sizeof(GetSysConf()->mqttStation[1].ServerAddr)); + sizeof(GetSysConf()->mqttStation[1].ServerAddr)); httpd_query_key_value(PostData, "mqid2", GetSysConf()->mqttStation[1].ClientID, - sizeof(GetSysConf()->mqttStation[1].ClientID)); + sizeof(GetSysConf()->mqttStation[1].ClientID)); httpd_query_key_value(PostData, "mqsys2", GetSysConf()->mqttStation[1].SystemName, - sizeof(GetSysConf()->mqttStation[1].SystemName)); + sizeof(GetSysConf()->mqttStation[1].SystemName)); httpd_query_key_value(PostData, "mqgrp2", GetSysConf()->mqttStation[1].GroupName, - sizeof(GetSysConf()->mqttStation[1].GroupName)); + sizeof(GetSysConf()->mqttStation[1].GroupName)); httpd_query_key_value(PostData, "mqname2", GetSysConf()->mqttStation[1].UserName, - sizeof(GetSysConf()->mqttStation[1].UserName)); + sizeof(GetSysConf()->mqttStation[1].UserName)); if (httpd_query_key_value(PostData, "mqen2", tmp, sizeof(tmp)) == ESP_OK) { if (!strcmp((const char*) tmp, (const char*) "1")) - TempIsMQTT2Enabled = true; + TempIsMQTT2Enabled = true; } if (httpd_query_key_value(PostData, "mqport2", tmp, sizeof(tmp)) == ESP_OK) - if (httpd_query_key_value(PostData, "mqport2", tmp, sizeof(tmp)) == ESP_OK) - { - uint16_t tp = atoi((const char*) tmp); - if (tp < 65535 && tp >= 1000) - GetSysConf()->mqttStation[1].ServerPort = tp; - } + if (httpd_query_key_value(PostData, "mqport2", tmp, sizeof(tmp)) == ESP_OK) + { + uint16_t tp = atoi((const char*) tmp); + if (tp < 65535 && tp >= 1000) + GetSysConf()->mqttStation[1].ServerPort = tp; + } if (httpd_query_key_value(PostData, "mqpass2", tmp, sizeof(tmp)) == ESP_OK && strcmp(tmp, (const char*) "******")) diff --git a/src/LoRaWAN.c b/src/LoRaWAN.c index 969c0cd..744ee13 100644 --- a/src/LoRaWAN.c +++ b/src/LoRaWAN.c @@ -55,13 +55,15 @@ uint8_t LoRaMessagesQueueStorageArea[LORAWAN_MESSAGE_BUFER_LENTH void (*LoRaUserReceiveHandler)(const char *message, int length, int port); void regLoRaUserReceiveHandler( - void (*user_handler)(const char *message, int length, int port)) + void (*user_handler)(const char *message, int length, int port)) { LoRaUserReceiveHandler = user_handler; } esp_err_t LORASendData(LORA_DATA_SEND_STRUCT *pdss) { + if (LORAMessagesQueueHandle == NULL) + return ESP_ERR_INVALID_ARG; char *ptr = (char*) malloc(MESSAGE_LENGTH); if (ptr) { @@ -93,8 +95,8 @@ void messageReceived(const uint8_t *message, size_t length, ttn_port_t port) ESP_LOGI(TAG, "Received=%s", P); } #endif - if(LoRaUserReceiveHandler != NULL) - LoRaUserReceiveHandler((char*)message, length, (int)port); + if (LoRaUserReceiveHandler != NULL) + LoRaUserReceiveHandler((char*) message, length, (int) port); } @@ -128,7 +130,6 @@ void LoRaWANTransportTask(void *pvParameter) } } - void LoRaWANRejoin(void) { ttn_rejoin(); @@ -174,7 +175,6 @@ void LoRaWANInitJoinTask(void *pvParameter) } #endif - void LoRaWANStart(void) { #ifdef CONFIG_WEBGUIAPP_LORAWAN_ENABLE From 89efb0515401d138611f6e3c490f393ee74bbb67 Mon Sep 17 00:00:00 2001 From: Bogdan Pilyugin Date: Fri, 10 Mar 2023 14:23:43 +0200 Subject: [PATCH 9/9] gsm AT send procedure extended --- extlibs/libespfs | 2 +- include/NetTransport.h | 2 +- src/GSMTransport.c | 6 +++--- src/HTTPPostSystem.c | 10 +++++++--- src/LoRaWAN.c | 3 +++ 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/extlibs/libespfs b/extlibs/libespfs index 03ff681..a646e3e 160000 --- a/extlibs/libespfs +++ b/extlibs/libespfs @@ -1 +1 @@ -Subproject commit 03ff681a61cb03a43c6f008601a6e6090e9df2bd +Subproject commit a646e3ee0594ec2301e9b3fe6373ea274eb39e39 diff --git a/include/NetTransport.h b/include/NetTransport.h index fa33f83..7919eb8 100644 --- a/include/NetTransport.h +++ b/include/NetTransport.h @@ -71,7 +71,7 @@ void PPPModemStart(void); void PPPModemGetRSSI(void); void ModemSendSMS(void); -void ModemSendAT(char *cmd); +void ModemSendAT(char *cmd, char *resp, int timeout); void MQTTRun(void); diff --git a/src/GSMTransport.c b/src/GSMTransport.c index 3c47531..ffb3aaf 100644 --- a/src/GSMTransport.c +++ b/src/GSMTransport.c @@ -298,10 +298,10 @@ void PPPModemGetRSSI(void) ESP_LOGW(TAG, "Signal %d, ber %d", rssi, ber); } -void ModemSendAT(char *cmd) +void ModemSendAT(char *cmd, char *resp, int timeout) { - char resp[128] = {0}; - esp_modem_at(dce, cmd, resp, 5000); + esp_modem_at(dce, cmd, resp, timeout); + ESP_LOGI(TAG, "Command:%s", cmd); ESP_LOGW(TAG, "%s", resp); } diff --git a/src/HTTPPostSystem.c b/src/HTTPPostSystem.c index cbfba18..da9d99b 100644 --- a/src/HTTPPostSystem.c +++ b/src/HTTPPostSystem.c @@ -516,22 +516,26 @@ static HTTP_IO_RESULT HTTPPostSystemSettings(httpd_req_t *req, char *PostData) { if (!strcmp(tmp, (const char*) "1")) { + return HTTP_IO_DONE_NOREFRESH; } #if CONFIG_WEBGUIAPP_GPRS_ENABLE else if (!strcmp(tmp, (const char*) "2")) { - ModemSendAT("AT+CCLK?\r"); + char resp[256] = {0}; + ModemSendAT("AT+CCLK?\r", resp, 200); return HTTP_IO_DONE_NOREFRESH; } else if (!strcmp(tmp, (const char*) "3")) { - ModemSendAT("ATD+79022518532;\r"); + char resp[256] = {0}; + ModemSendAT("ATD+79022518532;\r", resp, 200); return HTTP_IO_DONE_NOREFRESH; } else if (!strcmp(tmp, (const char*) "4")) { - ModemSendAT("ATH\r"); + char resp[256] = {0}; + ModemSendAT("ATH\r", resp, 200); return HTTP_IO_DONE_NOREFRESH; } #endif diff --git a/src/LoRaWAN.c b/src/LoRaWAN.c index 744ee13..0baef4a 100644 --- a/src/LoRaWAN.c +++ b/src/LoRaWAN.c @@ -67,6 +67,7 @@ esp_err_t LORASendData(LORA_DATA_SEND_STRUCT *pdss) char *ptr = (char*) malloc(MESSAGE_LENGTH); if (ptr) { + ESP_LOGW(TAG, "memory allocate %d byte", MESSAGE_LENGTH); memcpy(ptr, pdss->raw_data_ptr, MESSAGE_LENGTH); LORA_DATA_SEND_STRUCT DSS; DSS.raw_data_ptr = ptr; @@ -77,6 +78,7 @@ esp_err_t LORASendData(LORA_DATA_SEND_STRUCT *pdss) else { free(ptr); + ESP_LOGW(TAG, "memory free (queue full) %d byte", MESSAGE_LENGTH); return ESP_ERR_TIMEOUT; } } @@ -120,6 +122,7 @@ void LoRaWANTransportTask(void *pvParameter) #endif ttn_transmit_message((const uint8_t*) DSS.raw_data_ptr, MESSAGE_LENGTH, 1, true); free(DSS.raw_data_ptr); + ESP_LOGW(TAG, "memory free (transmitted) %d byte", MESSAGE_LENGTH); } else {