Skip to content

Daikin Climate - Better integration with Climate base component #16913

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
MartinHjelmare merged 9 commits into from
Oct 8, 2018
Merged

Daikin Climate - Better integration with Climate base component #16913

Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c97dae4
Daikin Climate - Better integration with Climate base component
MatteGary Sep 26, 2018
922af63
Build bug fixing
MatteGary Sep 27, 2018
fe5bb82
Bug fixing in Set Operation_Mode functionality
MatteGary Sep 29, 2018
4864833
Fix useless code
MatteGary Oct 1, 2018
e4f537c
Fix hound bug
MatteGary Oct 1, 2018
5ed1eb1
Bug fixing
MatteGary Oct 2, 2018
8fb9925
Trailing white space fix
MatteGary Oct 2, 2018
5d92aea
Compile fixing
MatteGary Oct 2, 2018
6a192ba
Whitespace fix
MatteGary Oct 2, 2018
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
27 changes: 17 additions & 10 deletions homeassistant/components/climate/daikin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,15 @@
STATE_OFF: 'off',
}

DAIKIN_TO_HA_STATE = {
'fan': STATE_FAN_ONLY,
'dry': STATE_DRY,
'cool': STATE_COOL,
'hot': STATE_HEAT,
'auto': STATE_AUTO,
'off': STATE_OFF,
}

HA_ATTR_TO_DAIKIN = {
ATTR_OPERATION_MODE: 'mode',
ATTR_FAN_MODE: 'f_rate',
Expand Down Expand Up @@ -75,9 +84,7 @@ def __init__(self, api):
self._api = api
self._force_refresh = False
self._list = {
ATTR_OPERATION_MODE: list(
map(str.title, set(HA_STATE_TO_DAIKIN.values()))
),
ATTR_OPERATION_MODE: list(DAIKIN_TO_HA_STATE),

@MartinHjelmare MartinHjelmare Oct 1, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be:

ATTR_OPERATION_MODE: list(HA_STATE_TO_DAIKIN),

We want to use the ha states so we use the keys of the HA_STATE_TO_DAIKIN dictionary.

@MatteGary MatteGary Oct 1, 2018

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you check my lasts commit? I’m quite sure that I should use the other dictionary in that point. Today I’m not able to test since I’m travelling.

@MartinHjelmare MartinHjelmare Oct 1, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should use the same dictionary as we do here:
https://github.com/home-assistant/home-assistant/pull/16913/files#diff-f35f4028d7ed0027465e5dea53ef4acdR178

@MatteGary MatteGary Oct 2, 2018

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made the modification you suggested, but I'm not able to test it right now. I'm hoping that @mynameisdaniel32 can test it sooner than I can 😃

@MatteGary MatteGary Oct 2, 2018

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I managed to run a quick test, and it seems to work good. As soon as I can I will run some further tests.

ATTR_FAN_MODE: list(
map(
str.title,
Expand Down Expand Up @@ -136,11 +143,11 @@ def get(self, key):
elif key == ATTR_OPERATION_MODE:
# Daikin can return also internal states auto-1 or auto-7
# and we need to translate them as AUTO
value = re.sub(
'[^a-z]',
'',
self._api.device.represent(daikin_attr)[1]
).title()
daikin_mode = re.sub(
'[^a-z]','',self._api.device.represent(daikin_attr)[1])

@houndci-bot houndci-bot Oct 1, 2018

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing whitespace after ','


@houndci-bot houndci-bot Sep 27, 2018

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

blank line contains whitespace

ha_mode = DAIKIN_TO_HA_STATE.get(daikin_mode)
value = ha_mode

if value is None:
_LOGGER.error("Invalid value requested for key %s", key)
Expand All @@ -167,8 +174,8 @@ def set(self, settings):

daikin_attr = HA_ATTR_TO_DAIKIN.get(attr)
if daikin_attr is not None:
if value.title() in self._list[attr]:
values[daikin_attr] = value.lower()
if value in self._list[attr]:
Comment thread
MartinHjelmare marked this conversation as resolved.
values[daikin_attr] = HA_STATE_TO_DAIKIN[value];

@houndci-bot houndci-bot Oct 1, 2018

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

statement ends with a semicolon

else:
_LOGGER.error("Invalid value %s for %s", attr, value)

Expand Down