Skip to content

Commit

Permalink
Merge branch 'openhab:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
lsiepel authored Feb 22, 2022
2 parents 9351b81 + 9e6b952 commit 5bc2c0e
Show file tree
Hide file tree
Showing 132 changed files with 5,146 additions and 233 deletions.
2 changes: 2 additions & 0 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@
/bundles/org.openhab.binding.exec/ @kgoderis
/bundles/org.openhab.binding.feed/ @svilenvul
/bundles/org.openhab.binding.feican/ @Hilbrand
/bundles/org.openhab.binding.flicbutton/ @pfink
/bundles/org.openhab.binding.fmiweather/ @ssalonen
/bundles/org.openhab.binding.folderwatcher/ @goopilot
/bundles/org.openhab.binding.folding/ @fa2k
Expand Down Expand Up @@ -383,6 +384,7 @@
/bundles/org.openhab.voice.pollytts/ @hillmanr
/bundles/org.openhab.voice.porcupineks/ @GiviMAD
/bundles/org.openhab.voice.voicerss/ @JochenHiller @lolodomo
/bundles/org.openhab.voice.voskstt/ @GiviMAD
/bundles/org.openhab.voice.watsonstt/ @GiviMAD
/itests/org.openhab.binding.astro.tests/ @gerrieg
/itests/org.openhab.binding.avmfritz.tests/ @cweitkamp
Expand Down
10 changes: 10 additions & 0 deletions bom/openhab-addons/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -456,6 +456,11 @@
<artifactId>org.openhab.binding.feican</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.openhab.addons.bundles</groupId>
<artifactId>org.openhab.binding.flicbutton</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.openhab.addons.bundles</groupId>
<artifactId>org.openhab.binding.fmiweather</artifactId>
Expand Down Expand Up @@ -1906,6 +1911,11 @@
<artifactId>org.openhab.voice.voicerss</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.openhab.addons.bundles</groupId>
<artifactId>org.openhab.voice.voskstt</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.openhab.addons.bundles</groupId>
<artifactId>org.openhab.voice.watsonstt</artifactId>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# thing types

thing-type.bluetooth.airthings_wave_gen1.label = Airthings Wave Gen 1
thing-type.bluetooth.airthings_wave_gen1.description = Smart Radon Monitor
thing-type.bluetooth.airthings_wave_mini.label = Airthings Wave Mini
thing-type.bluetooth.airthings_wave_mini.description = Indoor air quality monitor
thing-type.bluetooth.airthings_wave_plus.label = Airthings Wave Plus
thing-type.bluetooth.airthings_wave_plus.description = Indoor air quality monitor with radon detection

# thing types config

thing-type.config.bluetooth.airthings_wave_gen1.address.label = Address
thing-type.config.bluetooth.airthings_wave_gen1.address.description = Bluetooth address in XX:XX:XX:XX:XX:XX format
thing-type.config.bluetooth.airthings_wave_gen1.refreshInterval.label = Refresh Interval
thing-type.config.bluetooth.airthings_wave_gen1.refreshInterval.description = States how often a refresh shall occur in seconds. This could have impact to battery lifetime
thing-type.config.bluetooth.airthings_wave_mini.address.label = Address
thing-type.config.bluetooth.airthings_wave_mini.address.description = Bluetooth address in XX:XX:XX:XX:XX:XX format
thing-type.config.bluetooth.airthings_wave_mini.refreshInterval.label = Refresh Interval
thing-type.config.bluetooth.airthings_wave_mini.refreshInterval.description = States how often a refresh shall occur in seconds. This could have impact to battery lifetime
thing-type.config.bluetooth.airthings_wave_plus.address.label = Address
thing-type.config.bluetooth.airthings_wave_plus.address.description = Bluetooth address in XX:XX:XX:XX:XX:XX format
thing-type.config.bluetooth.airthings_wave_plus.refreshInterval.label = Refresh Interval
thing-type.config.bluetooth.airthings_wave_plus.refreshInterval.description = States how often a refresh shall occur in seconds. This could have impact to battery lifetime

# channel types

channel-type.bluetooth.airthings_co2.label = CO₂ Level
channel-type.bluetooth.airthings_co2.description = Carbon dioxide level
channel-type.bluetooth.airthings_humidity.label = Humidity
channel-type.bluetooth.airthings_humidity.description = Humidity level
channel-type.bluetooth.airthings_pressure.label = Pressure
channel-type.bluetooth.airthings_pressure.description = Pressure
channel-type.bluetooth.airthings_radon_lt_avg.label = Radon Long Term Average Level
channel-type.bluetooth.airthings_radon_lt_avg.description = Radon gas level
channel-type.bluetooth.airthings_radon_st_avg.label = Radon Short Term Average Level
channel-type.bluetooth.airthings_radon_st_avg.description = Radon gas level
channel-type.bluetooth.airthings_temperature.label = Temperature
channel-type.bluetooth.airthings_temperature.description = Temperature
channel-type.bluetooth.airthings_tvoc.label = TVOC Level
channel-type.bluetooth.airthings_tvoc.description = Total volatile organic compounds
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# thing types

thing-type.bluetooth.am43.label = AM43 Blind Drive Motor
thing-type.bluetooth.am43.description = A AM43 Blind Drive Motor

# thing types config

thing-type.config.bluetooth.am43.address.label = Address
thing-type.config.bluetooth.am43.address.description = Bluetooth address in XX:XX:XX:XX:XX:XX format
thing-type.config.bluetooth.am43.commandTimeout.label = Command Timeout
thing-type.config.bluetooth.am43.commandTimeout.description = The amount of time, in milliseconds, a command should take before it times out.
thing-type.config.bluetooth.am43.invertPosition.label = Invert Position
thing-type.config.bluetooth.am43.invertPosition.description = Inverts the blinds percentages such that 0 becomes 100 and 100 becomes 0
thing-type.config.bluetooth.am43.refreshInterval.label = Refresh Interval
thing-type.config.bluetooth.am43.refreshInterval.description = Refresh interval for battery and light sensor data (in seconds). This could impact battery lifetime

# channel types

channel-type.bluetooth.am43_bottomLimitSet.label = Bottom Limit is Set
channel-type.bluetooth.am43_diameter.label = Diameter
channel-type.bluetooth.am43_diameter.description = The diameter of the pulley of this motor (not really important)
channel-type.bluetooth.am43_direction.label = Direction
channel-type.bluetooth.am43_direction.state.option.Forward = Forward
channel-type.bluetooth.am43_direction.state.option.Reverse = Reverse
channel-type.bluetooth.am43_hasLightSensor.label = Light Sensor Present
channel-type.bluetooth.am43_hasLightSensor.description = Whether or not a light sensor is attached to the motor
channel-type.bluetooth.am43_length.label = Length
channel-type.bluetooth.am43_length.description = The distance the blinds travel from full open and close (not really important)
channel-type.bluetooth.am43_lightLevel.label = Light Level
channel-type.bluetooth.am43_lightLevel.description = Light level detected by the solar sensor. Will range from 0-10
channel-type.bluetooth.am43_operationMode.label = Operation Mode
channel-type.bluetooth.am43_operationMode.state.option.Inching = Inching
channel-type.bluetooth.am43_operationMode.state.option.Continuous = Continuous
channel-type.bluetooth.am43_position.label = Position
channel-type.bluetooth.am43_position.description = The percent value of the blind position
channel-type.bluetooth.am43_speed.label = Speed
channel-type.bluetooth.am43_speed.description = The speed value in RPMs set for this motor
channel-type.bluetooth.am43_topLimitSet.label = Top Limit is Set
channel-type.bluetooth.am43_type.label = Device Type
channel-type.bluetooth.am43_type.description = The type of blinds this motor is operating. (not really important)
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# thing types

thing-type.bluetooth.bluegiga.label = BlueGiga Bluetooth Dongle
thing-type.bluetooth.bluegiga.description = Serial interface to the BlueGiga dongle

# thing types config

thing-type.config.bluetooth.bluegiga.activeScanInterval.label = Active Scan Interval
thing-type.config.bluetooth.bluegiga.activeScanInterval.description = Active scan interval defines the interval when scanning is re-started in units of 625us. Default is 6400 units (4000ms).
thing-type.config.bluetooth.bluegiga.activeScanWindow.label = Active Scan Window
thing-type.config.bluetooth.bluegiga.activeScanWindow.description = Active scan Window defines how long time the scanner will listen on a certain frequency and try to pick up advertisement packets. Default is 6400 units (4000ms).
thing-type.config.bluetooth.bluegiga.backgroundDiscovery.label = Background Discovery
thing-type.config.bluetooth.bluegiga.backgroundDiscovery.description = Whether this adapter performs background discovery of Bluetooth devices
thing-type.config.bluetooth.bluegiga.connIntervalMax.label = Maximum Connection Interval
thing-type.config.bluetooth.bluegiga.connIntervalMax.description = Maximum connection interval in units of 1.25ms. Default is 800 units (1000ms).
thing-type.config.bluetooth.bluegiga.connIntervalMin.label = Minimum Connection Interval
thing-type.config.bluetooth.bluegiga.connIntervalMin.description = Minimum connection interval in units of 1.25ms. Default is 80 units (100ms).
thing-type.config.bluetooth.bluegiga.connLatency.label = Connection Latency
thing-type.config.bluetooth.bluegiga.connLatency.description = Connection latency defines how many connection intervals a slave device can skip. Default is 3.
thing-type.config.bluetooth.bluegiga.connTimeout.label = Connection Supervision Timeout
thing-type.config.bluetooth.bluegiga.connTimeout.description = Connection supervision timeout in units of 10ms defines how long the devices can be out of range before the connection is closed. Default is 1000 units (10000ms).
thing-type.config.bluetooth.bluegiga.inactiveDeviceCleanupInterval.label = Device Cleanup Interval
thing-type.config.bluetooth.bluegiga.inactiveDeviceCleanupInterval.description = How often device cleanup is performed
thing-type.config.bluetooth.bluegiga.inactiveDeviceCleanupThreshold.label = Device Cleanup Threshold
thing-type.config.bluetooth.bluegiga.inactiveDeviceCleanupThreshold.description = Timespan a device can remain radio silent before it is eligible for cleanup
thing-type.config.bluetooth.bluegiga.passiveScanIdleTime.label = Passive Scan Idle Time
thing-type.config.bluetooth.bluegiga.passiveScanIdleTime.description = Passive scan idle time defines the time how long to wait in milliseconds before start passive scan.
thing-type.config.bluetooth.bluegiga.passiveScanInterval.label = Passive Scan Interval
thing-type.config.bluetooth.bluegiga.passiveScanInterval.description = Passive scan interval defines the interval when scanning is re-started in units of 625us. Default is 6400 units (4000ms).
thing-type.config.bluetooth.bluegiga.passiveScanWindow.label = Passive Scan Window
thing-type.config.bluetooth.bluegiga.passiveScanWindow.description = Passive scan Window defines how long time the scanner will listen on a certain frequency and try to pick up advertisement packets. Default is 6400 units (4000ms).
thing-type.config.bluetooth.bluegiga.port.label = Port
thing-type.config.bluetooth.bluegiga.port.description = Serial Port
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# thing types

thing-type.bluetooth.bluez.label = Bluetooth BlueZ Adapter
thing-type.bluetooth.bluez.description = Linux built-in Bluetooth support

# thing types config

thing-type.config.bluetooth.bluez.address.label = Address
thing-type.config.bluetooth.bluez.address.description = The Bluetooth address of the adapter in format XX:XX:XX:XX:XX:XX
thing-type.config.bluetooth.bluez.backgroundDiscovery.label = Background Discovery
thing-type.config.bluetooth.bluez.backgroundDiscovery.description = Whether this adapter performs background discovery of Bluetooth devices
thing-type.config.bluetooth.bluez.inactiveDeviceCleanupInterval.label = Device Cleanup Interval
thing-type.config.bluetooth.bluez.inactiveDeviceCleanupInterval.description = How often device cleanup is performed
thing-type.config.bluetooth.bluez.inactiveDeviceCleanupThreshold.label = Device Cleanup Threshold
thing-type.config.bluetooth.bluez.inactiveDeviceCleanupThreshold.description = Timespan a device can remain radio silent before it is eligible for cleanup
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# thing types

thing-type.bluetooth.blukii_beacon.label = Blukii SmartBeacon
thing-type.bluetooth.blukii_beacon.description = A Blukii SmartBeacon

# thing types config

thing-type.config.bluetooth.blukii_beacon.address.label = Address
thing-type.config.bluetooth.blukii_beacon.address.description = Bluetooth address in XX:XX:XX:XX:XX:XX format

# channel types

channel-type.bluetooth.blukii_humidity.label = Humidity
channel-type.bluetooth.blukii_luminance.label = Luminance
channel-type.bluetooth.blukii_pressure.label = Pressure
channel-type.bluetooth.blukii_temperature.label = Temperature
channel-type.bluetooth.blukii_tiltx.label = Tilt X
channel-type.bluetooth.blukii_tilty.label = Tilt Y
channel-type.bluetooth.blukii_tiltz.label = Tilt Z
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# thing types

thing-type.bluetooth.brc1h.label = Daikin BRC1H Thermostat
thing-type.bluetooth.brc1h.description = A Daikin Madoka BRC1H Thermostat (BLE)

# thing types config

thing-type.config.bluetooth.brc1h.address.label = Address
thing-type.config.bluetooth.brc1h.address.description = Bluetooth address in XX:XX:XX:XX:XX:XX format
thing-type.config.bluetooth.brc1h.commandTimeout.label = Command Timeout
thing-type.config.bluetooth.brc1h.commandTimeout.description = The amount of time, in milliseconds, a command should take before it times out.
thing-type.config.bluetooth.brc1h.refreshInterval.label = Refresh Interval
thing-type.config.bluetooth.brc1h.refreshInterval.description = Refresh interval for battery and light sensor data (in seconds). This could impact battery lifetime

# channel types

channel-type.bluetooth.brc1h_cleanFilter.label = Clean Filter Indicator
channel-type.bluetooth.brc1h_commCtrlVersion.label = Communication Controller Version
channel-type.bluetooth.brc1h_eyeBrightness.label = Eye Illumination Brightness
channel-type.bluetooth.brc1h_fanSpeed.label = Fan Speed
channel-type.bluetooth.brc1h_homebridgeMode.label = Mode from Homebridge
channel-type.bluetooth.brc1h_homebridgeMode.command.option.0 = Off
channel-type.bluetooth.brc1h_homebridgeMode.command.option.1 = Heating
channel-type.bluetooth.brc1h_homebridgeMode.command.option.2 = Cooling
channel-type.bluetooth.brc1h_homebridgeMode.command.option.3 = Auto
channel-type.bluetooth.brc1h_homekitCurrentHeatingCoolingMode.label = HomeKit CurrentMode
channel-type.bluetooth.brc1h_homekitCurrentHeatingCoolingMode.description = Readonly value. Off, Heating, Cooling, Auto
channel-type.bluetooth.brc1h_homekitTargetHeatingCoolingMode.label = HomeKit Target Mode
channel-type.bluetooth.brc1h_homekitTargetHeatingCoolingMode.command.option.Off = Off
channel-type.bluetooth.brc1h_homekitTargetHeatingCoolingMode.command.option.CoolOn = Cool
channel-type.bluetooth.brc1h_homekitTargetHeatingCoolingMode.command.option.HeatOn = Heat
channel-type.bluetooth.brc1h_homekitTargetHeatingCoolingMode.command.option.Auto = Auto
channel-type.bluetooth.brc1h_indoorFanHours.label = Number of hours fan has been operating
channel-type.bluetooth.brc1h_indoorOperationHours.label = Number of hours system has been operating
channel-type.bluetooth.brc1h_indoorPowerHours.label = Number of hours system has been powered up
channel-type.bluetooth.brc1h_indoorTemperature.label = Indoor Temperature
channel-type.bluetooth.brc1h_onOffStatus.label = Unit Power Status
channel-type.bluetooth.brc1h_operationMode.label = Operation Mode
channel-type.bluetooth.brc1h_operationMode.command.option.FAN = Fan
channel-type.bluetooth.brc1h_operationMode.command.option.DRY = Dry
channel-type.bluetooth.brc1h_operationMode.command.option.AUTO = Auto
channel-type.bluetooth.brc1h_operationMode.command.option.COOL = Cool
channel-type.bluetooth.brc1h_operationMode.command.option.HEAT = Heat
channel-type.bluetooth.brc1h_operationMode.command.option.VENTILATION = Ventilation
channel-type.bluetooth.brc1h_outdoorTemperature.label = Outdoor Temperature
channel-type.bluetooth.brc1h_remoteCtrlVersion.label = Remote Controller Version
channel-type.bluetooth.brc1h_setpoint.label = Setpoint
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# thing types

thing-type.bluetooth.ptm215b.label = Enocean PTM 215B Rocker
thing-type.bluetooth.ptm215b.description = An Enocean BLE Rocker (PTM 215B)

# thing types config

thing-type.config.bluetooth.ptm215b.address.label = Address
thing-type.config.bluetooth.ptm215b.address.description = Bluetooth address in XX:XX:XX:XX:XX:XX format
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# thing types

thing-type.bluetooth.generic.label = Generic Bluetooth Device
thing-type.bluetooth.generic.description = A generic bluetooth device that supports GATT characteristics

# thing types config

thing-type.config.bluetooth.generic.address.label = Address
thing-type.config.bluetooth.generic.address.description = Bluetooth address in XX:XX:XX:XX:XX:XX format
thing-type.config.bluetooth.generic.alwaysConnected.label = Connect Automatically
thing-type.config.bluetooth.generic.alwaysConnected.description = If enabled, will automatically connect to the device and reconnect if connection is lost.
thing-type.config.bluetooth.generic.pollingInterval.label = Polling Interval
thing-type.config.bluetooth.generic.pollingInterval.description = The frequency at which readable characteristics refreshed

# channel types

channel-type.bluetooth.char-unknown.label = Unknown Bluetooth Characteristic
channel-type.bluetooth.char-unknown.description = The raw value of unknown characteristics are represented with hexadecimal
Loading

0 comments on commit 5bc2c0e

Please sign in to comment.