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

Update brand information #389

Merged
merged 1 commit into from
Jul 22, 2024
Merged

Update brand information #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Binary file modified .coverage
View file
Open in desktop
Binary file not shown.
10 changes: 5 additions & 5 deletions homewizard_energy/brand.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def __eq__(self, other):
),
Product(
"HWE-SKT",
"Energy Socket",
"Wi-Fi Energy Socket",
"https://www.homewizard.com/energy-socket/",
"Measure and switch every device.",
),
Expand All @@ -55,25 +55,25 @@ def __eq__(self, other):
),
Product(
"HWE-KWH1",
"Wi-Fi kWh meter 1-phase",
"Wi-Fi kWh Meter 1-phase",
"https://www.homewizard.com/kwh-meter/",
"Measure solar panels, car chargers and more.",
),
Product(
"HWE-KWH3",
"Wi-Fi kWh meter 3-phase",
"Wi-Fi kWh Meter 3-phase",
"https://www.homewizard.com/kwh-meter/",
"Measure solar panels, car chargers and more.",
),
Product(
"SDM230-wifi",
"Wi-Fi kWh meter 1-phase",
"Wi-Fi kWh Meter 1-phase",
"https://www.homewizard.com/kwh-meter/",
"Measure solar panels, car chargers and more.",
),
Product(
"SDM630-wifi",
"Wi-Fi kWh meter 3-phase",
"Wi-Fi kWh Meter 3-phase",
"https://www.homewizard.com/kwh-meter/",
"Measure solar panels, car chargers and more.",
),
Expand Down
20 changes: 10 additions & 10 deletions tests/__snapshots__/test_brand.ambr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
# serializer version: 1
# name: test_known_product_strings[HWE-KWH1]
'HomeWizard Wi-Fi kWh meter 1-phase - HWE-KWH1'
'HomeWizard Wi-Fi kWh Meter 1-phase - HWE-KWH1'
# ---
# name: test_known_product_strings[HWE-KWH3]
'HomeWizard Wi-Fi kWh meter 3-phase - HWE-KWH3'
'HomeWizard Wi-Fi kWh Meter 3-phase - HWE-KWH3'
# ---
# name: test_known_product_strings[HWE-P1]
'HomeWizard Wi-Fi P1 Meter - HWE-P1'
# ---
# name: test_known_product_strings[HWE-SKT]
'HomeWizard Energy Socket - HWE-SKT'
'HomeWizard Wi-Fi Energy Socket - HWE-SKT'
# ---
# name: test_known_product_strings[HWE-WTR]
'HomeWizard Wi-Fi Watermeter - HWE-WTR'
# ---
# name: test_known_product_strings[SDM230-wifi]
'HomeWizard Wi-Fi kWh meter 1-phase - SDM230-wifi'
'HomeWizard Wi-Fi kWh Meter 1-phase - SDM230-wifi'
# ---
# name: test_known_product_strings[SDM630-wifi]
'HomeWizard Wi-Fi kWh meter 3-phase - SDM630-wifi'
'HomeWizard Wi-Fi kWh Meter 3-phase - SDM630-wifi'
# ---
# name: test_known_products[HWE-KWH1]
Product(model='HWE-KWH1', name='Wi-Fi kWh meter 1-phase', url='https://www.homewizard.com/kwh-meter/', description='Measure solar panels, car chargers and more.')
Product(model='HWE-KWH1', name='Wi-Fi kWh Meter 1-phase', url='https://www.homewizard.com/kwh-meter/', description='Measure solar panels, car chargers and more.')
# ---
# name: test_known_products[HWE-KWH3]
Product(model='HWE-KWH3', name='Wi-Fi kWh meter 3-phase', url='https://www.homewizard.com/kwh-meter/', description='Measure solar panels, car chargers and more.')
Product(model='HWE-KWH3', name='Wi-Fi kWh Meter 3-phase', url='https://www.homewizard.com/kwh-meter/', description='Measure solar panels, car chargers and more.')
# ---
# name: test_known_products[HWE-P1]
Product(model='HWE-P1', name='Wi-Fi P1 Meter', url='https://www.homewizard.com/p1-meter/', description='The HomeWizard P1 Meter gives you detailed insight in your electricity-, gas consumption and solar surplus.')
# ---
# name: test_known_products[HWE-SKT]
Product(model='HWE-SKT', name='Energy Socket', url='https://www.homewizard.com/energy-socket/', description='Measure and switch every device.')
Product(model='HWE-SKT', name='Wi-Fi Energy Socket', url='https://www.homewizard.com/energy-socket/', description='Measure and switch every device.')
# ---
# name: test_known_products[HWE-WTR]
Product(model='HWE-WTR', name='Wi-Fi Watermeter', url='https://www.homewizard.com/watermeter/', description='Real-time water consumption insights')
# ---
# name: test_known_products[SDM230-wifi]
Product(model='SDM230-wifi', name='Wi-Fi kWh meter 1-phase', url='https://www.homewizard.com/kwh-meter/', description='Measure solar panels, car chargers and more.')
Product(model='SDM230-wifi', name='Wi-Fi kWh Meter 1-phase', url='https://www.homewizard.com/kwh-meter/', description='Measure solar panels, car chargers and more.')
# ---
# name: test_known_products[SDM630-wifi]
Product(model='SDM630-wifi', name='Wi-Fi kWh meter 3-phase', url='https://www.homewizard.com/kwh-meter/', description='Measure solar panels, car chargers and more.')
Product(model='SDM630-wifi', name='Wi-Fi kWh Meter 3-phase', url='https://www.homewizard.com/kwh-meter/', description='Measure solar panels, car chargers and more.')
# ---
# name: test_unknown_or_invalid_products[HWE-P2]
None
Expand Down
10 changes: 5 additions & 5 deletions tests/__snapshots__/test_homewizard_energy.ambr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,25 +60,25 @@
Data(wifi_ssid='HW WiFi', wifi_strength=84, smr_version=None, meter_model=None, unique_meter_id=None, active_tariff=None, total_energy_import_kwh=2940.101, total_energy_import_t1_kwh=2940.101, total_energy_import_t2_kwh=None, total_energy_import_t3_kwh=None, total_energy_import_t4_kwh=None, total_energy_export_kwh=0, total_energy_export_t1_kwh=0, total_energy_export_t2_kwh=None, total_energy_export_t3_kwh=None, total_energy_export_t4_kwh=None, active_power_w=7100.278, active_power_l1_w=0, active_power_l2_w=3547.015, active_power_l3_w=3553.263, active_voltage_v=None, active_voltage_l1_v=230.751, active_voltage_l2_v=228.391, active_voltage_l3_v=229.612, active_current_a=30.999, active_current_l1_a=0, active_current_l2_a=15.521, active_current_l3_a=15.477, active_apparent_power_va=7112.293, active_apparent_power_l1_va=0, active_apparent_power_l2_va=3548.879, active_apparent_power_l3_va=3563.414, active_reactive_power_var=-429.025, active_reactive_power_l1_var=0, active_reactive_power_l2_var=-166.675, active_reactive_power_l3_var=-262.35, active_power_factor=None, active_power_factor_l1=1, active_power_factor_l2=0.999, active_power_factor_l3=0.997, active_frequency_hz=49.926, voltage_sag_l1_count=None, voltage_sag_l2_count=None, voltage_sag_l3_count=None, voltage_swell_l1_count=None, voltage_swell_l2_count=None, voltage_swell_l3_count=None, any_power_fail_count=None, long_power_fail_count=None, active_power_average_w=None, monthly_power_peak_w=None, monthly_power_peak_timestamp=None, total_gas_m3=None, gas_timestamp=None, gas_unique_id=None, active_liter_lpm=None, total_liter_m3=None, external_devices=None)
# ---
# name: test_get_device_object[HWE-KWH1-fixtures3]
Device(product=Product(model='HWE-KWH1', name='Wi-Fi kWh meter 1-phase', url='https://www.homewizard.com/kwh-meter/', description='Measure solar panels, car chargers and more.'), product_name='kWh Meter', product_type='HWE-KWH1', serial='3c39e7aabbcc', api_version='v1', firmware_version='2.11')
Device(product=Product(model='HWE-KWH1', name='Wi-Fi kWh Meter 1-phase', url='https://www.homewizard.com/kwh-meter/', description='Measure solar panels, car chargers and more.'), product_name='kWh Meter', product_type='HWE-KWH1', serial='3c39e7aabbcc', api_version='v1', firmware_version='2.11')
# ---
# name: test_get_device_object[HWE-KWH3-fixtures4]
Device(product=Product(model='HWE-KWH3', name='Wi-Fi kWh meter 3-phase', url='https://www.homewizard.com/kwh-meter/', description='Measure solar panels, car chargers and more.'), product_name='kWh Meter 3-phase', product_type='HWE-KWH3', serial='3c39e7aabbcc', api_version='v1', firmware_version='2.11')
Device(product=Product(model='HWE-KWH3', name='Wi-Fi kWh Meter 3-phase', url='https://www.homewizard.com/kwh-meter/', description='Measure solar panels, car chargers and more.'), product_name='kWh Meter 3-phase', product_type='HWE-KWH3', serial='3c39e7aabbcc', api_version='v1', firmware_version='2.11')
# ---
# name: test_get_device_object[HWE-P1-fixtures0]
Device(product=Product(model='HWE-P1', name='Wi-Fi P1 Meter', url='https://www.homewizard.com/p1-meter/', description='The HomeWizard P1 Meter gives you detailed insight in your electricity-, gas consumption and solar surplus.'), product_name='P1 Meter', product_type='HWE-P1', serial='3c39e7aabbcc', api_version='v1', firmware_version='2.11')
# ---
# name: test_get_device_object[HWE-SKT-fixtures1]
Device(product=Product(model='HWE-SKT', name='Energy Socket', url='https://www.homewizard.com/energy-socket/', description='Measure and switch every device.'), product_name='Energy Socket', product_type='HWE-SKT', serial='3c39e7aabbcc', api_version='v1', firmware_version='2.11')
Device(product=Product(model='HWE-SKT', name='Wi-Fi Energy Socket', url='https://www.homewizard.com/energy-socket/', description='Measure and switch every device.'), product_name='Energy Socket', product_type='HWE-SKT', serial='3c39e7aabbcc', api_version='v1', firmware_version='2.11')
# ---
# name: test_get_device_object[HWE-WTR-fixtures2]
Device(product=Product(model='HWE-WTR', name='Wi-Fi Watermeter', url='https://www.homewizard.com/watermeter/', description='Real-time water consumption insights'), product_name='Water Meter', product_type='HWE-WTR', serial='3c39e7aabbcc', api_version='v1', firmware_version='2.11')
# ---
# name: test_get_device_object[SDM230-wifi-fixtures5]
Device(product=Product(model='SDM230-wifi', name='Wi-Fi kWh meter 1-phase', url='https://www.homewizard.com/kwh-meter/', description='Measure solar panels, car chargers and more.'), product_name='kWh Meter', product_type='SDM230-wifi', serial='3c39e7aabbcc', api_version='v1', firmware_version='2.11')
Device(product=Product(model='SDM230-wifi', name='Wi-Fi kWh Meter 1-phase', url='https://www.homewizard.com/kwh-meter/', description='Measure solar panels, car chargers and more.'), product_name='kWh Meter', product_type='SDM230-wifi', serial='3c39e7aabbcc', api_version='v1', firmware_version='2.11')
# ---
# name: test_get_device_object[SDM630-wifi-fixtures6]
Device(product=Product(model='SDM630-wifi', name='Wi-Fi kWh meter 3-phase', url='https://www.homewizard.com/kwh-meter/', description='Measure solar panels, car chargers and more.'), product_name='kWh Meter 3-phase', product_type='SDM630-wifi', serial='3c39e7aabbcc', api_version='v1', firmware_version='2.11')
Device(product=Product(model='SDM630-wifi', name='Wi-Fi kWh Meter 3-phase', url='https://www.homewizard.com/kwh-meter/', description='Measure solar panels, car chargers and more.'), product_name='kWh Meter 3-phase', product_type='SDM630-wifi', serial='3c39e7aabbcc', api_version='v1', firmware_version='2.11')
# ---
# name: test_get_state_object[HWE-SKT-fixtures0]
State(power_on=False, switch_lock=False, brightness=255)
Expand Down
10 changes: 5 additions & 5 deletions tests/__snapshots__/test_models.ambr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,25 +33,25 @@
Data(wifi_ssid='HW WiFi', wifi_strength=84, smr_version=None, meter_model=None, unique_meter_id=None, active_tariff=None, total_energy_import_kwh=2940.101, total_energy_import_t1_kwh=2940.101, total_energy_import_t2_kwh=None, total_energy_import_t3_kwh=None, total_energy_import_t4_kwh=None, total_energy_export_kwh=0, total_energy_export_t1_kwh=0, total_energy_export_t2_kwh=None, total_energy_export_t3_kwh=None, total_energy_export_t4_kwh=None, active_power_w=7100.278, active_power_l1_w=0, active_power_l2_w=3547.015, active_power_l3_w=3553.263, active_voltage_v=None, active_voltage_l1_v=230.751, active_voltage_l2_v=228.391, active_voltage_l3_v=229.612, active_current_a=30.999, active_current_l1_a=0, active_current_l2_a=15.521, active_current_l3_a=15.477, active_apparent_power_va=7112.293, active_apparent_power_l1_va=0, active_apparent_power_l2_va=3548.879, active_apparent_power_l3_va=3563.414, active_reactive_power_var=-429.025, active_reactive_power_l1_var=0, active_reactive_power_l2_var=-166.675, active_reactive_power_l3_var=-262.35, active_power_factor=None, active_power_factor_l1=1, active_power_factor_l2=0.999, active_power_factor_l3=0.997, active_frequency_hz=49.926, voltage_sag_l1_count=None, voltage_sag_l2_count=None, voltage_sag_l3_count=None, voltage_swell_l1_count=None, voltage_swell_l2_count=None, voltage_swell_l3_count=None, any_power_fail_count=None, long_power_fail_count=None, active_power_average_w=None, monthly_power_peak_w=None, monthly_power_peak_timestamp=None, total_gas_m3=None, gas_timestamp=None, gas_unique_id=None, active_liter_lpm=None, total_liter_m3=None, external_devices=None)
# ---
# name: test_device[HWE-KWH1-fixtures3]
Device(product=Product(model='HWE-KWH1', name='Wi-Fi kWh meter 1-phase', url='https://www.homewizard.com/kwh-meter/', description='Measure solar panels, car chargers and more.'), product_name='kWh Meter', product_type='HWE-KWH1', serial='3c39e7aabbcc', api_version='v1', firmware_version='2.11')
Device(product=Product(model='HWE-KWH1', name='Wi-Fi kWh Meter 1-phase', url='https://www.homewizard.com/kwh-meter/', description='Measure solar panels, car chargers and more.'), product_name='kWh Meter', product_type='HWE-KWH1', serial='3c39e7aabbcc', api_version='v1', firmware_version='2.11')
# ---
# name: test_device[HWE-KWH3-fixtures4]
Device(product=Product(model='HWE-KWH3', name='Wi-Fi kWh meter 3-phase', url='https://www.homewizard.com/kwh-meter/', description='Measure solar panels, car chargers and more.'), product_name='kWh Meter 3-phase', product_type='HWE-KWH3', serial='3c39e7aabbcc', api_version='v1', firmware_version='2.11')
Device(product=Product(model='HWE-KWH3', name='Wi-Fi kWh Meter 3-phase', url='https://www.homewizard.com/kwh-meter/', description='Measure solar panels, car chargers and more.'), product_name='kWh Meter 3-phase', product_type='HWE-KWH3', serial='3c39e7aabbcc', api_version='v1', firmware_version='2.11')
# ---
# name: test_device[HWE-P1-fixtures0]
Device(product=Product(model='HWE-P1', name='Wi-Fi P1 Meter', url='https://www.homewizard.com/p1-meter/', description='The HomeWizard P1 Meter gives you detailed insight in your electricity-, gas consumption and solar surplus.'), product_name='P1 Meter', product_type='HWE-P1', serial='3c39e7aabbcc', api_version='v1', firmware_version='2.11')
# ---
# name: test_device[HWE-SKT-fixtures1]
Device(product=Product(model='HWE-SKT', name='Energy Socket', url='https://www.homewizard.com/energy-socket/', description='Measure and switch every device.'), product_name='Energy Socket', product_type='HWE-SKT', serial='3c39e7aabbcc', api_version='v1', firmware_version='2.11')
Device(product=Product(model='HWE-SKT', name='Wi-Fi Energy Socket', url='https://www.homewizard.com/energy-socket/', description='Measure and switch every device.'), product_name='Energy Socket', product_type='HWE-SKT', serial='3c39e7aabbcc', api_version='v1', firmware_version='2.11')
# ---
# name: test_device[HWE-WTR-fixtures2]
Device(product=Product(model='HWE-WTR', name='Wi-Fi Watermeter', url='https://www.homewizard.com/watermeter/', description='Real-time water consumption insights'), product_name='Water Meter', product_type='HWE-WTR', serial='3c39e7aabbcc', api_version='v1', firmware_version='2.11')
# ---
# name: test_device[SDM230-wifi-fixtures5]
Device(product=Product(model='SDM230-wifi', name='Wi-Fi kWh meter 1-phase', url='https://www.homewizard.com/kwh-meter/', description='Measure solar panels, car chargers and more.'), product_name='kWh Meter', product_type='SDM230-wifi', serial='3c39e7aabbcc', api_version='v1', firmware_version='2.11')
Device(product=Product(model='SDM230-wifi', name='Wi-Fi kWh Meter 1-phase', url='https://www.homewizard.com/kwh-meter/', description='Measure solar panels, car chargers and more.'), product_name='kWh Meter', product_type='SDM230-wifi', serial='3c39e7aabbcc', api_version='v1', firmware_version='2.11')
# ---
# name: test_device[SDM630-wifi-fixtures6]
Device(product=Product(model='SDM630-wifi', name='Wi-Fi kWh meter 3-phase', url='https://www.homewizard.com/kwh-meter/', description='Measure solar panels, car chargers and more.'), product_name='kWh Meter 3-phase', product_type='SDM630-wifi', serial='3c39e7aabbcc', api_version='v1', firmware_version='2.11')
Device(product=Product(model='SDM630-wifi', name='Wi-Fi kWh Meter 3-phase', url='https://www.homewizard.com/kwh-meter/', description='Measure solar panels, car chargers and more.'), product_name='kWh Meter 3-phase', product_type='SDM630-wifi', serial='3c39e7aabbcc', api_version='v1', firmware_version='2.11')
# ---
# name: test_state[HWE-SKT-fixtures0]
State(power_on=False, switch_lock=False, brightness=255)
Expand Down
Loading