From 94ff29e3121e6d6e6bfa1eb99e60ee612ce06102 Mon Sep 17 00:00:00 2001
From: bogdan <bogd@live.ru>
Date: Tue, 30 Apr 2024 09:46:58 +0200
Subject: [PATCH] MQTT ID now is fully user defined

---
 src/MQTT.c             |  4 ++--
 src/SysConfiguration.c | 18 +++++++++++++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/MQTT.c b/src/MQTT.c
index 217d84b..e0eb7c4 100644
--- a/src/MQTT.c
+++ b/src/MQTT.c
@@ -107,8 +107,8 @@ void ComposeTopic(char *topic, int idx, char *service_name, char *direct)
     strcat((char*) topic, GetSysConf()->mqttStation[idx].GroupName);                // Global system name
     strcat((char*) topic, "/");
     strcat((char*) topic, GetSysConf()->mqttStation[idx].ClientID);     // Device client name  (for multiclient devices)
-    strcat((char*) topic, "-");
-    strcat((char*) topic, GetSysConf()->ID);                 //
+    //strcat((char*) topic, "-");
+    //strcat((char*) topic, GetSysConf()->ID);                 //
     strcat((char*) topic, "/");
     strcat((char*) topic, (const char*) service_name);  // Device service name
     strcat((char*) topic, "/");
diff --git a/src/SysConfiguration.c b/src/SysConfiguration.c
index 01b9262..c698608 100644
--- a/src/SysConfiguration.c
+++ b/src/SysConfiguration.c
@@ -361,8 +361,14 @@ esp_netif_str_to_ip4(CONFIG_WEBGUIAPP_DNS3_ADDRESS_DEFAULT, (esp_ip4_addr_t*) &C
            sizeof(CONFIG_WEBGUIAPP_MQTT_SYSTEM_NAME));
     memcpy(Conf->mqttStation[0].GroupName, CONFIG_WEBGUIAPP_MQTT_GROUP_NAME,
            sizeof(CONFIG_WEBGUIAPP_MQTT_GROUP_NAME));
-    memcpy(Conf->mqttStation[0].ClientID, CONFIG_WEBGUIAPP_MQTT_CLIENT_ID_1,
-           sizeof(CONFIG_WEBGUIAPP_MQTT_CLIENT_ID_1));
+
+    Conf->mqttStation[0].ClientID[0] = 0x00;
+    strcat(Conf->mqttStation[0].ClientID, CONFIG_WEBGUIAPP_MQTT_CLIENT_ID_1);
+    strcat(Conf->mqttStation[0].ClientID, "-");
+    strcat(Conf->mqttStation[0].ClientID, Conf->ID);
+
+
+
     memcpy(Conf->mqttStation[0].UserName, CONFIG_WEBGUIAPP_MQTT_USERNAME,
            sizeof(CONFIG_WEBGUIAPP_MQTT_USERNAME));
     memcpy(Conf->mqttStation[0].UserPass, CONFIG_WEBGUIAPP_MQTT_PASSWORD,
@@ -377,7 +383,13 @@ esp_netif_str_to_ip4(CONFIG_WEBGUIAPP_DNS3_ADDRESS_DEFAULT, (esp_ip4_addr_t*) &C
     memcpy(Conf->mqttStation[1].SystemName, CONFIG_WEBGUIAPP_MQTT_SYSTEM_NAME,
            sizeof(CONFIG_WEBGUIAPP_MQTT_SYSTEM_NAME));
     memcpy(Conf->mqttStation[1].GroupName, CONFIG_WEBGUIAPP_MQTT_GROUP_NAME, sizeof(CONFIG_WEBGUIAPP_MQTT_GROUP_NAME));
-    memcpy(Conf->mqttStation[1].ClientID, CONFIG_WEBGUIAPP_MQTT_CLIENT_ID_2, sizeof(CONFIG_WEBGUIAPP_MQTT_CLIENT_ID_2));
+
+    Conf->mqttStation[1].ClientID[0] = 0x00;
+    strcat(Conf->mqttStation[1].ClientID, CONFIG_WEBGUIAPP_MQTT_CLIENT_ID_2);
+    strcat(Conf->mqttStation[1].ClientID, "-");
+    strcat(Conf->mqttStation[1].ClientID, Conf->ID);
+
+
     memcpy(Conf->mqttStation[1].UserName, CONFIG_WEBGUIAPP_MQTT_USERNAME, sizeof(CONFIG_WEBGUIAPP_MQTT_USERNAME));
     memcpy(Conf->mqttStation[1].UserPass, CONFIG_WEBGUIAPP_MQTT_PASSWORD, sizeof(CONFIG_WEBGUIAPP_MQTT_PASSWORD));
 #endif