ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Fixed incorrect Zigbee2mqtt topic name for setting values

Browse source
This commit is contained in:
Ziver Koc 2024-10-01 23:26:32 +02:00
parent 22e6400369
commit 3d883e0674
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/hal-mqtt/src/se/hal/plugin/mqtt/detector/Zigbee2mqttDetector.java
View file

@ -31,7 +31,7 @@ public class Zigbee2mqttDetector implements HalMqttDetector {
if (json.getString("state") != null) { if (json.getString("state") != null) {
HalMqttOnOffEventConfig event = new HalMqttOnOffEventConfig(topic, "$.state"); HalMqttOnOffEventConfig event = new HalMqttOnOffEventConfig(topic, "$.state");
event.setWriteTopicName(topic + "/set"); event.setWriteTopicName(topic + "/set/state");
event.setValueOnString("ON"); event.setValueOnString("ON");
event.setValueOffString("OFF"); event.setValueOffString("OFF");
detectedDeviceConfigs.add(event); detectedDeviceConfigs.add(event);

4
plugins/hal-mqtt/test/se/hal/plugin/mqtt/detector/Zigbee2mqttDetectorTest.java
View file

@ -25,8 +25,10 @@ public class Zigbee2mqttDetectorTest {
assertEquals(0, devices.size()); assertEquals(0, devices.size());
devices = detector.parseTopic("zigbee2mqtt/Kitchen Plant Light", "{\"power\":10.48,\"state\":\"ON\"}".getBytes(StandardCharsets.UTF_8)); devices = detector.parseTopic("zigbee2mqtt/Kitchen Plant Light", "{\"power\":10.48,\"state\":\"ON\"}".getBytes(StandardCharsets.UTF_8));
HalMqttOnOffEventConfig actualOnOff = new HalMqttOnOffEventConfig("zigbee2mqtt/Kitchen Plant Light", "$.state");
actualOnOff.setWriteTopicName("zigbee2mqtt/Kitchen Plant Light/set");
assertEquals(1, devices.size()); assertEquals(1, devices.size());
assertEquals(new HalMqttOnOffEventConfig("zigbee2mqtt/Kitchen Plant Light", "$.state"), devices.get(0)); assertEquals(actualOnOff, devices.get(0));
} }
/* /*