From bd949518de3ac55349a1882efecf63940073437d Mon Sep 17 00:00:00 2001 From: eugen Date: Thu, 4 Feb 2021 07:06:20 +0100 Subject: [PATCH] [homekit] mapping configuration improvements (#9932) * add support for custom mapping * add screenshot * remove unnecessary variable * make parameter nullable to avoid not required list instances Signed-off-by: Eugen Freiter --- bundles/org.openhab.io.homekit/README.md | 401 +++++++++++------- .../doc/mode_mapping.png | Bin 0 -> 52799 bytes .../homekit/internal/HomekitAuthInfoImpl.java | 5 +- .../AbstractHomekitAccessoryImpl.java | 20 +- .../accessories/HomekitHeaterCoolerImpl.java | 21 +- .../HomekitSecuritySystemImpl.java | 23 +- .../accessories/HomekitThermostatImpl.java | 135 +++--- 7 files changed, 349 insertions(+), 256 deletions(-) create mode 100644 bundles/org.openhab.io.homekit/doc/mode_mapping.png diff --git a/bundles/org.openhab.io.homekit/README.md b/bundles/org.openhab.io.homekit/README.md index 6cc248fe4..60c7d786b 100644 --- a/bundles/org.openhab.io.homekit/README.md +++ b/bundles/org.openhab.io.homekit/README.md @@ -108,10 +108,10 @@ org.openhab.homekit:maximumTemperature=100 | pin | Pin code used for pairing with iOS devices. Apparently, pin codes are provided by Apple and represent specific device types, so they cannot be chosen freely. The pin code 031-45-154 is used in sample applications and known to work. | 031-45-154 | | startDelay | HomeKit start delay in seconds in case the number of accessories is lower than last time. This helps to avoid resetting home app in case not all items have been initialised properly before HomeKit integration start. | 30 | | useFahrenheitTemperature | Set to true to use Fahrenheit degrees, or false to use Celsius degrees. | false | -| thermostatTargetModeCool | Word used for activating the cooling mode of the device (if applicable). | CoolOn | -| thermostatTargetModeHeat | Word used for activating the heating mode of the device (if applicable). | HeatOn | -| thermostatTargetModeAuto | Word used for activating the automatic mode of the device (if applicable). | Auto | -| thermostatTargetModeOff | Word used to set the thermostat mode of the device to off (if applicable). | Off | +| thermostatTargetModeCool | Word used for activating the cooling mode of the device (if applicable). It can be overwritten at item level. | CoolOn | +| thermostatTargetModeHeat | Word used for activating the heating mode of the device (if applicable). It can be overwritten at item level. | HeatOn | +| thermostatTargetModeAuto | Word used for activating the automatic mode of the device (if applicable). It can be overwritten at item level. | Auto | +| thermostatTargetModeOff | Word used to set the thermostat mode of the device to off (if applicable). It can be overwritten at item level. | Off | | minimumTemperature | Lower bound of possible temperatures, used in the user interface of the iOS device to display the allowed temperature range. Note that this setting applies to all devices in HomeKit. | -100 | | maximumTemperature | Upper bound of possible temperatures, used in the user interface of the iOS device to display the allowed temperature range. Note that this setting applies to all devices in HomeKit. | 100 | | name | Name under which this HomeKit bridge is announced on the network. This is also the name displayed on the iOS device when searching for available bridges. | openHAB | @@ -198,6 +198,242 @@ Switch light1 "Light 1" (gLight) {homekit="Lighting.OnState"} Switch light2 "Light 2" (gLight) {homekit="Lighting.OnState"} ``` + +## Accessory Configuration Details + +This section provides examples widely used accessory types. +For complete list of supported accessory types and characteristics please see section [Supported accessory type](#Supported accessory type) + +### Dimmers + +The way HomeKit handles dimmer devices can be different to the actual dimmers' way of working. +HomeKit home app sends following commands/update: + +- On brightness change home app sends "ON" event along with target brightness, e.g. "Brightness = 50%" + "State = ON". +- On "ON" event home app sends "ON" along with brightness 100%, i.e. "Brightness = 100%" + "State = ON" +- On "OFF" event home app sends "OFF" without brightness information. + +However, some dimmer devices for example do not expect brightness on "ON" event, some others do not expect "ON" upon brightness change. +In order to support different devices HomeKit integration can filter some events. Which events should be filtered is defined via dimmerMode configuration. + +```xtend +Dimmer dimmer_light "Dimmer Light" {homekit="Lighting, Lighting.Brightness" [dimmerMode=""]} +``` + +Following modes are supported: + +- "normal" - no filtering. The commands will be sent to device as received from HomeKit. This is default mode. +- "filterOn" - ON events are filtered out. only OFF events and brightness information are sent +- "filterBrightness100" - only Brightness=100% is filtered out. everything else sent unchanged. This allows custom logic for soft launch in devices. +- "filterOnExceptBrightness100" - ON events are filtered out in all cases except of brightness = 100%. + +Examples: + + ```xtend + Dimmer dimmer_light_1 "Dimmer Light 1" {homekit="Lighting, Lighting.Brightness" [dimmerMode="filterOn"]} + Dimmer dimmer_light_2 "Dimmer Light 2" {homekit="Lighting, Lighting.Brightness" [dimmerMode="filterBrightness100"]} + Dimmer dimmer_light_3 "Dimmer Light 3" {homekit="Lighting, Lighting.Brightness" [dimmerMode="filterOnExceptBrightness100"]} + ``` + +### Windows Covering (Blinds) / Window / Door + +HomeKit Windows Covering, Window and Door accessory types have following mandatory characteristics: + +- CurrentPosition (0-100% of current window covering position) +- TargetPosition (0-100% of target position) +- PositionState (DECREASING,INCREASING or STOPPED as state). If no state provided, HomeKit will send STOPPED + +These characteristics can be mapped to a single openHAB rollershutter item. In such case currentPosition will always equal target position, means if you request to close a blind/window/door, HomeKit will immediately report that the blind/window/door is closed. +As discussed above, one can use full or shorthand definition. Following two definitions are equal: + +```xtend +Rollershutter window "Window" {homekit = "Window"} +Rollershutter door "Door" {homekit = "Door"} +Rollershutter window_covering "Window Rollershutter" {homekit = "WindowCovering"} +Rollershutter window_covering_long "Window Rollershutter long" {homekit = "WindowCovering, WindowCovering.CurrentPosition, WindowCovering.TargetPosition, WindowCovering.PositionState"} + ``` + +openHAB Rollershutter is defined by default as: + +- OPEN if position is 0%, +- CLOSED if position is 100%. + +In contrast, HomeKit window covering/door/window have inverted mapping + +- OPEN if position 100% +- CLOSED if position is 0% + +Therefore, HomeKit integration inverts by default the values between openHAB and HomeKit, e.g. if openHAB current position is 30% then it will send 70% to HomeKit app. +In case you need to disable this logic you can do it with configuration parameter inverted="false", e.g. + +```xtend +Rollershutter window_covering "Window Rollershutter" {homekit = "WindowCovering" [inverted="false"]} +Rollershutter window "Window" {homekit = "Window" [inverted="false"]} +Rollershutter door "Door" {homekit = "Door" [inverted="false"]} + + ``` + +Window covering can have a number of optional characteristics like horizontal & vertical tilt, obstruction status and hold position trigger. +If your blind supports tilt, and you want to control tilt via HomeKit you need to define blind as a group. +e.g. + +```xtend +Group gBlind "Blind with tilt" {homekit = "WindowCovering"} +Rollershutter window_covering "Blind" (gBlind) {homekit = "WindowCovering"} +Dimmer window_covering_htilt "Blind horizontal tilt" (gBlind) {homekit = "WindowCovering.CurrentHorizontalTiltAngle, WindowCovering.TargetHorizontalTiltAngle"} +Dimmer window_covering_vtilt "Blind vertical tilt" (gBlind) {homekit = "WindowCovering.CurrentVerticalTiltAngle, WindowCovering.TargetVerticalTiltAngle"} + ``` +### Thermostat +A HomeKit thermostat has following mandatory characteristics: + +- CurrentTemperature +- TargetTemperature +- CurrentHeatingCoolingMode +- TargetHeatingCoolingMode + +In order to define a thermostat you need to create a group with at least these 4 items. +Example: + +```xtend +Group gThermostat "Thermostat" {homekit = "Thermostat"} +Number thermostat_current_temp "Thermostat Current Temp [%.1f C]" (gThermostat) {homekit = "CurrentTemperature"} +Number thermostat_target_temp "Thermostat Target Temp[%.1f C]" (gThermostat) {homekit = "TargetTemperature"} +String thermostat_current_mode "Thermostat Current Mode" (gThermostat) {homekit = "CurrentHeatingCoolingMode"} +String thermostat_target_mode "Thermostat Target Mode" (gThermostat) {homekit = "TargetHeatingCoolingMode"} +``` + +In addition, thermostat can have thresholds for cooling and heating modes. +Example with thresholds: + +```xtend +Group gThermostat "Thermostat" {homekit = "Thermostat"} +Number thermostat_current_temp "Thermostat Current Temp [%.1f C]" (gThermostat) {homekit = "CurrentTemperature"} +Number thermostat_target_temp "Thermostat Target Temp[%.1f C]" (gThermostat) {homekit = "TargetTemperature"} +String thermostat_current_mode "Thermostat Current Mode" (gThermostat) {homekit = "CurrentHeatingCoolingMode"} +String thermostat_target_mode "Thermostat Target Mode" (gThermostat) {homekit = "TargetHeatingCoolingMode"} +Number thermostat_cool_thrs "Thermostat Cool Threshold Temp [%.1f C]" (gThermostat) {homekit = "CoolingThresholdTemperature"} +Number thermostat_heat_thrs "Thermostat Heat Threshold Temp [%.1f C]" (gThermostat) {homekit = "HeatingThresholdTemperature"} +``` + +#### Min / max temperatures + +Current and target temperatures have default min and max values. Any values below or above max limits will be replaced with min or max limits. +Default limits are: +- current temperature: min value = 0 C, max value = 100 C +- target temperature: min value = 10 C, max value = 38 C + +You can overwrite default values using minValue and maxValue configuration at item level, e.g. + +```xtend +Number thermostat_current_temp "Thermostat Current Temp [%.1f C]" (gThermostat) {homekit = "CurrentTemperature" [minValue=5, maxValue=30]} +Number thermostat_target_temp "Thermostat Target Temp[%.1f C]" (gThermostat) {homekit = "TargetTemperature" [minValue=10.5, maxValue=27]} +``` + +#### Thermostat modes + +HomeKit thermostat supports following modes + +- CurrentHeatingCoolingMode: OFF, HEAT, COOL +- TargetHeatingCoolingMode: OFF, HEAT, COOL, AUTO + +These modes are mapped to string values of openHAB items using either global configuration (see [Global Configuration](#Global Configuration)) or configuration at item level. +e.g. if your current mode item can have following values: "OFF", "HEATING", "COOLING" then you need following mapping at item level + +```xtend +String thermostat_current_mode "Thermostat Current Mode" (gThermostat) {homekit = "CurrentHeatingCoolingMode" [OFF="OFF", HEAT="HEATING", COOL="COOLING"]} +``` + +You can provide mapping for target mode in similar way. + +The custom mapping at item level can be also used to reduce number of modes shown in home app. The modes can be only reduced, but not added, i.e. it is not possible to add new custom mode to HomeKit thermostat. + +Example: if your thermostat does not support cooling, then you need to limit mapping to OFF and HEAT values only: + +```xtend +String thermostat_current_mode "Thermostat Current Mode" (gThermostat) {homekit = "CurrentHeatingCoolingMode" [HEAT="HEATING", OFF="OFF"]} +String thermostat_target_mode "Thermostat Target Mode" (gThermostat) {homekit = "TargetHeatingCoolingMode" [HEAT="HEATING", OFF="OFF"]} +``` + +The mapping using main UI looks like following: + +![mode_mapping.png](doc/mode_mapping.png) + +### Valve + +The HomeKit valve accessory supports following 2 optional characteristics: + +- duration: this describes how long the valve should set "InUse" once it is activated. The duration changes will apply to the next operation. If valve is already active then duration changes have no effect. + +- remaining duration: this describes the remaining duration on the valve. Notifications on this characteristic must only be used if the remaining duration increases/decreases from the accessoryʼs usual countdown of remaining duration. + +Upon valve activation in home app, home app starts to count down from the "duration" to "0" without contacting the server. Home app also does not trigger any action if it remaining duration get 0. +It is up to valve to have an own timer and stop valve once the timer is over. +Some valves have such timer, e.g. pretty common for sprinklers. +In case the valve has no timer capability, openHAB can take care on this - start an internal timer and send "Off" command to the valve once the timer is over. + +configuration for these two cases looks as follow: + +- valve with timer: + +```xtend +Group gValve "Valve Group" {homekit="Valve" [homekitValveType="Irrigation"]} +Switch valve_active "Valve active" (gValve) {homekit = "Valve.ActiveStatus, Valve.InUseStatus"} +Number valve_duration "Valve duration" (gValve) {homekit = "Valve.Duration"} +Number valve_remaining_duration "Valve remaining duration" (gValve) {homekit = "Valve.RemainingDuration"} +``` + +- valve without timer (no item for remaining duration required) + +```xtend +Group gValve "Valve Group" {homekit="Valve" [homekitValveType="Irrigation", homekitTimer="true]} +Switch valve_active "Valve active" (gValve) {homekit = "Valve.ActiveStatus, Valve.InUseStatus"} +Number valve_duration "Valve duration" (gValve) {homekit = "Valve.Duration" [homekitDefaultDuration = 1800]} +``` + +### Sensors + +Sensors have typically one mandatory characteristic, e.g. temperature or lead trigger, and several optional characteristics which are typically used for battery powered sensors and/or wireless sensors. +Following table summarizes the optional characteristics supported by sensors. + +| Characteristics | Supported openHAB items | Description | +|:-----------------------------|:-------------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| Name | String | Name of the sensor. This characteristic is interesting only for very specific cases in which the name of accessory is dynamic. if you not sure then you don't need it. | +| ActiveStatus | Switch, Contact | Accessory current working status. "ON"/"OPEN" indicates that the accessory is active and is functioning without any errors. | +| FaultStatus | Switch, Contact | Accessory fault status. "ON"/"OPEN" value indicates that the accessory has experienced a fault that may be interfering with its intended functionality. A value of "OFF"/"CLOSED" indicates that there is no fault. | +| TamperedStatus | Switch, Contact | Accessory tampered status. "ON"/"OPEN" indicates that the accessory has been tampered. Value should return to "OFF"/"CLOSED" when the accessory has been reset to a non-tampered state. | +| BatteryLowStatus | Switch, Contact | Accessory battery status. "ON"/"OPEN" indicates that the battery level of the accessory is low. Value should return to "OFF"/"CLOSED" when the battery charges to a level thats above the low threshold. | + +Examples of sensor definitions. +Sensors without optional characteristics: + +```xtend +Switch leaksensor_single "Leak Sensor" {homekit="LeakSensor"} +Number light_sensor "Light Sensor" {homekit="LightSensor"} +Number temperature_sensor "Temperature Sensor [%.1f C]" {homekit="TemperatureSensor"} +Contact contact_sensor "Contact Sensor" {homekit="ContactSensor"} +Switch occupancy_sensor "Occupancy Sensor" {homekit="OccupancyDetectedState"} +Switch motion_sensor "Motion Sensor" {homekit="MotionSensor"} +Number humidity_sensor "Humidity Sensor" {homekit="HumiditySensor"} +``` + +Sensors with optional characteristics: + +```xtend +Group gLeakSensor "Leak Sensor" {homekit="LeakSensor"} +Switch leaksensor "Leak Sensor State" (gLeakSensor) {homekit="LeakDetectedState"} +Switch leaksensor_bat "Leak Sensor Battery" (gLeakSensor) {homekit="BatteryLowStatus"} +Switch leaksensor_active "Leak Sensor Active" (gLeakSensor) {homekit="ActiveStatus"} +Switch leaksensor_fault "Leak Sensor Fault" (gLeakSensor) {homekit="FaultStatus"} +Switch leaksensor_tampered "Leak Sensor Tampered" (gLeakSensor) {homekit="TamperedStatus"} + +Group gMotionSensor "Motion Sensor" {homekit="MotionSensor"} +Switch motionsensor "Motion Sensor State" (gMotionSensor) {homekit="MotionDetectedState"} +Switch motionsensor_bat "Motion Sensor Battery" (gMotionSensor) {homekit="BatteryLowStatus"} +Switch motionsensor_active "Motion Sensor Active" (gMotionSensor) {homekit="ActiveStatus"} +Switch motionsensor_fault "Motion Sensor Fault" (gMotionSensor) {homekit="FaultStatus"} +Switch motionsensor_tampered "Motion Sensor Tampered" (gMotionSensor) {homekit="TamperedStatus"} +``` + ## Supported accessory type | Accessory Tag | Mandatory Characteristics | Optional Characteristics | Supported OH items | Description | @@ -461,163 +697,6 @@ Number cooler_cool_thrs "Cooler Cool Threshold Temp [%.1f C]" (gCo Number cooler_heat_thrs "Cooler Heat Threshold Temp [%.1f C]" (gCooler) {homekit="HeatingThresholdTemperature" [minValue=0.5, maxValue=20]} ``` -## Accessory Configuration Details - -### Dimmers - -The way HomeKit handles dimmer devices can be different to the actual dimmers' way of working. -HomeKit home app sends following commands/update: - -- On brightness change home app sends "ON" event along with target brightness, e.g. "Brightness = 50%" + "State = ON". -- On "ON" event home app sends "ON" along with brightness 100%, i.e. "Brightness = 100%" + "State = ON" -- On "OFF" event home app sends "OFF" without brightness information. - -However, some dimmer devices for example do not expect brightness on "ON" event, some others do not expect "ON" upon brightness change. -In order to support different devices HomeKit integration can filter some events. Which events should be filtered is defined via dimmerMode configuration. - -```xtend -Dimmer dimmer_light "Dimmer Light" {homekit="Lighting, Lighting.Brightness" [dimmerMode=""]} -``` - -Following modes are supported: - -- "normal" - no filtering. The commands will be sent to device as received from HomeKit. This is default mode. -- "filterOn" - ON events are filtered out. only OFF events and brightness information are sent -- "filterBrightness100" - only Brightness=100% is filtered out. everything else sent unchanged. This allows custom logic for soft launch in devices. -- "filterOnExceptBrightness100" - ON events are filtered out in all cases except of brightness = 100%. - - Examples: - - ```xtend - Dimmer dimmer_light_1 "Dimmer Light 1" {homekit="Lighting, Lighting.Brightness" [dimmerMode="filterOn"]} - Dimmer dimmer_light_2 "Dimmer Light 2" {homekit="Lighting, Lighting.Brightness" [dimmerMode="filterBrightness100"]} - Dimmer dimmer_light_3 "Dimmer Light 3" {homekit="Lighting, Lighting.Brightness" [dimmerMode="filterOnExceptBrightness100"]} - ``` - -### Windows Covering (Blinds) / Window / Door - -HomeKit Windows Covering, Window and Door accessory types have following mandatory characteristics: - -- CurrentPosition (0-100% of current window covering position) -- TargetPosition (0-100% of target position) -- PositionState (DECREASING,INCREASING or STOPPED as state). If no state provided, HomeKit will send STOPPED - -These characteristics can be mapped to a single openHAB rollershutter item. In such case currentPosition will always equal target position, means if you request to close a blind/window/door, HomeKit will immediately report that the blind/window/door is closed. -As discussed above, one can use full or shorthand definition. Following two definitions are equal: - -```xtend -Rollershutter window "Window" {homekit = "Window"} -Rollershutter door "Door" {homekit = "Door"} -Rollershutter window_covering "Window Rollershutter" {homekit = "WindowCovering"} -Rollershutter window_covering_long "Window Rollershutter long" {homekit = "WindowCovering, WindowCovering.CurrentPosition, WindowCovering.TargetPosition, WindowCovering.PositionState"} - ``` - -openHAB Rollershutter is defined by default as: - -- OPEN if position is 0%, -- CLOSED if position is 100%. - -In contrast, HomeKit window covering/door/window have inverted mapping - -- OPEN if position 100% -- CLOSED if position is 0% - -Therefore, HomeKit integration inverts by default the values between openHAB and HomeKit, e.g. if openHAB current position is 30% then it will send 70% to HomeKit app. -In case you need to disable this logic you can do it with configuration parameter inverted="false", e.g. - -```xtend -Rollershutter window_covering "Window Rollershutter" {homekit = "WindowCovering" [inverted="false"]} -Rollershutter window "Window" {homekit = "Window" [inverted="false"]} -Rollershutter door "Door" {homekit = "Door" [inverted="false"]} - - ``` - -Window covering can have a number of optional characteristics like horizontal & vertical tilt, obstruction status and hold position trigger. -If your blind supports tilt, and you want to control tilt via HomeKit you need to define blind as a group. -e.g. - -```xtend -Group gBlind "Blind with tilt" {homekit = "WindowCovering"} -Rollershutter window_covering "Blind" (gBlind) {homekit = "WindowCovering"} -Dimmer window_covering_htilt "Blind horizontal tilt" (gBlind) {homekit = "WindowCovering.CurrentHorizontalTiltAngle, WindowCovering.TargetHorizontalTiltAngle"} -Dimmer window_covering_vtilt "Blind vertical tilt" (gBlind) {homekit = "WindowCovering.CurrentVerticalTiltAngle, WindowCovering.TargetVerticalTiltAngle"} - ``` - -### Valve - -The HomeKit valve accessory supports following 2 optional characteristics: - -- duration: this describes how long the valve should set "InUse" once it is activated. The duration changes will apply to the next operation. If valve is already active then duration changes have no effect. - -- remaining duration: this describes the remaining duration on the valve. Notifications on this characteristic must only be used if the remaining duration increases/decreases from the accessoryʼs usual countdown of remaining duration. - -Upon valve activation in home app, home app starts to count down from the "duration" to "0" without contacting the server. Home app also does not trigger any action if it remaining duration get 0. -It is up to valve to have an own timer and stop valve once the timer is over. -Some valves have such timer, e.g. pretty common for sprinklers. -In case the valve has no timer capability, openHAB can take care on this - start an internal timer and send "Off" command to the valve once the timer is over. - -configuration for these two cases looks as follow: - -- valve with timer: - -```xtend -Group gValve "Valve Group" {homekit="Valve" [homekitValveType="Irrigation"]} -Switch valve_active "Valve active" (gValve) {homekit = "Valve.ActiveStatus, Valve.InUseStatus"} -Number valve_duration "Valve duration" (gValve) {homekit = "Valve.Duration"} -Number valve_remaining_duration "Valve remaining duration" (gValve) {homekit = "Valve.RemainingDuration"} -``` - -- valve without timer (no item for remaining duration required) - -```xtend -Group gValve "Valve Group" {homekit="Valve" [homekitValveType="Irrigation", homekitTimer="true]} -Switch valve_active "Valve active" (gValve) {homekit = "Valve.ActiveStatus, Valve.InUseStatus"} -Number valve_duration "Valve duration" (gValve) {homekit = "Valve.Duration" [homekitDefaultDuration = 1800]} -``` - -### Sensors - -Sensors have typically one mandatory characteristic, e.g. temperature or lead trigger, and several optional characteristics which are typically used for battery powered sensors and/or wireless sensors. -Following table summarizes the optional characteristics supported by sensors. - -| Characteristics | Supported openHAB items | Description | -|:-----------------------------|:-------------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| Name | String | Name of the sensor. This characteristic is interesting only for very specific cases in which the name of accessory is dynamic. if you not sure then you don't need it. | -| ActiveStatus | Switch, Contact | Accessory current working status. "ON"/"OPEN" indicates that the accessory is active and is functioning without any errors. | -| FaultStatus | Switch, Contact | Accessory fault status. "ON"/"OPEN" value indicates that the accessory has experienced a fault that may be interfering with its intended functionality. A value of "OFF"/"CLOSED" indicates that there is no fault. | -| TamperedStatus | Switch, Contact | Accessory tampered status. "ON"/"OPEN" indicates that the accessory has been tampered. Value should return to "OFF"/"CLOSED" when the accessory has been reset to a non-tampered state. | -| BatteryLowStatus | Switch, Contact | Accessory battery status. "ON"/"OPEN" indicates that the battery level of the accessory is low. Value should return to "OFF"/"CLOSED" when the battery charges to a level thats above the low threshold. | - -Examples of sensor definitions. -Sensors without optional characteristics: - -```xtend -Switch leaksensor_single "Leak Sensor" {homekit="LeakSensor"} -Number light_sensor "Light Sensor" {homekit="LightSensor"} -Number temperature_sensor "Temperature Sensor [%.1f C]" {homekit="TemperatureSensor"} -Contact contact_sensor "Contact Sensor" {homekit="ContactSensor"} -Switch occupancy_sensor "Occupancy Sensor" {homekit="OccupancyDetectedState"} -Switch motion_sensor "Motion Sensor" {homekit="MotionSensor"} -Number humidity_sensor "Humidity Sensor" {homekit="HumiditySensor"} -``` - -Sensors with optional characteristics: - -```xtend -Group gLeakSensor "Leak Sensor" {homekit="LeakSensor"} -Switch leaksensor "Leak Sensor State" (gLeakSensor) {homekit="LeakDetectedState"} -Switch leaksensor_bat "Leak Sensor Battery" (gLeakSensor) {homekit="BatteryLowStatus"} -Switch leaksensor_active "Leak Sensor Active" (gLeakSensor) {homekit="ActiveStatus"} -Switch leaksensor_fault "Leak Sensor Fault" (gLeakSensor) {homekit="FaultStatus"} -Switch leaksensor_tampered "Leak Sensor Tampered" (gLeakSensor) {homekit="TamperedStatus"} - -Group gMotionSensor "Motion Sensor" {homekit="MotionSensor"} -Switch motionsensor "Motion Sensor State" (gMotionSensor) {homekit="MotionDetectedState"} -Switch motionsensor_bat "Motion Sensor Battery" (gMotionSensor) {homekit="BatteryLowStatus"} -Switch motionsensor_active "Motion Sensor Active" (gMotionSensor) {homekit="ActiveStatus"} -Switch motionsensor_fault "Motion Sensor Fault" (gMotionSensor) {homekit="FaultStatus"} -Switch motionsensor_tampered "Motion Sensor Tampered" (gMotionSensor) {homekit="TamperedStatus"} -``` ## Common Problems diff --git a/bundles/org.openhab.io.homekit/doc/mode_mapping.png b/bundles/org.openhab.io.homekit/doc/mode_mapping.png new file mode 100644 index 0000000000000000000000000000000000000000..54a08a905c0008c40fdfb0ea62ba45bac3bba630 GIT binary patch literal 52799 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 ag;2B2Jd0cEfO!Y_CnKRKUMBi7;Qs*commh7 literal 0 HcmV?d00001 diff --git a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitAuthInfoImpl.java b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitAuthInfoImpl.java index 234a25c08..ae164900b 100644 --- a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitAuthInfoImpl.java +++ b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitAuthInfoImpl.java @@ -58,7 +58,10 @@ public class HomekitAuthInfoImpl implements HomekitAuthInfo { @Override public void createUser(String username, byte[] publicKey) { logger.trace("Create user {}", username); - storage.put(createUserKey(username), Base64.getEncoder().encodeToString(publicKey)); + final String userKey = createUserKey(username); + final String encodedPublicKey = Base64.getEncoder().encodeToString(publicKey); + storage.put(userKey, encodedPublicKey); + logger.trace("Stored user key {} with value {}", userKey, encodedPublicKey); } @Override diff --git a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/AbstractHomekitAccessoryImpl.java b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/AbstractHomekitAccessoryImpl.java index 520c15679..9791afcf0 100644 --- a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/AbstractHomekitAccessoryImpl.java +++ b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/AbstractHomekitAccessoryImpl.java @@ -218,20 +218,32 @@ abstract class AbstractHomekitAccessoryImpl implements HomekitAccessory { * * @param characteristicType characteristicType to identify item * @param map mapping to update + * @param customEnumList list to store custom state enumeration */ @NonNullByDefault - protected void updateMapping(HomekitCharacteristicType characteristicType, Map map) { + protected void updateMapping(HomekitCharacteristicType characteristicType, Map map, + @Nullable List customEnumList) { getCharacteristic(characteristicType).ifPresent(c -> { final Map configuration = c.getConfiguration(); if (configuration != null) { - map.replaceAll((k, current_value) -> { - final Object new_value = configuration.get(current_value); - return (new_value instanceof String) ? (String) new_value : current_value; + map.forEach((k, current_value) -> { + final Object new_value = configuration.get(k.toString()); + if (new_value instanceof String) { + map.put(k, (String) new_value); + if (customEnumList != null) { + customEnumList.add(k); + } + } }); } }); } + @NonNullByDefault + protected void updateMapping(HomekitCharacteristicType characteristicType, Map map) { + updateMapping(characteristicType, map, null); + } + /** * takes item state as value and retrieves the key for that value from mapping. * e.g. used to map StringItem value to HomeKit Enum diff --git a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitHeaterCoolerImpl.java b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitHeaterCoolerImpl.java index 038b0affc..3aa396261 100644 --- a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitHeaterCoolerImpl.java +++ b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitHeaterCoolerImpl.java @@ -16,6 +16,7 @@ import static org.openhab.io.homekit.internal.HomekitCharacteristicType.ACTIVE_S import static org.openhab.io.homekit.internal.HomekitCharacteristicType.CURRENT_HEATER_COOLER_STATE; import static org.openhab.io.homekit.internal.HomekitCharacteristicType.TARGET_HEATER_COOLER_STATE; +import java.util.ArrayList; import java.util.EnumMap; import java.util.List; import java.util.Map; @@ -71,13 +72,16 @@ public class HomekitHeaterCoolerImpl extends AbstractHomekitAccessoryImpl implem } }; + private final List customCurrentStateList = new ArrayList<>(); + private final List customTargetStateList = new ArrayList<>(); + public HomekitHeaterCoolerImpl(HomekitTaggedItem taggedItem, List mandatoryCharacteristics, HomekitAccessoryUpdater updater, HomekitSettings settings) throws IncompleteAccessoryException { super(taggedItem, mandatoryCharacteristics, updater, settings); activeReader = new BooleanItemReader(getItem(ACTIVE_STATUS, GenericItem.class) .orElseThrow(() -> new IncompleteAccessoryException(ACTIVE_STATUS)), OnOffType.ON, OpenClosedType.OPEN); - updateMapping(CURRENT_HEATER_COOLER_STATE, currentStateMapping); - updateMapping(TARGET_HEATER_COOLER_STATE, targetStateMapping); + updateMapping(CURRENT_HEATER_COOLER_STATE, currentStateMapping, customCurrentStateList); + updateMapping(TARGET_HEATER_COOLER_STATE, targetStateMapping, customTargetStateList); final HeaterCoolerService service = new HeaterCoolerService(this); service.addOptionalCharacteristic(new TemperatureDisplayUnitCharacteristic(this::getTemperatureDisplayUnit, this::setTemperatureDisplayUnit, this::subscribeTemperatureDisplayUnit, @@ -85,6 +89,19 @@ public class HomekitHeaterCoolerImpl extends AbstractHomekitAccessoryImpl implem getServices().add(service); } + @Override + public CurrentHeaterCoolerStateEnum[] getCurrentHeaterCoolerStateValidValues() { + return customCurrentStateList.isEmpty() + ? currentStateMapping.keySet().toArray(new CurrentHeaterCoolerStateEnum[0]) + : customCurrentStateList.toArray(new CurrentHeaterCoolerStateEnum[0]); + } + + @Override + public TargetHeaterCoolerStateEnum[] getTargetHeaterCoolerStateValidValues() { + return customTargetStateList.isEmpty() ? targetStateMapping.keySet().toArray(new TargetHeaterCoolerStateEnum[0]) + : customTargetStateList.toArray(new TargetHeaterCoolerStateEnum[0]); + } + @Override public CompletableFuture getCurrentTemperature() { final @Nullable DecimalType state = getStateAs(HomekitCharacteristicType.CURRENT_TEMPERATURE, diff --git a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitSecuritySystemImpl.java b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitSecuritySystemImpl.java index 433d8b280..22604127e 100644 --- a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitSecuritySystemImpl.java +++ b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitSecuritySystemImpl.java @@ -15,6 +15,7 @@ package org.openhab.io.homekit.internal.accessories; import static org.openhab.io.homekit.internal.HomekitCharacteristicType.SECURITY_SYSTEM_CURRENT_STATE; import static org.openhab.io.homekit.internal.HomekitCharacteristicType.SECURITY_SYSTEM_TARGET_STATE; +import java.util.ArrayList; import java.util.EnumMap; import java.util.List; import java.util.Map; @@ -62,15 +63,33 @@ public class HomekitSecuritySystemImpl extends AbstractHomekitAccessoryImpl impl put(TargetSecuritySystemStateEnum.NIGHT_ARM, "NIGHT_ARM"); } }; + private final List customCurrentStateList; + private final List customTargetStateList; public HomekitSecuritySystemImpl(HomekitTaggedItem taggedItem, List mandatoryCharacteristics, HomekitAccessoryUpdater updater, HomekitSettings settings) { super(taggedItem, mandatoryCharacteristics, updater, settings); - updateMapping(SECURITY_SYSTEM_CURRENT_STATE, currentStateMapping); - updateMapping(SECURITY_SYSTEM_TARGET_STATE, targetStateMapping); + customCurrentStateList = new ArrayList<>(); + customTargetStateList = new ArrayList<>(); + updateMapping(SECURITY_SYSTEM_CURRENT_STATE, currentStateMapping, customCurrentStateList); + updateMapping(SECURITY_SYSTEM_TARGET_STATE, targetStateMapping, customTargetStateList); getServices().add(new SecuritySystemService(this)); } + @Override + public CurrentSecuritySystemStateEnum[] getCurrentSecuritySystemStateValidValues() { + return customCurrentStateList.isEmpty() + ? currentStateMapping.keySet().toArray(new CurrentSecuritySystemStateEnum[0]) + : customCurrentStateList.toArray(new CurrentSecuritySystemStateEnum[0]); + } + + @Override + public TargetSecuritySystemStateEnum[] getTargetSecuritySystemStateValidValues() { + return customTargetStateList.isEmpty() + ? targetStateMapping.keySet().toArray(new TargetSecuritySystemStateEnum[0]) + : customTargetStateList.toArray(new TargetSecuritySystemStateEnum[0]); + } + @Override public CompletableFuture getCurrentSecuritySystemState() { return CompletableFuture.completedFuture(getKeyFromMapping(SECURITY_SYSTEM_CURRENT_STATE, currentStateMapping, diff --git a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitThermostatImpl.java b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitThermostatImpl.java index 36cc9137a..8f997a86d 100644 --- a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitThermostatImpl.java +++ b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitThermostatImpl.java @@ -12,8 +12,14 @@ */ package org.openhab.io.homekit.internal.accessories; +import static org.openhab.io.homekit.internal.HomekitCharacteristicType.CURRENT_HEATING_COOLING_STATE; +import static org.openhab.io.homekit.internal.HomekitCharacteristicType.TARGET_HEATING_COOLING_STATE; + import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.EnumMap; import java.util.List; +import java.util.Map; import java.util.Optional; import java.util.concurrent.CompletableFuture; @@ -49,43 +55,52 @@ import io.github.hapjava.services.impl.ThermostatService; */ class HomekitThermostatImpl extends AbstractHomekitAccessoryImpl implements ThermostatAccessory { private final Logger logger = LoggerFactory.getLogger(HomekitThermostatImpl.class); + private final Map currentHeatingCoolingStateMapping; + private final Map targetHeatingCoolingStateMapping; + private final List customCurrentHeatingCoolingStateList; + private final List customTargetHeatingCoolingStateList; public HomekitThermostatImpl(HomekitTaggedItem taggedItem, List mandatoryCharacteristics, HomekitAccessoryUpdater updater, HomekitSettings settings) { super(taggedItem, mandatoryCharacteristics, updater, settings); + currentHeatingCoolingStateMapping = new EnumMap<>(CurrentHeatingCoolingStateEnum.class); + currentHeatingCoolingStateMapping.put(CurrentHeatingCoolingStateEnum.OFF, settings.thermostatCurrentModeOff); + currentHeatingCoolingStateMapping.put(CurrentHeatingCoolingStateEnum.COOL, + settings.thermostatCurrentModeCooling); + currentHeatingCoolingStateMapping.put(CurrentHeatingCoolingStateEnum.HEAT, + settings.thermostatCurrentModeHeating); + targetHeatingCoolingStateMapping = new EnumMap<>(TargetHeatingCoolingStateEnum.class); + targetHeatingCoolingStateMapping.put(TargetHeatingCoolingStateEnum.OFF, settings.thermostatTargetModeOff); + targetHeatingCoolingStateMapping.put(TargetHeatingCoolingStateEnum.COOL, settings.thermostatTargetModeCool); + targetHeatingCoolingStateMapping.put(TargetHeatingCoolingStateEnum.HEAT, settings.thermostatTargetModeHeat); + targetHeatingCoolingStateMapping.put(TargetHeatingCoolingStateEnum.AUTO, settings.thermostatTargetModeAuto); + customCurrentHeatingCoolingStateList = new ArrayList<>(); + customTargetHeatingCoolingStateList = new ArrayList<>(); + updateMapping(CURRENT_HEATING_COOLING_STATE, currentHeatingCoolingStateMapping, + customCurrentHeatingCoolingStateList); + updateMapping(TARGET_HEATING_COOLING_STATE, targetHeatingCoolingStateMapping, + customTargetHeatingCoolingStateList); this.getServices().add(new ThermostatService(this)); } + @Override + public CurrentHeatingCoolingStateEnum[] getCurrentHeatingCoolingStateValidValues() { + return customCurrentHeatingCoolingStateList.isEmpty() + ? currentHeatingCoolingStateMapping.keySet().toArray(new CurrentHeatingCoolingStateEnum[0]) + : customCurrentHeatingCoolingStateList.toArray(new CurrentHeatingCoolingStateEnum[0]); + } + + @Override + public TargetHeatingCoolingStateEnum[] getTargetHeatingCoolingStateValidValues() { + return customTargetHeatingCoolingStateList.isEmpty() + ? targetHeatingCoolingStateMapping.keySet().toArray(new TargetHeatingCoolingStateEnum[0]) + : customTargetHeatingCoolingStateList.toArray(new TargetHeatingCoolingStateEnum[0]); + } + @Override public CompletableFuture getCurrentState() { - final HomekitSettings settings = getSettings(); - String stringValue = settings.thermostatCurrentModeOff; - final Optional characteristic = getCharacteristic( - HomekitCharacteristicType.CURRENT_HEATING_COOLING_STATE); - if (characteristic.isPresent()) { - stringValue = characteristic.get().getItem().getState().toString(); - } else { - logger.warn("Missing mandatory characteristic {}", HomekitCharacteristicType.CURRENT_HEATING_COOLING_STATE); - } - - CurrentHeatingCoolingStateEnum mode; - - if (stringValue.equalsIgnoreCase(settings.thermostatCurrentModeCooling)) { - mode = CurrentHeatingCoolingStateEnum.COOL; - } else if (stringValue.equalsIgnoreCase(settings.thermostatCurrentModeHeating)) { - mode = CurrentHeatingCoolingStateEnum.HEAT; - } else if (stringValue.equalsIgnoreCase(settings.thermostatCurrentModeOff)) { - mode = CurrentHeatingCoolingStateEnum.OFF; - } else if (stringValue.equals("UNDEF") || stringValue.equals("NULL")) { - logger.warn("Heating cooling current mode not available. Relaying value of OFF to Homekit"); - mode = CurrentHeatingCoolingStateEnum.OFF; - } else { - logger.warn("Unrecognized heatingCoolingCurrentMode: {}. Expected {}, {}, or {} strings in value.", - stringValue, settings.thermostatCurrentModeCooling, settings.thermostatCurrentModeHeating, - settings.thermostatCurrentModeOff); - mode = CurrentHeatingCoolingStateEnum.OFF; - } - return CompletableFuture.completedFuture(mode); + return CompletableFuture.completedFuture(getKeyFromMapping(CURRENT_HEATING_COOLING_STATE, + currentHeatingCoolingStateMapping, CurrentHeatingCoolingStateEnum.OFF)); } @Override @@ -114,36 +129,8 @@ class HomekitThermostatImpl extends AbstractHomekitAccessoryImpl implements Ther @Override public CompletableFuture getTargetState() { - final HomekitSettings settings = getSettings(); - String stringValue = settings.thermostatTargetModeOff; - - final Optional characteristic = getCharacteristic( - HomekitCharacteristicType.TARGET_HEATING_COOLING_STATE); - if (characteristic.isPresent()) { - stringValue = characteristic.get().getItem().getState().toString(); - } else { - logger.warn("Missing mandatory characteristic {}", HomekitCharacteristicType.TARGET_HEATING_COOLING_STATE); - } - TargetHeatingCoolingStateEnum mode; - - if (stringValue.equalsIgnoreCase(settings.thermostatTargetModeCool)) { - mode = TargetHeatingCoolingStateEnum.COOL; - } else if (stringValue.equalsIgnoreCase(settings.thermostatTargetModeHeat)) { - mode = TargetHeatingCoolingStateEnum.HEAT; - } else if (stringValue.equalsIgnoreCase(settings.thermostatTargetModeAuto)) { - mode = TargetHeatingCoolingStateEnum.AUTO; - } else if (stringValue.equalsIgnoreCase(settings.thermostatTargetModeOff)) { - mode = TargetHeatingCoolingStateEnum.OFF; - } else if (stringValue.equals("UNDEF") || stringValue.equals("NULL")) { - logger.warn("Heating cooling target mode not available. Relaying value of OFF to Homekit"); - mode = TargetHeatingCoolingStateEnum.OFF; - } else { - logger.warn("Unrecognized heating cooling target mode: {}. Expected {}, {}, {}, or {} strings in value.", - stringValue, settings.thermostatTargetModeCool, settings.thermostatTargetModeHeat, - settings.thermostatTargetModeAuto, settings.thermostatTargetModeOff); - mode = TargetHeatingCoolingStateEnum.OFF; - } - return CompletableFuture.completedFuture(mode); + return CompletableFuture.completedFuture(getKeyFromMapping(TARGET_HEATING_COOLING_STATE, + targetHeatingCoolingStateMapping, TargetHeatingCoolingStateEnum.OFF)); } @Override @@ -166,32 +153,8 @@ class HomekitThermostatImpl extends AbstractHomekitAccessoryImpl implements Ther @Override public void setTargetState(TargetHeatingCoolingStateEnum mode) { - final HomekitSettings settings = getSettings(); - String modeString = null; - switch (mode) { - case AUTO: - modeString = settings.thermostatTargetModeAuto; - break; - - case COOL: - modeString = settings.thermostatTargetModeCool; - break; - - case HEAT: - modeString = settings.thermostatTargetModeHeat; - break; - - case OFF: - modeString = settings.thermostatTargetModeOff; - break; - } - final Optional characteristic = getCharacteristic( - HomekitCharacteristicType.TARGET_HEATING_COOLING_STATE); - if (characteristic.isPresent()) { - ((StringItem) characteristic.get().getItem()).send(new StringType(modeString)); - } else { - logger.warn("Missing mandatory characteristic {}", HomekitCharacteristicType.TARGET_HEATING_COOLING_STATE); - } + getItem(TARGET_HEATING_COOLING_STATE, StringItem.class) + .ifPresent(item -> item.send(new StringType(targetHeatingCoolingStateMapping.get(mode)))); } @Override @@ -226,7 +189,7 @@ class HomekitThermostatImpl extends AbstractHomekitAccessoryImpl implements Ther @Override public void subscribeCurrentState(HomekitCharacteristicChangeCallback callback) { - subscribe(HomekitCharacteristicType.CURRENT_HEATING_COOLING_STATE, callback); + subscribe(CURRENT_HEATING_COOLING_STATE, callback); } @Override @@ -251,7 +214,7 @@ class HomekitThermostatImpl extends AbstractHomekitAccessoryImpl implements Ther @Override public void unsubscribeCurrentState() { - unsubscribe(HomekitCharacteristicType.CURRENT_HEATING_COOLING_STATE); + unsubscribe(CURRENT_HEATING_COOLING_STATE); } @Override