Skip to content

Commit 08f5e58

Browse files
bouwewbouwew
committed
Black
1 parent 9cef74d commit 08f5e58

File tree

2 files changed

+76
-57
lines changed

2 files changed

+76
-57
lines changed

‎plugwise/constants.py‎

Lines changed: 72 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -306,71 +306,93 @@
306306
# HA Core setpoint
307307
"thermostat": {ATTR_NAME: "setpoint", ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS},
308308
# Anna/Adam
309-
"boiler_temperature": {ATTR_NAME: "water_temperature", ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS},
310-
"domestic_hot_water_state": {ATTR_NAME: "dhw_state", ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS},
311-
"intended_boiler_temperature": {ATTR_NAME: "intended_boiler_temperature", ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}, # non-zero when heating, zero when dhw-heating
312-
"intended_central_heating_state": {ATTR_NAME: "heating_state", ATTR_UNIT_OF_MEASUREMENT: None}, # use intended_c_h_state, this key shows the heating-behavior better than c-h_state
313-
"modulation_level": {ATTR_NAME: "modulation_level", ATTR_UNIT_OF_MEASUREMENT: PERCENTAGE},
314-
"return_water_temperature": {ATTR_NAME: "return_temperature", ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS},
309+
"boiler_temperature": {
310+
ATTR_NAME: "water_temperature",
311+
ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS,
312+
},
313+
"domestic_hot_water_state": {
314+
ATTR_NAME: "dhw_state",
315+
ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS,
316+
},
317+
"intended_boiler_temperature": {
318+
ATTR_NAME: "intended_boiler_temperature",
319+
ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS,
320+
}, # non-zero when heating, zero when dhw-heating
321+
"intended_central_heating_state": {
322+
ATTR_NAME: "heating_state",
323+
ATTR_UNIT_OF_MEASUREMENT: None,
324+
}, # use intended_c_h_state, this key shows the heating-behavior better than c-h_state
325+
"modulation_level": {
326+
ATTR_NAME: "modulation_level",
327+
ATTR_UNIT_OF_MEASUREMENT: PERCENTAGE,
328+
},
329+
"return_water_temperature": {
330+
ATTR_NAME: "return_temperature",
331+
ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS,
332+
},
315333
# Used with the Elga heatpump - marcelveldt
316334
"compressor_state": {ATTR_NAME: "compressor_state", ATTR_UNIT_OF_MEASUREMENT: None},
317335
"cooling_state": {ATTR_NAME: "cooling_state", ATTR_UNIT_OF_MEASUREMENT: None},
318336
# Next 2 keys are used to show the state of the gas-heater used next to the Elga heatpump - marcelveldt
319-
"slave_boiler_state": {ATTR_NAME: "slave_boiler_state", ATTR_UNIT_OF_MEASUREMENT: None},
320-
"flame_state": {ATTR_NAME: "flame_state", ATTR_UNIT_OF_MEASUREMENT: None}, # also present when there is a single gas-heater
337+
"slave_boiler_state": {
338+
ATTR_NAME: "slave_boiler_state",
339+
ATTR_UNIT_OF_MEASUREMENT: None,
340+
},
341+
"flame_state": {
342+
ATTR_NAME: "flame_state",
343+
ATTR_UNIT_OF_MEASUREMENT: None,
344+
}, # also present when there is a single gas-heater
321345
# Anna only
322-
"central_heater_water_pressure": {ATTR_NAME: "water_pressure", ATTR_UNIT_OF_MEASUREMENT: PRESSURE_BAR},
323-
"outdoor_temperature": {ATTR_NAME: "outdoor_temperature", ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}, # Outdoor temp as reported on the Anna, in the App
324-
"schedule_temperature":{ATTR_NAME: "schedule_temperature", ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}, # Only present on legacy Anna and Anna_v3
346+
"central_heater_water_pressure": {
347+
ATTR_NAME: "water_pressure",
348+
ATTR_UNIT_OF_MEASUREMENT: PRESSURE_BAR,
349+
},
350+
"outdoor_temperature": {
351+
ATTR_NAME: "outdoor_temperature",
352+
ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS,
353+
}, # Outdoor temp as reported on the Anna, in the App
354+
"schedule_temperature": {
355+
ATTR_NAME: "schedule_temperature",
356+
ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS,
357+
}, # Only present on legacy Anna and Anna_v3
325358
# Legacy Anna: similar to flame-state on Anna/Adam
326359
"boiler_state": {ATTR_NAME: "boiler_state", ATTR_UNIT_OF_MEASUREMENT: None},
327360
# Legacy Anna: shows when heating is active, don't show dhw_state, cannot be determined reliably
328-
"intended_boiler_state": {ATTR_NAME: "intended_boiler_state", ATTR_UNIT_OF_MEASUREMENT: None},
361+
"intended_boiler_state": {
362+
ATTR_NAME: "intended_boiler_state",
363+
ATTR_UNIT_OF_MEASUREMENT: None,
364+
},
329365
# Lisa and Tom
330366
"battery": {ATTR_NAME: "battery", ATTR_UNIT_OF_MEASUREMENT: PERCENTAGE},
331-
"temperature_difference": {ATTR_NAME: "temperature_difference", ATTR_UNIT_OF_MEASUREMENT: DEGREE},
332-
"valve_position": {ATTR_NAME: "valve_position", ATTR_UNIT_OF_MEASUREMENT: PERCENTAGE},
367+
"temperature_difference": {
368+
ATTR_NAME: "temperature_difference",
369+
ATTR_UNIT_OF_MEASUREMENT: DEGREE,
370+
},
371+
"valve_position": {
372+
ATTR_NAME: "valve_position",
373+
ATTR_UNIT_OF_MEASUREMENT: PERCENTAGE,
374+
},
333375
# Plug
334-
"electricity_consumed": {ATTR_NAME: "electricity_consumed", ATTR_UNIT_OF_MEASUREMENT: POWER_WATT},
335-
"electricity_produced": {ATTR_NAME: "electricity_produced", ATTR_UNIT_OF_MEASUREMENT: POWER_WATT},
376+
"electricity_consumed": {
377+
ATTR_NAME: "electricity_consumed",
378+
ATTR_UNIT_OF_MEASUREMENT: POWER_WATT,
379+
},
380+
"electricity_produced": {
381+
ATTR_NAME: "electricity_produced",
382+
ATTR_UNIT_OF_MEASUREMENT: POWER_WATT,
383+
},
336384
"relay": {ATTR_NAME: "relay", ATTR_UNIT_OF_MEASUREMENT: None},
337385
}
338386

339387
SMILES = {
340-
"smile_open_therm_v3": {
341-
"type": "thermostat",
342-
"friendly_name": "Adam",
343-
},
344-
"smile_open_therm_v2": {
345-
"type": "thermostat",
346-
"friendly_name": "Adam",
347-
},
348-
"smile_thermo_v4": {
349-
"type": "thermostat",
350-
"friendly_name": "Anna",
351-
},
352-
"smile_thermo_v3": {
353-
"type": "thermostat",
354-
"friendly_name": "Anna",
355-
},
356-
"smile_thermo_v1": {
357-
"type": "thermostat",
358-
"friendly_name": "Anna",
359-
"legacy": True,
360-
},
361-
"smile_v4": {
362-
"type": "power",
363-
"friendly_name": "P1",
364-
},
365-
"smile_v3": {
366-
"type": "power",
367-
"friendly_name": "P1",
368-
},
369-
"smile_v2": {
370-
"type": "power",
371-
"friendly_name": "P1",
372-
"legacy": True,
373-
},
388+
"smile_open_therm_v3": {"type": "thermostat", "friendly_name": "Adam",},
389+
"smile_open_therm_v2": {"type": "thermostat", "friendly_name": "Adam",},
390+
"smile_thermo_v4": {"type": "thermostat", "friendly_name": "Anna",},
391+
"smile_thermo_v3": {"type": "thermostat", "friendly_name": "Anna",},
392+
"smile_thermo_v1": {"type": "thermostat", "friendly_name": "Anna", "legacy": True,},
393+
"smile_v4": {"type": "power", "friendly_name": "P1",},
394+
"smile_v3": {"type": "power", "friendly_name": "P1",},
395+
"smile_v2": {"type": "power", "friendly_name": "P1", "legacy": True,},
374396
"stretch_v3": {"type": "stretch", "friendly_name": "Stretch", "legacy": True},
375397
"stretch_v2": {"type": "stretch", "friendly_name": "Stretch", "legacy": True},
376398
}

‎plugwise/smile.py‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -214,12 +214,7 @@ async def close_connection(self):
214214
await self.websession.close()
215215

216216
async def request(
217-
self,
218-
command,
219-
retry=3,
220-
method="get",
221-
data=None,
222-
headers=None,
217+
self, command, retry=3, method="get", data=None, headers=None,
223218
):
224219
"""Request data."""
225220
resp = None
@@ -803,7 +798,9 @@ def get_appliance_data(self, dev_id):
803798
if measurement in ["compressor_state", "flame_state"]:
804799
self.active_device_present = True
805800

806-
data[attrs[ATTR_NAME]] = format_measure(measure, attrs[ATTR_UNIT_OF_MEASUREMENT])
801+
data[attrs[ATTR_NAME]] = format_measure(
802+
measure, attrs[ATTR_UNIT_OF_MEASUREMENT]
803+
)
807804

808805
i_locator = (
809806
f'.//logs/interval_log[type="{measurement}"]/period/measurement'

0 commit comments

Comments
 (0)