From 9f20a1b08bf69e1f2017ba1d4411004df2aef042 Mon Sep 17 00:00:00 2001 From: bogdan Date: Thu, 16 May 2024 21:12:49 +0200 Subject: [PATCH] MQTT services definitions moved to mqtt header --- include/MQTT.h | 4 ++++ src/MQTT.c | 4 ---- src/SerialPort.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/MQTT.h b/include/MQTT.h index 231bee4..39970e7 100644 --- a/include/MQTT.h +++ b/include/MQTT.h @@ -47,6 +47,10 @@ typedef int mqtt_app_err_t; #define API_FILE_EMPTY_ERR 15 #define API_UNKNOWN_ERR 16 +#define EXTERNAL_SERVICE_NAME "RS485" +#define UPLINK_SUBTOPIC "UPLINK" // Device publish to this topic +#define DOWNLINK_SUBTOPIC "DWLINK" // Device listen from this topic + typedef struct { char topic[CONFIG_WEBGUIAPP_MQTT_MAX_TOPIC_LENGTH]; diff --git a/src/MQTT.c b/src/MQTT.c index e0eb7c4..004fc19 100644 --- a/src/MQTT.c +++ b/src/MQTT.c @@ -29,10 +29,6 @@ #define TAG "MQTT" #define SERVICE_NAME "SYSTEM" // Dedicated service name -#define EXTERNAL_SERVICE_NAME "RS485" -#define UPLINK_SUBTOPIC "UPLINK" // Device publish to this topic -#define DOWNLINK_SUBTOPIC "DWLINK" // Device listen from this topic - #define MQTT_DEBUG_MODE CONFIG_WEBGUIAPP_MQTT_DEBUG_LEVEL #define MQTT_MESSAGE_BUFER_LENTH 10 //size of mqtt queue diff --git a/src/SerialPort.c b/src/SerialPort.c index 59d7416..a9e74ad 100644 --- a/src/SerialPort.c +++ b/src/SerialPort.c @@ -131,8 +131,8 @@ void serial_RX_task(void *arg) if (GetSysConf()->serialSettings.Flags.IsBridgeEnabled) { - ExternalServiceMQTTSend(rxbuf, buffered_size, 0); - ExternalServiceMQTTSend(rxbuf, buffered_size, 1); + ExternalServiceMQTTSend(EXTERNAL_SERVICE_NAME, rxbuf, buffered_size, 0); + ExternalServiceMQTTSend(EXTERNAL_SERVICE_NAME, rxbuf, buffered_size, 1); } else ReceiveHandlerAPI();