userbogd/WebguiappTemplate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed mqtt queue overload

Browse Source
This commit is contained in:
Bogdan Pilyugin 2023-10-18 18:35:29 +02:00
parent a3f0b6d057
commit f16c045ca1
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/webguiapp

@ -1 +1 @@
Subproject commit 32c8a42b8928581a3a51c44ab6550dcf1418384e Subproject commit 9e05f92cbf1a60a4a4e1e19ad6a93a0341eb32c9

2
dependencies.lock
View File

@ -24,6 +24,6 @@ dependencies:
path: . path: .
type: git type: git
version: b42825192c6455569f1a047b21140d6d1fe5e4ef version: b42825192c6455569f1a047b21140d6d1fe5e4ef
manifest_hash: 72c85554bdb043aee14114593fa390acd2be020b5c66d5b678e73ac548fbbfa9 manifest_hash: ea7789060658ee790872f7fa601b7cdb01766bdb58e4cdeb1c8b05513d5ba6ab
target: esp32 target: esp32
version: 1.0.0 version: 1.0.0

4
main/src/MQTTCustom.c
View File

@ -42,7 +42,7 @@ esp_err_t AppServiceMQTTSend(char *data, int len, int idx)
ComposeTopic(DSS.topic, idx, APP_SERVICE_NAME, APP_UPLINK_SUBTOPIC); ComposeTopic(DSS.topic, idx, APP_SERVICE_NAME, APP_UPLINK_SUBTOPIC);
DSS.raw_data_ptr = buf; DSS.raw_data_ptr = buf;
DSS.data_length = len; DSS.data_length = len;
if (xQueueSend(GetMQTTHandlesPool(idx)->mqtt_queue, &DSS, pdMS_TO_TICKS(1000)) == pdPASS) if (xQueueSend(GetMQTTHandlesPool(idx)->mqtt_queue, &DSS, 0) == pdPASS)
return ESP_OK; return ESP_OK;
else else
{ {
@ -96,7 +96,7 @@ esp_err_t AppLog(esp_log_level_t level, char *format, ...)
ComposeTopic(DSS.topic, idx, "LOG", APP_UPLINK_SUBTOPIC); ComposeTopic(DSS.topic, idx, "LOG", APP_UPLINK_SUBTOPIC);
DSS.raw_data_ptr = buf; DSS.raw_data_ptr = buf;
DSS.data_length = strlen(buf); DSS.data_length = strlen(buf);
if (xQueueSend(GetMQTTHandlesPool(idx)->mqtt_queue, &DSS, pdMS_TO_TICKS(1000)) != pdPASS) if (xQueueSend(GetMQTTHandlesPool(idx)->mqtt_queue, &DSS, 0) != pdPASS)
free(buf); free(buf);
continue; continue;
} }

6
sdkconfig
View File

@ -1749,6 +1749,12 @@ CONFIG_LORA_APP_ID="BBBBBBBBBBBBBBBB"
CONFIG_LORA_APP_KEY="CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC" CONFIG_LORA_APP_KEY="CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC"
# end of LoRaWAN settings # end of LoRaWAN settings
#
# Serial port configuration
#
# CONFIG_WEBGUIAPP_UART_TRANSPORT_ENABLE is not set
# end of Serial port configuration
# #
# Modbus settings # Modbus settings
# #