diff --git a/bundles/org.openhab.io.homekit/README.md b/bundles/org.openhab.io.homekit/README.md index 5fa1a54a36066..685ce7fe00fd9 100644 --- a/bundles/org.openhab.io.homekit/README.md +++ b/bundles/org.openhab.io.homekit/README.md @@ -100,23 +100,25 @@ org.openhab.homekit:name=openHAB org.openhab.homekit:instances=1 ``` +Some settings are only visible in UI if the checkbox "Show advanced" is activated. + ### Overview of all settings -| Setting | Description | Default value | -|:-------------------------|:----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:--------------| -| networkInterface | IP address or domain name under which the HomeKit bridge can be reached. If no value is configured, the add-on uses the first network adapter address configured for openHAB. | (none) | -| port | Port under which the HomeKit bridge can be reached. | 9123 | -| useOHmDNS | mDNS service is used to advertise openHAB as HomeKit bridge in the network so that HomeKit clients can find it. openHAB has already mDNS service running. This option defines whether the mDNS service of openHAB or a separate service should be used. | false | -| blockUserDeletion | Blocks HomeKit user deletion in openHAB and as result unpairing of devices. If you experience an issue with accessories becoming non-responsive after some time, try to enable this setting. You can also enable this setting if your HomeKit setup is done and you will not re-pair ios devices. | false | -| 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. Note if an item has a QuantityType as its state, this configuration is ignored and it's always converted properly. | false | -| 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 | -| 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 | -| instances | Defines how many bridges to expose. Necessary if you have more than 149 accessories. Accessories must be assigned to additional instances via metadata. Additional bridges will use incrementing port numbers. | 1 | +| Setting | Description | Default value | +|:-------------------------|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:--------------| +| networkInterface | IP address or domain name under which the HomeKit bridge can be reached. If no value is configured, the add-on uses the primary IP address configured for openHAB. If unsure, keep it empty | (none) | +| port | Port under which the HomeKit bridge can be reached. | 9123 | +| useOHmDNS | mDNS service is used to advertise openHAB as HomeKit bridge in the network so that HomeKit clients can find it. openHAB has already mDNS service running. This option defines whether the mDNS service of openHAB or a separate service should be used. | false | +| blockUserDeletion | Blocks HomeKit user deletion in openHAB and as result unpairing of devices. If you experience an issue with accessories becoming non-responsive after some time, try to enable this setting. You can also enable this setting if your HomeKit setup is done and you will not re-pair ios devices. | false | +| 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. Note if an item has a QuantityType as its state, this configuration is ignored and it's always converted properly. | false | +| 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 | +| 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 | +| instances | Defines how many bridges to expose. Necessary if you have more than 149 accessories. Accessories must be assigned to additional instances via metadata. Additional bridges will use incrementing port numbers. | 1 | ## Item Configuration diff --git a/bundles/org.openhab.io.homekit/doc/mode_mapping.png b/bundles/org.openhab.io.homekit/doc/mode_mapping.png index 54a08a905c000..633c66db8c2cc 100644 Binary files a/bundles/org.openhab.io.homekit/doc/mode_mapping.png and b/bundles/org.openhab.io.homekit/doc/mode_mapping.png differ diff --git a/bundles/org.openhab.io.homekit/doc/sensor_ui_config.png b/bundles/org.openhab.io.homekit/doc/sensor_ui_config.png index ffd05c1ae5162..407261f8341e8 100644 Binary files a/bundles/org.openhab.io.homekit/doc/sensor_ui_config.png and b/bundles/org.openhab.io.homekit/doc/sensor_ui_config.png differ diff --git a/bundles/org.openhab.io.homekit/doc/settings_qrcode.png b/bundles/org.openhab.io.homekit/doc/settings_qrcode.png index 4aecccfa3249f..75fa98a0f47bd 100644 Binary files a/bundles/org.openhab.io.homekit/doc/settings_qrcode.png and b/bundles/org.openhab.io.homekit/doc/settings_qrcode.png differ diff --git a/bundles/org.openhab.io.homekit/doc/ui_fan_with_light_group_code.png b/bundles/org.openhab.io.homekit/doc/ui_fan_with_light_group_code.png index bc4eead57fe44..6a863d91125d3 100644 Binary files a/bundles/org.openhab.io.homekit/doc/ui_fan_with_light_group_code.png and b/bundles/org.openhab.io.homekit/doc/ui_fan_with_light_group_code.png differ diff --git a/bundles/org.openhab.io.homekit/doc/ui_fan_with_light_group_config.png b/bundles/org.openhab.io.homekit/doc/ui_fan_with_light_group_config.png index a05054b51444b..d427173474bf0 100644 Binary files a/bundles/org.openhab.io.homekit/doc/ui_fan_with_light_group_config.png and b/bundles/org.openhab.io.homekit/doc/ui_fan_with_light_group_config.png differ diff --git a/bundles/org.openhab.io.homekit/doc/ui_fan_with_light_group_view.png b/bundles/org.openhab.io.homekit/doc/ui_fan_with_light_group_view.png index 4ba4a532a2a1e..3bf3d90658787 100644 Binary files a/bundles/org.openhab.io.homekit/doc/ui_fan_with_light_group_view.png and b/bundles/org.openhab.io.homekit/doc/ui_fan_with_light_group_view.png differ diff --git a/bundles/org.openhab.io.homekit/doc/ui_fan_with_light_primary.png b/bundles/org.openhab.io.homekit/doc/ui_fan_with_light_primary.png index fbdf0df0817b1..df40c2d08423b 100644 Binary files a/bundles/org.openhab.io.homekit/doc/ui_fan_with_light_primary.png and b/bundles/org.openhab.io.homekit/doc/ui_fan_with_light_primary.png differ diff --git a/bundles/org.openhab.io.homekit/doc/ui_sensor_with_battery.png b/bundles/org.openhab.io.homekit/doc/ui_sensor_with_battery.png index d984a0aaf90f5..60a644566d0d1 100644 Binary files a/bundles/org.openhab.io.homekit/doc/ui_sensor_with_battery.png and b/bundles/org.openhab.io.homekit/doc/ui_sensor_with_battery.png differ diff --git a/bundles/org.openhab.io.homekit/src/main/resources/OH-INF/config/config.xml b/bundles/org.openhab.io.homekit/src/main/resources/OH-INF/config/config.xml index cd5ab8e252742..2b72105594810 100644 --- a/bundles/org.openhab.io.homekit/src/main/resources/OH-INF/config/config.xml +++ b/bundles/org.openhab.io.homekit/src/main/resources/OH-INF/config/config.xml @@ -6,46 +6,52 @@ https://openhab.org/schemas/config-description-1.0.0.xsd"> - - + + false - General thermostat settings + Advanced thermostat settings. + true - General network settings + Advanced network settings. + true - String values used by your thermostat to set different targetHeatingCooling modes + String values used by your thermostat to set different target heating/cooling modes. + true - String values used by your thermostat to set different targetHeatingCooling modes + String values used by your thermostat to set different current heating/cooling modes. + true - Name of the HomeKit bridge + Name of the HomeKit bridge. openHAB qrcode - Scan QR code with home app to add openHAB as HomeKit bridge. + Scan QR code with home app to add openHAB as HomeKit bridge. - + Defines the port the HomeKit integration listens on. 9123 + true Defines how many bridges to expose. Necessary if you have more than 149 accessories. Accessories must be assigned to additional instances via metadata. Additional bridges will use incrementing port numbers. 1 + true @@ -55,53 +61,59 @@ Setup ID used for pairing using QR Code. Alphanumeric code of length 4. + true Defines the IP address of the network interface to expose the HomeKit integration on. + true HomeKit start delay in case of item configuration differences. 30 + true Defines whether or not to direct HomeKit clients to use fahrenheit temperatures instead of celsius. false - Word used to set the target heatingCoolingMode to COOL (if a thermostat is defined). CoolOn + true Word used to set the target heatingCoolingMode to HEAT (if a thermostat is defined). HeatOn + true Word used to set the target heatingCoolingMode to AUTO (if a thermostat is defined). Auto + true Word used to set the target heatingCoolingMode to OFF (if a thermostat is defined). Off + true - Value for setting target heatingCoolingCurrentMode to HEAT (IE: indicating that the heater is currently warming the home). Heating + true @@ -109,6 +121,7 @@ Value for setting target heatingCoolingCurrentMode to COOL (IE: indicating that the air condition is currently cooling the home). Cooling + true @@ -116,16 +129,19 @@ Value for setting target heatingCoolingCurrentMode to OFF (IE: the hvac is currently idle, because the target temperature has been reached per the mode). Off + true Defines whether mDNS service of openHAB or a separate instance of mDNS should be used. false + true - + - Block deletion of the HomeKit user information from openHAB and the unpairing of devices + Block deletion of the HomeKit user information from openHAB and the unpairing of devices. false + true diff --git a/bundles/org.openhab.io.homekit/src/main/resources/OH-INF/i18n/homekit.properties b/bundles/org.openhab.io.homekit/src/main/resources/OH-INF/i18n/homekit.properties index 5cc5bc2ea5f6c..38dc170b36816 100644 --- a/bundles/org.openhab.io.homekit/src/main/resources/OH-INF/i18n/homekit.properties +++ b/bundles/org.openhab.io.homekit/src/main/resources/OH-INF/i18n/homekit.properties @@ -1,18 +1,18 @@ io.config.homekit.blockUserDeletion.label = Block deletion of the HomeKit user -io.config.homekit.blockUserDeletion.description = Block deletion of the HomeKit user information from openHAB and the unpairing of devices -io.config.homekit.group.core.label = Core Configuration +io.config.homekit.blockUserDeletion.description = Block deletion of the HomeKit user information from openHAB and the unpairing of devices. +io.config.homekit.group.core.label = Core Configuration. io.config.homekit.group.network.label = Network Settings -io.config.homekit.group.network.description = General network settings +io.config.homekit.group.network.description = Advanced network settings. io.config.homekit.group.thermostat.label = Thermostat Settings -io.config.homekit.group.thermostat.description = General thermostat settings +io.config.homekit.group.thermostat.description = Advanced thermostat settings. io.config.homekit.group.thermostatCurrentHeatingCooling.label = Thermostat Current Heating/Cooling Mapping -io.config.homekit.group.thermostatCurrentHeatingCooling.description = String values used by your thermostat to set different targetHeatingCooling modes +io.config.homekit.group.thermostatCurrentHeatingCooling.description = String values used by your thermostat to set different current heating/cooling modes. io.config.homekit.group.thermostatTargetHeatingCooling.label = Thermostat Target Heating/Cooling Mapping -io.config.homekit.group.thermostatTargetHeatingCooling.description = String values used by your thermostat to set different targetHeatingCooling modes +io.config.homekit.group.thermostatTargetHeatingCooling.description = String values used by your thermostat to set different target heating/cooling modes. io.config.homekit.instances.label = Instances io.config.homekit.instances.description = Defines how many bridges to expose. Necessary if you have more than 149 accessories. Accessories must be assigned to additional instances via metadata. Additional bridges will use incrementing port numbers. io.config.homekit.name.label = Bridge name -io.config.homekit.name.description = Name of the HomeKit bridge +io.config.homekit.name.description = Name of the HomeKit bridge. io.config.homekit.networkInterface.label = Network Interface io.config.homekit.networkInterface.description = Defines the IP address of the network interface to expose the HomeKit integration on. io.config.homekit.pin.label = Pin