Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
xaviml committed Oct 18, 2020
2 parents c67a294 + f9286d8 commit f6f49d9
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 10 deletions.
2 changes: 1 addition & 1 deletion apps/controllerx/controllerx.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
from cx_devices.lutron import *
from cx_devices.muller_licht import *
from cx_devices.osram import *
from cx_devices.philips import *
from cx_devices.phillips import *
from cx_devices.smartthings import *
from cx_devices.trust import *
File renamed without changes.
22 changes: 14 additions & 8 deletions docs/_data/controllers/hue-dimmer-switch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,20 @@ integrations:
- "4003 → Hold release \"O\""
- name: ZHA
codename: zha
actions:
- "on → Click \"I\""
- "step_0_30_9 → Click 🔆"
- "step_0_56_9 → Hold 🔆"
- "step_1_30_9 → Click 🔅"
- "step_1_56_9 → Hold 🔅"
- "off_with_effect_0_0 → Click \"O\""
- "stop → Release brightness buttons"
actions: # CHANGE THIS
- "on_short_release → Click \"I\""
- "on_hold → Hold \"I\""
- "on_long_release → Release \"I\""
- "up_short_release → Click 🔆"
- "up_hold → Hold 🔆"
- "up_long_release → Release 🔆"
- "down_short_release → Click 🔅"
- "down_hold → Hold 🔅"
- "down_long_release → Release 🔅"
- "off_short_release → Click \"O\""
- "off_hold → Hold \"O\""
- "off_long_release → Release \"O\""

note: >-
For ZHA integration, the hold events just work for the brightness buttons,
and they are fired right after the click events.
Expand Down
2 changes: 1 addition & 1 deletion tests/unit_tests/cx_devices/phillips_test.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import pytest
from cx_devices.philips import HueDimmerController
from cx_devices.phillips import HueDimmerController


@pytest.mark.parametrize(
Expand Down

0 comments on commit f6f49d9

Please sign in to comment.