diff --git a/bundles/org.openhab.binding.ferroamp/src/main/feature/feature.xml b/bundles/org.openhab.binding.ferroamp/src/main/feature/feature.xml index bca67f90982..811b2ce24f6 100644 --- a/bundles/org.openhab.binding.ferroamp/src/main/feature/feature.xml +++ b/bundles/org.openhab.binding.ferroamp/src/main/feature/feature.xml @@ -1,16 +1,13 @@ - mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${ohc.version}/xml/features + mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${ohc.version}/xml/features - - openhab-runtime-base - openhab-transport-mqtt - mvn:org.openhab.addons.bundles/org.openhab.binding.mqtt/${project.version} + + openhab-runtime-base + openhab-transport-mqtt + mvn:org.openhab.addons.bundles/org.openhab.binding.mqtt/${project.version} - mvn:org.openhab.addons.bundles/org.openhab.binding.mqtt/${project.version} - mvn:org.openhab.addons.bundles/org.openhab.binding.ferroamp/${project.version} - + mvn:org.openhab.addons.bundles/org.openhab.binding.mqtt/${project.version} + mvn:org.openhab.addons.bundles/org.openhab.binding.ferroamp/${project.version} + - - - diff --git a/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/dto/GetUdc.java b/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/dto/GetUdc.java index 15041941149..f0bdad205bb 100644 --- a/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/dto/GetUdc.java +++ b/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/dto/GetUdc.java @@ -39,4 +39,4 @@ public class GetUdc { public String getNeg() { return neg; } -} \ No newline at end of file +} diff --git a/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/EsmJsonElements.java b/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/EsmJsonElements.java index 7cf27958f81..699c3a1d8c8 100644 --- a/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/EsmJsonElements.java +++ b/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/EsmJsonElements.java @@ -44,4 +44,4 @@ public class EsmJsonElements { jsonElementsEsm.add(new String("ts")); return jsonElementsEsm; } -} \ No newline at end of file +} diff --git a/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/FerroampChannelConfiguration.java b/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/FerroampChannelConfiguration.java index 8513b3f53f5..04a5bbd1de1 100644 --- a/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/FerroampChannelConfiguration.java +++ b/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/FerroampChannelConfiguration.java @@ -364,4 +364,4 @@ public class FerroampChannelConfiguration { new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_REQUESTEXTAPIVERSION, Units.ONE)); return channelConfigurationRequest; } -} \ No newline at end of file +} diff --git a/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/FerroampHandler.java b/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/FerroampHandler.java index e43e276bfe8..b4dd64aef1d 100644 --- a/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/FerroampHandler.java +++ b/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/FerroampHandler.java @@ -275,4 +275,4 @@ public class FerroampHandler extends BaseThingHandler implements MqttMessageSubs } return ferroampConfig.hasBattery; } -} \ No newline at end of file +} diff --git a/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/FerroampHandlerFactory.java b/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/FerroampHandlerFactory.java index 4c5561246ca..b317e8313d3 100644 --- a/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/FerroampHandlerFactory.java +++ b/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/FerroampHandlerFactory.java @@ -1,5 +1,4 @@ /** - /** * Copyright (c) 2010-2024 Contributors to the openHAB project * * See the NOTICE file(s) distributed with this work for additional diff --git a/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/FerroampMqttCommunication.java b/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/FerroampMqttCommunication.java index 646aabc535c..a0dd0f1b384 100644 --- a/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/FerroampMqttCommunication.java +++ b/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/FerroampMqttCommunication.java @@ -739,7 +739,6 @@ public class FerroampMqttCommunication implements MqttMessageSubscriber { esmChannelsUpdateValues = esmChannelPostsValue; } - } public @Nullable static String[] getEhubChannelUpdateValues() { diff --git a/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/SsoParameters.java b/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/SsoParameters.java index d6c27880885..dba7ac760bb 100644 --- a/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/SsoParameters.java +++ b/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/SsoParameters.java @@ -46,4 +46,4 @@ public class SsoParameters { "dc-link-voltage", "timestamp"); return channelParametersSs0; } -} \ No newline at end of file +} diff --git a/bundles/org.openhab.binding.ferroamp/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.ferroamp/src/main/resources/OH-INF/addon/addon.xml index 890710efc7b..2c3f6585313 100644 --- a/bundles/org.openhab.binding.ferroamp/src/main/resources/OH-INF/addon/addon.xml +++ b/bundles/org.openhab.binding.ferroamp/src/main/resources/OH-INF/addon/addon.xml @@ -1,11 +1,11 @@ + xmlns:addon="https://openhab.org/schemas/addon/v1.0.0" + xsi:schemaLocation="https://openhab.org/schemas/addon/v1.0.0 https://openhab.org/schemas/addon-1.0.0.xsd"> - binding - Ferroamp Binding - This is the binding for Ferroamp EnergyHub. - local + binding + Ferroamp Binding + This is the binding for Ferroamp EnergyHub. + local diff --git a/bundles/org.openhab.binding.ferroamp/src/main/resources/OH-INF/thing/channels.xml b/bundles/org.openhab.binding.ferroamp/src/main/resources/OH-INF/thing/channels.xml index b98d22d2272..32cf4358348 100644 --- a/bundles/org.openhab.binding.ferroamp/src/main/resources/OH-INF/thing/channels.xml +++ b/bundles/org.openhab.binding.ferroamp/src/main/resources/OH-INF/thing/channels.xml @@ -1,101 +1,101 @@ - - Number:Energy - - Energy - - - - - - - Number:ElectricCurrent - - Energy - - - - - - - Number:Power - - Energy - - - - - - - DateTime - - Energy - - - - - - - Number:ElectricPotential - - Energy - - - - - - - Number:Frequency - - Energy - - - - - - - Number:Dimensionless - - Energy - - - - - - - Number:Temperature - - Energy - - - - - - - String - - Energy - - - - - - - String - - Used for control of system - Energy - - - - String - - Returns Extapi Version - Energy - - - \ No newline at end of file + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0" + xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd"> + + Number:Energy + + Energy + + + + + + + Number:ElectricCurrent + + Energy + + + + + + + Number:Power + + Energy + + + + + + + DateTime + + Energy + + + + + + + Number:ElectricPotential + + Energy + + + + + + + Number:Frequency + + Energy + + + + + + + Number:Dimensionless + + Energy + + + + + + + Number:Temperature + + Energy + + + + + + + String + + Energy + + + + + + + String + + Used for control of system + Energy + + + + String + + Returns Extapi Version + Energy + + + diff --git a/bundles/org.openhab.binding.ferroamp/src/main/resources/OH-INF/thing/ferroamp.xml b/bundles/org.openhab.binding.ferroamp/src/main/resources/OH-INF/thing/ferroamp.xml index d25104279a2..6c166b13b5f 100644 --- a/bundles/org.openhab.binding.ferroamp/src/main/resources/OH-INF/thing/ferroamp.xml +++ b/bundles/org.openhab.binding.ferroamp/src/main/resources/OH-INF/thing/ferroamp.xml @@ -1,449 +1,449 @@ - - - Represents the Ferroamp EnergyHub - Energy - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Ferroamp - - - - \ No newline at end of file + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0" + xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd"> + + + Represents the Ferroamp EnergyHub + Energy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Ferroamp + + + + diff --git a/bundles/org.openhab.binding.ferroamp/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.ferroamp/src/main/resources/OH-INF/thing/thing-types.xml index a3054e8b8b3..af1e4cf3291 100644 --- a/bundles/org.openhab.binding.ferroamp/src/main/resources/OH-INF/thing/thing-types.xml +++ b/bundles/org.openhab.binding.ferroamp/src/main/resources/OH-INF/thing/thing-types.xml @@ -1,57 +1,57 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0" + xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd"> - - - Thing for Ferroamp Binding - - - network-address - - Hostname or IP address of the device - - - username - - Username to access the device - - - password - - Password to access the device - - - - Ehub type, with/without battery - false - - - - First SSO Unit Available - - - - Second SSO Unit Available - - - - Third SSO Unit Available - - - - Fourth SSO Unit Available - - - - ESO Module Available - - - - ESM Module Available - - - + + + Thing for Ferroamp Binding + + + network-address + + Hostname or IP address of the device + + + username + + Username to access the device + + + password + + Password to access the device + + + + Ehub type, with/without battery + false + + + + First SSO Unit Available + + + + Second SSO Unit Available + + + + Third SSO Unit Available + + + + Fourth SSO Unit Available + + + + ESO Module Available + + + + ESM Module Available + + + diff --git a/bundles/pom.xml b/bundles/pom.xml index 2459811049b..eb74ebaacec 100644 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 org.openhab.addons