Merge remote-tracking branch 'origin/add-slider'

src/components/Blockly/blocks/index.js

@@ -7,6 +7,7 @@ import './sensebox-osem';
 import './sensebox-web';
 import './sensebox-display';
 import './sensebox-lora';
+import './sensebox-led';
 import './io';
 import './math';
 import './map';

src/components/Blockly/blocks/sensebox-display.js

@@ -1,6 +1,8 @@
 import * as Blockly from 'blockly/core';
 import { getColour } from '../helpers/colour';
 import * as Types from '../helpers/types'
+import { FieldSlider } from '@blockly/field-slider';
+import { Field } from '..';
 
 
 Blockly.Blocks['sensebox_display_beginDisplay'] = {
@@ -35,12 +37,15 @@ Blockly.Blocks['sensebox_display_printDisplay'] = {
         this.appendDummyInput()
             .appendField(Blockly.Msg.senseBox_display_color)
             .appendField(new Blockly.FieldDropdown([[Blockly.Msg.senseBox_display_white, "WHITE,BLACK"], [Blockly.Msg.senseBox_display_black, "BLACK,WHITE"]]), "COLOR");
-        this.appendValueInput("SIZE", 'Number')
-            .appendField(Blockly.Msg.senseBox_display_setSize);
-        this.appendValueInput("X", 'Number')
-            .appendField(Blockly.Msg.senseBox_display_printDisplay_x);
-        this.appendValueInput("Y", 'Number')
-            .appendField(Blockly.Msg.senseBox_display_printDisplay_y);
+        this.appendDummyInput()
+            .appendField(Blockly.Msg.senseBox_display_setSize)
+            .appendField(new FieldSlider(1, 1, 4), "SIZE");
+        this.appendDummyInput()
+            .appendField(Blockly.Msg.senseBox_display_printDisplay_x)
+            .appendField(new FieldSlider(0, 0, 64), "X");
+        this.appendDummyInput()
+            .appendField(Blockly.Msg.senseBox_display_printDisplay_y)
+            .appendField(new FieldSlider(0, 0, 128), "Y");
         this.appendValueInput('printDisplay')
             .appendField(Blockly.Msg.senseBox_display_printDisplay_value)
             .setCheck(null);

src/components/Blockly/blocks/sensebox-led.js

@@ -0,0 +1,28 @@
+import * as Blockly from 'blockly';
+import { FieldSlider } from '@blockly/field-slider';
+import { getColour } from '../helpers/colour'
+import { selectedBoard } from '../helpers/board'
+
+
+Blockly.Blocks['sensebox_rgb_led'] = {
+    init: function () {
+        this.setColour(getColour().sensebox);
+        this.appendDummyInput()
+            .appendField(Blockly.Msg.senseBox_rgb_led)
+            .appendField("Pin:")
+            .appendField(new Blockly.FieldDropdown(selectedBoard().digitalPins), "PIN")
+        this.appendDummyInput()
+            .appendField(Blockly.Msg.COLOUR_RGB_RED)//Blockly.Msg.senseBox_basic_red
+            .appendField(new FieldSlider(255, 0, 255), "RED");
+        this.appendDummyInput()
+            .appendField(Blockly.Msg.COLOUR_RGB_GREEN)//Blockly.Msg.senseBox_basic_green
+            .appendField(new FieldSlider(255, 0, 255), "GREEN");
+        this.appendDummyInput()
+            .appendField(Blockly.Msg.COLOUR_RGB_BLUE)//Blockly.Msg.senseBox_basic_green
+            .appendField(new FieldSlider(255, 0, 255), "BLUE");
+        this.setPreviousStatement(true, null);
+        this.setNextStatement(true, null);
+        this.setTooltip(Blockly.Msg.senseBox_rgb_led_tip);
+        this.setHelpUrl('https://sensebox.de/books');
+    }
+};

src/components/Blockly/generator/index.js

@@ -6,6 +6,7 @@ import './sensebox-osem';
 import './sensebox-web';
 import './sensebox-display';
 import './sensebox-lora';
+import './sensebox-led';
 import './logic';
 import './math';
 import './map';

src/components/Blockly/generator/sensebox-led.js

@@ -0,0 +1,15 @@
+import * as Blockly from 'blockly/core';
+import { Block } from 'blockly';
+
+Blockly.Arduino.sensebox_rgb_led = function () {
+    var dropdown_pin = this.getFieldValue('PIN');
+    var red = this.getFieldValue('RED') || '0'
+    var green = this.getFieldValue('GREEN') || '0'
+    var blue = this.getFieldValue('BLUE') || '0'
+    Blockly.Arduino.libraries_['define_rgb_led' + dropdown_pin] = '#include <Adafruit_NeoPixel.h>\n Adafruit_NeoPixel rgb_led_' + dropdown_pin + ' = Adafruit_NeoPixel(1,' + dropdown_pin + ',NEO_RGB + NEO_KHZ800);\n';
+    Blockly.Arduino.setupCode_['setup_rgb_led' + dropdown_pin] = 'rgb_led_' + dropdown_pin + '.begin();';
+
+    var code = 'rgb_led_' + dropdown_pin + '.setPixelColor(0,rgb_led_' + dropdown_pin + '.Color(' + red + ',' + green + ',' + blue + '));\n';
+    code += 'rgb_led_' + dropdown_pin + '.show();';
+    return code;
+};

src/components/Blockly/toolbox/Toolbox.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import { Block, Value, Field, Shadow, Category } from '../';
 import { getColour } from '../helpers/colour'
+import '@blockly/block-plus-minus';
 
 
 class Toolbox extends React.Component {
@@ -23,6 +24,9 @@ class Toolbox extends React.Component {
                         <Block type="sensebox_wifi" />
                         <Block type="sensebox_startap" />
                     </Category>
+                    <Category name="LED" colour={getColour().sensebox}>
+                        <Block type="sensebox_rgb_led" />
+                    </Category>
                     <Category name="Display" colour={getColour().sensebox}>
                         <Block type="sensebox_display_beginDisplay" />
                         <Block type="sensebox_display_show" />