Skip to content

Commit a2a6bff

Browse files
author
udaw
committed
Limit custom min/max to tilt angle characteristics
Percentage characteristics and hue have fixed ranges by definition, so only the tilt angles keep the min/max constructors.
1 parent 3389210 commit a2a6bff

16 files changed

Lines changed: 127 additions & 491 deletions

‎CHANGES.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# HAP-Java 2.0.10
2-
* Add constructors with custom min/max (and step for float values) to the remaining range characteristics [#162](https://github.com/hap-java/HAP-Java/issues/162)
2+
* Add constructors with custom min/max to the tilt angle characteristics [#162](https://github.com/hap-java/HAP-Java/issues/162)
33

44
# HAP-Java 2.0.9
55
* Fix Set Duration and Remaining Duration characteristics to advertise format `uint32` instead of `int` [#202](https://github.com/hap-java/HAP-Java/issues/202)

‎src/main/java/io/github/hapjava/characteristics/impl/audio/VolumeCharacteristic.java‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,33 +11,21 @@
1111

1212
/** Volume characteristic to control audio volume. */
1313
public class VolumeCharacteristic extends IntegerCharacteristic implements EventableCharacteristic {
14-
public static final int DEFAULT_MIN_VALUE = 0;
15-
public static final int DEFAULT_MAX_VALUE = 100;
1614

1715
public VolumeCharacteristic(
18-
int minValue,
19-
int maxValue,
2016
Supplier<CompletableFuture<Integer>> getter,
2117
ExceptionalConsumer<Integer> setter,
2218
Consumer<HomekitCharacteristicChangeCallback> subscriber,
2319
Runnable unsubscriber) {
2420
super(
2521
"00000119-0000-1000-8000-0026BB765291",
2622
"volume",
27-
minValue,
28-
maxValue,
23+
0,
24+
100,
2925
"percentage",
3026
Optional.of(getter),
3127
Optional.of(setter),
3228
Optional.of(subscriber),
3329
Optional.of(unsubscriber));
3430
}
35-
36-
public VolumeCharacteristic(
37-
Supplier<CompletableFuture<Integer>> getter,
38-
ExceptionalConsumer<Integer> setter,
39-
Consumer<HomekitCharacteristicChangeCallback> subscriber,
40-
Runnable unsubscriber) {
41-
this(DEFAULT_MIN_VALUE, DEFAULT_MAX_VALUE, getter, setter, subscriber, unsubscriber);
42-
}
4331
}

‎src/main/java/io/github/hapjava/characteristics/impl/battery/BatteryLevelCharacteristic.java‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,20 @@
1111
/** This characteristic describes the current level of the battery. */
1212
public class BatteryLevelCharacteristic extends IntegerCharacteristic
1313
implements EventableCharacteristic {
14-
public static final int DEFAULT_MIN_VALUE = 0;
15-
public static final int DEFAULT_MAX_VALUE = 100;
1614

1715
public BatteryLevelCharacteristic(
18-
int minValue,
19-
int maxValue,
2016
Supplier<CompletableFuture<Integer>> getter,
2117
Consumer<HomekitCharacteristicChangeCallback> subscriber,
2218
Runnable unsubscriber) {
2319
super(
2420
"00000068-0000-1000-8000-0026BB765291",
2521
"battery level",
26-
minValue,
27-
maxValue,
22+
0,
23+
100,
2824
"%",
2925
Optional.of(getter),
3026
Optional.empty(),
3127
Optional.of(subscriber),
3228
Optional.of(unsubscriber));
3329
}
34-
35-
public BatteryLevelCharacteristic(
36-
Supplier<CompletableFuture<Integer>> getter,
37-
Consumer<HomekitCharacteristicChangeCallback> subscriber,
38-
Runnable unsubscriber) {
39-
this(DEFAULT_MIN_VALUE, DEFAULT_MAX_VALUE, getter, subscriber, unsubscriber);
40-
}
4130
}

‎src/main/java/io/github/hapjava/characteristics/impl/common/WaterLavelCharacteristic.java‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,34 +11,21 @@
1111
/** This characteristic describes the water level. */
1212
public class WaterLavelCharacteristic extends FloatCharacteristic
1313
implements EventableCharacteristic {
14-
public static final double DEFAULT_MIN_VALUE = 0;
15-
public static final double DEFAULT_MAX_VALUE = 100;
16-
public static final double DEFAULT_STEP = 1;
1714

1815
public WaterLavelCharacteristic(
19-
double minValue,
20-
double maxValue,
21-
double minStep,
2216
Supplier<CompletableFuture<Double>> getter,
2317
Consumer<HomekitCharacteristicChangeCallback> subscriber,
2418
Runnable unsubscriber) {
2519
super(
2620
"000000B5-0000-1000-8000-0026BB765291",
2721
"water level",
28-
minValue,
29-
maxValue,
30-
minStep,
22+
0,
23+
100,
24+
1,
3125
"%",
3226
Optional.of(getter),
3327
Optional.empty(),
3428
Optional.of(subscriber),
3529
Optional.of(unsubscriber));
3630
}
37-
38-
public WaterLavelCharacteristic(
39-
Supplier<CompletableFuture<Double>> getter,
40-
Consumer<HomekitCharacteristicChangeCallback> subscriber,
41-
Runnable unsubscriber) {
42-
this(DEFAULT_MIN_VALUE, DEFAULT_MAX_VALUE, DEFAULT_STEP, getter, subscriber, unsubscriber);
43-
}
4431
}

‎src/main/java/io/github/hapjava/characteristics/impl/filtermaintenance/FilterLifeLevelCharacteristic.java‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,34 +10,21 @@
1010

1111
public class FilterLifeLevelCharacteristic extends FloatCharacteristic
1212
implements EventableCharacteristic {
13-
public static final double DEFAULT_MIN_VALUE = 0;
14-
public static final double DEFAULT_MAX_VALUE = 100;
15-
public static final double DEFAULT_STEP = 1;
1613

1714
public FilterLifeLevelCharacteristic(
18-
double minValue,
19-
double maxValue,
20-
double minStep,
2115
Supplier<CompletableFuture<Double>> getter,
2216
Consumer<HomekitCharacteristicChangeCallback> subscriber,
2317
Runnable unsubscriber) {
2418
super(
2519
"000000AB-0000-1000-8000-0026BB765291",
2620
"Filter Life Level",
27-
minValue,
28-
maxValue,
29-
minStep,
21+
0,
22+
100,
23+
1,
3024
"%",
3125
Optional.of(getter),
3226
Optional.empty(),
3327
Optional.of(subscriber),
3428
Optional.of(unsubscriber));
3529
}
36-
37-
public FilterLifeLevelCharacteristic(
38-
Supplier<CompletableFuture<Double>> getter,
39-
Consumer<HomekitCharacteristicChangeCallback> subscriber,
40-
Runnable unsubscriber) {
41-
this(DEFAULT_MIN_VALUE, DEFAULT_MAX_VALUE, DEFAULT_STEP, getter, subscriber, unsubscriber);
42-
}
4330
}

‎src/main/java/io/github/hapjava/characteristics/impl/humidifier/HumidityDehumidifierThresholdCharacteristic.java‎

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,43 +13,22 @@
1313
* turns on.
1414
*/
1515
public class HumidityDehumidifierThresholdCharacteristic extends FloatCharacteristic {
16-
public static final double DEFAULT_MIN_VALUE = 0;
17-
public static final double DEFAULT_MAX_VALUE = 100;
18-
public static final double DEFAULT_STEP = 1;
1916

2017
public HumidityDehumidifierThresholdCharacteristic(
21-
double minValue,
22-
double maxValue,
23-
double minStep,
2418
Supplier<CompletableFuture<Double>> getter,
2519
ExceptionalConsumer<Double> setter,
2620
Consumer<HomekitCharacteristicChangeCallback> subscriber,
2721
Runnable unsubscriber) {
2822
super(
2923
"000000C9-0000-1000-8000-0026BB765291",
3024
"humidity threshold dehumidifier",
31-
minValue,
32-
maxValue,
33-
minStep,
25+
0,
26+
100,
27+
1,
3428
"%",
3529
Optional.of(getter),
3630
Optional.of(setter),
3731
Optional.of(subscriber),
3832
Optional.of(unsubscriber));
3933
}
40-
41-
public HumidityDehumidifierThresholdCharacteristic(
42-
Supplier<CompletableFuture<Double>> getter,
43-
ExceptionalConsumer<Double> setter,
44-
Consumer<HomekitCharacteristicChangeCallback> subscriber,
45-
Runnable unsubscriber) {
46-
this(
47-
DEFAULT_MIN_VALUE,
48-
DEFAULT_MAX_VALUE,
49-
DEFAULT_STEP,
50-
getter,
51-
setter,
52-
subscriber,
53-
unsubscriber);
54-
}
5534
}

‎src/main/java/io/github/hapjava/characteristics/impl/humidifier/HumidityHumidifierThresholdCharacteristic.java‎

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,43 +13,22 @@
1313
* turns on.
1414
*/
1515
public class HumidityHumidifierThresholdCharacteristic extends FloatCharacteristic {
16-
public static final double DEFAULT_MIN_VALUE = 0;
17-
public static final double DEFAULT_MAX_VALUE = 100;
18-
public static final double DEFAULT_STEP = 1;
1916

2017
public HumidityHumidifierThresholdCharacteristic(
21-
double minValue,
22-
double maxValue,
23-
double minStep,
2418
Supplier<CompletableFuture<Double>> getter,
2519
ExceptionalConsumer<Double> setter,
2620
Consumer<HomekitCharacteristicChangeCallback> subscriber,
2721
Runnable unsubscriber) {
2822
super(
2923
"000000CA-0000-1000-8000-0026BB765291",
3024
"humidity threshold humidifier",
31-
minValue,
32-
maxValue,
33-
minStep,
25+
0,
26+
100,
27+
1,
3428
"%",
3529
Optional.of(getter),
3630
Optional.of(setter),
3731
Optional.of(subscriber),
3832
Optional.of(unsubscriber));
3933
}
40-
41-
public HumidityHumidifierThresholdCharacteristic(
42-
Supplier<CompletableFuture<Double>> getter,
43-
ExceptionalConsumer<Double> setter,
44-
Consumer<HomekitCharacteristicChangeCallback> subscriber,
45-
Runnable unsubscriber) {
46-
this(
47-
DEFAULT_MIN_VALUE,
48-
DEFAULT_MAX_VALUE,
49-
DEFAULT_STEP,
50-
getter,
51-
setter,
52-
subscriber,
53-
unsubscriber);
54-
}
5534
}

‎src/main/java/io/github/hapjava/characteristics/impl/humiditysensor/CurrentRelativeHumidityCharacteristic.java‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,34 +9,21 @@
99

1010
/** This characteristic describes the current relative humidity. */
1111
public class CurrentRelativeHumidityCharacteristic extends FloatCharacteristic {
12-
public static final double DEFAULT_MIN_VALUE = 0;
13-
public static final double DEFAULT_MAX_VALUE = 100;
14-
public static final double DEFAULT_STEP = 1;
1512

1613
public CurrentRelativeHumidityCharacteristic(
17-
double minValue,
18-
double maxValue,
19-
double minStep,
2014
Supplier<CompletableFuture<Double>> getter,
2115
Consumer<HomekitCharacteristicChangeCallback> subscriber,
2216
Runnable unsubscriber) {
2317
super(
2418
"00000010-0000-1000-8000-0026BB765291",
2519
"Current Relative Humidity",
26-
minValue,
27-
maxValue,
28-
minStep,
20+
0,
21+
100,
22+
1,
2923
"%",
3024
Optional.of(getter),
3125
Optional.empty(),
3226
Optional.of(subscriber),
3327
Optional.of(unsubscriber));
3428
}
35-
36-
public CurrentRelativeHumidityCharacteristic(
37-
Supplier<CompletableFuture<Double>> getter,
38-
Consumer<HomekitCharacteristicChangeCallback> subscriber,
39-
Runnable unsubscriber) {
40-
this(DEFAULT_MIN_VALUE, DEFAULT_MAX_VALUE, DEFAULT_STEP, getter, subscriber, unsubscriber);
41-
}
4229
}

‎src/main/java/io/github/hapjava/characteristics/impl/humiditysensor/TargetRelativeHumidityCharacteristic.java‎

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,43 +10,22 @@
1010

1111
/** This characteristic describes the target relative humidity. */
1212
public class TargetRelativeHumidityCharacteristic extends FloatCharacteristic {
13-
public static final double DEFAULT_MIN_VALUE = 0;
14-
public static final double DEFAULT_MAX_VALUE = 100;
15-
public static final double DEFAULT_STEP = 1;
1613

1714
public TargetRelativeHumidityCharacteristic(
18-
double minValue,
19-
double maxValue,
20-
double minStep,
2115
Supplier<CompletableFuture<Double>> getter,
2216
ExceptionalConsumer<Double> setter,
2317
Consumer<HomekitCharacteristicChangeCallback> subscriber,
2418
Runnable unsubscriber) {
2519
super(
2620
"00000034-0000-1000-8000-0026BB765291",
2721
"Target Relative Humidity",
28-
minValue,
29-
maxValue,
30-
minStep,
22+
0,
23+
100,
24+
1,
3125
"%",
3226
Optional.of(getter),
3327
Optional.of(setter),
3428
Optional.of(subscriber),
3529
Optional.of(unsubscriber));
3630
}
37-
38-
public TargetRelativeHumidityCharacteristic(
39-
Supplier<CompletableFuture<Double>> getter,
40-
ExceptionalConsumer<Double> setter,
41-
Consumer<HomekitCharacteristicChangeCallback> subscriber,
42-
Runnable unsubscriber) {
43-
this(
44-
DEFAULT_MIN_VALUE,
45-
DEFAULT_MAX_VALUE,
46-
DEFAULT_STEP,
47-
getter,
48-
setter,
49-
subscriber,
50-
unsubscriber);
51-
}
5231
}

‎src/main/java/io/github/hapjava/characteristics/impl/lightbulb/BrightnessCharacteristic.java‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,33 +15,21 @@
1515
*/
1616
public class BrightnessCharacteristic extends IntegerCharacteristic
1717
implements EventableCharacteristic {
18-
public static final int DEFAULT_MIN_VALUE = 0;
19-
public static final int DEFAULT_MAX_VALUE = 100;
2018

2119
public BrightnessCharacteristic(
22-
int minValue,
23-
int maxValue,
2420
Supplier<CompletableFuture<Integer>> getter,
2521
ExceptionalConsumer<Integer> setter,
2622
Consumer<HomekitCharacteristicChangeCallback> subscriber,
2723
Runnable unsubscriber) {
2824
super(
2925
"00000008-0000-1000-8000-0026BB765291",
3026
"level of brightness",
31-
minValue,
32-
maxValue,
27+
0,
28+
100,
3329
"%",
3430
Optional.of(getter),
3531
Optional.of(setter),
3632
Optional.of(subscriber),
3733
Optional.of(unsubscriber));
3834
}
39-
40-
public BrightnessCharacteristic(
41-
Supplier<CompletableFuture<Integer>> getter,
42-
ExceptionalConsumer<Integer> setter,
43-
Consumer<HomekitCharacteristicChangeCallback> subscriber,
44-
Runnable unsubscriber) {
45-
this(DEFAULT_MIN_VALUE, DEFAULT_MAX_VALUE, getter, setter, subscriber, unsubscriber);
46-
}
4735
}

0 commit comments

Comments
 (0)