Skip to content

Drop "wi-fi” from model naming #624

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
DCSBL merged 1 commit into from
May 27, 2026
+73 −73
Merged

Drop "wi-fi” from model naming #624

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
14 changes: 7 additions & 7 deletions homewizard_energy/const.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ class Model(StrEnum):
}

MODEL_TO_NAME = {
Model.P1_METER: "Wi-Fi P1 Meter",
Model.ENERGY_SOCKET: "Wi-Fi Energy Socket",
Model.WATER_METER: "Wi-Fi Watermeter",
Model.P1_METER: "P1 Meter",
Model.ENERGY_SOCKET: "Energy Socket",
Model.WATER_METER: "Watermeter",
Model.DISPLAY: "Energy Display",
Model.ENERGY_METER_1_PHASE: "Wi-Fi kWh Meter 1-phase",
Model.ENERGY_METER_3_PHASE: "Wi-Fi kWh Meter 3-phase",
Model.ENERGY_METER_EASTRON_SDM230: "Wi-Fi kWh Meter 1-phase",
Model.ENERGY_METER_EASTRON_SDM630: "Wi-Fi kWh Meter 3-phase",
Model.ENERGY_METER_1_PHASE: "kWh Meter 1-phase",
Model.ENERGY_METER_3_PHASE: "kWh Meter 3-phase",
Model.ENERGY_METER_EASTRON_SDM230: "kWh Meter 1-phase",
Model.ENERGY_METER_EASTRON_SDM630: "kWh Meter 3-phase",
Model.BATTERY: "Plug-In Battery",
}
18 changes: 9 additions & 9 deletions tests/v1/__snapshots__/test_v1_combined_models.ambr
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions tests/v1/__snapshots__/test_v1_device.ambr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
# serializer version: 1
# name: test_device[HWE-KWH1-fixtures3]
Device(model_name='Wi-Fi kWh Meter 1-phase', id='appliance/energymeter/3c39e7aabbcc', product_name='kWh Meter', product_type='HWE-KWH1', serial='3c39e7aabbcc', api_version=<AwesomeVersion SemVer '1.0.0'>, firmware_version='2.11')
Device(model_name='kWh Meter 1-phase', id='appliance/energymeter/3c39e7aabbcc', product_name='kWh Meter', product_type='HWE-KWH1', serial='3c39e7aabbcc', api_version=<AwesomeVersion SemVer '1.0.0'>, firmware_version='2.11')
# ---
# name: test_device[HWE-KWH3-fixtures4]
Device(model_name='Wi-Fi kWh Meter 3-phase', id='appliance/energymeter/3c39e7aabbcc', product_name='kWh Meter 3-phase', product_type='HWE-KWH3', serial='3c39e7aabbcc', api_version=<AwesomeVersion SemVer '1.0.0'>, firmware_version='2.11')
Device(model_name='kWh Meter 3-phase', id='appliance/energymeter/3c39e7aabbcc', product_name='kWh Meter 3-phase', product_type='HWE-KWH3', serial='3c39e7aabbcc', api_version=<AwesomeVersion SemVer '1.0.0'>, firmware_version='2.11')
# ---
# name: test_device[HWE-P1-fixtures0]
Device(model_name='Wi-Fi P1 Meter', id='appliance/p1dongle/3c39e7aabbcc', product_name='P1 Meter', product_type='HWE-P1', serial='3c39e7aabbcc', api_version=<AwesomeVersion SemVer '1.0.0'>, firmware_version='2.11')
Device(model_name='P1 Meter', id='appliance/p1dongle/3c39e7aabbcc', product_name='P1 Meter', product_type='HWE-P1', serial='3c39e7aabbcc', api_version=<AwesomeVersion SemVer '1.0.0'>, firmware_version='2.11')
# ---
# name: test_device[HWE-SKT-fixtures1]
Device(model_name='Wi-Fi Energy Socket', id='appliance/energysocket/3c39e7aabbcc', product_name='Energy Socket', product_type='HWE-SKT', serial='3c39e7aabbcc', api_version=<AwesomeVersion SemVer '1.0.0'>, firmware_version='2.11')
Device(model_name='Energy Socket', id='appliance/energysocket/3c39e7aabbcc', product_name='Energy Socket', product_type='HWE-SKT', serial='3c39e7aabbcc', api_version=<AwesomeVersion SemVer '1.0.0'>, firmware_version='2.11')
# ---
# name: test_device[HWE-WTR-fixtures2]
Device(model_name='Wi-Fi Watermeter', id='appliance/watermeter/3c39e7aabbcc', product_name='Water Meter', product_type='HWE-WTR', serial='3c39e7aabbcc', api_version=<AwesomeVersion SemVer '1.0.0'>, firmware_version='2.11')
Device(model_name='Watermeter', id='appliance/watermeter/3c39e7aabbcc', product_name='Water Meter', product_type='HWE-WTR', serial='3c39e7aabbcc', api_version=<AwesomeVersion SemVer '1.0.0'>, firmware_version='2.11')
# ---
# name: test_device[SDM230-wifi-fixtures5]
Device(model_name='Wi-Fi kWh Meter 1-phase', id='appliance/energymeter/3c39e7aabbcc', product_name='kWh Meter', product_type='SDM230-wifi', serial='3c39e7aabbcc', api_version=<AwesomeVersion SemVer '1.0.0'>, firmware_version='2.11')
Device(model_name='kWh Meter 1-phase', id='appliance/energymeter/3c39e7aabbcc', product_name='kWh Meter', product_type='SDM230-wifi', serial='3c39e7aabbcc', api_version=<AwesomeVersion SemVer '1.0.0'>, firmware_version='2.11')
# ---
# name: test_device[SDM630-wifi-fixtures6]
Device(model_name='Wi-Fi kWh Meter 3-phase', id='appliance/energymeter/3c39e7aabbcc', product_name='kWh Meter 3-phase', product_type='SDM630-wifi', serial='3c39e7aabbcc', api_version=<AwesomeVersion SemVer '1.0.0'>, firmware_version='2.11')
Device(model_name='kWh Meter 3-phase', id='appliance/energymeter/3c39e7aabbcc', product_name='kWh Meter 3-phase', product_type='SDM630-wifi', serial='3c39e7aabbcc', api_version=<AwesomeVersion SemVer '1.0.0'>, firmware_version='2.11')
# ---
42 changes: 21 additions & 21 deletions tests/v1/__snapshots__/test_v1_homewizard_energy.ambr
View file
Open in desktop

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions tests/v1/__snapshots__/test_v1_models.ambr
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions tests/v2/__snapshots__/test_v2_device.ambr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
Device(model_name='Plug-In Battery', id='appliance/battery/5c2fafaabbcc', product_name='Plug-in Battery', product_type='HWE-BAT', serial='5c2fafaabbcc', api_version=<AwesomeVersion SemVer '2.0.0'>, firmware_version='6.00')
# ---
# name: test_device[HWE-KWH1-fixtures1]
Device(model_name='Wi-Fi kWh Meter 1-phase', id='appliance/energymeter/5c2fafaabbcc', product_name='kWh Meter 1-Phase', product_type='HWE-KWH1', serial='5c2fafaabbcc', api_version=<AwesomeVersion SemVer '2.1.0'>, firmware_version='6.00')
Device(model_name='kWh Meter 1-phase', id='appliance/energymeter/5c2fafaabbcc', product_name='kWh Meter 1-Phase', product_type='HWE-KWH1', serial='5c2fafaabbcc', api_version=<AwesomeVersion SemVer '2.1.0'>, firmware_version='6.00')
# ---
# name: test_device[HWE-KWH3-fixtures2]
Device(model_name='Wi-Fi kWh Meter 3-phase', id='appliance/energymeter/5c2fafaabbcc', product_name='kWh Meter 3-Phase', product_type='HWE-KWH3', serial='5c2fafaabbcc', api_version=<AwesomeVersion SemVer '2.1.0'>, firmware_version='6.00')
Device(model_name='kWh Meter 3-phase', id='appliance/energymeter/5c2fafaabbcc', product_name='kWh Meter 3-Phase', product_type='HWE-KWH3', serial='5c2fafaabbcc', api_version=<AwesomeVersion SemVer '2.1.0'>, firmware_version='6.00')
# ---
# name: test_device[HWE-P1-fixtures0]
Device(model_name='Wi-Fi P1 Meter', id='appliance/p1dongle/5c2fafaabbcc', product_name='P1 Meter', product_type='HWE-P1', serial='5c2fafaabbcc', api_version=<AwesomeVersion SemVer '2.0.0'>, firmware_version='6.00')
Device(model_name='P1 Meter', id='appliance/p1dongle/5c2fafaabbcc', product_name='P1 Meter', product_type='HWE-P1', serial='5c2fafaabbcc', api_version=<AwesomeVersion SemVer '2.0.0'>, firmware_version='6.00')
# ---
Loading
Loading