Skip to content

Commit

Permalink
Metadata and README requested changes
Browse files Browse the repository at this point in the history 
Co-authored-by: Jacob Laursen <jacob-github@vindvejr.dk>
Signed-off-by: Konstantin Polihronov <polychronov@gmail.com>
  • Loading branch information
@theater @jlaur
theater and jlaur committed Jul 26, 2023
1 parent 731b1d9 commit d5d90a4
Show file tree
Hide file tree
Showing 7 changed files with 159 additions and 164 deletions.
205 changes: 100 additions & 105 deletions bundles/org.openhab.binding.solax/README.md
View file

Large diffs are not rendered by default.

40 changes: 20 additions & 20 deletions ...binding.solax/src/main/java/org/openhab/binding/solax/internal/SolaxBindingConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,30 +42,30 @@ public class SolaxBindingConstants {
public static final String SERIAL_NUMBER = "serialWifi";
public static final String INVERTER_TYPE = "inverterType";

public static final String INVERTER_OUTPUT_POWER = "inverterOutputPower";
public static final String INVERTER_OUTPUT_CURRENT = "inverterCurrent";
public static final String INVERTER_OUTPUT_VOLTAGE = "inverterVoltage";
public static final String INVERTER_OUTPUT_FREQUENCY = "inverterFrequency";
public static final String INVERTER_OUTPUT_POWER = "inverter-output-power";
public static final String INVERTER_OUTPUT_CURRENT = "inverter-current";
public static final String INVERTER_OUTPUT_VOLTAGE = "inverter-voltage";
public static final String INVERTER_OUTPUT_FREQUENCY = "inverter-frequency";

public static final String INVERTER_PV1_POWER = "pv1Power";
public static final String INVERTER_PV1_VOLTAGE = "pv1Voltage";
public static final String INVERTER_PV1_CURRENT = "pv1Current";
public static final String INVERTER_PV1_POWER = "pv1-power";
public static final String INVERTER_PV1_VOLTAGE = "pv1-voltage";
public static final String INVERTER_PV1_CURRENT = "pv1-current";

public static final String INVERTER_PV2_POWER = "pv2Power";
public static final String INVERTER_PV2_VOLTAGE = "pv2Voltage";
public static final String INVERTER_PV2_CURRENT = "pv2Current";
public static final String INVERTER_PV2_POWER = "pv2-power";
public static final String INVERTER_PV2_VOLTAGE = "pv2-voltage";
public static final String INVERTER_PV2_CURRENT = "pv2-current";

public static final String INVERTER_PV_TOTAL_POWER = "pvTotalPower";
public static final String INVERTER_PV_TOTAL_CURRENT = "pvTotalCurrent";
public static final String INVERTER_PV_TOTAL_POWER = "pv-total-power";
public static final String INVERTER_PV_TOTAL_CURRENT = "pv-total-current";

public static final String BATTERY_POWER = "batteryPower";
public static final String BATTERY_VOLTAGE = "batteryVoltage";
public static final String BATTERY_CURRENT = "batteryCurrent";
public static final String BATTERY_TEMPERATURE = "batteryTemperature";
public static final String BATTERY_STATE_OF_CHARGE = "batteryStateOfCharge";
public static final String BATTERY_POWER = "battery-power";
public static final String BATTERY_VOLTAGE = "battery-voltage";
public static final String BATTERY_CURRENT = "battery-current";
public static final String BATTERY_TEMPERATURE = "battery-temperature";
public static final String BATTERY_STATE_OF_CHARGE = "battery-state-of-charge";

public static final String FEED_IN_POWER = "feedInPower";
public static final String FEED_IN_POWER = "feed-in-power";

public static final String TIMESTAMP = "lastUpdateTime";
public static final String RAW_DATA = "rawData";
public static final String TIMESTAMP = "last-update-time";
public static final String RAW_DATA = "raw-data";
}
1 change: 0 additions & 1 deletion ....binding.solax/src/main/java/org/openhab/binding/solax/internal/SolaxInverterHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ public void updateListener(InverterData data) {
}

private void transferInverterDataToChannels(InverterData data) {
// TODO check with reviewer if type and serial number is needed as a channel or as a property
updateProperty(SolaxBindingConstants.SERIAL_NUMBER, data.getWifiSerial());
updateProperty(SolaxBindingConstants.INVERTER_TYPE, data.getInverterType().name());

Expand Down
5 changes: 3 additions & 2 deletions bundles/org.openhab.binding.solax/src/main/resources/OH-INF/addon/addon.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
xsi:schemaLocation="https://openhab.org/schemas/addon/v1.0.0 https://openhab.org/schemas/addon-1.0.0.xsd">

<type>binding</type>
<name>solax Binding</name>
<description>This is the binding for solax.</description>
<name>Solax Binding</name>
<description>This is the binding for Solax inverters.</description>
<connection>local</connection>

</addon:addon>
10 changes: 5 additions & 5 deletions bundles/org.openhab.binding.solax/src/main/resources/OH-INF/thing/channel_types.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">

<channel-type id="frequency">
<item-type>Number</item-type>
<label>Electric frequency</label>
<description>Electric Frequency</description>
<item-type>Number:Frequency</item-type>
<label>Electric Frequency</label>
<description>Electric Frequency of the input/output voltage of the inverter</description>
</channel-type>
<channel-type id="battery-temperature">
<item-type>Number:Temperature</item-type>
Expand All @@ -19,10 +19,10 @@
<label>Last retrieve time stamp</label>
<description>Last time with a successful retrieval of data</description>
</channel-type>
<channel-type id="rawDataType">
<channel-type id="rawDataType" advanced="true">
<item-type>String</item-type>
<label>Raw Data</label>
<description>Raw data retrieved from system as JSON</description>
<description>Raw data retrieved from the system as a JSON</description>
</channel-type>

</thing:thing-descriptions>
58 changes: 29 additions & 29 deletions bundles/org.openhab.binding.solax/src/main/resources/OH-INF/thing/inverter.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,35 +14,35 @@
<description>The inverter representation in OpenHAB</description>

<channels>
<channel id="inverterOutputPower" typeId="system.electric-power"/>
<channel id="inverterCurrent" typeId="system.electric-current"/>
<channel id="inverterVoltage" typeId="system.electric-voltage"/>
<channel id="inverterFrequency" typeId="frequency"/>

<channel id="pv1Voltage" typeId="system.electric-voltage"/>
<channel id="pv2Voltage" typeId="system.electric-voltage"/>
<channel id="pv1Current" typeId="system.electric-current"/>
<channel id="pv2Current" typeId="system.electric-current"/>
<channel id="pv1Power" typeId="system.electric-power"/>
<channel id="pv2Power" typeId="system.electric-power"/>
<channel id="pvTotalPower" typeId="system.electric-power"/>
<channel id="pvTotalCurrent" typeId="system.electric-current"/>

<channel id="batteryPower" typeId="system.electric-power"/>
<channel id="batteryCurrent" typeId="system.electric-current"/>
<channel id="batteryVoltage" typeId="system.electric-voltage"/>
<channel id="batteryTemperature" typeId="battery-temperature"/>
<channel id="batteryStateOfCharge" typeId="system.battery-level"/>

<channel id="feedInPower" typeId="system.electric-power"/>

<channel id="lastUpdateTime" typeId="lastRetrieveTimeStamp"/>

<channel id="rawData" typeId="rawDataType"/>

<channel id="onGridTotalYield" typeId="system.electric-power"/>
<channel id="onGridDailyYield" typeId="system.electric-power"/>
<channel id="onTotalFeedinEnergy" typeId="system.electric-power"/>
<channel id="inverter-output-power" typeId="system.electric-power"/>
<channel id="inverter-current" typeId="system.electric-current"/>
<channel id="inverter-voltage" typeId="system.electric-voltage"/>
<channel id="inverter-frequency" typeId="frequency"/>

<channel id="pv1-voltage" typeId="system.electric-voltage"/>
<channel id="pv2-voltage" typeId="system.electric-voltage"/>
<channel id="pv1-current" typeId="system.electric-current"/>
<channel id="pv2-current" typeId="system.electric-current"/>
<channel id="pv1-power" typeId="system.electric-power"/>
<channel id="pv2-power" typeId="system.electric-power"/>
<channel id="pv-total-power" typeId="system.electric-power"/>
<channel id="pv-total-current" typeId="system.electric-current"/>

<channel id="battery-power" typeId="system.electric-power"/>
<channel id="battery-current" typeId="system.electric-current"/>
<channel id="battery-voltage" typeId="system.electric-voltage"/>
<channel id="battery-temperature" typeId="battery-temperature"/>
<channel id="battery-state-of-charge" typeId="system.battery-level"/>

<channel id="feed-in-power" typeId="system.electric-power"/>

<channel id="last-update-time" typeId="lastRetrieveTimeStamp"/>

<channel id="raw-data" typeId="rawDataType"/>

<channel id="on-grid-total-yield" typeId="system.electric-power"/>
<channel id="on-grid-daily-yield" typeId="system.electric-power"/>
<channel id="on-total-feedin-energy" typeId="system.electric-power"/>
</channels>

<properties>
Expand Down
4 changes: 2 additions & 2 deletions bundles/org.openhab.binding.solax/src/main/resources/OH-INF/thing/local_ip_bridge.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
</parameter>
<parameter name="password" type="text" required="true">
<label>Password</label>
<description>Password for accessing the Wifi module (the serial number of the wifi)</description>
<description>Password for accessing the Wi-Fi module (the serial number of the Wi-Fi module)</description>
<context>password</context>
</parameter>
<parameter name="hostname" type="text" required="true">
<label>Network Address</label>
<description>IP address or host name of the wifi</description>
<description>IP address or the host name of the Wi-Fi module</description>
<context>network-address</context>
</parameter>
</config-description>
Expand Down

0 comments on commit d5d90a4

Please sign in to comment.