Skip to content

Commit dfbe457

Browse files
authored
Merge pull request #377 from plugwise/core-prs
Implement latest Core Plugwise PR's
2 parents 9972ddf + 7bbf184 commit dfbe457

File tree

10 files changed

+529
-309
lines changed

10 files changed

+529
-309
lines changed

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@
22

33
## Versions from 0.30 and up
44

5-
### NEW MAR 2023 [0.34.9] Bugfixes for Stick and Anna + Elga
5+
### NEW APR 2023 [0.34.10] Implement latest Core PR's
6+
7+
- Core PR #[88967](https://github.com/home-assistant/core/pull/88967)
8+
- Core PR #[90537](https://github.com/home-assistant/core/pull/90537)
9+
- Implement name translations for sensors (translation_key)
10+
11+
## APR 2023 [0.34.9] Bugfixes for Stick and Anna + Elga
612

713
- Stick: 2nd fix for #369, merge PR #374 by @mvdwetering
814
- Final fix for #320 - via plugwise [v0.27.10](https://github.com/plugwise/python-plugwise/releases/tag/v0.27.10)

custom_components/plugwise/const.py

Lines changed: 0 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -72,71 +72,6 @@
7272
"stretch": "Stretch",
7373
}
7474

75-
# Binary Sensors:
76-
COOLING: Final = "cooling_enabled"
77-
COMPRESSOR_STATE: Final = "compressor_state"
78-
DHW_STATE: Final = "dhw_state"
79-
FLAME_STATE: Final = "flame_state"
80-
PW_NOTIFICATION: Final = "plugwise_notification"
81-
SLAVE_BOILER_STATE: Final = "slave_boiler_state"
82-
83-
# Sensors:
84-
BATTERY: Final = "battery"
85-
CURRENT_TEMP: Final = "temperature"
86-
DEVICE_STATE: Final = "device_state"
87-
DHW_TEMP: Final = "dhw_temperature"
88-
EL_CONSUMED: Final = "electricity_consumed"
89-
EL_CONSUMED_INTERVAL: Final = "electricity_consumed_interval"
90-
EL_CONSUMED_OFF_PEAK_CUMULATIVE: Final = "electricity_consumed_off_peak_cumulative"
91-
EL_CONSUMED_OFF_PEAK_INTERVAL: Final = "electricity_consumed_off_peak_interval"
92-
EL_CONSUMED_OFF_PEAK_POINT: Final = "electricity_consumed_off_peak_point"
93-
EL_CONSUMED_PEAK_CUMULATIVE: Final = "electricity_consumed_peak_cumulative"
94-
EL_CONSUMED_PEAK_INTERVAL: Final = "electricity_consumed_peak_interval"
95-
EL_CONSUMED_PEAK_POINT: Final = "electricity_consumed_peak_point"
96-
EL_CONSUMED_POINT: Final = "electricity_consumed_point"
97-
EL_PHASE_ONE_CONSUMED: Final = "electricity_phase_one_consumed"
98-
EL_PHASE_TWO_CONSUMED: Final = "electricity_phase_two_consumed"
99-
EL_PHASE_THREE_CONSUMED: Final = "electricity_phase_three_consumed"
100-
EL_PHASE_ONE_PRODUCED: Final = "electricity_phase_one_produced"
101-
EL_PHASE_TWO_PRODUCED: Final = "electricity_phase_two_produced"
102-
EL_PHASE_THREE_PRODUCED: Final = "electricity_phase_three_produced"
103-
EL_PRODUCED: Final = "electricity_produced"
104-
EL_PRODUCED_INTERVAL: Final = "electricity_produced_interval"
105-
EL_PRODUCED_OFF_PEAK_CUMULATIVE: Final = "electricity_produced_off_peak_cumulative"
106-
EL_PRODUCED_OFF_PEAK_INTERVAL: Final = "electricity_produced_off_peak_interval"
107-
EL_PRODUCED_OFF_PEAK_POINT: Final = "electricity_produced_off_peak_point"
108-
EL_PRODUCED_PEAK_CUMULATIVE: Final = "electricity_produced_peak_cumulative"
109-
EL_PRODUCED_PEAK_INTERVAL: Final = "electricity_produced_peak_interval"
110-
EL_PRODUCED_PEAK_POINT: Final = "electricity_produced_peak_point"
111-
EL_PRODUCED_POINT: Final = "electricity_produced_point"
112-
GAS_CONSUMED_CUMULATIVE: Final = "gas_consumed_cumulative"
113-
GAS_CONSUMED_INTERVAL: Final = "gas_consumed_interval"
114-
HUMIDITY: Final = "humidity"
115-
INTENDED_BOILER_TEMP: Final = "intended_boiler_temperature"
116-
MOD_LEVEL: Final = "modulation_level"
117-
NET_EL_CUMULATIVE: Final = "net_electricity_cumulative"
118-
NET_EL_POINT: Final = "net_electricity_point"
119-
OUTDOOR_AIR_TEMP: Final = "outdoor_air_temperature"
120-
OUTDOOR_TEMP: Final = "outdoor_temperature"
121-
RETURN_TEMP: Final = "return_temperature"
122-
TARGET_TEMP: Final = "setpoint"
123-
TARGET_TEMP_HIGH: Final = "setpoint_high"
124-
TARGET_TEMP_LOW: Final = "setpoint_low"
125-
TEMP_DIFF: Final = "temperature_difference"
126-
VALVE_POS: Final = "valve_position"
127-
V_PHASE_ONE: Final = "voltage_phase_one"
128-
V_PHASE_TWO: Final = "voltage_phase_two"
129-
V_PHASE_THREE: Final = "voltage_phase_three"
130-
WATER_PRESSURE: Final = "water_pressure"
131-
WATER_TEMP: Final = "water_temperature"
132-
133-
# Switches
134-
COOLING_ENABLED = "cooling_ena_switch"
135-
DHW_COMF_MODE: Final = "dhw_cm_switch"
136-
LOCK: Final = "lock"
137-
RELAY: Final = "relay"
138-
139-
14075
# --- Const for Plugwise USB-stick.
14176

14277
PLATFORMS_USB: Final[list[str]] = [

custom_components/plugwise/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
"iot_class": "local_polling",
1010
"loggers": ["plugwise"],
1111
"requirements": ["plugwise==0.27.10"],
12-
"version": "0.34.9"
12+
"version": "0.34.10"
1313
}

0 commit comments

Comments
 (0)