Support new xiaomi aqara device model and LAN protocol 2.0 by kerwin612 · Pull Request #13540 · home-assistant/core

kerwin612 · 2018-03-30T07:16:51Z

Description:

Support new device model.
Support new LAN protocol 2.0.

Checklist:

The code change is tested and works locally.
Local tests pass with tox. Your PR cannot be merged unless tests pass

If user exposed functionality or configuration variables are added/changed:

Documentation added/updated in home-assistant.github.io

If the code communicates with devices, web services, or third-party tools:

New dependencies have been added to the REQUIREMENTS variable (example).
New dependencies are only imported inside functions that use them (example).
New dependencies have been added to requirements_all.txt by running script/gen_requirements_all.py.
New files were added to .coveragerc.

If the code does not interact with devices:

Tests have been added to verify that the new code works.

homeassistant · 2018-03-30T07:16:52Z

Hi @ileler,

It seems you haven't yet signed a CLA. Please do so here.

Once you do that we will be able to review and accept this pull request.

Thanks!

houndci-bot · 2018-03-30T07:16:57Z

            model = device['model']
            if model == 'plug':
-                devices.append(XiaomiGenericSwitch(device, "Plug", 'status',
+                devices.append(XiaomiGenericSwitch(device, "Plug", 'status' if int(device['proto'][0:1]) == 1 else 'channel_0',


line too long (127 > 79 characters)

houndci-bot · 2018-03-30T07:16:57Z

-            elif model in ['switch', 'sensor_switch.aq2', 'sensor_switch.aq3']:
-                devices.append(XiaomiButton(device, 'Switch', 'status',
+            elif model in ['switch', 'sensor_switch', 'sensor_switch.aq2', 'sensor_switch.aq3']:
+                devices.append(XiaomiButton(device, 'Switch', 'status' if int(device['proto'][0:1]) == 1 else 'channel_0',


line too long (122 > 79 characters)

houndci-bot · 2018-03-30T07:16:58Z

                devices.append(XiaomiNatgasSensor(device, gateway))
-            elif model in ['switch', 'sensor_switch.aq2', 'sensor_switch.aq3']:
-                devices.append(XiaomiButton(device, 'Switch', 'status',
+            elif model in ['switch', 'sensor_switch', 'sensor_switch.aq2', 'sensor_switch.aq3']:


line too long (96 > 79 characters)

houndci-bot · 2018-03-30T07:23:28Z

            if model == 'plug':
-                devices.append(XiaomiGenericSwitch(device, "Plug", 'status',
+                devices.append(XiaomiGenericSwitch(device, "Plug",
+                       'status' if int(device['proto'][0:1]) == 1 else 'channel_0',


continuation line under-indented for visual indent
line too long (83 > 79 characters)

houndci-bot · 2018-03-30T07:23:28Z

+            elif model in ['switch', 'sensor_switch',
+                           'sensor_switch.aq2', 'sensor_switch.aq3']:
+                devices.append(XiaomiButton(device, 'Switch',
+                        'status' if int(device['proto'][0:1]) == 1 else 'channel_0',


continuation line under-indented for visual indent
line too long (84 > 79 characters)

houndci-bot · 2018-03-30T07:53:08Z

-                devices.append(XiaomiGenericSwitch(device, "Plug", 'status',
+                devices.append(XiaomiGenericSwitch(device, "Plug",
+                    'status' if 'proto' not in device
+                                or int(device['proto'][0:1]) == 1


continuation line under-indented for visual indent

houndci-bot · 2018-03-30T07:53:08Z

+                           'sensor_switch.aq2', 'sensor_switch.aq3']:
+                devices.append(XiaomiButton(device, 'Switch',
+                    'status' if 'proto' not in device
+                                or int(device['proto'][0:1]) == 1


continuation line under-indented for visual indent

houndci-bot · 2018-03-30T07:55:32Z

            if model == 'plug':
-                devices.append(XiaomiGenericSwitch(device, "Plug", 'status',
+                devices.append(XiaomiGenericSwitch(device, "Plug",
+                    'status' if 'proto' not in device or int(device['proto'][0:1]) == 1


continuation line under-indented for visual indent
line too long (87 > 79 characters)

houndci-bot · 2018-03-30T07:55:33Z

+            elif model in ['switch', 'sensor_switch',
+                           'sensor_switch.aq2', 'sensor_switch.aq3']:
+                devices.append(XiaomiButton(device, 'Switch',
+                    'status' if 'proto' not in device or int(device['proto'][0:1]) == 1


continuation line under-indented for visual indent
line too long (87 > 79 characters)

fabaff

Don't change the permission of the files. They don't need to be executable.

Danielhiversen · 2018-04-01T16:38:43Z

        self._sid = device['sid']
        self._name = '{}_{}'.format(device_type, self._sid)
        self._type = device_type
+        self._proto = xiaomi_hub.proto


Where is this used?

kerwin612 · 2018-04-01T16:46:28Z

It is not used currently. I think it may be used later.

Danielhiversen · 2018-04-01T18:21:30Z

Then you should remove self._proto for now.

syssi · 2018-04-02T07:35:53Z

@ileler I added some docs to support your PR. Please feel free to copy & extend: home-assistant/home-assistant.io#5083

syssi · 2018-04-02T07:38:47Z

                devices.append(XiaomiSensor(device, 'Humidity',
                                            'humidity', gateway))
-            elif device['model'] == 'weather.v1':
+            elif device['model'] in ['weather', 'weather.v1']:


Are you sure about this ("weather") model name?

yes ,i sure

syssi · 2018-04-02T07:41:08Z

                devices.append(XiaomiNatgasSensor(device, gateway))
-            elif model in ['switch', 'sensor_switch.aq2', 'sensor_switch.aq3']:
-                devices.append(XiaomiButton(device, 'Switch', 'status',
+            elif model in ['switch', 'sensor_switch',


Is my assumption correct: The device "switch" is called "sensor_switch" in future (new protocol version). It isn't a new hardware version of the device?

According to me, the sub-device receives a new gateway (protocol 2.0) and the model changes. So, in order to be compatible with the old and new agreements

kerwin612 · 2018-04-24T06:47:21Z

???

syssi · 2018-04-24T06:56:12Z

@ileler I will merge the PR soon. I just need some more time for testing.

kerwin612 · 2018-04-24T07:00:03Z

@syssi Thanks

support new device model;support new LAN protocol 2.0

17ef258

kerwin612 requested review from Danielhiversen and syssi as code owners March 30, 2018 07:16

homeassistant added cla-needed integration: xiaomi_aqara platform: binary_sensor.xiaomi_aqara small-pr PRs with less than 30 lines. labels Mar 30, 2018

houndci-bot reviewed Mar 30, 2018

View reviewed changes

homeassistant added cla-signed and removed cla-needed labels Mar 30, 2018

format code style

7ace038

homeassistant added the cla-signed label Mar 30, 2018

houndci-bot reviewed Mar 30, 2018

View reviewed changes

ileler added 2 commits March 30, 2018 15:25

format code style

54dad52

format code style

77cc7df

houndci-bot reviewed Mar 30, 2018

View reviewed changes

format code style

29b2d97

houndci-bot reviewed Mar 30, 2018

View reviewed changes

ileler added 2 commits March 30, 2018 15:58

format code style

8a11675

support motion 2.0

5dc40bf

fabaff requested changes Apr 1, 2018

View reviewed changes

remove file executable permissions

e1f4036

Danielhiversen reviewed Apr 1, 2018

View reviewed changes

Danielhiversen added the docs-missing label Apr 1, 2018

ileler added 2 commits April 2, 2018 09:13

remove unused variables

d8c103f

Merge branch 'dev' of gh:ileler/home-assistant into dev

e59e19d

homeassistant added the cla-signed label Apr 2, 2018

syssi mentioned this pull request Apr 2, 2018

Air Conditioning Companion V3 (acpartner.v3) support added home-assistant/home-assistant.io#5083

Merged

syssi reviewed Apr 2, 2018

View reviewed changes

MartinHjelmare changed the title ~~support new device model;support new LAN protocol 2.0~~ Support new xiaomi aqara device model and LAN protocol 2.0 Apr 2, 2018

syssi removed the docs-missing label Apr 3, 2018

syssi approved these changes Apr 25, 2018

View reviewed changes

syssi merged commit 0a0d34d into home-assistant:dev Apr 25, 2018

balloob mentioned this pull request May 11, 2018

0.69 #14392

Merged

home-assistant locked and limited conversation to collaborators Jul 26, 2018

ghost removed platform: binary_sensor.xiaomi_aqara labels Mar 21, 2019

Uh oh!

Conversation

kerwin612 commented Mar 30, 2018 • edited by MartinHjelmare Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description:

Checklist:

Uh oh!

homeassistant commented Mar 30, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

fabaff left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kerwin612 commented Apr 1, 2018

Uh oh!

Danielhiversen commented Apr 1, 2018

Uh oh!

syssi commented Apr 2, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kerwin612 commented Apr 24, 2018

Uh oh!

syssi commented Apr 24, 2018

Uh oh!

kerwin612 commented Apr 24, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

kerwin612 commented Mar 30, 2018 •

edited by MartinHjelmare

Loading