demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-10 15:11:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

[homekit] don't pre-fill enums from switches if metadata has enum values (#17142)

Browse Source 
this is especially important when linking a many-valued enum (such as
CurrentHeatingCoolingState) to a switch, and you want to use a value
beyond 0 and 1 (i.e. OFF (0) and COOL (2)).

Signed-off-by: Cody Cutrer <cody@cutrer.us>
Signed-off-by: Ciprian Pascu <contact@ciprianpascu.ro>
This commit is contained in:
Cody Cutrer 2024-07-25 01:16:41 -06:00 committed by Ciprian Pascu
parent 83026e555f
commit a21ee9de6f
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitCharacteristicFactory.java
View File

@ -339,13 +339,24 @@ public class HomekitCharacteristicFactory {
@Nullable
T offEnumValue = null, onEnumValue = null;
var configuration = item.getConfiguration();
boolean configurationDefinesEnumValues = false;
if (configuration != null && !configuration.isEmpty()) {
for (var k : klazz.getEnumConstants()) {
if (configuration.containsKey(k.toString())) {
configurationDefinesEnumValues = true;
break;
}
}
}
for (var k : klazz.getEnumConstants()) {
if (numberType) {
int code = k.getCode();
if ((switchType || contactType) && code == 0) {
if ((switchType || contactType) && code == 0 && !configurationDefinesEnumValues) {
map.put(k, inverted ? onValue : offValue);
offEnumValue = k;
} else if ((switchType || contactType) && code == 1) {
} else if ((switchType || contactType) && code == 1 && !configurationDefinesEnumValues) {
map.put(k, inverted ? offValue : onValue);
onEnumValue = k;
} else if (percentType && code == 0) {
@ -359,8 +370,7 @@ public class HomekitCharacteristicFactory {
map.put(k, k.toString());
}
}
var configuration = item.getConfiguration();
if (configuration != null) {
if (configuration != null && !configuration.isEmpty()) {
map.forEach((k, current_value) -> {
final Object newValue = configuration.get(k.toString());
if (newValue instanceof String || newValue instanceof Number) {