diff --git a/addons/binding/org.openhab.binding.airquality/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.airquality/META-INF/MANIFEST.MF index f6e6433880ab2..14ca07572a04f 100644 --- a/addons/binding/org.openhab.binding.airquality/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.airquality/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: AirQuality Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.airquality;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Export-Package: org.openhab.binding.airquality, org.openhab.binding.airquality.handler, diff --git a/addons/binding/org.openhab.binding.airquality/pom.xml b/addons/binding/org.openhab.binding.airquality/pom.xml index 53607799a5ba6..e4af36a8e2429 100644 --- a/addons/binding/org.openhab.binding.airquality/pom.xml +++ b/addons/binding/org.openhab.binding.airquality/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.airquality diff --git a/addons/binding/org.openhab.binding.airvisualnode/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.airvisualnode/META-INF/MANIFEST.MF index d53102c54fe52..30279a4988062 100644 --- a/addons/binding/org.openhab.binding.airvisualnode/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.airvisualnode/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Bundle-Name: AirVisualNode Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.airvisualnode;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.gson, com.google.gson.annotations, diff --git a/addons/binding/org.openhab.binding.airvisualnode/pom.xml b/addons/binding/org.openhab.binding.airvisualnode/pom.xml index 138c99186ee61..bfc65289437f1 100644 --- a/addons/binding/org.openhab.binding.airvisualnode/pom.xml +++ b/addons/binding/org.openhab.binding.airvisualnode/pom.xml @@ -1,17 +1,15 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.airvisualnode - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT AirVisual Node Air Quality Monitor Binding eclipse-plugin diff --git a/addons/binding/org.openhab.binding.allplay/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.allplay/META-INF/MANIFEST.MF index 9a1bb7d377018..fc4349a29f7cd 100644 --- a/addons/binding/org.openhab.binding.allplay/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.allplay/META-INF/MANIFEST.MF @@ -19,7 +19,7 @@ Bundle-NativeCode: Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.allplay;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: org.apache.commons.io, org.eclipse.jdt.annotation;resolution:=optional, diff --git a/addons/binding/org.openhab.binding.allplay/pom.xml b/addons/binding/org.openhab.binding.allplay/pom.xml index ffd0e3b239662..814780b8ed36c 100644 --- a/addons/binding/org.openhab.binding.allplay/pom.xml +++ b/addons/binding/org.openhab.binding.allplay/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.allplay diff --git a/addons/binding/org.openhab.binding.amazondashbutton/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.amazondashbutton/META-INF/MANIFEST.MF index 2871e01073db9..f5ed3bb9bbec4 100644 --- a/addons/binding/org.openhab.binding.amazondashbutton/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.amazondashbutton/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.amazondashbutton;singleton:=tru e Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.common.base, com.google.common.collect, diff --git a/addons/binding/org.openhab.binding.amazondashbutton/pom.xml b/addons/binding/org.openhab.binding.amazondashbutton/pom.xml index 7c56cc76b3996..fa48edefd2a35 100644 --- a/addons/binding/org.openhab.binding.amazondashbutton/pom.xml +++ b/addons/binding/org.openhab.binding.amazondashbutton/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.amazondashbutton diff --git a/addons/binding/org.openhab.binding.amazonechocontrol/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.amazonechocontrol/META-INF/MANIFEST.MF index 76566bfa9c501..989694f5cadcd 100755 --- a/addons/binding/org.openhab.binding.amazonechocontrol/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.amazonechocontrol/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: Amazon Echo Control Binding Bundle-SymbolicName: org.openhab.binding.amazonechocontrol;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.gson, javax.measure, javax.measure.quantity, diff --git a/addons/binding/org.openhab.binding.amazonechocontrol/pom.xml b/addons/binding/org.openhab.binding.amazonechocontrol/pom.xml index e49de2ff47de2..eea67466f0526 100755 --- a/addons/binding/org.openhab.binding.amazonechocontrol/pom.xml +++ b/addons/binding/org.openhab.binding.amazonechocontrol/pom.xml @@ -1,16 +1,15 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.amazonechocontrol - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT eclipse-plugin Amazon Echo Control Binding diff --git a/addons/binding/org.openhab.binding.atlona/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.atlona/META-INF/MANIFEST.MF index a8679fabff6b5..e2ac8a37bb20d 100644 --- a/addons/binding/org.openhab.binding.atlona/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.atlona/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: Atlona Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.atlona;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: org.apache.commons.lang, org.eclipse.jdt.annotation;resolution:=optional, diff --git a/addons/binding/org.openhab.binding.atlona/pom.xml b/addons/binding/org.openhab.binding.atlona/pom.xml index 4cd68a5f62687..f86da1976ee9e 100644 --- a/addons/binding/org.openhab.binding.atlona/pom.xml +++ b/addons/binding/org.openhab.binding.atlona/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.atlona diff --git a/addons/binding/org.openhab.binding.autelis/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.autelis/META-INF/MANIFEST.MF index a543f254602cb..c06eafd93a35c 100644 --- a/addons/binding/org.openhab.binding.autelis/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.autelis/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Name: Autelis Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.autelis;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Export-Package: org.openhab.binding.autelis, org.openhab.binding.autelis.handler diff --git a/addons/binding/org.openhab.binding.autelis/pom.xml b/addons/binding/org.openhab.binding.autelis/pom.xml index 95304d9d65a3e..058b73c298471 100644 --- a/addons/binding/org.openhab.binding.autelis/pom.xml +++ b/addons/binding/org.openhab.binding.autelis/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.autelis diff --git a/addons/binding/org.openhab.binding.avmfritz.test/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.avmfritz.test/META-INF/MANIFEST.MF index bbf4ce7a9b698..7512a661db3e5 100644 --- a/addons/binding/org.openhab.binding.avmfritz.test/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.avmfritz.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: AVM FRITZ! Binding Tests Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.avmfritz.test;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Fragment-Host: org.openhab.binding.avmfritz Import-Package: org.eclipse.jdt.annotation;resolution:=optional, diff --git a/addons/binding/org.openhab.binding.avmfritz.test/pom.xml b/addons/binding/org.openhab.binding.avmfritz.test/pom.xml index 7a3252ba7311b..1a493464599b1 100644 --- a/addons/binding/org.openhab.binding.avmfritz.test/pom.xml +++ b/addons/binding/org.openhab.binding.avmfritz.test/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.avmfritz.test diff --git a/addons/binding/org.openhab.binding.avmfritz/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.avmfritz/META-INF/MANIFEST.MF index 53074d7bf3e40..eaaee3b00ba5a 100644 --- a/addons/binding/org.openhab.binding.avmfritz/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.avmfritz/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: AVM FRITZ! Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.avmfritz;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: javax.measure.quantity, javax.xml.bind, diff --git a/addons/binding/org.openhab.binding.avmfritz/pom.xml b/addons/binding/org.openhab.binding.avmfritz/pom.xml index de495c9af8b95..87cc30735f9f9 100644 --- a/addons/binding/org.openhab.binding.avmfritz/pom.xml +++ b/addons/binding/org.openhab.binding.avmfritz/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.avmfritz diff --git a/addons/binding/org.openhab.binding.bigassfan/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.bigassfan/META-INF/MANIFEST.MF index 16d74e02b143d..8a0c693e5a9c6 100644 --- a/addons/binding/org.openhab.binding.bigassfan/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.bigassfan/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Name: BigAssFan Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.bigassfan;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: org.apache.commons.lang, org.eclipse.jdt.annotation;resolution:=optional, diff --git a/addons/binding/org.openhab.binding.bigassfan/pom.xml b/addons/binding/org.openhab.binding.bigassfan/pom.xml index 1ba0347a73453..6d39fb7681359 100644 --- a/addons/binding/org.openhab.binding.bigassfan/pom.xml +++ b/addons/binding/org.openhab.binding.bigassfan/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.bigassfan diff --git a/addons/binding/org.openhab.binding.boschindego/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.boschindego/META-INF/MANIFEST.MF index a869ca91e1303..20de2a54648a5 100644 --- a/addons/binding/org.openhab.binding.boschindego/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.boschindego/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Bundle-Name: BoschIndego Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.boschindego;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: org.apache.commons.codec, org.apache.commons.codec.binary, diff --git a/addons/binding/org.openhab.binding.boschindego/pom.xml b/addons/binding/org.openhab.binding.boschindego/pom.xml index 3bd7538cce806..543b86236efdc 100644 --- a/addons/binding/org.openhab.binding.boschindego/pom.xml +++ b/addons/binding/org.openhab.binding.boschindego/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.boschindego diff --git a/addons/binding/org.openhab.binding.chromecast.test/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.chromecast.test/META-INF/MANIFEST.MF index 9b6c8ee836b71..660292638ab07 100644 --- a/addons/binding/org.openhab.binding.chromecast.test/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.chromecast.test/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Name: Chromecast Binding Tests Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.chromecast.test;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Fragment-Host: org.openhab.binding.chromecast Import-Package: org.eclipse.jdt.annotation;resolution:=optional, diff --git a/addons/binding/org.openhab.binding.chromecast.test/pom.xml b/addons/binding/org.openhab.binding.chromecast.test/pom.xml index 078ad34f7db34..20eacadb88ed1 100644 --- a/addons/binding/org.openhab.binding.chromecast.test/pom.xml +++ b/addons/binding/org.openhab.binding.chromecast.test/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.chromecast.test diff --git a/addons/binding/org.openhab.binding.chromecast/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.chromecast/META-INF/MANIFEST.MF index 8e4d3843aecc9..07c0ea7e20d75 100644 --- a/addons/binding/org.openhab.binding.chromecast/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.chromecast/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Bundle-Name: Chromecast Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.chromecast;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: javax.jmdns, javax.measure.quantity, diff --git a/addons/binding/org.openhab.binding.chromecast/pom.xml b/addons/binding/org.openhab.binding.chromecast/pom.xml index ff6ec33a9fdb2..0b0c274de0e39 100644 --- a/addons/binding/org.openhab.binding.chromecast/pom.xml +++ b/addons/binding/org.openhab.binding.chromecast/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.chromecast diff --git a/addons/binding/org.openhab.binding.cm11a/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.cm11a/META-INF/MANIFEST.MF index 4f9f2279f5636..054527bd04c0b 100644 --- a/addons/binding/org.openhab.binding.cm11a/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.cm11a/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: CM11A Binding Bundle-SymbolicName: org.openhab.binding.cm11a;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: . Import-Package: gnu.io, diff --git a/addons/binding/org.openhab.binding.cm11a/pom.xml b/addons/binding/org.openhab.binding.cm11a/pom.xml index e2beda5cfa92f..d4caa1d3c0f14 100644 --- a/addons/binding/org.openhab.binding.cm11a/pom.xml +++ b/addons/binding/org.openhab.binding.cm11a/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.cm11a diff --git a/addons/binding/org.openhab.binding.coolmasternet/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.coolmasternet/META-INF/MANIFEST.MF index f150a53e2abb0..8c5efe7a9c1f8 100644 --- a/addons/binding/org.openhab.binding.coolmasternet/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.coolmasternet/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: CoolMasterNet Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.coolmasternet;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: org.eclipse.jdt.annotation;resolution:=optional, org.eclipse.smarthome.config.core, diff --git a/addons/binding/org.openhab.binding.coolmasternet/pom.xml b/addons/binding/org.openhab.binding.coolmasternet/pom.xml index b57f1b9c01f8c..6bb50b0b0250c 100644 --- a/addons/binding/org.openhab.binding.coolmasternet/pom.xml +++ b/addons/binding/org.openhab.binding.coolmasternet/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.coolmasternet diff --git a/addons/binding/org.openhab.binding.deconz/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.deconz/META-INF/MANIFEST.MF index 90611d16a9c84..3ae8ce5c987c3 100644 --- a/addons/binding/org.openhab.binding.deconz/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.deconz/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: Dresden Elektronik Deconz Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.deconz;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.gson, com.google.gson.stream, diff --git a/addons/binding/org.openhab.binding.deconz/pom.xml b/addons/binding/org.openhab.binding.deconz/pom.xml index 4e436b6469b4c..5137f441fda30 100644 --- a/addons/binding/org.openhab.binding.deconz/pom.xml +++ b/addons/binding/org.openhab.binding.deconz/pom.xml @@ -1,17 +1,15 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.deconz - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT Dresden Elektronik Deconz Binding eclipse-plugin diff --git a/addons/binding/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/HandlerFactory.java b/addons/binding/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/HandlerFactory.java index 8211916c79265..c11bd5994f2bc 100644 --- a/addons/binding/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/HandlerFactory.java +++ b/addons/binding/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/HandlerFactory.java @@ -41,7 +41,7 @@ public class HandlerFactory extends BaseThingHandlerFactory { private static final Set SUPPORTED_THING_TYPES_UIDS = Stream .of(BRIDGE_TYPE, THING_TYPE_PRESENCE_SENSOR, THING_TYPE_DAYLIGHT_SENSOR, THING_TYPE_POWER_SENSOR, - THING_TYPE_LIGHT_SENSOR, THING_TYPE_TEMPERATURE_SENSOR) + THING_TYPE_LIGHT_SENSOR, THING_TYPE_TEMPERATURE_SENSOR, THING_TYPE_SWITCH) .collect(Collectors.toSet()); private @NonNullByDefault({}) WebSocketFactory webSocketFactory; diff --git a/addons/binding/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/SensorThingHandler.java b/addons/binding/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/SensorThingHandler.java index 5ff49d6d5a495..c41fd1dffb5f5 100644 --- a/addons/binding/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/SensorThingHandler.java +++ b/addons/binding/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/SensorThingHandler.java @@ -243,7 +243,7 @@ public void valueUpdated(String channelID, SensorState state) { break; case BindingConstants.CHANNEL_TEMPERATURE: if (temperature != null) { - updateState(channelID, new QuantityType(temperature, SIUnits.CELSIUS)); + updateState(channelID, new QuantityType(temperature / 100, SIUnits.CELSIUS)); } break; case BindingConstants.CHANNEL_PRESENCE: diff --git a/addons/binding/org.openhab.binding.denonmarantz/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.denonmarantz/META-INF/MANIFEST.MF index a7ec3430ed981..0e74c480ac03c 100644 --- a/addons/binding/org.openhab.binding.denonmarantz/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.denonmarantz/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: DenonMarantz Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.denonmarantz;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: javax.jmdns, javax.xml.bind, diff --git a/addons/binding/org.openhab.binding.denonmarantz/pom.xml b/addons/binding/org.openhab.binding.denonmarantz/pom.xml index 3a64c5869d928..2d65cd6e90c9b 100644 --- a/addons/binding/org.openhab.binding.denonmarantz/pom.xml +++ b/addons/binding/org.openhab.binding.denonmarantz/pom.xml @@ -1,17 +1,16 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding org.openhab.binding.denonmarantz - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT eclipse-plugin DenonMarantz Binding diff --git a/addons/binding/org.openhab.binding.dlinksmarthome/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.dlinksmarthome/META-INF/MANIFEST.MF index 01e989ff2bf62..ce79c96504594 100644 --- a/addons/binding/org.openhab.binding.dlinksmarthome/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.dlinksmarthome/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: D-Link Smart Home Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.dlinksmarthome;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: javax.jmdns, org.eclipse.jdt.annotation;resolution:=optional, diff --git a/addons/binding/org.openhab.binding.dlinksmarthome/pom.xml b/addons/binding/org.openhab.binding.dlinksmarthome/pom.xml index 31499645f98b4..363c1d000f45c 100644 --- a/addons/binding/org.openhab.binding.dlinksmarthome/pom.xml +++ b/addons/binding/org.openhab.binding.dlinksmarthome/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.dlinksmarthome diff --git a/addons/binding/org.openhab.binding.dscalarm/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.dscalarm/META-INF/MANIFEST.MF index 5fc5afd42c139..3095fefea7e3d 100644 --- a/addons/binding/org.openhab.binding.dscalarm/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.dscalarm/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: DSCAlarm Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.dscalarm;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: gnu.io, org.apache.commons.io, diff --git a/addons/binding/org.openhab.binding.dscalarm/pom.xml b/addons/binding/org.openhab.binding.dscalarm/pom.xml index c690a8cdb7d6b..5cd284accd171 100644 --- a/addons/binding/org.openhab.binding.dscalarm/pom.xml +++ b/addons/binding/org.openhab.binding.dscalarm/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.dscalarm diff --git a/addons/binding/org.openhab.binding.dsmr.test/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.dsmr.test/META-INF/MANIFEST.MF index 8fa3499e2e32d..30f6f17cf7443 100644 --- a/addons/binding/org.openhab.binding.dsmr.test/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.dsmr.test/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Name: DSMR Binding Tests Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.dsmr.test;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Fragment-Host: org.openhab.binding.dsmr Import-Package: org.apache.commons.io, diff --git a/addons/binding/org.openhab.binding.dsmr.test/pom.xml b/addons/binding/org.openhab.binding.dsmr.test/pom.xml index eaa6a2a09c9e8..288f25e7c7760 100644 --- a/addons/binding/org.openhab.binding.dsmr.test/pom.xml +++ b/addons/binding/org.openhab.binding.dsmr.test/pom.xml @@ -1,12 +1,11 @@ - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.dsmr.test diff --git a/addons/binding/org.openhab.binding.dsmr/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.dsmr/META-INF/MANIFEST.MF index fd3dd0b6b34db..3b4e94a3ca023 100644 --- a/addons/binding/org.openhab.binding.dsmr/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.dsmr/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: DSMR Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.dsmr;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: javax.measure, javax.measure.quantity, diff --git a/addons/binding/org.openhab.binding.dsmr/pom.xml b/addons/binding/org.openhab.binding.dsmr/pom.xml index 5ce5dea83ae46..d05eb8c90d726 100644 --- a/addons/binding/org.openhab.binding.dsmr/pom.xml +++ b/addons/binding/org.openhab.binding.dsmr/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.dsmr diff --git a/addons/binding/org.openhab.binding.enocean/ESH-INF/thing/MechanicalHandle.xml b/addons/binding/org.openhab.binding.enocean/ESH-INF/thing/MechanicalHandle.xml index db61ef9ed3733..72a77d75a6b4d 100644 --- a/addons/binding/org.openhab.binding.enocean/ESH-INF/thing/MechanicalHandle.xml +++ b/addons/binding/org.openhab.binding.enocean/ESH-INF/thing/MechanicalHandle.xml @@ -11,7 +11,7 @@ - Mechanical handle sensor for window/door handles (EEP: F6-10) + Mechanical handle sensor for window/door handles @@ -25,6 +25,7 @@ + true true diff --git a/addons/binding/org.openhab.binding.enocean/ESH-INF/thing/channels.xml b/addons/binding/org.openhab.binding.enocean/ESH-INF/thing/channels.xml index 719fefedde2de..99739797869f0 100644 --- a/addons/binding/org.openhab.binding.enocean/ESH-INF/thing/channels.xml +++ b/addons/binding/org.openhab.binding.enocean/ESH-INF/thing/channels.xml @@ -147,6 +147,13 @@ Used energy in Kilowatt hours + + + Number:ElectricPotential + + Voltage of the battery + + diff --git a/addons/binding/org.openhab.binding.enocean/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.enocean/META-INF/MANIFEST.MF index b8a0935e6e2c8..a9c67aaca04e4 100644 --- a/addons/binding/org.openhab.binding.enocean/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.enocean/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: EnOcean Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.enocean;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: javax.measure.quantity, org.apache.commons.io, diff --git a/addons/binding/org.openhab.binding.enocean/pom.xml b/addons/binding/org.openhab.binding.enocean/pom.xml index 7af04e461ce60..f75bb83c66667 100644 --- a/addons/binding/org.openhab.binding.enocean/pom.xml +++ b/addons/binding/org.openhab.binding.enocean/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 pom org.openhab.binding - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.enocean diff --git a/addons/binding/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/EnOceanBindingConstants.java b/addons/binding/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/EnOceanBindingConstants.java index ca0e83453265d..06a05f4aa55b0 100644 --- a/addons/binding/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/EnOceanBindingConstants.java +++ b/addons/binding/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/EnOceanBindingConstants.java @@ -101,6 +101,7 @@ public class EnOceanBindingConstants { public final static String CHANNEL_TOTALUSAGE = "totalusage"; public final static String CHANNEL_INSTANTLITRE = "amrLitre"; public final static String CHANNEL_TOTALCUBICMETRE = "amrCubicMetre"; + public final static String CHANNEL_BATTERY_VOLTAGE = "batteryVoltage"; public final static String CHANNEL_AUTOOFF = "autoOFF"; public final static String CHANNEL_DELAYRADIOOFF = "delayRadioOFF"; @@ -159,6 +160,8 @@ public class EnOceanBindingConstants { CoreItemFactory.CONTACT)); put(CHANNEL_WINDOWHANDLESTATE, new EnOceanChannelDescription( new ChannelTypeUID(BINDING_ID, CHANNEL_WINDOWHANDLESTATE), CoreItemFactory.STRING)); + put(CHANNEL_BATTERY_VOLTAGE, new EnOceanChannelDescription( + new ChannelTypeUID(BINDING_ID, CHANNEL_BATTERY_VOLTAGE), CoreItemFactory.NUMBER)); put(CHANNEL_TEACHINCMD, new EnOceanChannelDescription( new ChannelTypeUID(BINDING_ID, CHANNEL_TEACHINCMD), CoreItemFactory.SWITCH)); diff --git a/addons/binding/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_14/A5_14.java b/addons/binding/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_14/A5_14.java new file mode 100644 index 0000000000000..89693c30f47b0 --- /dev/null +++ b/addons/binding/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_14/A5_14.java @@ -0,0 +1,53 @@ +/** + * Copyright (c) 2010-2018 by the respective copyright holders. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + */ +package org.openhab.binding.enocean.internal.eep.A5_14; + +import static org.openhab.binding.enocean.internal.EnOceanBindingConstants.CHANNEL_BATTERY_VOLTAGE; + +import org.eclipse.smarthome.config.core.Configuration; +import org.eclipse.smarthome.core.library.types.QuantityType; +import org.eclipse.smarthome.core.library.unit.SmartHomeUnits; +import org.eclipse.smarthome.core.types.State; +import org.eclipse.smarthome.core.types.UnDefType; +import org.openhab.binding.enocean.internal.eep.Base._4BSMessage; +import org.openhab.binding.enocean.internal.messages.ERP1Message; + +/** + * + * @author Dominik Krickl-Vorreiter - Initial contribution + */ +public abstract class A5_14 extends _4BSMessage { + public A5_14(ERP1Message packet) { + super(packet); + } + + private State getBatteryVoltage() { + int db3 = getDB_3Value(); + + if (db3 > 250) { + logger.warn("EEP A5-14 error code {}", db3); + return UnDefType.UNDEF; + } + + double voltage = db3 / 50.0; // 0..250 = 0.0..5.0V + + return new QuantityType<>(voltage, SmartHomeUnits.VOLT); + } + + @Override + protected State convertToStateImpl(String channelId, String channelTypeId, State currentState, + Configuration config) { + switch (channelId) { + case CHANNEL_BATTERY_VOLTAGE: + return getBatteryVoltage(); + } + + return UnDefType.UNDEF; + } +} \ No newline at end of file diff --git a/addons/binding/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_14/A5_14_09.java b/addons/binding/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_14/A5_14_09.java new file mode 100644 index 0000000000000..2b669639c32aa --- /dev/null +++ b/addons/binding/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_14/A5_14_09.java @@ -0,0 +1,75 @@ +/** + * Copyright (c) 2010-2018 by the respective copyright holders. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + */ +package org.openhab.binding.enocean.internal.eep.A5_14; + +import static org.openhab.binding.enocean.internal.EnOceanBindingConstants.*; + +import org.eclipse.smarthome.config.core.Configuration; +import org.eclipse.smarthome.core.library.types.OpenClosedType; +import org.eclipse.smarthome.core.library.types.StringType; +import org.eclipse.smarthome.core.types.State; +import org.eclipse.smarthome.core.types.UnDefType; +import org.openhab.binding.enocean.internal.messages.ERP1Message; + +/** + * Window/Door-Sensor with States Open/Closed/Tilt, Supply voltage monitor + * + * @author Dominik Krickl-Vorreiter - Initial contribution + */ +public class A5_14_09 extends A5_14 { + public final byte CLOSED = (byte) 0x00; + public final byte TILTED = (byte) 0x01; + public final byte OPEN = (byte) 0x03; + + public A5_14_09(ERP1Message packet) { + super(packet); + } + + private State getWindowhandleState() { + byte ct = (byte) ((getDB_0() & 0x06) >> 1); + + switch (ct) { + case CLOSED: + return new StringType("CLOSED"); + case OPEN: + return new StringType("OPEN"); + case TILTED: + return new StringType("TILTED"); + } + + return UnDefType.UNDEF; + } + + private State getContact() { + byte ct = (byte) ((getDB_0() & 0x06) >> 1); + + switch (ct) { + case CLOSED: + return OpenClosedType.CLOSED; + case OPEN: + case TILTED: + return OpenClosedType.OPEN; + } + + return UnDefType.UNDEF; + } + + @Override + protected State convertToStateImpl(String channelId, String channelTypeId, State currentState, + Configuration config) { + switch (channelId) { + case CHANNEL_WINDOWHANDLESTATE: + return getWindowhandleState(); + case CHANNEL_CONTACT: + return getContact(); + } + + return super.convertToStateImpl(channelId, channelTypeId, currentState, config); + } +} \ No newline at end of file diff --git a/addons/binding/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/D2_01/D2_01.java b/addons/binding/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/D2_01/D2_01.java index 6852ff3c2883b..981f66f46f77e 100644 --- a/addons/binding/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/D2_01/D2_01.java +++ b/addons/binding/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/D2_01/D2_01.java @@ -75,7 +75,7 @@ protected void setSwitchingQueryData(byte outputChannel) { protected State getSwitchingData() { if (getCMD() == CMD_ACTUATOR_STATUS_RESPONE) { - return (bytes[bytes.length - 1] & outputValueMask) == STATUS_SWITCHING_ON ? OnOffType.OFF : OnOffType.ON; + return (bytes[bytes.length - 1] & outputValueMask) == STATUS_SWITCHING_OFF ? OnOffType.OFF : OnOffType.ON; } return UnDefType.UNDEF; diff --git a/addons/binding/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/EEPType.java b/addons/binding/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/EEPType.java index e2775a34cd231..c7403c82f6b27 100644 --- a/addons/binding/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/EEPType.java +++ b/addons/binding/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/EEPType.java @@ -90,6 +90,7 @@ import org.openhab.binding.enocean.internal.eep.A5_12.A5_12_01; import org.openhab.binding.enocean.internal.eep.A5_12.A5_12_02; import org.openhab.binding.enocean.internal.eep.A5_12.A5_12_03; +import org.openhab.binding.enocean.internal.eep.A5_14.A5_14_09; import org.openhab.binding.enocean.internal.eep.A5_38.A5_38_08_Blinds; import org.openhab.binding.enocean.internal.eep.A5_38.A5_38_08_Dimming; import org.openhab.binding.enocean.internal.eep.A5_38.A5_38_08_Switching; @@ -167,6 +168,8 @@ public enum EEPType { CHANNEL_WINDOWHANDLESTATE, CHANNEL_CONTACT, CHANNEL_RECEIVINGSTATE), MechanicalHandle01(RORG.RPS, 0x10, 0x01, false, F6_10_01.class, THING_TYPE_MECHANICALHANDLE, CHANNEL_WINDOWHANDLESTATE, CHANNEL_CONTACT, CHANNEL_RECEIVINGSTATE), + MechanicalHandle02(RORG._4BS, 0x14, 0x09, false, A5_14_09.class, THING_TYPE_MECHANICALHANDLE, + CHANNEL_WINDOWHANDLESTATE, CHANNEL_CONTACT, CHANNEL_BATTERY_VOLTAGE, CHANNEL_RECEIVINGSTATE), ContactAndSwitch(RORG._1BS, 0x00, 0x01, false, D5_00_01.class, THING_TYPE_CONTACT, CHANNEL_CONTACT, CHANNEL_RECEIVINGSTATE), diff --git a/addons/binding/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/handler/EnOceanClassicDeviceHandler.java b/addons/binding/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/handler/EnOceanClassicDeviceHandler.java index 6548a738e1d8f..264a88e533ad6 100644 --- a/addons/binding/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/handler/EnOceanClassicDeviceHandler.java +++ b/addons/binding/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/handler/EnOceanClassicDeviceHandler.java @@ -234,7 +234,7 @@ public void handleCommand(@NonNull ChannelUID channelUID, @NonNull Command comma EEP eep = EEPFactory.createEEP(sendingEEPType); ESP3Packet press = eep.setSenderId(senderId).setDestinationId(destinationId) - .convertFromCommand(channelId, channel.getChannelTypeUID().getId(), command, currentState, + .convertFromCommand(channelId, channel.getChannelTypeUID().getId(), result, currentState, channel.getConfiguration()) .setSuppressRepeating(getConfiguration().suppressRepeating).getERP1Message(); diff --git a/addons/binding/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/messages/ERP1Message.java b/addons/binding/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/messages/ERP1Message.java index 1ff0cce87757e..7d1461ad9af19 100644 --- a/addons/binding/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/messages/ERP1Message.java +++ b/addons/binding/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/messages/ERP1Message.java @@ -76,11 +76,16 @@ public ERP1Message(int dataLength, int optionalDataLength, byte[] payload) { rorg = RORG.getRORG(payload[0]); switch (rorg) { - case RPS: // treat each RPS message as a teach in message + case RPS: + if (dataLength >= 6) { + senderId = Arrays.copyOfRange(payload, 2, 6); + teachIn = false; + } + break; case _1BS: if (dataLength >= 6) { senderId = Arrays.copyOfRange(payload, 2, 6); - teachIn = rorg == RORG.RPS || ((_1BSMessage.TeachInBit & payload[1]) == 0); + teachIn = ((_1BSMessage.TeachInBit & payload[1]) == 0); } break; case _4BS: diff --git a/addons/binding/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/transceiver/EnOceanSerialTransceiver.java b/addons/binding/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/transceiver/EnOceanSerialTransceiver.java index 5a4fc87ad9aa0..c9d287b694923 100644 --- a/addons/binding/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/transceiver/EnOceanSerialTransceiver.java +++ b/addons/binding/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/transceiver/EnOceanSerialTransceiver.java @@ -58,8 +58,13 @@ public void Initialize() serialPort = id.open(EnOceanBindingConstants.BINDING_ID, 1000); serialPort.setSerialPortParams(ENOCEAN_DEFAULT_BAUD, SerialPort.DATABITS_8, SerialPort.STOPBITS_1, SerialPort.PARITY_NONE); - serialPort.enableReceiveThreshold(1); - serialPort.enableReceiveTimeout(100); // In ms. Small values mean faster shutdown but more cpu usage. + + try { + serialPort.enableReceiveThreshold(1); + serialPort.enableReceiveTimeout(100); // In ms. Small values mean faster shutdown but more cpu usage. + } catch (UnsupportedCommOperationException e) { + // rfc connections do not allow a ReceiveThreshold + } inputStream = serialPort.getInputStream(); outputStream = serialPort.getOutputStream(); diff --git a/addons/binding/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/transceiver/EnOceanTransceiver.java b/addons/binding/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/transceiver/EnOceanTransceiver.java index 29cf476521d4b..f5686b1dbd683 100644 --- a/addons/binding/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/transceiver/EnOceanTransceiver.java +++ b/addons/binding/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/transceiver/EnOceanTransceiver.java @@ -26,6 +26,7 @@ import org.eclipse.smarthome.io.transport.serial.UnsupportedCommOperationException; import org.openhab.binding.enocean.internal.EnOceanException; import org.openhab.binding.enocean.internal.messages.ERP1Message; +import org.openhab.binding.enocean.internal.messages.ERP1Message.RORG; import org.openhab.binding.enocean.internal.messages.ESP3Packet; import org.openhab.binding.enocean.internal.messages.ESP3PacketFactory; import org.openhab.binding.enocean.internal.messages.Response; @@ -393,12 +394,18 @@ protected void informListeners(ERP1Message msg) { return; } - if (msg.getIsTeachIn()) { - if (teachInListener != null) { + if (teachInListener != null) { + if (msg.getIsTeachIn() || (msg.getRORG() == RORG.RPS)) { logger.info("Received teach in message from {}", HexUtils.bytesToHex(msg.getSenderId())); teachInListener.espPacketReceived(msg); return; } + } else { + if (msg.getIsTeachIn()) { + logger.info("Discard message because this is a teach-in telegram from {}!", + HexUtils.bytesToHex(msg.getSenderId())); + return; + } } long s = Long.parseLong(HexUtils.bytesToHex(senderId), 16); diff --git a/addons/binding/org.openhab.binding.evohome/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.evohome/META-INF/MANIFEST.MF index b4d0a5ba2f0d1..baa8d9ee7d9bf 100644 --- a/addons/binding/org.openhab.binding.evohome/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.evohome/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: evohome Binding Bundle-SymbolicName: org.openhab.binding.evohome;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: . Export-Package: diff --git a/addons/binding/org.openhab.binding.evohome/pom.xml b/addons/binding/org.openhab.binding.evohome/pom.xml index f73d70ec553b4..cd007058e1e1f 100644 --- a/addons/binding/org.openhab.binding.evohome/pom.xml +++ b/addons/binding/org.openhab.binding.evohome/pom.xml @@ -1,14 +1,13 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding org.openhab.binding.evohome - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT evohome Binding eclipse-plugin diff --git a/addons/binding/org.openhab.binding.exec/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.exec/META-INF/MANIFEST.MF index 86c14a1c69acc..a412bdd99e37f 100644 --- a/addons/binding/org.openhab.binding.exec/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.exec/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: Exec Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.exec;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Export-Package: org.openhab.binding.exec, org.openhab.binding.exec.handler diff --git a/addons/binding/org.openhab.binding.exec/pom.xml b/addons/binding/org.openhab.binding.exec/pom.xml index 6fdd8a9245db0..fad51f6e976f2 100644 --- a/addons/binding/org.openhab.binding.exec/pom.xml +++ b/addons/binding/org.openhab.binding.exec/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.exec diff --git a/addons/binding/org.openhab.binding.feed.test/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.feed.test/META-INF/MANIFEST.MF index dee765842a781..cf719f28246ea 100644 --- a/addons/binding/org.openhab.binding.feed.test/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.feed.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: Feed Binding Tests Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.feed.test;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Fragment-Host: org.openhab.binding.feed Import-Package: javax.servlet, diff --git a/addons/binding/org.openhab.binding.feed.test/pom.xml b/addons/binding/org.openhab.binding.feed.test/pom.xml index 25901494a5a0d..75f5927be94c6 100644 --- a/addons/binding/org.openhab.binding.feed.test/pom.xml +++ b/addons/binding/org.openhab.binding.feed.test/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.feed.test diff --git a/addons/binding/org.openhab.binding.feed/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.feed/META-INF/MANIFEST.MF index 7b2ca37fa22b2..108b9fe9b9901 100644 --- a/addons/binding/org.openhab.binding.feed/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.feed/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: Feed Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.feed;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.rometools.rome.feed, com.rometools.rome.feed.atom, diff --git a/addons/binding/org.openhab.binding.feed/pom.xml b/addons/binding/org.openhab.binding.feed/pom.xml index 1cd1e9fa5dc1e..c326f75745545 100644 --- a/addons/binding/org.openhab.binding.feed/pom.xml +++ b/addons/binding/org.openhab.binding.feed/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.feed diff --git a/addons/binding/org.openhab.binding.feican/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.feican/META-INF/MANIFEST.MF index f81bba9ff9a58..493e23bd4cd74 100644 --- a/addons/binding/org.openhab.binding.feican/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.feican/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Feican Binding Bundle-SymbolicName: org.openhab.binding.feican;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: . Import-Package: org.eclipse.jdt.annotation;resolution:=optional, diff --git a/addons/binding/org.openhab.binding.feican/pom.xml b/addons/binding/org.openhab.binding.feican/pom.xml index af04f2a43fdd6..1cc512dacc8b0 100644 --- a/addons/binding/org.openhab.binding.feican/pom.xml +++ b/addons/binding/org.openhab.binding.feican/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.feican diff --git a/addons/binding/org.openhab.binding.folding/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.folding/META-INF/MANIFEST.MF index 41c4ac2a210b8..d8dbd5ccd4217 100644 --- a/addons/binding/org.openhab.binding.folding/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.folding/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: Folding Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.folding;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.gson, com.google.gson.reflect, diff --git a/addons/binding/org.openhab.binding.folding/pom.xml b/addons/binding/org.openhab.binding.folding/pom.xml index 6c41aa89d486c..ff35401ec2eca 100644 --- a/addons/binding/org.openhab.binding.folding/pom.xml +++ b/addons/binding/org.openhab.binding.folding/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.folding diff --git a/addons/binding/org.openhab.binding.freebox/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.freebox/META-INF/MANIFEST.MF index f29f609d9c673..dbccf71a41333 100644 --- a/addons/binding/org.openhab.binding.freebox/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.freebox/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Bundle-Name: Freebox Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.freebox;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.common.base, com.google.common.collect, diff --git a/addons/binding/org.openhab.binding.freebox/pom.xml b/addons/binding/org.openhab.binding.freebox/pom.xml index 0159f3836c32d..412ee029fca2b 100644 --- a/addons/binding/org.openhab.binding.freebox/pom.xml +++ b/addons/binding/org.openhab.binding.freebox/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.freebox diff --git a/addons/binding/org.openhab.binding.fronius/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.fronius/META-INF/MANIFEST.MF index 4c55e1565e0b0..1c41db4058d99 100644 --- a/addons/binding/org.openhab.binding.fronius/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.fronius/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Fronius Binding Bundle-SymbolicName: org.openhab.binding.fronius;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: . Import-Package: diff --git a/addons/binding/org.openhab.binding.fronius/pom.xml b/addons/binding/org.openhab.binding.fronius/pom.xml index 8d0499c71f8cd..bf9f285056255 100644 --- a/addons/binding/org.openhab.binding.fronius/pom.xml +++ b/addons/binding/org.openhab.binding.fronius/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.fronius diff --git a/addons/binding/org.openhab.binding.ftpupload/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.ftpupload/META-INF/MANIFEST.MF index 726cf55da452a..56f2a65e68f7b 100644 --- a/addons/binding/org.openhab.binding.ftpupload/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.ftpupload/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: FTP Upload Binding Bundle-SymbolicName: org.openhab.binding.ftpupload;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: ., lib/ftplet-api-1.1.0.jar, diff --git a/addons/binding/org.openhab.binding.ftpupload/pom.xml b/addons/binding/org.openhab.binding.ftpupload/pom.xml index d3530a1411c43..caa2631248db4 100644 --- a/addons/binding/org.openhab.binding.ftpupload/pom.xml +++ b/addons/binding/org.openhab.binding.ftpupload/pom.xml @@ -1,17 +1,16 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding org.openhab.binding.ftpupload - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT eclipse-plugin FTP Upload Binding diff --git a/addons/binding/org.openhab.binding.gardena/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.gardena/META-INF/MANIFEST.MF index c63ae6534f510..dc5b03cc8f688 100644 --- a/addons/binding/org.openhab.binding.gardena/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.gardena/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: Gardena Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.gardena;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.gson, com.google.gson.annotations, diff --git a/addons/binding/org.openhab.binding.gardena/pom.xml b/addons/binding/org.openhab.binding.gardena/pom.xml index 421ddeb5a227e..13768d7e351cb 100644 --- a/addons/binding/org.openhab.binding.gardena/pom.xml +++ b/addons/binding/org.openhab.binding.gardena/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.gardena diff --git a/addons/binding/org.openhab.binding.globalcache/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.globalcache/META-INF/MANIFEST.MF index dc84ab41e0734..917d623be8f03 100644 --- a/addons/binding/org.openhab.binding.globalcache/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.globalcache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Name: GlobalCache Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.globalcache;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Export-Package: org.openhab.binding.globalcache, org.openhab.binding.globalcache.handler diff --git a/addons/binding/org.openhab.binding.globalcache/pom.xml b/addons/binding/org.openhab.binding.globalcache/pom.xml index 09500222246f7..cef56497771cd 100644 --- a/addons/binding/org.openhab.binding.globalcache/pom.xml +++ b/addons/binding/org.openhab.binding.globalcache/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.globalcache diff --git a/addons/binding/org.openhab.binding.gpstracker/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.gpstracker/META-INF/MANIFEST.MF index 477230dc3e2de..3ecb43eef35a2 100644 --- a/addons/binding/org.openhab.binding.gpstracker/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.gpstracker/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Automatic-Module-Name: org.openhab.binding.gpstracker Bundle-Name: GPSTracker Binding Bundle-SymbolicName: org.openhab.binding.gpstracker;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-ManifestVersion: 2 Bundle-Description: GPSTracker binding for openHAB Bundle-ClassPath: . diff --git a/addons/binding/org.openhab.binding.gpstracker/pom.xml b/addons/binding/org.openhab.binding.gpstracker/pom.xml index fbf7f1bdcf5cf..577243c602d67 100644 --- a/addons/binding/org.openhab.binding.gpstracker/pom.xml +++ b/addons/binding/org.openhab.binding.gpstracker/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.gpstracker diff --git a/addons/binding/org.openhab.binding.groheondus/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.groheondus/META-INF/MANIFEST.MF index 34d21bc0261bf..21c9ce77125d6 100644 --- a/addons/binding/org.openhab.binding.groheondus/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.groheondus/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: GROHE ONDUS Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.groheondus;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: javax.measure, org.eclipse.jdt.annotation;resolution:=optional, diff --git a/addons/binding/org.openhab.binding.groheondus/pom.xml b/addons/binding/org.openhab.binding.groheondus/pom.xml index c9d8c6593cd2b..64084e70d632b 100644 --- a/addons/binding/org.openhab.binding.groheondus/pom.xml +++ b/addons/binding/org.openhab.binding.groheondus/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 pom org.openhab.binding - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.groheondus diff --git a/addons/binding/org.openhab.binding.harmonyhub/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.harmonyhub/META-INF/MANIFEST.MF index 90e10218deb01..034547bc237f0 100644 --- a/addons/binding/org.openhab.binding.harmonyhub/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.harmonyhub/META-INF/MANIFEST.MF @@ -21,7 +21,7 @@ Bundle-Name: HarmonyHub Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.harmonyhub;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.common.base, com.google.common.collect, diff --git a/addons/binding/org.openhab.binding.harmonyhub/pom.xml b/addons/binding/org.openhab.binding.harmonyhub/pom.xml index c0945603a477e..e61f5886982a0 100644 --- a/addons/binding/org.openhab.binding.harmonyhub/pom.xml +++ b/addons/binding/org.openhab.binding.harmonyhub/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.harmonyhub diff --git a/addons/binding/org.openhab.binding.hdanywhere/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.hdanywhere/META-INF/MANIFEST.MF index 20de97fe38af3..d652980029b63 100644 --- a/addons/binding/org.openhab.binding.hdanywhere/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.hdanywhere/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: HDanywhere Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.hdanywhere;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.gson, com.google.gson.reflect, diff --git a/addons/binding/org.openhab.binding.hdanywhere/pom.xml b/addons/binding/org.openhab.binding.hdanywhere/pom.xml index 42949a69e594c..0d3f4de1838cc 100644 --- a/addons/binding/org.openhab.binding.hdanywhere/pom.xml +++ b/addons/binding/org.openhab.binding.hdanywhere/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.hdanywhere diff --git a/addons/binding/org.openhab.binding.hdpowerview/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.hdpowerview/META-INF/MANIFEST.MF index 49de34ccb4e87..21dfbc9da5a0a 100644 --- a/addons/binding/org.openhab.binding.hdpowerview/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.hdpowerview/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Bundle-Name: Hunter Douglas PowerView Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.hdpowerview;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.gson, javax.ws.rs.client, diff --git a/addons/binding/org.openhab.binding.hdpowerview/pom.xml b/addons/binding/org.openhab.binding.hdpowerview/pom.xml index d9f394274c788..de79b074a27d5 100644 --- a/addons/binding/org.openhab.binding.hdpowerview/pom.xml +++ b/addons/binding/org.openhab.binding.hdpowerview/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.hdpowerview diff --git a/addons/binding/org.openhab.binding.helios/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.helios/META-INF/MANIFEST.MF index 218c18262aa34..5864a234369d4 100644 --- a/addons/binding/org.openhab.binding.helios/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.helios/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Helios Binding Bundle-SymbolicName: org.openhab.binding.helios;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: ., lib/cxf-core-3.1.0-SNAPSHOT.jar, diff --git a/addons/binding/org.openhab.binding.helios/pom.xml b/addons/binding/org.openhab.binding.helios/pom.xml index 782da39d86ac1..b7021f3765622 100644 --- a/addons/binding/org.openhab.binding.helios/pom.xml +++ b/addons/binding/org.openhab.binding.helios/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.helios diff --git a/addons/binding/org.openhab.binding.hyperion/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.hyperion/META-INF/MANIFEST.MF index e4aee9bf02b6c..0e45cab53b5b3 100644 --- a/addons/binding/org.openhab.binding.hyperion/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.hyperion/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: Hyperion Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.hyperion;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.gson, com.google.gson.annotations, diff --git a/addons/binding/org.openhab.binding.hyperion/pom.xml b/addons/binding/org.openhab.binding.hyperion/pom.xml index 058cc2badf52c..ffacc69d7ff0d 100644 --- a/addons/binding/org.openhab.binding.hyperion/pom.xml +++ b/addons/binding/org.openhab.binding.hyperion/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.hyperion diff --git a/addons/binding/org.openhab.binding.icloud/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.icloud/META-INF/MANIFEST.MF index f8526286dc359..33634c0421649 100644 --- a/addons/binding/org.openhab.binding.icloud/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.icloud/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: iCloud Binding Bundle-SymbolicName: org.openhab.binding.icloud;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: . Import-Package: com.google.gson, diff --git a/addons/binding/org.openhab.binding.icloud/pom.xml b/addons/binding/org.openhab.binding.icloud/pom.xml index 7521e56a9e263..81adcc451712f 100644 --- a/addons/binding/org.openhab.binding.icloud/pom.xml +++ b/addons/binding/org.openhab.binding.icloud/pom.xml @@ -1,11 +1,10 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.icloud diff --git a/addons/binding/org.openhab.binding.innogysmarthome/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.innogysmarthome/META-INF/MANIFEST.MF index 52b4e8e52ed61..874cbc1b316a7 100644 --- a/addons/binding/org.openhab.binding.innogysmarthome/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.innogysmarthome/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: innogy SmartHome Binding Bundle-SymbolicName: org.openhab.binding.innogysmarthome;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: ., lib/google-http-client-1.22.0.jar, diff --git a/addons/binding/org.openhab.binding.innogysmarthome/pom.xml b/addons/binding/org.openhab.binding.innogysmarthome/pom.xml index 53b9546697a2b..56c197817baba 100644 --- a/addons/binding/org.openhab.binding.innogysmarthome/pom.xml +++ b/addons/binding/org.openhab.binding.innogysmarthome/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.innogysmarthome diff --git a/addons/binding/org.openhab.binding.ipp/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.ipp/META-INF/MANIFEST.MF index c7ed7067c7b60..7026ef3cc8d98 100644 --- a/addons/binding/org.openhab.binding.ipp/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.ipp/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Bundle-Name: IPP Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.ipp;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: javax.jmdns, javax.xml, diff --git a/addons/binding/org.openhab.binding.ipp/pom.xml b/addons/binding/org.openhab.binding.ipp/pom.xml index 7785c1cd46924..578cd6f41f9c3 100644 --- a/addons/binding/org.openhab.binding.ipp/pom.xml +++ b/addons/binding/org.openhab.binding.ipp/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.ipp diff --git a/addons/binding/org.openhab.binding.irtrans/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.irtrans/META-INF/MANIFEST.MF index 852f881353a95..71101d73334b6 100644 --- a/addons/binding/org.openhab.binding.irtrans/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.irtrans/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: IRtrans Binding Bundle-SymbolicName: org.openhab.binding.irtrans;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: . Import-Package: diff --git a/addons/binding/org.openhab.binding.irtrans/pom.xml b/addons/binding/org.openhab.binding.irtrans/pom.xml index 66d365fa6649c..71bdac7a5e72d 100644 --- a/addons/binding/org.openhab.binding.irtrans/pom.xml +++ b/addons/binding/org.openhab.binding.irtrans/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.irtrans diff --git a/addons/binding/org.openhab.binding.jeelink/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.jeelink/META-INF/MANIFEST.MF index 531c6b57ed0d6..55911e51e97e6 100644 --- a/addons/binding/org.openhab.binding.jeelink/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.jeelink/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: JeeLink Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.jeelink;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: gnu.io, javax.measure.quantity, diff --git a/addons/binding/org.openhab.binding.jeelink/pom.xml b/addons/binding/org.openhab.binding.jeelink/pom.xml index 37696630fab3a..e6ec9ff65089c 100644 --- a/addons/binding/org.openhab.binding.jeelink/pom.xml +++ b/addons/binding/org.openhab.binding.jeelink/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.jeelink diff --git a/addons/binding/org.openhab.binding.keba/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.keba/META-INF/MANIFEST.MF index f31b8ca0544e2..b72c3ec1ea734 100644 --- a/addons/binding/org.openhab.binding.keba/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.keba/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: Keba Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.keba;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.gson, org.apache.commons.lang, diff --git a/addons/binding/org.openhab.binding.keba/pom.xml b/addons/binding/org.openhab.binding.keba/pom.xml index 3c0aa72028926..0083d6a76c4a8 100644 --- a/addons/binding/org.openhab.binding.keba/pom.xml +++ b/addons/binding/org.openhab.binding.keba/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.keba diff --git a/addons/binding/org.openhab.binding.km200/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.km200/META-INF/MANIFEST.MF index 62dcf2d52153b..453ad86e5c74c 100644 --- a/addons/binding/org.openhab.binding.km200/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.km200/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: KM200 Binding Bundle-SymbolicName: org.openhab.binding.km200;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.openhab.binding.km200, diff --git a/addons/binding/org.openhab.binding.km200/pom.xml b/addons/binding/org.openhab.binding.km200/pom.xml index 16537c173586f..bb629337fd480 100644 --- a/addons/binding/org.openhab.binding.km200/pom.xml +++ b/addons/binding/org.openhab.binding.km200/pom.xml @@ -1,17 +1,16 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding org.openhab.binding.km200 - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT KM200 Binding eclipse-plugin diff --git a/addons/binding/org.openhab.binding.knx.test/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.knx.test/META-INF/MANIFEST.MF index 6b749eed3d0e3..d74d1aa218b49 100644 --- a/addons/binding/org.openhab.binding.knx.test/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.knx.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: KNX Binding Tests Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.knx.test;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Export-Package: org.openhab.binding.knx;uses:="org.eclipse.smarthome.test" Fragment-Host: org.openhab.binding.knx diff --git a/addons/binding/org.openhab.binding.knx.test/pom.xml b/addons/binding/org.openhab.binding.knx.test/pom.xml index 59436553ab4ed..135bf0a764917 100644 --- a/addons/binding/org.openhab.binding.knx.test/pom.xml +++ b/addons/binding/org.openhab.binding.knx.test/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.knx.test diff --git a/addons/binding/org.openhab.binding.knx/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.knx/META-INF/MANIFEST.MF index f194e615f80aa..f9b2c2a2884e7 100644 --- a/addons/binding/org.openhab.binding.knx/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.knx/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: KNX Binding Bundle-SymbolicName: org.openhab.binding.knx;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: gnu.io;resolution:=optional, org.eclipse.jdt.annotation;resolution:=optional, diff --git a/addons/binding/org.openhab.binding.knx/pom.xml b/addons/binding/org.openhab.binding.knx/pom.xml index 208b04503155a..f665750b1feab 100644 --- a/addons/binding/org.openhab.binding.knx/pom.xml +++ b/addons/binding/org.openhab.binding.knx/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.knx diff --git a/addons/binding/org.openhab.binding.kodi/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.kodi/META-INF/MANIFEST.MF index 12cebf296a0ee..113fd4b71b314 100644 --- a/addons/binding/org.openhab.binding.kodi/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.kodi/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: Kodi Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.kodi;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.gson, com.google.gson.annotations, diff --git a/addons/binding/org.openhab.binding.kodi/pom.xml b/addons/binding/org.openhab.binding.kodi/pom.xml index f9923c9367107..5de1ec9f7ec49 100644 --- a/addons/binding/org.openhab.binding.kodi/pom.xml +++ b/addons/binding/org.openhab.binding.kodi/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.kodi diff --git a/addons/binding/org.openhab.binding.konnected/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.konnected/META-INF/MANIFEST.MF index 4079721f1f6f7..b2a6a3d2b49fc 100644 --- a/addons/binding/org.openhab.binding.konnected/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.konnected/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Name: Konnected Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.konnected;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.gson, com.google.gson.annotations, diff --git a/addons/binding/org.openhab.binding.konnected/pom.xml b/addons/binding/org.openhab.binding.konnected/pom.xml index 7c18c223f9d09..7147b5feb206f 100644 --- a/addons/binding/org.openhab.binding.konnected/pom.xml +++ b/addons/binding/org.openhab.binding.konnected/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 pom org.openhab.binding - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.konnected diff --git a/addons/binding/org.openhab.binding.kostalinverter/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.kostalinverter/META-INF/MANIFEST.MF index c515b98a76ca5..82712c8da7f02 100644 --- a/addons/binding/org.openhab.binding.kostalinverter/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.kostalinverter/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Bundle-Name: Kostal Inverter Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.kostalinverter;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: javax.measure, org.eclipse.jdt.annotation;resolution:=optional, diff --git a/addons/binding/org.openhab.binding.kostalinverter/pom.xml b/addons/binding/org.openhab.binding.kostalinverter/pom.xml index d8ad7c6690086..040fd190792b7 100644 --- a/addons/binding/org.openhab.binding.kostalinverter/pom.xml +++ b/addons/binding/org.openhab.binding.kostalinverter/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.kostalinverter diff --git a/addons/binding/org.openhab.binding.lametrictime/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.lametrictime/META-INF/MANIFEST.MF index 6e3d68cc10480..0c70c8812976e 100644 --- a/addons/binding/org.openhab.binding.lametrictime/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.lametrictime/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: LaMetric Time Binding Bundle-SymbolicName: org.openhab.binding.lametrictime;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: ., lib/provider-gson.jar, diff --git a/addons/binding/org.openhab.binding.lametrictime/pom.xml b/addons/binding/org.openhab.binding.lametrictime/pom.xml index f3955baadf867..02b2a66878bc2 100644 --- a/addons/binding/org.openhab.binding.lametrictime/pom.xml +++ b/addons/binding/org.openhab.binding.lametrictime/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.lametrictime diff --git a/addons/binding/org.openhab.binding.leapmotion/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.leapmotion/META-INF/MANIFEST.MF index 81d3cfdeab588..84ea5c238bb2a 100644 --- a/addons/binding/org.openhab.binding.leapmotion/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.leapmotion/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: Leap Motion Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.leapmotion;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: org.eclipse.jdt.annotation;resolution:=optional, org.eclipse.smarthome.config.core, diff --git a/addons/binding/org.openhab.binding.leapmotion/pom.xml b/addons/binding/org.openhab.binding.leapmotion/pom.xml index c19f05b4ba7a8..a78a63e494f84 100644 --- a/addons/binding/org.openhab.binding.leapmotion/pom.xml +++ b/addons/binding/org.openhab.binding.leapmotion/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.leapmotion diff --git a/addons/binding/org.openhab.binding.lgtvserial/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.lgtvserial/META-INF/MANIFEST.MF index 3ae4c596cc4ae..7a2e8d097276c 100644 --- a/addons/binding/org.openhab.binding.lgtvserial/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.lgtvserial/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Name: LG TV Serial Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.lgtvserial;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Export-Package: org.openhab.binding.lgtvserial, org.openhab.binding.lgtvserial.handler diff --git a/addons/binding/org.openhab.binding.lgtvserial/pom.xml b/addons/binding/org.openhab.binding.lgtvserial/pom.xml index 184ead1625ea7..febe5dfba3b6e 100644 --- a/addons/binding/org.openhab.binding.lgtvserial/pom.xml +++ b/addons/binding/org.openhab.binding.lgtvserial/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.lgtvserial diff --git a/addons/binding/org.openhab.binding.lgwebos/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.lgwebos/META-INF/MANIFEST.MF index 835e66d183da2..5352851ea8e16 100644 --- a/addons/binding/org.openhab.binding.lgwebos/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.lgwebos/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Bundle-Name: LG webOS Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.lgwebos;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Export-Package: org.openhab.binding.lgwebos, org.openhab.binding.lgwebos.handler diff --git a/addons/binding/org.openhab.binding.lgwebos/pom.xml b/addons/binding/org.openhab.binding.lgwebos/pom.xml index e1264248bc893..699eaf18f1697 100644 --- a/addons/binding/org.openhab.binding.lgwebos/pom.xml +++ b/addons/binding/org.openhab.binding.lgwebos/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.lgwebos diff --git a/addons/binding/org.openhab.binding.logreader/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.logreader/META-INF/MANIFEST.MF index 06c3f84a47924..522f65c85487f 100755 --- a/addons/binding/org.openhab.binding.logreader/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.logreader/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-Name: LogReader Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.logreader;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: org.eclipse.jdt.annotation;resolution:=optional, org.eclipse.smarthome.config.core, diff --git a/addons/binding/org.openhab.binding.logreader/README.md b/addons/binding/org.openhab.binding.logreader/README.md index 14969fbd901be..94aacab2e90b1 100755 --- a/addons/binding/org.openhab.binding.logreader/README.md +++ b/addons/binding/org.openhab.binding.logreader/README.md @@ -1,12 +1,15 @@ # Log Reader Binding This binding reads and analyzes log files. Search patterns are fully configurable, therefore different kind of log files should be possible to monitor by this binding. -When certain log events is recognized, openHAB rules can be used to send notification about the event e.g by email for further analysis. +When certain log events are recognized, openHAB rules can be used to send notification about the event e.g by email for further analysis. ## Supported Things This binding supports one ThingType: `reader`. -A reader supports 3 separate channels; One for errors, one for warnings and one custom channel for other purposes. +A reader supports 3 separate channels + * One for errors + * one for warnings + * one custom channel for other purposes. ## Thing Configuration @@ -16,9 +19,9 @@ The `reader` Thing has the following configuration parameters: | ------------------------------| ------- | -------- | -------------------------------- |-----------------------------------------------------------------------------------------| | `filePath` | String | yes | `${OPENHAB_LOGDIR}/openhab.log` | Path to log file. ${OPENHAB_LOGDIR} is automatically replaced by the correct directory. | | `refreshRate` | integer | no | `1000` | Time in milliseconds between individual log reads. | -| `errorPatterns` | String | no | `ERROR+` | Search patterns separated by \| character for warning events. | +| `errorPatterns` | String | no | `ERROR+` | Search patterns separated by \| character for error events. | | `errorBlacklistingPatterns` | String | no | | Search patterns for blacklisting unwanted error events separated by \| character. | -| `warningPatterns` | String | no | `WARN+` | Search patterns separated by \| character for error events. | +| `warningPatterns` | String | no | `WARN+` | Search patterns separated by \| character for warning events. | | `warningBlacklistingPatterns` | String | no | | Search patterns for blacklisting unwanted warning events separated by \| character. | | `customPatterns` | String | no | | Search patterns separated by \| character for custom events. | | `customBlacklistingPatterns` | String | no | | Search patterns for blacklisting unwanted custom events separated by \| character. | @@ -31,9 +34,9 @@ List of channels | Channel Type ID | Item Type | Description | | ------------------ | ------------ | -------------------------------------------------------------- | -| `lastErrorEvent` | `String` | Displays contents of last [ERROR] event | -| `lastWarningEvent` | `String` | Displays contents of last [WARN] event | -| `lastCustomEvent` | `String` | Displays contents of last [CUSTOM] event | +| `lastErrorEvent` | `String` | Displays content of last [ERROR] event | +| `lastWarningEvent` | `String` | Displays content of last [WARN] event | +| `lastCustomEvent` | `String` | Displays content of last [CUSTOM] event | | `errorEvents` | `Number` | Displays number of [ERROR] lines matched to search pattern | | `warningEvents` | `Number` | Displays number of [WARN] lines matched to search pattern | | `customEvents` | `Number` | Displays number of [CUSTOM] lines matched to search pattern | @@ -48,7 +51,7 @@ List of channels ```xtend -logreader:reader:openhablog[ refreshRate=1000, errorPatterns="ERROR+", errorBlacklistingPatterns="annoying error which should ignored|Another annoying error which should ignored" ] +logreader:reader:openhablog[ refreshRate=1000, errorPatterns="ERROR+", errorBlacklistingPatterns="annoying error which should be ignored|Another annoying error which should be ignored" ] ``` @@ -109,5 +112,3 @@ Enable DEBUG logging in karaf console to see more precise error messages: `log:set DEBUG org.openhab.binding.logreader` See [openHAB2 logging docs](https://www.openhab.org/docs/administration/logging.html#defining-what-to-log) for more help. - - diff --git a/addons/binding/org.openhab.binding.logreader/pom.xml b/addons/binding/org.openhab.binding.logreader/pom.xml index 9445ac7ecf0e7..63440411fcf57 100755 --- a/addons/binding/org.openhab.binding.logreader/pom.xml +++ b/addons/binding/org.openhab.binding.logreader/pom.xml @@ -1,16 +1,15 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.logreader - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT eclipse-plugin Log Reader Binding diff --git a/addons/binding/org.openhab.binding.loxone/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.loxone/META-INF/MANIFEST.MF index 30f2d4868d7a8..723c4bc632fe2 100644 --- a/addons/binding/org.openhab.binding.loxone/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.loxone/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: Loxone Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.loxone;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Export-Package: org.openhab.binding.loxone, org.openhab.binding.loxone.handler diff --git a/addons/binding/org.openhab.binding.loxone/pom.xml b/addons/binding/org.openhab.binding.loxone/pom.xml index 94516fef190b6..3d839836fc098 100644 --- a/addons/binding/org.openhab.binding.loxone/pom.xml +++ b/addons/binding/org.openhab.binding.loxone/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.loxone diff --git a/addons/binding/org.openhab.binding.lutron/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.lutron/META-INF/MANIFEST.MF index ea74cff59cc4e..fe9c8bd167050 100644 --- a/addons/binding/org.openhab.binding.lutron/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.lutron/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Name: Lutron Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.lutron;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.common.collect, com.thoughtworks.xstream, gnu.io, diff --git a/addons/binding/org.openhab.binding.lutron/pom.xml b/addons/binding/org.openhab.binding.lutron/pom.xml index 2fb00ac784b1c..8b8bcdce9681b 100644 --- a/addons/binding/org.openhab.binding.lutron/pom.xml +++ b/addons/binding/org.openhab.binding.lutron/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.lutron diff --git a/addons/binding/org.openhab.binding.max.test/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.max.test/META-INF/MANIFEST.MF index 9b22a56148c25..0e9d592a07a40 100644 --- a/addons/binding/org.openhab.binding.max.test/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.max.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: openHAB Max! Binding Tests Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.max.test;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Fragment-Host: org.openhab.binding.max Import-Package: org.eclipse.jdt.annotation;resolution:=optional, diff --git a/addons/binding/org.openhab.binding.max.test/pom.xml b/addons/binding/org.openhab.binding.max.test/pom.xml index a9666059627c5..efaf3a0b10412 100644 --- a/addons/binding/org.openhab.binding.max.test/pom.xml +++ b/addons/binding/org.openhab.binding.max.test/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.max.test diff --git a/addons/binding/org.openhab.binding.max/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.max/META-INF/MANIFEST.MF index caa41cbdee2c8..a0bd0ab898518 100644 --- a/addons/binding/org.openhab.binding.max/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.max/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: MaxCube Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.max;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: javax.measure.quantity, org.apache.commons.lang, diff --git a/addons/binding/org.openhab.binding.max/pom.xml b/addons/binding/org.openhab.binding.max/pom.xml index fa7a3660ecad0..2d5341b969dd4 100644 --- a/addons/binding/org.openhab.binding.max/pom.xml +++ b/addons/binding/org.openhab.binding.max/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.max diff --git a/addons/binding/org.openhab.binding.mcp23017/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.mcp23017/META-INF/MANIFEST.MF index 049de833bf8b7..88cfd6bf0be97 100644 --- a/addons/binding/org.openhab.binding.mcp23017/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.mcp23017/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: mcp23017 Binding Bundle-SymbolicName: org.openhab.binding.mcp23017;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: ., lib/pi4j-core.jar, diff --git a/addons/binding/org.openhab.binding.mcp23017/pom.xml b/addons/binding/org.openhab.binding.mcp23017/pom.xml index d35c24c055bd8..6ed21d780c0f4 100644 --- a/addons/binding/org.openhab.binding.mcp23017/pom.xml +++ b/addons/binding/org.openhab.binding.mcp23017/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.mcp23017 diff --git a/addons/binding/org.openhab.binding.meteostick/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.meteostick/META-INF/MANIFEST.MF index e206bb8eb1411..f444674324c92 100644 --- a/addons/binding/org.openhab.binding.meteostick/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.meteostick/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: Meteostick Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.meteostick;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: gnu.io, javax.measure.quantity, diff --git a/addons/binding/org.openhab.binding.meteostick/pom.xml b/addons/binding/org.openhab.binding.meteostick/pom.xml index 7a4c900b9a0b3..c1162d4b698f9 100644 --- a/addons/binding/org.openhab.binding.meteostick/pom.xml +++ b/addons/binding/org.openhab.binding.meteostick/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.meteostick diff --git a/addons/binding/org.openhab.binding.miele/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.miele/META-INF/MANIFEST.MF index 5536b76da1b8e..ab648b2b977dd 100644 --- a/addons/binding/org.openhab.binding.miele/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.miele/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Name: Miele Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.miele;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.gson, javax.jmdns, diff --git a/addons/binding/org.openhab.binding.miele/pom.xml b/addons/binding/org.openhab.binding.miele/pom.xml index 0bd0af2aa8ea5..a583d0643b539 100644 --- a/addons/binding/org.openhab.binding.miele/pom.xml +++ b/addons/binding/org.openhab.binding.miele/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.miele diff --git a/addons/binding/org.openhab.binding.mihome/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.mihome/META-INF/MANIFEST.MF index 7d9aae8d32921..0233d059f51cb 100644 --- a/addons/binding/org.openhab.binding.mihome/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.mihome/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: Xiaomi Mi Smart Home Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.mihome;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.gson, javax.measure, diff --git a/addons/binding/org.openhab.binding.mihome/pom.xml b/addons/binding/org.openhab.binding.mihome/pom.xml index 9ba4636f8e21d..54859a251cfa9 100644 --- a/addons/binding/org.openhab.binding.mihome/pom.xml +++ b/addons/binding/org.openhab.binding.mihome/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.mihome diff --git a/addons/binding/org.openhab.binding.miio/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.miio/META-INF/MANIFEST.MF index c23dc687aff20..0ea4a86507e36 100644 --- a/addons/binding/org.openhab.binding.miio/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.miio/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Xiaomi Mi IO Binding Bundle-SymbolicName: org.openhab.binding.miio;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: . Import-Package: com.google.gson, diff --git a/addons/binding/org.openhab.binding.miio/pom.xml b/addons/binding/org.openhab.binding.miio/pom.xml index 021a04efb5c3c..7a75f290d88b4 100644 --- a/addons/binding/org.openhab.binding.miio/pom.xml +++ b/addons/binding/org.openhab.binding.miio/pom.xml @@ -1,11 +1,9 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.miio Xiaomi Mi IO Binding diff --git a/addons/binding/org.openhab.binding.milight/ESH-INF/thing/v3.xml b/addons/binding/org.openhab.binding.milight/ESH-INF/thing/v3.xml index 8b16b3d02de5c..4a4906b2655ca 100644 --- a/addons/binding/org.openhab.binding.milight/ESH-INF/thing/v3.xml +++ b/addons/binding/org.openhab.binding.milight/ESH-INF/thing/v3.xml @@ -10,10 +10,9 @@ manufacturers. - + - Will be resolved by discovery if auto configured - + You either need an IP/Hostname or the Bridge ID. network-address @@ -39,12 +38,13 @@ true - + The mac address of the bridge in upper case letters without delimiter. - This is used to check if the given IP corresponds to the right device. The bridge is set offline if the device - does not respond with the correct Bride ID and a re-detection is started. Useful for DHCP environments where - IPs may change over time, after power outage etc. Will be resolved by discovery if auto configured. + Use this parameter and leave the IP/Hostname empty for DHCP environments where IPs may often change over time. + + The Bridge ID is also used to check if a given IP corresponds to the right device. + The bridge is set offline if the device does not respond with the correct Bridge ID and a re-detection is started. true @@ -81,7 +81,7 @@ A milight bulb can be assigned to zone 0-4. zone 0 controls all bulbs of that type. - + 1 @@ -106,7 +106,7 @@ A milight bulb can be assigned to zone 0-4. zone 0 controls all bulbs of that type. - + 1 diff --git a/addons/binding/org.openhab.binding.milight/ESH-INF/thing/v6.xml b/addons/binding/org.openhab.binding.milight/ESH-INF/thing/v6.xml index ac586de4627b3..d8e02ae839232 100644 --- a/addons/binding/org.openhab.binding.milight/ESH-INF/thing/v6.xml +++ b/addons/binding/org.openhab.binding.milight/ESH-INF/thing/v6.xml @@ -102,7 +102,7 @@ A milight bulb can be assigned to zone 0-4. zone 0 controls all bulbs of that type. - + 1 @@ -132,7 +132,7 @@ A milight bulb can be assigned to zone 0-4. zone 0 controls all bulbs of that type. - + 1 @@ -164,7 +164,7 @@ A milight bulb can be assigned to zone 0-4. zone 0 controls all bulbs of that type. - + 1 diff --git a/addons/binding/org.openhab.binding.milight/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.milight/META-INF/MANIFEST.MF index d2517c804b995..59ab1bdc49d7d 100644 --- a/addons/binding/org.openhab.binding.milight/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.milight/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: Milight Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.milight;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: org.eclipse.jdt.annotation;resolution:=optional, org.eclipse.smarthome.config.core, diff --git a/addons/binding/org.openhab.binding.milight/pom.xml b/addons/binding/org.openhab.binding.milight/pom.xml index bc5c302c5a458..8d5467e988d4e 100644 --- a/addons/binding/org.openhab.binding.milight/pom.xml +++ b/addons/binding/org.openhab.binding.milight/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.milight diff --git a/addons/binding/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/handler/AbstractBridgeHandler.java b/addons/binding/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/handler/AbstractBridgeHandler.java index 3d3f3009e6951..a57a3daa3c903 100644 --- a/addons/binding/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/handler/AbstractBridgeHandler.java +++ b/addons/binding/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/handler/AbstractBridgeHandler.java @@ -36,9 +36,7 @@ public abstract class AbstractBridgeHandler extends BaseBridgeHandler { protected volatile boolean preventReinit = false; protected BridgeHandlerConfig config = new BridgeHandlerConfig(); protected @Nullable InetAddress address; - @NonNullByDefault({}) - protected DatagramSocket socket; - protected int port; + protected @NonNullByDefault({}) DatagramSocket socket; public AbstractBridgeHandler(Bridge bridge) { super(bridge); @@ -73,19 +71,14 @@ public void handleConfigurationUpdate(Map configurationParameter public void initialize() { config = getConfigAs(BridgeHandlerConfig.class); - try { - address = InetAddress.getByName(config.host); - } catch (UnknownHostException ignored) { - updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR, "No address known!"); - return; - } - - port = config.port; - - // Version 1/2 do not support response messages / detection. We therefore directly call bridgeDetected(addr). - if (config.bridgeid.length() != 12) { - updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR, "No bridgeID of length 12!"); - return; + if (!config.host.isEmpty()) { + try { + address = InetAddress.getByName(config.host); + } catch (UnknownHostException ignored) { + updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR, + "Address set, but is invalid!"); + return; + } } startConnectAndKeepAlive(); diff --git a/addons/binding/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/handler/AbstractLedHandler.java b/addons/binding/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/handler/AbstractLedHandler.java index 0b5e3a0df3802..7c707973e66f3 100644 --- a/addons/binding/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/handler/AbstractLedHandler.java +++ b/addons/binding/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/handler/AbstractLedHandler.java @@ -298,7 +298,7 @@ public void bridgeStatusChanged(@NonNull ThingStatusInfo bridgeStatusInfo) { * @param h The bridge handler */ public void configUpdated(AbstractBridgeHandler h, InetAddress address) { - this.port = h.port; + this.port = h.config.port; this.address = address; this.socket = h.socket; this.delayTimeMS = h.config.delayTime; diff --git a/addons/binding/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/handler/BridgeV3Handler.java b/addons/binding/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/handler/BridgeV3Handler.java index 3ae5c2900ff36..68884ec23a488 100644 --- a/addons/binding/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/handler/BridgeV3Handler.java +++ b/addons/binding/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/handler/BridgeV3Handler.java @@ -61,11 +61,19 @@ public void thingUpdated(Thing thing) { */ @Override protected void startConnectAndKeepAlive() { - if (running) { - return; + if (address == null) { + if (!config.bridgeid.matches("^([0-9A-Fa-f]{12})$")) { + updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR, "bridgeID invalid!"); + return; + } + try { + address = InetAddress.getByAddress(new byte[] { (byte) 255, (byte) 255, (byte) 255, (byte) 255 }); + } catch (UnknownHostException neverHappens) { + } } - if (port == 0) { - port = MilightBindingConstants.PORT_VER3; + + if (config.port == 0) { + config.port = MilightBindingConstants.PORT_VER3; } try { @@ -95,23 +103,20 @@ public void dispose() { private void receive() { try { - - discoverPacketV3.setAddress( - InetAddress.getByAddress(new byte[] { (byte) 255, (byte) 255, (byte) 255, (byte) 255 })); + discoverPacketV3.setAddress(address); discoverPacketV3.setPort(MilightBindingConstants.PORT_DISCOVER); socket.setSoTimeout(100); - final int ATTEMPTS = 3; + final int attempts = 3; int timeoutsCounter = 0; while (running) { try { packet.setLength(buffer.length); socket.receive(packet); } catch (SocketTimeoutException e) { - if (timeoutsCounter >= ATTEMPTS) { + if (timeoutsCounter >= attempts) { socket.setSoTimeout(config.refreshTime * 1000); - updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.NONE, - "Bridge did not respond or the bridge's MAC address does not match with your configuration!"); + updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.NONE, "Bridge did not respond!"); timeoutsCounter = 0; } else { socket.setSoTimeout(300); @@ -155,8 +160,14 @@ private void receive() { final InetAddress addressOfBridge = ((InetSocketAddress) packet.getSocketAddress()).getAddress(); final String bridgeID = msg[1]; - if (!config.bridgeid.equals(bridgeID)) { + if (!config.bridgeid.isEmpty() && !bridgeID.equals(config.bridgeid)) { // We found a bridge, but it is not the one that is handled by this handler + if (this.address != null) { // The user has set a host address -> but wrong bridge found! + stopKeepAlive(); + updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR, + "Wrong bridge found on host address. Change bridgeid or host configuration."); + break; + } continue; } @@ -168,6 +179,13 @@ private void receive() { preventReinit = true; updateConfiguration(c); preventReinit = false; + } else if (config.bridgeid.isEmpty()) { // bridge id was not set and is now known. Store it. + config.bridgeid = bridgeID; + Configuration c = editConfiguration(); + c.put(BridgeHandlerConfig.CONFIG_BRIDGE_ID, bridgeID); + preventReinit = true; + updateConfiguration(c); + preventReinit = false; } timeoutsCounter = 0; diff --git a/addons/binding/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/handler/BridgeV6Handler.java b/addons/binding/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/handler/BridgeV6Handler.java index 506298d3f0b15..641106c302a4f 100644 --- a/addons/binding/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/handler/BridgeV6Handler.java +++ b/addons/binding/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/handler/BridgeV6Handler.java @@ -15,6 +15,8 @@ import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.time.format.FormatStyle; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.TimeUnit; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; @@ -37,6 +39,8 @@ public class BridgeV6Handler extends AbstractBridgeHandler implements ISessionState { private @NonNullByDefault({}) MilightV6SessionManager session; final DateTimeFormatter timeFormat = DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT); + private String offlineReason = ""; + private @Nullable ScheduledFuture scheduledFuture; public BridgeV6Handler(Bridge bridge) { super(bridge); @@ -54,19 +58,25 @@ public BridgeV6Handler(Bridge bridge) { */ @Override protected void startConnectAndKeepAlive() { - if (port == 0) { - port = MilightBindingConstants.PORT_VER6; + if (!config.bridgeid.matches("^([0-9A-Fa-f]{12})$")) { + updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR, "bridgeID invalid!"); + return; + } + + if (config.port == 0) { + config.port = MilightBindingConstants.PORT_VER6; } updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_PENDING, "Waiting for session"); int refreshTime = Math.max(Math.min(config.refreshTime, MilightV6SessionManager.TIMEOUT_MS), 100); - this.session = new MilightV6SessionManager(config.bridgeid, this, address, port, refreshTime, + this.session = new MilightV6SessionManager(config.bridgeid, this, address, config.port, refreshTime, new byte[] { (byte) config.passwordByte1, (byte) config.passwordByte2 }); session.start().thenAccept(d -> this.socket = d); } @Override public void dispose() { + stopMakeOfflineTimer(); try { session.close(); } catch (IOException ignore) { @@ -81,6 +91,7 @@ public MilightV6SessionManager getSessionManager() { @Override public void sessionStateChanged(SessionState state, @Nullable InetAddress newAddress) { + stopMakeOfflineTimer(); switch (state) { case SESSION_VALID_KEEP_ALIVE: preventReinit = true; @@ -94,25 +105,39 @@ public void sessionStateChanged(SessionState state, @Nullable InetAddress newAdd updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR, "No IP address received"); break; } - updateStatus(ThingStatus.ONLINE); - this.address = newAddress; - // As soon as the session is valid, update the user visible configuration of the host IP. - Configuration c = editConfiguration(); - c.put(BridgeHandlerConfig.CONFIG_HOST_NAME, newAddress.getHostAddress()); - thing.setProperty(MilightBindingConstants.PROPERTY_SESSIONID, session.getSession()); - thing.setProperty(MilightBindingConstants.PROPERTY_SESSIONCONFIRMED, - String.valueOf(session.getLastSessionValidConfirmation())); - preventReinit = true; - updateConfiguration(c); - preventReinit = false; + if (!newAddress.equals(address) || !thing.getStatus().equals(ThingStatus.ONLINE)) { + updateStatus(ThingStatus.ONLINE); + this.address = newAddress; + // As soon as the session is valid, update the user visible configuration of the host IP. + Configuration c = editConfiguration(); + c.put(BridgeHandlerConfig.CONFIG_HOST_NAME, newAddress.getHostAddress()); + thing.setProperty(MilightBindingConstants.PROPERTY_SESSIONID, session.getSession()); + thing.setProperty(MilightBindingConstants.PROPERTY_SESSIONCONFIRMED, + String.valueOf(session.getLastSessionValidConfirmation())); + preventReinit = true; + updateConfiguration(c); + preventReinit = false; + } break; case SESSION_INVALID: updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR, "Session could not be established"); + break; default: - updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_PENDING, state.name()); + // Delay putting the session offline + offlineReason = state.name(); + scheduledFuture = scheduler.schedule(() -> updateStatus(ThingStatus.OFFLINE, + ThingStatusDetail.CONFIGURATION_PENDING, offlineReason), 1000, TimeUnit.MILLISECONDS); break; } } + + private void stopMakeOfflineTimer() { + ScheduledFuture future = scheduledFuture; + if (future != null) { + future.cancel(false); + scheduledFuture = null; + } + } } diff --git a/addons/binding/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/handler/MilightV2RGBHandler.java b/addons/binding/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/handler/MilightV2RGBHandler.java index d93839a689ea4..7b8d9c6274d62 100644 --- a/addons/binding/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/handler/MilightV2RGBHandler.java +++ b/addons/binding/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/handler/MilightV2RGBHandler.java @@ -104,7 +104,6 @@ public void setSaturation(int value, MilightThingState state) { @Override public void changeSaturation(int relativeSaturation, MilightThingState state) { - } @Override diff --git a/addons/binding/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/handler/MilightV6RGBWHandler.java b/addons/binding/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/handler/MilightV6RGBWHandler.java index 8150c316cf5fd..51c3be51f1b6c 100644 --- a/addons/binding/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/handler/MilightV6RGBWHandler.java +++ b/addons/binding/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/handler/MilightV6RGBWHandler.java @@ -75,4 +75,4 @@ public void setLedMode(int newmode, MilightThingState state) { public void changeSpeed(int relativeSpeed, MilightThingState state) { sendNonRepeatable(4, relativeSpeed > 1 ? 3 : 4); } -} \ No newline at end of file +} diff --git a/addons/binding/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/protocol/QueueItem.java b/addons/binding/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/protocol/QueueItem.java index d81c8b0563d11..00e6cb64226ca 100644 --- a/addons/binding/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/protocol/QueueItem.java +++ b/addons/binding/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/protocol/QueueItem.java @@ -128,7 +128,6 @@ public static QueueItem createRepeatable(DatagramSocket socket, int customDelayT */ public static QueueItem createNonRepeatable(DatagramSocket socket, int customDelayTime, InetAddress address, int port, byte[]... data) { - QueueItem item = new QueueItem(socket, QueuedSend.NO_CATEGORY, data[0], false, customDelayTime, 1, address, port); diff --git a/addons/binding/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/protocol/QueuedSend.java b/addons/binding/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/protocol/QueuedSend.java index cd21572cc5a48..c1f9070d5b6d4 100644 --- a/addons/binding/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/protocol/QueuedSend.java +++ b/addons/binding/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/protocol/QueuedSend.java @@ -89,7 +89,7 @@ public void run() { item.packet.getAddress().getHostAddress()); } } - } catch (Exception e) { + } catch (IOException e) { logger.warn("Failed to send Message to '{}': {}", item.packet.getAddress().getHostAddress(), e.getMessage()); } diff --git a/addons/binding/org.openhab.binding.minecraft/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.minecraft/META-INF/MANIFEST.MF index 8d58ca6f833e3..17d5bfec7258f 100644 --- a/addons/binding/org.openhab.binding.minecraft/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.minecraft/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Bundle-Name: Minecraft Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.minecraft;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.common.collect, com.google.gson, diff --git a/addons/binding/org.openhab.binding.minecraft/pom.xml b/addons/binding/org.openhab.binding.minecraft/pom.xml index 841341c221cf3..01487fae71cdc 100644 --- a/addons/binding/org.openhab.binding.minecraft/pom.xml +++ b/addons/binding/org.openhab.binding.minecraft/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.minecraft diff --git a/addons/binding/org.openhab.binding.modbus.test/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.modbus.test/META-INF/MANIFEST.MF index c440beb67ee20..48e0ebbce50b1 100644 --- a/addons/binding/org.openhab.binding.modbus.test/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.modbus.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: Modbus Binding Tests Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.modbus.test;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Fragment-Host: org.openhab.binding.modbus Require-Bundle: org.hamcrest Import-Package: diff --git a/addons/binding/org.openhab.binding.modbus.test/pom.xml b/addons/binding/org.openhab.binding.modbus.test/pom.xml index 5306844e90be3..853b9e7b4c37c 100644 --- a/addons/binding/org.openhab.binding.modbus.test/pom.xml +++ b/addons/binding/org.openhab.binding.modbus.test/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 pom org.openhab.binding - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.modbus.test diff --git a/addons/binding/org.openhab.binding.modbus/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.modbus/META-INF/MANIFEST.MF index d301c2f44509f..8b93857c19257 100644 --- a/addons/binding/org.openhab.binding.modbus/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.modbus/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Modbus Binding Bundle-SymbolicName: org.openhab.binding.modbus;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: . Import-Package: org.apache.commons.lang, diff --git a/addons/binding/org.openhab.binding.modbus/pom.xml b/addons/binding/org.openhab.binding.modbus/pom.xml index cd93afab0bc64..30dd89a08d324 100644 --- a/addons/binding/org.openhab.binding.modbus/pom.xml +++ b/addons/binding/org.openhab.binding.modbus/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.modbus diff --git a/addons/binding/org.openhab.binding.neato/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.neato/META-INF/MANIFEST.MF index 9adb61098e254..0327537e3e0f7 100644 --- a/addons/binding/org.openhab.binding.neato/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.neato/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Name: Neato Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.neato;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.gson, com.google.gson.annotations, diff --git a/addons/binding/org.openhab.binding.neato/pom.xml b/addons/binding/org.openhab.binding.neato/pom.xml index 4327d4bcdc0c9..6178a289043fc 100644 --- a/addons/binding/org.openhab.binding.neato/pom.xml +++ b/addons/binding/org.openhab.binding.neato/pom.xml @@ -1,17 +1,16 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding org.openhab.binding.neato - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT Neato Binding eclipse-plugin diff --git a/addons/binding/org.openhab.binding.neeo/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.neeo/META-INF/MANIFEST.MF index e142a7b3fd938..940cac718bd6a 100644 --- a/addons/binding/org.openhab.binding.neeo/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.neeo/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Neeo Binding Bundle-SymbolicName: org.openhab.binding.neeo;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: . Import-Package: diff --git a/addons/binding/org.openhab.binding.neeo/pom.xml b/addons/binding/org.openhab.binding.neeo/pom.xml index c646c8f53e3e1..267ad0e473ce6 100644 --- a/addons/binding/org.openhab.binding.neeo/pom.xml +++ b/addons/binding/org.openhab.binding.neeo/pom.xml @@ -1,17 +1,15 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.neeo - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT Neeo Binding eclipse-plugin diff --git a/addons/binding/org.openhab.binding.nest.test/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.nest.test/META-INF/MANIFEST.MF index 4f8d529b6c11c..bd8940f1a73f2 100644 --- a/addons/binding/org.openhab.binding.nest.test/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.nest.test/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Name: Nest Binding Tests Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.nest.test;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Fragment-Host: org.openhab.binding.nest Import-Package: com.google.gson.reflect, diff --git a/addons/binding/org.openhab.binding.nest.test/pom.xml b/addons/binding/org.openhab.binding.nest.test/pom.xml index ced6541e929c2..366a62d353172 100644 --- a/addons/binding/org.openhab.binding.nest.test/pom.xml +++ b/addons/binding/org.openhab.binding.nest.test/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.nest.test diff --git a/addons/binding/org.openhab.binding.nest/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.nest/META-INF/MANIFEST.MF index f601973d07d05..8f83182933bf5 100644 --- a/addons/binding/org.openhab.binding.nest/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.nest/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: Nest Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.nest;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.gson, com.google.gson.annotations, diff --git a/addons/binding/org.openhab.binding.nest/pom.xml b/addons/binding/org.openhab.binding.nest/pom.xml index d791d5dea0c52..5c0b0431df6ea 100644 --- a/addons/binding/org.openhab.binding.nest/pom.xml +++ b/addons/binding/org.openhab.binding.nest/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.nest diff --git a/addons/binding/org.openhab.binding.netatmo/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.netatmo/META-INF/MANIFEST.MF index 34c8a16103257..0fdabcac456e9 100644 --- a/addons/binding/org.openhab.binding.netatmo/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.netatmo/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Bundle-Name: Netatmo Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.netatmo;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: javax.measure, javax.measure.quantity, diff --git a/addons/binding/org.openhab.binding.netatmo/pom.xml b/addons/binding/org.openhab.binding.netatmo/pom.xml index ae9f55c27bc16..98c77cdf24cc4 100644 --- a/addons/binding/org.openhab.binding.netatmo/pom.xml +++ b/addons/binding/org.openhab.binding.netatmo/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.netatmo diff --git a/addons/binding/org.openhab.binding.network.test/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.network.test/META-INF/MANIFEST.MF index 905d9f0afec09..0c71fc82d6553 100644 --- a/addons/binding/org.openhab.binding.network.test/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.network.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: network.test Binding Tests Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.network.test;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Fragment-Host: org.openhab.binding.network Import-Package: org.eclipse.jdt.annotation;resolution:=optional, diff --git a/addons/binding/org.openhab.binding.network.test/pom.xml b/addons/binding/org.openhab.binding.network.test/pom.xml index d38adefd989da..56e57af55bc3a 100644 --- a/addons/binding/org.openhab.binding.network.test/pom.xml +++ b/addons/binding/org.openhab.binding.network.test/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.network.test diff --git a/addons/binding/org.openhab.binding.network/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.network/META-INF/MANIFEST.MF index 71f199eb107fc..cf59b41d2639f 100644 --- a/addons/binding/org.openhab.binding.network/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.network/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: Network Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.network;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: org.apache.commons.lang, org.apache.commons.net.util, diff --git a/addons/binding/org.openhab.binding.network/pom.xml b/addons/binding/org.openhab.binding.network/pom.xml index c21eec411ebe4..589b48fcea632 100644 --- a/addons/binding/org.openhab.binding.network/pom.xml +++ b/addons/binding/org.openhab.binding.network/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.network diff --git a/addons/binding/org.openhab.binding.nibeheatpump.test/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.nibeheatpump.test/META-INF/MANIFEST.MF index fbc97e8ba3e5c..08f4068beba70 100644 --- a/addons/binding/org.openhab.binding.nibeheatpump.test/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.nibeheatpump.test/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: NibeHeatPump Binding Tests Bundle-SymbolicName: org.openhab.binding.nibeheatpump.test;singleton:=true -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: openHAB Fragment-Host: org.openhab.binding.nibeheatpump diff --git a/addons/binding/org.openhab.binding.nibeheatpump.test/pom.xml b/addons/binding/org.openhab.binding.nibeheatpump.test/pom.xml index 493acfae39b4d..f28b85cd2a1a3 100644 --- a/addons/binding/org.openhab.binding.nibeheatpump.test/pom.xml +++ b/addons/binding/org.openhab.binding.nibeheatpump.test/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.nibeheatpump.test diff --git a/addons/binding/org.openhab.binding.nibeheatpump.test/src/test/java/org/openhab/binding/nibeheatpump/internal/models/PumpModelTest.java b/addons/binding/org.openhab.binding.nibeheatpump.test/src/test/java/org/openhab/binding/nibeheatpump/internal/models/PumpModelTest.java index 0af195c31eeb6..97be197009a0d 100644 --- a/addons/binding/org.openhab.binding.nibeheatpump.test/src/test/java/org/openhab/binding/nibeheatpump/internal/models/PumpModelTest.java +++ b/addons/binding/org.openhab.binding.nibeheatpump.test/src/test/java/org/openhab/binding/nibeheatpump/internal/models/PumpModelTest.java @@ -33,6 +33,13 @@ public void TestF750() { assertEquals(PumpModel.F750, pumpModel); } + @Test + public void TestF470() { + final String pumpModelString = "F470"; + final PumpModel pumpModel = PumpModel.getPumpModel(pumpModelString); + assertEquals(PumpModel.F470, pumpModel); + } + @Test(expected = IllegalArgumentException.class) public void badPumpModelTest() { PumpModel.getPumpModel("XXXX"); diff --git a/addons/binding/org.openhab.binding.nibeheatpump.test/src/test/java/org/openhab/binding/nibeheatpump/internal/models/VariableInformationTest.java b/addons/binding/org.openhab.binding.nibeheatpump.test/src/test/java/org/openhab/binding/nibeheatpump/internal/models/VariableInformationTest.java index 970a67006bc66..d9a5c78fa271c 100644 --- a/addons/binding/org.openhab.binding.nibeheatpump.test/src/test/java/org/openhab/binding/nibeheatpump/internal/models/VariableInformationTest.java +++ b/addons/binding/org.openhab.binding.nibeheatpump.test/src/test/java/org/openhab/binding/nibeheatpump/internal/models/VariableInformationTest.java @@ -38,4 +38,14 @@ public void TestF750Variable() { assertEquals(VariableInformation.NibeDataType.S16, variableInfo.dataType); assertEquals(VariableInformation.Type.SENSOR, variableInfo.type); } + + @Test + public void TestF470Variable() { + final int coilAddress = 40020; + final VariableInformation variableInfo = VariableInformation.getVariableInfo(PumpModel.F470, coilAddress); + assertEquals(10, variableInfo.factor); + assertEquals("EB100-BT16 Evaporator temp", variableInfo.variable); + assertEquals(VariableInformation.NibeDataType.S16, variableInfo.dataType); + assertEquals(VariableInformation.Type.SENSOR, variableInfo.type); + } } diff --git a/addons/binding/org.openhab.binding.nibeheatpump/ESH-INF/thing/f470-channel-groups.xml b/addons/binding/org.openhab.binding.nibeheatpump/ESH-INF/thing/f470-channel-groups.xml new file mode 100644 index 0000000000000..9acbe82c15c35 --- /dev/null +++ b/addons/binding/org.openhab.binding.nibeheatpump/ESH-INF/thing/f470-channel-groups.xml @@ -0,0 +1,506 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/binding/org.openhab.binding.nibeheatpump/ESH-INF/thing/f470-types.xml b/addons/binding/org.openhab.binding.nibeheatpump/ESH-INF/thing/f470-types.xml new file mode 100644 index 0000000000000..89f8626132a25 --- /dev/null +++ b/addons/binding/org.openhab.binding.nibeheatpump/ESH-INF/thing/f470-types.xml @@ -0,0 +1,3470 @@ + + + + + Number + + Current outdoor temperature + + + + + Number + + Supply temperature for system 4 + + + + + Number + + Supply temperature for system 3 + + + + + Number + + Supply temperature for system 2 + + + + + Number + + Supply temperature for system 1 + + + + + Number + + Return temperature + + + + + Number + + Hot water top temperature, BT7 + + + + + Number + + Hot water load temperature, BT6 + + + + + Number + + + + + + + Number + + Suction temperature, BT17 + + + + + Number + + Valid only for F3/470 + + + + + Number + + Valid only for F3/470 + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + Used in Solar and AHPS Docking accessories + + + + + Number + + Used in Solar and AHPS Docking accessories + + + + + Number + + + + + + + Number + + EB100-BT1 Outdoor temperature average + + + + + Number + + External supply temperature, BT25 + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + Used in DEH and AHPS Docking accessories + + + + + Number + + Return temperature for system 4 + + + + + Number + + Return temperature for system 3 + + + + + Number + + Return temperature for system 2 + + + + + Number + + Supply temperature for system 8 + + + + + Number + + Supply temperature for system 7 + + + + + Number + + Supply temperature for system 6 + + + + + Number + + Supply temperature for system 5 + + + + + Number + + Return temperature for system 8 + + + + + Number + + Return temperature for system 7 + + + + + Number + + Return temperature for system 6 + + + + + Number + + Return temperature for system 5 + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + EB100-BT1 Outdoor temperature average, 1h + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + BT74 heating cooling sensor average + + + + + Number + + Calculated supply temperature for the climate system + + + + + Number + + Calculated supply temperature for the climate system + + + + + Number + + Calculated supply temperature for the climate system + + + + + Number + + Calculated supply temperature for the climate system + + + + + Number + + State of the mixing valve for the climate system + + + + + Number + + State of the mixing valve for the climate system + + + + + Number + + State of the mixing valve for the climate system + + + + + Number + + State of the mixing valve for the climate system + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + Total external hw-electric additive operation time + + + + + Number + + + + + + + Number + + Tells if plusadjust system calls for heat or cool + + + + + Number + + Which comfort mode + + + + + Number + + requested adjustment + + + + + Number + + Humidity + + + + + Number + + Average of all room sensors + + + + + Number + + Outdoor temp + + + + + Number + + PCA input version + + + + + Number + + If plusadjust accessory is activated + + + + + Number + + If plusadjust system calls for heat + + + + + Number + + BT64 Cooling supply average + + + + + Number + + Humidity average + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + The current fan speed after scheduling and blocks are considered + + + + + Number + + The current fan speed after scheduling and blocks are considered + + + + + Number + + The current fan speed after scheduling and blocks are considered + + + + + String + + Current smart home mode, 0=Default,1=Away from home,2=Vacation + + + + + + + + + + Number + + Offset to smart home system + + + + + Number + + Smart Home is controlling the system + + + + + Number + + Smart Home is controlling the system + + + + + Number + + Smart Home is controlling the system + + + + + Number + + Smart Home is controlling the system + + + + + Number + + Smart Home is controlling the system + + + + + Number + + Smart Home is controlling the system + + + + + Number + + Smart Home is controlling the system + + + + + Number + + Smart Home is controlling the system + + + + + Number + + The current electric price + + + + + Number + + Whether the current price is unknown (0), low (1), medium (2), high (3) + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + EB100-BT1 Outdoor temperature average, 24h + + + + + Number + + Used heating power average, 24h + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + Calculated supply temperature for the climate system + + + + + Number + + Calculated supply temperature for the climate system + + + + + Number + + Calculated supply temperature for the climate system + + + + + Number + + Calculated supply temperature for the climate system + + + + + String + + 1 = Freeze protection active + + + + + + + + Number + + Total electric additive operation time + + + + + Number + + Current power from the internal electrical addition + + + + + String + + Indicates what heating action (HW/heat/pool) currently prioritised 10=Off 20=Hot Water 30=Heat 40=Pool 41=Pool 2 50=Transfer 60=Cooling + + + + + + + + + + + + + + Number + + Number of steps active for internal step-controlled addition + + + + + Number + + State of the mixing valve for the climate system + + + + + Number + + State of the mixing valve for the climate system + + + + + Number + + State of the mixing valve for the climate system + + + + + Number + + State of the mixing valve for the climate system + + + + + Number + + The state of the FJVM accessory + + + + + Number + + The current fan speed after scheduling and blocks are considered + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + String + + Hot water circulation pump status. 1=on, 0=off + + + + + + + + + Number + + Total electric additive operation time in hot water mode + + + + + Number + + Indicates the active relays on the FJVM accessory. The information is binary encoded + + + + + Number + + Number of compressorer starts + + + + + Number + + Total compressorer operation time + + + + + Number + + Total compressorer operation time in hot water mode + + + + + String + + 20 = Stopped, 40 = Starting, 60 = Running, 100 = Stopping + + + + + + + + + + + String + + 10=off,15=starting,20=on,40=10-day mode,80=calibration + + + + + + + + + + + + String + + Status of the compressor. 1=on,0=off 0=Off 1=On + + + + + + + + + + + Number + + The state of the DEH accessory + + + + + String + + Indicates active relays on the PCA Base card. Please refer to the wiring diagram for relay description. Binary encoded. 1=on, 0=off. Bit0=K4,Bit1=K3,Bit2=K2,Bit3=K1 + + + + + + + + + Number + + Indicates the active relays on the PCA-Power card. The information is binary encoded + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + String + + 0=Eco,1=Normal,2=Luxury,10=Normal+,20=Mini + + + + + + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + Indicates the alarm number of the most severe current alarm + + + + + Number + + + + + + + Number + + + + + + + Number + + Largest allowed change + + + + + Switch + + System affected by paralell change + + + + Switch + + System affected by paralell change + + + + Switch + + System affected by paralell change + + + + Switch + + System affected by paralell change + + + + Switch + + System affected by paralell change + + + + Switch + + System affected by paralell change + + + + Switch + + System affected by paralell change + + + + Switch + + System affected by paralell change + + + + Number + + Reset alarm by setting value 1 + + + + + Number + + Heat curve, see manual for more information + + + + + Number + + Heat curve, see manual for more information + + + + + Number + + Heat curve, see manual for more information + + + + + Number + + Heat curve, see manual for more information + + + + + Number + + Offset of the heat curve, see manual for more information + + + + + Number + + Offset of the heat curve, see manual for more information + + + + + Number + + Offset of the heat curve, see manual for more information + + + + + Number + + Offset of the heat curve, see manual for more information + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + User defined heating curve point + + + + + Number + + User defined heating curve point + + + + + Number + + User defined heating curve point + + + + + Number + + User defined heating curve point + + + + + Number + + User defined heating curve point + + + + + Number + + User defined heating curve point + + + + + Number + + User defined heating curve point + + + + + Number + + Outdoor temperature point where the heat curve is offset + + + + + Number + + Amount of offset at the point offset temperature + + + + + Number + + Change of the offset of the heat curve when closing the external adjustment input + + + + + Number + + Change of the offset of the heat curve when closing the external adjustment input + + + + + Number + + Change of the offset of the heat curve when closing the external adjustment input + + + + + Number + + Change of the offset of the heat curve when closing the external adjustment input + + + + + Number + + Room temperature setting when closing the external adjustment input + + + + + Number + + Room temperature setting when closing the external adjustment input + + + + + Number + + Room temperature setting when closing the external adjustment input + + + + + Number + + Room temperature setting when closing the external adjustment input + + + + + String + + Setting in menu 2.2. 0=Economy,1=Normal,2=Luxury,4=Smart Control 0=Economy 1=Normal 2=Luxury + + + + + + + + + + + + + + Number + + Start temperature for heating water + + + + + Number + + Start temperature for heating water + + + + + Number + + Start temperature for heating water + + + + + Number + + Temperature where hot water generation will stop + + + + + Number + + Temperature where hot water generation will stop + + + + + Number + + Temperature where hot water generation will stop + + + + + Number + + Temperature where hot water generation will stop + + + + + Switch + + Activates the periodic hot water generation + + + + Number + + Interval between Periodic hot water sessions + + + + + Number + + Run time for the hot water circulation system + + + + + Number + + Still time for the hot water circulation system + + + + + String + + Display language in the heat pump 0=English 1=Svenska 2=Deutsch 3=Francais 4=Espanol 5=Suomi 6=Lietuviu 7=Cesky 8=Polski 9=Nederlands 10=Norsk 11=Dansk 12=Eesti 13=Latviesu 16=Magyar + + + + + + + + + + + + + + + + + + + + + + String + + The operational mode of the heat pump 0=Auto 1=Manual 2=Add. heat only + + + + + + + + + + String + + 10=Intermittent 20=Continous 30=Economy 40=Auto + + + + + + + + + + + Number + + + + + + + Number + + Size of the fuse that the HP is connected to + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + Time from a changed fan speed until it returns to normal speed + + + + + Number + + Time from a changed fan speed until it returns to normal speed + + + + + Number + + Time from a changed fan speed until it returns to normal speed + + + + + Number + + Time from a changed fan speed until it returns to normal speed + + + + + Number + + Time between the reminder of filter replacement/cleaning. + + + + + Switch + + 0=Off 1=On + + + + Number + + Days each period is active + + + + + Number + + Days each period is active + + + + + Number + + Days each period is active + + + + + Number + + Days each period is active + + + + + Number + + Days each period is active + + + + + Number + + Days each period is active + + + + + Number + + Days each period is active + + + + + Number + + Supply temperature each period + + + + + Number + + Supply temperature each period + + + + + Number + + Supply temperature each period + + + + + Number + + Supply temperature each period + + + + + Number + + Supply temperature each period + + + + + Number + + Supply temperature each period + + + + + Number + + Supply temperature each period + + + + + Number + + Above the set outdoor temperature the addition activation time is limited to give the compressor more time to raise the hot water temperature. + + + + + Number + + Time between hot water and heating operating mode + + + + + Number + + Dimensioning outdoor temperature + + + + + Number + + Delta T (BT12-BT3)at dimensioning outdoor temperature + + + + + Switch + + Activates the climate system 2 accessory 0=Off 1=On + + + + Switch + + Activates the climate system 3 accessory 0=Off 1=On + + + + Switch + + Activates the climate system 4 accessory 0=Off 1=On + + + + Number + + Mixing valve amplification for extra climate systems + + + + + Number + + Mixing valve amplification for extra climate systems + + + + + Number + + Mixing valve amplification for extra climate systems + + + + + Number + + Wait time between changes of the shunt in extra climate systems + + + + + Number + + Wait time between changes of the shunt in extra climate systems + + + + + Number + + Wait time between changes of the shunt in extra climate systems + + + + + Switch + + Activates the FJVM accessory 0=Off 1=On + + + + Switch + + Activates the SMS40 accessory + + + + Switch + + Activates the RMU accessory for system 1 + + + + Switch + + Activates the RMU accessory for system 2 + + + + Switch + + Activates the RMU accessory for system 3 + + + + Switch + + Activates the RMU accessory for system 4 + + + + Switch + + Whether to allow additive heating (only valid for operational mode Manual) + + + + Switch + + Whether to allow heating (only valid for operational mode Manual or Add. heat only) + + + + Switch + + Whether to allow cooling (only valid for operational mode Manual or Add. heat only) + + + + String + + Start temperature for cooling, as set in menu 4.9.2 0=Off 1=On + + + + + + + + + Number + + Stop temperature for heating, as set in menu 4.9.2 + + + + + Number + + Stop temperature for additive, as set in menu 4.9.2 + + + + + String + + 12=12 Hours 24=24 Hours + + + + + + + + + Number + + + + + + + Number + + + + + + + String + + 1=DD-MM-YY 2=YY-MM-DD + + + + + + + + + String + + 12=12 hours 24=24 Hours + + + + + + + + + Switch + + Activates hot water production where applicable 0=Off 1=On + + + + Switch + + Lowers the room temperature during red light alarms to notify the occupants of the building that something is the matter 0=Off 1=On + + + + Switch + + Lowers the hot water temperature during red light alarms to notify the occupants of the building that something is the matter 0=Off 1=On + + + + Switch + + When activated the system uses the room sensor 0=Off 1=On + + + + Switch + + When activated the system uses the room sensor 0=Off 1=On + + + + Switch + + When activated the system uses the room sensor 0=Off 1=On + + + + Switch + + When activated the system uses the room sensor 0=Off 1=On + + + + Number + + Sets the room temperature setpoint for the system + + + + + Number + + Sets the room temperature setpoint for the system + + + + + Number + + Sets the room temperature setpoint for the system + + + + + Number + + Sets the room temperature setpoint for the system + + + + + Number + + Setting of how much the difference between set and actual room temperature should affect the supply temperature. + + + + + Number + + Setting of how much the difference between set and actual room temperature should affect the supply temperature. + + + + + Number + + Setting of how much the difference between set and actual room temperature should affect the supply temperature. + + + + + Number + + Setting of how much the difference between set and actual room temperature should affect the supply temperature. + + + + + String + + Preset flow setting for climate system. 0 = manual setting, 1 = radiator, 2 = floor heating, 3 = radiator + floor heating. + + + + + + + + + + + Number + + Heat curve, see manual for more information + + + + + Switch + + If the fan should have a lower speed when the compressor is not running 0=Off 1=On + + + + Switch + + If the fan should have a higher speed when there is a high room temp and a low outdoor temp. 0=Off 1=On + + + + Number + + + + + + + Number + + Minimum difference between room temp and outdoor temp to start night cooling + + + + + Switch + + Activates the DEH accessory + + + + Switch + + Whether to allow heating for system 1 (only valid for operational mode Manual or Add. heat only) + + + + Switch + + Whether to allow heating for system 2 (only valid for operational mode Manual or Add. heat only) + + + + Number + + Heat curve, see manual for more information + + + + + String + + 0=inactive, 10=active + + + + + + + + + String + + 0=Off, 1=3h, 2=6h, 3=12h, 4=One time increase + + + + + + + + + + + + Switch + + Sets whether or not SG Ready should affect heating + + + + Switch + + Sets whether or not SG Ready should affect cooling + + + + Switch + + Sets whether or not SG Ready should affect hot water + + + + Switch + + Sets whether or not SG Ready should affect pool + + + + Number + + Heat curve, see manual for more information + + + + + Number + + Heat curve, see manual for more information + + + + + Number + + Offset of the heat curve, see manual for more information + + + + + Number + + Offset of the heat curve, see manual for more information + + + + + Number + + Offset of the heat curve, see manual for more information + + + + + Number + + Offset of the heat curve, see manual for more information + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + Change of the offset of the heat curve when closing the external adjustment input + + + + + Number + + Change of the offset of the heat curve when closing the external adjustment input + + + + + Number + + Change of the offset of the heat curve when closing the external adjustment input + + + + + Number + + Change of the offset of the heat curve when closing the external adjustment input + + + + + Number + + Room temperature setting when closing the external adjustment input + + + + + Number + + Room temperature setting when closing the external adjustment input + + + + + Number + + Room temperature setting when closing the external adjustment input + + + + + Number + + Room temperature setting when closing the external adjustment input + + + + + Switch + + Activates the climate system 5 accessory + + + + Switch + + Activates the climate system 6 accessory + + + + Switch + + Activates the climate system 7 accessory + + + + Switch + + Activates the climate system 8 accessory + + + + Number + + Mixing valve amplification for extra climate systems + + + + + Number + + Mixing valve amplification for extra climate systems + + + + + Number + + Mixing valve amplification for extra climate systems + + + + + Number + + Mixing valve amplification for extra climate systems + + + + + Number + + Wait time between changes of the shunt in extra climate systems + + + + + Number + + Wait time between changes of the shunt in extra climate systems + + + + + Number + + Wait time between changes of the shunt in extra climate systems + + + + + Number + + Wait time between changes of the shunt in extra climate systems + + + + + Switch + + When activated the system uses the room sensor + + + + Switch + + When activated the system uses the room sensor + + + + Switch + + When activated the system uses the room sensor + + + + Switch + + When activated the system uses the room sensor + + + + Number + + Sets the room temperature setpoint for the system + + + + + Number + + Sets the room temperature setpoint for the system + + + + + Number + + Sets the room temperature setpoint for the system + + + + + Number + + Sets the room temperature setpoint for the system + + + + + Number + + Setting of how much the difference between set and actual room temperature should affect the supply temperature. + + + + + Number + + Setting of how much the difference between set and actual room temperature should affect the supply temperature. + + + + + Number + + Setting of how much the difference between set and actual room temperature should affect the supply temperature. + + + + + Number + + Setting of how much the difference between set and actual room temperature should affect the supply temperature. + + + + + Number + + Offset of the cool curve, see manual for more information + + + + + Number + + Offset of the cool curve, see manual for more information + + + + + Number + + Offset of the cool curve, see manual for more information + + + + + Number + + Offset of the cool curve, see manual for more information + + + + + Number + + Offset of the cool curve, see manual for more information + + + + + Number + + Offset of the cool curve, see manual for more information + + + + + Number + + Offset of the cool curve, see manual for more information + + + + + Number + + Offset of the cool curve, see manual for more information + + + + + Number + + Ratio of the current measurement transformers + + + + + Number + + RH set value + + + + + Switch + + + + + + Switch + + + + + + Switch + + + + + + Switch + + + + + + Switch + + + + + + Switch + + + + + + Switch + + + + + + Switch + + + + + + Switch + + If set, the system will ignore the existing LOG.SET on the USB stick.1=ignore LOG.SET,0=use LOG.SET + + + + Number + + Setting of how much the difference between set and actual room humidity should affect the supply temperature. + + + + + Number + + Setting of how much the difference between set and actual room humidity should affect the supply temperature in cooling mode. + + + + + Switch + + 0=not activated, 1=activated + + + + Switch + + 0=not affecting, 1=affecting + + + + Switch + + 0=not affecting, 1=affecting + + + + Number + + Set point, cooling, when using FLM cooling + + + + + Switch + + Activates the Outdoor Air Mixing function. + + + + Switch + + + + + + Switch + + + + + + Switch + + 0=not activated, 1=activated + + + + String + + 0=not affecting, 1=affecting + + + + + + + + + Switch + + If the fan should have a higher speed when there is a high room temp and a low outdoor temp. + + + + Switch + + If the fan should have a higher speed when there is a high room temp and a low outdoor temp. + + + + Switch + + If the fan should have a higher speed when there is a high room temp and a low outdoor temp. + + + + Number + + + + + + + Number + + + + + + + Number + + + + + + + Number + + Minimum difference between room temp and outdoor temp to start night cooling + + + + + Number + + Minimum difference between room temp and outdoor temp to start night cooling + + + + + Number + + Minimum difference between room temp and outdoor temp to start night cooling + + + + + Number + + Stop temperature for supply air heating + + + + + diff --git a/addons/binding/org.openhab.binding.nibeheatpump/ESH-INF/thing/f470.xml b/addons/binding/org.openhab.binding.nibeheatpump/ESH-INF/thing/f470.xml new file mode 100644 index 0000000000000..b4b594788d9dc --- /dev/null +++ b/addons/binding/org.openhab.binding.nibeheatpump/ESH-INF/thing/f470.xml @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + Network address of the NibeGW. + + + + UDP port to listening data packets from the NibeGW. + 9999 + + + + UDP port to send read commands to the NibeGW. + 9999 + + + + UDP port to send write commands to the NibeGW. + 10000 + + + + States how often a refresh shall occur in seconds. + 60 + + + + Enable read commands to read additional variable from heat pump which are not included to data readout + messages. This is experimental feature, use it at your own risk! + false + + + + Enable write commands to change heat pump settings. This is experimental feature, use it at your own + risk! + false + + + + Comma separated list of registers, which are allowed to write to heat pump. E.g. 44266, 47004 + + + + + Throttle incoming data read out messages from heat pump. 0 = throttle is disabled, otherwise throttle time in milliseconds. + 0 + + + + + + + + + + + + + + + + + + Serial port to connect to the heat pump. + + + + States how often a refresh shall occur in seconds. + 60 + + + + Enable read commands to read additional variable from heat pump which are not included to data readout + messages. This is experimental feature, use it at your own risk! + false + + + + Enable write commands to change heat pump settings. This is experimental feature, use it at your own + risk! + false + + + + Comma separated list of registers, which are allowed to write to heat pump. E.g. 44266, 47004 + + + + + Binding emulates MODBUS40 device and send protocol acknowledges to heat pump. + true + + + + Binding emulates RMU40 device and send protocol acknowledges to heat pump. + false + + + + Binding emulates SMS40 device and send protocol acknowledges to heat pump. + false + + + + Throttle incoming data read out messages from heat pump. 0 = throttle is disabled, otherwise throttle time in milliseconds. + 0 + + + + + + + + + + + + + + + + + States how often a refresh shall occur in seconds. + 60 + + + + Enable read commands to read additional variable from heat pump which are not included to data readout + messages. This is experimental feature, use it at your own risk! + false + + + + Enable write commands to change heat pump settings. This is experimental feature, use it at your own + risk! + false + + + + Comma separated list of registers, which are allowed to write to heat pump. E.g. 44266, 47004 + + + + + Throttle incoming data read out messages from heat pump. 0 = throttle is disabled, otherwise throttle time in milliseconds. + 0 + + + + diff --git a/addons/binding/org.openhab.binding.nibeheatpump/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.nibeheatpump/META-INF/MANIFEST.MF index 8a0a7870f5d42..5e959dc7c073a 100644 --- a/addons/binding/org.openhab.binding.nibeheatpump/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.nibeheatpump/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: NibeHeatPump Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.nibeheatpump;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: gnu.io, org.apache.commons.io, diff --git a/addons/binding/org.openhab.binding.nibeheatpump/README.md b/addons/binding/org.openhab.binding.nibeheatpump/README.md index 94fbed1c602ed..191f5acfd7e32 100644 --- a/addons/binding/org.openhab.binding.nibeheatpump/README.md +++ b/addons/binding/org.openhab.binding.nibeheatpump/README.md @@ -1,7 +1,7 @@ # Nibe Heatpump Binding The Nibe Heatpump binding is used to get live data from from Nibe heat pumps without using expensive MODBUS40 adapter. -This binding should be compatible at least the F750, F1145 and F1245 heat pump models. +This binding should be compatible at least the F750, F1145, F1245 and F470 heat pump models. The binding support data telegrams (contains max 20 registers) from the heat pump, but binding can also read other registers from the pump. It's recommend to add most changed variables to telegram, binding will then read all other registers automatically from the pump when channels are linked to item. @@ -22,6 +22,9 @@ This binding supports direct serial port connection (RS-485 adapter needed) to h | f750-serial | Serial port connected F750 Heat Pumps | | f750-udp | UDP connected Nibe F750 Heat Pumps | | f750-simulator | Simulator for Nibe F750 Heat Pumps | +| f470-serial | Serial port connected F470 Heat Pumps | +| f470-udp | UDP connected Nibe F470 Heat Pumps | +| f470-simulator | Simulator for Nibe F470 Heat Pumps | ## Discovery diff --git a/addons/binding/org.openhab.binding.nibeheatpump/pom.xml b/addons/binding/org.openhab.binding.nibeheatpump/pom.xml index 0f3a1c28b36f3..084e89438c66f 100644 --- a/addons/binding/org.openhab.binding.nibeheatpump/pom.xml +++ b/addons/binding/org.openhab.binding.nibeheatpump/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.nibeheatpump diff --git a/addons/binding/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/NibeHeatPumpBindingConstants.java b/addons/binding/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/NibeHeatPumpBindingConstants.java index 8f683db337877..dca687537a815 100644 --- a/addons/binding/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/NibeHeatPumpBindingConstants.java +++ b/addons/binding/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/NibeHeatPumpBindingConstants.java @@ -33,11 +33,15 @@ public class NibeHeatPumpBindingConstants { public final static ThingTypeUID THING_TYPE_F750_SERIAL = new ThingTypeUID(BINDING_ID, "f750-serial"); public final static ThingTypeUID THING_TYPE_F750_SIMULATOR = new ThingTypeUID(BINDING_ID, "f750-simulator"); + public final static ThingTypeUID THING_TYPE_F470_UDP = new ThingTypeUID(BINDING_ID, "f470-udp"); + public final static ThingTypeUID THING_TYPE_F470_SERIAL = new ThingTypeUID(BINDING_ID, "f470-serial"); + public final static ThingTypeUID THING_TYPE_F470_SIMULATOR = new ThingTypeUID(BINDING_ID, "f470-simulator"); + /** * Presents all supported thing types by NibeHeatPump binding. */ - public final static Set SUPPORTED_THING_TYPES_UIDS = Stream - .of(THING_TYPE_F1X45_UDP, THING_TYPE_F1X45_SERIAL, THING_TYPE_F1X45_SIMULATOR, THING_TYPE_F750_UDP, - THING_TYPE_F750_SERIAL, THING_TYPE_F750_SIMULATOR) + public final static Set SUPPORTED_THING_TYPES_UIDS = Stream.of(THING_TYPE_F1X45_UDP, + THING_TYPE_F1X45_SERIAL, THING_TYPE_F1X45_SIMULATOR, THING_TYPE_F750_UDP, THING_TYPE_F750_SERIAL, + THING_TYPE_F750_SIMULATOR, THING_TYPE_F470_UDP, THING_TYPE_F470_SERIAL, THING_TYPE_F470_SIMULATOR) .collect(Collectors.toSet()); } diff --git a/addons/binding/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/connection/ConnectorFactory.java b/addons/binding/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/connection/ConnectorFactory.java index e8ad1390e6525..47eac4f759b60 100644 --- a/addons/binding/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/connection/ConnectorFactory.java +++ b/addons/binding/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/connection/ConnectorFactory.java @@ -24,11 +24,14 @@ public class ConnectorFactory { public static NibeHeatPumpConnector getConnector(ThingTypeUID type) throws NibeHeatPumpException { if (type != null) { - if (THING_TYPE_F1X45_UDP.equals(type) || THING_TYPE_F750_UDP.equals(type)) { + if (THING_TYPE_F1X45_UDP.equals(type) || THING_TYPE_F750_UDP.equals(type) + || THING_TYPE_F470_UDP.equals(type)) { return new UDPConnector(); - } else if (THING_TYPE_F1X45_SERIAL.equals(type) || THING_TYPE_F750_SERIAL.equals(type)) { + } else if (THING_TYPE_F1X45_SERIAL.equals(type) || THING_TYPE_F750_SERIAL.equals(type) + || THING_TYPE_F470_SERIAL.equals(type)) { return new SerialConnector(); - } else if (THING_TYPE_F1X45_SIMULATOR.equals(type) || THING_TYPE_F750_SIMULATOR.equals(type)) { + } else if (THING_TYPE_F1X45_SIMULATOR.equals(type) || THING_TYPE_F750_SIMULATOR.equals(type) + || THING_TYPE_F470_SIMULATOR.equals(type)) { return new SimulatorConnector(); } } diff --git a/addons/binding/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/handler/NibeHeatPumpHandler.java b/addons/binding/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/handler/NibeHeatPumpHandler.java index cfe06f655845e..f022b25cc610e 100644 --- a/addons/binding/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/handler/NibeHeatPumpHandler.java +++ b/addons/binding/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/handler/NibeHeatPumpHandler.java @@ -97,10 +97,10 @@ protected class CacheObject { * Initialize cache object. * * @param lastUpdateTime - * Time in milliseconds. + * Time in milliseconds. * * @param value - * Cache value. + * Cache value. */ CacheObject(long lastUpdateTime, Double value) { this.lastUpdateTime = lastUpdateTime; diff --git a/addons/binding/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/models/F470.java b/addons/binding/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/models/F470.java new file mode 100644 index 0000000000000..aba8d61b5c7b9 --- /dev/null +++ b/addons/binding/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/models/F470.java @@ -0,0 +1,525 @@ +/** + * Copyright (c) 2010-2018 by the respective copyright holders. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + */ +package org.openhab.binding.nibeheatpump.internal.models; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + +import org.openhab.binding.nibeheatpump.internal.models.VariableInformation.NibeDataType; +import org.openhab.binding.nibeheatpump.internal.models.VariableInformation.Type; + +/** + * Class which holds all data variables of F470 heat pumps. + * + * @author Juho Mäkinen - Adding model F470 + * @author Pauli Anttila - Initial contribution + */ +public class F470 { + + @SuppressWarnings("serial") + private static final Map VARIABLE_INFO_F470 = Collections + .unmodifiableMap(new HashMap() { + { + // @formatter:off + put(40004, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "BT1 Outdoor Temperature")); + put(40005, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "EP23-BT2 Supply temp S4")); + put(40006, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "EP22-BT2 Supply temp S3")); + put(40007, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "EP21-BT2 Supply temp S2")); + put(40008, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "BT2 Supply temp S1")); + put(40012, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "EB100-EP14-BT3 Return temp")); + put(40013, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "BT7 HW Top")); + put(40014, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "BT6 HW Load")); + put(40020, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "EB100-BT16 Evaporator temp")); + put(40022, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "EB100-EP14-BT17 Suction")); + put(40023, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "EB100-BT18 Compressor temp.")); + put(40024, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "EB100-BT19 Addition temp.")); + put(40025, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "BT20 Exhaust air temp. 1")); + put(40026, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "BT21 Vented air temp. 1")); + put(40030, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "EP23-BT50 Room Temp S4")); + put(40031, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "EP22-BT50 Room Temp S3")); + put(40032, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "EP21-BT50 Room Temp S2")); + put(40033, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "BT50 Room Temp S1")); + put(40043, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "BT53 Solar Panel Temp")); + put(40044, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "BT54 Solar Load Temp")); + put(40054, new VariableInformation( 1, NibeDataType.S16, Type.SENSOR , "EB100-FD1 Temperature limiter")); + put(40067, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "BT1 Average")); + put(40071, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "BT25 Ext. Supply")); + put(40074, new VariableInformation( 1, NibeDataType.S16, Type.SENSOR , "EB100-FR1 Anode Status")); + put(40075, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "BT22 Supply air temp.")); + put(40076, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "EP30-BT55 Solar Tank Top Temp")); + put(40079, new VariableInformation( 10, NibeDataType.U32, Type.SENSOR , "EB100-BE3 Current")); + put(40081, new VariableInformation( 10, NibeDataType.U32, Type.SENSOR , "EB100-BE2 Current")); + put(40083, new VariableInformation( 10, NibeDataType.U32, Type.SENSOR , "EB100-BE1 Current")); + put(40122, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "BT52 external water heater load temp.")); + put(40127, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "EP23-BT3 Return temp S4")); + put(40128, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "EP22-BT3 Return temp S3")); + put(40129, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "EP21-BT3 Return temp S2")); + put(40159, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "EP47-BT2 Supply temp S8")); + put(40160, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "EP46-BT2 Supply temp S7")); + put(40161, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "EP45-BT2 Supply temp S6")); + put(40162, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "EP44-BT2 Supply temp S5")); + put(40163, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "EP47-BT3 Return temp S8")); + put(40164, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "EP46-BT3 Return temp S7")); + put(40165, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "EP45-BT3 Return temp S6")); + put(40166, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "EP44-BT3 Return temp S5")); + put(40167, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "EP47-BT50 Room Temp S8")); + put(40168, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "EP46-BT50 Room Temp S7")); + put(40169, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "EP45-BT50 Room Temp S6")); + put(40170, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "EP44-BT50 Room Temp S5")); + put(40185, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "BT1 Average, 1h")); + put(40188, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "EP47-BT50 Room Temp S8 Average")); + put(40189, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "EP46-BT50 Room Temp S7 Average")); + put(40190, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "EP45-BT50 Room Temp S6 Average")); + put(40191, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "EP44-BT50 Room Temp S5 Average")); + put(40192, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "EP23-BT50 Room Temp S4 Average")); + put(40193, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "EP22-BT50 Room Temp S3 Average")); + put(40194, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "EP21-BT50 Room Temp S2 Average")); + put(40195, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "BT50 Room Temp S1 Average")); + put(40212, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "BT74 Average")); + put(40217, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "Calc. Supply S8")); + put(40218, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "Calc. Supply S7")); + put(40219, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "Calc. Supply S6")); + put(40220, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "Calculated Supply S5")); + put(40305, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "Mixing Valve State S8")); + put(40306, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "Mixing Valve State S7")); + put(40307, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "Mixing Valve State S6")); + put(40308, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "Mixing Valve State S5")); + put(40339, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "External adjustment activated via input S8")); + put(40340, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "External adjustment activated via input S7")); + put(40341, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "External adjustment activated via input S6")); + put(40342, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "External adjustment activated via input S5")); + put(40365, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "Extra heating system pump S8")); + put(40366, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "Extra heating system pump S7")); + put(40367, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "Extra heating system pump S6")); + put(40368, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "Extra heating system pump S5")); + put(40755, new VariableInformation( 10, NibeDataType.S32, Type.SENSOR , "Tot. ext. HW add op.time")); + put(40868, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "+Adjust AUX Port")); + put(40870, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "+Adjust OP mode")); + put(40871, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "+Adjust Comfort mode")); + put(40872, new VariableInformation( 1, NibeDataType.S8 , Type.SENSOR , "+Adjust Parallell adjustment")); + put(40873, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "+Adjust Humidity")); + put(40874, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "+Adjust Temp indoor")); + put(40875, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "+Adjust Temp outdoor")); + put(40876, new VariableInformation( 1, NibeDataType.U16, Type.SENSOR , "+Adjust Version")); + put(40877, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "+Adjust Activated")); + put(40878, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "+Adjust Need")); + put(40889, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "BT64 Average")); + put(41027, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "Humidity average")); + put(41189, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "AA20-BE5 EME10 Current")); + put(41190, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "AA20-BE5 EME10 Average Current")); + put(41191, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "PV Panel State")); + put(41256, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "Fan speed current")); + put(41257, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "Fan speed current")); + put(41258, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "Fan speed current")); + put(41265, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "Smart Home Mode")); + put(41266, new VariableInformation( 10, NibeDataType.S8 , Type.SENSOR , "Offset to smart home system")); + put(41267, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "Smart Home ctrl syst 8")); + put(41268, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "Smart Home ctrl syst 7")); + put(41269, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "Smart Home ctrl syst 6")); + put(41270, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "Smart Home ctrl syst 5")); + put(41271, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "Smart Home ctrl syst 4")); + put(41272, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "Smart Home ctrl syst 3")); + put(41273, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "Smart Home ctrl syst 2")); + put(41274, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "Smart Home ctrl syst 1")); + put(41928, new VariableInformation( 100, NibeDataType.U16, Type.SENSOR , "Smart Price Adaption Price")); + put(41929, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "Smart Price Adaption Price Level")); + put(41930, new VariableInformation( 1, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Power 10")); + put(41931, new VariableInformation( 1, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Power 9")); + put(41932, new VariableInformation( 1, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Power 8")); + put(41933, new VariableInformation( 1, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Power 7")); + put(41934, new VariableInformation( 1, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Power 6")); + put(41935, new VariableInformation( 1, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Power 5")); + put(41936, new VariableInformation( 1, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Power 4")); + put(41937, new VariableInformation( 1, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Power 3")); + put(41938, new VariableInformation( 1, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Power 2")); + put(41939, new VariableInformation( 1, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Power 1")); + put(41940, new VariableInformation( 1, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Error High 10")); + put(41941, new VariableInformation( 1, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Error High 9")); + put(41942, new VariableInformation( 1, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Error High 8")); + put(41943, new VariableInformation( 1, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Error High 7")); + put(41944, new VariableInformation( 1, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Error High 6")); + put(41945, new VariableInformation( 1, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Error High 5")); + put(41946, new VariableInformation( 1, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Error High 4")); + put(41947, new VariableInformation( 1, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Error High 3")); + put(41948, new VariableInformation( 1, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Error High 2")); + put(41949, new VariableInformation( 1, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Error High 1")); + put(41950, new VariableInformation( 1, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Error Low 10")); + put(41951, new VariableInformation( 1, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Error Low 9")); + put(41952, new VariableInformation( 1, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Error Low 8")); + put(41953, new VariableInformation( 1, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Error Low 7")); + put(41954, new VariableInformation( 1, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Error Low 6")); + put(41955, new VariableInformation( 1, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Error Low 5")); + put(41956, new VariableInformation( 1, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Error Low 4")); + put(41957, new VariableInformation( 1, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Error Low 3")); + put(41958, new VariableInformation( 1, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Error Low 2")); + put(41959, new VariableInformation( 1, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Error Low 1")); + put(41960, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "AA23-BE5 Com Percentage 10")); + put(41961, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "AA23-BE5 Com Percentage 9")); + put(41962, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "AA23-BE5 Com Percentage 8")); + put(41963, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "AA23-BE5 Com Percentage 7")); + put(41964, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "AA23-BE5 Com Percentage 6")); + put(41965, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "AA23-BE5 Com Percentage 5")); + put(41966, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "AA23-BE5 Com Percentage 4")); + put(41967, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "AA23-BE5 Com Percentage 3")); + put(41968, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "AA23-BE5 Com Percentage 2")); + put(41969, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "AA23-BE5 Com Percentage 1")); + put(41980, new VariableInformation( 10, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Voltage1 10")); + put(41981, new VariableInformation( 10, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Voltage1 9")); + put(41982, new VariableInformation( 10, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Voltage1 8")); + put(41983, new VariableInformation( 10, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Voltage1 7")); + put(41984, new VariableInformation( 10, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Voltage1 6")); + put(41985, new VariableInformation( 10, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Voltage1 5")); + put(41986, new VariableInformation( 10, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Voltage1 4")); + put(41987, new VariableInformation( 10, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Voltage1 3")); + put(41988, new VariableInformation( 10, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Voltage1 2")); + put(41989, new VariableInformation( 10, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Voltage1 1")); + put(41990, new VariableInformation( 10, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Voltage2 10")); + put(41991, new VariableInformation( 10, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Voltage2 9")); + put(41992, new VariableInformation( 10, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Voltage2 8")); + put(41993, new VariableInformation( 10, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Voltage2 7")); + put(41994, new VariableInformation( 10, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Voltage2 6")); + put(41995, new VariableInformation( 10, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Voltage2 5")); + put(41996, new VariableInformation( 10, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Voltage2 4")); + put(41997, new VariableInformation( 10, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Voltage2 3")); + put(41998, new VariableInformation( 10, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Voltage2 2")); + put(41999, new VariableInformation( 10, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Voltage2 1")); + put(42000, new VariableInformation( 10, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Temperature 10")); + put(42001, new VariableInformation( 10, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Temperature 9")); + put(42002, new VariableInformation( 10, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Temperature 8")); + put(42003, new VariableInformation( 10, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Temperature 7")); + put(42004, new VariableInformation( 10, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Temperature 6")); + put(42005, new VariableInformation( 10, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Temperature 5")); + put(42006, new VariableInformation( 10, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Temperature 4")); + put(42007, new VariableInformation( 10, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Temperature 3")); + put(42008, new VariableInformation( 10, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Temperature 2")); + put(42009, new VariableInformation( 10, NibeDataType.U16, Type.SENSOR , "AA23-BE5 Temperature 1")); + put(42010, new VariableInformation( 10, NibeDataType.U32, Type.SENSOR , "AA23-BE5 Energy 10")); + put(42012, new VariableInformation( 10, NibeDataType.U32, Type.SENSOR , "AA23-BE5 Energy 9")); + put(42014, new VariableInformation( 10, NibeDataType.U32, Type.SENSOR , "AA23-BE5 Energy 8")); + put(42016, new VariableInformation( 10, NibeDataType.U32, Type.SENSOR , "AA23-BE5 Energy 7")); + put(42018, new VariableInformation( 10, NibeDataType.U32, Type.SENSOR , "AA23-BE5 Energy 6")); + put(42020, new VariableInformation( 10, NibeDataType.U32, Type.SENSOR , "AA23-BE5 Energy 5")); + put(42022, new VariableInformation( 10, NibeDataType.U32, Type.SENSOR , "AA23-BE5 Energy 4")); + put(42024, new VariableInformation( 10, NibeDataType.U32, Type.SENSOR , "AA23-BE5 Energy 3")); + put(42026, new VariableInformation( 10, NibeDataType.U32, Type.SENSOR , "AA23-BE5 Energy 2")); + put(42028, new VariableInformation( 10, NibeDataType.U32, Type.SENSOR , "AA23-BE5 Energy 1")); + put(42030, new VariableInformation( 1, NibeDataType.U16, Type.SENSOR , "AA23-BE5 EME20 Version")); + put(42033, new VariableInformation( 10, NibeDataType.U8 , Type.SENSOR , "PV Panel Heat Offset")); + put(42034, new VariableInformation( 10, NibeDataType.U8 , Type.SENSOR , "PV Panel Pool Offset")); + put(42035, new VariableInformation( 1, NibeDataType.U32, Type.SENSOR , "AA23-BE5 EME20 Total Power")); + put(42037, new VariableInformation( 1, NibeDataType.U32, Type.SENSOR , "AA23-BE5 EME20 Total Average Power")); + put(42075, new VariableInformation( 10, NibeDataType.U32, Type.SENSOR , "AA23-BE5 EME20 Total Energy")); + put(42080, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "AA23-BE5 Alarm 504")); + put(42081, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "AA23-BE5 Alarm 505")); + put(42082, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "AA23-BE5 Alarm 506")); + put(42083, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "AA23-BE5 Alarm 507")); + put(42084, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "AA23-BE5 Alarm 508")); + put(42085, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "AA23-BE5 Alarm 509")); + put(42086, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "AA23-BE5 Alarm 510")); + put(42087, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "AA23-BE5 Alarm 511")); + put(42100, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "BT1 Average, 24h")); + put(42101, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "Used heating power average, 24h")); + put(42136, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "BT22 Supply air temp.")); + put(42137, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "BT22 Supply air temp.")); + put(42138, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "BT22 Supply air temp.")); + put(43001, new VariableInformation( 1, NibeDataType.U16, Type.SENSOR , "Software version")); + put(43006, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "Calc. Supply S4")); + put(43007, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "Calc. Supply S3")); + put(43008, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "Calc. Supply S2")); + put(43009, new VariableInformation( 10, NibeDataType.S16, Type.SENSOR , "Calc. Supply S1")); + put(43013, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "Freeze Protection Status")); + put(43081, new VariableInformation( 10, NibeDataType.S32, Type.SENSOR , "Tot. op.time add.")); + put(43084, new VariableInformation( 100, NibeDataType.S16, Type.SENSOR , "Int. el.add. Power")); + put(43086, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "Prio")); + put(43091, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "Int. el.add. State")); + put(43093, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "Mixing Valve State S4")); + put(43094, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "Mixing Valve State S3")); + put(43095, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "Mixing Valve State S2")); + put(43096, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "Mixing Valve State S1")); + put(43105, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "Status FJVM")); + put(43108, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "Fan speed current")); + put(43158, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "External adjustment activated via input S4")); + put(43159, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "External adjustment activated via input S3")); + put(43160, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "External adjustment activated via input S2")); + put(43161, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "External adjustment activated via input S1")); + put(43180, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "HWC Pump Status GP11")); + put(43239, new VariableInformation( 10, NibeDataType.S32, Type.SENSOR , "Tot. HW op.time add.")); + put(43383, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "FJVM Relays")); + put(43416, new VariableInformation( 1, NibeDataType.S32, Type.SENSOR , "Compressor starts EB100-EP14")); + put(43420, new VariableInformation( 1, NibeDataType.S32, Type.SENSOR , "Tot. op.time compr. EB100-EP14")); + put(43424, new VariableInformation( 1, NibeDataType.S32, Type.SENSOR , "Tot. HW op.time compr. EB100-EP14")); + put(43427, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "Compressor State EP14")); + put(43431, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "Supply Pump State EP14")); + put(43435, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "Cpr Status EP14")); + put(43460, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "State DEH")); + put(43514, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "EB100-EP14 PCA Base Relays")); + put(43516, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "PCA-Power Relays EP14")); + put(44331, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "Software release")); + put(44744, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "Extra heating system pump S4")); + put(44745, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "Extra heating system pump S3")); + put(44746, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "Extra heating system pump S2")); + put(44750, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "FJVM pump")); + put(44874, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "State SG Ready")); + put(44878, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "SG Ready input A")); + put(44879, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "SG Ready input B")); + put(44896, new VariableInformation( 10, NibeDataType.S8 , Type.SENSOR , "Smart Price Adaption Heating Offset")); + put(44897, new VariableInformation( 1, NibeDataType.S8 , Type.SENSOR , "Smart Price Adaption HW Comfort Mode")); + put(44898, new VariableInformation( 1, NibeDataType.S8 , Type.SENSOR , "Smart Price Adaption Pool Offset")); + put(44899, new VariableInformation( 1, NibeDataType.S8 , Type.SENSOR , "Smart Price Adaption Cool Offset")); + put(44908, new VariableInformation( 1, NibeDataType.U8 , Type.SENSOR , "State smart price adaption")); + put(45001, new VariableInformation( 1, NibeDataType.S16, Type.SENSOR , "Alarm")); + put(47291, new VariableInformation( 1, NibeDataType.U16, Type.SENSOR , "Floor drying timer")); + put(40879, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "+Adjust Parallell factor")); + put(40880, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "+Adjust Max change")); + put(40881, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "+Adjust Affect system8")); + put(40882, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "+Adjust Affect system7")); + put(40883, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "+Adjust Affect system6")); + put(40884, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "+Adjust Affect system5")); + put(40885, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "+Adjust Affect system4")); + put(40886, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "+Adjust Affect system3")); + put(40887, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "+Adjust Affect system2")); + put(40888, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "+Adjust Affect system1")); + put(45171, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Alarm Reset")); + put(47004, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Heat Curve S4")); + put(47005, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Heat Curve S3")); + put(47006, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Heat Curve S2")); + put(47007, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Heat Curve S1")); + put(47008, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Heat Offset S4")); + put(47009, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Heat Offset S3")); + put(47010, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Heat Offset S2")); + put(47011, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Heat Offset S1")); + put(47012, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Min Supply System 4")); + put(47013, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Min Supply System 3")); + put(47014, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Min Supply System 2")); + put(47015, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Min Supply System 1")); + put(47016, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Max Supply System 4")); + put(47017, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Max Supply System 3")); + put(47018, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Max Supply System 2")); + put(47019, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Max Supply System 1")); + put(47020, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Own Heating Curve P7")); + put(47021, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Own Heating Curve P6")); + put(47022, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Own Heating Curve P5")); + put(47023, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Own Heating Curve P4")); + put(47024, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Own Heating Curve P3")); + put(47025, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Own Heating Curve P2")); + put(47026, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Own Heating Curve P1")); + put(47027, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Point offset outdoor temp.")); + put(47028, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Point offset")); + put(47029, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "External adjustment S4")); + put(47030, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "External adjustment S3")); + put(47031, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "External adjustment S2")); + put(47032, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "External adjustment S1")); + put(47033, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "External adjustment with room sensor S4")); + put(47034, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "External adjustment with room sensor S3")); + put(47035, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "External adjustment with room sensor S2")); + put(47036, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "External adjustment with room sensor S1")); + put(47041, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Hot water comfort mode")); + put(47043, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Start temperature HW Luxury")); + put(47044, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Start temperature HW Normal")); + put(47045, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Start temperature HW Economy")); + put(47046, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Stop temperature Periodic HW")); + put(47047, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Stop temperature HW Luxury")); + put(47048, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Stop temperature HW Normal")); + put(47049, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Stop temperature HW Economy")); + put(47050, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Periodic HW")); + put(47051, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Periodic HW Interval")); + put(47054, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Run time HWC")); + put(47055, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Still time HWC")); + put(47131, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Language")); + put(47137, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Operational mode")); + put(47138, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Operational mode heat medium pump")); + put(47212, new VariableInformation( 100, NibeDataType.S16, Type.SETTING , "Max int add. power")); + put(47214, new VariableInformation( 1, NibeDataType.U16, Type.SETTING , "Fuse")); + put(47261, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Exhaust Fan speed 4")); + put(47262, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Exhaust Fan speed 3")); + put(47263, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Exhaust Fan speed 2")); + put(47264, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Exhaust Fan speed 1")); + put(47265, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Exhaust Fan speed normal")); + put(47266, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Supply Fan speed 4")); + put(47267, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Supply Fan speed 3")); + put(47268, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Supply Fan speed 2")); + put(47269, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Supply Fan speed 1")); + put(47270, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Supply Fan speed normal")); + put(47271, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Fan return time 4")); + put(47272, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Fan return time 3")); + put(47273, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Fan return time 2")); + put(47274, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Fan return time 1")); + put(47275, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Filter Reminder period")); + put(47276, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Floor drying")); + put(47277, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Floor drying period 7")); + put(47278, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Floor drying period 6")); + put(47279, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Floor drying period 5")); + put(47280, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Floor drying period 4")); + put(47281, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Floor drying period 3")); + put(47282, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Floor drying period 2")); + put(47283, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Floor drying period 1")); + put(47284, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Floor drying temp. 7")); + put(47285, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Floor drying temp. 6")); + put(47286, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Floor drying temp. 5")); + put(47287, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Floor drying temp. 4")); + put(47288, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Floor drying temp. 3")); + put(47289, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Floor drying temp. 2")); + put(47290, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Floor drying temp. 1")); + put(47292, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Trend temperature")); + put(47293, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Transfer time HW-Heat")); + put(47300, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "DOT")); + put(47301, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "delta T at DOT")); + put(47302, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Climate system 2 accessory")); + put(47303, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Climate system 3 accessory")); + put(47304, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Climate system 4 accessory")); + put(47305, new VariableInformation( 10, NibeDataType.S8 , Type.SETTING , "Climate system 4 mixing valve amp.")); + put(47306, new VariableInformation( 10, NibeDataType.S8 , Type.SETTING , "Climate system 3 mixing valve amp.")); + put(47307, new VariableInformation( 10, NibeDataType.S8 , Type.SETTING , "Climate system 2 mixing valve amp.")); + put(47308, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Climate system 4 shunt wait")); + put(47309, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Climate system 3 shunt wait")); + put(47310, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Climate system 2 shunt wait")); + put(47351, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "FJVM accessory")); + put(47352, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "SMS40 accessory")); + put(47365, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "RMU System 1")); + put(47366, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "RMU System 2")); + put(47367, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "RMU System 3")); + put(47368, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "RMU System 4")); + put(47370, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Allow Additive Heating")); + put(47371, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Allow Heating")); + put(47372, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Allow Cooling")); + put(47374, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Start Temperature Cooling")); + put(47375, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Stop Temperature Heating")); + put(47376, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Stop Temperature Additive")); + put(47377, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Outdoor Filter Time")); + put(47378, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Max diff. comp.")); + put(47379, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Max diff. add.")); + put(47384, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Date format")); + put(47385, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Time format")); + put(47387, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "HW production")); + put(47388, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Alarm lower room temp.")); + put(47389, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Alarm lower HW temp.")); + put(47391, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Use room sensor S4")); + put(47392, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Use room sensor S3")); + put(47393, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Use room sensor S2")); + put(47394, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Use room sensor S1")); + put(47395, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Room sensor setpoint S4")); + put(47396, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Room sensor setpoint S3")); + put(47397, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Room sensor setpoint S2")); + put(47398, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Room sensor setpoint S1")); + put(47399, new VariableInformation( 10, NibeDataType.U8 , Type.SETTING , "Room sensor factor S4")); + put(47400, new VariableInformation( 10, NibeDataType.U8 , Type.SETTING , "Room sensor factor S3")); + put(47401, new VariableInformation( 10, NibeDataType.U8 , Type.SETTING , "Room sensor factor S2")); + put(47402, new VariableInformation( 10, NibeDataType.U8 , Type.SETTING , "Room sensor factor S1")); + put(47442, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "preset flow clim. sys.")); + put(47525, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Heat Curve S8")); + put(47536, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Fan synch mode")); + put(47537, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Night cooling")); + put(47538, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Start room temp. night cooling")); + put(47539, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Night Cooling Min. diff.")); + put(47556, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "DEH accessory")); + put(47564, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Allow Heating Sys1")); + put(47565, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Allow Heating Sys2")); + put(47567, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Heat Curve S7")); + put(48043, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Holiday - Activated")); + put(48132, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Temporary Lux")); + put(48282, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "SG Ready heating")); + put(48283, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "SG Ready cooling")); + put(48284, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "SG Ready hot water")); + put(48285, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "SG Ready pool")); + put(48488, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Heat Curve S6")); + put(48489, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Heat Curve S5")); + put(48491, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Heat Offset S8")); + put(48492, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Heat Offset S7")); + put(48493, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Heat Offset S6")); + put(48494, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Heat Offset S5")); + put(48495, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Min Supply System 8")); + put(48496, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Min Supply System 7")); + put(48497, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Min Supply System 6")); + put(48498, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Min Supply System 5")); + put(48499, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Max Supply System 8")); + put(48500, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Max Supply System 7")); + put(48501, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Max Supply System 6")); + put(48502, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Max Supply System 5")); + put(48503, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "External adjustment S8")); + put(48504, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "External adjustment S7")); + put(48505, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "External adjustment S6")); + put(48506, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "External adjustment S5")); + put(48507, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "External adjustment with room sensor S8")); + put(48508, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "External adjustment with room sensor S7")); + put(48509, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "External adjustment with room sensor S6")); + put(48510, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "External adjustment with room sensor S5")); + put(48569, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Climate system 5 accessory")); + put(48570, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Climate system 6 accessory")); + put(48571, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Climate system 7 accessory")); + put(48572, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Climate system 8 accessory")); + put(48573, new VariableInformation( 10, NibeDataType.S8 , Type.SETTING , "Climate system 8 mixing valve amp.")); + put(48574, new VariableInformation( 10, NibeDataType.S8 , Type.SETTING , "Climate system 7 mixing valve amp.")); + put(48575, new VariableInformation( 10, NibeDataType.S8 , Type.SETTING , "Climate system 6 mixing valve amp.")); + put(48576, new VariableInformation( 10, NibeDataType.S8 , Type.SETTING , "Climate system 5 mixing valve amp.")); + put(48577, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Climate system 8 shunt wait")); + put(48578, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Climate system 7 shunt wait")); + put(48579, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Climate system 6 shunt wait")); + put(48580, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Climate system 5 shunt wait")); + put(48675, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Use room sensor S8")); + put(48676, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Use room sensor S7")); + put(48677, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Use room sensor S6")); + put(48678, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Use room sensor S5")); + put(48680, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Room sensor setpoint S8")); + put(48681, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Room sensor setpoint S7")); + put(48682, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Room sensor setpoint S6")); + put(48683, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Room sensor setpoint S5")); + put(48685, new VariableInformation( 10, NibeDataType.U8 , Type.SETTING , "Room sensor factor S8")); + put(48686, new VariableInformation( 10, NibeDataType.U8 , Type.SETTING , "Room sensor factor S7")); + put(48687, new VariableInformation( 10, NibeDataType.U8 , Type.SETTING , "Room sensor factor S6")); + put(48688, new VariableInformation( 10, NibeDataType.U8 , Type.SETTING , "Room sensor factor S5")); + put(48732, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Cool offset S8")); + put(48733, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Cool offset S7")); + put(48734, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Cool offset S6")); + put(48735, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Cool offset S5")); + put(48736, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Cool offset S4")); + put(48737, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Cool offset S3")); + put(48738, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Cool offset S2")); + put(48739, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Cool offset S1")); + put(48755, new VariableInformation( 1, NibeDataType.U16, Type.SETTING , "Transformer ratio")); + put(48794, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "RH set value")); + put(48810, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Prevent humidity S8 ")); + put(48811, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Prevent humidity S7")); + put(48812, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Prevent humidity S6")); + put(48813, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Prevent humidity S5")); + put(48814, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Prevent humidity S4")); + put(48815, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Prevent humidity S3")); + put(48816, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Prevent humidity S2")); + put(48817, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Prevent humidity S1")); + put(48889, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "MODBUS40 Disable LOG.SET")); + put(48926, new VariableInformation( 10, NibeDataType.U8 , Type.SETTING , "Humidity factor")); + put(48927, new VariableInformation( 10, NibeDataType.U8 , Type.SETTING , "Humidity cool factor")); + put(48930, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "EME10 Activated")); + put(48931, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "EME PV Panel Affect Heating")); + put(48932, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "EME PV Panel Affect Hot Water")); + put(48968, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "FLM 1 set point, cooling")); + put(48970, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Outdoor Air Mixing function")); + put(48976, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Smart home room control")); + put(49289, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Ground water pump speed control ")); + put(49297, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "EME20 Activated")); + put(49298, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "EME PV Panel Affect Pool")); + put(49358, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Night cooling")); + put(49359, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Night cooling")); + put(49360, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Night cooling")); + put(49361, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Start room temp. night cooling")); + put(49362, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Start room temp. night cooling")); + put(49363, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Start room temp. night cooling")); + put(49364, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Night Cooling Min. diff.")); + put(49365, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Night Cooling Min. diff.")); + put(49366, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Night Cooling Min. diff.")); + put(49431, new VariableInformation( 1, NibeDataType.S16, Type.SETTING , "Stop Temperature Supply Air Heating")); + + // @formatter:on + } + }); + + public static VariableInformation getVariableInfo(int key) { + return VARIABLE_INFO_F470.get(key); + } +} diff --git a/addons/binding/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/models/PumpModel.java b/addons/binding/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/models/PumpModel.java index 5fa79a1c45cd4..ad37549d914eb 100644 --- a/addons/binding/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/models/PumpModel.java +++ b/addons/binding/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/models/PumpModel.java @@ -16,7 +16,8 @@ */ public enum PumpModel { F1X45("F1X45"), - F750("F750"); + F750("F750"), + F470("F470"); private final String pumpModel; diff --git a/addons/binding/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/models/VariableInformation.java b/addons/binding/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/models/VariableInformation.java index bd2013e2cf56e..325ee94b9d8cd 100644 --- a/addons/binding/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/models/VariableInformation.java +++ b/addons/binding/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/models/VariableInformation.java @@ -50,6 +50,8 @@ public static VariableInformation getVariableInfo(PumpModel model, int key) { return F1X45.getVariableInfo(key); case F750: return F750.getVariableInfo(key); + case F470: + return F470.getVariableInfo(key); default: return null; } diff --git a/addons/binding/org.openhab.binding.nibeuplink/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.nibeuplink/META-INF/MANIFEST.MF index 8acf486c9fb42..3569ac8eedf35 100644 --- a/addons/binding/org.openhab.binding.nibeuplink/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.nibeuplink/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: NibeUplink Binding Bundle-SymbolicName: org.openhab.binding.nibeuplink;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: . Import-Package: diff --git a/addons/binding/org.openhab.binding.nibeuplink/pom.xml b/addons/binding/org.openhab.binding.nibeuplink/pom.xml index df382b4313240..683d36837d2ac 100644 --- a/addons/binding/org.openhab.binding.nibeuplink/pom.xml +++ b/addons/binding/org.openhab.binding.nibeuplink/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.nibeuplink diff --git a/addons/binding/org.openhab.binding.nikohomecontrol/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.nikohomecontrol/META-INF/MANIFEST.MF index 512ef4b5d0065..a47d3aaa156f5 100644 --- a/addons/binding/org.openhab.binding.nikohomecontrol/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.nikohomecontrol/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: Niko Home Control Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.nikohomecontrol;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.gson, com.google.gson.stream, diff --git a/addons/binding/org.openhab.binding.nikohomecontrol/pom.xml b/addons/binding/org.openhab.binding.nikohomecontrol/pom.xml index e0e602d3a500c..41e0c53cf5dc9 100644 --- a/addons/binding/org.openhab.binding.nikohomecontrol/pom.xml +++ b/addons/binding/org.openhab.binding.nikohomecontrol/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.nikohomecontrol diff --git a/addons/binding/org.openhab.binding.nuki/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.nuki/META-INF/MANIFEST.MF index e35b5f6d8fa60..920e436afad5e 100644 --- a/addons/binding/org.openhab.binding.nuki/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.nuki/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: Nuki Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.nuki;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Export-Package: org.openhab.binding.nuki, org.openhab.binding.nuki.handler diff --git a/addons/binding/org.openhab.binding.nuki/pom.xml b/addons/binding/org.openhab.binding.nuki/pom.xml index 968f11d6d2b87..c263d7fbc4af0 100644 --- a/addons/binding/org.openhab.binding.nuki/pom.xml +++ b/addons/binding/org.openhab.binding.nuki/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.nuki diff --git a/addons/binding/org.openhab.binding.oceanic/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.oceanic/META-INF/MANIFEST.MF index ef1e3e650a65a..b2837e564b009 100644 --- a/addons/binding/org.openhab.binding.oceanic/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.oceanic/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: Oceanic Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.oceanic;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: gnu.io, org.apache.commons.io, diff --git a/addons/binding/org.openhab.binding.oceanic/pom.xml b/addons/binding/org.openhab.binding.oceanic/pom.xml index e9fb1b6a10d77..e5effe8b65d61 100644 --- a/addons/binding/org.openhab.binding.oceanic/pom.xml +++ b/addons/binding/org.openhab.binding.oceanic/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.oceanic diff --git a/addons/binding/org.openhab.binding.onebusaway/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.onebusaway/META-INF/MANIFEST.MF index 4a19124b754e2..07ffdca6f861e 100644 --- a/addons/binding/org.openhab.binding.onebusaway/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.onebusaway/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: OneBusAway Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.onebusaway;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.common.base, com.google.common.collect, diff --git a/addons/binding/org.openhab.binding.onebusaway/pom.xml b/addons/binding/org.openhab.binding.onebusaway/pom.xml index e3e2e0982334f..bb477eb46e0d7 100644 --- a/addons/binding/org.openhab.binding.onebusaway/pom.xml +++ b/addons/binding/org.openhab.binding.onebusaway/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.onebusaway diff --git a/addons/binding/org.openhab.binding.onewiregpio/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.onewiregpio/META-INF/MANIFEST.MF index db2266fcf543c..be54f18229237 100644 --- a/addons/binding/org.openhab.binding.onewiregpio/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.onewiregpio/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: OneWireGPIO Binding Bundle-SymbolicName: org.openhab.binding.onewiregpio;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: . Import-Package: diff --git a/addons/binding/org.openhab.binding.onewiregpio/pom.xml b/addons/binding/org.openhab.binding.onewiregpio/pom.xml index 6c7067f2db021..b3ec0d35d06af 100644 --- a/addons/binding/org.openhab.binding.onewiregpio/pom.xml +++ b/addons/binding/org.openhab.binding.onewiregpio/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.onewiregpio diff --git a/addons/binding/org.openhab.binding.onkyo/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.onkyo/META-INF/MANIFEST.MF index cf4563065c8db..cc2e98a13b2a3 100644 --- a/addons/binding/org.openhab.binding.onkyo/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.onkyo/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: Onkyo Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.onkyo;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: org.apache.commons.io, org.apache.commons.lang, diff --git a/addons/binding/org.openhab.binding.onkyo/pom.xml b/addons/binding/org.openhab.binding.onkyo/pom.xml index 1f137dbe1614f..11a2fcc2cf725 100644 --- a/addons/binding/org.openhab.binding.onkyo/pom.xml +++ b/addons/binding/org.openhab.binding.onkyo/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.onkyo diff --git a/addons/binding/org.openhab.binding.opensprinkler/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.opensprinkler/META-INF/MANIFEST.MF index ac6045029e614..119818284055d 100644 --- a/addons/binding/org.openhab.binding.opensprinkler/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.opensprinkler/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Bundle-Name: OpenSprinkler Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.opensprinkler;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.gson, org.apache.commons.net.util, diff --git a/addons/binding/org.openhab.binding.opensprinkler/pom.xml b/addons/binding/org.openhab.binding.opensprinkler/pom.xml index 4cf3019133f8c..49eb89fb7b602 100644 --- a/addons/binding/org.openhab.binding.opensprinkler/pom.xml +++ b/addons/binding/org.openhab.binding.opensprinkler/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.opensprinkler diff --git a/addons/binding/org.openhab.binding.openuv/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.openuv/META-INF/MANIFEST.MF index 0d4b7721ac110..42ba27d09f811 100644 --- a/addons/binding/org.openhab.binding.openuv/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.openuv/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: OpenUV Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.openuv;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.gson, javax.measure, diff --git a/addons/binding/org.openhab.binding.openuv/pom.xml b/addons/binding/org.openhab.binding.openuv/pom.xml index 6b5a0e941d8b8..3df4afd7abc6a 100644 --- a/addons/binding/org.openhab.binding.openuv/pom.xml +++ b/addons/binding/org.openhab.binding.openuv/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 pom org.openhab.binding - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.openuv diff --git a/addons/binding/org.openhab.binding.orvibo/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.orvibo/META-INF/MANIFEST.MF index dde6ea3e19ef5..d4a7a0126366b 100644 --- a/addons/binding/org.openhab.binding.orvibo/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.orvibo/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Bundle-Name: Orvibo Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.orvibo;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: javax.xml.bind, org.apache.commons.lang, diff --git a/addons/binding/org.openhab.binding.orvibo/pom.xml b/addons/binding/org.openhab.binding.orvibo/pom.xml index 268378b0276d0..6c8b14c43a376 100644 --- a/addons/binding/org.openhab.binding.orvibo/pom.xml +++ b/addons/binding/org.openhab.binding.orvibo/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.orvibo diff --git a/addons/binding/org.openhab.binding.pentair/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.pentair/META-INF/MANIFEST.MF index a7861a7720511..d6ff060cfb848 100644 --- a/addons/binding/org.openhab.binding.pentair/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.pentair/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Pentair Binding Bundle-SymbolicName: org.openhab.binding.pentair;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: . Import-Package: diff --git a/addons/binding/org.openhab.binding.pentair/pom.xml b/addons/binding/org.openhab.binding.pentair/pom.xml index 652925d60ae76..d75c6adf74f8b 100644 --- a/addons/binding/org.openhab.binding.pentair/pom.xml +++ b/addons/binding/org.openhab.binding.pentair/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.pentair diff --git a/addons/binding/org.openhab.binding.phc/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.phc/META-INF/MANIFEST.MF index bd0b69bad1c4b..1276f4b0bb899 100644 --- a/addons/binding/org.openhab.binding.phc/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.phc/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: PHC Binding Bundle-SymbolicName: org.openhab.binding.phc;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: . Import-Package: diff --git a/addons/binding/org.openhab.binding.phc/pom.xml b/addons/binding/org.openhab.binding.phc/pom.xml index 5103b2e32b08c..7fb693b230271 100644 --- a/addons/binding/org.openhab.binding.phc/pom.xml +++ b/addons/binding/org.openhab.binding.phc/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.phc diff --git a/addons/binding/org.openhab.binding.pioneeravr/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.pioneeravr/META-INF/MANIFEST.MF index a01408d151ad6..73d5c1821d394 100644 --- a/addons/binding/org.openhab.binding.pioneeravr/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.pioneeravr/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: PioneerAvr Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.pioneeravr;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Export-Package: org.openhab.binding.pioneeravr, org.openhab.binding.pioneeravr.protocol, diff --git a/addons/binding/org.openhab.binding.pioneeravr/pom.xml b/addons/binding/org.openhab.binding.pioneeravr/pom.xml index 309eeab521001..21ebe299b327e 100644 --- a/addons/binding/org.openhab.binding.pioneeravr/pom.xml +++ b/addons/binding/org.openhab.binding.pioneeravr/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.pioneeravr diff --git a/addons/binding/org.openhab.binding.plclogo/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.plclogo/META-INF/MANIFEST.MF index 656348482ba99..1f21b55a1fae7 100644 --- a/addons/binding/org.openhab.binding.plclogo/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.plclogo/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: PLCLogo Binding Bundle-SymbolicName: org.openhab.binding.plclogo;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: ., lib/Moka7-1.0.2_io_patch.jar diff --git a/addons/binding/org.openhab.binding.plclogo/pom.xml b/addons/binding/org.openhab.binding.plclogo/pom.xml index 8083ecf341856..ce0fe1d5ba5bc 100644 --- a/addons/binding/org.openhab.binding.plclogo/pom.xml +++ b/addons/binding/org.openhab.binding.plclogo/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 pom org.openhab.binding - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.plclogo diff --git a/addons/binding/org.openhab.binding.plugwise/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.plugwise/META-INF/MANIFEST.MF index 98f0acfd79792..5c65ae3483d14 100644 --- a/addons/binding/org.openhab.binding.plugwise/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.plugwise/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: Plugwise Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.plugwise;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.common.base, com.google.common.collect, diff --git a/addons/binding/org.openhab.binding.plugwise/pom.xml b/addons/binding/org.openhab.binding.plugwise/pom.xml index 1c372eb594ddd..bef1c7e68e060 100644 --- a/addons/binding/org.openhab.binding.plugwise/pom.xml +++ b/addons/binding/org.openhab.binding.plugwise/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.plugwise diff --git a/addons/binding/org.openhab.binding.powermax/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.powermax/META-INF/MANIFEST.MF index 8e8a1accb6da5..b955726ee3f93 100644 --- a/addons/binding/org.openhab.binding.powermax/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.powermax/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Powermax Binding Bundle-SymbolicName: org.openhab.binding.powermax;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: . Import-Package: diff --git a/addons/binding/org.openhab.binding.powermax/pom.xml b/addons/binding/org.openhab.binding.powermax/pom.xml index ea79cd77f86dd..01c54bae75151 100644 --- a/addons/binding/org.openhab.binding.powermax/pom.xml +++ b/addons/binding/org.openhab.binding.powermax/pom.xml @@ -1,17 +1,16 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding org.openhab.binding.powermax - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT Powermax Binding eclipse-plugin diff --git a/addons/binding/org.openhab.binding.pulseaudio/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.pulseaudio/META-INF/MANIFEST.MF index f72eade37610b..daa272a1cfc54 100644 --- a/addons/binding/org.openhab.binding.pulseaudio/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.pulseaudio/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: Pulseaudio Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.pulseaudio;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: javax.jmdns, org.apache.commons.lang, diff --git a/addons/binding/org.openhab.binding.pulseaudio/pom.xml b/addons/binding/org.openhab.binding.pulseaudio/pom.xml index 5f0e23a9b7bfb..d454f2507256c 100644 --- a/addons/binding/org.openhab.binding.pulseaudio/pom.xml +++ b/addons/binding/org.openhab.binding.pulseaudio/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.pulseaudio diff --git a/addons/binding/org.openhab.binding.regoheatpump/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.regoheatpump/META-INF/MANIFEST.MF index daaeabc87b64a..a45d110ef6a51 100644 --- a/addons/binding/org.openhab.binding.regoheatpump/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.regoheatpump/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: RegoHeatPump Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.regoheatpump;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: gnu.io;resolution:=optional, org.eclipse.jdt.annotation;resolution:=optional, diff --git a/addons/binding/org.openhab.binding.regoheatpump/pom.xml b/addons/binding/org.openhab.binding.regoheatpump/pom.xml index 1cee2ad0b847a..341267253af70 100644 --- a/addons/binding/org.openhab.binding.regoheatpump/pom.xml +++ b/addons/binding/org.openhab.binding.regoheatpump/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.regoheatpump diff --git a/addons/binding/org.openhab.binding.rfxcom.test/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.rfxcom.test/META-INF/MANIFEST.MF index d6c4b6478ad7b..9e486d2ca25ed 100644 --- a/addons/binding/org.openhab.binding.rfxcom.test/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.rfxcom.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: openHAB RFXCOM Binding Tests Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.rfxcom.test;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Fragment-Host: org.openhab.binding.rfxcom Import-Package: org.apache.commons.lang.reflect, diff --git a/addons/binding/org.openhab.binding.rfxcom.test/pom.xml b/addons/binding/org.openhab.binding.rfxcom.test/pom.xml index 3d84c9388e3c5..54ce99dbe7838 100644 --- a/addons/binding/org.openhab.binding.rfxcom.test/pom.xml +++ b/addons/binding/org.openhab.binding.rfxcom.test/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.rfxcom.test diff --git a/addons/binding/org.openhab.binding.rfxcom/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.rfxcom/META-INF/MANIFEST.MF index 3dda498d2626b..a3860fa4acb01 100644 --- a/addons/binding/org.openhab.binding.rfxcom/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.rfxcom/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Bundle-Name: Rfxcom Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.rfxcom;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Export-Package: org.openhab.binding.rfxcom, org.openhab.binding.rfxcom.handler diff --git a/addons/binding/org.openhab.binding.rfxcom/pom.xml b/addons/binding/org.openhab.binding.rfxcom/pom.xml index 95a7df54e0e8d..d2f48a6a35863 100644 --- a/addons/binding/org.openhab.binding.rfxcom/pom.xml +++ b/addons/binding/org.openhab.binding.rfxcom/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.rfxcom diff --git a/addons/binding/org.openhab.binding.rme/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.rme/META-INF/MANIFEST.MF index 57a747bd81a9b..a12fbc6521d40 100644 --- a/addons/binding/org.openhab.binding.rme/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.rme/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: RME Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.rme;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: gnu.io, org.apache.commons.io, diff --git a/addons/binding/org.openhab.binding.rme/pom.xml b/addons/binding/org.openhab.binding.rme/pom.xml index 7423f5bcb2995..159a62f8d733b 100644 --- a/addons/binding/org.openhab.binding.rme/pom.xml +++ b/addons/binding/org.openhab.binding.rme/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.rme diff --git a/addons/binding/org.openhab.binding.robonect.test/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.robonect.test/META-INF/MANIFEST.MF index b5835a1c191be..e8d2df8c4fc81 100644 --- a/addons/binding/org.openhab.binding.robonect.test/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.robonect.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: Robonect Binding Tests Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.robonect.test;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Fragment-Host: org.openhab.binding.robonect Import-Package: org.apache.commons.lang.reflect, diff --git a/addons/binding/org.openhab.binding.robonect.test/pom.xml b/addons/binding/org.openhab.binding.robonect.test/pom.xml index fe1fc9b8d8ddf..db28737b4d18d 100644 --- a/addons/binding/org.openhab.binding.robonect.test/pom.xml +++ b/addons/binding/org.openhab.binding.robonect.test/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.robonect.test eclipse-test-plugin diff --git a/addons/binding/org.openhab.binding.robonect/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.robonect/META-INF/MANIFEST.MF index 0e0c8925c951b..0f0b96a1b5c03 100644 --- a/addons/binding/org.openhab.binding.robonect/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.robonect/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Robonect Binding Bundle-SymbolicName: org.openhab.binding.robonect;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: . Import-Package: diff --git a/addons/binding/org.openhab.binding.robonect/pom.xml b/addons/binding/org.openhab.binding.robonect/pom.xml index 2760367c0a8b2..58cb89e43edfe 100644 --- a/addons/binding/org.openhab.binding.robonect/pom.xml +++ b/addons/binding/org.openhab.binding.robonect/pom.xml @@ -1,17 +1,16 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding org.openhab.binding.robonect - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT eclipse-plugin Robonect Binding diff --git a/addons/binding/org.openhab.binding.rotelra1x/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.rotelra1x/META-INF/MANIFEST.MF index 03695242f81b5..8d65683c97fdc 100644 --- a/addons/binding/org.openhab.binding.rotelra1x/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.rotelra1x/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: RotelRa1x Binding Bundle-SymbolicName: org.openhab.binding.rotelra1x;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: . Import-Package: diff --git a/addons/binding/org.openhab.binding.rotelra1x/pom.xml b/addons/binding/org.openhab.binding.rotelra1x/pom.xml index a233a02bec390..03112c17b4846 100644 --- a/addons/binding/org.openhab.binding.rotelra1x/pom.xml +++ b/addons/binding/org.openhab.binding.rotelra1x/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.rotelra1x diff --git a/addons/binding/org.openhab.binding.russound/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.russound/META-INF/MANIFEST.MF index a9b8dcbe07bb6..ec3db8aa6e2a3 100644 --- a/addons/binding/org.openhab.binding.russound/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.russound/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: Russound Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.russound;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.gson, com.google.gson.annotations, diff --git a/addons/binding/org.openhab.binding.russound/pom.xml b/addons/binding/org.openhab.binding.russound/pom.xml index d8a9ed07debec..ce4e5d0da0b7a 100644 --- a/addons/binding/org.openhab.binding.russound/pom.xml +++ b/addons/binding/org.openhab.binding.russound/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.russound diff --git a/addons/binding/org.openhab.binding.samsungtv/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.samsungtv/META-INF/MANIFEST.MF index 7e3c69f40a617..85d6d73da710f 100644 --- a/addons/binding/org.openhab.binding.samsungtv/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.samsungtv/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Name: Samsung Tv Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.samsungtv;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: org.apache.commons.net.util, org.eclipse.jdt.annotation;resolution:=optional, diff --git a/addons/binding/org.openhab.binding.samsungtv/pom.xml b/addons/binding/org.openhab.binding.samsungtv/pom.xml index e0f98cec7460d..c398204816e36 100644 --- a/addons/binding/org.openhab.binding.samsungtv/pom.xml +++ b/addons/binding/org.openhab.binding.samsungtv/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.samsungtv diff --git a/addons/binding/org.openhab.binding.satel/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.satel/META-INF/MANIFEST.MF index 1d8f768af30aa..dff529e6f1762 100644 --- a/addons/binding/org.openhab.binding.satel/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.satel/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Satel Binding Bundle-SymbolicName: org.openhab.binding.satel;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: . Import-Package: diff --git a/addons/binding/org.openhab.binding.satel/pom.xml b/addons/binding/org.openhab.binding.satel/pom.xml index 3a56ec1e5f776..869a258f88703 100644 --- a/addons/binding/org.openhab.binding.satel/pom.xml +++ b/addons/binding/org.openhab.binding.satel/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.satel diff --git a/addons/binding/org.openhab.binding.seneye/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.seneye/META-INF/MANIFEST.MF index 96e5a4d8a4ce7..64f18f7ed2783 100755 --- a/addons/binding/org.openhab.binding.seneye/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.seneye/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: Seneye Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.seneye;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.gson, org.eclipse.jdt.annotation;resolution:=optional, diff --git a/addons/binding/org.openhab.binding.seneye/pom.xml b/addons/binding/org.openhab.binding.seneye/pom.xml index a027596a71555..d725993cd01ec 100755 --- a/addons/binding/org.openhab.binding.seneye/pom.xml +++ b/addons/binding/org.openhab.binding.seneye/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.seneye diff --git a/addons/binding/org.openhab.binding.sensebox/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.sensebox/META-INF/MANIFEST.MF index 2c3d0480b36e6..d951f598ff08a 100644 --- a/addons/binding/org.openhab.binding.sensebox/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.sensebox/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Name: senseBox Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.sensebox;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.gson, com.google.gson.annotations, diff --git a/addons/binding/org.openhab.binding.sensebox/pom.xml b/addons/binding/org.openhab.binding.sensebox/pom.xml index d8e8ec1a737df..606afe8bb79e4 100644 --- a/addons/binding/org.openhab.binding.sensebox/pom.xml +++ b/addons/binding/org.openhab.binding.sensebox/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.sensebox diff --git a/addons/binding/org.openhab.binding.silvercrestwifisocket/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.silvercrestwifisocket/META-INF/MANIFEST.MF index 9f7e45e68fd95..f6f8a26669846 100644 --- a/addons/binding/org.openhab.binding.silvercrestwifisocket/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.silvercrestwifisocket/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.silvercrestwifisocket;singleton :=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: org.eclipse.jdt.annotation;resolution:=optional, org.eclipse.smarthome.config.core, diff --git a/addons/binding/org.openhab.binding.silvercrestwifisocket/pom.xml b/addons/binding/org.openhab.binding.silvercrestwifisocket/pom.xml index 63add69ab1ec0..5aecbcbf059db 100644 --- a/addons/binding/org.openhab.binding.silvercrestwifisocket/pom.xml +++ b/addons/binding/org.openhab.binding.silvercrestwifisocket/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.silvercrestwifisocket diff --git a/addons/binding/org.openhab.binding.sleepiq/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.sleepiq/META-INF/MANIFEST.MF index a17e3a2803a3a..8cd527bf79bf4 100644 --- a/addons/binding/org.openhab.binding.sleepiq/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.sleepiq/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Bundle-Name: SleepIQ Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.sleepiq;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.common.collect, com.google.gson, diff --git a/addons/binding/org.openhab.binding.sleepiq/pom.xml b/addons/binding/org.openhab.binding.sleepiq/pom.xml index 4fdcc8cdaa051..9135d772c510c 100644 --- a/addons/binding/org.openhab.binding.sleepiq/pom.xml +++ b/addons/binding/org.openhab.binding.sleepiq/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.sleepiq diff --git a/addons/binding/org.openhab.binding.smaenergymeter/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.smaenergymeter/META-INF/MANIFEST.MF index 4da08d9c386b1..edf35971c0625 100644 --- a/addons/binding/org.openhab.binding.smaenergymeter/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.smaenergymeter/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: SMAEnergyMeter Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.smaenergymeter;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: org.eclipse.jdt.annotation;resolution:=optional, org.eclipse.smarthome.config.core, diff --git a/addons/binding/org.openhab.binding.smaenergymeter/pom.xml b/addons/binding/org.openhab.binding.smaenergymeter/pom.xml index 2d060c35d8b19..0f030acca4ce3 100644 --- a/addons/binding/org.openhab.binding.smaenergymeter/pom.xml +++ b/addons/binding/org.openhab.binding.smaenergymeter/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.smaenergymeter diff --git a/addons/binding/org.openhab.binding.smartmeter.test/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.smartmeter.test/META-INF/MANIFEST.MF index 601ec3708744d..08b43c1a9ee38 100644 --- a/addons/binding/org.openhab.binding.smartmeter.test/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.smartmeter.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: Smartmeter Binding Tests Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.smartmeter.test;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Fragment-Host: org.openhab.binding.smartmeter Import-Package: net.bytebuddy, diff --git a/addons/binding/org.openhab.binding.smartmeter.test/pom.xml b/addons/binding/org.openhab.binding.smartmeter.test/pom.xml index 4843a3cdac100..ace5193b50e27 100644 --- a/addons/binding/org.openhab.binding.smartmeter.test/pom.xml +++ b/addons/binding/org.openhab.binding.smartmeter.test/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.smartmeter.test diff --git a/addons/binding/org.openhab.binding.smartmeter/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.smartmeter/META-INF/MANIFEST.MF index 479536f91cbed..62131738ac011 100644 --- a/addons/binding/org.openhab.binding.smartmeter/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.smartmeter/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Smartmeter Binding Bundle-SymbolicName: org.openhab.binding.smartmeter;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: ., lib/jsml.jar, diff --git a/addons/binding/org.openhab.binding.smartmeter/pom.xml b/addons/binding/org.openhab.binding.smartmeter/pom.xml index 273505b7c530c..de36cd2d1388c 100644 --- a/addons/binding/org.openhab.binding.smartmeter/pom.xml +++ b/addons/binding/org.openhab.binding.smartmeter/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.smartmeter diff --git a/addons/binding/org.openhab.binding.solaredge/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.solaredge/META-INF/MANIFEST.MF index 8d47dc31473de..a73cee2a3ef8f 100644 --- a/addons/binding/org.openhab.binding.solaredge/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.solaredge/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: SolarEdge Binding Bundle-SymbolicName: org.openhab.binding.solaredge;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: . Import-Package: com.google.gson, diff --git a/addons/binding/org.openhab.binding.solaredge/pom.xml b/addons/binding/org.openhab.binding.solaredge/pom.xml index a85b48084c89e..ef435e024a644 100644 --- a/addons/binding/org.openhab.binding.solaredge/pom.xml +++ b/addons/binding/org.openhab.binding.solaredge/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.solaredge diff --git a/addons/binding/org.openhab.binding.solarlog/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.solarlog/META-INF/MANIFEST.MF index bb100f6351cbf..61c7adff2e43a 100644 --- a/addons/binding/org.openhab.binding.solarlog/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.solarlog/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Solar-Log Binding Bundle-SymbolicName: org.openhab.binding.solarlog;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: . Import-Package: diff --git a/addons/binding/org.openhab.binding.solarlog/pom.xml b/addons/binding/org.openhab.binding.solarlog/pom.xml index e4a08f150b622..4c226b9cdcf83 100644 --- a/addons/binding/org.openhab.binding.solarlog/pom.xml +++ b/addons/binding/org.openhab.binding.solarlog/pom.xml @@ -1,17 +1,16 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding org.openhab.binding.solarlog - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT eclipse-plugin Solar-Log Binding diff --git a/addons/binding/org.openhab.binding.somfytahoma/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.somfytahoma/META-INF/MANIFEST.MF index 87d7dc001bb24..14a66d3f75e99 100644 --- a/addons/binding/org.openhab.binding.somfytahoma/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.somfytahoma/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: SomfyTahoma Binding Bundle-SymbolicName: org.openhab.binding.somfytahoma;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: . Import-Package: com.google.gson, diff --git a/addons/binding/org.openhab.binding.somfytahoma/pom.xml b/addons/binding/org.openhab.binding.somfytahoma/pom.xml index 3f0bb6c32cfd3..004f789bc8db6 100644 --- a/addons/binding/org.openhab.binding.somfytahoma/pom.xml +++ b/addons/binding/org.openhab.binding.somfytahoma/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.somfytahoma diff --git a/addons/binding/org.openhab.binding.squeezebox/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.squeezebox/META-INF/MANIFEST.MF index 2ac0264f82603..2bad8c9e62926 100644 --- a/addons/binding/org.openhab.binding.squeezebox/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.squeezebox/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Name: SqueezeBox Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.squeezebox;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.gson, org.apache.commons.lang, diff --git a/addons/binding/org.openhab.binding.squeezebox/pom.xml b/addons/binding/org.openhab.binding.squeezebox/pom.xml index 72d5029586c04..e7df0e6e5060a 100644 --- a/addons/binding/org.openhab.binding.squeezebox/pom.xml +++ b/addons/binding/org.openhab.binding.squeezebox/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.squeezebox diff --git a/addons/binding/org.openhab.binding.synopanalyzer/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.synopanalyzer/META-INF/MANIFEST.MF index d3035f14584dc..4ef8ce948f03c 100644 --- a/addons/binding/org.openhab.binding.synopanalyzer/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.synopanalyzer/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Bundle-Name: Synop Analyzer Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.synopanalyzer;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: javax.measure, javax.measure.quantity, diff --git a/addons/binding/org.openhab.binding.synopanalyzer/pom.xml b/addons/binding/org.openhab.binding.synopanalyzer/pom.xml index 2886553e9d6d4..b6597d3bb9344 100644 --- a/addons/binding/org.openhab.binding.synopanalyzer/pom.xml +++ b/addons/binding/org.openhab.binding.synopanalyzer/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.synopanalyzer diff --git a/addons/binding/org.openhab.binding.systeminfo.test/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.systeminfo.test/META-INF/MANIFEST.MF index 7df0a0fcf8c6b..bc57dc5f0f3fd 100644 --- a/addons/binding/org.openhab.binding.systeminfo.test/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.systeminfo.test/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Name: Systeminfo Binding Tests Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.systeminfo.test;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Fragment-Host: org.openhab.binding.systeminfo Import-Package: org.eclipse.jdt.annotation;resolution:=optional, diff --git a/addons/binding/org.openhab.binding.systeminfo.test/pom.xml b/addons/binding/org.openhab.binding.systeminfo.test/pom.xml index d88575072b250..e81bd3a4424bb 100644 --- a/addons/binding/org.openhab.binding.systeminfo.test/pom.xml +++ b/addons/binding/org.openhab.binding.systeminfo.test/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.systeminfo.test diff --git a/addons/binding/org.openhab.binding.systeminfo/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.systeminfo/META-INF/MANIFEST.MF index 8190cd0add48b..0df9eeae363d2 100644 --- a/addons/binding/org.openhab.binding.systeminfo/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.systeminfo/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Bundle-Name: Systeminfo Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.systeminfo;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.common.collect, org.apache.commons.lang, diff --git a/addons/binding/org.openhab.binding.systeminfo/pom.xml b/addons/binding/org.openhab.binding.systeminfo/pom.xml index 2fa1e4b763abe..2f6f313fb561d 100644 --- a/addons/binding/org.openhab.binding.systeminfo/pom.xml +++ b/addons/binding/org.openhab.binding.systeminfo/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.systeminfo diff --git a/addons/binding/org.openhab.binding.tado/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.tado/META-INF/MANIFEST.MF index 46ffaaf11c3e8..c3451a198052f 100644 --- a/addons/binding/org.openhab.binding.tado/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.tado/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Tado Binding Bundle-SymbolicName: org.openhab.binding.tado;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: ., lib/tado-api-client-1.1.jar diff --git a/addons/binding/org.openhab.binding.tado/pom.xml b/addons/binding/org.openhab.binding.tado/pom.xml index d4aa31259c2c4..cc6904b7147b2 100644 --- a/addons/binding/org.openhab.binding.tado/pom.xml +++ b/addons/binding/org.openhab.binding.tado/pom.xml @@ -1,17 +1,16 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding org.openhab.binding.tado - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT eclipse-plugin Tado Binding diff --git a/addons/binding/org.openhab.binding.tankerkoenig/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.tankerkoenig/META-INF/MANIFEST.MF index 8175c818eb687..5398db193a330 100644 --- a/addons/binding/org.openhab.binding.tankerkoenig/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.tankerkoenig/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: Tankerkoenig Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.tankerkoenig;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.gson, org.apache.commons.io, diff --git a/addons/binding/org.openhab.binding.tankerkoenig/pom.xml b/addons/binding/org.openhab.binding.tankerkoenig/pom.xml index abc51d01e93dd..d67fc79f8a2a5 100644 --- a/addons/binding/org.openhab.binding.tankerkoenig/pom.xml +++ b/addons/binding/org.openhab.binding.tankerkoenig/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.tankerkoenig diff --git a/addons/binding/org.openhab.binding.tellstick/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.tellstick/META-INF/MANIFEST.MF index 9ea914bb07845..a8a05f62bff84 100755 --- a/addons/binding/org.openhab.binding.tellstick/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.tellstick/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Bundle-Name: Tellstick Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.tellstick;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.common.collect, com.sun.jna, diff --git a/addons/binding/org.openhab.binding.tellstick/pom.xml b/addons/binding/org.openhab.binding.tellstick/pom.xml index 0391ee834c42e..1758208e347c8 100755 --- a/addons/binding/org.openhab.binding.tellstick/pom.xml +++ b/addons/binding/org.openhab.binding.tellstick/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.tellstick diff --git a/addons/binding/org.openhab.binding.tesla/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.tesla/META-INF/MANIFEST.MF index aa32e569ae9c3..ca3c963eebe45 100644 --- a/addons/binding/org.openhab.binding.tesla/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.tesla/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: Tesla Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.tesla;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Export-Package: org.openhab.binding.tesla, org.openhab.binding.tesla.handler diff --git a/addons/binding/org.openhab.binding.tesla/pom.xml b/addons/binding/org.openhab.binding.tesla/pom.xml index 07ac4d1d91aa8..67267835130a7 100644 --- a/addons/binding/org.openhab.binding.tesla/pom.xml +++ b/addons/binding/org.openhab.binding.tesla/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.tesla diff --git a/addons/binding/org.openhab.binding.toon/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.toon/META-INF/MANIFEST.MF index 1cb42eb08a63a..460d4dcb417a6 100644 --- a/addons/binding/org.openhab.binding.toon/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.toon/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: Toon Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.toon;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.gson, javax.ws.rs.client, diff --git a/addons/binding/org.openhab.binding.toon/pom.xml b/addons/binding/org.openhab.binding.toon/pom.xml index 9e4b74f5d0b6f..e7a542e5f49af 100644 --- a/addons/binding/org.openhab.binding.toon/pom.xml +++ b/addons/binding/org.openhab.binding.toon/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.toon diff --git a/addons/binding/org.openhab.binding.tplinksmarthome.test/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.tplinksmarthome.test/META-INF/MANIFEST.MF index 7125d2497c1f0..64eff8b42905f 100644 --- a/addons/binding/org.openhab.binding.tplinksmarthome.test/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.tplinksmarthome.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: TPLinkSmartHome.test Binding Tests Bundle-SymbolicName: org.openhab.binding.tplinksmarthome.test;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Fragment-Host: org.openhab.binding.tplinksmarthome Import-Package: org.apache.commons.io, diff --git a/addons/binding/org.openhab.binding.tplinksmarthome.test/pom.xml b/addons/binding/org.openhab.binding.tplinksmarthome.test/pom.xml index e4a724740f86e..50c7e474ddc17 100644 --- a/addons/binding/org.openhab.binding.tplinksmarthome.test/pom.xml +++ b/addons/binding/org.openhab.binding.tplinksmarthome.test/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.tplinksmarthome.test diff --git a/addons/binding/org.openhab.binding.tplinksmarthome/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.tplinksmarthome/META-INF/MANIFEST.MF index 7909c8d41099d..9d54fec32bfa2 100644 --- a/addons/binding/org.openhab.binding.tplinksmarthome/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.tplinksmarthome/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: TPLinkSmartHome Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.tplinksmarthome;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.gson, com.google.gson.annotations, com.google.gson.reflect, diff --git a/addons/binding/org.openhab.binding.tplinksmarthome/pom.xml b/addons/binding/org.openhab.binding.tplinksmarthome/pom.xml index 28721170e1129..96258543cf358 100644 --- a/addons/binding/org.openhab.binding.tplinksmarthome/pom.xml +++ b/addons/binding/org.openhab.binding.tplinksmarthome/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.tplinksmarthome diff --git a/addons/binding/org.openhab.binding.unifi/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.unifi/META-INF/MANIFEST.MF index 09aa57d82b0aa..e67b1a81877f0 100644 --- a/addons/binding/org.openhab.binding.unifi/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.unifi/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Name: UniFi Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.unifi;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.gson, com.google.gson.annotations, diff --git a/addons/binding/org.openhab.binding.unifi/pom.xml b/addons/binding/org.openhab.binding.unifi/pom.xml index ecb411c54978b..9b638406e7138 100644 --- a/addons/binding/org.openhab.binding.unifi/pom.xml +++ b/addons/binding/org.openhab.binding.unifi/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.unifi diff --git a/addons/binding/org.openhab.binding.urtsi/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.urtsi/META-INF/MANIFEST.MF index 5e31b1a866574..1dda3e9fd37a5 100644 --- a/addons/binding/org.openhab.binding.urtsi/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.urtsi/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: Urtsi Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.urtsi;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.common.base, com.google.common.collect, diff --git a/addons/binding/org.openhab.binding.urtsi/pom.xml b/addons/binding/org.openhab.binding.urtsi/pom.xml index fea1f22177e81..d792dd6541aae 100644 --- a/addons/binding/org.openhab.binding.urtsi/pom.xml +++ b/addons/binding/org.openhab.binding.urtsi/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.urtsi diff --git a/addons/binding/org.openhab.binding.valloxmv/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.valloxmv/META-INF/MANIFEST.MF index 9ada3c04aec3f..24d55774a3add 100644 --- a/addons/binding/org.openhab.binding.valloxmv/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.valloxmv/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: ValloxMV Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.valloxmv;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: javax.measure, javax.measure.quantity, diff --git a/addons/binding/org.openhab.binding.valloxmv/pom.xml b/addons/binding/org.openhab.binding.valloxmv/pom.xml index 71fda2cbbd462..b9b5ad197d8c8 100644 --- a/addons/binding/org.openhab.binding.valloxmv/pom.xml +++ b/addons/binding/org.openhab.binding.valloxmv/pom.xml @@ -1,17 +1,15 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.valloxmv - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT ValloxMV Binding eclipse-plugin diff --git a/addons/binding/org.openhab.binding.velbus/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.velbus/META-INF/MANIFEST.MF index 905845c204648..e66606b0742de 100644 --- a/addons/binding/org.openhab.binding.velbus/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.velbus/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: Velbus Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.velbus;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: gnu.io, javax.measure.quantity, diff --git a/addons/binding/org.openhab.binding.velbus/pom.xml b/addons/binding/org.openhab.binding.velbus/pom.xml index b8e20ba716aa7..2d8868833418f 100644 --- a/addons/binding/org.openhab.binding.velbus/pom.xml +++ b/addons/binding/org.openhab.binding.velbus/pom.xml @@ -1,16 +1,15 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.velbus - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT eclipse-plugin Velbus Binding diff --git a/addons/binding/org.openhab.binding.vitotronic/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.vitotronic/META-INF/MANIFEST.MF index 48450ec9960b5..0324e952e8e6e 100644 --- a/addons/binding/org.openhab.binding.vitotronic/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.vitotronic/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Name: Vitotronic Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.vitotronic;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Export-Package: org.openhab.binding.vitotronic, org.openhab.binding.vitotronic.handler diff --git a/addons/binding/org.openhab.binding.vitotronic/pom.xml b/addons/binding/org.openhab.binding.vitotronic/pom.xml index 590cb119a7d5b..3ff738dad9767 100644 --- a/addons/binding/org.openhab.binding.vitotronic/pom.xml +++ b/addons/binding/org.openhab.binding.vitotronic/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.vitotronic diff --git a/addons/binding/org.openhab.binding.wifiled.test/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.wifiled.test/META-INF/MANIFEST.MF index 3d79171210812..9c79c35fbe2be 100644 --- a/addons/binding/org.openhab.binding.wifiled.test/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.wifiled.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: WifiLED Binding Tests Bundle-SymbolicName: org.openhab.binding.wifiled.test;singleton:=true Bundle-Vendor: openHAB Fragment-Host: org.openhab.binding.wifiled -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.jdt.annotation;resolution:=optional, diff --git a/addons/binding/org.openhab.binding.wifiled.test/pom.xml b/addons/binding/org.openhab.binding.wifiled.test/pom.xml index c0d7a70e5ecac..7186174982628 100644 --- a/addons/binding/org.openhab.binding.wifiled.test/pom.xml +++ b/addons/binding/org.openhab.binding.wifiled.test/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.wifiled.test diff --git a/addons/binding/org.openhab.binding.wifiled/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.wifiled/META-INF/MANIFEST.MF index 8631e70032e1a..8aa5490ce5aec 100644 --- a/addons/binding/org.openhab.binding.wifiled/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.wifiled/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: WiFiLED Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.wifiled;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: org.eclipse.jdt.annotation;resolution:=optional, org.eclipse.smarthome.config.core, diff --git a/addons/binding/org.openhab.binding.wifiled/pom.xml b/addons/binding/org.openhab.binding.wifiled/pom.xml index 79c96a6f3173f..38d350e23beeb 100644 --- a/addons/binding/org.openhab.binding.wifiled/pom.xml +++ b/addons/binding/org.openhab.binding.wifiled/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.wifiled diff --git a/addons/binding/org.openhab.binding.windcentrale/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.windcentrale/META-INF/MANIFEST.MF index a391e3394685b..f2c647bf0f9c7 100644 --- a/addons/binding/org.openhab.binding.windcentrale/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.windcentrale/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: Windcentrale Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.windcentrale;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.gson, javax.measure.quantity, diff --git a/addons/binding/org.openhab.binding.windcentrale/pom.xml b/addons/binding/org.openhab.binding.windcentrale/pom.xml index 3d776fb14086c..6902ae1705a47 100644 --- a/addons/binding/org.openhab.binding.windcentrale/pom.xml +++ b/addons/binding/org.openhab.binding.windcentrale/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.windcentrale diff --git a/addons/binding/org.openhab.binding.yamahareceiver.test/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.yamahareceiver.test/META-INF/MANIFEST.MF index aef0781d217a0..62527e62e7468 100644 --- a/addons/binding/org.openhab.binding.yamahareceiver.test/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.yamahareceiver.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: YamahaReceiver Binding Tests Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.yamahareceiver.test;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Fragment-Host: org.openhab.binding.yamahareceiver Import-Package: org.apache.commons.io, diff --git a/addons/binding/org.openhab.binding.yamahareceiver.test/pom.xml b/addons/binding/org.openhab.binding.yamahareceiver.test/pom.xml index 9121713049902..33b226cc795f3 100644 --- a/addons/binding/org.openhab.binding.yamahareceiver.test/pom.xml +++ b/addons/binding/org.openhab.binding.yamahareceiver.test/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 pom org.openhab.binding - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding diff --git a/addons/binding/org.openhab.binding.yamahareceiver/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.yamahareceiver/META-INF/MANIFEST.MF index 500199e7fde32..0e4087213c00f 100644 --- a/addons/binding/org.openhab.binding.yamahareceiver/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.yamahareceiver/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: YamahaReceiver Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.yamahareceiver;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: javax.xml.parsers, org.apache.commons.lang, diff --git a/addons/binding/org.openhab.binding.yamahareceiver/pom.xml b/addons/binding/org.openhab.binding.yamahareceiver/pom.xml index 0a36eeca02b2b..22f0e96f178b1 100644 --- a/addons/binding/org.openhab.binding.yamahareceiver/pom.xml +++ b/addons/binding/org.openhab.binding.yamahareceiver/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.yamahareceiver diff --git a/addons/binding/org.openhab.binding.yeelight/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.yeelight/META-INF/MANIFEST.MF index be517ced21fe0..7249a76b05eeb 100644 --- a/addons/binding/org.openhab.binding.yeelight/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.yeelight/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Yeelight Binding Bundle-SymbolicName: org.openhab.binding.yeelight;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.google.gson, diff --git a/addons/binding/org.openhab.binding.yeelight/pom.xml b/addons/binding/org.openhab.binding.yeelight/pom.xml index 320e9c7d8dec3..65bcc494f7354 100644 --- a/addons/binding/org.openhab.binding.yeelight/pom.xml +++ b/addons/binding/org.openhab.binding.yeelight/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.yeelight diff --git a/addons/binding/org.openhab.binding.zoneminder/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.zoneminder/META-INF/MANIFEST.MF index ab2b960b1d131..ff63af1630f93 100644 --- a/addons/binding/org.openhab.binding.zoneminder/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.zoneminder/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Bundle-Name: ZoneMinder Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.zoneminder;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Export-Package: org.openhab.binding.zoneminder, org.openhab.binding.zoneminder.handler diff --git a/addons/binding/org.openhab.binding.zoneminder/pom.xml b/addons/binding/org.openhab.binding.zoneminder/pom.xml index fe895da95023a..c7eda54d53c93 100644 --- a/addons/binding/org.openhab.binding.zoneminder/pom.xml +++ b/addons/binding/org.openhab.binding.zoneminder/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.zoneminder diff --git a/addons/binding/org.openhab.binding.zway/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.zway/META-INF/MANIFEST.MF index 2e0702b0225e4..551af5712232b 100644 --- a/addons/binding/org.openhab.binding.zway/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.zway/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Bundle-Name: ZWay Binding Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.zway;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.common.collect, com.google.gson, diff --git a/addons/binding/org.openhab.binding.zway/pom.xml b/addons/binding/org.openhab.binding.zway/pom.xml index 5ce108dbc0eac..714148526d380 100644 --- a/addons/binding/org.openhab.binding.zway/pom.xml +++ b/addons/binding/org.openhab.binding.zway/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.binding pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.binding.zway diff --git a/addons/binding/pom.xml b/addons/binding/pom.xml index 8ac650d11cf73..1bc34b5785633 100644 --- a/addons/binding/pom.xml +++ b/addons/binding/pom.xml @@ -1,5 +1,4 @@ - - + 4.0.0 diff --git a/addons/io/org.openhab.io.azureiothub/META-INF/MANIFEST.MF b/addons/io/org.openhab.io.azureiothub/META-INF/MANIFEST.MF index 261136e016cdd..fa9c216f4ab6e 100644 --- a/addons/io/org.openhab.io.azureiothub/META-INF/MANIFEST.MF +++ b/addons/io/org.openhab.io.azureiothub/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Azure IoT Hub Connector Bundle-SymbolicName: org.openhab.io.azureiothub;singleton:=true -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Service-Component: OSGI-INF/*.xml Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: diff --git a/addons/io/org.openhab.io.azureiothub/pom.xml b/addons/io/org.openhab.io.azureiothub/pom.xml index 306799f3bfe6e..428ce76ef0fcc 100644 --- a/addons/io/org.openhab.io.azureiothub/pom.xml +++ b/addons/io/org.openhab.io.azureiothub/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.io pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.io.azureiothub diff --git a/addons/io/org.openhab.io.homekit/META-INF/MANIFEST.MF b/addons/io/org.openhab.io.homekit/META-INF/MANIFEST.MF index 9396e58ab20bb..9bbc63b5182ad 100644 --- a/addons/io/org.openhab.io.homekit/META-INF/MANIFEST.MF +++ b/addons/io/org.openhab.io.homekit/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Bundle-Name: HomeKit Integration Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.io.homekit;singleton:=true Bundle-Vendor: openhab.org -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Export-Package: org.openhab.io.homekit Import-Package: com.google.common.collect, diff --git a/addons/io/org.openhab.io.homekit/pom.xml b/addons/io/org.openhab.io.homekit/pom.xml index 93b402164a339..e5776a15c8c5f 100644 --- a/addons/io/org.openhab.io.homekit/pom.xml +++ b/addons/io/org.openhab.io.homekit/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.io pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.io.homekit diff --git a/addons/io/org.openhab.io.hueemulation.test/META-INF/MANIFEST.MF b/addons/io/org.openhab.io.hueemulation.test/META-INF/MANIFEST.MF index 98ea10a246e72..95b8f619d3004 100644 --- a/addons/io/org.openhab.io.hueemulation.test/META-INF/MANIFEST.MF +++ b/addons/io/org.openhab.io.hueemulation.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: Hue Emulation Service Tests Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.io.hueemulation.test;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Fragment-Host: org.openhab.io.hueemulation Import-Package: com.google.gson, diff --git a/addons/io/org.openhab.io.hueemulation.test/pom.xml b/addons/io/org.openhab.io.hueemulation.test/pom.xml index bff4e166a8461..4d1979a0b6f54 100644 --- a/addons/io/org.openhab.io.hueemulation.test/pom.xml +++ b/addons/io/org.openhab.io.hueemulation.test/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.io pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.io.hueemulation.test diff --git a/addons/io/org.openhab.io.hueemulation.test/src/test/java/org/openhab/io/hueemulation/internal/HueRestAPITest.java b/addons/io/org.openhab.io.hueemulation.test/src/test/java/org/openhab/io/hueemulation/internal/HueRestAPITest.java index 1104855d1df2a..ad4fe05c5c5bc 100644 --- a/addons/io/org.openhab.io.hueemulation.test/src/test/java/org/openhab/io/hueemulation/internal/HueRestAPITest.java +++ b/addons/io/org.openhab.io.hueemulation.test/src/test/java/org/openhab/io/hueemulation/internal/HueRestAPITest.java @@ -161,4 +161,26 @@ public void changeOnAndBriValues() throws IOException { assertThat(((HueStateColorBulb) ds.lights.get(2).state).on, is(true)); assertThat(((HueStateColorBulb) ds.lights.get(2).state).bri, is(200)); } + + @Test + public void switchOnWithXY() throws IOException { + ds.config.whitelist.put("testuser", new HueUserAuth("testuser")); + + assertThat(((HueStateColorBulb) ds.lights.get(2).state).on, is(false)); + assertThat(((HueStateColorBulb) ds.lights.get(2).state).bri, is(0)); + + String body = "{'on':true,'bri':200,'xy':[0.5119,0.4147]}"; + StringWriter out = new StringWriter(); + int result = restAPI.handle(HttpMethod.PUT, body, out, Paths.get("/api/testuser/lights/2/state"), false); + assertEquals(200, result); + assertThat(out.toString(), containsString("success")); + assertThat(((HueStateColorBulb) ds.lights.get(2).state).on, is(true)); + assertThat(((HueStateColorBulb) ds.lights.get(2).state).bri, is(200)); + assertThat(((HueStateColorBulb) ds.lights.get(2).state).xy[0], is(0.5119)); + assertThat(((HueStateColorBulb) ds.lights.get(2).state).xy[1], is(0.4147)); + assertThat(((HueStateColorBulb) ds.lights.get(2).state).colormode, is(HueStateColorBulb.ColorMode.xy)); + assertThat(((HueStateColorBulb) ds.lights.get(2).state).toHSBType().getHue().intValue(), is((int)27.47722590981918)); + assertThat(((HueStateColorBulb) ds.lights.get(2).state).toHSBType().getSaturation().intValue(), is(88)); + assertThat(((HueStateColorBulb) ds.lights.get(2).state).toHSBType().getBrightness().intValue(), is(78)); + } } diff --git a/addons/io/org.openhab.io.hueemulation/META-INF/MANIFEST.MF b/addons/io/org.openhab.io.hueemulation/META-INF/MANIFEST.MF index 69eaf9706ef46..374a554e43c5d 100644 --- a/addons/io/org.openhab.io.hueemulation/META-INF/MANIFEST.MF +++ b/addons/io/org.openhab.io.hueemulation/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Name: Hue Emulation Service Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.io.hueemulation;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.gson, com.google.gson.reflect, diff --git a/addons/io/org.openhab.io.hueemulation/pom.xml b/addons/io/org.openhab.io.hueemulation/pom.xml index 52b80af71feee..58bd6b46d8536 100644 --- a/addons/io/org.openhab.io.hueemulation/pom.xml +++ b/addons/io/org.openhab.io.hueemulation/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.io pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.io.hueemulation diff --git a/addons/io/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/dto/HueDevice.java b/addons/io/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/dto/HueDevice.java index 40a61aa7e0d53..baaeef0c0866c 100644 --- a/addons/io/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/dto/HueDevice.java +++ b/addons/io/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/dto/HueDevice.java @@ -27,6 +27,7 @@ * * @author Dan Cunningham - Initial contribution * @author David Graeff - Color lights and plugs + * @author Florian Lentz - XY Support */ @NonNullByDefault public class HueDevice { @@ -222,7 +223,7 @@ private T as(Class type) throws ClassCastExcepti try { if (as(HueStateBulb.class).bri != newState.bri) { as(HueStateBulb.class).bri = newState.bri; - command = new PercentType(newState.bri * 100 / HueStateBulb.MAX_BRI); + command = new PercentType((int) (newState.bri * 100.0 / HueStateBulb.MAX_BRI + 0.5)); } successApplied.put("bri", newState.bri); } catch (ClassCastException e) { @@ -234,12 +235,14 @@ private T as(Class type) throws ClassCastExcepti try { int newBri = as(HueStateBulb.class).bri + newState.bri_inc; if (newBri < 0 || newBri > HueStateBulb.MAX_BRI) { - throw new ClassCastException(); + throw new IllegalArgumentException(); } - command = new PercentType(newBri * 100 / HueStateBulb.MAX_BRI); + command = new PercentType((int) (newBri * 100.0 / HueStateBulb.MAX_BRI + 0.5)); successApplied.put("bri", newState.bri); } catch (ClassCastException e) { errorApplied.add("bri_inc"); + } catch (IllegalArgumentException e) { + errorApplied.add("bri_inc"); } } @@ -261,7 +264,7 @@ private T as(Class type) throws ClassCastExcepti HueStateColorBulb c = as(HueStateColorBulb.class); int newV = c.sat + newState.sat_inc; if (newV < 0 || newV > HueStateColorBulb.MAX_SAT) { - throw new ClassCastException(); + throw new IllegalArgumentException(); } c.colormode = ColorMode.hs; c.sat = newV; @@ -269,6 +272,8 @@ private T as(Class type) throws ClassCastExcepti successApplied.put("sat", newState.sat); } catch (ClassCastException e) { errorApplied.add("sat_inc"); + } catch (IllegalArgumentException e) { + errorApplied.add("sat_inc"); } } @@ -289,7 +294,7 @@ private T as(Class type) throws ClassCastExcepti HueStateColorBulb c = as(HueStateColorBulb.class); int newV = c.hue + newState.hue_inc; if (newV < 0 || newV > HueStateColorBulb.MAX_HUE) { - throw new ClassCastException(); + throw new IllegalArgumentException(); } c.colormode = ColorMode.hs; c.hue = newV; @@ -297,6 +302,8 @@ private T as(Class type) throws ClassCastExcepti successApplied.put("hue", newState.hue); } catch (ClassCastException e) { errorApplied.add("hue_inc"); + } catch (IllegalArgumentException e) { + errorApplied.add("hue_inc"); } } @@ -352,10 +359,37 @@ private T as(Class type) throws ClassCastExcepti successApplied.put("effect", newState.effect); // Pretend that worked } if (newState.xy != null) { - errorApplied.add("xy"); + try { + HueStateColorBulb c = as(HueStateColorBulb.class); + c.colormode = ColorMode.xy; + c.bri = as(HueStateBulb.class).bri; + c.xy[0] = newState.xy.get(0); + c.xy[1] = newState.xy.get(1); + command = c.toHSBType(); + successApplied.put("xy", newState.xy); + } catch (ClassCastException e) { + errorApplied.add("xy"); + } } if (newState.xy_inc != null) { - errorApplied.add("xy_inc"); + try { + HueStateColorBulb c = as(HueStateColorBulb.class); + double newX = c.xy[0] + newState.xy_inc.get(0); + double newY = c.xy[1] + newState.xy_inc.get(1); + if (newX < 0 || newX > 1 || newY < 0 || newY > 1) { + throw new IllegalArgumentException(); + } + c.colormode = ColorMode.xy; + c.bri = as(HueStateBulb.class).bri; + c.xy[0] = newX; + c.xy[1] = newY; + command = c.toHSBType(); + successApplied.put("xy", newState.xy_inc); + } catch (ClassCastException e) { + errorApplied.add("xy_inc"); + } catch (IllegalArgumentException e) { + errorApplied.add("xy_inc"); + } } return command; diff --git a/addons/io/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/dto/HueStateBulb.java b/addons/io/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/dto/HueStateBulb.java index db48e25e27edd..afaa65463c29f 100644 --- a/addons/io/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/dto/HueStateBulb.java +++ b/addons/io/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/dto/HueStateBulb.java @@ -43,7 +43,7 @@ public HueStateBulb(boolean on) { */ public HueStateBulb(PercentType brightness, boolean on) { super(on); - this.bri = brightness.intValue() * MAX_BRI / 100; + this.bri = (int) (brightness.intValue() * MAX_BRI / 100.0 + 0.5); } @Override diff --git a/addons/io/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/dto/HueStateColorBulb.java b/addons/io/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/dto/HueStateColorBulb.java index f8829fc090889..933ec2e6f12bd 100644 --- a/addons/io/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/dto/HueStateColorBulb.java +++ b/addons/io/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/dto/HueStateColorBulb.java @@ -17,6 +17,7 @@ * * @author Dan Cunningham - Initial contribution * @author David Graeff - "extended color light bulbs" support + * @author Florian Lentz - added xy support * */ public class HueStateColorBulb extends HueStateBulb { @@ -68,9 +69,9 @@ public HueStateColorBulb(PercentType brightness, boolean on) { */ public HueStateColorBulb(HSBType hsb) { super(hsb.getBrightness().intValue() > 0); - this.hue = hsb.getHue().intValue() * MAX_HUE / 360; - this.sat = hsb.getSaturation().intValue() * MAX_SAT / 100; - this.bri = hsb.getBrightness().intValue() * MAX_BRI / 100; + this.hue = (int) (hsb.getHue().intValue() * MAX_HUE / 360.0 + 0.5); + this.sat = (int) (hsb.getSaturation().intValue() * MAX_SAT / 100.0 + 0.5); + this.bri = (int) (hsb.getBrightness().intValue() * MAX_BRI / 100.0 + 0.5); colormode = this.sat > 0 ? ColorMode.hs : ColorMode.ct; } @@ -78,17 +79,65 @@ public HueStateColorBulb(HSBType hsb) { * Converts this HueState to a HSBType */ public HSBType toHSBType() { - int bri = this.bri * 100 / MAX_BRI; - int sat = this.sat * 100 / MAX_SAT; - int hue = this.hue * 360 / MAX_HUE; - - if (!this.on) { - bri = 0; - } - if (colormode == ColorMode.ct) { - sat = 0; + if (colormode == ColorMode.xy) { + int i; + double d = this.xy[0]; + d = this.xy[1]; + double y = ((double) this.bri) / 100.0d; + double x = (y / this.xy[1]) * this.xy[0]; + double z = (y / this.xy[1]) * ((1.0d - this.xy[0]) - this.xy[1]); + int r = (int) (Math.abs(((1.4628067016601562d * x) - (0.18406230211257935d * y)) - (0.2743605971336365d * z)) * 255.0d); + int g = (int) (Math.abs((((-x) * 0.5217933058738708d) + (1.4472380876541138d * y)) + (0.06772270053625107d * z)) * 255.0d); + int b = (int) (Math.abs(((0.03493420034646988d * x) - (0.09689299762248993d * y)) + (1.288409948348999d * z)) * 255.0d); + if (r < g) { + i = r; + } else { + i = g; + } + double minValue = i; + if (minValue >= b) { + minValue = b; + } + double maxValue = (r > g ? r : g); + if (maxValue <= b) { + maxValue = b; + } + double delta = maxValue - minValue; + if (maxValue <= 0.0d) { + return new HSBType(new DecimalType(0), new PercentType(100), new PercentType((this.bri * 100) / MAX_BRI)); + } + double h; + if (((double) r) >= maxValue) { + h = ((double) (g - b)) / delta; + } else if (((double) g) >= maxValue) { + h = 2.0d + (((double) (b - r)) / delta); + } else { + h = 4.0d + (((double) (r - g)) / delta); + } + h *= 60.0d; + if (h < 0.0d) { + h += 360.0d; + } + double hueSat = Math.floor((delta / maxValue) * 254.0d); + int percentSat = (int) ((100.0d * hueSat) / ((double) MAX_SAT)); + if (!this.on) { + this.bri = 0; + } + return new HSBType(new DecimalType((Math.floor(182.04d * h) * 360.0d) / ((double) MAX_HUE)), new PercentType(percentSat), new PercentType((this.bri * 100) / MAX_BRI)); + + } else { + int bri = this.bri * 100 / MAX_BRI; + int sat = this.sat * 100 / MAX_SAT; + int hue = this.hue * 360 / MAX_HUE; + + if (!this.on) { + bri = 0; + } + if (colormode == ColorMode.ct) { + sat = 0; + } + return new HSBType(new DecimalType(hue), new PercentType(sat), new PercentType(bri)); } - return new HSBType(new DecimalType(hue), new PercentType(sat), new PercentType(bri)); } @Override diff --git a/addons/io/org.openhab.io.imperihome/META-INF/MANIFEST.MF b/addons/io/org.openhab.io.imperihome/META-INF/MANIFEST.MF index 46abafed630be..4f3d6da53ea50 100644 --- a/addons/io/org.openhab.io.imperihome/META-INF/MANIFEST.MF +++ b/addons/io/org.openhab.io.imperihome/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: ImperiHome Integration Service Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.io.imperihome;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.google.common.base, com.google.gson, diff --git a/addons/io/org.openhab.io.imperihome/pom.xml b/addons/io/org.openhab.io.imperihome/pom.xml index 5271f12f14208..f31d8d1442582 100644 --- a/addons/io/org.openhab.io.imperihome/pom.xml +++ b/addons/io/org.openhab.io.imperihome/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.io pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.io.imperihome diff --git a/addons/io/org.openhab.io.neeo/META-INF/MANIFEST.MF b/addons/io/org.openhab.io.neeo/META-INF/MANIFEST.MF index 1a462bd51076d..8e3496f0da761 100644 --- a/addons/io/org.openhab.io.neeo/META-INF/MANIFEST.MF +++ b/addons/io/org.openhab.io.neeo/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Neeo Integration Bundle-SymbolicName: org.openhab.io.neeo;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: . Import-Package: diff --git a/addons/io/org.openhab.io.neeo/pom.xml b/addons/io/org.openhab.io.neeo/pom.xml index e65445f802075..3c2b517b617fa 100644 --- a/addons/io/org.openhab.io.neeo/pom.xml +++ b/addons/io/org.openhab.io.neeo/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 pom org.openhab.io - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.io.neeo diff --git a/addons/io/org.openhab.io.openhabcloud/META-INF/MANIFEST.MF b/addons/io/org.openhab.io.openhabcloud/META-INF/MANIFEST.MF index 938976c1d3f53..fc64711293c9c 100644 --- a/addons/io/org.openhab.io.openhabcloud/META-INF/MANIFEST.MF +++ b/addons/io/org.openhab.io.openhabcloud/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Bundle-Name: openHAB Cloud Connector Bundle Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.io.openhabcloud Bundle-Vendor: openHAB.org -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Export-Package: org.openhab.io.openhabcloud Ignore-Package: org.openhab.io.openhabcloud.internal Import-Package: diff --git a/addons/io/org.openhab.io.openhabcloud/pom.xml b/addons/io/org.openhab.io.openhabcloud/pom.xml index 3b68ea25dc878..c76236e2c1d50 100644 --- a/addons/io/org.openhab.io.openhabcloud/pom.xml +++ b/addons/io/org.openhab.io.openhabcloud/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.io pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.io.openhabcloud diff --git a/addons/io/org.openhab.io.transport.feed/META-INF/MANIFEST.MF b/addons/io/org.openhab.io.transport.feed/META-INF/MANIFEST.MF index fc314459dabf4..bed8b856cf970 100644 --- a/addons/io/org.openhab.io.transport.feed/META-INF/MANIFEST.MF +++ b/addons/io/org.openhab.io.transport.feed/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: Feed Transport bundle Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.io.transport.feed Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Export-Package: com.rometools.rome.feed, com.rometools.rome.feed.atom, diff --git a/addons/io/org.openhab.io.transport.feed/pom.xml b/addons/io/org.openhab.io.transport.feed/pom.xml index 5caa5c9406593..09c0ee9d90c06 100644 --- a/addons/io/org.openhab.io.transport.feed/pom.xml +++ b/addons/io/org.openhab.io.transport.feed/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.io pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.io.transport.feed diff --git a/addons/io/org.openhab.io.transport.modbus.test/META-INF/MANIFEST.MF b/addons/io/org.openhab.io.transport.modbus.test/META-INF/MANIFEST.MF index 9d366bcf35a71..f3639bb5a6d75 100644 --- a/addons/io/org.openhab.io.transport.modbus.test/META-INF/MANIFEST.MF +++ b/addons/io/org.openhab.io.transport.modbus.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Fragment-Host: org.openhab.io.transport.modbus Bundle-Name: Modbus Binding Tests Bundle-SymbolicName: org.openhab.io.transport.modbus.test;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.google.common.collect, net.bytebuddy.dynamic.loading, diff --git a/addons/io/org.openhab.io.transport.modbus.test/pom.xml b/addons/io/org.openhab.io.transport.modbus.test/pom.xml index b4bc366f22f3d..031d84996543e 100644 --- a/addons/io/org.openhab.io.transport.modbus.test/pom.xml +++ b/addons/io/org.openhab.io.transport.modbus.test/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.io pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.io.transport.modbus.test diff --git a/addons/io/org.openhab.io.transport.modbus/META-INF/MANIFEST.MF b/addons/io/org.openhab.io.transport.modbus/META-INF/MANIFEST.MF index a517b98f220bb..b7610961dd763 100644 --- a/addons/io/org.openhab.io.transport.modbus/META-INF/MANIFEST.MF +++ b/addons/io/org.openhab.io.transport.modbus/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Automatic-Module-Name: org.openhab.io.transport.modbus Bundle-ManifestVersion: 2 Bundle-Name: openHAB MODBUS Transport Bundle Bundle-SymbolicName: org.openhab.io.transport.modbus -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-Vendor: openHAB Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: diff --git a/addons/io/org.openhab.io.transport.modbus/pom.xml b/addons/io/org.openhab.io.transport.modbus/pom.xml index 344aa88482ea4..05bbab67c938f 100644 --- a/addons/io/org.openhab.io.transport.modbus/pom.xml +++ b/addons/io/org.openhab.io.transport.modbus/pom.xml @@ -1,12 +1,10 @@ - - + 4.0.0 org.openhab.io pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.io.transport.modbus diff --git a/addons/io/pom.xml b/addons/io/pom.xml index cf2ee323e1a31..f9493f8cc2e17 100644 --- a/addons/io/pom.xml +++ b/addons/io/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.addons pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.io diff --git a/addons/pom.xml b/addons/pom.xml index fb6ebfebac6e1..a12d4331c2b51 100644 --- a/addons/pom.xml +++ b/addons/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab pom-addons2 - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.addons diff --git a/addons/ui/org.openhab.ui.cometvisu.php/META-INF/MANIFEST.MF b/addons/ui/org.openhab.ui.cometvisu.php/META-INF/MANIFEST.MF index f3f797fbe6942..dc92315885a83 100644 --- a/addons/ui/org.openhab.ui.cometvisu.php/META-INF/MANIFEST.MF +++ b/addons/ui/org.openhab.ui.cometvisu.php/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Name: PHP support for the CometVisu backend Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.ui.cometvisu.php;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: com.caucho.java;version="[4.0,5)", com.caucho.quercus.env;version="[4.0,5)", diff --git a/addons/ui/org.openhab.ui.cometvisu.php/pom.xml b/addons/ui/org.openhab.ui.cometvisu.php/pom.xml index a8e8736258046..02f6b89dc8601 100644 --- a/addons/ui/org.openhab.ui.cometvisu.php/pom.xml +++ b/addons/ui/org.openhab.ui.cometvisu.php/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.ui pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.ui.cometvisu.php diff --git a/addons/ui/org.openhab.ui.cometvisu/META-INF/MANIFEST.MF b/addons/ui/org.openhab.ui.cometvisu/META-INF/MANIFEST.MF index 36683486d9ed4..b0c92c278028b 100644 --- a/addons/ui/org.openhab.ui.cometvisu/META-INF/MANIFEST.MF +++ b/addons/ui/org.openhab.ui.cometvisu/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Bundle-Name: CometVisu backend Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.ui.cometvisu;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Export-Package: org.openhab.ui.cometvisu.php Import-Package: com.google.gson, diff --git a/addons/ui/org.openhab.ui.cometvisu/pom.xml b/addons/ui/org.openhab.ui.cometvisu/pom.xml index 39de90aecb9e7..994a1dd4967cc 100644 --- a/addons/ui/org.openhab.ui.cometvisu/pom.xml +++ b/addons/ui/org.openhab.ui.cometvisu/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.ui pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.ui.cometvisu diff --git a/addons/ui/pom.xml b/addons/ui/pom.xml index 582b0144d7c4c..7d1d0a34dd837 100644 --- a/addons/ui/pom.xml +++ b/addons/ui/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.addons pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.ui diff --git a/addons/voice/org.openhab.voice.googletts/META-INF/MANIFEST.MF b/addons/voice/org.openhab.voice.googletts/META-INF/MANIFEST.MF index 32faeb34dad6b..48379a8bc85c5 100644 --- a/addons/voice/org.openhab.voice.googletts/META-INF/MANIFEST.MF +++ b/addons/voice/org.openhab.voice.googletts/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Name: Google Cloud Text-to-Speech Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.voice.googletts;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Bundle-ClassPath: ., lib/api-common-1.7.0.jar, diff --git a/addons/voice/org.openhab.voice.googletts/pom.xml b/addons/voice/org.openhab.voice.googletts/pom.xml index a09f26a4347f7..3aa21e345a672 100644 --- a/addons/voice/org.openhab.voice.googletts/pom.xml +++ b/addons/voice/org.openhab.voice.googletts/pom.xml @@ -1,13 +1,10 @@ - - + 4.0.0 pom org.openhab.voice - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.voice.googletts diff --git a/addons/voice/org.openhab.voice.marytts/META-INF/MANIFEST.MF b/addons/voice/org.openhab.voice.marytts/META-INF/MANIFEST.MF index ae432e2aaf75d..e751b6e6ade67 100644 --- a/addons/voice/org.openhab.voice.marytts/META-INF/MANIFEST.MF +++ b/addons/voice/org.openhab.voice.marytts/META-INF/MANIFEST.MF @@ -27,7 +27,7 @@ Bundle-Name: Mary Text-to-Speech Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.voice.marytts;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: javax.sound.sampled, org.apache.commons.collections.map, diff --git a/addons/voice/org.openhab.voice.marytts/pom.xml b/addons/voice/org.openhab.voice.marytts/pom.xml index c0f3d6db6a8d2..0ecffb1164d00 100644 --- a/addons/voice/org.openhab.voice.marytts/pom.xml +++ b/addons/voice/org.openhab.voice.marytts/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.voice pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.voice.marytts diff --git a/addons/voice/org.openhab.voice.picotts/META-INF/MANIFEST.MF b/addons/voice/org.openhab.voice.picotts/META-INF/MANIFEST.MF index 69694fb537952..bf1dd11a9adf1 100644 --- a/addons/voice/org.openhab.voice.picotts/META-INF/MANIFEST.MF +++ b/addons/voice/org.openhab.voice.picotts/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: Pico Text-to-Speech Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.voice.picotts;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: org.apache.commons.io, org.eclipse.jdt.annotation;resolution:=optional, diff --git a/addons/voice/org.openhab.voice.picotts/pom.xml b/addons/voice/org.openhab.voice.picotts/pom.xml index b4d0b35b0efeb..08d15f0bce8ae 100644 --- a/addons/voice/org.openhab.voice.picotts/pom.xml +++ b/addons/voice/org.openhab.voice.picotts/pom.xml @@ -1,18 +1,17 @@ - - - - 4.0.0 - - - org.openhab.voice - pom - 2.4.0-SNAPSHOT - - - org.openhab.voice - org.openhab.voice.picotts - - Pico Text-to-Speech - eclipse-plugin - - + + + 4.0.0 + + + org.openhab.voice + pom + 2.5.0-SNAPSHOT + + + org.openhab.voice + org.openhab.voice.picotts + + Pico Text-to-Speech + eclipse-plugin + + diff --git a/addons/voice/org.openhab.voice.voicerss/META-INF/MANIFEST.MF b/addons/voice/org.openhab.voice.voicerss/META-INF/MANIFEST.MF index 3ce714381504e..e26efaa9a7a0b 100644 --- a/addons/voice/org.openhab.voice.voicerss/META-INF/MANIFEST.MF +++ b/addons/voice/org.openhab.voice.voicerss/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Name: VoiceRSS Text-to-Speech Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.voice.voicerss;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 2.5.0.qualifier Import-Package: org.eclipse.jdt.annotation;resolution:=optional, org.eclipse.smarthome.config.core, diff --git a/addons/voice/org.openhab.voice.voicerss/pom.xml b/addons/voice/org.openhab.voice.voicerss/pom.xml index 98d83fffb2ccb..06255c02525e4 100644 --- a/addons/voice/org.openhab.voice.voicerss/pom.xml +++ b/addons/voice/org.openhab.voice.voicerss/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.voice pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.voice.voicerss diff --git a/addons/voice/pom.xml b/addons/voice/pom.xml index d39c9da5c0ad7..829d5f0fb258d 100644 --- a/addons/voice/pom.xml +++ b/addons/voice/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.addons pom - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.voice diff --git a/features/openhab-addons-external/pom.xml b/features/openhab-addons-external/pom.xml index 69c259a1be885..311e087d274a4 100644 --- a/features/openhab-addons-external/pom.xml +++ b/features/openhab-addons-external/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab features - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.addons diff --git a/features/openhab-addons-verify/pom.xml b/features/openhab-addons-verify/pom.xml index 75a08f5338478..9f9f79f150d7f 100644 --- a/features/openhab-addons-verify/pom.xml +++ b/features/openhab-addons-verify/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab features - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.addons diff --git a/features/openhab-addons/pom.xml b/features/openhab-addons/pom.xml index aee2eae3516ee..c52a40a3aa38d 100644 --- a/features/openhab-addons/pom.xml +++ b/features/openhab-addons/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab features - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab.addons diff --git a/features/pom.xml b/features/pom.xml index 045d1f39bf523..fb42ba8015de5 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab pom-addons2 - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.openhab diff --git a/pom.xml b/pom.xml index 6b575913fda95..f0e8e28b04046 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab pom-tycho 2.5.0-SNAPSHOT - + org.openhab diff --git a/tools/checkstyle.properties b/tools/checkstyle.properties index f44514559eeb4..6a96f93209c85 100644 --- a/tools/checkstyle.properties +++ b/tools/checkstyle.properties @@ -1,3 +1,3 @@ checkstyle.headerCheck.content=^/\\*\\*$\\n^ \\* Copyright \\(c\\) {0}-{1} by the respective copyright holders\\.$\\n^ \\*$\\n^ \\* All rights reserved\\. This program and the accompanying materials$\\n^ \\* are made available under the terms of the Eclipse Public License v1\\.0$\\n^ \\* which accompanies this distribution, and is available at$\\n^ \\* http://www.eclipse.org/legal/epl\\-v10\\.html$ checkstyle.headerCheck.values=2010,2018 -checkstyle.pomXmlCheck.currentVersionRegex=^2\.4\.0 +checkstyle.pomXmlCheck.currentVersionRegex=^2\.5\.0