schuelerlabor-cleverlab/smarti
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove field slider from rgb block

Browse Source
This commit is contained in:
Mario 2020-12-21 11:57:32 +01:00
parent 842b4522f0
commit 40f8c62696
3 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/components/Blockly/blocks/sensebox-led.js
View File

@ -1,5 +1,4 @@
import * as Blockly from 'blockly'; import * as Blockly from 'blockly';
import { FieldSlider } from '@blockly/field-slider';
import { getColour } from '../helpers/colour' import { getColour } from '../helpers/colour'
import { selectedBoard } from '../helpers/board' import { selectedBoard } from '../helpers/board'
@ -27,15 +26,12 @@ Blockly.Blocks['sensebox_rgb_led'] = {
.appendField(Blockly.Msg.senseBox_rgb_led) .appendField(Blockly.Msg.senseBox_rgb_led)
.appendField("Pin:") .appendField("Pin:")
.appendField(new Blockly.FieldDropdown(selectedBoard().digitalPins), "PIN"); .appendField(new Blockly.FieldDropdown(selectedBoard().digitalPins), "PIN");
this.appendDummyInput() this.appendValueInput("RED", 'Number')
.appendField(Blockly.Msg.COLOUR_RGB_RED)//Blockly.Msg.senseBox_basic_red .appendField(Blockly.Msg.COLOUR_RGB_RED);//Blockly.Msg.senseBox_basic_red
.appendField(new FieldSlider(255, 0, 255), "RED"); this.appendValueInput("GREEN", 'Number')
this.appendDummyInput() .appendField(Blockly.Msg.COLOUR_RGB_GREEN);//Blockly.Msg.senseBox_basic_green
.appendField(Blockly.Msg.COLOUR_RGB_GREEN)//Blockly.Msg.senseBox_basic_green this.appendValueInput("BLUE", 'Number')
.appendField(new FieldSlider(255, 0, 255), "GREEN"); .appendField(Blockly.Msg.COLOUR_RGB_BLUE);
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.setPreviousStatement(true, null);
this.setNextStatement(true, null); this.setNextStatement(true, null);
this.setTooltip(Blockly.Msg.senseBox_rgb_led_tip); this.setTooltip(Blockly.Msg.senseBox_rgb_led_tip);
@ -53,7 +49,7 @@ Blockly.Blocks['sensebox_ws2818_led'] = {
this.setColour(getColour().sensebox); this.setColour(getColour().sensebox);
this.appendDummyInput() this.appendDummyInput()
.appendField(Blockly.Msg.senseBox_ws2818_rgb_led) .appendField(Blockly.Msg.senseBox_ws2818_rgb_led)
.appendField("Pin:") .appendField("Port:")
.appendField(new Blockly.FieldDropdown(dropdownOptions), "Port") .appendField(new Blockly.FieldDropdown(dropdownOptions), "Port")
this.appendValueInput("BRIGHTNESS", "brightness") this.appendValueInput("BRIGHTNESS", "brightness")
.appendField((Blockly.Msg.senseBox_ws2818_rgb_led_brightness)); .appendField((Blockly.Msg.senseBox_ws2818_rgb_led_brightness));

6
src/components/Blockly/generator/sensebox-led.js
View File

@ -10,9 +10,9 @@ Blockly.Arduino.sensebox_led = function () {
Blockly.Arduino.sensebox_rgb_led = function () { Blockly.Arduino.sensebox_rgb_led = function () {
var dropdown_pin = this.getFieldValue('PIN'); var dropdown_pin = this.getFieldValue('PIN');
var red = this.getFieldValue('RED') || '0' var red = Blockly.Arduino.valueToCode(this, 'RED', Blockly.Arduino.ORDER_ATOMIC) || '0'
var green = this.getFieldValue('GREEN') || '0' var green = Blockly.Arduino.valueToCode(this, 'GREEN', Blockly.Arduino.ORDER_ATOMIC) || '0'
var blue = this.getFieldValue('BLUE') || '0' var blue = Blockly.Arduino.valueToCode(this, 'BLUE', Blockly.Arduino.ORDER_ATOMIC) || '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.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();'; Blockly.Arduino.setupCode_['setup_rgb_led' + dropdown_pin] = 'rgb_led_' + dropdown_pin + '.begin();';

18
src/components/Blockly/toolbox/Toolbox.js
View File

@ -65,7 +65,23 @@ class Toolbox extends React.Component {
<Block type="sensebox_sd_write_file" /> <Block type="sensebox_sd_write_file" />
</Category> </Category>
<Category name="LED" colour={getColour().sensebox}> <Category name="LED" colour={getColour().sensebox}>
<Block type="sensebox_rgb_led" /> <Block type="sensebox_rgb_led">
<Value name="RED">
<Block type="math_number">
<Field name="NUM">0</Field>
</Block>
</Value>
<Value name="GREEN">
<Block type="math_number">
<Field name="NUM">0</Field>
</Block>
</Value>
<Value name="BLUE">
<Block type="math_number">
<Field name="NUM">0</Field>
</Block>
</Value>
</Block>
<Block type="sensebox_led" /> <Block type="sensebox_led" />
<Block type="sensebox_ws2818_led"> <Block type="sensebox_ws2818_led">
<Value name="POSITION"> <Value name="POSITION">