diff --git a/js/msp.js b/js/msp.js index e98cd4fd..727f9fa0 100644 --- a/js/msp.js +++ b/js/msp.js @@ -72,7 +72,7 @@ var MSP = { ledDirectionLetters: ['n', 'e', 's', 'w', 'u', 'd'], // in LSB bit order ledFunctionLetters: ['i', 'w', 'f', 'a', 't', 'r', 'c', 'g', 's', 'b', 'l'], // in LSB bit order - ledBaseFunctionLetters: ['c', 'f', 'a', 'l', 's', 'g', 'r'], // in LSB bit + ledBaseFunctionLetters: ['c', 'f', 'a', 'l', 's', 'g', 'r', 'h'], // in LSB bit ledOverlayLetters: ['t', 'o', 'b', 'n', 'i', 'w'], // in LSB bit last_received_timestamp: null, diff --git a/js/msp/MSPHelper.js b/js/msp/MSPHelper.js index 56b00720..d9a61e7f 100644 --- a/js/msp/MSPHelper.js +++ b/js/msp/MSPHelper.js @@ -2664,7 +2664,7 @@ var mspHelper = (function (gui) { /* ledDirectionLetters: ['n', 'e', 's', 'w', 'u', 'd'], // in LSB bit order ledFunctionLetters: ['i', 'w', 'f', 'a', 't', 'r', 'c', 'g', 's', 'b', 'l'], // in LSB bit order - ledBaseFunctionLetters: ['c', 'f', 'a', 'l', 's', 'g', 'r'], // in LSB bit + ledBaseFunctionLetters: ['c', 'f', 'a', 'l', 's', 'g', 'r', 'h'], // in LSB bit ledOverlayLetters: ['t', 'o', 'b', 'n', 'i', 'w'], // in LSB bit */ diff --git a/src/css/tabs/led_strip.css b/src/css/tabs/led_strip.css index 5f1f4788..639251b2 100644 --- a/src/css/tabs/led_strip.css +++ b/src/css/tabs/led_strip.css @@ -74,6 +74,12 @@ border-color: rgb(52, 155, 255); } +.tab-led-strip .gPoint.function-h { /* Channel */ + background: skyblue; + box-shadow: inset 0 0 30px rgba(0, 0, 0, .7); + border-color: black; +} + .tab-led-strip .gPoint.function-c .overlay-color, .tab-led-strip .gPoint.function-r .overlay-color { float: left; @@ -210,6 +216,7 @@ .tab-led-strip .select .function-g { background: green;} /* .tab-led-strip .select .function-b { background: white; color:black;} */ .tab-led-strip .select .function-r { background: #acacac;} +.tab-led-strip .select .function-h { background: skyblue;} .tab-led-strip .select .functionSelect option { background: white; diff --git a/tabs/led_strip.html b/tabs/led_strip.html index 5fed7bc6..fdc12786 100644 --- a/tabs/led_strip.html +++ b/tabs/led_strip.html @@ -65,6 +65,7 @@ + @@ -104,6 +105,10 @@ + +
+ Select Channel from color list +
Mode colors
diff --git a/tabs/led_strip.js b/tabs/led_strip.js index 39f61d7d..ef63b74e 100644 --- a/tabs/led_strip.js +++ b/tabs/led_strip.js @@ -17,7 +17,7 @@ TABS.led_strip.initialize = function (callback, scrollPosition) { TABS.led_strip.overlays = ['t', 's', 'i', 'w']; } else { TABS.led_strip.functions = ['i', 'w', 'f', 'a', 't', 'r', 'c', 'g', 's', 'b', 'l', 'o', 'n']; - TABS.led_strip.baseFuncs = ['c', 'f', 'a', 'l', 's', 'g', 'r']; + TABS.led_strip.baseFuncs = ['c', 'f', 'a', 'l', 's', 'g', 'r', 'h']; TABS.led_strip.overlays = ['t', 'o', 'b', 'n', 'i', 'w']; } @@ -733,7 +733,7 @@ TABS.led_strip.initialize = function (callback, scrollPosition) { case "function-r": case "function-o": case "function-g": - return true; + return true; break; } } @@ -799,6 +799,7 @@ TABS.led_strip.initialize = function (callback, scrollPosition) { $('.modifiers').hide(); $('.blinkers').hide(); $('.warningOverlay').hide(); + $('.channel_info').hide(); if (areOverlaysActive(activeFunction)) $('.overlays').show(); @@ -867,6 +868,10 @@ TABS.led_strip.initialize = function (callback, scrollPosition) { $('.mode_color-6-0').show(); // disarmed $('.mode_color-6-1').show(); // armed break; + case "function-h": // Channel + $('.special_colors').hide(); + $('.channel_info').show(); + break; case "function-r": // Ring default: