Skip to content
This repository was archived by the owner on Dec 13, 2023. It is now read-only.

Commit 538d9f2

Browse files
gjdvarska
authored andcommitted
minor cleanup and more clarification of "ex" feature
1 parent 4ef4d03 commit 538d9f2

1 file changed

Lines changed: 8 additions & 3 deletions

File tree

daikinapi.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,14 @@ class Daikin:
2929
"ver",
3030
"type",
3131
"today_runtime",
32-
"current_month_power_consumption",
32+
"today_energy_consumption",
33+
"current_month_energy_consumption",
3334
"price_int",
3435
"compressor_frequency",
3536
"inside_temperature",
3637
"outside_temperature",
3738
"wifi_settings",
39+
"datetime"
3840
]
3941

4042
_host = None
@@ -96,6 +98,7 @@ def _get_week(self, ex=False):
9698
Example (ex=True):
9799
ret=OK,s_dayw=2,week_heat=10/0/0/0/0/0/0/0/0/0/0/0/0/0,week_cool=0/0/0/0/0/0/0/0/0/0/0/0/0/0
98100
(week_*: values in 100Watt/hour, last day first)
101+
Probably 'ex' refers to "exclusively this device"
99102
:return: dict
100103
"""
101104
return self._get("/aircon/get_week_power" + ("_ex" if ex else ""))
@@ -108,6 +111,7 @@ def _get_year(self, ex=False):
108111
Example (ex=True):
109112
ret=OK,curr_year_heat=0/0/0/0/0/0/0/0/0/0/0/1,prev_year_heat=0/0/0/0/0/0/0/0/0/0/0/0,curr_year_cool=0/0/0/0/0/0/0/0/0/0/0/0,prev_year_cool=0/0/0/0/0/0/0/0/0/0/0/0
110113
(*_year_*: values in 100Watt/hour per month (jan-dec))
114+
Probably 'ex' refers to "exclusively this device"
111115
:return: dict
112116
"""
113117
return self._get("/aircon/get_year_power" + ("_ex" if ex else ""))
@@ -372,6 +376,7 @@ def today_energy_consumption_ex(self, ex=True, mode="heat"):
372376
"""
373377
unit energy consumption today (in Watt/hour)
374378
:param ex: boolean indicating whether to take form '_ex'
379+
Probably 'ex' refers to "exclusively this device"
375380
:param mode: string from ("heat", "cool") describing mode of operation; ignored if ex==False
376381
:return: Watt/hour of energy consumption
377382
"""
@@ -386,7 +391,7 @@ def today_energy_consumption_ex(self, ex=True, mode="heat"):
386391
def today_energy_consumption(self, ex=False):
387392
"""
388393
unit energy consumption today (in Watt/hour)
389-
:return: Watt/hour of power consumption
394+
:return: Watt/hour of energy consumption
390395
"""
391396
return self.today_energy_consumption_ex(ex=ex, mode=None)
392397

@@ -404,7 +409,7 @@ def month_energy_consumption(self, month=None):
404409
return int(self._get_year()["this_year"].split("/")[month-1]) / 10.0
405410

406411
@property
407-
def current_month_power_consumption(self, month=None):
412+
def current_month_energy_consumption(self, month=None):
408413
"""
409414
energy consumption
410415
:return: current month to date energy consumption in kWh or None if not retrievable

0 commit comments

Comments
 (0)