demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-10 15:11:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ferroamp] Binding for ferroamp 20241011

Browse Source 
Changes done in:
EsmParameters.java
EsoParameters.java
ferroamp.xml
FerroampBindingConstants.java
FerroampChannelConfiguration.java
README.md
SsoParameters.java

Signed-off-by: Örjan Backsell <orjan.backsell@gmail.com>
This commit is contained in:
Örjan Backsell 2024-10-11 10:32:57 +02:00
parent 5c5ebc0f86
commit d7853623b2
8 changed files with 80 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
bundles/org.openhab.binding.ferroamp/README.md
View File

@ -128,11 +128,11 @@ The following configuration parameters are available.
| soc | Number:Dimensionless | R | System State of Check | State of the system | | soc | Number:Dimensionless | R | System State of Check | State of the system |
| soh | Number:Dimensionless | R | System State of Health | | soh | Number:Dimensionless | R | System State of Health |
| power-battery | Number:Power | R | Battery Power | Only sent when system has batteries | | 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-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-pv-voltage | 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-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-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-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 | | 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 | | 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-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-pv-voltage | 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-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-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-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 | | 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-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-pv-voltage | 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-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-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-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 | | 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-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-pv-voltage | 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-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-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-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 | | 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 | | 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 | | eso-id | String | R | Eso Unique Identifier | Unique identifier |
| measured-voltage-battery | Number:ElectricPotential | R | Eso Voltage Measured on Battery Side | Measured on battery side | | eso-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-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-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-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 | | 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 | | 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-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-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-total-capacity | Number:Energy | R | Esm Rated Capacity | Rated capacity of all batteries |
| esm-rated-power-battery | Number:Power | R | Esm Rated power of battery | Rated power of battery | | 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-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 | | esm-timestamp | DateTime | R | Esm Time Stamp When Message was Published| Time stamp when message was published |

2
bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/EhubParameters.java
View File

@ -57,7 +57,7 @@ public class EhubParameters {
"grid-energy-consumed-total", "inverter-energy-produced-total", "inverter-energy-consumed-total", "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", "load-energy-produced-3p", "load-energy-consumed-3p", "total-solar-energy", "state", "timestamp",
"battery-energy-produced", "battery-energy-consumed", "soc", "soh", "power-battery", "battery-energy-produced", "battery-energy-consumed", "soc", "soh", "power-battery",
"total-rated-capacity-all-batteries"); "total-capacity-batteries");
return channelParametersEhub; return channelParametersEhub;
} }
} }

4
bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/EsmParameters.java
View File

@ -34,8 +34,8 @@ public class EsmParameters {
} }
public static List<String> getChannelParametersEsm() { public static List<String> getChannelParametersEsm() {
final List<String> channelParametersEsm = Arrays.asList("esm-unique-identifier", "esm-soh", "esm-soc", final List<String> channelParametersEsm = Arrays.asList("esm-id", "esm-soh", "esm-soc", "esm-total-capacity",
"esm-total-rated-capacity-all-batteries", "esm-rated-power-battery", "esm-status", "esm-timestamp"); "esm-power-battery", "esm-status", "esm-timestamp");
return channelParametersEsm; return channelParametersEsm;
} }
} }

6
bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/EsoParameters.java
View File

@ -34,9 +34,9 @@ public class EsoParameters {
} }
public static List<String> getChannelParametersEso() { public static List<String> getChannelParametersEso() {
final List<String> channelParametersEso = Arrays.asList("eso-unique-identifier", "eso-measured-voltage-battery", final List<String> channelParametersEso = Arrays.asList("eso-id", "eso-voltage-battery", "eso-current-battery",
"eso-measured-current-battery", "eso-battery-energy-produced", "eso-battery-energy-consumed", "eso-soc", "eso-battery-energy-produced", "eso-battery-energy-consumed", "eso-soc", "eso-relay-status",
"eso-relay-status", "eso-temperature", "eso-fault-code", "eso-dc-link-voltage", "eso-timestamp"); "eso-temperature", "eso-fault-code", "eso-dc-link-voltage", "eso-timestamp");
return channelParametersEso; return channelParametersEso;
} }
} }

30
bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/FerroampBindingConstants.java
View File

@ -136,12 +136,12 @@ public class FerroampBindingConstants {
public static final String CHANNEL_SOC = "soc"; public static final String CHANNEL_SOC = "soc";
public static final String CHANNEL_SOH = "soh"; public static final String CHANNEL_SOH = "soh";
public static final String CHANNEL_POWERBATTERY = "power-battery"; 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 // List of SSO Channel ids
public static final String CHANNEL_S0ID = "s0-id"; public static final String CHANNEL_S0ID = "s0-id";
public static final String CHANNEL_S0MEASUREDVOLTAGEPVSTRING = "s0-measured-voltage-pv-string"; public static final String CHANNEL_S0PVVOLTAGE = "s0-pv-voltage";
public static final String CHANNEL_S0MEASUREDCURRENTPVSTRING = "s0-measured-current-pv-string"; public static final String CHANNEL_S0PVCURRENT = "s0-pv-current";
public static final String CHANNEL_S0TOTALSOLARENERGY = "s0-total-solar-energy"; public static final String CHANNEL_S0TOTALSOLARENERGY = "s0-total-solar-energy";
public static final String CHANNEL_S0RELAYSTATUS = "s0-relay-status"; public static final String CHANNEL_S0RELAYSTATUS = "s0-relay-status";
public static final String CHANNEL_S0TEMPERATURE = "s0-temperature"; 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_S0DCLINKVOLTAGE = "s0-dc-link-voltage";
public static final String CHANNEL_S0TIMESTAMP = "s0-timestamp"; public static final String CHANNEL_S0TIMESTAMP = "s0-timestamp";
public static final String CHANNEL_S1ID = "s1-id"; public static final String CHANNEL_S1ID = "s1-id";
public static final String CHANNEL_S1MEASUREDVOLTAGEPVSTRING = "s1-measured-voltage-pv-string"; public static final String CHANNEL_S1PVVOLTAGE = "s1-pv-voltage";
public static final String CHANNEL_S1MEASUREDCURRENTPVSTRING = "s1-measured-current-pv-string"; public static final String CHANNEL_S1PVCURRENT = "s1-pv-current";
public static final String CHANNEL_S1TOTALSOLARENERGY = "s1-total-solar-energy"; public static final String CHANNEL_S1TOTALSOLARENERGY = "s1-total-solar-energy";
public static final String CHANNEL_S1RELAYSTATUS = "s1-relay-status"; public static final String CHANNEL_S1RELAYSTATUS = "s1-relay-status";
public static final String CHANNEL_S1TEMPERATURE = "s1-temperature"; 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_S1DCLINKVOLTAGE = "s1-dc-link-voltage";
public static final String CHANNEL_S1TIMESTAMP = "s1-timestamp"; public static final String CHANNEL_S1TIMESTAMP = "s1-timestamp";
public static final String CHANNEL_S2ID = "s2-id"; public static final String CHANNEL_S2ID = "s2-id";
public static final String CHANNEL_S2MEASUREDVOLTAGEPVSTRING = "s2-measured-voltage-pv-string"; public static final String CHANNEL_S2PVVOLTAGE = "s2-pv-voltage";
public static final String CHANNEL_S2MEASUREDCURRENTPVSTRING = "s2-measured-current-pv-string"; public static final String CHANNEL_S2PVCURRENT = "s2-pv-current";
public static final String CHANNEL_S2TOTALSOLARENERGY = "s2-total-solar-energy"; public static final String CHANNEL_S2TOTALSOLARENERGY = "s2-total-solar-energy";
public static final String CHANNEL_S2RELAYSTATUS = "s2-relay-status"; public static final String CHANNEL_S2RELAYSTATUS = "s2-relay-status";
public static final String CHANNEL_S2TEMPERATURE = "s2-temperature"; 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_S2DCLINKVOLTAGE = "s2-dc-link-voltage";
public static final String CHANNEL_S2TIMESTAMP = "s2-timestamp"; public static final String CHANNEL_S2TIMESTAMP = "s2-timestamp";
public static final String CHANNEL_S3ID = "s3-id"; public static final String CHANNEL_S3ID = "s3-id";
public static final String CHANNEL_S3MEASUREDVOLTAGEPVSTRING = "s3-measured-voltage-pv-string"; public static final String CHANNEL_S3PVVOLTAGE = "s3-pv-voltage";
public static final String CHANNEL_S3MEASUREDCURRENTPVSTRING = "s3-measured-current-pv-string"; public static final String CHANNEL_S3PVCURRENT = "s3-pv-current";
public static final String CHANNEL_S3TOTALSOLARENERGY = "s3-total-solar-energy"; public static final String CHANNEL_S3TOTALSOLARENERGY = "s3-total-solar-energy";
public static final String CHANNEL_S3RELAYSTATUS = "s3-relay-status"; public static final String CHANNEL_S3RELAYSTATUS = "s3-relay-status";
public static final String CHANNEL_S3TEMPERATURE = "s3-temperature"; public static final String CHANNEL_S3TEMPERATURE = "s3-temperature";
@ -177,9 +177,9 @@ public class FerroampBindingConstants {
public static final String CHANNEL_S3TIMESTAMP = "s3-timestamp"; public static final String CHANNEL_S3TIMESTAMP = "s3-timestamp";
// List of ESO Channel ids // List of ESO Channel ids
public static final String CHANNEL_ESOUNIQUEIDENTIFIER = "eso-unique-identifier"; public static final String CHANNEL_ESOID = "eso-id";
public static final String CHANNEL_ESOMEASUREDVOLTAGEBATTERY = "eso-measured-voltage-battery"; public static final String CHANNEL_ESOVOLTAGEBATTERY = "eso-voltage-battery";
public static final String CHANNEL_ESOMEASUREDCURRENTBATTERY = "eso-measured-current-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_ESOBATTERYENERGYPRODUCED = "eso-battery-energy-produced";
public static final String CHANNEL_ESOBATTERYENERGYCONSUMED = "eso-battery-energy-consumed"; public static final String CHANNEL_ESOBATTERYENERGYCONSUMED = "eso-battery-energy-consumed";
public static final String CHANNEL_ESOSOC = "eso-soc"; public static final String CHANNEL_ESOSOC = "eso-soc";
@ -190,11 +190,11 @@ public class FerroampBindingConstants {
public static final String CHANNEL_ESOTIMESTAMP = "eso-timestamp"; public static final String CHANNEL_ESOTIMESTAMP = "eso-timestamp";
// List of ESM Channel ids // 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_ESMSOH = "esm-soh";
public static final String CHANNEL_ESMSOC = "esm-soc"; 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_ESMTOTALCAPACITY = "esm-total-capacity";
public static final String CHANNEL_ESMRATEDPOWERBATTERY = "esm-rated-power-battery"; public static final String CHANNEL_ESMPOWERBATTERY = "esm-power-battery";
public static final String CHANNEL_ESMSTATUS = "esm-status"; public static final String CHANNEL_ESMSTATUS = "esm-status";
public static final String CHANNEL_ESMTIMESTAMP = "esm-timestamp"; public static final String CHANNEL_ESMTIMESTAMP = "esm-timestamp";

52
bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/FerroampChannelConfiguration.java
View File

@ -210,7 +210,7 @@ public class FerroampChannelConfiguration {
channelConfigurationEhub channelConfigurationEhub
.add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_POWERBATTERY, Units.WATT)); .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_POWERBATTERY, Units.WATT));
channelConfigurationEhub.add(new FerroampChannelConfiguration( channelConfigurationEhub.add(new FerroampChannelConfiguration(
FerroampBindingConstants.CHANNEL_TOTALRATEDCAPACITYALLBATTERIES, Units.WATT_HOUR)); FerroampBindingConstants.CHANNEL_TOTALCAPACITYBATTERIES, Units.WATT_HOUR));
return channelConfigurationEhub; return channelConfigurationEhub;
} }
@ -218,10 +218,10 @@ public class FerroampChannelConfiguration {
final List<FerroampChannelConfiguration> channelConfigurationSsoS0 = new ArrayList<>(); final List<FerroampChannelConfiguration> channelConfigurationSsoS0 = new ArrayList<>();
channelConfigurationSsoS0 channelConfigurationSsoS0
.add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S0ID, Units.ONE)); .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S0ID, Units.ONE));
channelConfigurationSsoS0.add(new FerroampChannelConfiguration( channelConfigurationSsoS0
FerroampBindingConstants.CHANNEL_S0MEASUREDVOLTAGEPVSTRING, Units.VOLT)); .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S0PVVOLTAGE, Units.VOLT));
channelConfigurationSsoS0.add(new FerroampChannelConfiguration( channelConfigurationSsoS0
FerroampBindingConstants.CHANNEL_S0MEASUREDCURRENTPVSTRING, Units.AMPERE)); .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S0PVCURRENT, Units.AMPERE));
channelConfigurationSsoS0 channelConfigurationSsoS0
.add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S0TOTALSOLARENERGY, Units.WATT)); .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S0TOTALSOLARENERGY, Units.WATT));
channelConfigurationSsoS0 channelConfigurationSsoS0
@ -241,10 +241,10 @@ public class FerroampChannelConfiguration {
final List<FerroampChannelConfiguration> channelConfigurationSsoS1 = new ArrayList<>(); final List<FerroampChannelConfiguration> channelConfigurationSsoS1 = new ArrayList<>();
channelConfigurationSsoS1 channelConfigurationSsoS1
.add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S1ID, Units.ONE)); .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S1ID, Units.ONE));
channelConfigurationSsoS1.add(new FerroampChannelConfiguration( channelConfigurationSsoS1
FerroampBindingConstants.CHANNEL_S1MEASUREDVOLTAGEPVSTRING, Units.VOLT)); .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S1PVVOLTAGE, Units.VOLT));
channelConfigurationSsoS1.add(new FerroampChannelConfiguration( channelConfigurationSsoS1
FerroampBindingConstants.CHANNEL_S1MEASUREDCURRENTPVSTRING, Units.AMPERE)); .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S1PVCURRENT, Units.AMPERE));
channelConfigurationSsoS1 channelConfigurationSsoS1
.add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S1TOTALSOLARENERGY, Units.WATT)); .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S1TOTALSOLARENERGY, Units.WATT));
channelConfigurationSsoS1 channelConfigurationSsoS1
@ -264,10 +264,10 @@ public class FerroampChannelConfiguration {
final List<FerroampChannelConfiguration> channelConfigurationSsoS2 = new ArrayList<>(); final List<FerroampChannelConfiguration> channelConfigurationSsoS2 = new ArrayList<>();
channelConfigurationSsoS2 channelConfigurationSsoS2
.add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S2ID, Units.ONE)); .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S2ID, Units.ONE));
channelConfigurationSsoS2.add(new FerroampChannelConfiguration( channelConfigurationSsoS2
FerroampBindingConstants.CHANNEL_S2MEASUREDVOLTAGEPVSTRING, Units.VOLT)); .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S2PVVOLTAGE, Units.VOLT));
channelConfigurationSsoS2.add(new FerroampChannelConfiguration( channelConfigurationSsoS2
FerroampBindingConstants.CHANNEL_S2MEASUREDCURRENTPVSTRING, Units.AMPERE)); .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S2PVCURRENT, Units.AMPERE));
channelConfigurationSsoS2 channelConfigurationSsoS2
.add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S2TOTALSOLARENERGY, Units.WATT)); .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S2TOTALSOLARENERGY, Units.WATT));
channelConfigurationSsoS2 channelConfigurationSsoS2
@ -287,10 +287,10 @@ public class FerroampChannelConfiguration {
final List<FerroampChannelConfiguration> channelConfigurationSsoS3 = new ArrayList<>(); final List<FerroampChannelConfiguration> channelConfigurationSsoS3 = new ArrayList<>();
channelConfigurationSsoS3 channelConfigurationSsoS3
.add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S3ID, Units.ONE)); .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S3ID, Units.ONE));
channelConfigurationSsoS3.add(new FerroampChannelConfiguration( channelConfigurationSsoS3
FerroampBindingConstants.CHANNEL_S3MEASUREDVOLTAGEPVSTRING, Units.VOLT)); .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S3PVVOLTAGE, Units.VOLT));
channelConfigurationSsoS3.add(new FerroampChannelConfiguration( channelConfigurationSsoS3
FerroampBindingConstants.CHANNEL_S3MEASUREDCURRENTPVSTRING, Units.AMPERE)); .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S3PVCURRENT, Units.AMPERE));
channelConfigurationSsoS3 channelConfigurationSsoS3
.add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S3TOTALSOLARENERGY, Units.WATT)); .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_S3TOTALSOLARENERGY, Units.WATT));
channelConfigurationSsoS3 channelConfigurationSsoS3
@ -309,11 +309,11 @@ public class FerroampChannelConfiguration {
public static List<FerroampChannelConfiguration> getChannelConfigurationEso() { public static List<FerroampChannelConfiguration> getChannelConfigurationEso() {
final List<FerroampChannelConfiguration> channelConfigurationEso = new ArrayList<>(); final List<FerroampChannelConfiguration> channelConfigurationEso = new ArrayList<>();
channelConfigurationEso channelConfigurationEso
.add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_ESOUNIQUEIDENTIFIER, Units.ONE)); .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_ESOID, Units.ONE));
channelConfigurationEso.add(new FerroampChannelConfiguration( channelConfigurationEso
FerroampBindingConstants.CHANNEL_ESOMEASUREDVOLTAGEBATTERY, Units.VOLT)); .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_ESOVOLTAGEBATTERY, Units.VOLT));
channelConfigurationEso.add(new FerroampChannelConfiguration( channelConfigurationEso.add(
FerroampBindingConstants.CHANNEL_ESOMEASUREDCURRENTBATTERY, Units.AMPERE)); new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_ESOCURRENTBATTERY, Units.AMPERE));
channelConfigurationEso.add(new FerroampChannelConfiguration( channelConfigurationEso.add(new FerroampChannelConfiguration(
FerroampBindingConstants.CHANNEL_ESOBATTERYENERGYPRODUCED, Units.WATT)); FerroampBindingConstants.CHANNEL_ESOBATTERYENERGYPRODUCED, Units.WATT));
channelConfigurationEso.add(new FerroampChannelConfiguration( channelConfigurationEso.add(new FerroampChannelConfiguration(
@ -336,15 +336,15 @@ public class FerroampChannelConfiguration {
public static List<FerroampChannelConfiguration> getChannelConfigurationEsm() { public static List<FerroampChannelConfiguration> getChannelConfigurationEsm() {
final List<FerroampChannelConfiguration> channelConfigurationEsm = new ArrayList<>(); final List<FerroampChannelConfiguration> channelConfigurationEsm = new ArrayList<>();
channelConfigurationEsm channelConfigurationEsm
.add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_ESMUNIQUEIDENTIFIER, Units.ONE)); .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_ESMID, Units.ONE));
channelConfigurationEsm channelConfigurationEsm
.add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_ESMSOH, Units.PERCENT)); .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_ESMSOH, Units.PERCENT));
channelConfigurationEsm channelConfigurationEsm
.add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_ESMSOC, Units.PERCENT)); .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_ESMSOC, Units.PERCENT));
channelConfigurationEsm.add(new FerroampChannelConfiguration(
FerroampBindingConstants.CHANNEL_ESMTOTALRATEDCAPACITYALLBATTERIES, Units.WATT_HOUR));
channelConfigurationEsm.add( 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 channelConfigurationEsm
.add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_ESMSTATUS, Units.ONE)); .add(new FerroampChannelConfiguration(FerroampBindingConstants.CHANNEL_ESMSTATUS, Units.ONE));
channelConfigurationEsm channelConfigurationEsm

5
bundles/org.openhab.binding.ferroamp/src/main/java/org/openhab/binding/ferroamp/internal/SsoParameters.java
View File

@ -41,9 +41,8 @@ import org.eclipse.jdt.annotation.NonNullByDefault;
public class SsoParameters { public class SsoParameters {
public static List<String> getChannelParametersSso() { public static List<String> getChannelParametersSso() {
final List<String> channelParametersSs0 = Arrays.asList("id", "measured-voltage-pv-string", final List<String> channelParametersSs0 = Arrays.asList("id", "pv-voltage", "pv-current", "total-solar-energy",
"measured-current-pv-string", "total-solar-energy", "relay-status", "temperature", "fault-code", "relay-status", "temperature", "fault-code", "dc-link-voltage", "timestamp");
"dc-link-voltage", "timestamp");
return channelParametersSs0; return channelParametersSs0;
} }
} }

30
bundles/org.openhab.binding.ferroamp/src/main/resources/OH-INF/thing/ferroamp.xml
View File

@ -263,16 +263,16 @@
<channel id="power-battery" typeId="power"> <channel id="power-battery" typeId="power">
<label>Battery Power</label> <label>Battery Power</label>
</channel> </channel>
<channel id="total-rated-capacity-all-batteries" typeId="energy"> <channel id="total-capacity-batteries" typeId="energy">
<label>Total Rated Capacity of All Batteries</label> <label>Total Rated Capacity of All Batteries</label>
</channel> </channel>
<channel id="s0-id" typeId="string"> <channel id="s0-id" typeId="string">
<label>S0 ID</label> <label>S0 ID</label>
</channel> </channel>
<channel id="s0-measured-voltage-pv-string" typeId="electric-potential"> <channel id="s0-pv-voltage" typeId="electric-potential">
<label>S0 Measured Voltage on PV String Side</label> <label>S0 Measured Voltage on PV String Side</label>
</channel> </channel>
<channel id="s0-measured-current-pv-string" typeId="electric-current"> <channel id="s0-pv-current" typeId="electric-current">
<label>S0 Measured Current on PV String Side</label> <label>S0 Measured Current on PV String Side</label>
</channel> </channel>
<channel id="s0-total-solar-energy" typeId="energy"> <channel id="s0-total-solar-energy" typeId="energy">
@ -296,10 +296,10 @@
<channel id="s1-id" typeId="string"> <channel id="s1-id" typeId="string">
<label>S1 ID</label> <label>S1 ID</label>
</channel> </channel>
<channel id="s1-measured-voltage-pv-string" typeId="electric-potential"> <channel id="s1-pv-voltage" typeId="electric-potential">
<label>S1 Measured Voltage on PV String Side</label> <label>S1 Measured Voltage on PV String Side</label>
</channel> </channel>
<channel id="s1-measured-current-pv-string" typeId="electric-current"> <channel id="s1-pv-current" typeId="electric-current">
<label>S1 Measured Current on PV String Side</label> <label>S1 Measured Current on PV String Side</label>
</channel> </channel>
<channel id="s1-total-solar-energy" typeId="energy"> <channel id="s1-total-solar-energy" typeId="energy">
@ -323,10 +323,10 @@
<channel id="s2-id" typeId="string"> <channel id="s2-id" typeId="string">
<label>S2 ID</label> <label>S2 ID</label>
</channel> </channel>
<channel id="s2-measured-voltage-pv-string" typeId="electric-potential"> <channel id="s2-pv-voltage" typeId="electric-potential">
<label>S2 Measured Voltage on PV String Side</label> <label>S2 Measured Voltage on PV String Side</label>
</channel> </channel>
<channel id="s2-measured-current-pv-string" typeId="electric-current"> <channel id="s2-pv-current" typeId="electric-current">
<label>S2 Measured Current on PV String Side</label> <label>S2 Measured Current on PV String Side</label>
</channel> </channel>
<channel id="s2-total-solar-energy" typeId="energy"> <channel id="s2-total-solar-energy" typeId="energy">
@ -350,10 +350,10 @@
<channel id="s3-id" typeId="string"> <channel id="s3-id" typeId="string">
<label>S3 ID</label> <label>S3 ID</label>
</channel> </channel>
<channel id="s3-measured-voltage-pv-string" typeId="electric-potential"> <channel id="s3-pv-voltage" typeId="electric-potential">
<label>S3 Measured Voltage on PV String Side</label> <label>S3 Measured Voltage on PV String Side</label>
</channel> </channel>
<channel id="s3-measured-current-pv-string" typeId="electric-current"> <channel id="s3-pv-current" typeId="electric-current">
<label>S3 Measured Current on PV String Side</label> <label>S3 Measured Current on PV String Side</label>
</channel> </channel>
<channel id="s3-total-solar-energy" typeId="energy"> <channel id="s3-total-solar-energy" typeId="energy">
@ -374,13 +374,13 @@
<channel id="s3-timestamp" typeId="date-time"> <channel id="s3-timestamp" typeId="date-time">
<label>S3 Time Stamp When Message was Published</label> <label>S3 Time Stamp When Message was Published</label>
</channel> </channel>
<channel id="eso-unique-identifier" typeId="string"> <channel id="eso-id" typeId="string">
<label>Eso Unique Identifier</label> <label>Eso Unique Identifier</label>
</channel> </channel>
<channel id="measured-voltage-battery" typeId="electric-potential"> <channel id="eso-voltage-battery" typeId="electric-potential">
<label>Eso Voltage Measured on Battery Side</label> <label>Eso Voltage Measured on Battery Side</label>
</channel> </channel>
<channel id="measured-current-battery" typeId="electric-current"> <channel id="eso-current-battery" typeId="electric-current">
<label>Eso Current Measured on Battery Side</label> <label>Eso Current Measured on Battery Side</label>
</channel> </channel>
<channel id="eso-battery-energy-produced" typeId="energy"> <channel id="eso-battery-energy-produced" typeId="energy">
@ -407,7 +407,7 @@
<channel id="eso-timestamp" typeId="date-time"> <channel id="eso-timestamp" typeId="date-time">
<label>Eso Time Stamp When Message was Published</label> <label>Eso Time Stamp When Message was Published</label>
</channel> </channel>
<channel id="esm-unique-identifier" typeId="string"> <channel id="esm-id" typeId="string">
<label>Esm Unique Identifier</label> <label>Esm Unique Identifier</label>
</channel> </channel>
<channel id="esm-soh" typeId="dimensionless"> <channel id="esm-soh" typeId="dimensionless">
@ -416,10 +416,10 @@
<channel id="esm-soc" typeId="dimensionless"> <channel id="esm-soc" typeId="dimensionless">
<label>Esm System State of Charge</label> <label>Esm System State of Charge</label>
</channel> </channel>
<channel id="esm-total-rated-capacity-all-batteries" typeId="energy"> <channel id="esm-total-capacity" typeId="energy">
<label>Esm Rated Capacity</label> <label>Esm Rated Capacity</label>
</channel> </channel>
<channel id="esm-rated-power-battery" typeId="power"> <channel id="esm-power-battery" typeId="power">
<label>Esm Rated Power of Battery</label> <label>Esm Rated Power of Battery</label>
</channel> </channel>
<channel id="esm-status" typeId="string"> <channel id="esm-status" typeId="string">