Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
hfedcba committed Aug 2, 2016
2 parents 4cce630 + d530ea8 commit 9ce3197
Show file tree
Hide file tree
Showing 8 changed files with 40 additions and 1,017 deletions.
6 changes: 6 additions & 0 deletions misc/Config Directory/philipshue.conf
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ ___________________________________________________________________________
------------------------------- Philips hue -------------------------------
___________________________________________________________________________

[General]

#######################################
############# Hue Bridge #############
#######################################
Expand All @@ -25,3 +27,7 @@ ___________________________________________________________________________

## Should be "100" for Philips hue
#responseDelay = 100

# The interval in milliseconds to poll the Hue bridge
#interval = 15000

12 changes: 10 additions & 2 deletions misc/Device Description Files/LCT.xml
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,10 @@
<key>on</key>
<parameterId>STATE</parameterId>
</element>
<element>
<key>bri</key>
<parameterId>BRIGHTNESS</parameterId>
</element>
</jsonPayload>
</packet>
<packet id="FAST_STATE_SET">
Expand All @@ -282,6 +286,10 @@
<key>on</key>
<parameterId>STATE</parameterId>
</element>
<element>
<key>bri</key>
<parameterId>BRIGHTNESS</parameterId>
</element>
</jsonPayload>
</packet>
<packet id="XY_SET">
Expand Down Expand Up @@ -418,7 +426,7 @@
</properties>
<logicalInteger>
<minimumValue>1</minimumValue>
<maximumValue>255</maximumValue>
<maximumValue>254</maximumValue>
</logicalInteger>
<physicalInteger groupId="BRIGHTNESS">
<operationType>command</operationType>
Expand All @@ -440,7 +448,7 @@
</properties>
<logicalInteger>
<minimumValue>1</minimumValue>
<maximumValue>255</maximumValue>
<maximumValue>254</maximumValue>
</logicalInteger>
<physicalInteger groupId="BRIGHTNESS">
<operationType>command</operationType>
Expand Down
Loading

0 comments on commit 9ce3197

Please sign in to comment.