jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-28 05:36:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stability improvements

Browse Source
This commit is contained in:
fvanroie 2022-11-08 20:40:25 +01:00
parent 79303a450b
commit 988514970c
2 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/lv_conf_v7.h
View File

@ -59,7 +59,7 @@
/* Default display refresh period. /* Default display refresh period.
* Can be changed in the display driver (`lv_disp_drv_t`).*/ * Can be changed in the display driver (`lv_disp_drv_t`).*/
#define LV_DISP_DEF_REFR_PERIOD 30 /*[ms]*/ #define LV_DISP_DEF_REFR_PERIOD 50 /*[ms]*/
/* Dot Per Inch: used to initialize default sizes. /* Dot Per Inch: used to initialize default sizes.
* E.g. a button with width = LV_DPI / 2 -> half inch wide * E.g. a button with width = LV_DPI / 2 -> half inch wide

32
src/mqtt/hasp_mqtt_esp.cpp
View File

@ -18,6 +18,14 @@
#include "hasp_config.h" #include "hasp_config.h"
#include "../hasp/hasp_dispatch.h" #include "../hasp/hasp_dispatch.h"
#include "freertos/queue.h"
QueueHandle_t queue;
typedef struct
{
char topic[64];
char payload[512];
} mqtt_message_t;
char mqttLwtTopic[28]; char mqttLwtTopic[28];
char mqttNodeTopic[24]; char mqttNodeTopic[24];
@ -100,7 +108,8 @@ int mqtt_send_state(const char* subtopic, const char* payload)
int mqtt_send_discovery(const char* payload, size_t len) int mqtt_send_discovery(const char* payload, size_t len)
{ {
char tmp_topic[128]; char tmp_topic[128];
snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR(MQTT_PREFIX "/" MQTT_TOPIC_DISCOVERY "/%s"),haspDevice.get_hardware_id()); snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR(MQTT_PREFIX "/" MQTT_TOPIC_DISCOVERY "/%s"),
haspDevice.get_hardware_id());
return mqttPublish(tmp_topic, payload, len, false); return mqttPublish(tmp_topic, payload, len, false);
} }
@ -109,7 +118,7 @@ int mqtt_send_discovery(const char* payload, size_t len)
static void mqtt_message_cb(const char* topic, byte* payload, unsigned int length) static void mqtt_message_cb(const char* topic, byte* payload, unsigned int length)
{ // Handle incoming commands from MQTT { // Handle incoming commands from MQTT
mqttReceiveCount++; mqttReceiveCount++;
LOG_TRACE(TAG_MQTT_RCV, F("%s = %s"), topic, (char*)payload); LOG_TRACE(TAG_MQTT_RCV, F("[%s] %s = %s"), pcTaskGetTaskName(NULL), topic, (char*)payload);
if(topic == strstr(topic, mqttNodeTopic)) { // startsWith mqttNodeTopic if(topic == strstr(topic, mqttNodeTopic)) { // startsWith mqttNodeTopic
@ -168,7 +177,15 @@ static void mqtt_message_cb(const char* topic, byte* payload, unsigned int lengt
} }
else */ else */
{ {
dispatch_topic_payload(topic, (const char*)payload, length > 0, TAG_MQTT); mqtt_message_t data;
snprintf(data.topic, sizeof(data.topic), topic);
snprintf(data.payload, sizeof(data.payload), (const char*)payload);
size_t attempt = 0;
while(xQueueSend(queue, &data, (TickType_t)0) == errQUEUE_FULL && attempt < 100) {
vTaskDelay(5 / portTICK_PERIOD_MS);
attempt++;
};
// dispatch_topic_payload(topic, (const char*)payload, length > 0, TAG_MQTT);
} }
} }
@ -316,6 +333,8 @@ static esp_err_t mqtt_event_handler(esp_mqtt_event_handle_t event)
void mqttSetup() void mqttSetup()
{ {
queue = xQueueCreate(20, sizeof(mqtt_message_t));
esp_crt_bundle_set(rootca_crt_bundle_start); esp_crt_bundle_set(rootca_crt_bundle_start);
mqttStart(); mqttStart();
} }
@ -323,6 +342,13 @@ void mqttSetup()
IRAM_ATTR void mqttLoop(void) IRAM_ATTR void mqttLoop(void)
{ {
// mqttClient.loop(); // mqttClient.loop();
mqtt_message_t data;
while(xQueueReceive(queue, &data, (TickType_t)0)) {
LOG_INFO(TAG_MQTT, F("[%s] Received data from queue == %s\n"), pcTaskGetTaskName(NULL), data.topic);
size_t length = strlen(data.payload);
dispatch_topic_payload(data.topic, data.payload, length > 0, TAG_MQTT);
delay(1);
}
} }
void mqttEvery5Seconds(bool networkIsConnected) void mqttEvery5Seconds(bool networkIsConnected)