Improvements to HASS sensor names

ngardiner · Oct 14, 2019 · f449a0d · f449a0d
1 parent 18963b0
commit f449a0d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,7 +13,7 @@ This document shows the changes per release
   * Improvements to HomeAssistant EMS module to avoid setting Consumption/Generation values to zero as a result of a connection failure, and better exception handling in general for the module.
   * Added EMS support for TED (The Energy Detective)
   * Added Control module support with a first control module for MQTT, with initial commands to stop the TWCManager daemon and start charging immediately.
-  * Improvements to the MQTT and HASS topic/sensor names for Slave TWCs.
+  * Improvements to the MQTT and HASS topic/sensor names for Slave TWCs. (4 byte instead of 2 byte)
 
 ## v1.1.0 - 2019-10-12
 

diff --git a/lib/TWCManager/Status/HASSStatus.py b/lib/TWCManager/Status/HASSStatus.py
@@ -27,7 +27,15 @@ def debugLog(self, minlevel, message):
       print("debugLog: (" + str(minlevel) + ") " + message)
 
   def setStatus(self, twcid, key, value):
-    sensor = "sensor.twcmanager_" + str(twcid.decode("utf-8")) + "_" + key
+
+    # Format TWCID nicely
+    twident = None
+    if (len(twcid) == 2):
+      twident = "%02X%02X" % (twcid[0], twcid[1])
+    else:
+      twident = str(twcid.decode("utf-8"))
+
+    sensor = "sensor.twcmanager_" + str(twident) + "_" + key
 
     if (self.status):