From 297cb35e83203a92ae13ab9fcee0b48a66a61cdf Mon Sep 17 00:00:00 2001 From: Bogdan Pilyugin Date: Tue, 10 Jan 2023 14:29:54 +0200 Subject: [PATCH 1/3] added GPRS transport UART configuration --- Kconfig | 7 +++++++ include/NetTransport.h | 3 --- src/GSMTransport.c | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Kconfig b/Kconfig index a8b1b06..c20e180 100644 --- a/Kconfig +++ b/Kconfig @@ -501,6 +501,13 @@ menu "WebGUIApp" Pin to unlock the SIM menu "UART Configuration" + config MODEM_UART_PORT_NUM + int "Modem UART port number" + default 1 + range 0 2 + help + UART port number dedicated to modem + config MODEM_UART_TX_PIN int "TXD Pin Number" default 17 diff --git a/include/NetTransport.h b/include/NetTransport.h index 528af3b..3062f36 100644 --- a/include/NetTransport.h +++ b/include/NetTransport.h @@ -93,9 +93,6 @@ void NextDefaultNetIF(void); void PrintDefaultNetIF(void); void GetDefaultNetIFName(char *name); -void InitRS485(void); -void RS485Task(void *pvParameter); - void PrintNetifs(void); void GotEthIF(void); diff --git a/src/GSMTransport.c b/src/GSMTransport.c index aeea2a0..ac9002b 100644 --- a/src/GSMTransport.c +++ b/src/GSMTransport.c @@ -176,6 +176,7 @@ static void GSMInitTask(void *pvParameter) /* Configure the DTE */ esp_modem_dte_config_t dte_config = ESP_MODEM_DTE_DEFAULT_CONFIG(); /* setup UART specific configuration based on kconfig options */ + //dte_config.uart_config.port_num = CONFIG_MODEM_UART_PORT_NUM; dte_config.uart_config.tx_io_num = CONFIG_MODEM_UART_TX_PIN; dte_config.uart_config.rx_io_num = CONFIG_MODEM_UART_RX_PIN; dte_config.uart_config.rts_io_num = CONFIG_MODEM_UART_RTS_PIN; From 03aa08689d39e79aabfdc4bbf6d557e4f5e9a398 Mon Sep 17 00:00:00 2001 From: Bogdan Pilyugin Date: Tue, 10 Jan 2023 16:40:18 +0200 Subject: [PATCH 2/3] mqtt data send log optimized --- src/MQTT.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/MQTT.c b/src/MQTT.c index c0f6c5b..335bbc1 100644 --- a/src/MQTT.c +++ b/src/MQTT.c @@ -40,7 +40,8 @@ mqtt_client_t mqtt[CONFIG_WEBGUIAPP_MQTT_CLIENTS_NUM] = { 0 }; #define TAG "MQTTApp" -static void mqtt_system_event_handler(int idx, void *handler_args, esp_event_base_t base, int32_t event_id, void *event_data); +static void mqtt_system_event_handler(int idx, void *handler_args, esp_event_base_t base, int32_t event_id, + void *event_data); static void mqtt1_system_event_handler(void *handler_args, esp_event_base_t base, int32_t event_id, void *event_data); static void mqtt2_system_event_handler(void *handler_args, esp_event_base_t base, int32_t event_id, void *event_data); @@ -49,7 +50,7 @@ static void mqtt2_user_event_handler(void *handler_args, esp_event_base_t base, void (*UserEventHandler)(int idx, void *handler_args, esp_event_base_t base, int32_t event_id, void *event_data); void regUserEventHandler( - void (*event_handler)(int idx, void *handler_args, esp_event_base_t base, int32_t event_id, void *event_data)) + void (*event_handler)(int idx, void *handler_args, esp_event_base_t base, int32_t event_id, void *event_data)) { UserEventHandler = event_handler; } @@ -97,7 +98,8 @@ void ComposeTopic(char *topic, int idx, char *service_name, char *direct) strcat((char*) topic, direct); // Data direction UPLINK or DOWNLINK } -static void mqtt_system_event_handler(int idx, void *handler_args, esp_event_base_t base, int32_t event_id, void *event_data) +static void mqtt_system_event_handler(int idx, void *handler_args, esp_event_base_t base, int32_t event_id, + void *event_data) { xSemaphoreTake(xSemaphoreMQTTHandle, pdMS_TO_TICKS(1000)); ESP_LOGI(TAG, "Event dispatched from event loop base=%s, event_id=%d", base, event_id); @@ -223,7 +225,7 @@ void MQTTTaskTransmit(void *pvParameter) xQueueReceive(mqtt[idx].mqtt_queue, &DSS, portMAX_DELAY); if (mqtt[idx].mqtt) { - ESP_LOGW(TAG,"MQTT data send:%.*s", DSS.data_length, DSS.raw_data_ptr); + ESP_LOGI(TAG, "MQTT client %d data send:%.*s", idx, DSS.data_length, DSS.raw_data_ptr); esp_mqtt_client_publish(mqtt[idx].mqtt, (const char*) DSS.topic, (const char*) DSS.raw_data_ptr, From 6ede0022423e5e14b03b60cd43c307de2e5e8f5c Mon Sep 17 00:00:00 2001 From: Bogdan Pilyugin Date: Wed, 11 Jan 2023 14:49:57 +0200 Subject: [PATCH 3/3] reduce mqtt and lora queue length --- src/LoRaWAN.c | 2 +- src/MQTT.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/LoRaWAN.c b/src/LoRaWAN.c index e661972..969c0cd 100644 --- a/src/LoRaWAN.c +++ b/src/LoRaWAN.c @@ -46,7 +46,7 @@ #define MESSAGE_LENGTH 32 #define TAG "LoRaWANApp" #define LORAWAN_APP_LOG_ENABLED 1 -#define LORAWAN_MESSAGE_BUFER_LENTH 8 +#define LORAWAN_MESSAGE_BUFER_LENTH 5 QueueHandle_t LORAMessagesQueueHandle; static StaticQueue_t xStaticLoRaMessagesQueue; diff --git a/src/MQTT.c b/src/MQTT.c index 335bbc1..f02c5ab 100644 --- a/src/MQTT.c +++ b/src/MQTT.c @@ -24,7 +24,7 @@ #include "NetTransport.h" #include "MQTT.h" -#define MQTT_MESSAGE_BUFER_LENTH 8 //size of mqtt queue +#define MQTT_MESSAGE_BUFER_LENTH 5 //size of mqtt queue #define MQTT_RECONNECT_CHANGE_ADAPTER 3 #if CONFIG_WEBGUIAPP_MQTT_ENABLE