* Set QOS to 1 and Retained as default

* Pass subscription topic suffix as parameter (i.e. "set") * Fix mixed up bound checks for color temperature
dvdgeisler · Nov 24, 2022 · 32355a4 · 32355a4
1 parent eb9cade
commit 32355a4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/...ient-mqtt/src/main/java/de/dvdgeisler/iot/dirigera/client/mqtt/hass/HassEventHandler.java b/...ient-mqtt/src/main/java/de/dvdgeisler/iot/dirigera/client/mqtt/hass/HassEventHandler.java
@@ -56,22 +56,35 @@ protected String topic(final MqttBridge mqtt, final _Device device, final String
                 .collect(Collectors.joining("/"));
     }
 
-    protected <T> MqttBridgeMessage<_Device> build(final MqttBridge mqtt, final _Device device, final String topic, final T payload) {
+    protected <T> MqttBridgeMessage<_Device> build(
+            final MqttBridge mqtt,
+            final _Device device,
+            final String topic,
+            final T payload) {
         try {
             return new MqttBridgeMessage<>(
                     device,
                     this,
                     this.topic(mqtt, device, topic),
-                    new MqttMessage(this.objectMapper.writeValueAsBytes(payload)));
+                    new MqttMessage(this.objectMapper.writeValueAsBytes(payload)){{
+                        this.setQos(1);
+                        this.setRetained(true);
+                    }});
         } catch (JsonProcessingException e) {
             log.error(e.getMessage());
         }
         return null;
     }
 
-    protected void subscribe(final MqttBridge mqtt, final DirigeraApi api, final _Device device) {
+    protected void subscribe(final MqttBridge mqtt, final DirigeraApi api, final _Device device, final String topicSuffix) {
+        final String topic;
+
         try {
-            mqtt.subscribe(this.topic(mqtt, device, "set"), (topic, message) -> {
+            topic = this.topic(mqtt, device, topicSuffix);
+            log.info("Subscribe to device: topic={}, id={}, name={}, category={}, type={}",
+                    topic, device.id, device.attributes.state.customName, device.deviceType, device.type);
+
+            mqtt.subscribe(this.topic(mqtt, device, topicSuffix), (t, message) -> {
                 final _DeviceState state;
 
                 try {

diff --git a/...ent-mqtt/src/main/java/de/dvdgeisler/iot/dirigera/client/mqtt/hass/LightEventHandler.java b/...ent-mqtt/src/main/java/de/dvdgeisler/iot/dirigera/client/mqtt/hass/LightEventHandler.java
@@ -51,8 +51,8 @@ public void setDevice(final MqttBridge mqtt, final DirigeraApi api, final LightD
 
         Optional.ofNullable(status.color_temp)
                 .filter(t -> canReceive(device, "colorTemperature"))
-                .map(t -> max(t, getMaxTemperatureMireds(device))) // todo: getMaxTemperatureMireds may return null
-                .map(t -> min(t, getMinTemperatureMireds(device))) // todo: getMinTemperatureMireds may return null
+                .flatMap(t -> Optional.ofNullable(getMaxTemperatureMireds(device)).map(maxT -> min(t, maxT)))
+                .flatMap(t -> Optional.ofNullable(getMinTemperatureMireds(device)).map(minT -> max(t, minT)))
                 .map(LightUtils::miredsToKelvin)
                 .map(t -> api.device.light.setTemperature(device, t))
                 .ifPresent(Mono::block);
@@ -81,7 +81,7 @@ public Stream<MqttBridgeMessage<LightDevice>> addDevice(
         final List<LightColorMode> colorModes;
 
         colorModes = colorModes(device);
-        this.subscribe(mqtt, api, device);
+        this.subscribe(mqtt, api, device, TOPIC_SET);
         return Stream.of(this.build(mqtt, device, TOPIC_CONFIG,
                 new LightConfig(
                         device.id,

diff --git a/...nt-mqtt/src/main/java/de/dvdgeisler/iot/dirigera/client/mqtt/hass/OutletEventHandler.java b/...nt-mqtt/src/main/java/de/dvdgeisler/iot/dirigera/client/mqtt/hass/OutletEventHandler.java
@@ -55,7 +55,7 @@ public Stream<MqttBridgeMessage<OutletDevice>> addDevice(
             final DirigeraApi api,
             final OutletDevice device) {
 
-        this.subscribe(mqtt, api, device);
+        this.subscribe(mqtt, api, device, TOPIC_SET);
         return Stream.of(this.build(mqtt, device, TOPIC_CONFIG,
                 new OutletConfig(
                         device.id,