add support for custom min/max values for temperatures

Signed-off-by: Eugen Freiter <[email protected]>

Author: Eugen Freiter

src/main/java/io/github/hapjava/accessories/TemperatureSensorAccessory.java

@@ -21,6 +21,36 @@ public interface TemperatureSensorAccessory extends HomekitAccessory {
    */
   CompletableFuture<Double> getCurrentTemperature();
 
+  /**
+   * return the min value for current temperature. overwrite if you want to change the default
+   * value.
+   *
+   * @return min current temperature
+   */
+  default double getMinCurrentTemperature() {
+    return 0;
+  }
+
+  /**
+   * return the max value for current temperature. overwrite if you want to change the default
+   * value.
+   *
+   * @return max current temperature
+   */
+  default double getMaxCurrentTemperature() {
+    return 100;
+  }
+
+  /**
+   * return the min step value for current temperature. overwrite if you want to change the default
+   * value.
+   *
+   * @return min step current temperature
+   */
+  default double getMinStepCurrentTemperature() {
+    return 0.1;
+  }
+
   /**
    * Subscribes to changes in the current temperature.
    *

src/main/java/io/github/hapjava/accessories/ThermostatAccessory.java

@@ -24,6 +24,36 @@ public interface ThermostatAccessory extends HomekitAccessory {
    */
   CompletableFuture<Double> getCurrentTemperature();
 
+  /**
+   * return the min value for current temperature. overwrite if you want to change the default
+   * value.
+   *
+   * @return min current temperature
+   */
+  default double getMinCurrentTemperature() {
+    return 0;
+  }
+
+  /**
+   * return the max value for current temperature. overwrite if you want to change the default
+   * value.
+   *
+   * @return max current temperature
+   */
+  default double getMaxCurrentTemperature() {
+    return 100;
+  }
+
+  /**
+   * return the min step value for current temperature. overwrite if you want to change the default
+   * value.
+   *
+   * @return min step current temperature
+   */
+  default double getMinStepCurrentTemperature() {
+    return 0.1;
+  }
+
   /**
    * Retrieves the target temperature, in celsius degrees.
    *
@@ -39,6 +69,34 @@ public interface ThermostatAccessory extends HomekitAccessory {
    */
   void setTargetTemperature(Double value) throws Exception;
 
+  /**
+   * return the min value for target temperature. overwrite if you want to change the default value.
+   *
+   * @return min target temperature
+   */
+  default double getMinTargetTemperature() {
+    return 10;
+  }
+
+  /**
+   * return the max value for target temperature. overwrite if you want to change the default value.
+   *
+   * @return max target temperature
+   */
+  default double getMaxTargetTemperature() {
+    return 38;
+  }
+
+  /**
+   * return the min step value for target temperature. overwrite if you want to change the default
+   * value.
+   *
+   * @return min step target temperature
+   */
+  default double getMinStepTargetTemperature() {
+    return 0.1;
+  }
+
   /**
    * Retrieves the current {@link CurrentHeatingCoolingStateEnum} of the thermostat.
    *

src/main/java/io/github/hapjava/characteristics/impl/thermostat/CurrentTemperatureCharacteristic.java

@@ -11,19 +11,29 @@
 public class CurrentTemperatureCharacteristic extends FloatCharacteristic {
 
   public CurrentTemperatureCharacteristic(
+      double minValue,
+      double maxValue,
+      double minStep,
       Supplier<CompletableFuture<Double>> getter,
       Consumer<HomekitCharacteristicChangeCallback> subscriber,
       Runnable unsubscriber) {
     super(
         "00000011-0000-1000-8000-0026BB765291",
         "current temperature",
-        0,
-        100,
-        0.1,
+        minValue,
+        maxValue,
+        minStep,
         "C",
         Optional.of(getter),
         Optional.empty(),
         Optional.of(subscriber),
         Optional.of(unsubscriber));
   }
+
+  public CurrentTemperatureCharacteristic(
+      Supplier<CompletableFuture<Double>> getter,
+      Consumer<HomekitCharacteristicChangeCallback> subscriber,
+      Runnable unsubscriber) {
+    this(0, 100, 0.1, getter, subscriber, unsubscriber);
+  }
 }

src/main/java/io/github/hapjava/characteristics/impl/thermostat/TargetTemperatureCharacteristic.java

@@ -15,20 +15,31 @@
 public class TargetTemperatureCharacteristic extends FloatCharacteristic {
 
   public TargetTemperatureCharacteristic(
+      double minValue,
+      double maxValue,
+      double minStep,
       Supplier<CompletableFuture<Double>> getter,
       ExceptionalConsumer<Double> setter,
       Consumer<HomekitCharacteristicChangeCallback> subscriber,
       Runnable unsubscriber) {
     super(
         "00000035-0000-1000-8000-0026BB765291",
         "target temperature",
-        10,
-        38,
-        0.1,
+        minValue,
+        maxValue,
+        minStep,
         "C",
         Optional.of(getter),
         Optional.of(setter),
         Optional.of(subscriber),
         Optional.of(unsubscriber));
   }
+
+  public TargetTemperatureCharacteristic(
+      Supplier<CompletableFuture<Double>> getter,
+      ExceptionalConsumer<Double> setter,
+      Consumer<HomekitCharacteristicChangeCallback> subscriber,
+      Runnable unsubscriber) {
+    this(10, 38, 0.1, getter, setter, subscriber, unsubscriber);
+  }
 }

src/main/java/io/github/hapjava/services/impl/TemperatureSensorService.java

@@ -25,6 +25,9 @@ public TemperatureSensorService(
   public TemperatureSensorService(TemperatureSensorAccessory accessory) {
     this(
         new CurrentTemperatureCharacteristic(
+            accessory.getMinCurrentTemperature(),
+            accessory.getMaxCurrentTemperature(),
+            accessory.getMinStepCurrentTemperature(),
             accessory::getCurrentTemperature,
             accessory::subscribeCurrentTemperature,
             accessory::unsubscribeCurrentTemperature));

src/main/java/io/github/hapjava/services/impl/ThermostatService.java

@@ -46,10 +46,16 @@ public ThermostatService(ThermostatAccessory accessory) {
             accessory::subscribeTargetState,
             accessory::unsubscribeTargetState),
         new CurrentTemperatureCharacteristic(
+            accessory.getMinCurrentTemperature(),
+            accessory.getMaxCurrentTemperature(),
+            accessory.getMinStepCurrentTemperature(),
             accessory::getCurrentTemperature,
             accessory::subscribeCurrentTemperature,
             accessory::unsubscribeCurrentTemperature),
         new TargetTemperatureCharacteristic(
+            accessory.getMinTargetTemperature(),
+            accessory.getMaxTargetTemperature(),
+            accessory.getMinStepTargetTemperature(),
             accessory::getTargetTemperature,
             accessory::setTargetTemperature,
             accessory::subscribeTargetTemperature,