From d7853623b2fbad2a7082220a1fa2fbc76af4afc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96rjan=20Backsell?= Date: Fri, 11 Oct 2024 10:32:57 +0200 Subject: [PATCH] [ferroamp] Binding for ferroamp 20241011 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changes done in: EsmParameters.java EsoParameters.java ferroamp.xml FerroampBindingConstants.java FerroampChannelConfiguration.java README.md SsoParameters.java Signed-off-by: Örjan Backsell --- .../org.openhab.binding.ferroamp/README.md | 32 ++++++------ .../ferroamp/internal/EhubParameters.java | 2 +- .../ferroamp/internal/EsmParameters.java | 4 +- .../ferroamp/internal/EsoParameters.java | 6 +-- .../internal/FerroampBindingConstants.java | 30 +++++------ .../FerroampChannelConfiguration.java | 52 +++++++++---------- .../ferroamp/internal/SsoParameters.java | 5 +- .../main/resources/OH-INF/thing/ferroamp.xml | 30 +++++------ 8 files changed, 80 insertions(+), 81 deletions(-) diff --git a/bundles/org.openhab.binding.ferroamp/README.md b/bundles/org.openhab.binding.ferroamp/README.md index 57ac7d10fe0..e857de7724e 100644 --- a/bundles/org.openhab.binding.ferroamp/README.md +++ b/bundles/org.openhab.binding.ferroamp/README.md @@ -128,11 +128,11 @@ The following configuration parameters are available. | soc | Number:Dimensionless | R | System State of Check | State of the system | | soh | Number:Dimensionless | R | System State of Health | | power-battery | Number:Power | R | Battery Power | Only sent when system has batteries | -| total-rated-capacity-all-batteries | Number:Energy | R | Total Rated Capacity of All Batteries | +| total-capacity-batteries | Number:Energy | R | Total Rated Capacity of All Batteries | -| s0-id | String | R | S0 ID | Unique identifier of SSO-0 | -| s0-measured-voltage-on-pv-string-side | Number:ElectricPotential | R | S0 Measured Voltage on PV String Side | Measured on PV string side | -| s0-measured-current-on-pv-string-side | Number:ElectricCurrent | R | S0 Measured Current on PV String Side | Measured on PV string side | +| s0-id | String | R | S0 ID | Unique identifier of SSO-0 | +| s0-pv-voltage | Number:ElectricPotential | R | S0 Measured Voltage on PV String Side | Measured on PV string side | +| s0-pv-current | Number:ElectricCurrent | R | S0 Measured Current on PV String Side | Measured on PV string side | | s0-total-solar-energy | Number:Energy | R | S0 Total Solar Energy | Total energy produced by SSO-0 | | s0-relay-status | String | R | S0 Relay Status | 0 = relay closed (i.e running power), 1 = relay open/disconnected, 2 = precharge | | s0-temperature | Number:Temperature | R | S0 Temperature Measured on PCB | Temperature Measured on PCB | @@ -141,8 +141,8 @@ The following configuration parameters are available. | s0-timestamp | DateTime | R | S0 Time Stamp When Message was Published | Time stamp when message was published | | | s1-id | String | R | S1 ID | Unique identifier of SSO-1 | -| s1-measured-voltage-on-pv-string-side | Number:ElectricPotential | R | S1 easured Voltage on PV String Side | Measured on PV string side | -| s1-measured-current-on-pv-string-side | Number:ElectricCurrent | R | S1 Measured Current on PV String Side | Measured on PV string side | +| s1-pv-voltage | Number:ElectricPotential | R | S1 easured Voltage on PV String Side | Measured on PV string side | +| s1-pv-current | Number:ElectricCurrent | R | S1 Measured Current on PV String Side | Measured on PV string side | | s1-total-solar-energy | Number:Energy | R | S1 Total Solar Energy | Total energy produced by SSO-1 | | s1-relay-status | String | R | S1 Relay Status | 0 = relay closed (i.e running power), 1 = relay open/disconnected, 2 = precharge | | s1-temperature | Number:Temperature | R | S1 Temperature Measured on PCB | Temperature Measured on PCB | @@ -152,8 +152,8 @@ The following configuration parameters are available. | | s2-id | String | R | S2 ID | Unique identifier of SSO-2 | -| s2-measured-voltage-on-pv-string-side | Number:ElectricPotential | R | S2 Measured Voltage on PV String Side | Measured on PV string side | -| s2-measured-current-on-pv-string-side | Number:ElectricCurrent | R | S2 Measured Current on PV String Side | Measured on PV string side | +| s2-pv-voltage | Number:ElectricPotential | R | S2 Measured Voltage on PV String Side | Measured on PV string side | +| s2-pv-current | Number:ElectricCurrent | R | S2 Measured Current on PV String Side | Measured on PV string side | | s2-total-solar-energy | Number:Energy | R | S2 Total Solar Energy | Total energy produced by SSO-2 | | s2-relay-status | String | R | S2 Relay Status | 0 = relay closed (i.e running power), 1 = relay open/disconnected, 2 = precharge | | s2-temperature | Number:Temperature | R | S2 Temperature Measured on PCB | Temperature Measured on PCB | @@ -163,8 +163,8 @@ The following configuration parameters are available. | | s3-id | String | R | S3 ID | Unique identifier of SSO-3 | -| s3-measured-voltage-on-pv-string-side | Number:ElectricPotential | R | S3 Measured Voltage on PV String Side | Measured on PV string side | -| s3-measured-current-on-pv-string-side | Number:ElectricCurrent | R | S3 Measured Current on PV String Side | Measured on PV string side | +| s3-pv-voltage | Number:ElectricPotential | R | S3 Measured Voltage on PV String Side | Measured on PV string side | +| s3-pv-current | Number:ElectricCurrent | R | S3 Measured Current on PV String Side | Measured on PV string side | | s3-total-solar-energy | Number:Energy | R | S3 Total Solar Energy | Total energy produced by SSO-3 | | s3-relay-status | String | R | S3 Relay Status | 0 = relay closed (i.e running power), 1 = relay open/disconnected, 2 = precharge | | s3-temperature | Number:Temperature | R | S3 Temperature Measured on PCB | Temperature Measured on PCB | @@ -173,9 +173,9 @@ The following configuration parameters are available. | s3-timestamp | DateTime | R | S3 Time Stamp When Message was Published | Time stamp when message was published | | -| eso-unique-identifier | String | R | Eso Unique Identifier | Unique identifier | -| measured-voltage-battery | Number:ElectricPotential | R | Eso Voltage Measured on Battery Side | Measured on battery side | -| measured-current-battery | Number:ElectricCurrent | R | Eso Current Measured on Battery Side | Measured on battery side | +| eso-id | String | R | Eso Unique Identifier | Unique identifier | +| eso-voltage-battery | Number:ElectricPotential | R | Eso Voltage Measured on Battery Side | Measured on battery side | +| eso-current-battery | Number:ElectricCurrent | R | Eso Current Measured on Battery Side | Measured on battery side | | eso-battery-energy-produced | Number:Energy | R | Eso Battery Energy Produced | Total energy produced by ESO, i.e total energy charged | | eso-battery-energy-consumed | Number:Energy | R | Eso Battery Energy Consumed | Total energy consumed by ESO, i.e total energy discharged | | eso-soc | Number:Dimensionless | R | Eso State of Charge | State of Charge for ESO | @@ -187,11 +187,11 @@ The following configuration parameters are available. | eso-timestamp | DateTime | R | Eso Time Stamp When Message was Published| Time stamp when message was published | -| esm-unique-identifier | String | R | Esm Unique Identifier | Unique identifier of battery. If available, this will be the unique id that the battery reports.| +| esm-id | String | R | Esm Unique Identifier | Unique identifier of battery. If available, this will be the unique id that the battery reports.| | esm-soh | Number:Dimensionless | R | Esm System State of Health | State of Health for ESM | | esm-soc | Number:Dimensionless | R | Esm System State of Charge | State of Charge for ESM | -| esm-total-rated-capacity-all-batteries | Number:Energy | R | Esm Rated Capacity | Rated capacity of battery | -| esm-rated-power-battery | Number:Power | R | Esm Rated power of battery | Rated power of battery | +| esm-total-capacity | Number:Energy | R | Esm Rated Capacity | Rated capacity of all batteries | +| esm-power-battery | Number:Power | R | Esm Rated power of battery | Rated power of battery | | esm-status | String | R | Esm Status | Dependent on battery manufacturer | | esm-timestamp | DateTime | R | Esm Time Stamp When Message was Published| Time stamp when message was published | diff --git a/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/EhubParameters.java b/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/EhubParameters.java index 80abd87159c..fd9503d7c84 100644 --- a/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/EhubParameters.java +++ b/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/EhubParameters.java @@ -57,7 +57,7 @@ public class EhubParameters { "grid-energy-consumed-total", "inverter-energy-produced-total", "inverter-energy-consumed-total", "load-energy-produced-3p", "load-energy-consumed-3p", "total-solar-energy", "state", "timestamp", "battery-energy-produced", "battery-energy-consumed", "soc", "soh", "power-battery", - "total-rated-capacity-all-batteries"); + "total-capacity-batteries"); return channelParametersEhub; } } diff --git a/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/EsmParameters.java b/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/EsmParameters.java index ac2b6058731..3cd33a508a5 100644 --- a/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/EsmParameters.java +++ b/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/EsmParameters.java @@ -34,8 +34,8 @@ public class EsmParameters { } public static List getChannelParametersEsm() { - final List channelParametersEsm = Arrays.asList("esm-unique-identifier", "esm-soh", "esm-soc", - "esm-total-rated-capacity-all-batteries", "esm-rated-power-battery", "esm-status", "esm-timestamp"); + final List channelParametersEsm = Arrays.asList("esm-id", "esm-soh", "esm-soc", "esm-total-capacity", + "esm-power-battery", "esm-status", "esm-timestamp"); return channelParametersEsm; } } diff --git a/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/EsoParameters.java b/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/EsoParameters.java index 844b67f7b44..3f317dd1b12 100644 --- a/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/EsoParameters.java +++ b/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/EsoParameters.java @@ -34,9 +34,9 @@ public class EsoParameters { } public static List getChannelParametersEso() { - final List channelParametersEso = Arrays.asList("eso-unique-identifier", "eso-measured-voltage-battery", - "eso-measured-current-battery", "eso-battery-energy-produced", "eso-battery-energy-consumed", "eso-soc", - "eso-relay-status", "eso-temperature", "eso-fault-code", "eso-dc-link-voltage", "eso-timestamp"); + final List channelParametersEso = Arrays.asList("eso-id", "eso-voltage-battery", "eso-current-battery", + "eso-battery-energy-produced", "eso-battery-energy-consumed", "eso-soc", "eso-relay-status", + "eso-temperature", "eso-fault-code", "eso-dc-link-voltage", "eso-timestamp"); return channelParametersEso; } } diff --git a/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/FerroampBindingConstants.java b/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/FerroampBindingConstants.java index c7ecee8de64..cbfe21e041e 100644 --- a/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/FerroampBindingConstants.java +++ b/bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/FerroampBindingConstants.java @@ -136,12 +136,12 @@ public class FerroampBindingConstants { public static final String CHANNEL_SOC = "soc"; public static final String CHANNEL_SOH = "soh"; public static final String CHANNEL_POWERBATTERY = "power-battery"; - public static final String CHANNEL_TOTALRATEDCAPACITYALLBATTERIES = "total-rated-capacity-all-batteries"; + public static final String CHANNEL_TOTALCAPACITYBATTERIES = "total-capacity-batteries"; // List of SSO Channel ids public static final String CHANNEL_S0ID = "s0-id"; - public static final String CHANNEL_S0MEASUREDVOLTAGEPVSTRING = "s0-measured-voltage-pv-string"; - public static final String CHANNEL_S0MEASUREDCURRENTPVSTRING = "s0-measured-current-pv-string"; + public static final String CHANNEL_S0PVVOLTAGE = "s0-pv-voltage"; + public static final String CHANNEL_S0PVCURRENT = "s0-pv-current"; public static final String CHANNEL_S0TOTALSOLARENERGY = "s0-total-solar-energy"; public static final String CHANNEL_S0RELAYSTATUS = "s0-relay-status"; public static final String CHANNEL_S0TEMPERATURE = "s0-temperature"; @@ -149,8 +149,8 @@ public class FerroampBindingConstants { public static final String CHANNEL_S0DCLINKVOLTAGE = "s0-dc-link-voltage"; public static final String CHANNEL_S0TIMESTAMP = "s0-timestamp"; public static final String CHANNEL_S1ID = "s1-id"; - public static final String CHANNEL_S1MEASUREDVOLTAGEPVSTRING = "s1-measured-voltage-pv-string"; - public static final String CHANNEL_S1MEASUREDCURRENTPVSTRING = "s1-measured-current-pv-string"; + public static final String CHANNEL_S1PVVOLTAGE = "s1-pv-voltage"; + public static final String CHANNEL_S1PVCURRENT = "s1-pv-current"; public static final String CHANNEL_S1TOTALSOLARENERGY = "s1-total-solar-energy"; public static final String CHANNEL_S1RELAYSTATUS = "s1-relay-status"; public static final String CHANNEL_S1TEMPERATURE = "s1-temperature"; @@ -158,8 +158,8 @@ public class FerroampBindingConstants { public static final String CHANNEL_S1DCLINKVOLTAGE = "s1-dc-link-voltage"; public static final String CHANNEL_S1TIMESTAMP = "s1-timestamp"; public static final String CHANNEL_S2ID = "s2-id"; - public static final String CHANNEL_S2MEASUREDVOLTAGEPVSTRING = "s2-measured-voltage-pv-string"; - public static final String CHANNEL_S2MEASUREDCURRENTPVSTRING = "s2-measured-current-pv-string"; + public static final String CHANNEL_S2PVVOLTAGE = "s2-pv-voltage"; + public static final String CHANNEL_S2PVCURRENT = "s2-pv-current"; public static final String CHANNEL_S2TOTALSOLARENERGY = "s2-total-solar-energy"; public static final String CHANNEL_S2RELAYSTATUS = "s2-relay-status"; public static final String CHANNEL_S2TEMPERATURE = "s2-temperature"; @@ -167,8 +167,8 @@ public class FerroampBindingConstants { public static final String CHANNEL_S2DCLINKVOLTAGE = "s2-dc-link-voltage"; public static final String CHANNEL_S2TIMESTAMP = "s2-timestamp"; public static final String CHANNEL_S3ID = "s3-id"; - public static final String CHANNEL_S3MEASUREDVOLTAGEPVSTRING = "s3-measured-voltage-pv-string"; - public static final String CHANNEL_S3MEASUREDCURRENTPVSTRING = "s3-measured-current-pv-string"; + public static final String CHANNEL_S3PVVOLTAGE = "s3-pv-voltage"; + public static final String CHANNEL_S3PVCURRENT = "s3-pv-current"; public static final String CHANNEL_S3TOTALSOLARENERGY = "s3-total-solar-energy"; public static final String CHANNEL_S3RELAYSTATUS = "s3-relay-status"; public static final String CHANNEL_S3TEMPERATURE = "s3-temperature"; @@ -177,9 +177,9 @@ public class FerroampBindingConstants { public static final String CHANNEL_S3TIMESTAMP = "s3-timestamp"; // List of ESO Channel ids - public static final String CHANNEL_ESOUNIQUEIDENTIFIER = "eso-unique-identifier"; - public static final String CHANNEL_ESOMEASUREDVOLTAGEBATTERY = "eso-measured-voltage-battery"; - public static final String CHANNEL_ESOMEASUREDCURRENTBATTERY = "eso-measured-current-battery"; + public static final String CHANNEL_ESOID = "eso-id"; + public static final String CHANNEL_ESOVOLTAGEBATTERY = "eso-voltage-battery"; + public static final String CHANNEL_ESOCURRENTBATTERY = "eso-current-battery"; public static final String CHANNEL_ESOBATTERYENERGYPRODUCED = "eso-battery-energy-produced"; public static final String CHANNEL_ESOBATTERYENERGYCONSUMED = "eso-battery-energy-consumed"; public static final String CHANNEL_ESOSOC = "eso-soc"; @@ -190,11 +190,11 @@ public class FerroampBindingConstants { public static final String CHANNEL_ESOTIMESTAMP = "eso-timestamp"; // List of ESM Channel ids - public static final String CHANNEL_ESMUNIQUEIDENTIFIER = "esm-unique-identifier"; + public static final String CHANNEL_ESMID = "esm-id"; public static final String CHANNEL_ESMSOH = "esm-soh"; public static final String CHANNEL_ESMSOC = "esm-soc"; - public static final String CHANNEL_ESMTOTALRATEDCAPACITYALLBATTERIES = "esm-total-rated-capacity-all-batteries"; - public static final String CHANNEL_ESMRATEDPOWERBATTERY = "esm-rated-power-battery"; + public static final String CHANNEL_ESMTOTALCAPACITY = "esm-total-capacity"; + public static final String CHANNEL_ESMPOWERBATTERY = "esm-power-battery"; public static final String CHANNEL_ESMSTATUS = "esm-status"; public static final String CHANNEL_ESMTIMESTAMP = "esm-timestamp"; 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 e80162e040c..df98b94a87f 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 @@ -210,7 +210,7 @@ public class FerroampChannelConfiguration { channelConfigurationEhub .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_POWERBATTERY, Units.WATT)); channelConfigurationEhub.add(new FerroampChannelConfiguration( - FerroampBindingConstants.CHANNEL_TOTALRATEDCAPACITYALLBATTERIES, Units.WATT_HOUR)); + FerroampBindingConstants.CHANNEL_TOTALCAPACITYBATTERIES, Units.WATT_HOUR)); return channelConfigurationEhub; } @@ -218,10 +218,10 @@ public class FerroampChannelConfiguration { final List channelConfigurationSsoS0 = new ArrayList<>(); channelConfigurationSsoS0 .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S0ID, Units.ONE)); - channelConfigurationSsoS0.add(new FerroampChannelConfiguration( - FerroampBindingConstants.CHANNEL_S0MEASUREDVOLTAGEPVSTRING, Units.VOLT)); - channelConfigurationSsoS0.add(new FerroampChannelConfiguration( - FerroampBindingConstants.CHANNEL_S0MEASUREDCURRENTPVSTRING, Units.AMPERE)); + channelConfigurationSsoS0 + .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S0PVVOLTAGE, Units.VOLT)); + channelConfigurationSsoS0 + .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S0PVCURRENT, Units.AMPERE)); channelConfigurationSsoS0 .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S0TOTALSOLARENERGY, Units.WATT)); channelConfigurationSsoS0 @@ -241,10 +241,10 @@ public class FerroampChannelConfiguration { final List channelConfigurationSsoS1 = new ArrayList<>(); channelConfigurationSsoS1 .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S1ID, Units.ONE)); - channelConfigurationSsoS1.add(new FerroampChannelConfiguration( - FerroampBindingConstants.CHANNEL_S1MEASUREDVOLTAGEPVSTRING, Units.VOLT)); - channelConfigurationSsoS1.add(new FerroampChannelConfiguration( - FerroampBindingConstants.CHANNEL_S1MEASUREDCURRENTPVSTRING, Units.AMPERE)); + channelConfigurationSsoS1 + .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S1PVVOLTAGE, Units.VOLT)); + channelConfigurationSsoS1 + .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S1PVCURRENT, Units.AMPERE)); channelConfigurationSsoS1 .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S1TOTALSOLARENERGY, Units.WATT)); channelConfigurationSsoS1 @@ -264,10 +264,10 @@ public class FerroampChannelConfiguration { final List channelConfigurationSsoS2 = new ArrayList<>(); channelConfigurationSsoS2 .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S2ID, Units.ONE)); - channelConfigurationSsoS2.add(new FerroampChannelConfiguration( - FerroampBindingConstants.CHANNEL_S2MEASUREDVOLTAGEPVSTRING, Units.VOLT)); - channelConfigurationSsoS2.add(new FerroampChannelConfiguration( - FerroampBindingConstants.CHANNEL_S2MEASUREDCURRENTPVSTRING, Units.AMPERE)); + channelConfigurationSsoS2 + .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S2PVVOLTAGE, Units.VOLT)); + channelConfigurationSsoS2 + .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S2PVCURRENT, Units.AMPERE)); channelConfigurationSsoS2 .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S2TOTALSOLARENERGY, Units.WATT)); channelConfigurationSsoS2 @@ -287,10 +287,10 @@ public class FerroampChannelConfiguration { final List channelConfigurationSsoS3 = new ArrayList<>(); channelConfigurationSsoS3 .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S3ID, Units.ONE)); - channelConfigurationSsoS3.add(new FerroampChannelConfiguration( - FerroampBindingConstants.CHANNEL_S3MEASUREDVOLTAGEPVSTRING, Units.VOLT)); - channelConfigurationSsoS3.add(new FerroampChannelConfiguration( - FerroampBindingConstants.CHANNEL_S3MEASUREDCURRENTPVSTRING, Units.AMPERE)); + channelConfigurationSsoS3 + .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S3PVVOLTAGE, Units.VOLT)); + channelConfigurationSsoS3 + .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S3PVCURRENT, Units.AMPERE)); channelConfigurationSsoS3 .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S3TOTALSOLARENERGY, Units.WATT)); channelConfigurationSsoS3 @@ -309,11 +309,11 @@ public class FerroampChannelConfiguration { public static List getChannelConfigurationEso() { final List channelConfigurationEso = new ArrayList<>(); channelConfigurationEso - .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_ESOUNIQUEIDENTIFIER, Units.ONE)); - channelConfigurationEso.add(new FerroampChannelConfiguration( - FerroampBindingConstants.CHANNEL_ESOMEASUREDVOLTAGEBATTERY, Units.VOLT)); - channelConfigurationEso.add(new FerroampChannelConfiguration( - FerroampBindingConstants.CHANNEL_ESOMEASUREDCURRENTBATTERY, Units.AMPERE)); + .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_ESOID, Units.ONE)); + channelConfigurationEso + .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_ESOVOLTAGEBATTERY, Units.VOLT)); + channelConfigurationEso.add( + new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_ESOCURRENTBATTERY, Units.AMPERE)); channelConfigurationEso.add(new FerroampChannelConfiguration( FerroampBindingConstants.CHANNEL_ESOBATTERYENERGYPRODUCED, Units.WATT)); channelConfigurationEso.add(new FerroampChannelConfiguration( @@ -336,15 +336,15 @@ public class FerroampChannelConfiguration { public static List getChannelConfigurationEsm() { final List channelConfigurationEsm = new ArrayList<>(); channelConfigurationEsm - .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_ESMUNIQUEIDENTIFIER, Units.ONE)); + .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_ESMID, Units.ONE)); channelConfigurationEsm .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_ESMSOH, Units.PERCENT)); channelConfigurationEsm .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_ESMSOC, Units.PERCENT)); - channelConfigurationEsm.add(new FerroampChannelConfiguration( - FerroampBindingConstants.CHANNEL_ESMTOTALRATEDCAPACITYALLBATTERIES, Units.WATT_HOUR)); channelConfigurationEsm.add( - new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_ESMRATEDPOWERBATTERY, Units.WATT)); + new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_ESMTOTALCAPACITY, Units.WATT_HOUR)); + channelConfigurationEsm + .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_ESMPOWERBATTERY, Units.WATT)); channelConfigurationEsm .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_ESMSTATUS, Units.ONE)); channelConfigurationEsm 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 dba7ac760bb..776402fd43f 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 @@ -41,9 +41,8 @@ import org.eclipse.jdt.annotation.NonNullByDefault; public class SsoParameters { public static List getChannelParametersSso() { - final List channelParametersSs0 = Arrays.asList("id", "measured-voltage-pv-string", - "measured-current-pv-string", "total-solar-energy", "relay-status", "temperature", "fault-code", - "dc-link-voltage", "timestamp"); + final List channelParametersSs0 = Arrays.asList("id", "pv-voltage", "pv-current", "total-solar-energy", + "relay-status", "temperature", "fault-code", "dc-link-voltage", "timestamp"); return channelParametersSs0; } } 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 a21234a8cfa..211d5c8902e 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 @@ -263,16 +263,16 @@ - + - + - + @@ -296,10 +296,10 @@ - + - + @@ -323,10 +323,10 @@ - + - + @@ -350,10 +350,10 @@ - + - + @@ -374,13 +374,13 @@ - + - + - + @@ -407,7 +407,7 @@ - + @@ -416,10 +416,10 @@ - + - +