Skip to content

Commit 40ffaf4

Browse files
author
Michael Ruettgers
committed
Merge branch 'release/2.1.5'
2 parents 81fe32c + 281ff81 commit 40ffaf4

File tree

4 files changed

+30
-26
lines changed

4 files changed

+30
-26
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9+
## [2.1.5] - 2020-07-25
10+
### Changed
11+
- Modified MQTT topic to use / instead of * due to invalid character issues when used with ioBroker
12+
913
## [2.1.4] - 2020-07-24
1014
### Changed
1115
- Worked on the docs

README.md

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -165,30 +165,30 @@ If everything is configured properly and running with a sensor in place, SMLRead
165165

166166
```
167167
MB-Monty ➜ ~ mosquitto_sub -h 10.4.32.103 -v -t smartmeter/mains/#
168-
smartmeter/mains/info Hello from 00C7551E, running SMLReader version 2.1.1.
169-
smartmeter/mains/sensor/1/obis/1-0:1.8.0*255/value 3546245.9
170-
smartmeter/mains/sensor/1/obis/1-0:2.8.0*255/value 13.2
171-
smartmeter/mains/sensor/1/obis/1-0:1.8.1*255/value 0.0
172-
smartmeter/mains/sensor/1/obis/1-0:2.8.1*255/value 13.2
173-
smartmeter/mains/sensor/1/obis/1-0:1.8.2*255/value 3546245.9
174-
smartmeter/mains/sensor/1/obis/1-0:2.8.2*255/value 0.0
175-
smartmeter/mains/sensor/1/obis/1-0:16.7.0*255/value 451.2
176-
177-
smartmeter/mains/sensor/2/obis/1-0:1.8.0*255/value 3546245.9
178-
smartmeter/mains/sensor/2/obis/1-0:2.8.0*255/value 13.2
179-
smartmeter/mains/sensor/2/obis/1-0:1.8.1*255/value 0.0
180-
smartmeter/mains/sensor/2/obis/1-0:2.8.1*255/value 13.2
181-
smartmeter/mains/sensor/2/obis/1-0:1.8.2*255/value 3546245.9
182-
smartmeter/mains/sensor/2/obis/1-0:2.8.2*255/value 0.0
183-
smartmeter/mains/sensor/2/obis/1-0:16.7.0*255/value 451.2
184-
185-
smartmeter/mains/sensor/3/obis/1-0:1.8.0*255/value 3546245.9
186-
smartmeter/mains/sensor/3/obis/1-0:2.8.0*255/value 13.2
187-
smartmeter/mains/sensor/3/obis/1-0:1.8.1*255/value 0.0
188-
smartmeter/mains/sensor/3/obis/1-0:2.8.1*255/value 13.2
189-
smartmeter/mains/sensor/3/obis/1-0:1.8.2*255/value 3546245.9
190-
smartmeter/mains/sensor/3/obis/1-0:2.8.2*255/value 0.0
191-
smartmeter/mains/sensor/3/obis/1-0:16.7.0*255/value 451.2
168+
smartmeter/mains/info Hello from 00C7551E, running SMLReader version 2.1.5.
169+
smartmeter/mains/sensor/1/obis/1-0:1.8.0/255/value 3546245.9
170+
smartmeter/mains/sensor/1/obis/1-0:2.8.0/255/value 13.2
171+
smartmeter/mains/sensor/1/obis/1-0:1.8.1/255/value 0.0
172+
smartmeter/mains/sensor/1/obis/1-0:2.8.1/255/value 13.2
173+
smartmeter/mains/sensor/1/obis/1-0:1.8.2/255/value 3546245.9
174+
smartmeter/mains/sensor/1/obis/1-0:2.8.2/255/value 0.0
175+
smartmeter/mains/sensor/1/obis/1-0:16.7.0/255/value 451.2
176+
177+
smartmeter/mains/sensor/2/obis/1-0:1.8.0/255/value 3546245.9
178+
smartmeter/mains/sensor/2/obis/1-0:2.8.0/255/value 13.2
179+
smartmeter/mains/sensor/2/obis/1-0:1.8.1/255/value 0.0
180+
smartmeter/mains/sensor/2/obis/1-0:2.8.1/255/value 13.2
181+
smartmeter/mains/sensor/2/obis/1-0:1.8.2/255/value 3546245.9
182+
smartmeter/mains/sensor/2/obis/1-0:2.8.2/255/value 0.0
183+
smartmeter/mains/sensor/2/obis/1-0:16.7.0/255/value 451.2
184+
185+
smartmeter/mains/sensor/3/obis/1-0:1.8.0/255/value 3546245.9
186+
smartmeter/mains/sensor/3/obis/1-0:2.8.0/255/value 13.2
187+
smartmeter/mains/sensor/3/obis/1-0:1.8.1/255/value 0.0
188+
smartmeter/mains/sensor/3/obis/1-0:2.8.1/255/value 13.2
189+
smartmeter/mains/sensor/3/obis/1-0:1.8.2/255/value 3546245.9
190+
smartmeter/mains/sensor/3/obis/1-0:2.8.2/255/value 0.0
191+
smartmeter/mains/sensor/3/obis/1-0:16.7.0/255/value 451.2
192192
```
193193

194194
---

src/MqttPublisher.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class MqttPublisher
7777
char obisIdentifier[32];
7878
char buffer[255];
7979

80-
sprintf(obisIdentifier, "%d-%d:%d.%d.%d*%d",
80+
sprintf(obisIdentifier, "%d-%d:%d.%d.%d/%d",
8181
entry->obj_name->str[0], entry->obj_name->str[1],
8282
entry->obj_name->str[2], entry->obj_name->str[3],
8383
entry->obj_name->str[4], entry->obj_name->str[5]);

src/config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "Arduino.h"
55
#include "Sensor.h"
66

7-
const char *VERSION = "2.1.4";
7+
const char *VERSION = "2.1.5";
88

99
// Modifying the config version will probably cause a loss of the existig configuration.
1010
// Be careful!

0 commit comments

Comments
 (0)