From c73ecd7ce6ce0f8951fa475cfc46e7a7ace511b8 Mon Sep 17 00:00:00 2001 From: Alexey Zholtikov Date: Wed, 17 Jul 2024 07:59:08 +0300 Subject: [PATCH] Added definition ZH_GATEWAY_KEEP_ALIVE_TIME --- main/zh_gateway.c | 4 ++-- main/zh_gateway.h | 2 ++ version.txt | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/main/zh_gateway.c b/main/zh_gateway.c index 9dd0435..9c3933e 100755 --- a/main/zh_gateway.c +++ b/main/zh_gateway.c @@ -1298,7 +1298,7 @@ void zh_gateway_send_mqtt_json_config_message(const gateway_config_t *gateway_co data.payload_data.config_message.binary_sensor_config_message.binary_sensor_device_class = HABSDC_CONNECTIVITY; data.payload_data.config_message.binary_sensor_config_message.payload_on = HAONOFT_CONNECT; data.payload_data.config_message.binary_sensor_config_message.payload_off = HAONOFT_NONE; - data.payload_data.config_message.binary_sensor_config_message.expire_after = 30; + data.payload_data.config_message.binary_sensor_config_message.expire_after = ZH_GATEWAY_KEEP_ALIVE_TIME * 1.25; // + 25% just in case. data.payload_data.config_message.binary_sensor_config_message.enabled_by_default = true; data.payload_data.config_message.binary_sensor_config_message.force_update = true; data.payload_data.config_message.binary_sensor_config_message.qos = 2; @@ -1320,7 +1320,7 @@ void zh_gateway_send_mqtt_json_keep_alive_message_task(void *pvParameter) zh_send_message(NULL, (uint8_t *)&data, sizeof(zh_espnow_data_t)); data.payload_type = ZHPT_STATE; zh_espnow_binary_sensor_send_mqtt_json_status_message(&data, gateway_config->self_mac, gateway_config); - vTaskDelay(10000 / portTICK_PERIOD_MS); + vTaskDelay(ZH_GATEWAY_KEEP_ALIVE_TIME * 1000 / portTICK_PERIOD_MS); } vTaskDelete(NULL); } diff --git a/main/zh_gateway.h b/main/zh_gateway.h index 6e7488e..1b7bbe1 100755 --- a/main/zh_gateway.h +++ b/main/zh_gateway.h @@ -64,6 +64,8 @@ #define ZH_MAX_GPIO_NUMBERS 48 // Maximum number of GPIOs on ESP modules. +#define ZH_GATEWAY_KEEP_ALIVE_TIME 10 // Frequency of sending a keep alive message. + typedef struct // Structure of data exchange between tasks, functions and event handlers. { struct // Storage structure of gateway configuration data. diff --git a/version.txt b/version.txt index 4dd6c84..8f73966 100755 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.0.8-1 \ No newline at end of file +1.0.8-2 \ No newline at end of file