Skip to content
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Versions from 0.40 and up

## Ongoing

- New feature: implement setting of Adam zone profile
- Implement translation for added homeassistantError raise message via PR [#948](https://github.com/plugwise/plugwise-beta/pull/948)
- Line up strings with Core Plugwise strings via PR [#954](https://github.com/plugwise/plugwise-beta/pull/954)

Expand Down
6 changes: 5 additions & 1 deletion custom_components/plugwise/const.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,12 @@
GATEWAY_MODES: Final = "gateway_modes"
REGULATION_MODE: Final = "regulation_mode"
REGULATION_MODES: Final = "regulation_modes"
ZONE_PROFILES: Final = "zone_profiles"
SELECT_DHW_MODE: Final = "select_dhw_mode"
SELECT_GATEWAY_MODE: Final = "select_gateway_mode"
SELECT_REGULATION_MODE: Final = "select_regulation_mode"
SELECT_SCHEDULE: Final = "select_schedule"
SELECT_ZONE_PROFILE: Final = "select_zone_profile"

# Switch constants
DHW_CM_SWITCH: Final = "dhw_cm_switch"
Expand Down Expand Up @@ -198,10 +200,12 @@
"select_gateway_mode",
"select_regulation_mode",
"select_schedule",
"select_zone_profile"
]
type SelectOptionsType = Literal[
"available_schedules",
"dhw_modes",
"gateway_modes",
"regulation_modes",
"available_schedules",
"zone_profiles",
]
4 changes: 3 additions & 1 deletion custom_components/plugwise/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
"integration_type": "hub",
"iot_class": "local_polling",
"loggers": ["plugwise"],
"requirements": ["plugwise==1.9.0"],
"requirements": [
"https://test-files.pythonhosted.org/packages/b2/83/18ab8d7ed56e0ddabaa633b546fca32523bf028da97c7164aaa8daa648a9/plugwise-1.10.0a0.tar.gz#plugwise==1.10.0a0"
],
"version": "0.60.0",
"zeroconf": ["_plugwise._tcp.local."]
}
8 changes: 8 additions & 0 deletions custom_components/plugwise/select.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
SELECT_GATEWAY_MODE,
SELECT_REGULATION_MODE,
SELECT_SCHEDULE,
SELECT_ZONE_PROFILE,
ZONE_PROFILES,
SelectOptionsType,
SelectType,
)
Expand Down Expand Up @@ -68,6 +70,12 @@ class PlugwiseSelectEntityDescription(SelectEntityDescription):
entity_category=EntityCategory.CONFIG,
options_key=GATEWAY_MODES,
),
PlugwiseSelectEntityDescription(
key=SELECT_ZONE_PROFILE,
translation_key=SELECT_ZONE_PROFILE,
entity_category=EntityCategory.CONFIG,
options_key=ZONE_PROFILES,
),
)


Expand Down
8 changes: 8 additions & 0 deletions custom_components/plugwise/strings.json
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,14 @@
"state": {
"off": "Off"
}
},
"select_zone_profile": {
"name": "Zone profile",
"state": {
"active": "Active",
"off": "Off",
"passive": "Passive"
}
}
},
"sensor": {
Expand Down
8 changes: 8 additions & 0 deletions custom_components/plugwise/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,14 @@
"state": {
"off": "Off"
}
},
"select_zone_profile": {
"name": "Zone profile",
"state": {
"active": "Active",
"off": "Off",
"passive": "Passive"
}
}
},
"sensor": {
Expand Down
8 changes: 8 additions & 0 deletions custom_components/plugwise/translations/nl.json
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,14 @@
"state": {
"off": "Uit"
}
},
"select_zone_profile": {
"name": "Zone profiel",
"state": {
"active": "Actief",
"off": "Uit",
"passive": "Passief"
}
}
},
"sensor": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@
"name": "Living room",
"preset_modes": ["vacation", "no_frost", "asleep", "home", "away"],
"select_schedule": "Weekschema",
"select_zone_profile": "active",
"sensors": {
"electricity_consumed": 60.8,
"electricity_produced": 0.0,
Expand All @@ -299,7 +300,8 @@
],
"secondary": []
},
"vendor": "Plugwise"
"vendor": "Plugwise",
"zone_profiles": ["active", "off", "passive"]
},
"f871b8c4d63549319221e294e4f88074": {
"active_preset": "vacation",
Expand All @@ -317,6 +319,7 @@
"name": "Bathroom",
"preset_modes": ["vacation", "no_frost", "asleep", "home", "away"],
"select_schedule": "off",
"select_zone_profile": "passive",
"sensors": {
"electricity_consumed": 0.0,
"electricity_produced": 0.0,
Expand All @@ -332,6 +335,7 @@
"primary": ["e2f4322d57924fa090fbbc48b3a140dc"],
"secondary": ["1772a4ea304041adb83f357b751341ff"]
},
"vendor": "Plugwise"
"vendor": "Plugwise",
"zone_profiles": ["active", "off", "passive"]
}
}
8 changes: 6 additions & 2 deletions tests/components/plugwise/fixtures/m_adam_cooling/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@
"name": "Living room",
"preset_modes": ["vacation", "no_frost", "asleep", "home", "away"],
"select_schedule": "off",
"select_zone_profile": "active",
"sensors": {
"electricity_consumed": 60.8,
"electricity_produced": 0.0,
Expand All @@ -215,7 +216,8 @@
],
"secondary": []
},
"vendor": "Plugwise"
"vendor": "Plugwise",
"zone_profiles": ["active", "off", "passive"]
},
"f871b8c4d63549319221e294e4f88074": {
"active_preset": "vacation",
Expand All @@ -233,6 +235,7 @@
"name": "Bathroom",
"preset_modes": ["vacation", "no_frost", "asleep", "home", "away"],
"select_schedule": "off",
"select_zone_profile": "passive",
"sensors": {
"electricity_consumed": 0.0,
"electricity_produced": 0.0,
Expand All @@ -248,6 +251,7 @@
"primary": ["e2f4322d57924fa090fbbc48b3a140dc"],
"secondary": ["1772a4ea304041adb83f357b751341ff"]
},
"vendor": "Plugwise"
"vendor": "Plugwise",
"zone_profiles": ["active", "off", "passive"]
}
}
8 changes: 6 additions & 2 deletions tests/components/plugwise/fixtures/m_adam_heating/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@
"name": "Living room",
"preset_modes": ["vacation", "no_frost", "asleep", "home", "away"],
"select_schedule": "off",
"select_zone_profile": "active",
"sensors": {
"electricity_consumed": 60.8,
"electricity_produced": 0.0,
Expand All @@ -214,7 +215,8 @@
],
"secondary": []
},
"vendor": "Plugwise"
"vendor": "Plugwise",
"zone_profiles": ["active", "off", "passive"]
},
"f871b8c4d63549319221e294e4f88074": {
"active_preset": "vacation",
Expand All @@ -232,6 +234,7 @@
"name": "Bathroom",
"preset_modes": ["vacation", "no_frost", "asleep", "home", "away"],
"select_schedule": "off",
"select_zone_profile": "passive",
"sensors": {
"electricity_consumed": 0.0,
"electricity_produced": 0.0,
Expand All @@ -247,6 +250,7 @@
"primary": ["e2f4322d57924fa090fbbc48b3a140dc"],
"secondary": ["1772a4ea304041adb83f357b751341ff"]
},
"vendor": "Plugwise"
"vendor": "Plugwise",
"zone_profiles": ["active", "off", "passive"]
}
}
16 changes: 12 additions & 4 deletions tests/components/plugwise/fixtures/m_adam_jip/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"name": "Slaapkamer",
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
"select_schedule": null,
"select_zone_profile": "active",
"sensors": {
"temperature": 24.2
},
Expand All @@ -21,7 +22,8 @@
"primary": ["1346fbd8498d4dbcab7e18d51b771f3d"],
"secondary": ["356b65335e274d769c338223e7af9c33"]
},
"vendor": "Plugwise"
"vendor": "Plugwise",
"zone_profiles": ["active", "off", "passive"]
},
"13228dab8ce04617af318a2888b3c548": {
"active_preset": "home",
Expand All @@ -33,6 +35,7 @@
"name": "Woonkamer",
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
"select_schedule": null,
"select_zone_profile": "active",
"sensors": {
"temperature": 27.4
},
Expand All @@ -46,7 +49,8 @@
"primary": ["f61f1a2535f54f52ad006a3d18e459ca"],
"secondary": ["833de10f269c4deab58fb9df69901b4e"]
},
"vendor": "Plugwise"
"vendor": "Plugwise",
"zone_profiles": ["active", "off", "passive"]
},
"1346fbd8498d4dbcab7e18d51b771f3d": {
"available": true,
Expand Down Expand Up @@ -248,6 +252,7 @@
"name": "Kinderkamer",
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
"select_schedule": null,
"select_zone_profile": "active",
"sensors": {
"temperature": 30.0
},
Expand All @@ -261,7 +266,8 @@
"primary": ["6f3e9d7084214c21b9dfa46f6eeb8700"],
"secondary": ["d4496250d0e942cfa7aea3476e9070d5"]
},
"vendor": "Plugwise"
"vendor": "Plugwise",
"zone_profiles": ["active", "off", "passive"]
},
"d4496250d0e942cfa7aea3476e9070d5": {
"available": true,
Expand Down Expand Up @@ -297,6 +303,7 @@
"name": "Logeerkamer",
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
"select_schedule": null,
"select_zone_profile": "active",
"sensors": {
"temperature": 30.0
},
Expand All @@ -310,7 +317,8 @@
"primary": ["a6abc6a129ee499c88a4d420cc413b47"],
"secondary": ["1da4d325838e4ad8aac12177214505c9"]
},
"vendor": "Plugwise"
"vendor": "Plugwise",
"zone_profiles": ["active", "off", "passive"]
},
"e4684553153b44afbef2200885f379dc": {
"available": true,
Expand Down
Loading
Loading