Merge branch 'release/2.1.5'

Author: Michael Ruettgers

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.1.5] - 2020-07-25
+### Changed
+- Modified MQTT topic to use / instead of * due to invalid character issues when used with ioBroker
+
 ## [2.1.4] - 2020-07-24
 ### Changed
 - Worked on the docs

README.md

@@ -165,30 +165,30 @@ If everything is configured properly and running with a sensor in place, SMLRead
 
 ```
 MB-Monty ➜  ~  mosquitto_sub -h 10.4.32.103 -v -t smartmeter/mains/#
-smartmeter/mains/info Hello from 00C7551E, running SMLReader version 2.1.1.
-smartmeter/mains/sensor/1/obis/1-0:1.8.0*255/value 3546245.9
-smartmeter/mains/sensor/1/obis/1-0:2.8.0*255/value 13.2
-smartmeter/mains/sensor/1/obis/1-0:1.8.1*255/value 0.0
-smartmeter/mains/sensor/1/obis/1-0:2.8.1*255/value 13.2
-smartmeter/mains/sensor/1/obis/1-0:1.8.2*255/value 3546245.9
-smartmeter/mains/sensor/1/obis/1-0:2.8.2*255/value 0.0
-smartmeter/mains/sensor/1/obis/1-0:16.7.0*255/value 451.2
-
-smartmeter/mains/sensor/2/obis/1-0:1.8.0*255/value 3546245.9
-smartmeter/mains/sensor/2/obis/1-0:2.8.0*255/value 13.2
-smartmeter/mains/sensor/2/obis/1-0:1.8.1*255/value 0.0
-smartmeter/mains/sensor/2/obis/1-0:2.8.1*255/value 13.2
-smartmeter/mains/sensor/2/obis/1-0:1.8.2*255/value 3546245.9
-smartmeter/mains/sensor/2/obis/1-0:2.8.2*255/value 0.0
-smartmeter/mains/sensor/2/obis/1-0:16.7.0*255/value 451.2
-
-smartmeter/mains/sensor/3/obis/1-0:1.8.0*255/value 3546245.9
-smartmeter/mains/sensor/3/obis/1-0:2.8.0*255/value 13.2
-smartmeter/mains/sensor/3/obis/1-0:1.8.1*255/value 0.0
-smartmeter/mains/sensor/3/obis/1-0:2.8.1*255/value 13.2
-smartmeter/mains/sensor/3/obis/1-0:1.8.2*255/value 3546245.9
-smartmeter/mains/sensor/3/obis/1-0:2.8.2*255/value 0.0
-smartmeter/mains/sensor/3/obis/1-0:16.7.0*255/value 451.2
+smartmeter/mains/info Hello from 00C7551E, running SMLReader version 2.1.5.
+smartmeter/mains/sensor/1/obis/1-0:1.8.0/255/value 3546245.9
+smartmeter/mains/sensor/1/obis/1-0:2.8.0/255/value 13.2
+smartmeter/mains/sensor/1/obis/1-0:1.8.1/255/value 0.0
+smartmeter/mains/sensor/1/obis/1-0:2.8.1/255/value 13.2
+smartmeter/mains/sensor/1/obis/1-0:1.8.2/255/value 3546245.9
+smartmeter/mains/sensor/1/obis/1-0:2.8.2/255/value 0.0
+smartmeter/mains/sensor/1/obis/1-0:16.7.0/255/value 451.2
+
+smartmeter/mains/sensor/2/obis/1-0:1.8.0/255/value 3546245.9
+smartmeter/mains/sensor/2/obis/1-0:2.8.0/255/value 13.2
+smartmeter/mains/sensor/2/obis/1-0:1.8.1/255/value 0.0
+smartmeter/mains/sensor/2/obis/1-0:2.8.1/255/value 13.2
+smartmeter/mains/sensor/2/obis/1-0:1.8.2/255/value 3546245.9
+smartmeter/mains/sensor/2/obis/1-0:2.8.2/255/value 0.0
+smartmeter/mains/sensor/2/obis/1-0:16.7.0/255/value 451.2
+
+smartmeter/mains/sensor/3/obis/1-0:1.8.0/255/value 3546245.9
+smartmeter/mains/sensor/3/obis/1-0:2.8.0/255/value 13.2
+smartmeter/mains/sensor/3/obis/1-0:1.8.1/255/value 0.0
+smartmeter/mains/sensor/3/obis/1-0:2.8.1/255/value 13.2
+smartmeter/mains/sensor/3/obis/1-0:1.8.2/255/value 3546245.9
+smartmeter/mains/sensor/3/obis/1-0:2.8.2/255/value 0.0
+smartmeter/mains/sensor/3/obis/1-0:16.7.0/255/value 451.2
 ```
 
 ---

src/MqttPublisher.h

@@ -77,7 +77,7 @@ class MqttPublisher
                 char obisIdentifier[32];
                 char buffer[255];
 
-                sprintf(obisIdentifier, "%d-%d:%d.%d.%d*%d",
+                sprintf(obisIdentifier, "%d-%d:%d.%d.%d/%d",
                         entry->obj_name->str[0], entry->obj_name->str[1],
                         entry->obj_name->str[2], entry->obj_name->str[3],
                         entry->obj_name->str[4], entry->obj_name->str[5]);

src/config.h

@@ -4,7 +4,7 @@
 #include "Arduino.h"
 #include "Sensor.h"
 
-const char *VERSION = "2.1.4";
+const char *VERSION = "2.1.5";
 
 // Modifying the config version will probably cause a loss of the existig configuration.
 // Be careful!