Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[homewizard] Add current, voltage and failure channels #16995

Merged
merged 18 commits into from
Oct 7, 2024
Merged

[homewizard] Add current, voltage and failure channels #16995

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
6a18acd
Add channels
lsiepel Jul 4, 2024
0f1a4c4
Adjust ordering
lsiepel Jul 4, 2024
0f500b2
Add two powerfailure channels
lsiepel Jul 7, 2024
5710ace
Merge branch 'openhab:main' into homewizard-endpoint
lsiepel Jul 8, 2024
61d834d
Spotless
lsiepel Jul 8, 2024
902411c
Add tests
lsiepel Jul 12, 2024
3c89661
Final adjustments
lsiepel Jul 12, 2024
1b73f1c
Different solution to extend/mock handler
lsiepel Jul 14, 2024
c72d7aa
Merge remote-tracking branch 'upstream/main' into homewizard-endpoint
lsiepel Aug 28, 2024
9a8b656
Corrections after merge
lsiepel Aug 28, 2024
50d8412
Final adjustments after merge
lsiepel Aug 28, 2024
b6482c6
Fix visibility
lsiepel Aug 28, 2024
44f9717
Merge branch 'main' into homewizard-endpoint
lsiepel Sep 14, 2024
bb0bfab
Review comments
lsiepel Sep 28, 2024
0c394b5
Spotless
lsiepel Sep 28, 2024
02d62ab
Adjust label - review comment
lsiepel Sep 29, 2024
f68bf70
Adjust timezoneprovider
lsiepel Sep 29, 2024
402b683
Update bundles/org.openhab.binding.homewizard/README.md
lsiepel Sep 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 27 additions & 17 deletions bundles/org.openhab.binding.homewizard/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,23 +48,33 @@ For DSMR5 meters this is generally once per second, for older versions the frequ

## Channels

| Channel ID | Item Type | Description |Available|
|------------------------|---------------------------|--------------------------------------------------------------------------------------------|---------|
| total_energy_import_t1 | Number:Energy | The most recently reported total imported energy in kWh by counter 1. | P,E |
| total_energy_import_t2 | Number:Energy | The most recently reported total imported energy in kWh by counter 2. | P |
| total_energy_export_t1 | Number:Energy | The most recently reported total exported energy in kWh by counter 1. | P,E |
| total_energy_export_t2 | Number:Energy | The most recently reported total exported energy in kWh by counter 2. | P |
| active_power | Number:Power | The current net total power in W. It will be below 0 if power is currently being exported. | P,E |
| active_power_l1 | Number:Power | The current net total power in W for phase 1. | P |
| active_power_l2 | Number:Power | The current net total power in W for phase 2. | P |
| active_power_l3 | Number:Power | The current net total power in W for phase 3. | P |
| total_gas | Number:Volume | The most recently reported total imported gas in m^3. | P |
| gas_timestamp | DateTime | The time stamp of the total_gas measurement. | P |
| total_water | Number:Volume | Total water used. | W |
| current_water | Number:VolumetricFlowRate | Current water usage. | W |
| power_switch | Switch | Controls the power switch of the socket. | E |
| power_lock | Switch | Controls the lock of the power switch (un/locking both the API and the physical button) | E |
| ring_brightness | Number:Dimensionless | Controls the brightness of the ring on the socket | E |
| Channel ID | Item Type | Description | Available |
|------------------------|---------------------------|--------------------------------------------------------------------------------------------|-----------|
| active_current | Number:ElectricCurrent | The combined current in A vor all phases | P,E |
| active_current_l1 | Number:ElectricCurrent | The active current in A for phase 1. | P |
| active_current_l2 | Number:ElectricCurrent | The active current in A for phase 2. | P |
| active_current_l3 | Number:ElectricCurrent | The active current in A for phase 3. | P |
| active_power | Number:Power | The current net total power in W. It will be below 0 if power is currently being exported. | P,E |
| active_power_l1 | Number:Power | The current net total power in W for phase 1. | P |
| active_power_l2 | Number:Power | The current net total power in W for phase 2. | P |
| active_power_l3 | Number:Power | The current net total power in W for phase 3. | P |
| active_voltage | Number:ElectricPotential | The active voltage in V | P |
| active_voltage_l1 | Number:ElectricPotential | The active voltage in V for phase 1. | P |
| active_voltage_l2 | Number:ElectricPotential | The active voltage in V for phase 2. | P |
| active_voltage_l3 | Number:ElectricPotential | The active voltage in V for phase 3. | P |
| total_energy_import_t1 | Number:Energy | The most recently reported total imported energy in kWh by counter 1. | P,E |
| total_energy_import_t2 | Number:Energy | The most recently reported total imported energy in kWh by counter 2. | P |
| total_energy_export_t1 | Number:Energy | The most recently reported total exported energy in kWh by counter 1. | P,E |
| total_energy_export_t2 | Number:Energy | The most recently reported total exported energy in kWh by counter 2. | P |
| total_gas | Number:Volume | The most recently reported total imported gas in m^3. | P |
| gas_timestamp | DateTime | The time stamp of the total_gas measurement. | P |
| total_water | Number:Volume | Total water used. | W |
| current_water | Number:VolumetricFlowRate | Current water usage. | W |
| any_power_failures | Number | The count of long power failures. | P |
| long_power_failures | Number | the count of any power failures. | P |
| power_switch | Switch | Controls the power switch of the socket. | E |
| power_lock | Switch | Controls the lock of the power switch (un/locking both the API and the physical button) | E |
| ring_brightness | Number:Dimensionless | Controls the brightness of the ring on the socket | E |

## Full Example

Expand Down
21 changes: 16 additions & 5 deletions ...ard/src/main/java/org/openhab/binding/homewizard/internal/HomeWizardBindingConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,27 @@ public class HomeWizardBindingConstants {
public static final ThingTypeUID THING_TYPE_WATERMETER = new ThingTypeUID(BINDING_ID, "watermeter");

// List of all Channel ids
public static final String CHANNEL_ENERGY_IMPORT_T1 = "total_energy_import_t1";
public static final String CHANNEL_ENERGY_IMPORT_T2 = "total_energy_import_t2";
public static final String CHANNEL_ENERGY_EXPORT_T1 = "total_energy_export_t1";
public static final String CHANNEL_ENERGY_EXPORT_T2 = "total_energy_export_t2";
public static final String CHANNEL_ACTIVE_CURRENT = "active_current";
public static final String CHANNEL_ACTIVE_CURRENT_L1 = "active_current_l1";
public static final String CHANNEL_ACTIVE_CURRENT_L2 = "active_current_l2";
public static final String CHANNEL_ACTIVE_CURRENT_L3 = "active_current_l3";
public static final String CHANNEL_ACTIVE_POWER = "active_power";
public static final String CHANNEL_ACTIVE_POWER_L1 = "active_power_l1";
public static final String CHANNEL_ACTIVE_POWER_L2 = "active_power_l2";
public static final String CHANNEL_ACTIVE_POWER_L3 = "active_power_l3";
public static final String CHANNEL_TOTAL_GAS = "total_gas";
public static final String CHANNEL_ACTIVE_VOLTAGE = "active_voltage";
public static final String CHANNEL_ACTIVE_VOLTAGE_L1 = "active_voltage_l1";
public static final String CHANNEL_ACTIVE_VOLTAGE_L2 = "active_voltage_l2";
public static final String CHANNEL_ACTIVE_VOLTAGE_L3 = "active_voltage_l3";
public static final String CHANNEL_ANY_POWER_FAILURES = "any_power_failures";
public static final String CHANNEL_LONG_POWER_FAILURES = "long_power_failures";
public static final String CHANNEL_ENERGY_IMPORT_T1 = "total_energy_import_t1";
public static final String CHANNEL_ENERGY_IMPORT_T2 = "total_energy_import_t2";
public static final String CHANNEL_ENERGY_EXPORT_T1 = "total_energy_export_t1";
public static final String CHANNEL_ENERGY_EXPORT_T2 = "total_energy_export_t2";

public static final String CHANNEL_GAS_TIMESTAMP = "gas_timestamp";
public static final String CHANNEL_GAS_TOTAL = "total_gas";
public static final String CHANNEL_TOTAL_WATER = "total_water";
public static final String CHANNEL_CURRENT_WATER = "current_water";

Expand Down
Loading