Merge pull request #93 from dvdgeisler/bugfix/update_off_on_condition

#92 Support new sunset conditions
dvdgeisler · Jul 6, 2023 · 6fc27df · 6fc27df
2 parents de5097d + d5b70e7
commit 6fc27df
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/...client-api/src/main/java/de/dvdgeisler/iot/dirigera/client/api/MotionSensorDeviceApi.java b/...client-api/src/main/java/de/dvdgeisler/iot/dirigera/client/api/MotionSensorDeviceApi.java
@@ -6,7 +6,6 @@
 import reactor.core.publisher.Mono;
 
 import java.time.Duration;
-import java.time.LocalTime;
 
 public class MotionSensorDeviceApi extends ControllerDeviceApi<
         MotionSensorStateAttributes,
@@ -58,16 +57,17 @@ public Mono<MotionSensorDevice> disableSchedule(final MotionSensorDevice device)
         return this.setConfigurationAttribute(device, attributes);
     }
 
-    public Mono<MotionSensorDevice> setSchedule(final MotionSensorDevice device, final LocalTime from, final LocalTime to) {
+    public Mono<MotionSensorDevice> setSchedule(final MotionSensorDevice device, final String from, final int offSetFrom,
+                                                final String to, final int offSetTo) {
         final MotionSensorConfigurationAttributes attributes;
 
         attributes = new MotionSensorConfigurationAttributes();
         attributes.sensorConfig = new MotionSensorConfig(
                 null,
                 null,
                 new MotionSensorSchedule(
-                        new MotionSensorScheduleEntry(from),
-                        new MotionSensorScheduleEntry(to)
+                        new MotionSensorScheduleEntry(from, offSetFrom),
+                        new MotionSensorScheduleEntry(to, offSetTo)
                 )
         );
 

diff --git a/...dgeisler/iot/dirigera/client/api/model/device/motionsensor/MotionSensorScheduleEntry.java b/...dgeisler/iot/dirigera/client/api/model/device/motionsensor/MotionSensorScheduleEntry.java
@@ -1,17 +1,14 @@
 package de.dvdgeisler.iot.dirigera.client.api.model.device.motionsensor;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.time.LocalTime;
-
 public class MotionSensorScheduleEntry {
-    @JsonFormat(pattern="HH:mm")
-    public LocalTime time;
+    public String time;
+    public int offset;
 
     public MotionSensorScheduleEntry() {
     }
 
-    public MotionSensorScheduleEntry(final LocalTime time) {
+    public MotionSensorScheduleEntry(String time, int offset) {
         this.time = time;
+        this.offset = offset;
     }
 }