Skip to content

[homewizard] Add support for kWh meter, Plug-in Battery and API v2. #18099

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

Merged
lsiepel merged 9 commits into from
Mar 2, 2025
Merged

[homewizard] Add support for kWh meter, Plug-in Battery and API v2. #18099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
80ea317
Added support for kWh meter, Plug-in Battery and API v2.
Jan 12, 2025
a768643
Removed unused packages
Jan 14, 2025
c08ad68
Removed unused packages part 2
Jan 14, 2025
d6d94c1
Update bundles/org.openhab.binding.homewizard/src/main/resources/OH-I…
GearrelW Feb 20, 2025
203ec65
Update bundles/org.openhab.binding.homewizard/src/main/resources/OH-I…
GearrelW Feb 20, 2025
8f4b7a2
Changes after review comments
Feb 20, 2025
ed83cab
Merge and fix
Feb 20, 2025
0a1dd6c
More comments and a fix
Feb 20, 2025
a10f093
Fix for send command errors
Mar 1, 2025
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
108 changes: 65 additions & 43 deletions bundles/org.openhab.binding.homewizard/README.md
View file
Open in desktop

Large diffs are not rendered by default.

103 changes: 84 additions & 19 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 @@ -20,46 +20,111 @@
* used across the full binding.
*
* @author Daniël van Os - Initial contribution
* @author Gearrel Welvaart - Added constants
*
*/
@NonNullByDefault
public class HomeWizardBindingConstants {

private static final String BINDING_ID = "homewizard";

// List of supported devices
public static final String HWE_P1 = "hwe-p1";
public static final String HWE_SKT = "hwe-skt";
public static final String HWE_WTR = "hwe-wtr";
public static final String HWE_KWH = "hwe-kwh";
public static final String HWE_KWH1 = "hwe-kwh1";
public static final String HWE_KWH3 = "hwe-kwh3";
public static final String SDM230_WIFI = "sdm230-wifi";
public static final String SDM630_WIFI = "sdm630-wifi";
public static final String HWE_BAT = "hwe-bat";

// List of all Thing Type UIDs
public static final ThingTypeUID THING_TYPE_HWE_P1 = new ThingTypeUID(BINDING_ID, HWE_P1);
public static final ThingTypeUID THING_TYPE_HWE_SKT = new ThingTypeUID(BINDING_ID, HWE_SKT);
public static final ThingTypeUID THING_TYPE_HWE_WTR = new ThingTypeUID(BINDING_ID, HWE_WTR);
public static final ThingTypeUID THING_TYPE_HWE_KWH = new ThingTypeUID(BINDING_ID, HWE_KWH);
public static final ThingTypeUID THING_TYPE_HWE_BAT = new ThingTypeUID(BINDING_ID, HWE_BAT);

public static final ThingTypeUID THING_TYPE_P1_METER = new ThingTypeUID(BINDING_ID, "p1_wifi_meter");
public static final ThingTypeUID THING_TYPE_ENERGY_SOCKET = new ThingTypeUID(BINDING_ID, "energy_socket");
public static final ThingTypeUID THING_TYPE_WATERMETER = new ThingTypeUID(BINDING_ID, "watermeter");

// List of all Channel ids
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_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";
// Channel Groups
public static final String CHANNEL_GROUP_ENERGY = "energy";
public static final String CHANNEL_GROUP_WATER = "water";
public static final String CHANNEL_GROUP_SKT_CONTROL = "control";

// Energy Meter Channels
public static final String CHANNEL_ENERGY_IMPORT = "energy_import";
public static final String CHANNEL_ENERGY_IMPORT_T1 = "energy_import_t1";
public static final String CHANNEL_ENERGY_IMPORT_T2 = "energy_import_t2";
public static final String LEGACY_CHANNEL_ENERGY_IMPORT_T1 = "total_energy_import_t1";
public static final String LEGACY_CHANNEL_ENERGY_IMPORT_T2 = "total_energy_import_t2";

public static final String CHANNEL_ENERGY_EXPORT = "energy_export";
public static final String CHANNEL_ENERGY_EXPORT_T1 = "energy_export_t1";
public static final String CHANNEL_ENERGY_EXPORT_T2 = "energy_export_t2";
public static final String LEGACY_CHANNEL_ENERGY_EXPORT_T1 = "total_energy_export_t1";
public static final String LEGACY_CHANNEL_ENERGY_EXPORT_T2 = "total_energy_export_t2";

public static final String CHANNEL_POWER = "power";
public static final String CHANNEL_POWER_L1 = "power_l1";
public static final String CHANNEL_POWER_L2 = "power_l2";
public static final String CHANNEL_POWER_L3 = "power_l3";
public static final String LEGACY_CHANNEL_POWER = "active_power";
public static final String LEGACY_CHANNEL_POWER_L1 = "active_power_l1";
public static final String LEGACY_CHANNEL_POWER_L2 = "active_power_l2";
public static final String LEGACY_CHANNEL_POWER_L3 = "active_power_l3";

public static final String CHANNEL_VOLTAGE = "voltage";
public static final String CHANNEL_VOLTAGE_L1 = "voltage_l1";
public static final String CHANNEL_VOLTAGE_L2 = "voltage_l2";
public static final String CHANNEL_VOLTAGE_L3 = "voltage_l3";
public static final String LEGACY_CHANNEL_VOLTAGE = "active_voltage";
public static final String LEGACY_CHANNEL_VOLTAGE_L1 = "active_voltage_l1";
public static final String LEGACY_CHANNEL_VOLTAGE_L2 = "active_voltage_l2";
public static final String LEGACY_CHANNEL_VOLTAGE_L3 = "active_voltage_l3";

public static final String CHANNEL_CURRENT = "current";
public static final String CHANNEL_CURRENT_L1 = "current_l1";
public static final String CHANNEL_CURRENT_L2 = "current_l2";
public static final String CHANNEL_CURRENT_L3 = "current_l3";
public static final String LEGACY_CHANNEL_CURRENT = "active_current";
public static final String LEGACY_CHANNEL_CURRENT_L1 = "active_current_l1";
public static final String LEGACY_CHANNEL_CURRENT_L2 = "active_current_l2";
public static final String LEGACY_CHANNEL_CURRENT_L3 = "active_current_l3";

public static final String CHANNEL_FREQUENCY = "frequency";

// P1 Meter Channels
public static final String CHANNEL_POWER_FAILURES = "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";

// Energy Socket And kWh Meter Channels
public static final String CHANNEL_REACTIVE_POWER = "reactive_power";
public static final String CHANNEL_APPARENT_POWER = "apparent_power";
public static final String CHANNEL_POWER_FACTOR = "power_factor";

// Water Meter Channels
public static final String CHANNEL_ACTIVE_LITER = "active_liter";
public static final String CHANNEL_TOTAL_LITER = "total_liter";
public static final String LEGACY_CHANNEL_ACTIVE_LITER = "active_water";
public static final String LEGACY_CHANNEL_TOTAL_LITER = "total_water";

// Plug-In Battery Channels
public static final String CHANNEL_STATE_OF_CHARGE = "state_of_charge";
public static final String CHANNEL_CYCLES = "cycles";

// Energy Socket Control Channels
public static final String CHANNEL_POWER_SWITCH = "power_switch";
public static final String CHANNEL_POWER_LOCK = "power_lock";
public static final String CHANNEL_RING_BRIGHTNESS = "ring_brightness";

//
public static final String PROPERTY_METER_MODEL = "meterModel";
public static final String PROPERTY_METER_VERSION = "meterVersion";
}
12 changes: 12 additions & 0 deletions ...wizard/src/main/java/org/openhab/binding/homewizard/internal/HomeWizardConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
* The {@link HomeWizardConfiguration} class contains fields mapping thing configuration parameters.
*
* @author Daniël van Os - Initial contribution
* @author Gearrel Welvaart - Added API version
*
*/
@NonNullByDefault
public class HomeWizardConfiguration {
Expand All @@ -31,4 +33,14 @@ public class HomeWizardConfiguration {
* Refresh delay in seconds
*/
public Integer refreshDelay = 5;

/**
* The API version to be used
*/
public Integer apiVersion = 1;

/**
* Bearer token for API v2
*/
public String bearerToken = "";
}
Loading