add block type to setter and getter
This commit is contained in:
Mario
@@ -56,7 +56,7 @@ Blockly.Blocks['io_digitalread'] = {
|
||||
.appendField(Blockly.Msg.ARD_DIGITALREAD)
|
||||
.appendField(new Blockly.FieldDropdown(
|
||||
selectedBoard().digitalPins), 'PIN');
|
||||
this.setOutput(true, Types.BOOLEAN);
|
||||
this.setOutput(true, 'boolean');
|
||||
this.setTooltip(Blockly.Msg.ARD_DIGITALREAD_TIP);
|
||||
},
|
||||
/** @return {!string} The type of return value for the block, an integer. */
|
||||
|
||||
@@ -50,6 +50,8 @@ Blockly.Blocks['sensebox_display_printDisplay'] = {
|
||||
.setCheck(null);
|
||||
this.setPreviousStatement(true, null);
|
||||
this.setNextStatement(true, null);
|
||||
let variableName = this.getField('COLOR');
|
||||
console.log(variableName.getValue());
|
||||
this.setTooltip(Blockly.Msg.senseBox_display_printDisplay_tip);
|
||||
this.setHelpUrl('https://sensebox.de/books');
|
||||
},
|
||||
|
||||
@@ -2,6 +2,7 @@ import Blockly from 'blockly';
|
||||
import { getColour } from '../helpers/colour'
|
||||
import * as Types from '../helpers/types'
|
||||
import { selectedBoard } from '../helpers/board'
|
||||
import { colors } from '@material-ui/core';
|
||||
|
||||
/**
|
||||
* HDC1080 Temperature and Humidity Sensor
|
||||
@@ -16,7 +17,7 @@ Blockly.Blocks['sensebox_sensor_temp_hum'] = {
|
||||
.setAlign(Blockly.ALIGN_RIGHT)
|
||||
.appendField(Blockly.Msg.senseBox_value)
|
||||
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.senseBox_temp, "Temperature"], [Blockly.Msg.senseBox_hum, "Humidity"]]), "NAME");
|
||||
this.setOutput(true, Types.NUMBER.typeId);
|
||||
this.setOutput(true, Types.DECIMAL.typeId);
|
||||
this.setColour(getColour().sensebox);
|
||||
this.setTooltip(Blockly.Msg.senseBox_temp_hum_tip);
|
||||
this.setHelpUrl('https://edu.books.sensebox.de/de/projekte/diy_umweltstation/temp_und_luftfeuchte.html');
|
||||
@@ -124,6 +125,8 @@ Blockly.Blocks['sensebox_sensor_pressure'] = {
|
||||
this.setOutput(true, Types.NUMBER.typeId);
|
||||
this.setTooltip(Blockly.Msg.senseBox_pressure_tip);
|
||||
this.setHelpUrl('https://edu.books.sensebox.de/de/projekte/diy_umweltstation/luftdruck.html');
|
||||
var input = this.getFieldValue('NAME');
|
||||
console.log(input);
|
||||
},
|
||||
/**
|
||||
* Parse XML to restore the number of pins available.
|
||||
@@ -231,7 +234,7 @@ Blockly.Blocks['sensebox_sensor_ultrasonic_ranger'] = {
|
||||
.appendField(Blockly.Msg.senseBox_ultrasonic_echo)
|
||||
.appendField(new Blockly.FieldDropdown(
|
||||
selectedBoard().digitalPins), 'ultrasonic_echo');
|
||||
this.setOutput(true, Types.NUMBER.typeId);
|
||||
this.setOutput(true, 'int');
|
||||
this.setTooltip(Blockly.Msg.senseBox_ultrasonic_tip);
|
||||
this.setHelpUrl('https://sensebox.de/books');
|
||||
},
|
||||
@@ -283,7 +286,7 @@ Blockly.Blocks['sensebox_sensor_ultrasonic_ranger'] = {
|
||||
},
|
||||
|
||||
getBlockType: function () {
|
||||
return Blockly.Types.NUMBER;
|
||||
return Blockly.Types.SHORT_NUMBER;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -1,167 +1,41 @@
|
||||
import Blockly from 'blockly/core';
|
||||
import Blockly, { FieldVariable } from 'blockly/core';
|
||||
import { getColour } from '../helpers/colour';
|
||||
import { getCompatibleTypes } from '../helpers/types'
|
||||
|
||||
Blockly.defineBlocksWithJsonArray([
|
||||
// BEGIN JSON EXTRACT
|
||||
{
|
||||
type: 'variables_get_number',
|
||||
message0: '= number variable %1',
|
||||
args0: [
|
||||
{
|
||||
type: 'field_variable',
|
||||
name: 'VAR',
|
||||
variable: null,
|
||||
variableTypes: ['Number'],
|
||||
defaultType: 'Number',
|
||||
},
|
||||
],
|
||||
output: 'Number',
|
||||
colour: getColour().variables,
|
||||
tooltip: '',
|
||||
helpUrl: '',
|
||||
|
||||
Blockly.Blocks['variables_set_dynamic'] = {
|
||||
init: function () {
|
||||
|
||||
// const type = myVar.type;
|
||||
this.setColour(getColour().variables);
|
||||
this.setPreviousStatement(true, null);
|
||||
this.setNextStatement(true, null);
|
||||
this.appendValueInput('VALUE')
|
||||
.appendField('set', 'set')
|
||||
.appendField(new Blockly.FieldVariable('VAR'), 'VAR')
|
||||
.appendField('to');
|
||||
},
|
||||
{
|
||||
type: 'variables_set_number',
|
||||
message0: 'Number variable %1 = %2',
|
||||
args0: [
|
||||
{
|
||||
type: 'field_variable',
|
||||
name: 'VAR',
|
||||
variable: null,
|
||||
variableTypes: ['Number'],
|
||||
defaultType: 'Number',
|
||||
createNewVariable: false,
|
||||
},
|
||||
{
|
||||
type: 'input_value',
|
||||
name: 'VALUE',
|
||||
check: 'Number',
|
||||
},
|
||||
],
|
||||
previousStatement: null,
|
||||
nextStatement: null,
|
||||
colour: getColour().variables,
|
||||
tooltip: '',
|
||||
helpUrl: '',
|
||||
onchange: function (e) {
|
||||
let variableID = this.getFieldValue('VAR');
|
||||
let variable = Blockly.getMainWorkspace().getVariableMap().getVariableById(variableID)
|
||||
this.getInput('VALUE').setCheck(getCompatibleTypes(variable.type));
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Blockly.Blocks['variables_get_dynamic'] = {
|
||||
init: function () {
|
||||
this.setColour(getColour().variables);
|
||||
this.appendDummyInput()
|
||||
.appendField('', 'type')
|
||||
.appendField(new Blockly.FieldVariable('VAR'), 'VAR');
|
||||
this.setOutput(true);
|
||||
},
|
||||
{
|
||||
type: 'variables_get_colour',
|
||||
message0: '= color variable %1',
|
||||
args0: [
|
||||
{
|
||||
type: 'field_variable',
|
||||
name: 'VAR',
|
||||
variable: null,
|
||||
variableTypes: ['Colour'],
|
||||
defaultType: 'Colour',
|
||||
},
|
||||
],
|
||||
output: 'Colour',
|
||||
colour: getColour().variables,
|
||||
tooltip: '',
|
||||
helpUrl: '',
|
||||
},
|
||||
{
|
||||
type: 'variables_set_colour',
|
||||
message0: 'Color variable %1 = %2',
|
||||
args0: [
|
||||
{
|
||||
type: 'field_variable',
|
||||
name: 'VAR',
|
||||
variable: null,
|
||||
variableTypes: ['Colour'],
|
||||
defaultType: 'Colour',
|
||||
},
|
||||
{
|
||||
type: 'input_value',
|
||||
name: 'VALUE',
|
||||
check: 'Colour',
|
||||
},
|
||||
],
|
||||
previousStatement: null,
|
||||
nextStatement: null,
|
||||
colour: getColour().variables,
|
||||
tooltip: '',
|
||||
helpUrl: '',
|
||||
},
|
||||
{
|
||||
type: 'variables_get_string',
|
||||
message0: '= text variable %1',
|
||||
args0: [
|
||||
{
|
||||
type: 'field_variable',
|
||||
name: 'VAR',
|
||||
variable: null,
|
||||
variableTypes: ['String'],
|
||||
defaultType: 'String',
|
||||
},
|
||||
],
|
||||
output: 'String',
|
||||
colour: getColour().variables,
|
||||
tooltip: '',
|
||||
helpUrl: '',
|
||||
},
|
||||
{
|
||||
type: 'variables_set_string',
|
||||
message0: 'Text variable %1 = %2',
|
||||
args0: [
|
||||
{
|
||||
type: 'field_variable',
|
||||
name: 'VAR',
|
||||
variable: null,
|
||||
variableTypes: ['String'],
|
||||
defaultType: 'String',
|
||||
},
|
||||
{
|
||||
type: 'input_value',
|
||||
name: 'VALUE',
|
||||
check: 'String',
|
||||
},
|
||||
],
|
||||
previousStatement: null,
|
||||
nextStatement: null,
|
||||
colour: getColour().variables,
|
||||
tooltip: '',
|
||||
helpUrl: '',
|
||||
},
|
||||
{
|
||||
type: 'variables_get_boolean',
|
||||
message0: '= boolean variable %1',
|
||||
args0: [
|
||||
{
|
||||
type: 'field_variable',
|
||||
name: 'VAR',
|
||||
variable: null,
|
||||
variableTypes: ['Boolean'],
|
||||
defaultType: 'Boolean',
|
||||
},
|
||||
],
|
||||
output: 'Boolean',
|
||||
colour: getColour().variables,
|
||||
tooltip: '',
|
||||
helpUrl: '',
|
||||
},
|
||||
{
|
||||
type: 'variables_set_boolean',
|
||||
message0: 'Boolean variable %1 = %2',
|
||||
args0: [
|
||||
{
|
||||
type: 'field_variable',
|
||||
name: 'VAR',
|
||||
variable: null,
|
||||
variableTypes: ['Boolean'],
|
||||
defaultType: 'Boolean',
|
||||
},
|
||||
{
|
||||
type: 'input_value',
|
||||
name: 'VALUE',
|
||||
check: 'Boolean',
|
||||
},
|
||||
],
|
||||
previousStatement: null,
|
||||
nextStatement: null,
|
||||
colour: getColour().variables,
|
||||
tooltip: '',
|
||||
helpUrl: '',
|
||||
},
|
||||
]); // END JSON EXTRACT (Do not delete this comment.)
|
||||
onchange: function (e) {
|
||||
let variableID = this.getFieldValue('VAR');
|
||||
let variable = Blockly.getMainWorkspace().getVariableMap().getVariableById(variableID)
|
||||
this.getField('type').setValue(variable.type);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user