diff --git a/de.ibapl.openhab.fhz4j/src/main/java/de/ibapl/openhab/fhz4j/internal/FHZ4JHandlerFactory.java b/de.ibapl.openhab.fhz4j/src/main/java/de/ibapl/openhab/fhz4j/internal/FHZ4JHandlerFactory.java index 7542c57..e66e8df 100644 --- a/de.ibapl.openhab.fhz4j/src/main/java/de/ibapl/openhab/fhz4j/internal/FHZ4JHandlerFactory.java +++ b/de.ibapl.openhab.fhz4j/src/main/java/de/ibapl/openhab/fhz4j/internal/FHZ4JHandlerFactory.java @@ -57,7 +57,7 @@ * * @author aploese@gmx.de - Initial contribution */ -@Component(service = ThingHandlerFactory.class) +@Component(service = ThingHandlerFactory.class, immediate = true, configurationPid = "binding.fhz4j") public class FHZ4JHandlerFactory extends BaseThingHandlerFactory { private static final Logger logger = Logger.getLogger("d.i.e.f.h.FHZ4JHandlerFactory"); diff --git a/de.ibapl.openhab.fhz4j/src/main/java/de/ibapl/openhab/fhz4j/internal/discovery/FHZ4JDiscoveryService.java b/de.ibapl.openhab.fhz4j/src/main/java/de/ibapl/openhab/fhz4j/internal/discovery/FHZ4JDiscoveryService.java index ba32ad2..bd6f0aa 100644 --- a/de.ibapl.openhab.fhz4j/src/main/java/de/ibapl/openhab/fhz4j/internal/discovery/FHZ4JDiscoveryService.java +++ b/de.ibapl.openhab.fhz4j/src/main/java/de/ibapl/openhab/fhz4j/internal/discovery/FHZ4JDiscoveryService.java @@ -21,9 +21,6 @@ */ package de.ibapl.openhab.fhz4j.internal.discovery; -import de.ibapl.openhab.fhz4j.FHZ4JBindingConstants; -import de.ibapl.openhab.fhz4j.handler.SpswBridgeHandler; -import de.ibapl.openhab.fhz4j.internal.FHZ4JHandlerFactory; import de.ibapl.fhz4j.api.Protocol; import de.ibapl.fhz4j.cul.CulMessage; import de.ibapl.fhz4j.cul.CulMessageListener; @@ -35,6 +32,9 @@ import de.ibapl.fhz4j.protocol.fs20.FS20Message; import de.ibapl.fhz4j.protocol.hms.HmsMessage; import de.ibapl.fhz4j.protocol.lacrosse.tx2.LaCrosseTx2Message; +import de.ibapl.openhab.fhz4j.FHZ4JBindingConstants; +import de.ibapl.openhab.fhz4j.handler.SpswBridgeHandler; +import de.ibapl.openhab.fhz4j.internal.FHZ4JHandlerFactory; import java.io.IOException; import java.util.Set; import java.util.logging.Logger; diff --git a/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/addon/addon.xml b/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/addon/addon.xml index 19fd693..baa11c6 100644 --- a/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/addon/addon.xml +++ b/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/addon/addon.xml @@ -1,12 +1,11 @@ - + - binding - Fhz4J Binding - The Fhz binding integrates the Fhz and EvoHome systems via the CUL RF-receiver. - local + binding + Fhz4J Binding + The Fhz binding integrates the Fhz and EvoHome systems via the CUL RF-receiver. + local diff --git a/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/i18n/fhz4j_xx_XX.properties b/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/i18n/fhz4j_xx_XX.properties deleted file mode 100644 index e735704..0000000 --- a/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/i18n/fhz4j_xx_XX.properties +++ /dev/null @@ -1,13 +0,0 @@ -# FIXME: please substitute the xx_XX with a proper locale, ie. de_DE -# FIXME: please do not add the file to the repo if you add or change no content -# binding -binding.fhz4j.name = -binding.fhz4j.description = - -# thing types -thing-type.fhz4j.sample.label = -thing-type.fhz4j.sample.description = - -# channel types -channel-type.fhz4j.sample-channel.label = -channel-type.fhz4j.sample-channel.description = diff --git a/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/thing/channels.xml b/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/thing/channels.xml index 95fed64..0dc2da0 100644 --- a/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/thing/channels.xml +++ b/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/thing/channels.xml @@ -1,329 +1,325 @@ - - + + + Contact + + Indicates if the window is open or closed + + Window + + + + + + + - - - Contact - - Indicates if the window is open or closed - - Window - - - - - - - + + Number + + Measured Energy + + + + + Number + + Heat demand of radiator + + + - - Number - - Measured Energy - - - + + Number + + Measured Power + + + - - Number - - Heat demand of radiator - - - + + Number + + Measured Humidity + + CurrentHumidity + + + + - - Number - - Measured Power - - - + + Number + + Measured Temperature + Radiator + + CurrentTemperature + + + + - - Number - - Measured Humidity - - CurrentHumidity - - - - + + Number + + Desired temperature. + Radiator + + TargetTemperature + + + + - - Number - - Measured Temperature - Radiator - - CurrentTemperature - - - - + + Number + + Desired day temperature. + Radiator + + TargetTemperature + + + + - - Number - - Desired temperature. - Radiator - - TargetTemperature - - - - + + Number + + Desired night temperature + Radiator + + TargetTemperature + + + + - - Number - - Desired day temperature. - Radiator - - TargetTemperature - - - - + + Number + + Desired window open temperature + Radiator + + TargetTemperature + + + + - - Number - - Desired night temperature - Radiator - - TargetTemperature - - - - + + Number + + Position of the radiator valve. + Radiator + + RadiatorValvePos + + + + - - Number - - Desired window open temperature - Radiator - - TargetTemperature - - - - + + Switch + + Allow beep on valve if battery is low. + Radiator + + RadiatorValveBeep + + + + - - Number - - Position of the radiator valve. - Radiator - - RadiatorValvePos - - - - + + String + + Mode of temperature control + Radiator + + + + + + + + + - - Switch - - Allow beep on valve if battery is low. - Radiator - - RadiatorValveBeep - - - - + + DateTime + + Date of something + Radiator + - - String - - Mode of temperature control - Radiator - - - - - - - - - + + String + + Switch times of Mon-Sun format: "XX:XX-XX:XX XX:XX-XX:XX". + Radiator + - - - DateTime - - Date of something - Radiator - - - - String - - Switch times of Mon-Sun format: "XX:XX-XX:XX XX:XX-XX:XX". - Radiator - - - - String - - Mode of temperature control - Radiator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + String + + Mode of temperature control + Radiator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/thing/em-1000-em-thing.xml b/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/thing/em-1000-em-thing.xml index 8a2a0e1..e7df3d2 100644 --- a/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/thing/em-1000-em-thing.xml +++ b/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/thing/em-1000-em-thing.xml @@ -1,32 +1,33 @@ - - - - - - + - - Energy Measurement + + + + - - - - - - - - - + + Energy Measurement - - - - The Address. - - - + + + + + + + + + + + + + + The Address. + + + diff --git a/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/thing/fht80-tf-thing.xml b/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/thing/fht80-tf-thing.xml index e7d4c05..e9d3fd4 100644 --- a/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/thing/fht80-tf-thing.xml +++ b/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/thing/fht80-tf-thing.xml @@ -1,28 +1,29 @@ - - - - - - + - - Fht80TF binding + + + + - - - - - + + Fht80TF binding - - - - The address as hex. - - - + + + + + + + + + + The address as hex. + + + diff --git a/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/thing/hms-100-tf-thing.xml b/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/thing/hms-100-tf-thing.xml index f9b098d..98459cc 100644 --- a/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/thing/hms-100-tf-thing.xml +++ b/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/thing/hms-100-tf-thing.xml @@ -1,29 +1,29 @@ - - + - - - - + + + + - - Temp Humidity sensor + + Temp Humidity sensor - - - - - + + + + + - - - - The Housecode. - - - + + + + The Housecode. + + + diff --git a/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/thing/multi-zone-controller-evo-home-thing.xml b/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/thing/multi-zone-controller-evo-home-thing.xml index 1626be8..b3764ed 100644 --- a/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/thing/multi-zone-controller-evo-home-thing.xml +++ b/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/thing/multi-zone-controller-evo-home-thing.xml @@ -1,260 +1,260 @@ - - + - - - - + + + + - - Evo Home single zone thermostat binding + + Evo Home single zone thermostat binding - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - The deviceId - - - + + + + The deviceId + + + diff --git a/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/thing/radiator-evo-home-thing.xml b/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/thing/radiator-evo-home-thing.xml index c51a762..05b5964 100644 --- a/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/thing/radiator-evo-home-thing.xml +++ b/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/thing/radiator-evo-home-thing.xml @@ -1,30 +1,30 @@ - - + - - - - + + + + - - Evo Home radiator binding + + Evo Home radiator binding - - - - - - + + + + + + - - - - The deviceId - - - + + + + The deviceId + + + diff --git a/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/thing/radiator-fht80b-thing.xml b/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/thing/radiator-fht80b-thing.xml index d5435a1..434093a 100644 --- a/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/thing/radiator-fht80b-thing.xml +++ b/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/thing/radiator-fht80b-thing.xml @@ -1,75 +1,76 @@ - - - - - - + - - Fht80b binding + + + + - - - - - - + + Fht80b binding - - - - - - - - + + + + + + - - - date of holyday end - - - - - + + - - - - - - - - - - - - - - - - - - - - - + + + - + - - - - The housecode. - - - - The cron pattern for pinging the device. - - - + + + date of holyday end + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + The housecode. + + + + The cron pattern for pinging the device. + + + diff --git a/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/thing/rs232-bridge-cul.xml b/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/thing/rs232-bridge-cul.xml index c88232d..eeb4877 100644 --- a/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/thing/rs232-bridge-cul.xml +++ b/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/thing/rs232-bridge-cul.xml @@ -1,14 +1,14 @@ - - + - - - The RS 232 bridge represents a single CUL stick connected via RS232 + + + The RS 232 bridge represents a single CUL stick connected via RS232 - - + + diff --git a/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/thing/single-zone-thermostat-evo-home-thing.xml b/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/thing/single-zone-thermostat-evo-home-thing.xml index 5036dc9..62cabdf 100644 --- a/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/thing/single-zone-thermostat-evo-home-thing.xml +++ b/de.ibapl.openhab.fhz4j/src/main/resources/OH-INF/thing/single-zone-thermostat-evo-home-thing.xml @@ -1,32 +1,32 @@ - - + - - - - + + + + - - Evo Home multi zone controller binding + + Evo Home multi zone controller binding - - - - - - - - + + + + + + + + - - - - The deviceId - - - + + + + The deviceId + + + diff --git a/de.ibapl.openhab.onewire4j/src/main/java/de/ibapl/openhab/onewire4j/internal/OneWire4JHandlerFactory.java b/de.ibapl.openhab.onewire4j/src/main/java/de/ibapl/openhab/onewire4j/internal/OneWire4JHandlerFactory.java index 4f50c54..a07d024 100644 --- a/de.ibapl.openhab.onewire4j/src/main/java/de/ibapl/openhab/onewire4j/internal/OneWire4JHandlerFactory.java +++ b/de.ibapl.openhab.onewire4j/src/main/java/de/ibapl/openhab/onewire4j/internal/OneWire4JHandlerFactory.java @@ -51,7 +51,7 @@ * * @author aploese@gmx.de - Initial contribution */ -@Component(service = ThingHandlerFactory.class) +@Component(service = ThingHandlerFactory.class, immediate = true, configurationPid = "binding.onewire4j") public class OneWire4JHandlerFactory extends BaseThingHandlerFactory { private static final Set SUPPORTED_THING_TYPES_UIDS; diff --git a/de.ibapl.openhab.onewire4j/src/main/java/de/ibapl/openhab/onewire4j/internal/discovery/OneWire4JDiscoveryService.java b/de.ibapl.openhab.onewire4j/src/main/java/de/ibapl/openhab/onewire4j/internal/discovery/OneWire4JDiscoveryService.java index 75f7e6b..790de4e 100644 --- a/de.ibapl.openhab.onewire4j/src/main/java/de/ibapl/openhab/onewire4j/internal/discovery/OneWire4JDiscoveryService.java +++ b/de.ibapl.openhab.onewire4j/src/main/java/de/ibapl/openhab/onewire4j/internal/discovery/OneWire4JDiscoveryService.java @@ -33,13 +33,16 @@ import org.openhab.core.config.discovery.AbstractDiscoveryService; import org.openhab.core.config.discovery.DiscoveryResult; import org.openhab.core.config.discovery.DiscoveryResultBuilder; +import org.openhab.core.config.discovery.DiscoveryService; import org.openhab.core.thing.ThingTypeUID; import org.openhab.core.thing.ThingUID; +import org.osgi.service.component.annotations.Component; /** * * @author aploese@gmx.de - Initial contribution */ +@Component(immediate = true, service = DiscoveryService.class, configurationPid = "discovery.onewire4j") public class OneWire4JDiscoveryService extends AbstractDiscoveryService { private static final Logger LOGGER = Logger.getLogger("d.i.o.ow.h.OneWire4JDiscoveryService"); diff --git a/de.ibapl.openhab.onewire4j/src/main/resources/OH-INF/addon/addon.xml b/de.ibapl.openhab.onewire4j/src/main/resources/OH-INF/addon/addon.xml index f14f5e4..e729451 100644 --- a/de.ibapl.openhab.onewire4j/src/main/resources/OH-INF/addon/addon.xml +++ b/de.ibapl.openhab.onewire4j/src/main/resources/OH-INF/addon/addon.xml @@ -1,12 +1,11 @@ - + - binding - OneWire Binding - The OneWire binding integrates the 1-wire devices. - local + binding + OneWire Binding + The OneWire binding integrates the 1-wire devices. + local diff --git a/de.ibapl.openhab.onewire4j/src/main/resources/OH-INF/thing/advanced-temperature-thing.xml b/de.ibapl.openhab.onewire4j/src/main/resources/OH-INF/thing/advanced-temperature-thing.xml index 91f60d2..bc5d53e 100644 --- a/de.ibapl.openhab.onewire4j/src/main/resources/OH-INF/thing/advanced-temperature-thing.xml +++ b/de.ibapl.openhab.onewire4j/src/main/resources/OH-INF/thing/advanced-temperature-thing.xml @@ -1,43 +1,44 @@ - - - - - - + - - Temperature and alert thing for OneWire4J binding + + + + - - - - - - - - - - The one wire device id. - - - + + Temperature and alert thing for OneWire4J binding - - Number - - Min Temperature Alert - - - - - Number - - Max Temperature Alert - - - + + + + + + + + + + The one wire device id. + + + + + + Number + + Min Temperature Alert + + + + + Number + + Max Temperature Alert + + + diff --git a/de.ibapl.openhab.onewire4j/src/main/resources/OH-INF/thing/channels.xml b/de.ibapl.openhab.onewire4j/src/main/resources/OH-INF/thing/channels.xml index 85af73f..1e3b94e 100644 --- a/de.ibapl.openhab.onewire4j/src/main/resources/OH-INF/thing/channels.xml +++ b/de.ibapl.openhab.onewire4j/src/main/resources/OH-INF/thing/channels.xml @@ -1,30 +1,31 @@ - - - - Number - - Measured Temperature - Temperature - - CurrentTemperature - - - - + - - Number - - Measured Humidity - Humidity - - CurrentHumidity - - - - + + Number + + Measured Temperature + Temperature + + CurrentTemperature + + + + + + + Number + + Measured Humidity + Humidity + + CurrentHumidity + + + + diff --git a/de.ibapl.openhab.onewire4j/src/main/resources/OH-INF/thing/humidity-thing.xml b/de.ibapl.openhab.onewire4j/src/main/resources/OH-INF/thing/humidity-thing.xml index 12f66c8..616c7a8 100644 --- a/de.ibapl.openhab.onewire4j/src/main/resources/OH-INF/thing/humidity-thing.xml +++ b/de.ibapl.openhab.onewire4j/src/main/resources/OH-INF/thing/humidity-thing.xml @@ -1,28 +1,28 @@ - - - - - - - + - - Humidity from DS2438 thing for OneWire4J binding + + + + - - - - + + Humidity from DS2438 thing for OneWire4J binding - - - - The one wire device id. - - - + + + + + + + + + The one wire device id. + + + diff --git a/de.ibapl.openhab.onewire4j/src/main/resources/OH-INF/thing/rs232-bridge.xml b/de.ibapl.openhab.onewire4j/src/main/resources/OH-INF/thing/rs232-bridge.xml index d428465..b2b5ba9 100644 --- a/de.ibapl.openhab.onewire4j/src/main/resources/OH-INF/thing/rs232-bridge.xml +++ b/de.ibapl.openhab.onewire4j/src/main/resources/OH-INF/thing/rs232-bridge.xml @@ -1,13 +1,14 @@ - - - - - The RS 232 bridge represents a single One Wire network connected via RS232 + - - + + + The RS 232 bridge represents a single One Wire network connected via RS232 + + + diff --git a/de.ibapl.openhab.onewire4j/src/main/resources/OH-INF/thing/smart-battery-monitor-thing.xml b/de.ibapl.openhab.onewire4j/src/main/resources/OH-INF/thing/smart-battery-monitor-thing.xml index 7029c89..5b3eacb 100644 --- a/de.ibapl.openhab.onewire4j/src/main/resources/OH-INF/thing/smart-battery-monitor-thing.xml +++ b/de.ibapl.openhab.onewire4j/src/main/resources/OH-INF/thing/smart-battery-monitor-thing.xml @@ -1,25 +1,26 @@ - - - - - - + - - Smart battery monitor thing for OneWire4J binding + + + + - - + + Smart battery monitor thing for OneWire4J binding - - - - The one wire device id. - - - + + + + + + + The one wire device id. + + + diff --git a/de.ibapl.openhab.onewire4j/src/main/resources/OH-INF/thing/temperature-thing.xml b/de.ibapl.openhab.onewire4j/src/main/resources/OH-INF/thing/temperature-thing.xml index 7af105a..7b28580 100644 --- a/de.ibapl.openhab.onewire4j/src/main/resources/OH-INF/thing/temperature-thing.xml +++ b/de.ibapl.openhab.onewire4j/src/main/resources/OH-INF/thing/temperature-thing.xml @@ -1,27 +1,27 @@ - - - - - - - + - - Temperature thing for OneWire4J binding + + + + - - - + + Temperature thing for OneWire4J binding - - - - The one wire device id. - - - + + + + + + + + The one wire device id. + + + diff --git a/de.ibapl.openhab.onewire4j/src/main/resources/OH-INF/thing/unknown-thing.xml b/de.ibapl.openhab.onewire4j/src/main/resources/OH-INF/thing/unknown-thing.xml index 6dcedae..9f22263 100644 --- a/de.ibapl.openhab.onewire4j/src/main/resources/OH-INF/thing/unknown-thing.xml +++ b/de.ibapl.openhab.onewire4j/src/main/resources/OH-INF/thing/unknown-thing.xml @@ -1,22 +1,23 @@ - - - - - - + - - Unknown device + + + + - - - - The one wire device id. - - - + + Unknown device + + + + + The one wire device id. + + + diff --git a/pom.xml b/pom.xml index 22e2989..328771c 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ 1.1.1-SNAPSHOT ${project.version} 4.1.0 - [6.0.0,7.0.0) + 6.0.0 https://openhab.jfrog.io/openhab @@ -316,7 +316,7 @@ org.osgi - org.osgi.annotation + osgi.annotation ${osgi.version.range} provided