Skip to content

New Feature: show model_id's of all devices (Adam, Anna, not for legacy gateways). #710

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
merged 8 commits into from
Sep 12, 2024
Merged

New Feature: show model_id's of all devices (Adam, Anna, not for legacy gateways). #710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4961975
Link to plugwise v1.3.0
bouwew Sep 11, 2024
4a1c12b
Updated relevant test-fixtures
bouwew Sep 11, 2024
4c01c35
Add model_id to DeviceInfo
bouwew Sep 11, 2024
05d8867
Import MODEL_ID
bouwew Sep 11, 2024
fb807fe
Link to plugwise v1.3.1
bouwew Sep 11, 2024
9df432e
Save updated diagnostics file
bouwew Sep 11, 2024
3aabbba
Bump to v0.53.0 release-version
bouwew Sep 11, 2024
bfe2640
Update CHANGELOG
bouwew Sep 11, 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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Versions from 0.40 and up

## v0.53.0

- New Feature: show model_id's of all devices (Adam, Anna, and P1, not for legacy gateways).

## v0.52.2

- Battery-state binary_sensors improvements via plugwise [v1.2.0](https://github.com/plugwise/python-plugwise/releases/tag/v1.2.0)
Expand Down
1 change: 1 addition & 0 deletions custom_components/plugwise/const.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
GATEWAY_ID: Final = "gateway_id"
HARDWARE: Final = "hardware"
MODEL: Final = "model"
MODEL_ID: Final = "model_id"
SMILE_NAME: Final = "smile_name"
VENDOR: Final = "vendor"

Expand Down
2 changes: 2 additions & 0 deletions custom_components/plugwise/entity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
HARDWARE,
MAC_ADDRESS,
MODEL,
MODEL_ID,
SMILE_NAME,
VENDOR,
ZIGBEE_MAC_ADDRESS,
Expand Down Expand Up @@ -60,6 +61,7 @@ def __init__(
connections=connections,
manufacturer=data.get(VENDOR),
model=data.get(MODEL),
model_id=data.get(MODEL_ID),
name=coordinator.data.gateway[SMILE_NAME],
sw_version=data.get(FIRMWARE),
hw_version=data.get(HARDWARE),
Expand Down
4 changes: 2 additions & 2 deletions custom_components/plugwise/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"integration_type": "hub",
"iot_class": "local_polling",
"loggers": ["plugwise"],
"requirements": ["plugwise==1.2.0"],
"version": "0.52.2",
"requirements": ["plugwise==1.3.1"],
"version": "0.53.0",
"zeroconf": ["_plugwise._tcp.local."]
}
3 changes: 2 additions & 1 deletion tests/components/plugwise/fixtures/anna_heatpump_heating/all_data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"location": "a57efe5f145f498c9be62a9b63626fbf",
"mac_address": "012345670001",
"model": "Gateway",
"model_id": "smile_thermo",
"name": "Smile Anna",
"sensors": {
"outdoor_temperature": 20.2
Expand Down Expand Up @@ -97,7 +98,7 @@
"cooling_present": true,
"gateway_id": "015ae9ea3f964e668e490fa39da3870b",
"heater_id": "1cbf783bb11e4a7c8a6843dee3a86927",
"item_count": 66,
"item_count": 67,
"notifications": {},
"reboot": true,
"smile_name": "Smile Anna"
Expand Down
2 changes: 1 addition & 1 deletion tests/components/plugwise/fixtures/legacy_anna/all_data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"setpoint": 50.0,
"upper_bound": 90.0
},
"model": "4.21",
"model": "Generic heater",
"name": "OpenTherm",
"sensors": {
"dhw_temperature": 51.2,
Expand Down
6 changes: 5 additions & 1 deletion tests/components/plugwise/fixtures/m_adam_cooling/all_data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"hardware": "1",
"location": "f871b8c4d63549319221e294e4f88074",
"model": "Tom/Floor",
"model_id": "106-03",
"name": "Tom Badkamer",
"sensors": {
"battery": 99,
Expand Down Expand Up @@ -67,6 +68,7 @@
"location": "f2bf9048bef64cc5b6d5110154e33c81",
"mode": "cool",
"model": "ThermoTouch",
"model_id": "143.1",
"name": "Anna",
"preset_modes": ["no_frost", "asleep", "vacation", "home", "away"],
"select_schedule": "off",
Expand All @@ -93,6 +95,7 @@
"location": "bc93488efab249e5bc54fd7e175a6f91",
"mac_address": "012345679891",
"model": "Gateway",
"model_id": "smile_open_therm",
"name": "Adam",
"regulation_modes": [
"bleeding_hot",
Expand Down Expand Up @@ -129,6 +132,7 @@
"location": "f871b8c4d63549319221e294e4f88074",
"mode": "auto",
"model": "Lisa",
"model_id": "158-01",
"name": "Lisa Badkamer",
"preset_modes": ["no_frost", "asleep", "vacation", "home", "away"],
"select_schedule": "Badkamer",
Expand Down Expand Up @@ -169,7 +173,7 @@
"cooling_present": true,
"gateway_id": "da224107914542988a88561b4452b0f6",
"heater_id": "056ee145a816487eaa69243c3280f8bf",
"item_count": 149,
"item_count": 157,
"notifications": {},
"reboot": true,
"smile_name": "Adam"
Expand Down
6 changes: 5 additions & 1 deletion tests/components/plugwise/fixtures/m_adam_heating/all_data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"hardware": "1",
"location": "f871b8c4d63549319221e294e4f88074",
"model": "Tom/Floor",
"model_id": "106-03",
"name": "Tom Badkamer",
"sensors": {
"battery": 99,
Expand Down Expand Up @@ -72,6 +73,7 @@
"location": "f2bf9048bef64cc5b6d5110154e33c81",
"mode": "heat",
"model": "ThermoTouch",
"model_id": "143.1",
"name": "Anna",
"preset_modes": ["no_frost", "asleep", "vacation", "home", "away"],
"select_schedule": "off",
Expand All @@ -98,6 +100,7 @@
"location": "bc93488efab249e5bc54fd7e175a6f91",
"mac_address": "012345679891",
"model": "Gateway",
"model_id": "smile_open_therm",
"name": "Adam",
"regulation_modes": ["bleeding_hot", "bleeding_cold", "off", "heating"],
"select_gateway_mode": "full",
Expand Down Expand Up @@ -128,6 +131,7 @@
"location": "f871b8c4d63549319221e294e4f88074",
"mode": "auto",
"model": "Lisa",
"model_id": "158-01",
"name": "Lisa Badkamer",
"preset_modes": ["no_frost", "asleep", "vacation", "home", "away"],
"select_schedule": "Badkamer",
Expand Down Expand Up @@ -168,7 +172,7 @@
"cooling_present": false,
"gateway_id": "da224107914542988a88561b4452b0f6",
"heater_id": "056ee145a816487eaa69243c3280f8bf",
"item_count": 149,
"item_count": 157,
"notifications": {},
"reboot": true,
"smile_name": "Adam"
Expand Down
17 changes: 14 additions & 3 deletions tests/components/plugwise/fixtures/m_adam_jip/all_data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"location": "06aecb3d00354375924f50c47af36bd2",
"mode": "off",
"model": "Lisa",
"model_id": "158-01",
"name": "Slaapkamer",
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
"sensors": {
Expand Down Expand Up @@ -42,6 +43,7 @@
"hardware": "1",
"location": "d58fec52899f4f1c92e4f8fad6d8c48c",
"model": "Tom/Floor",
"model_id": "106-03",
"name": "Tom Logeerkamer",
"sensors": {
"setpoint": 13.0,
Expand All @@ -65,6 +67,7 @@
"hardware": "1",
"location": "06aecb3d00354375924f50c47af36bd2",
"model": "Tom/Floor",
"model_id": "106-03",
"name": "Tom Slaapkamer",
"sensors": {
"setpoint": 13.0,
Expand All @@ -85,7 +88,8 @@
"available": true,
"dev_class": "zz_misc",
"location": "9e4433a9d69f40b3aefd15e74395eaec",
"model": "lumi.plug.maeu01",
"model": "Aqara Smart Plug",
"model_id": "lumi.plug.maeu01",
"name": "Plug",
"sensors": {
"electricity_consumed_interval": 0.0
Expand All @@ -110,6 +114,7 @@
"location": "d27aede973b54be484f6842d1b2802ad",
"mode": "heat",
"model": "Lisa",
"model_id": "158-01",
"name": "Kinderkamer",
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
"sensors": {
Expand Down Expand Up @@ -139,6 +144,7 @@
"hardware": "1",
"location": "13228dab8ce04617af318a2888b3c548",
"model": "Tom/Floor",
"model_id": "106-03",
"name": "Tom Woonkamer",
"sensors": {
"setpoint": 9.0,
Expand Down Expand Up @@ -168,6 +174,7 @@
"location": "d58fec52899f4f1c92e4f8fad6d8c48c",
"mode": "heat",
"model": "Lisa",
"model_id": "158-01",
"name": "Logeerkamer",
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
"sensors": {
Expand Down Expand Up @@ -201,6 +208,7 @@
"location": "9e4433a9d69f40b3aefd15e74395eaec",
"mac_address": "012345670001",
"model": "Gateway",
"model_id": "smile_open_therm",
"name": "Adam",
"regulation_modes": ["heating", "off", "bleeding_cold", "bleeding_hot"],
"select_gateway_mode": "full",
Expand All @@ -218,6 +226,7 @@
"hardware": "1",
"location": "d27aede973b54be484f6842d1b2802ad",
"model": "Tom/Floor",
"model_id": "106-03",
"name": "Tom Kinderkamer",
"sensors": {
"setpoint": 13.0,
Expand Down Expand Up @@ -255,7 +264,8 @@
"setpoint": 90.0,
"upper_bound": 90.0
},
"model": "10.20",
"model": "Generic heater",
"model_id": "10.20",
"name": "OpenTherm",
"sensors": {
"intended_boiler_temperature": 0.0,
Expand All @@ -282,6 +292,7 @@
"location": "13228dab8ce04617af318a2888b3c548",
"mode": "heat",
"model": "Jip",
"model_id": "168-01",
"name": "Woonkamer",
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
"sensors": {
Expand Down Expand Up @@ -310,7 +321,7 @@
"cooling_present": false,
"gateway_id": "b5c2386c6f6342669e50fe49dd05b188",
"heater_id": "e4684553153b44afbef2200885f379dc",
"item_count": 217,
"item_count": 228,
"notifications": {},
"reboot": true,
"smile_name": "Adam"
Expand Down
19 changes: 18 additions & 1 deletion tests/components/plugwise/fixtures/m_adam_multiple_devices_per_zone/all_data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"firmware": "2019-06-21T02:00:00+02:00",
"location": "cd143c07248f491493cea0533bc3d669",
"model": "Plug",
"model_id": "160-01",
"name": "NVR",
"sensors": {
"electricity_consumed": 34.0,
Expand All @@ -26,6 +27,7 @@
"firmware": "2019-06-21T02:00:00+02:00",
"location": "cd143c07248f491493cea0533bc3d669",
"model": "Plug",
"model_id": "160-01",
"name": "Playstation Smart Plug",
"sensors": {
"electricity_consumed": 84.1,
Expand All @@ -46,6 +48,7 @@
"firmware": "2019-06-21T02:00:00+02:00",
"location": "cd143c07248f491493cea0533bc3d669",
"model": "Plug",
"model_id": "160-01",
"name": "USG Smart Plug",
"sensors": {
"electricity_consumed": 8.5,
Expand All @@ -66,6 +69,7 @@
"firmware": "2019-06-21T02:00:00+02:00",
"location": "cd143c07248f491493cea0533bc3d669",
"model": "Plug",
"model_id": "160-01",
"name": "Ziggo Modem",
"sensors": {
"electricity_consumed": 12.2,
Expand All @@ -90,6 +94,7 @@
"hardware": "1",
"location": "08963fec7c53423ca5680aa4cb502c63",
"model": "Tom/Floor",
"model_id": "106-03",
"name": "Thermostatic Radiator Badkamer",
"sensors": {
"battery": 51,
Expand Down Expand Up @@ -127,6 +132,7 @@
"location": "82fa13f017d240daa0d0ea1775420f24",
"mode": "auto",
"model": "Lisa",
"model_id": "158-01",
"name": "Zone Thermostat Jessie",
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
"select_schedule": "CV Jessie",
Expand Down Expand Up @@ -156,6 +162,7 @@
"firmware": "2019-06-21T02:00:00+02:00",
"location": "c50f167537524366a5af7aa3942feb1e",
"model": "Plug",
"model_id": "160-01",
"name": "CV Pomp",
"sensors": {
"electricity_consumed": 35.6,
Expand Down Expand Up @@ -189,6 +196,7 @@
"firmware": "2019-06-21T02:00:00+02:00",
"location": "cd143c07248f491493cea0533bc3d669",
"model": "Plug",
"model_id": "160-01",
"name": "Fibaro HC2",
"sensors": {
"electricity_consumed": 12.5,
Expand All @@ -213,6 +221,7 @@
"hardware": "1",
"location": "12493538af164a409c6a1c79e38afe1c",
"model": "Tom/Floor",
"model_id": "106-03",
"name": "Bios Cv Thermostatic Radiator ",
"sensors": {
"battery": 62,
Expand All @@ -237,6 +246,7 @@
"hardware": "1",
"location": "c50f167537524366a5af7aa3942feb1e",
"model": "Tom/Floor",
"model_id": "106-03",
"name": "Floor kraan",
"sensors": {
"setpoint": 21.5,
Expand Down Expand Up @@ -273,6 +283,7 @@
"location": "c50f167537524366a5af7aa3942feb1e",
"mode": "auto",
"model": "Lisa",
"model_id": "158-01",
"name": "Zone Lisa WK",
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
"select_schedule": "GF7 Woonkamer",
Expand Down Expand Up @@ -302,6 +313,7 @@
"firmware": "2019-06-21T02:00:00+02:00",
"location": "cd143c07248f491493cea0533bc3d669",
"model": "Plug",
"model_id": "160-01",
"name": "NAS",
"sensors": {
"electricity_consumed": 16.5,
Expand All @@ -326,6 +338,7 @@
"hardware": "1",
"location": "82fa13f017d240daa0d0ea1775420f24",
"model": "Tom/Floor",
"model_id": "106-03",
"name": "Thermostatic Radiator Jessie",
"sensors": {
"battery": 62,
Expand Down Expand Up @@ -363,6 +376,7 @@
"location": "12493538af164a409c6a1c79e38afe1c",
"mode": "heat",
"model": "Lisa",
"model_id": "158-01",
"name": "Zone Lisa Bios",
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
"select_schedule": "off",
Expand Down Expand Up @@ -398,6 +412,7 @@
"location": "446ac08dd04d4eff8ac57489757b7314",
"mode": "heat",
"model": "Tom/Floor",
"model_id": "106-03",
"name": "CV Kraan Garage",
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
"sensors": {
Expand Down Expand Up @@ -442,6 +457,7 @@
"location": "08963fec7c53423ca5680aa4cb502c63",
"mode": "auto",
"model": "Lisa",
"model_id": "158-01",
"name": "Zone Thermostat Badkamer",
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
"select_schedule": "Badkamer Schema",
Expand Down Expand Up @@ -475,6 +491,7 @@
"location": "1f9dcf83fd4e4b66b72ff787957bfe5d",
"mac_address": "012345670001",
"model": "Gateway",
"model_id": "smile_open_therm",
"name": "Adam",
"select_regulation_mode": "heating",
"sensors": {
Expand All @@ -488,7 +505,7 @@
"cooling_present": false,
"gateway_id": "fe799307f1624099878210aa0b9f1475",
"heater_id": "90986d591dcd426cae3ec3e8111ff730",
"item_count": 323,
"item_count": 340,
"notifications": {
"af82e4ccf9c548528166d38e560662a4": {
"warning": "Node Plug (with MAC address 000D6F000D13CB01, in room 'n.a.') has been unreachable since 23:03 2020-01-18. Please check the connection and restart the device."
Expand Down
Loading