summaryrefslogtreecommitdiff
path: root/svg/subcan.js
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@diac24.net>2013-06-29 13:36:59 +0000
committerroot <root@beaglebone.local.sublab.org>2013-06-29 13:36:59 +0000
commit8564203f3515d1a449451922dab824396bb60072 (patch)
treea1ae8c6fffa5317d8c47bb386e4ce6a72d2dcdc4 /svg/subcan.js
parent644a17b089b48b4deb734c750df152ab0a608e58 (diff)
cethcan: svg: basic DMX dimming
b/w only, no color picking.
Diffstat (limited to 'svg/subcan.js')
-rw-r--r--svg/subcan.js19
1 files changed, 15 insertions, 4 deletions
diff --git a/svg/subcan.js b/svg/subcan.js
index c75af50..7f2e6cd 100644
--- a/svg/subcan.js
+++ b/svg/subcan.js
@@ -42,12 +42,18 @@ function on_evt_click(node) {
$.jsonRPC.request('light_get', {
params: [id],
error: function(result) {
- console.log('light_get error', result);
+ console.log('light_get', id, 'error', result);
},
success: function(result) {
/* <<< */
- console.log('light_get', result['result']);
- var set = result['result']['set'];
+ r = result['result']
+ console.log('light_get', r);
+ var set;
+ if (r['r'] !== null) {
+ set = (r['r'] + r['g'] + r['b']) / 3;
+ } else {
+ set = r['set'];
+ }
var newset = set ? 0 : 255;
$.jsonRPC.request('light_set', {
params: [id, newset],
@@ -106,7 +112,12 @@ function on_evt_mousedown(node, evt) {
console.log('light_get error', result);
},
success: function(result) {
- mouseorig = result['result']['set'];
+ r = result['result']
+ if (r['r'] !== null) {
+ mouseorig = (r['r'] + r['g'] + r['b']) / 3;
+ } else {
+ mouseorig = r['set'];
+ }
mouseset = mouseorig;
}
});