Skip to content
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

tint remote (ZBT-Remote) Color keys #284

Merged
merged 13 commits into from
Feb 19, 2019
Merged

tint remote (ZBT-Remote) Color keys #284

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
fa5b765
tint remote, 3 keys
MoskitoHorst Feb 14, 2019
88d0809
Update devices.js
Koenkk Feb 14, 2019
b06faa2
Update fromZigbee.js
Koenkk Feb 14, 2019
22705d1
Update devices.js
Koenkk Feb 14, 2019
fbfd378
Update devices.js
Koenkk Feb 14, 2019
a433a35
tint remote (ZBT-Remote) Color keys
MoskitoHorst Feb 17, 2019
66cdeac
Merge remote-tracking branch 'upstream/master'
MoskitoHorst Feb 18, 2019
59be686
syntax power-key
MoskitoHorst Feb 18, 2019
1ad499b
Update fromZigbee.js
MoskitoHorst Feb 18, 2019
8c4f387
Update fromZigbee.js
Koenkk Feb 19, 2019
286a0ea
Update devices.js
Koenkk Feb 19, 2019
ef9640b
Update fromZigbee.js
Koenkk Feb 19, 2019
6151b57
Update devices.js
Koenkk Feb 19, 2019
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
Prev Previous commit
Next Next commit
Update fromZigbee.js
  • Loading branch information
@Koenkk
Koenkk authored Feb 19, 2019
commit ef9640b0fb3ddabbbe9e9799570516d8e8f5cbda
6 changes: 3 additions & 3 deletions converters/fromZigbee.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1599,7 +1599,7 @@ const converters = {
convert: (model, msg, publish, options) => {
return {
action: `color_temp`,
color_temperature: msg.data.data.colortemp,
action_color_temperature: msg.data.data.colortemp,
transition_time: msg.data.data.transtime,
};
},
Expand All @@ -1610,8 +1610,8 @@ const converters = {
convert: (model, msg, publish, options) => {
return {
action: `color_wheel`,
color_x: msg.data.data.colorx,
color_y: msg.data.data.colory,
action_color_x: msg.data.data.colorx,
action_color_y: msg.data.data.colory,
transition_time: msg.data.data.transtime,
};
},
Expand Down