userbogd/webguiapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new mqtt topic compose

Browse Source
This commit is contained in:
Bogdan Pilyugin 2022-08-18 19:18:38 +02:00
parent 6fa1c4abd4
commit 758e0882ae
3 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/NetTransport.h
View File

@ -1,4 +1,4 @@
/* Copyright 2022 Bogdan Pilyugin /* Copyright 2022 Bogdan Pilyugin
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
include/SystemConfiguration.h
View File

@ -27,7 +27,7 @@
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include "esp_netif.h" #include "esp_netif.h"
#include <sdkconfig.h> #include "sdkconfig.h"
#define DEFAULT_HOST_NAME "DEVICE_HOSTNAME" ///<Default host name of device #define DEFAULT_HOST_NAME "DEVICE_HOSTNAME" ///<Default host name of device

28
src/MQTT.c
View File

@ -53,8 +53,7 @@ uint8_t MQTT2MessagesQueueStorageArea[CH_MESSAGE_BUFER_LENTH * sizeof(DATA_SEND_
mqtt_client_t mqtt[CONFIG_MQTT_CLIENTS_NUM] = { 0 }; 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 apiver[] = "2.0";
const char tagGet[] = "GET"; 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) static void ComposeTopicControl(char *topic, char *roottopic, char *ident, uint8_t dir)
{ {
char id[4]; char id[4];
@ -191,11 +211,15 @@ static void mqtt_event_handler(void *handler_args, esp_event_base_t base, int32_
MQTTReconnectCounter = 0; MQTTReconnectCounter = 0;
ESP_LOGI(TAG, "MQTT_EVENT_CONNECTED client %d", ctx->mqtt_index); ESP_LOGI(TAG, "MQTT_EVENT_CONNECTED client %d", ctx->mqtt_index);
char sub[64]; char sub[64];
ComposeTopicControl(sub, GetSysConf()->mqttStation[ctx->mqtt_index].RootTopic, ComposeTopicControl(sub, GetSysConf()->mqttStation[ctx->mqtt_index].RootTopic,
GetSysConf()->mqttStation[ctx->mqtt_index].ClientID, GetSysConf()->mqttStation[ctx->mqtt_index].ClientID,
0); 0);
msg_id = esp_mqtt_client_subscribe(client, (const char*) sub, 0); msg_id = esp_mqtt_client_subscribe(client, (const char*) sub, 0);
ESP_LOGI(TAG, "sent subscribe successful, msg_id=%d", msg_id); ESP_LOGI(TAG, "sent subscribe successful, msg_id=%d", msg_id);
ComposeTopicScreen(sub, GetSysConf()->mqttStation[ctx->mqtt_index].RootTopic, ComposeTopicScreen(sub, GetSysConf()->mqttStation[ctx->mqtt_index].RootTopic,
GetSysConf()->mqttStation[ctx->mqtt_index].ClientID, GetSysConf()->mqttStation[ctx->mqtt_index].ClientID,
0); 0);