diff --git a/src/httpserver/http_fns.c b/src/httpserver/http_fns.c
index f9985899f..b90f65571 100644
--- a/src/httpserver/http_fns.c
+++ b/src/httpserver/http_fns.c
@@ -527,7 +527,7 @@ int http_fn_cfg_mqtt(http_request_t *request) {
i = CFG_GetMQTTPort();
hprintf128(request, "%i", i);
poststr(request,"\">
\
-
\
+
\
Change device names for display. Remember that short name is used by MQTT.
");
+ poststr(request," Change device names for display.
");
if(http_getArg(request->url,"shortName",tmpA,sizeof(tmpA))) {
CFG_SetShortDeviceName(tmpA);
}
@@ -1265,20 +1265,20 @@ void build_hass_unique_id(char *outBuffer, char *type, int index){
int http_fn_cfg_ha(http_request_t *request) {
int relayCount = 0;
int pwmCount = 0;
- const char *baseName;
- const char *topicName;
+ const char *shortDeviceName;
+ const char *clientId;
int i;
char mqttAdded = 0;
char unique_id[128]; //64 for longDeviceName, 10 for type,3 for index .. 128 would be sufficient
- baseName = CFG_GetShortDeviceName();
- topicName = CFG_GetMQTTClientId();
+ shortDeviceName = CFG_GetShortDeviceName();
+ clientId = CFG_GetMQTTClientId();
http_setup(request, httpMimeTypeHTML);
poststr(request,htmlHeader);
HTTP_AddHeader(request);
poststr(request,"Home Assistant Cfg
");
- hprintf128(request,"Note that your short device name is: %s
",baseName);
+ hprintf128(request,"Note that your short device name is: %s
",shortDeviceName);
poststr(request,"Paste this to configuration yaml
");
poststr(request,"Make sure that you have \"switch:\" keyword only once! Home Assistant doesn't like dup keywords.
");
poststr(request,"You can also use \"switch MyDeviceName:\" to avoid keyword duplication!
");
@@ -1312,15 +1312,15 @@ int http_fn_cfg_ha(http_request_t *request) {
build_hass_unique_id(unique_id,"relay",i);
hprintf128(request," - unique_id: \"%s\"\n",unique_id);
- hprintf128(request," name: \"%s %i\"\n",baseName,i);
- hprintf128(request," state_topic: \"%s/%i/get\"\n",topicName,i);
- hprintf128(request," command_topic: \"%s/%i/set\"\n",topicName,i);
+ hprintf128(request," name: \"%s %i\"\n",shortDeviceName,i);
+ hprintf128(request," state_topic: \"%s/%i/get\"\n",clientId,i);
+ hprintf128(request," command_topic: \"%s/%i/set\"\n",clientId,i);
poststr(request, " qos: 1\n");
poststr(request, " payload_on: 1\n");
poststr(request, " payload_off: 0\n");
poststr(request, " retain: true\n");
hprintf128(request," availability:\n");
- hprintf128(request," - topic: \"%s/connected\"\n",topicName);
+ hprintf128(request," - topic: \"%s/connected\"\n",clientId);
}
}
}
@@ -1340,10 +1340,10 @@ int http_fn_cfg_ha(http_request_t *request) {
build_hass_unique_id(unique_id,"light",i);
hprintf128(request," - unique_id: \"%s\"\n",unique_id);
- hprintf128(request," name: \"%s %i\"\n",baseName,i);
- hprintf128(request," state_topic: \"%s/%i/get\"\n",topicName,i);
- hprintf128(request," command_topic: \"%s/%i/set\"\n",topicName,i);
- hprintf128(request," brightness_command_topic: \"%s/%i/set\"\n",topicName,i);
+ hprintf128(request," name: \"%s %i\"\n",shortDeviceName,i);
+ hprintf128(request," state_topic: \"%s/%i/get\"\n",clientId,i);
+ hprintf128(request," command_topic: \"%s/%i/set\"\n",clientId,i);
+ hprintf128(request," brightness_command_topic: \"%s/%i/set\"\n",clientId,i);
poststr(request, " on_command_type: \"brightness\"\n");
poststr(request, " brightness_scale: 99\n");
poststr(request, " qos: 1\n");
@@ -1352,7 +1352,7 @@ int http_fn_cfg_ha(http_request_t *request) {
poststr(request, " retain: true\n");
poststr(request, " optimistic: true\n");
hprintf128(request," availability:\n");
- hprintf128(request," - topic: \"%s/connected\"\n",topicName);
+ hprintf128(request," - topic: \"%s/connected\"\n",clientId);
}
}
}
@@ -1455,15 +1455,15 @@ int http_tasmota_json_status_SNS(http_request_t *request) {
int http_tasmota_json_status_generic(http_request_t *request) {
const char *deviceName;
const char *friendlyName;
- const char *topic;
+ const char *clientId;
deviceName = CFG_GetShortDeviceName();
friendlyName = CFG_GetDeviceName();
- topic = CFG_GetMQTTClientId();
+ clientId = CFG_GetMQTTClientId();
hprintf128(request,"{\"Status\":{\"Module\":0,\"DeviceName\":\"%s\"",deviceName);
hprintf128(request,",\"FriendlyName\":[\"%s\"]",friendlyName);
- hprintf128(request,",\"Topic\":\"%s\",\"ButtonTopic\":\"0\"",topic);
+ hprintf128(request,",\"Topic\":\"%s\",\"ButtonTopic\":\"0\"",clientId);
hprintf128(request,",\"Power\":1,\"PowerOnState\":3,\"LedState\":1");
hprintf128(request,",\"LedMask\":\"FFFF\",\"SaveData\":1,\"SaveState\":1");
hprintf128(request,",\"SwitchTopic\":\"0\",\"SwitchMode\":[0,0,0,0,0,0,0,0]");
diff --git a/src/mqtt/new_mqtt.c b/src/mqtt/new_mqtt.c
index adfb0d677..0ffd8e153 100644
--- a/src/mqtt/new_mqtt.c
+++ b/src/mqtt/new_mqtt.c
@@ -333,7 +333,7 @@ int channelSet(mqtt_request_t* request){
}
-// this accepts cmnd// to receive data to set channels
+// this accepts cmnd// to receive data to set channels
int tasCmnd(mqtt_request_t* request){
// we only need a few bytes to receive a decimal number 0-100
char copy[64];
@@ -395,7 +395,7 @@ static OBK_Publish_Result MQTT_PublishMain(mqtt_client_t *client, const char *sC
//int myValue;
u8_t qos = 2; /* 0 1 or 2, see MQTT specification */
u8_t retain = 0; /* No don't retain such crappy payload... */
- const char *baseName;
+ const char *clientId;
@@ -432,9 +432,9 @@ static OBK_Publish_Result MQTT_PublishMain(mqtt_client_t *client, const char *sC
addLogAdv(LOG_INFO,LOG_FEATURE_MQTT,"Publishing %s = %s \n",sChannel,sVal);
- baseName = CFG_GetMQTTClientId();
+ clientId = CFG_GetMQTTClientId();
- sprintf(pub_topic,"%s/%s%s",baseName,sChannel, (appendGet == true ? "/get" : ""));
+ sprintf(pub_topic,"%s/%s%s",clientId,sChannel, (appendGet == true ? "/get" : ""));
err = mqtt_publish(client, pub_topic, sVal, strlen(sVal), qos, retain, mqtt_pub_request_cb, 0);
if(err != ERR_OK) {
if(err == ERR_CONN) {
@@ -520,7 +520,7 @@ static void mqtt_connection_cb(mqtt_client_t *client, void *arg, mqtt_connection
{
int i;
char tmp[64];
- const char *baseName;
+ const char *clientId;
err_t err = ERR_OK;
const struct mqtt_connect_client_info_t* client_info = (const struct mqtt_connect_client_info_t*)arg;
LWIP_UNUSED_ARG(client);
@@ -555,9 +555,9 @@ static void mqtt_connection_cb(mqtt_client_t *client, void *arg, mqtt_connection
}
}
- baseName = CFG_GetMQTTClientId();
+ clientId = CFG_GetMQTTClientId();
- sprintf(tmp,"%s/connected",baseName);
+ sprintf(tmp,"%s/connected",clientId);
err = mqtt_publish(client, tmp, "online", strlen("online"), 2, true, mqtt_pub_request_cb, 0);
if(err != ERR_OK) {
addLogAdv(LOG_INFO,LOG_FEATURE_MQTT,"Publish err: %d\n", err);
@@ -597,7 +597,6 @@ static void MQTT_do_connect(mqtt_client_t *client)
mqtt_userName = CFG_GetMQTTUserName();
mqtt_pass = CFG_GetMQTTPass();
mqtt_clientID = CFG_GetMQTTClientId();
- //mqtt_clientID = CFG_GetShortDeviceName();
mqtt_host = CFG_GetMQTTHost();
mqtt_port = CFG_GetMQTTPort();
@@ -734,18 +733,18 @@ OBK_Publish_Result MQTT_PublishCommand(const void *context, const char *cmd, con
void MQTT_init(){
char cbtopicbase[64];
char cbtopicsub[64];
- const char *baseName;
- baseName = CFG_GetMQTTClientId();
+ const char *clientId;
+ clientId = CFG_GetMQTTClientId();
// register the main set channel callback
- sprintf(cbtopicbase,"%s/",baseName);
- sprintf(cbtopicsub,"%s/+/set",baseName);
+ sprintf(cbtopicbase,"%s/",clientId);
+ sprintf(cbtopicsub,"%s/+/set",clientId);
// note: this may REPLACE an existing entry with the same ID. ID 1 !!!
MQTT_RegisterCallback( cbtopicbase, cbtopicsub, 1, channelSet);
// register the TAS cmnd callback
- sprintf(cbtopicbase,"cmnd/%s/",baseName);
- sprintf(cbtopicsub,"cmnd/%s/+",baseName);
+ sprintf(cbtopicbase,"cmnd/%s/",clientId);
+ sprintf(cbtopicsub,"cmnd/%s/+",clientId);
// note: this may REPLACE an existing entry with the same ID. ID 2 !!!
MQTT_RegisterCallback( cbtopicbase, cbtopicsub, 2, tasCmnd);