diff --git a/Docs/huepi.Lightstate.html b/Docs/huepi.Lightstate.html
index 5e2ebc4..1708aa8 100644
--- a/Docs/huepi.Lightstate.html
+++ b/Docs/huepi.Lightstate.html
@@ -95,7 +95,7 @@ <h4 class="name" id="Lightstate"><span class="type-signature"></span>new Lightst
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line437">line 437</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line500">line 500</a>
</li></ul></dd>
@@ -191,7 +191,7 @@ <h4 class="name" id="AlertLSelect"><span class="type-signature"></span>AlertLSel
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line538">line 538</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line601">line 601</a>
</li></ul></dd>
@@ -269,7 +269,7 @@ <h4 class="name" id="AlertNone"><span class="type-signature"></span>AlertNone<sp
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line543">line 543</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line606">line 606</a>
</li></ul></dd>
@@ -347,7 +347,7 @@ <h4 class="name" id="AlertSelect"><span class="type-signature"></span>AlertSelec
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line533">line 533</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line596">line 596</a>
</li></ul></dd>
@@ -425,7 +425,7 @@ <h4 class="name" id="EffectColorloop"><span class="type-signature"></span>Effect
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line552">line 552</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line615">line 615</a>
</li></ul></dd>
@@ -503,7 +503,7 @@ <h4 class="name" id="EffectNone"><span class="type-signature"></span>EffectNone<
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line557">line 557</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line620">line 620</a>
</li></ul></dd>
@@ -581,7 +581,7 @@ <h4 class="name" id="Get"><span class="type-signature"></span>Get<span class="si
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line572">line 572</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line635">line 635</a>
</li></ul></dd>
@@ -681,7 +681,7 @@ <h4 class="name" id="Off"><span class="type-signature"></span>Off<span class="si
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line449">line 449</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line512">line 512</a>
</li></ul></dd>
@@ -759,7 +759,7 @@ <h4 class="name" id="On"><span class="type-signature"></span>On<span class="sign
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line444">line 444</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line507">line 507</a>
</li></ul></dd>
@@ -886,7 +886,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line481">line 481</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line544">line 544</a>
</li></ul></dd>
@@ -972,7 +972,7 @@ <h5>Parameters:</h5>
- <td class="description last">Range [2000..65000] for the 2012 lights</td>
+ <td class="description last">Range [2000..6500] for the 2012 lights</td>
</tr>
@@ -1013,7 +1013,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line516">line 516</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line579">line 579</a>
</li></ul></dd>
@@ -1099,7 +1099,7 @@ <h5>Parameters:</h5>
- <td class="description last">Micro Reciprocal Degree of Colortemperature (Ct = 100000 / Colortemperature)</td>
+ <td class="description last">Micro Reciprocal Degree of Colortemperature (Ct = 1000000 / Colortemperature)</td>
</tr>
@@ -1140,7 +1140,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line509">line 509</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line572">line 572</a>
</li></ul></dd>
@@ -1267,7 +1267,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line467">line 467</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line530">line 530</a>
</li></ul></dd>
@@ -1440,7 +1440,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line490">line 490</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line553">line 553</a>
</li></ul></dd>
@@ -1526,7 +1526,7 @@ <h5>Parameters:</h5>
- <td class="description last">Range [0..255]</td>
+ <td class="description last">Range [0..1]</td>
</tr>
@@ -1549,7 +1549,7 @@ <h5>Parameters:</h5>
- <td class="description last">Range [0..255]</td>
+ <td class="description last">Range [0..1]</td>
</tr>
@@ -1572,7 +1572,7 @@ <h5>Parameters:</h5>
- <td class="description last">Range [0..255]</td>
+ <td class="description last">Range [0..1]</td>
</tr>
@@ -1613,7 +1613,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line502">line 502</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line565">line 565</a>
</li></ul></dd>
@@ -1740,7 +1740,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line474">line 474</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line537">line 537</a>
</li></ul></dd>
@@ -1867,7 +1867,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line564">line 564</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line627">line 627</a>
</li></ul></dd>
@@ -2017,7 +2017,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line524">line 524</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line587">line 587</a>
</li></ul></dd>
@@ -2065,7 +2065,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="huepi.htm
<br class="clear">
<footer>
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-beta1</a> on Sun Feb 15 2015 17:08:41 GMT+0100 (CET)
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-beta1</a> on Tue Feb 24 2015 09:12:22 GMT+0100 (CET)
</footer>
<script> prettyPrint(); </script>
diff --git a/Docs/huepi.html b/Docs/huepi.html
index 9ceb1a1..bccc504 100644
--- a/Docs/huepi.html
+++ b/Docs/huepi.html
@@ -1017,7 +1017,7 @@ <h3 class="subsection-title">Methods</h3>
- <h4 class="name" id=".HelperCTtoRGB"><span class="type-signature">(static) </span>HelperCTtoRGB<span class="signature">(Temperature)</span><span class="type-signature"> → {object}</span></h4>
+ <h4 class="name" id=".HelperColortemperaturetoRGB"><span class="type-signature">(static) </span>HelperColortemperaturetoRGB<span class="signature">(Temperature)</span><span class="type-signature"> → {object}</span></h4>
@@ -1062,7 +1062,7 @@ <h5>Parameters:</h5>
<td class="type">
-<span class="param-type">numer</span>
+<span class="param-type">number</span>
@@ -1113,7 +1113,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line357">line 357</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line420">line 420</a>
</li></ul></dd>
@@ -1140,7 +1140,7 @@ <h5>Returns:</h5>
<div class="param-desc">
- [Red, Green, Blue] ranges [0..255] [0..255] [0..255]
+ [Red, Green, Blue] ranges [0..1] [0..1] [0..1]
</div>
@@ -1312,7 +1312,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line291">line 291</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line279">line 279</a>
</li></ul></dd>
@@ -2046,7 +2046,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line408">line 408</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line471">line 471</a>
</li></ul></dd>
@@ -2099,6 +2099,178 @@ <h5>Returns:</h5>
+ <h4 class="name" id=".HelperXYtoRGB"><span class="type-signature">(static) </span>HelperXYtoRGB<span class="signature">(x, y)</span><span class="type-signature"> → {object}</span></h4>
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <h5>Parameters:</h5>
+
+
+<table class="params">
+ <thead>
+ <tr>
+
+ <th>Name</th>
+
+
+ <th>Type</th>
+
+
+
+
+
+ <th class="last">Description</th>
+ </tr>
+ </thead>
+
+ <tbody>
+
+
+ <tr>
+
+ <td class="name"><code>x</code></td>
+
+
+ <td class="type">
+
+
+<span class="param-type">float</span>
+
+
+
+ </td>
+
+
+
+
+
+ <td class="description last"></td>
+ </tr>
+
+
+
+ <tr>
+
+ <td class="name"><code>y</code></td>
+
+
+ <td class="type">
+
+
+<span class="param-type">float</span>
+
+
+
+ </td>
+
+
+
+
+
+ <td class="description last"></td>
+ </tr>
+
+
+ </tbody>
+</table>
+
+
+
+
+
+
+<dl class="details">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <dt class="tag-source">Source:</dt>
+ <dd class="tag-source"><ul class="dummy"><li>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line349">line 349</a>
+ </li></ul></dd>
+
+
+
+
+
+
+
+</dl>
+
+
+
+
+
+
+
+
+
+
+
+
+
+<h5>Returns:</h5>
+
+
+<div class="param-desc">
+ [Red, Green, Blue] - Ranges [0..1] [0..1] [0..1]
+</div>
+
+
+
+<dl>
+ <dt>
+ Type
+ </dt>
+ <dd>
+
+<span class="param-type">object</span>
+
+
+ </dd>
+</dl>
+
+
+
+
+
+
+
+
+
+
<h4 class="name" id="BridgeCreateUser"><span class="type-signature"></span>BridgeCreateUser<span class="signature">()</span><span class="type-signature"></span></h4>
@@ -2509,7 +2681,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1179">line 1179</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1242">line 1242</a>
</li></ul></dd>
@@ -2659,7 +2831,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1191">line 1191</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1254">line 1254</a>
</li></ul></dd>
@@ -2809,7 +2981,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1167">line 1167</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1230">line 1230</a>
</li></ul></dd>
@@ -2963,7 +3135,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line893">line 893</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line956">line 956</a>
</li></ul></dd>
@@ -3090,7 +3262,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line955">line 955</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1018">line 1018</a>
</li></ul></dd>
@@ -3240,7 +3412,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1203">line 1203</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1266">line 1266</a>
</li></ul></dd>
@@ -3390,7 +3562,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1215">line 1215</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1278">line 1278</a>
</li></ul></dd>
@@ -3540,7 +3712,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line996">line 996</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1059">line 1059</a>
</li></ul></dd>
@@ -3690,7 +3862,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line984">line 984</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1047">line 1047</a>
</li></ul></dd>
@@ -3867,7 +4039,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line941">line 941</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1004">line 1004</a>
</li></ul></dd>
@@ -4035,7 +4207,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1058">line 1058</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1121">line 1121</a>
</li></ul></dd>
@@ -4208,7 +4380,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1128">line 1128</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1191">line 1191</a>
</li></ul></dd>
@@ -4381,7 +4553,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1099">line 1099</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1162">line 1162</a>
</li></ul></dd>
@@ -4604,7 +4776,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1012">line 1012</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1075">line 1075</a>
</li></ul></dd>
@@ -4777,7 +4949,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1032">line 1032</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1095">line 1095</a>
</li></ul></dd>
@@ -4981,7 +5153,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1073">line 1073</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1136">line 1136</a>
</li></ul></dd>
@@ -5135,7 +5307,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line924">line 924</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line987">line 987</a>
</li></ul></dd>
@@ -5285,7 +5457,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line908">line 908</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line971">line 971</a>
</li></ul></dd>
@@ -5389,7 +5561,7 @@ <h5>Parameters:</h5>
- <td class="description last">Range [0..255]</td>
+ <td class="description last">Range [0..1]</td>
</tr>
@@ -5407,7 +5579,7 @@ <h5>Parameters:</h5>
- <td class="description last">Range [0..255]</td>
+ <td class="description last">Range [0..1]</td>
</tr>
@@ -5425,7 +5597,7 @@ <h5>Parameters:</h5>
- <td class="description last">Range [0..255]</td>
+ <td class="description last">Range [0..1]</td>
</tr>
@@ -5489,7 +5661,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1088">line 1088</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1151">line 1151</a>
</li></ul></dd>
@@ -5657,7 +5829,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1045">line 1045</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1108">line 1108</a>
</li></ul></dd>
@@ -5807,7 +5979,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line969">line 969</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1032">line 1032</a>
</li></ul></dd>
@@ -6003,7 +6175,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1139">line 1139</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1202">line 1202</a>
</li></ul></dd>
@@ -6081,7 +6253,7 @@ <h4 class="name" id="GroupsGetData"><span class="type-signature"></span>GroupsGe
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line877">line 877</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line940">line 940</a>
</li></ul></dd>
@@ -6231,7 +6403,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line825">line 825</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line888">line 888</a>
</li></ul></dd>
@@ -6381,7 +6553,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line837">line 837</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line900">line 900</a>
</li></ul></dd>
@@ -6531,7 +6703,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line813">line 813</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line876">line 876</a>
</li></ul></dd>
@@ -6681,7 +6853,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line849">line 849</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line912">line 912</a>
</li></ul></dd>
@@ -6831,7 +7003,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line861">line 861</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line924">line 924</a>
</li></ul></dd>
@@ -6981,7 +7153,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line663">line 663</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line726">line 726</a>
</li></ul></dd>
@@ -7131,7 +7303,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line651">line 651</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line714">line 714</a>
</li></ul></dd>
@@ -7299,7 +7471,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line724">line 724</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line787">line 787</a>
</li></ul></dd>
@@ -7472,7 +7644,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line788">line 788</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line851">line 851</a>
</li></ul></dd>
@@ -7645,7 +7817,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line769">line 769</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line832">line 832</a>
</li></ul></dd>
@@ -7868,7 +8040,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line679">line 679</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line742">line 742</a>
</li></ul></dd>
@@ -8041,7 +8213,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line698">line 698</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line761">line 761</a>
</li></ul></dd>
@@ -8245,7 +8417,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line739">line 739</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line802">line 802</a>
</li></ul></dd>
@@ -8395,7 +8567,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line621">line 621</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line684">line 684</a>
</li></ul></dd>
@@ -8499,7 +8671,7 @@ <h5>Parameters:</h5>
- <td class="description last">Range [0..255]</td>
+ <td class="description last">Range [0..1]</td>
</tr>
@@ -8517,7 +8689,7 @@ <h5>Parameters:</h5>
- <td class="description last">Range [0..255]</td>
+ <td class="description last">Range [0..1]</td>
</tr>
@@ -8535,7 +8707,7 @@ <h5>Parameters:</h5>
- <td class="description last">Range [0..255]</td>
+ <td class="description last">Range [0..1]</td>
</tr>
@@ -8599,7 +8771,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line754">line 754</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line817">line 817</a>
</li></ul></dd>
@@ -8767,7 +8939,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line711">line 711</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line774">line 774</a>
</li></ul></dd>
@@ -8917,7 +9089,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line636">line 636</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line699">line 699</a>
</li></ul></dd>
@@ -9113,7 +9285,7 @@ <h5>Parameters:</h5>
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line799">line 799</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line862">line 862</a>
</li></ul></dd>
@@ -9191,7 +9363,7 @@ <h4 class="name" id="LightsGetData"><span class="type-signature"></span>LightsGe
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line586">line 586</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line649">line 649</a>
</li></ul></dd>
@@ -9269,7 +9441,7 @@ <h4 class="name" id="LightsGetNew"><span class="type-signature"></span>LightsGet
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line611">line 611</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line674">line 674</a>
</li></ul></dd>
@@ -9347,7 +9519,7 @@ <h4 class="name" id="LightsSearchForNew"><span class="type-signature"></span>Lig
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line599">line 599</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line662">line 662</a>
</li></ul></dd>
@@ -9507,7 +9679,7 @@ <h4 class="name" id="RulesGetData"><span class="type-signature"></span>RulesGetD
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1288">line 1288</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1351">line 1351</a>
</li></ul></dd>
@@ -9585,7 +9757,7 @@ <h4 class="name" id="ScenesGetData"><span class="type-signature"></span>ScenesGe
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1250">line 1250</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1313">line 1313</a>
</li></ul></dd>
@@ -9663,7 +9835,7 @@ <h4 class="name" id="SchedulesGetData"><span class="type-signature"></span>Sched
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1231">line 1231</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1294">line 1294</a>
</li></ul></dd>
@@ -9741,7 +9913,7 @@ <h4 class="name" id="SensorsGetData"><span class="type-signature"></span>Sensors
<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
- <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1269">line 1269</a>
+ <a href="huepi.js.html">huepi.js</a>, <a href="huepi.js.html#line1332">line 1332</a>
</li></ul></dd>
@@ -9789,7 +9961,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="huepi.htm
<br class="clear">
<footer>
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-beta1</a> on Sun Feb 15 2015 17:08:41 GMT+0100 (CET)
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-beta1</a> on Tue Feb 24 2015 09:12:21 GMT+0100 (CET)
</footer>
<script> prettyPrint(); </script>
diff --git a/Docs/huepi.js.html b/Docs/huepi.js.html
index fb6844e..369476a 100644
--- a/Docs/huepi.js.html
+++ b/Docs/huepi.js.html
@@ -90,7 +90,7 @@ <h1 class="page-title">Source: huepi.js</h1>
}
////////////////////////////////////////////////////////////////////////////////
-//
+//
// Portal Functions
//
//
@@ -187,7 +187,7 @@ <h1 class="page-title">Source: huepi.js</h1>
* @returns {object} [Ang, Sat, Bri] - Ranges [0..360] [0..1] [0..1]
*/
huepi.HelperRGBtoHueAngSatBri = function(Red, Green, Blue)
-{ // Range 0..1, return .Ang (360), .Sat, .Brig
+{
var Ang, Sat, Bri;
var Min = Math.min(Red, Green, Blue);
var Max = Math.max(Red, Green, Blue);
@@ -272,12 +272,8 @@ <h1 class="page-title">Source: huepi.js</h1>
* @returns {object} [x, y] - Ranges [0..1] [0..1]
*/
huepi.HelperRGBtoXY = function(Red, Green, Blue)
-{ // Range 0..1, return .x, .y
- // Adjust to Light XY CIE
- // https://github.com/PhilipsHue/PhilipsHueSDK-iOS-OSX/commit/f41091cf671e13fe8c32fcced12604cd31cceaf3
- // for details...
- //
- // Gamma Correct RGB
+{ // Source: https://github.com/PhilipsHue/PhilipsHueSDK-iOS-OSX/blob/master/ApplicationDesignNotes/RGB%20to%20xy%20Color%20conversion.md
+ // Apply gamma correction
if (Red > 0.04045)
Red = Math.pow((Red + 0.055) / (1.055), 2.4);
else
@@ -290,18 +286,10 @@ <h1 class="page-title">Source: huepi.js</h1>
Blue = Math.pow((Blue + 0.055) / (1.055), 2.4);
else
Blue = Blue / 12.92;
- // Translate to XYZ
+ // Wide gamut conversion D65
var X = Red * 0.649926 + Green * 0.103455 + Blue * 0.197109;
var Y = Red * 0.234327 + Green * 0.743075 + Blue * 0.022598;
var Z = Red * 0.000000 + Green * 0.053077 + Blue * 1.035763;
- //
- // http://www.everyhue.com/vanilla/discussion/comment/635
- //
- // var X = 1.076450 * Red - 0.237662 * Green + 0.161212 * Blue;
- // var Y = 0.410964 * Red + 0.554342 * Green + 0.034694 * Blue;
- // var Z = -0.010954 * Red - 0.013389 * Green + 1.024343 * Blue;
-
- //
// But we don't want Capital X,Y,Z you want lowercase [x,y] (called the color point) as per:
if ((X + Y + Z) === 0)
return {x: 0, y: 0};
@@ -317,16 +305,19 @@ <h1 class="page-title">Source: huepi.js</h1>
* @returns {object} [x, y] - Ranges [0..1] [0..1]
*/
huepi.HelperGamutXYforModel = function(Px, Py, Model)
-{ // return .x, .y
- // Check if point is inside Triangle for correct model of light
- if (Model === 'LCT001') { // For the hue bulb the corners of the triangle are:
- var PRed = {x: 0.6750, y: 0.3220};
- var PGreen = {x: 0.4091, y: 0.5180};
- var PBlue = {x: 0.1670, y: 0.0400};
- } else { // For LivingColors Bloom, Aura and Iris the triangle corners are:
- var PRed = {x: 0.704, y: 0.296};
- var PGreen = {x: 0.2151, y: 0.7106};
- var PBlue = {x: 0.138, y: 0.08};
+{
+ if (Model.slice(0, 3) === 'LCT') { // For the hue bulb the corners of the triangle are:
+ var PRed = {x: 0.674, y: 0.322};
+ var PGreen = {x: 0.408, y: 0.517};
+ var PBlue = {x: 0.168, y: 0.041};
+ } else if ((Model.slice(0, 3) === 'LLC') || (Model.slice(0, 3) === 'LST')) { // For LivingColors Bloom, Aura and Iris the triangle corners are:
+ var PRed = {x: 0.703, y: 0.296};
+ var PGreen = {x: 0.214, y: 0.709};
+ var PBlue = {x: 0.139, y: 0.081};
+ } else { // Default all values
+ var PRed = {x: 1.0, y: 0.0};
+ var PGreen = {x: 0.0, y: 1.0};
+ var PBlue = {x: 0.0, y: 0.0};
}
var VBR = {x: PRed.x - PBlue.x, y: PRed.y - PBlue.y}; // Blue to Red
@@ -379,10 +370,82 @@ <h1 class="page-title">Source: huepi.js</h1>
};
/**
- * @param {numer} Temperature ranges [1000..66000]
- * @returns {object} [Red, Green, Blue] ranges [0..255] [0..255] [0..255]
+ * @param {float} x
+ * @param {float} y
+ * @returns {object} [Red, Green, Blue] - Ranges [0..1] [0..1] [0..1]
*/
-huepi.HelperCTtoRGB = function(Temperature)
+huepi.HelperXYtoRGB = function(x, y)
+{ // Source: https://github.com/PhilipsHue/PhilipsHueSDK-iOS-OSX/blob/master/ApplicationDesignNotes/RGB%20to%20xy%20Color%20conversion.md
+ var z = 1.0 - x - y;
+ var Y = 1.0;
+ var X = (Y / y) * x;
+ var Z = (Y / y) * z;
+ // sRGB D65 conversion
+ var Red = X * 3.2406 - Y * 1.5372 - Z * 0.4986;
+ var Green = -X * 0.9689 + Y * 1.8758 + Z * 0.0415;
+ var Blue = X * 0.0557 - Y * 0.2040 + Z * 1.0570;
+ // Limit RGB on [0..1]
+ if (Red > Blue && Red > Green && Red > 1.0) { // Red is too big
+ Green = Green / Red;
+ Blue = Blue / Red;
+ Red = 1.0;
+ }
+ else if (Green > Blue && Green > Red && Green > 1.0) { // Green is too big
+ Red = Red / Green;
+ Blue = Blue / Green;
+ Green = 1.0;
+ }
+ else if (Blue > Red && Blue > Green && Blue > 1.0) { // Blue is too big
+ Red = Red / Blue;
+ Green = Green / Blue;
+ Blue = 1.0;
+ }
+ // Apply gamma correction
+ if (Red <= 0.0031308) {
+ Red = Red * 12.92;
+ } else {
+ Red = 1.055 * Math.pow(Red, (1.0 / 2.4)) - 0.055;
+ }
+ if (Green <= 0.0031308) {
+ Green = Green * 12.92;
+ } else {
+ Green = 1.055 * Math.pow(Green, (1.0 / 2.4)) - 0.055;
+ }
+ if (Blue <= 0.0031308) {
+ Blue = Blue * 12.92;
+ } else {
+ Blue = 1.055 * Math.pow(Blue, (1.0 / 2.4)) - 0.055;
+ }
+ // Limit RGB on [0..1]
+ if (Red > Blue && Red > Green) { // Red is biggest
+ if (Red > 1.0) {
+ Green = Green / Red;
+ Blue = Blue / Red;
+ Red = 1.0;
+ }
+ }
+ else if (Green > Blue && Green > Red) { // Green is biggest
+ if (Green > 1.0) {
+ Red = Red / Green;
+ Blue = Blue / Green;
+ Green = 1.0;
+ }
+ }
+ else if (Blue > Red && Blue > Green) { // Blue is biggest
+ if (Blue > 1.0) {
+ Red = Red / Blue;
+ Green = Green / Blue;
+ Blue = 1.0;
+ }
+ }
+ return {Red: Red, Green: Green, Blue: Blue};
+};
+
+/**
+ * @param {number} Temperature ranges [1000..66000]
+ * @returns {object} [Red, Green, Blue] ranges [0..1] [0..1] [0..1]
+ */
+huepi.HelperColortemperaturetoRGB = function(Temperature)
{ // http://www.tannerhelland.com/4435/convert-temperature-rgb-algorithm-code/
var Red, Green, Blue;
@@ -391,7 +454,7 @@ <h1 class="page-title">Source: huepi.js</h1>
Red = 255;
else {
Red = Temperature - 60;
- Red = Math.round(329.698727466 * Math.pow(Red, -0.1332047592));
+ Red = 329.698727466 * Math.pow(Red, -0.1332047592);
if (Red < 0)
Red = 0;
if (Red > 255)
@@ -399,7 +462,7 @@ <h1 class="page-title">Source: huepi.js</h1>
}
if (Temperature <= 66) {
Green = Temperature;
- Green = Math.round(99.4708025861 * Math.log(Green) - 161.1195681661);
+ Green = 99.4708025861 * Math.log(Green) - 161.1195681661;
if (Green < 0)
Green = 0;
if (Green > 255)
@@ -419,14 +482,14 @@ <h1 class="page-title">Source: huepi.js</h1>
Blue = 0;
else {
Blue = Temperature - 10;
- Blue = Math.round(138.5177312231 * Math.log(Blue) - 305.0447927307);
+ Blue = 138.5177312231 * Math.log(Blue) - 305.0447927307;
if (Blue < 0)
Blue = 0;
if (Blue > 255)
Blue = 255;
}
}
- return {Red: Red, Green: Green, Blue: Blue};
+ return {Red: Red/255, Green: Green/255, Blue: Blue/255};
};
/**
@@ -484,33 +547,33 @@ <h1 class="page-title">Source: huepi.js</h1>
* @param {float} Brightness Range [0..255]
*/
this.SetHSB = function(Hue, Saturation, Brightness) { // Range 65535, 255, 255
- this.hue = Hue;
- this.sat = Saturation;
- this.bri = Brightness;
+ this.hue = Math.round(Hue);
+ this.sat = Math.round(Saturation);
+ this.bri = Math.round(Brightness);
return this;
};
/**
* @param {number} Hue Range [0..65535]
*/
this.SetHue = function(Hue) {
- this.hue = Hue;
+ this.hue = Math.round(Hue);
return this;
};
/**
* @param {float} Saturation Range [0..255]
*/
this.SetSaturation = function(Saturation) {
- this.sat = Saturation;
+ this.sat = Math.round(Saturation);
return this;
};
/**
* @param {float} Brightness Range [0..255]
*/
this.SetBrightness = function(Brightness) {
- this.bri = Brightness;
+ this.bri = Math.round(Brightness);
return this;
};
- /**
+ /**
* @param {float} Ang Range [0..360]
* @param {float} Sat Range [0..1]
* @param {float} Bri Range [0..1]
@@ -520,26 +583,26 @@ <h1 class="page-title">Source: huepi.js</h1>
while (Ang < 0)
Ang = Ang + 360;
Ang = Ang % 360;
- return this.SetHSB(Math.round(Ang / 360 * 65535), Sat * 255, Bri * 255);
+ return this.SetHSB(Math.round(Ang / 360 * 65535), Math.round(Sat * 255), Math.round(Bri * 255));
};
/**
- * @param {number} Red Range [0..255]
- * @param {number} Green Range [0..255]
- * @param {number} Blue Range [0..255]
+ * @param {number} Red Range [0..1]
+ * @param {number} Green Range [0..1]
+ * @param {number} Blue Range [0..1]
*/
- this.SetRGB = function(Red, Green, Blue) {// In RGB [0..255]
- var HueAngSatBri = huepi.HelperRGBtoHueAngSatBri(Red / 255, Green / 255, Blue / 255);
+ this.SetRGB = function(Red, Green, Blue) {
+ var HueAngSatBri = huepi.HelperRGBtoHueAngSatBri(Red, Green, Blue);
return this.SetHueAngSatBri(HueAngSatBri.Ang, HueAngSatBri.Sat, HueAngSatBri.Bri);
};
/**
- * @param {number} Ct Micro Reciprocal Degree of Colortemperature (Ct = 100000 / Colortemperature)
+ * @param {number} Ct Micro Reciprocal Degree of Colortemperature (Ct = 1000000 / Colortemperature)
*/
this.SetCT = function(Ct) {
- this.ct = Ct;
+ this.ct = Math.round(Ct);
return this;
};
/**
- * @param {number} Colortemperature Range [2000..65000] for the 2012 lights
+ * @param {number} Colortemperature Range [2000..6500] for the 2012 lights
*/
this.SetColortemperature = function(Colortemperature) {
this.ct = Math.round((1000000 / Colortemperature)); // Kelvin to micro reciprocal degree
@@ -547,7 +610,7 @@ <h1 class="page-title">Source: huepi.js</h1>
};
/**
* @param {float} X
- * @param {float} Y
+ * @param {float} Y
*/
this.SetXY = function(X, Y) {
this.xy = [X, Y];
@@ -594,7 +657,7 @@ <h1 class="page-title">Source: huepi.js</h1>
this.transitiontime = Transitiontime;
return this;
};
- /**
+ /**
* @returns {string} Stringified version of the content of LightState ready to be sent to the Bridge.
*/
this.Get = function() {
@@ -766,25 +829,25 @@ <h1 class="page-title">Source: huepi.js</h1>
*/
huepi.prototype.LightSetHueAngSatBri = function(LightNr, Ang, Sat, Bri, Transitiontime)
{ // In: Hue in Deg, Saturation, Brightness 0.0-1.0 Transform To Philips Hue Range...
- if (Ang < 0)
+ while (Ang < 0)
Ang = Ang + 360;
Ang = Ang % 360;
- return this.LightSetHSB(LightNr, Math.round(Ang / 360 * 65535), Sat * 255, Bri * 255, Transitiontime);
+ return this.LightSetHSB(LightNr, Ang / 360 * 65535, Sat * 255, Bri * 255, Transitiontime);
};
/**
* @param {number} LightNr
- * @param Red Range [0..255]
- * @param Green Range [0..255]
- * @param Blue Range [0..255]
+ * @param Red Range [0..1]
+ * @param Green Range [0..1]
+ * @param Blue Range [0..1]
* @param {number} Transitiontime optional
*/
-huepi.prototype.LightSetRGB = function(LightNr, Red, Green, Blue, Transitiontime) // 0-255;FF
+huepi.prototype.LightSetRGB = function(LightNr, Red, Green, Blue, Transitiontime)
{
- var Point = huepi.HelperRGBtoXY(Red / 255, Green / 255, Blue / 255);
- var HueAngSatBri = huepi.HelperRGBtoHueAngSatBri(Red / 255, Green / 255, Blue / 255);
+ var Point = huepi.HelperRGBtoXY(Red, Green, Blue);
+ var HueAngSatBri = huepi.HelperRGBtoHueAngSatBri(Red, Green, Blue);
return $.when(
- this.LightSetBrightness(Math.round(HueAngSatBri.Bri * 255)),
+ this.LightSetBrightness(HueAngSatBri.Bri * 255),
this.LightSetXY(LightNr, Point.x, Point.y, Transitiontime)
);
};
@@ -798,7 +861,7 @@ <h1 class="page-title">Source: huepi.js</h1>
{
var Model = this.Lights[LightNr].modelid;
if (Model !== 'LCT001') { // CT->RGB->XY to ignore Brightness in RGB
- var Color = huepi.HelperCTtoRGB(1000000 / CT);
+ var Color = huepi.HelperColortemperaturetoRGB(1000000 / CT);
var Point = huepi.HelperRGBtoXY(Color.Red, Color.Green, Color.Blue);
return this.LightSetXY(LightNr, Point.x, Point.y, Transitiontime);
}
@@ -815,7 +878,7 @@ <h1 class="page-title">Source: huepi.js</h1>
*/
huepi.prototype.LightSetColortemperature = function(LightNr, Colortemperature, Transitiontime)
{
- return this.LightSetCT(LightNr, Math.round(1000000 / Colortemperature), Transitiontime);
+ return this.LightSetCT(LightNr, 1000000 / Colortemperature, Transitiontime);
};
/**
@@ -918,7 +981,7 @@ <h1 class="page-title">Source: huepi.js</h1>
* @param {string} Name New name of the light Range [1..32]
* @param {multiple} Lights LightNr or Array of Lights to Group
*/
-huepi.prototype.GroupCreate = function(Name, Lights)
+huepi.prototype.GroupCreate = function(Name, Lights)
{ // POST /api/username/groups
return $.ajax({
type: 'POST',
@@ -1100,22 +1163,22 @@ <h1 class="page-title">Source: huepi.js</h1>
*/
huepi.prototype.GroupSetHueAngSatBri = function(GroupNr, Ang, Sat, Bri, Transitiontime)
{
- if (Ang < 0)
+ while (Ang < 0)
Ang = Ang + 360;
Ang = Ang % 360;
- return this.GroupSetHSB(GroupNr, Math.round(Ang / 360 * 65535), Sat * 255, Bri * 255, Transitiontime);
+ return this.GroupSetHSB(GroupNr, Ang / 360 * 65535, Sat * 255, Bri * 255, Transitiontime);
};
/**
* @param {number} GroupNr
- * @param Red Range [0..255]
- * @param Green Range [0..255]
- * @param Blue Range [0..255]
+ * @param Red Range [0..1]
+ * @param Green Range [0..1]
+ * @param Blue Range [0..1]
* @param {number} Transitiontime optional
*/
-huepi.prototype.GroupSetRGB = function(GroupNr, Red, Green, Blue, Transitiontime) // 0-255;FF
+huepi.prototype.GroupSetRGB = function(GroupNr, Red, Green, Blue, Transitiontime)
{
- var HueAngSatBri = huepi.HelperRGBtoHueAngSatBri(Red / 255, Green / 255, Blue / 255);
+ var HueAngSatBri = huepi.HelperRGBtoHueAngSatBri(Red, Green, Blue);
return this.GroupSetHueAngSatBri(GroupNr, HueAngSatBri.Ang, HueAngSatBri.Sat, HueAngSatBri.Bri, Transitiontime);
};
@@ -1155,7 +1218,7 @@ <h1 class="page-title">Source: huepi.js</h1>
*/
huepi.prototype.GroupSetColortemperature = function(GroupNr, Colortemperature, Transitiontime)
{
- return this.GroupSetCT(GroupNr, Math.round(1000000 / Colortemperature), Transitiontime);
+ return this.GroupSetCT(GroupNr, 1000000 / Colortemperature, Transitiontime);
};
/**
@@ -1373,14 +1436,14 @@ <h1 class="page-title">Source: huepi.js</h1>
// 0.61
// LightSetCT = CT->RGB->XY to ignore Brightness in RGB
// changed " string to ' string
-//
+//
// 0.62
// renamed
// BridgeGet to BridgeGetData
// GroupGet to GroupsGetData
// LightGet to LightsGetData
// UsernameWhitelisted to BridgeUsernameWhitelisted
-//
+//
// 0.9
// Added detection of NodeJS
// Added WORKING JQuery NodeJS if running on NodeJS
@@ -1388,8 +1451,11 @@ <h1 class="page-title">Source: huepi.js</h1>
//
// 0.95
// renamed HUEPI to huepi to be more complient with modules and actual hue product name
-//
//
+//
+// Renamed HelperCTtoRGB to HelperColortemperaturetoRG
+// All Red, Green & Blue arguments ranges to [0..1]
+
</code></pre>
</article>
</section>
@@ -1406,7 +1472,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="huepi.htm
<br class="clear">
<footer>
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-beta1</a> on Sun Feb 15 2015 17:08:41 GMT+0100 (CET)
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-beta1</a> on Tue Feb 24 2015 09:12:21 GMT+0100 (CET)
</footer>
<script> prettyPrint(); </script>
diff --git a/Docs/index.html b/Docs/index.html
index 2b80638..086d984 100644
--- a/Docs/index.html
+++ b/Docs/index.html
@@ -56,7 +56,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="huepi.htm
<br class="clear">
<footer>
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-beta1</a> on Sun Feb 15 2015 17:08:41 GMT+0100 (CET)
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-beta1</a> on Tue Feb 24 2015 09:12:21 GMT+0100 (CET)
</footer>
<script> prettyPrint(); </script>