Merge pull request #2517 from Misiu/mega

Rename OpenHAB MQTT to Home Assistant (openHAB) MQTT
letscontrolit · Aug 2, 2019 · 33b9804 · 33b9804
2 parents 5675d0c + 2e885f4
commit 33b9804
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/docs/source/Controller/_controller_substitutions.repl b/docs/source/Controller/_controller_substitutions.repl
@@ -45,9 +45,9 @@
 .. |C004_maintainer| replace:: `.`
 .. |C004_compileinfo| replace:: `.`
 
-.. |C005_name| replace:: :cyan:`OpenHAB MQTT`
+.. |C005_name| replace:: :cyan:`Home Assistant (openHAB) MQTT`
 .. |C005_type| replace:: :cyan:`Controller`
-.. |C005_typename| replace:: :cyan:`Controller - OpenHAB MQTT`
+.. |C005_typename| replace:: :cyan:`Controller - Home Assistant (openHAB) MQTT`
 .. |C005_status| replace:: :green:`NORMAL`
 .. |C005_github| replace:: C005.ino
 .. _C005_github: https://github.com/letscontrolit/ESPEasy/blob/mega/src/_C005.ino

diff --git a/src/ESPEasy-Globals.h b/src/ESPEasy-Globals.h
@@ -90,7 +90,7 @@ void check_size() {
 //   2 = Domoticz MQTT
 //   3 = Nodo Telnet
 //   4 = ThingSpeak
-//   5 = OpenHAB MQTT
+//   5 = Home Assistant (openHAB) MQTT
 //   6 = PiDome MQTT
 //   7 = EmonCMS
 //   8 = Generic HTTP

diff --git a/src/_C005.ino b/src/_C005.ino
@@ -1,11 +1,11 @@
 #ifdef USES_C005
 //#######################################################################################################
-//########################### Controller Plugin 005: OpenHAB MQTT #######################################
+//################### Controller Plugin 005: Home Assistant (openHAB) MQTT ##############################
 //#######################################################################################################
 
 #define CPLUGIN_005
 #define CPLUGIN_ID_005         5
-#define CPLUGIN_NAME_005       "OpenHAB MQTT"
+#define CPLUGIN_NAME_005       "Home Assistant (openHAB) MQTT"
 
 bool CPlugin_005(byte function, struct EventStruct *event, String& string)
 {
@@ -41,8 +41,8 @@ bool CPlugin_005(byte function, struct EventStruct *event, String& string)
 
     case CPLUGIN_PROTOCOL_TEMPLATE:
       {
-        event->String1 = F("/%sysname%/#");
-        event->String2 = F("/%sysname%/%tskname%/%valname%");
+        event->String1 = F("%sysname%/#");
+        event->String2 = F("%sysname%/%tskname%/%valname%");
         break;
       }
 

diff --git a/src/define_plugin_sets.h b/src/define_plugin_sets.h
@@ -134,7 +134,7 @@ To create/register a plugin, you have to :
 
     #define USES_C001   // Domoticz HTTP
     #define USES_C002   // Domoticz MQTT
-    #define USES_C005   // OpenHAB MQTT
+    #define USES_C005   // Home Assistant (openHAB) MQTT
 //    #define USES_C006   // PiDome MQTT
     #define USES_C008   // Generic HTTP
     #define USES_C009   // FHEM HTTP
@@ -571,7 +571,7 @@ To create/register a plugin, you have to :
     #define USES_C002   // Domoticz MQTT
     #define USES_C003   // Nodo telnet
     #define USES_C004   // ThingSpeak
-    #define USES_C005   // OpenHAB MQTT
+    #define USES_C005   // Home Assistant (openHAB) MQTT
     #define USES_C006   // PiDome MQTT
     #define USES_C007   // Emoncms
     #define USES_C008   // Generic HTTP