From 758e0882aee006acaac737c862350be425981d5d Mon Sep 17 00:00:00 2001
From: Bogdan <bogd@live.ru>
Date: Thu, 18 Aug 2022 19:18:38 +0200
Subject: [PATCH] new mqtt topic compose

---
 include/NetTransport.h        |  2 +-
 include/SystemConfiguration.h |  2 +-
 src/MQTT.c                    | 28 ++++++++++++++++++++++++++--
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/include/NetTransport.h b/include/NetTransport.h
index 5478da2..b0df497 100644
--- a/include/NetTransport.h
+++ b/include/NetTransport.h
@@ -1,4 +1,4 @@
- /* Copyright 2022 Bogdan Pilyugin
+/* Copyright 2022 Bogdan Pilyugin
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/include/SystemConfiguration.h b/include/SystemConfiguration.h
index e8eadc0..79f5d9b 100644
--- a/include/SystemConfiguration.h
+++ b/include/SystemConfiguration.h
@@ -27,7 +27,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include "esp_netif.h"
-#include <sdkconfig.h>
+#include "sdkconfig.h"
 
 #define DEFAULT_HOST_NAME               "DEVICE_HOSTNAME"     ///<Default host name of device
 
diff --git a/src/MQTT.c b/src/MQTT.c
index 5d71e79..4abdf65 100644
--- a/src/MQTT.c
+++ b/src/MQTT.c
@@ -53,8 +53,7 @@ uint8_t MQTT2MessagesQueueStorageArea[CH_MESSAGE_BUFER_LENTH * sizeof(DATA_SEND_
 
 mqtt_client_t mqtt[CONFIG_MQTT_CLIENTS_NUM] = { 0 };
 
-static const char topic_tx[] = "/UPLINK/";  //subtopic for transmit
-static const char topic_rx[] = "/DOWNLINK/";  //subtopic to receive
+
 
 const char apiver[] = "2.0";
 const char tagGet[] = "GET";
@@ -133,6 +132,27 @@ static void log_error_if_nonzero(const char *message, int error_code)
     }
 }
 
+static const char topic_tx[] = "/UPLINK/";  //subtopic for transmit
+static const char topic_rx[] = "/DOWNLINK/";  //subtopic to receive
+
+static void ComposeTopic(char *topic, char *system_name, char* direct, char *client_name, char *service_name)
+{
+    char tmp[4];
+    char dev_rom_id[8];
+    GetChipId((uint8_t*) tmp);
+    BytesToStr((unsigned char*) tmp, (unsigned char*) dev_rom_id, 4);
+    strcpy((char*) topic, system_name);    // Global system name
+    strcat((char*) topic, "/");
+    strcpy((char*) topic, direct);    // Data direction UPLINK or DOWNLINK
+    strcat((char*) topic, "/");
+    strcat((char*) topic, (const char*) dev_rom_id);   // Unique device ID (based on ROM chip id)
+    strcat((char*) topic, "/");
+    strcat((char*) topic, client_name);               // Device client name  (for multiclient devices)
+    strcat((char*) topic, "/");
+    strcat((char*) topic, (const char*) service_name); // Device service name
+}
+
+
 static void ComposeTopicControl(char *topic, char *roottopic, char *ident, uint8_t dir)
 {
     char id[4];
@@ -191,11 +211,15 @@ static void mqtt_event_handler(void *handler_args, esp_event_base_t base, int32_
             MQTTReconnectCounter = 0;
             ESP_LOGI(TAG, "MQTT_EVENT_CONNECTED client %d", ctx->mqtt_index);
             char sub[64];
+
             ComposeTopicControl(sub, GetSysConf()->mqttStation[ctx->mqtt_index].RootTopic,
                                 GetSysConf()->mqttStation[ctx->mqtt_index].ClientID,
                                 0);
             msg_id = esp_mqtt_client_subscribe(client, (const char*) sub, 0);
             ESP_LOGI(TAG, "sent subscribe successful, msg_id=%d", msg_id);
+
+
+
             ComposeTopicScreen(sub, GetSysConf()->mqttStation[ctx->mqtt_index].RootTopic,
                                 GetSysConf()->mqttStation[ctx->mqtt_index].ClientID,
                                 0);