Merge branch 'master' into ui-updates
This commit is contained in:
Mario Pesch
commit
8c3a86b667
@ -1,24 +1,25 @@
|
||||
import './loops';
|
||||
import './sensebox';
|
||||
import './logic';
|
||||
import './sensebox-sensors';
|
||||
import './sensebox-telegram';
|
||||
import './sensebox-osem';
|
||||
import './sensebox-web';
|
||||
import './sensebox-display';
|
||||
import './sensebox-lora';
|
||||
import './sensebox-led';
|
||||
import './sensebox-sd';
|
||||
import './mqtt';
|
||||
import './text';
|
||||
import './io';
|
||||
import './audio';
|
||||
import './math';
|
||||
import './map';
|
||||
import './procedures';
|
||||
import './time';
|
||||
import './variables';
|
||||
import './lists';
|
||||
import './webserver';
|
||||
import "./loops";
|
||||
import "./sensebox";
|
||||
import "./logic";
|
||||
import "./sensebox-sensors";
|
||||
import "./sensebox-telegram";
|
||||
import "./sensebox-osem";
|
||||
import "./sensebox-web";
|
||||
import "./sensebox-display";
|
||||
import "./sensebox-lora";
|
||||
import "./sensebox-led";
|
||||
import "./sensebox-ble";
|
||||
import "./sensebox-sd";
|
||||
import "./mqtt";
|
||||
import "./text";
|
||||
import "./io";
|
||||
import "./audio";
|
||||
import "./math";
|
||||
import "./map";
|
||||
import "./procedures";
|
||||
import "./time";
|
||||
import "./variables";
|
||||
import "./lists";
|
||||
import "./webserver";
|
||||
|
||||
import '../helpers/types'
|
||||
import "../helpers/types";
|
||||
|
||||
145
src/components/Blockly/blocks/sensebox-ble.js
Normal file
145
src/components/Blockly/blocks/sensebox-ble.js
Normal file
@ -0,0 +1,145 @@
|
||||
import * as Blockly from "blockly";
|
||||
import { getColour } from "../helpers/colour";
|
||||
|
||||
Blockly.Blocks["sensebox_phyphox_init"] = {
|
||||
init: function () {
|
||||
this.setColour(getColour().phyphox);
|
||||
this.appendDummyInput()
|
||||
.appendField(Blockly.Msg.sensebox_phyphox_init)
|
||||
.appendField(new Blockly.FieldTextInput("Geräte Name"), "devicename");
|
||||
|
||||
this.setPreviousStatement(true, null);
|
||||
this.setNextStatement(true, null);
|
||||
this.setTooltip(Blockly.Msg.sensebox_phyphox_init_tooltip);
|
||||
},
|
||||
};
|
||||
|
||||
Blockly.Blocks["sensebox_phyphox_experiment"] = {
|
||||
init: function () {
|
||||
this.setColour(getColour().phyphox);
|
||||
this.appendDummyInput().appendField(
|
||||
Blockly.Msg.sensebox_phyphox_createExperiment
|
||||
);
|
||||
this.appendDummyInput()
|
||||
.appendField(Blockly.Msg.sensebox_phyphox_experimentTitle)
|
||||
.appendField(new Blockly.FieldTextInput("Experiment Title"), "title");
|
||||
this.appendDummyInput()
|
||||
.appendField(Blockly.Msg.sensebox_phyphox_experimentDescription)
|
||||
.appendField(
|
||||
new Blockly.FieldTextInput(
|
||||
Blockly.Msg.sensebox_phyphox_experiment_description
|
||||
),
|
||||
"description"
|
||||
);
|
||||
this.appendStatementInput("view").appendField(
|
||||
Blockly.Msg.sensebox_phyphox_createView
|
||||
);
|
||||
this.setPreviousStatement(true, null);
|
||||
this.setNextStatement(true, null);
|
||||
this.setTooltip(Blockly.Msg.sensebox_phyphox_experiment_tooltip);
|
||||
},
|
||||
};
|
||||
|
||||
Blockly.Blocks["sensebox_phyphox_graph"] = {
|
||||
init: function () {
|
||||
this.setColour(getColour().phyphox);
|
||||
this.appendDummyInput()
|
||||
.appendField(Blockly.Msg.sensebox_phyphox_createGraph)
|
||||
.appendField(Blockly.Msg.sensebox_phyphox_graphLabel)
|
||||
.appendField(new Blockly.FieldTextInput("Label"), "label");
|
||||
this.appendDummyInput()
|
||||
.appendField(Blockly.Msg.sensebox_phyphox_unitx)
|
||||
.appendField(new Blockly.FieldTextInput("Unit X"), "unitx");
|
||||
this.appendDummyInput()
|
||||
.appendField(Blockly.Msg.sensebox_phyphox_unity)
|
||||
.appendField(new Blockly.FieldTextInput("Unit Y"), "unity");
|
||||
this.appendDummyInput()
|
||||
.appendField(Blockly.Msg.sensebox_phyphox_labelx)
|
||||
.appendField(new Blockly.FieldTextInput("Label X"), "labelx");
|
||||
this.appendDummyInput()
|
||||
.appendField(Blockly.Msg.sensebox_phyphox_labely)
|
||||
.appendField(new Blockly.FieldTextInput("Label Y"), "labely");
|
||||
this.appendDummyInput()
|
||||
.appendField(Blockly.Msg.sensebox_phyphox_graphStyle)
|
||||
.appendField(
|
||||
new Blockly.FieldDropdown([
|
||||
[Blockly.Msg.sensebox_phyphox_style_dots, "dots"],
|
||||
[Blockly.Msg.sensebox_phyphox_style_line, "line"],
|
||||
]),
|
||||
"style"
|
||||
);
|
||||
this.appendValueInput("channel0").appendField(
|
||||
Blockly.Msg.sensebox_phyphox_channel0
|
||||
);
|
||||
this.appendValueInput("channel1").appendField(
|
||||
Blockly.Msg.sensebox_phyphox_channel1
|
||||
);
|
||||
this.setPreviousStatement(true, null);
|
||||
this.setNextStatement(true, null);
|
||||
this.setTooltip(Blockly.Msg.sensebox_phyphox_graph_tooltip);
|
||||
},
|
||||
};
|
||||
|
||||
Blockly.Blocks["sensebox_phyphox_timestamp"] = {
|
||||
init: function () {
|
||||
this.setColour(getColour().phyphox);
|
||||
this.appendDummyInput().appendField(Blockly.Msg.sensebox_phyphox_timestamp);
|
||||
this.setOutput(true);
|
||||
this.setTooltip(Blockly.Msg.sensebox_phyphox_timestamp_tooltip);
|
||||
},
|
||||
};
|
||||
|
||||
Blockly.Blocks["sensebox_phyphox_channel"] = {
|
||||
init: function () {
|
||||
this.setColour(getColour().phyphox);
|
||||
this.appendDummyInput()
|
||||
.appendField(Blockly.Msg.sensebox_phyphox_channel)
|
||||
.appendField(
|
||||
new Blockly.FieldDropdown([
|
||||
["1", "1"],
|
||||
["2", "2"],
|
||||
["3", "3"],
|
||||
["4", "4"],
|
||||
["5", "5"],
|
||||
]),
|
||||
"channel"
|
||||
);
|
||||
|
||||
this.setOutput(true);
|
||||
this.setTooltip(Blockly.Msg.sensebox_phyphox_channel_tooltip);
|
||||
},
|
||||
};
|
||||
|
||||
Blockly.Blocks["sensebox_phyphox_sendchannel"] = {
|
||||
init: function () {
|
||||
this.setColour(getColour().phyphox);
|
||||
this.appendValueInput("value")
|
||||
.appendField(Blockly.Msg.sensebox_phyphox_sendchannel)
|
||||
.appendField(
|
||||
new Blockly.FieldDropdown([
|
||||
["1", "1"],
|
||||
["2", "2"],
|
||||
["3", "3"],
|
||||
["4", "4"],
|
||||
["5", "5"],
|
||||
]),
|
||||
"channel"
|
||||
);
|
||||
|
||||
this.setPreviousStatement(true, null);
|
||||
this.setNextStatement(true, null);
|
||||
this.setTooltip(Blockly.Msg.sensebox_phyphox_sendchannel_tooltip);
|
||||
},
|
||||
};
|
||||
|
||||
Blockly.Blocks["sensebox_phyphox_experiment_send"] = {
|
||||
init: function () {
|
||||
this.setColour(getColour().phyphox);
|
||||
this.appendStatementInput("sendValues").appendField(
|
||||
Blockly.Msg.sensebox_phyphox_writeValues
|
||||
);
|
||||
this.setPreviousStatement(true, null);
|
||||
this.setNextStatement(true, null);
|
||||
this.setTooltip(Blockly.Msg.sensebox_phyphox_experiment_send_tooltip);
|
||||
},
|
||||
};
|
||||
@ -24,13 +24,13 @@
|
||||
// More on generating code:
|
||||
// https://developers.google.com/blockly/guides/create-custom-blocks/generating-code
|
||||
|
||||
import * as Blockly from 'blockly/core';
|
||||
import * as Blockly from "blockly/core";
|
||||
|
||||
/**
|
||||
* Arduino code generator.
|
||||
* @type !Blockly.Generator
|
||||
*/
|
||||
Blockly['Arduino'] = new Blockly.Generator('Arduino');
|
||||
Blockly["Arduino"] = new Blockly.Generator("Arduino");
|
||||
|
||||
/**
|
||||
* List of illegal variable names.
|
||||
@ -39,49 +39,46 @@ Blockly['Arduino'] = new Blockly.Generator('Arduino');
|
||||
* accidentally clobbering a built-in object or function.
|
||||
* @private
|
||||
*/
|
||||
Blockly['Arduino'].addReservedWords(
|
||||
Blockly["Arduino"].addReservedWords(
|
||||
// http://arduino.cc/en/Reference/HomePage
|
||||
'setup,loop,if,else,for,switch,case,while,' +
|
||||
'do,break,continue,return,goto,define,include,' +
|
||||
'HIGH,LOW,INPUT,OUTPUT,INPUT_PULLUP,true,false,' +
|
||||
'interger, constants,floating,point,void,boolean,char,' +
|
||||
'unsigned,byte,int,word,long,float,double,string,String,array,' +
|
||||
'static, volatile,const,sizeof,pinMode,digitalWrite,digitalRead,' +
|
||||
'analogReference,analogRead,analogWrite,tone,noTone,shiftOut,shitIn,' +
|
||||
'pulseIn,millis,micros,delay,delayMicroseconds,min,max,abs,constrain,' +
|
||||
'map,pow,sqrt,sin,cos,tan,randomSeed,random,lowByte,highByte,bitRead,' +
|
||||
'bitWrite,bitSet,bitClear,ultraSonicDistance,parseDouble,setNeoPixelColor,' +
|
||||
'bit,attachInterrupt,detachInterrupt,interrupts,noInterrupts',
|
||||
'short',
|
||||
'isBtnPressed'
|
||||
"setup,loop,if,else,for,switch,case,while," +
|
||||
"do,break,continue,return,goto,define,include," +
|
||||
"HIGH,LOW,INPUT,OUTPUT,INPUT_PULLUP,true,false," +
|
||||
"interger, constants,floating,point,void,boolean,char," +
|
||||
"unsigned,byte,int,word,long,float,double,string,String,array," +
|
||||
"static, volatile,const,sizeof,pinMode,digitalWrite,digitalRead," +
|
||||
"analogReference,analogRead,analogWrite,tone,noTone,shiftOut,shitIn," +
|
||||
"pulseIn,millis,micros,delay,delayMicroseconds,min,max,abs,constrain," +
|
||||
"map,pow,sqrt,sin,cos,tan,randomSeed,random,lowByte,highByte,bitRead," +
|
||||
"bitWrite,bitSet,bitClear,ultraSonicDistance,parseDouble,setNeoPixelColor," +
|
||||
"bit,attachInterrupt,detachInterrupt,interrupts,noInterrupts",
|
||||
"short",
|
||||
"isBtnPressed"
|
||||
);
|
||||
|
||||
/**
|
||||
* Order of operation ENUMs.
|
||||
*
|
||||
*/
|
||||
Blockly['Arduino'].ORDER_ATOMIC = 0; // 0 "" ...
|
||||
Blockly['Arduino'].ORDER_UNARY_POSTFIX = 1; // expr++ expr-- () [] .
|
||||
Blockly['Arduino'].ORDER_UNARY_PREFIX = 2; // -expr !expr ~expr ++expr --expr
|
||||
Blockly['Arduino'].ORDER_MULTIPLICATIVE = 3; // * / % ~/
|
||||
Blockly['Arduino'].ORDER_ADDITIVE = 4; // + -
|
||||
Blockly['Arduino'].ORDER_LOGICAL_NOT = 4.4; // !
|
||||
Blockly['Arduino'].ORDER_SHIFT = 5; // << >>
|
||||
Blockly['Arduino'].ORDER_MODULUS = 5.3; // %
|
||||
Blockly['Arduino'].ORDER_RELATIONAL = 6; // is is! >= > <= <
|
||||
Blockly['Arduino'].ORDER_EQUALITY = 7; // === !== === !==
|
||||
Blockly['Arduino'].ORDER_BITWISE_AND = 8; // &
|
||||
Blockly['Arduino'].ORDER_BITWISE_XOR = 9; // ^
|
||||
Blockly['Arduino'].ORDER_BITWISE_OR = 10; // |
|
||||
Blockly['Arduino'].ORDER_LOGICAL_AND = 11; // &&
|
||||
Blockly['Arduino'].ORDER_LOGICAL_OR = 12; // ||
|
||||
Blockly['Arduino'].ORDER_CONDITIONAL = 13; // expr ? expr : expr
|
||||
Blockly['Arduino'].ORDER_ASSIGNMENT = 14; // = *= /= ~/= %= += -= <<= >>= &= ^= |=
|
||||
Blockly['Arduino'].ORDER_COMMA = 18; // ,
|
||||
Blockly['Arduino'].ORDER_NONE = 99; // (...)
|
||||
|
||||
|
||||
|
||||
Blockly["Arduino"].ORDER_ATOMIC = 0; // 0 "" ...
|
||||
Blockly["Arduino"].ORDER_UNARY_POSTFIX = 1; // expr++ expr-- () [] .
|
||||
Blockly["Arduino"].ORDER_UNARY_PREFIX = 2; // -expr !expr ~expr ++expr --expr
|
||||
Blockly["Arduino"].ORDER_MULTIPLICATIVE = 3; // * / % ~/
|
||||
Blockly["Arduino"].ORDER_ADDITIVE = 4; // + -
|
||||
Blockly["Arduino"].ORDER_LOGICAL_NOT = 4.4; // !
|
||||
Blockly["Arduino"].ORDER_SHIFT = 5; // << >>
|
||||
Blockly["Arduino"].ORDER_MODULUS = 5.3; // %
|
||||
Blockly["Arduino"].ORDER_RELATIONAL = 6; // is is! >= > <= <
|
||||
Blockly["Arduino"].ORDER_EQUALITY = 7; // === !== === !==
|
||||
Blockly["Arduino"].ORDER_BITWISE_AND = 8; // &
|
||||
Blockly["Arduino"].ORDER_BITWISE_XOR = 9; // ^
|
||||
Blockly["Arduino"].ORDER_BITWISE_OR = 10; // |
|
||||
Blockly["Arduino"].ORDER_LOGICAL_AND = 11; // &&
|
||||
Blockly["Arduino"].ORDER_LOGICAL_OR = 12; // ||
|
||||
Blockly["Arduino"].ORDER_CONDITIONAL = 13; // expr ? expr : expr
|
||||
Blockly["Arduino"].ORDER_ASSIGNMENT = 14; // = *= /= ~/= %= += -= <<= >>= &= ^= |=
|
||||
Blockly["Arduino"].ORDER_COMMA = 18; // ,
|
||||
Blockly["Arduino"].ORDER_NONE = 99; // (...)
|
||||
|
||||
/**
|
||||
*
|
||||
@ -90,49 +87,49 @@ Blockly['Arduino'].ORDER_NONE = 99; // (...)
|
||||
* Blockly Types
|
||||
*/
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Initialise the database of variable names.
|
||||
* @param {!Blockly.Workspace} workspace Workspace to generate code from.
|
||||
*/
|
||||
Blockly['Arduino'].init = function (workspace) {
|
||||
Blockly["Arduino"].init = function (workspace) {
|
||||
// Create a dictionary of definitions to be printed before the code.
|
||||
Blockly['Arduino'].libraries_ = Object.create(null);
|
||||
Blockly["Arduino"].libraries_ = Object.create(null);
|
||||
|
||||
Blockly['Arduino'].definitions_ = Object.create(null);
|
||||
Blockly["Arduino"].definitions_ = Object.create(null);
|
||||
|
||||
// creates a list of code to be setup before the setup block
|
||||
Blockly['Arduino'].setupCode_ = Object.create(null);
|
||||
Blockly["Arduino"].setupCode_ = Object.create(null);
|
||||
|
||||
// creates a list of code to be setup before the setup block
|
||||
Blockly['Arduino'].loraSetupCode_ = Object.create(null);
|
||||
Blockly["Arduino"].phyphoxSetupCode_ = Object.create(null);
|
||||
|
||||
// creates a list of code to be setup before the setup block
|
||||
Blockly["Arduino"].loraSetupCode_ = Object.create(null);
|
||||
|
||||
// creates a list of code for the loop to be runned once
|
||||
Blockly['Arduino'].loopCodeOnce_ = Object.create(null)
|
||||
Blockly["Arduino"].loopCodeOnce_ = Object.create(null);
|
||||
|
||||
// creates a list of code for the loop to be runned once
|
||||
Blockly['Arduino'].codeFunctions_ = Object.create(null)
|
||||
Blockly["Arduino"].codeFunctions_ = Object.create(null);
|
||||
|
||||
// creates a list of code variables
|
||||
Blockly['Arduino'].variables_ = Object.create(null)
|
||||
Blockly["Arduino"].variables_ = Object.create(null);
|
||||
|
||||
// Create a dictionary mapping desired function names in definitions_
|
||||
// to actual function names (to avoid collisions with user functions).
|
||||
Blockly['Arduino'].functionNames_ = Object.create(null);
|
||||
Blockly["Arduino"].functionNames_ = Object.create(null);
|
||||
|
||||
Blockly['Arduino'].variablesInitCode_ = '';
|
||||
Blockly["Arduino"].variablesInitCode_ = "";
|
||||
|
||||
if (!Blockly['Arduino'].variableDB_) {
|
||||
Blockly['Arduino'].variableDB_ = new Blockly.Names(
|
||||
Blockly['Arduino'].RESERVED_WORDS_
|
||||
if (!Blockly["Arduino"].variableDB_) {
|
||||
Blockly["Arduino"].variableDB_ = new Blockly.Names(
|
||||
Blockly["Arduino"].RESERVED_WORDS_
|
||||
);
|
||||
} else {
|
||||
Blockly['Arduino'].variableDB_.reset();
|
||||
Blockly["Arduino"].variableDB_.reset();
|
||||
}
|
||||
|
||||
Blockly['Arduino'].variableDB_.setVariableMap(workspace.getVariableMap());
|
||||
Blockly["Arduino"].variableDB_.setVariableMap(workspace.getVariableMap());
|
||||
|
||||
// We don't have developer variables for now
|
||||
// // Add developer variables (not created or named by the user).
|
||||
@ -142,53 +139,53 @@ Blockly['Arduino'].init = function (workspace) {
|
||||
// Blockly.Names.DEVELOPER_VARIABLE_TYPE));
|
||||
// }
|
||||
|
||||
const doubleVariables = workspace.getVariablesOfType('Number');
|
||||
const doubleVariables = workspace.getVariablesOfType("Number");
|
||||
let i = 0;
|
||||
let variableCode = '';
|
||||
let variableCode = "";
|
||||
for (i = 0; i < doubleVariables.length; i += 1) {
|
||||
variableCode +=
|
||||
'double ' +
|
||||
Blockly['Arduino'].variableDB_.getName(
|
||||
"double " +
|
||||
Blockly["Arduino"].variableDB_.getName(
|
||||
doubleVariables[i].getId(),
|
||||
Blockly.Variables.NAME_TYPE
|
||||
) +
|
||||
' = 0; \n\n';
|
||||
" = 0; \n\n";
|
||||
}
|
||||
|
||||
const stringVariables = workspace.getVariablesOfType('String');
|
||||
const stringVariables = workspace.getVariablesOfType("String");
|
||||
for (i = 0; i < stringVariables.length; i += 1) {
|
||||
variableCode +=
|
||||
'String ' +
|
||||
Blockly['Arduino'].variableDB_.getName(
|
||||
"String " +
|
||||
Blockly["Arduino"].variableDB_.getName(
|
||||
stringVariables[i].getId(),
|
||||
Blockly.Variables.NAME_TYPE
|
||||
) +
|
||||
' = ""; \n\n';
|
||||
}
|
||||
|
||||
const booleanVariables = workspace.getVariablesOfType('Boolean');
|
||||
const booleanVariables = workspace.getVariablesOfType("Boolean");
|
||||
for (i = 0; i < booleanVariables.length; i += 1) {
|
||||
variableCode +=
|
||||
'boolean ' +
|
||||
Blockly['Arduino'].variableDB_.getDistinctName(
|
||||
"boolean " +
|
||||
Blockly["Arduino"].variableDB_.getDistinctName(
|
||||
booleanVariables[i].getId(),
|
||||
Blockly.Variables.NAME_TYPE
|
||||
) +
|
||||
' = false; \n\n';
|
||||
" = false; \n\n";
|
||||
}
|
||||
|
||||
const colourVariables = workspace.getVariablesOfType('Colour');
|
||||
const colourVariables = workspace.getVariablesOfType("Colour");
|
||||
for (i = 0; i < colourVariables.length; i += 1) {
|
||||
variableCode +=
|
||||
'RGB ' +
|
||||
Blockly['Arduino'].variableDB_.getName(
|
||||
"RGB " +
|
||||
Blockly["Arduino"].variableDB_.getName(
|
||||
colourVariables[i].getId(),
|
||||
Blockly.Variables.NAME_TYPE
|
||||
) +
|
||||
' = {0, 0, 0}; \n\n';
|
||||
" = {0, 0, 0}; \n\n";
|
||||
}
|
||||
|
||||
Blockly['Arduino'].variablesInitCode_ = variableCode;
|
||||
Blockly["Arduino"].variablesInitCode_ = variableCode;
|
||||
};
|
||||
|
||||
/**
|
||||
@ -196,86 +193,93 @@ Blockly['Arduino'].init = function (workspace) {
|
||||
* @param {string} code Generated code.
|
||||
* @return {string} Completed code.
|
||||
*/
|
||||
Blockly['Arduino'].finish = function (code) {
|
||||
let libraryCode = '';
|
||||
let variablesCode = '';
|
||||
let codeFunctions = '';
|
||||
let functionsCode = '';
|
||||
let definitionsCode = '';
|
||||
let loopCodeOnce = '';
|
||||
let setupCode = '';
|
||||
let preSetupCode = '';
|
||||
let loraSetupCode = '';
|
||||
let devVariables = '\n';
|
||||
Blockly["Arduino"].finish = function (code) {
|
||||
let libraryCode = "";
|
||||
let variablesCode = "";
|
||||
let codeFunctions = "";
|
||||
let functionsCode = "";
|
||||
let definitionsCode = "";
|
||||
let phyphoxSetupCode = "";
|
||||
let loopCodeOnce = "";
|
||||
let setupCode = "";
|
||||
let preSetupCode = "";
|
||||
let loraSetupCode = "";
|
||||
let devVariables = "\n";
|
||||
|
||||
for (const key in Blockly['Arduino'].libraries_) {
|
||||
libraryCode += Blockly['Arduino'].libraries_[key] + '\n';
|
||||
for (const key in Blockly["Arduino"].libraries_) {
|
||||
libraryCode += Blockly["Arduino"].libraries_[key] + "\n";
|
||||
}
|
||||
|
||||
for (const key in Blockly['Arduino'].variables_) {
|
||||
variablesCode += Blockly['Arduino'].variables_[key] + '\n';
|
||||
for (const key in Blockly["Arduino"].variables_) {
|
||||
variablesCode += Blockly["Arduino"].variables_[key] + "\n";
|
||||
}
|
||||
|
||||
for (const key in Blockly['Arduino'].definitions_) {
|
||||
definitionsCode += Blockly['Arduino'].definitions_[key] + '\n';
|
||||
for (const key in Blockly["Arduino"].definitions_) {
|
||||
definitionsCode += Blockly["Arduino"].definitions_[key] + "\n";
|
||||
}
|
||||
|
||||
for (const key in Blockly['Arduino'].loopCodeOnce_) {
|
||||
loopCodeOnce += Blockly['Arduino'].loopCodeOnce_[key] + '\n';
|
||||
for (const key in Blockly["Arduino"].loopCodeOnce_) {
|
||||
loopCodeOnce += Blockly["Arduino"].loopCodeOnce_[key] + "\n";
|
||||
}
|
||||
|
||||
for (const key in Blockly['Arduino'].codeFunctions_) {
|
||||
codeFunctions += Blockly['Arduino'].codeFunctions_[key] + '\n';
|
||||
for (const key in Blockly["Arduino"].codeFunctions_) {
|
||||
codeFunctions += Blockly["Arduino"].codeFunctions_[key] + "\n";
|
||||
}
|
||||
|
||||
for (const key in Blockly['Arduino'].functionNames_) {
|
||||
functionsCode += Blockly['Arduino'].functionNames_[key] + '\n';
|
||||
for (const key in Blockly["Arduino"].functionNames_) {
|
||||
functionsCode += Blockly["Arduino"].functionNames_[key] + "\n";
|
||||
}
|
||||
|
||||
|
||||
|
||||
for (const key in Blockly['Arduino'].setupCode_) {
|
||||
preSetupCode += Blockly['Arduino'].setupCode_[key] || '';
|
||||
for (const key in Blockly["Arduino"].setupCode_) {
|
||||
preSetupCode += Blockly["Arduino"].setupCode_[key] + "\n" || "";
|
||||
}
|
||||
|
||||
for (const key in Blockly['Arduino'].loraSetupCode_) {
|
||||
loraSetupCode += Blockly['Arduino'].loraSetupCode_[key] || '';
|
||||
for (const key in Blockly["Arduino"].loraSetupCode_) {
|
||||
loraSetupCode += Blockly["Arduino"].loraSetupCode_[key] + "\n" || "";
|
||||
}
|
||||
|
||||
for (const key in Blockly["Arduino"].phyphoxSetupCode_) {
|
||||
phyphoxSetupCode += Blockly["Arduino"].phyphoxSetupCode_[key] + "\n" || "";
|
||||
}
|
||||
|
||||
setupCode = '\nvoid setup() { \n' + preSetupCode + '\n' + loraSetupCode + '\n}\n';
|
||||
|
||||
let loopCode = '\nvoid loop() { \n' + loopCodeOnce + code + '\n}\n';
|
||||
setupCode =
|
||||
"\nvoid setup() { \n" +
|
||||
preSetupCode +
|
||||
"\n" +
|
||||
phyphoxSetupCode +
|
||||
"\n" +
|
||||
loraSetupCode +
|
||||
"\n}\n";
|
||||
|
||||
let loopCode = "\nvoid loop() { \n" + loopCodeOnce + code + "\n}\n";
|
||||
|
||||
// Convert the definitions dictionary into a list.
|
||||
code =
|
||||
devVariables +
|
||||
'\n' +
|
||||
"\n" +
|
||||
libraryCode +
|
||||
'\n' +
|
||||
"\n" +
|
||||
variablesCode +
|
||||
'\n' +
|
||||
"\n" +
|
||||
definitionsCode +
|
||||
'\n' +
|
||||
"\n" +
|
||||
codeFunctions +
|
||||
'\n' +
|
||||
Blockly['Arduino'].variablesInitCode_ +
|
||||
'\n' +
|
||||
"\n" +
|
||||
Blockly["Arduino"].variablesInitCode_ +
|
||||
"\n" +
|
||||
functionsCode +
|
||||
'\n' +
|
||||
"\n" +
|
||||
setupCode +
|
||||
'\n' +
|
||||
loopCode
|
||||
;
|
||||
"\n" +
|
||||
loopCode;
|
||||
|
||||
// Clean up temporary data.
|
||||
delete Blockly['Arduino'].definitions_;
|
||||
delete Blockly['Arduino'].functionNames_;
|
||||
delete Blockly['Arduino'].loopCodeOnce_;
|
||||
delete Blockly['Arduino'].variablesInitCode_;
|
||||
delete Blockly['Arduino'].libraries_;
|
||||
Blockly['Arduino'].variableDB_.reset();
|
||||
delete Blockly["Arduino"].definitions_;
|
||||
delete Blockly["Arduino"].functionNames_;
|
||||
delete Blockly["Arduino"].loopCodeOnce_;
|
||||
delete Blockly["Arduino"].variablesInitCode_;
|
||||
delete Blockly["Arduino"].libraries_;
|
||||
Blockly["Arduino"].variableDB_.reset();
|
||||
|
||||
return code;
|
||||
};
|
||||
@ -286,8 +290,8 @@ Blockly['Arduino'].finish = function (code) {
|
||||
* @param {string} line Line of generated code.
|
||||
* @return {string} Legal line of code.
|
||||
*/
|
||||
Blockly['Arduino'].scrubNakedValue = function (line) {
|
||||
return line + ';\n';
|
||||
Blockly["Arduino"].scrubNakedValue = function (line) {
|
||||
return line + ";\n";
|
||||
};
|
||||
|
||||
/**
|
||||
@ -297,12 +301,12 @@ Blockly['Arduino'].scrubNakedValue = function (line) {
|
||||
* @return {string} Arduino string.
|
||||
* @private
|
||||
*/
|
||||
Blockly['Arduino'].quote_ = function (string) {
|
||||
Blockly["Arduino"].quote_ = function (string) {
|
||||
// Can't use goog.string.quote since Google's style guide recommends
|
||||
// JS string literals use single quotes.
|
||||
string = string
|
||||
.replace(/\\/g, '\\\\')
|
||||
.replace(/\n/g, '\\\n')
|
||||
.replace(/\\/g, "\\\\")
|
||||
.replace(/\n/g, "\\\n")
|
||||
.replace(/'/g, "\\'");
|
||||
return '"' + string + '"';
|
||||
};
|
||||
@ -317,26 +321,25 @@ Blockly['Arduino'].quote_ = function (string) {
|
||||
* @return {string} Arduino code with comments and subsequent blocks added.
|
||||
* @private
|
||||
*/
|
||||
Blockly['Arduino'].scrub_ = function (block, code) {
|
||||
let commentCode = '';
|
||||
Blockly["Arduino"].scrub_ = function (block, code) {
|
||||
let commentCode = "";
|
||||
// Only collect comments for blocks that aren't inline.
|
||||
if (!block.outputConnection || !block.outputConnection.targetConnection) {
|
||||
// Collect comment for this block.
|
||||
let comment = block.getCommentText();
|
||||
//@ts-ignore
|
||||
comment = comment ? Blockly.utils.string.wrap(
|
||||
comment,
|
||||
Blockly['Arduino'].COMMENT_WRAP - 3
|
||||
) : null;
|
||||
comment = comment
|
||||
? Blockly.utils.string.wrap(comment, Blockly["Arduino"].COMMENT_WRAP - 3)
|
||||
: null;
|
||||
if (comment) {
|
||||
if (block.getProcedureDef) {
|
||||
// Use a comment block for function comments.
|
||||
commentCode +=
|
||||
'/**\n' +
|
||||
Blockly['Arduino'].prefixLines(comment + '\n', ' * ') +
|
||||
' */\n';
|
||||
"/**\n" +
|
||||
Blockly["Arduino"].prefixLines(comment + "\n", " * ") +
|
||||
" */\n";
|
||||
} else {
|
||||
commentCode += Blockly['Arduino'].prefixLines(comment + '\n', '// ');
|
||||
commentCode += Blockly["Arduino"].prefixLines(comment + "\n", "// ");
|
||||
}
|
||||
}
|
||||
// Collect comments for all value arguments.
|
||||
@ -345,15 +348,15 @@ Blockly['Arduino'].scrub_ = function (block, code) {
|
||||
if (block.inputList[i].type === Blockly.INPUT_VALUE) {
|
||||
const childBlock = block.inputList[i].connection.targetBlock();
|
||||
if (childBlock) {
|
||||
const comment = Blockly['Arduino'].allNestedComments(childBlock);
|
||||
const comment = Blockly["Arduino"].allNestedComments(childBlock);
|
||||
if (comment) {
|
||||
commentCode += Blockly['Arduino'].prefixLines(comment, '// ');
|
||||
commentCode += Blockly["Arduino"].prefixLines(comment, "// ");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
const nextBlock = block.nextConnection && block.nextConnection.targetBlock();
|
||||
const nextCode = Blockly['Arduino'].blockToCode(nextBlock);
|
||||
const nextCode = Blockly["Arduino"].blockToCode(nextBlock);
|
||||
return commentCode + code + nextCode;
|
||||
};
|
||||
@ -7,8 +7,9 @@ import "./sensebox-web";
|
||||
import "./sensebox-display";
|
||||
import "./sensebox-lora";
|
||||
import "./sensebox-led";
|
||||
import "./sensebox-sd";
|
||||
import "./sensebox";
|
||||
import "./sensebox-ble";
|
||||
import "./sensebox-sd";
|
||||
import "./mqtt";
|
||||
import "./logic";
|
||||
import "./text";
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
|
||||
import * as Blockly from 'blockly/core';
|
||||
import * as Blockly from "blockly/core";
|
||||
|
||||
/**
|
||||
* @license Licensed under the Apache License, Version 2.0 (the "License"):
|
||||
@ -19,13 +18,13 @@ import * as Blockly from 'blockly/core';
|
||||
* @param {!Blockly.Block} block Block to generate the code from.
|
||||
* @return {array} Completed code with order of operation.
|
||||
*/
|
||||
Blockly.Arduino['math_number'] = function (block) {
|
||||
Blockly.Arduino["math_number"] = function (block) {
|
||||
// Numeric value.
|
||||
var code = parseFloat(block.getFieldValue('NUM'));
|
||||
var code = parseFloat(block.getFieldValue("NUM"));
|
||||
if (code === Infinity) {
|
||||
code = 'INFINITY';
|
||||
code = "INFINITY";
|
||||
} else if (code === -Infinity) {
|
||||
code = '-INFINITY';
|
||||
code = "-INFINITY";
|
||||
}
|
||||
return [code, Blockly.Arduino.ORDER_ATOMIC];
|
||||
};
|
||||
@ -37,23 +36,23 @@ Blockly.Arduino['math_number'] = function (block) {
|
||||
* @param {!Blockly.Block} block Block to generate the code from.
|
||||
* @return {array} Completed code with order of operation.
|
||||
*/
|
||||
Blockly.Arduino['math_arithmetic'] = function (block) {
|
||||
Blockly.Arduino["math_arithmetic"] = function (block) {
|
||||
var OPERATORS = {
|
||||
ADD: [' + ', Blockly.Arduino.ORDER_ADDITIVE],
|
||||
MINUS: [' - ', Blockly.Arduino.ORDER_ADDITIVE],
|
||||
MULTIPLY: [' * ', Blockly.Arduino.ORDER_MULTIPLICATIVE],
|
||||
DIVIDE: [' / ', Blockly.Arduino.ORDER_MULTIPLICATIVE],
|
||||
POWER: [null, Blockly.Arduino.ORDER_NONE] // Handle power separately.
|
||||
ADD: [" + ", Blockly.Arduino.ORDER_ADDITIVE],
|
||||
MINUS: [" - ", Blockly.Arduino.ORDER_ADDITIVE],
|
||||
MULTIPLY: [" * ", Blockly.Arduino.ORDER_MULTIPLICATIVE],
|
||||
DIVIDE: [" / ", Blockly.Arduino.ORDER_MULTIPLICATIVE],
|
||||
POWER: [null, Blockly.Arduino.ORDER_NONE], // Handle power separately.
|
||||
};
|
||||
var tuple = OPERATORS[block.getFieldValue('OP')];
|
||||
var tuple = OPERATORS[block.getFieldValue("OP")];
|
||||
var operator = tuple[0];
|
||||
var order = tuple[1];
|
||||
var argument0 = Blockly.Arduino.valueToCode(block, 'A', order) || '0';
|
||||
var argument1 = Blockly.Arduino.valueToCode(block, 'B', order) || '0';
|
||||
var argument0 = Blockly.Arduino.valueToCode(block, "A", order) || "0";
|
||||
var argument1 = Blockly.Arduino.valueToCode(block, "B", order) || "0";
|
||||
var code;
|
||||
// Power in C++ requires a special case since it has no operator.
|
||||
if (!operator) {
|
||||
code = 'Math.pow(' + argument0 + ', ' + argument1 + ')';
|
||||
code = "Math.pow(" + argument0 + ", " + argument1 + ")";
|
||||
return [code, Blockly.Arduino.ORDER_UNARY_POSTFIX];
|
||||
}
|
||||
code = argument0 + operator + argument1;
|
||||
@ -66,65 +65,78 @@ Blockly.Arduino['math_arithmetic'] = function (block) {
|
||||
* @param {!Blockly.Block} block Block to generate the code from.
|
||||
* @return {array} Completed code with order of operation.
|
||||
*/
|
||||
Blockly.Arduino['math_single'] = function (block) {
|
||||
var operator = block.getFieldValue('OP');
|
||||
Blockly.Arduino["math_single"] = function (block) {
|
||||
var operator = block.getFieldValue("OP");
|
||||
var code;
|
||||
var arg;
|
||||
if (operator === 'NEG') {
|
||||
if (operator === "NEG") {
|
||||
// Negation is a special case given its different operator precedents.
|
||||
arg = Blockly.Arduino.valueToCode(block, 'NUM',
|
||||
Blockly.Arduino.ORDER_UNARY_PREFIX) || '0';
|
||||
if (arg[0] === '-') {
|
||||
arg =
|
||||
Blockly.Arduino.valueToCode(
|
||||
block,
|
||||
"NUM",
|
||||
Blockly.Arduino.ORDER_UNARY_PREFIX
|
||||
) || "0";
|
||||
if (arg[0] === "-") {
|
||||
// --3 is not legal in C++ in this context.
|
||||
arg = ' ' + arg;
|
||||
arg = " " + arg;
|
||||
}
|
||||
code = '-' + arg;
|
||||
code = "-" + arg;
|
||||
return [code, Blockly.Arduino.ORDER_UNARY_PREFIX];
|
||||
}
|
||||
if (operator === 'ABS' || operator.substring(0, 5) === 'ROUND') {
|
||||
arg = Blockly.Arduino.valueToCode(block, 'NUM',
|
||||
Blockly.Arduino.ORDER_UNARY_POSTFIX) || '0';
|
||||
} else if (operator === 'SIN' || operator === 'COS' || operator === 'TAN') {
|
||||
arg = Blockly.Arduino.valueToCode(block, 'NUM',
|
||||
Blockly.Arduino.ORDER_MULTIPLICATIVE) || '0';
|
||||
if (operator === "ABS" || operator.substring(0, 5) === "ROUND") {
|
||||
arg =
|
||||
Blockly.Arduino.valueToCode(
|
||||
block,
|
||||
"NUM",
|
||||
Blockly.Arduino.ORDER_UNARY_POSTFIX
|
||||
) || "0";
|
||||
} else if (operator === "SIN" || operator === "COS" || operator === "TAN") {
|
||||
arg =
|
||||
Blockly.Arduino.valueToCode(
|
||||
block,
|
||||
"NUM",
|
||||
Blockly.Arduino.ORDER_MULTIPLICATIVE
|
||||
) || "0";
|
||||
} else {
|
||||
arg = Blockly.Arduino.valueToCode(block, 'NUM',
|
||||
Blockly.Arduino.ORDER_NONE) || '0';
|
||||
arg =
|
||||
Blockly.Arduino.valueToCode(block, "NUM", Blockly.Arduino.ORDER_NONE) ||
|
||||
"0";
|
||||
}
|
||||
// First, handle cases which generate values that don't need parentheses.
|
||||
switch (operator) {
|
||||
case 'ABS':
|
||||
code = 'abs(' + arg + ')';
|
||||
case "ABS":
|
||||
code = "abs(" + arg + ")";
|
||||
break;
|
||||
case 'ROOT':
|
||||
code = 'sqrt(' + arg + ')';
|
||||
case "ROOT":
|
||||
code = "sqrt(" + arg + ")";
|
||||
break;
|
||||
case 'LN':
|
||||
code = 'log(' + arg + ')';
|
||||
case "LN":
|
||||
code = "log(" + arg + ")";
|
||||
break;
|
||||
case 'EXP':
|
||||
code = 'exp(' + arg + ')';
|
||||
case "EXP":
|
||||
code = "exp(" + arg + ")";
|
||||
break;
|
||||
case 'POW10':
|
||||
code = 'pow(10,' + arg + ')';
|
||||
case "POW10":
|
||||
code = "pow(10," + arg + ")";
|
||||
break;
|
||||
case 'ROUND':
|
||||
code = 'round(' + arg + ')';
|
||||
case "ROUND":
|
||||
code = "round(" + arg + ")";
|
||||
break;
|
||||
case 'ROUNDUP':
|
||||
code = 'ceil(' + arg + ')';
|
||||
case "ROUNDUP":
|
||||
code = "ceil(" + arg + ")";
|
||||
break;
|
||||
case 'ROUNDDOWN':
|
||||
code = 'floor(' + arg + ')';
|
||||
case "ROUNDDOWN":
|
||||
code = "floor(" + arg + ")";
|
||||
break;
|
||||
case 'SIN':
|
||||
code = 'sin(' + arg + ' / 180 * Math.PI)';
|
||||
case "SIN":
|
||||
code = "sin(" + arg + " / 180 * Math.PI)";
|
||||
break;
|
||||
case 'COS':
|
||||
code = 'cos(' + arg + ' / 180 * Math.PI)';
|
||||
case "COS":
|
||||
code = "cos(" + arg + " / 180 * Math.PI)";
|
||||
break;
|
||||
case 'TAN':
|
||||
code = 'tan(' + arg + ' / 180 * Math.PI)';
|
||||
case "TAN":
|
||||
code = "tan(" + arg + " / 180 * Math.PI)";
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
@ -134,20 +146,20 @@ Blockly.Arduino['math_single'] = function (block) {
|
||||
}
|
||||
// Second, handle cases which generate values that may need parentheses.
|
||||
switch (operator) {
|
||||
case 'LOG10':
|
||||
code = 'log(' + arg + ') / log(10)';
|
||||
case "LOG10":
|
||||
code = "log(" + arg + ") / log(10)";
|
||||
break;
|
||||
case 'ASIN':
|
||||
code = 'asin(' + arg + ') / M_PI * 180';
|
||||
case "ASIN":
|
||||
code = "asin(" + arg + ") / M_PI * 180";
|
||||
break;
|
||||
case 'ACOS':
|
||||
code = 'acos(' + arg + ') / M_PI * 180';
|
||||
case "ACOS":
|
||||
code = "acos(" + arg + ") / M_PI * 180";
|
||||
break;
|
||||
case 'ATAN':
|
||||
code = 'atan(' + arg + ') / M_PI * 180';
|
||||
case "ATAN":
|
||||
code = "atan(" + arg + ") / M_PI * 180";
|
||||
break;
|
||||
default:
|
||||
throw new Error('Unknown math operator: ' + operator);
|
||||
throw new Error("Unknown math operator: " + operator);
|
||||
}
|
||||
return [code, Blockly.Arduino.ORDER_MULTIPLICATIVE];
|
||||
};
|
||||
@ -161,16 +173,16 @@ Blockly.Arduino['math_single'] = function (block) {
|
||||
* @param {!Blockly.Block} block Block to generate the code from.
|
||||
* @return {string} Completed code.
|
||||
*/
|
||||
Blockly.Arduino['math_constant'] = function (block) {
|
||||
Blockly.Arduino["math_constant"] = function (block) {
|
||||
var CONSTANTS = {
|
||||
'PI': ['M_PI', Blockly.Arduino.ORDER_UNARY_POSTFIX],
|
||||
'E': ['M_E', Blockly.Arduino.ORDER_UNARY_POSTFIX],
|
||||
'GOLDEN_RATIO': ['(1 + sqrt(5)) / 2', Blockly.Arduino.ORDER_MULTIPLICATIVE],
|
||||
'SQRT2': ['M_SQRT2', Blockly.Arduino.ORDER_UNARY_POSTFIX],
|
||||
'SQRT1_2': ['M_SQRT1_2', Blockly.Arduino.ORDER_UNARY_POSTFIX],
|
||||
'INFINITY': ['INFINITY', Blockly.Arduino.ORDER_ATOMIC]
|
||||
PI: ["M_PI", Blockly.Arduino.ORDER_UNARY_POSTFIX],
|
||||
E: ["M_E", Blockly.Arduino.ORDER_UNARY_POSTFIX],
|
||||
GOLDEN_RATIO: ["(1 + sqrt(5)) / 2", Blockly.Arduino.ORDER_MULTIPLICATIVE],
|
||||
SQRT2: ["M_SQRT2", Blockly.Arduino.ORDER_UNARY_POSTFIX],
|
||||
SQRT1_2: ["M_SQRT1_2", Blockly.Arduino.ORDER_UNARY_POSTFIX],
|
||||
INFINITY: ["INFINITY", Blockly.Arduino.ORDER_ATOMIC],
|
||||
};
|
||||
return CONSTANTS[block.getFieldValue('CONSTANT')];
|
||||
return CONSTANTS[block.getFieldValue("CONSTANT")];
|
||||
};
|
||||
|
||||
/**
|
||||
@ -180,58 +192,67 @@ Blockly.Arduino['math_constant'] = function (block) {
|
||||
* @param {!Blockly.Block} block Block to generate the code from.
|
||||
* @return {array} Completed code with order of operation.
|
||||
*/
|
||||
Blockly.Arduino['math_number_property'] = function (block) {
|
||||
var number_to_check = Blockly.Arduino.valueToCode(block, 'NUMBER_TO_CHECK',
|
||||
Blockly.Arduino.ORDER_MULTIPLICATIVE) || '0';
|
||||
var dropdown_property = block.getFieldValue('PROPERTY');
|
||||
Blockly.Arduino["math_number_property"] = function (block) {
|
||||
var number_to_check =
|
||||
Blockly.Arduino.valueToCode(
|
||||
block,
|
||||
"NUMBER_TO_CHECK",
|
||||
Blockly.Arduino.ORDER_MULTIPLICATIVE
|
||||
) || "0";
|
||||
var dropdown_property = block.getFieldValue("PROPERTY");
|
||||
var code;
|
||||
if (dropdown_property === 'PRIME') {
|
||||
if (dropdown_property === "PRIME") {
|
||||
var func = [
|
||||
'boolean ' + Blockly.Arduino.DEF_FUNC_NAME + '(int n) {',
|
||||
' // https://en.wikipedia.org/wiki/Primality_test#Naive_methods',
|
||||
' if (n == 2 || n == 3) {',
|
||||
' return true;',
|
||||
' }',
|
||||
' // False if n is NaN, negative, is 1.',
|
||||
' // And false if n is divisible by 2 or 3.',
|
||||
' if (isnan(n) || (n <= 1) || (n == 1) || (n % 2 == 0) || ' +
|
||||
'(n % 3 == 0)) {',
|
||||
' return false;',
|
||||
' }',
|
||||
' // Check all the numbers of form 6k +/- 1, up to sqrt(n).',
|
||||
' for (int x = 6; x <= sqrt(n) + 1; x += 6) {',
|
||||
' if (n % (x - 1) == 0 || n % (x + 1) == 0) {',
|
||||
' return false;',
|
||||
' }',
|
||||
' }',
|
||||
' return true;',
|
||||
'}'];
|
||||
var funcName = Blockly.Arduino.addFunction('mathIsPrime', func.join('\n'));
|
||||
Blockly.Arduino.addInclude('math', '#include <math.h>');
|
||||
code = funcName + '(' + number_to_check + ')';
|
||||
"boolean " + Blockly.Arduino.DEF_FUNC_NAME + "(int n) {",
|
||||
" // https://en.wikipedia.org/wiki/Primality_test#Naive_methods",
|
||||
" if (n == 2 || n == 3) {",
|
||||
" return true;",
|
||||
" }",
|
||||
" // False if n is NaN, negative, is 1.",
|
||||
" // And false if n is divisible by 2 or 3.",
|
||||
" if (isnan(n) || (n <= 1) || (n == 1) || (n % 2 == 0) || " +
|
||||
"(n % 3 == 0)) {",
|
||||
" return false;",
|
||||
" }",
|
||||
" // Check all the numbers of form 6k +/- 1, up to sqrt(n).",
|
||||
" for (int x = 6; x <= sqrt(n) + 1; x += 6) {",
|
||||
" if (n % (x - 1) == 0 || n % (x + 1) == 0) {",
|
||||
" return false;",
|
||||
" }",
|
||||
" }",
|
||||
" return true;",
|
||||
"}",
|
||||
];
|
||||
var funcName = Blockly.Arduino.addFunction("mathIsPrime", func.join("\n"));
|
||||
Blockly.Arduino.addInclude("math", "#include <math.h>");
|
||||
code = funcName + "(" + number_to_check + ")";
|
||||
return [code, Blockly.Arduino.ORDER_UNARY_POSTFIX];
|
||||
}
|
||||
switch (dropdown_property) {
|
||||
case 'EVEN':
|
||||
code = number_to_check + ' % 2 == 0';
|
||||
case "EVEN":
|
||||
code = number_to_check + " % 2 == 0";
|
||||
break;
|
||||
case 'ODD':
|
||||
code = number_to_check + ' % 2 == 1';
|
||||
case "ODD":
|
||||
code = number_to_check + " % 2 == 1";
|
||||
break;
|
||||
case 'WHOLE':
|
||||
Blockly.Arduino.addInclude('math', '#include <math.h>');
|
||||
code = '(floor(' + number_to_check + ') == ' + number_to_check + ')';
|
||||
case "WHOLE":
|
||||
Blockly.Arduino.addInclude("math", "#include <math.h>");
|
||||
code = "(floor(" + number_to_check + ") == " + number_to_check + ")";
|
||||
break;
|
||||
case 'POSITIVE':
|
||||
code = number_to_check + ' > 0';
|
||||
case "POSITIVE":
|
||||
code = number_to_check + " > 0";
|
||||
break;
|
||||
case 'NEGATIVE':
|
||||
code = number_to_check + ' < 0';
|
||||
case "NEGATIVE":
|
||||
code = number_to_check + " < 0";
|
||||
break;
|
||||
case 'DIVISIBLE_BY':
|
||||
var divisor = Blockly.Arduino.valueToCode(block, 'DIVISOR',
|
||||
Blockly.Arduino.ORDER_MULTIPLICATIVE) || '0';
|
||||
code = number_to_check + ' % ' + divisor + ' == 0';
|
||||
case "DIVISIBLE_BY":
|
||||
var divisor =
|
||||
Blockly.Arduino.valueToCode(
|
||||
block,
|
||||
"DIVISOR",
|
||||
Blockly.Arduino.ORDER_MULTIPLICATIVE
|
||||
) || "0";
|
||||
code = number_to_check + " % " + divisor + " == 0";
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
@ -247,19 +268,25 @@ Blockly.Arduino['math_number_property'] = function (block) {
|
||||
* @param {!Blockly.Block} block Block to generate the code from.
|
||||
* @return {array} Completed code with order of operation.
|
||||
*/
|
||||
Blockly.Arduino['math_change'] = function (block) {
|
||||
var argument0 = Blockly.Arduino.valueToCode(block, 'DELTA',
|
||||
Blockly.Arduino.ORDER_ADDITIVE) || '0';
|
||||
Blockly.Arduino["math_change"] = function (block) {
|
||||
var argument0 =
|
||||
Blockly.Arduino.valueToCode(
|
||||
block,
|
||||
"DELTA",
|
||||
Blockly.Arduino.ORDER_ADDITIVE
|
||||
) || "0";
|
||||
var varName = Blockly.Arduino.variableDB_.getName(
|
||||
block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
|
||||
return varName + ' += ' + argument0 + ';\n';
|
||||
block.getFieldValue("VAR"),
|
||||
Blockly.Variables.NAME_TYPE
|
||||
);
|
||||
return varName + " += " + argument0 + ";\n";
|
||||
};
|
||||
|
||||
/** Rounding functions have a single operand. */
|
||||
Blockly.Arduino['math_round'] = Blockly.Arduino['math_single'];
|
||||
Blockly.Arduino["math_round"] = Blockly.Arduino["math_single"];
|
||||
|
||||
/** Trigonometry functions have a single operand. */
|
||||
Blockly.Arduino['math_trig'] = Blockly.Arduino['math_single'];
|
||||
Blockly.Arduino["math_trig"] = Blockly.Arduino["math_single"];
|
||||
|
||||
/**
|
||||
* Generator for the math function to a list.
|
||||
@ -268,7 +295,7 @@ Blockly.Arduino['math_trig'] = Blockly.Arduino['math_single'];
|
||||
* @param {!Blockly.Block} block Block to generate the code from.
|
||||
* @return {array} Completed code with order of operation.
|
||||
*/
|
||||
Blockly.Arduino['math_on_list'] = Blockly.Arduino.noGeneratorCodeInline;
|
||||
Blockly.Arduino["math_on_list"] = Blockly.Arduino.noGeneratorCodeInline;
|
||||
|
||||
/**
|
||||
* Generator for the math modulo function (calculates remainder of X/Y).
|
||||
@ -276,12 +303,20 @@ Blockly.Arduino['math_on_list'] = Blockly.Arduino.noGeneratorCodeInline;
|
||||
* @param {!Blockly.Block} block Block to generate the code from.
|
||||
* @return {array} Completed code with order of operation.
|
||||
*/
|
||||
Blockly.Arduino['math_modulo'] = function (block) {
|
||||
var argument0 = Blockly.Arduino.valueToCode(block, 'DIVIDEND',
|
||||
Blockly.Arduino.ORDER_MULTIPLICATIVE) || '0';
|
||||
var argument1 = Blockly.Arduino.valueToCode(block, 'DIVISOR',
|
||||
Blockly.Arduino.ORDER_MULTIPLICATIVE) || '0';
|
||||
var code = argument0 + ' % ' + argument1;
|
||||
Blockly.Arduino["math_modulo"] = function (block) {
|
||||
var argument0 =
|
||||
Blockly.Arduino.valueToCode(
|
||||
block,
|
||||
"DIVIDEND",
|
||||
Blockly.Arduino.ORDER_MULTIPLICATIVE
|
||||
) || "0";
|
||||
var argument1 =
|
||||
Blockly.Arduino.valueToCode(
|
||||
block,
|
||||
"DIVISOR",
|
||||
Blockly.Arduino.ORDER_MULTIPLICATIVE
|
||||
) || "0";
|
||||
var code = argument0 + " % " + argument1;
|
||||
return [code, Blockly.Arduino.ORDER_MULTIPLICATIVE];
|
||||
};
|
||||
|
||||
@ -291,17 +326,33 @@ Blockly.Arduino['math_modulo'] = function (block) {
|
||||
* @param {!Blockly.Block} block Block to generate the code from.
|
||||
* @return {array} Completed code with order of operation.
|
||||
*/
|
||||
Blockly.Arduino['math_constrain'] = function (block) {
|
||||
Blockly.Arduino["math_constrain"] = function (block) {
|
||||
// Constrain a number between two limits.
|
||||
var argument0 = Blockly.Arduino.valueToCode(block, 'VALUE',
|
||||
Blockly.Arduino.ORDER_NONE) || '0';
|
||||
var argument1 = Blockly.Arduino.valueToCode(block, 'LOW',
|
||||
Blockly.Arduino.ORDER_NONE) || '0';
|
||||
var argument2 = Blockly.Arduino.valueToCode(block, 'HIGH',
|
||||
Blockly.Arduino.ORDER_NONE) || '0';
|
||||
var code = '(' + argument0 + ' < ' + argument1 + ' ? ' + argument1 +
|
||||
' : ( ' + argument0 + ' > ' + argument2 + ' ? ' + argument2 + ' : ' +
|
||||
argument0 + '))';
|
||||
var argument0 =
|
||||
Blockly.Arduino.valueToCode(block, "VALUE", Blockly.Arduino.ORDER_NONE) ||
|
||||
"0";
|
||||
var argument1 =
|
||||
Blockly.Arduino.valueToCode(block, "LOW", Blockly.Arduino.ORDER_NONE) ||
|
||||
"0";
|
||||
var argument2 =
|
||||
Blockly.Arduino.valueToCode(block, "HIGH", Blockly.Arduino.ORDER_NONE) ||
|
||||
"0";
|
||||
var code =
|
||||
"(" +
|
||||
argument0 +
|
||||
" < " +
|
||||
argument1 +
|
||||
" ? " +
|
||||
argument1 +
|
||||
" : ( " +
|
||||
argument0 +
|
||||
" > " +
|
||||
argument2 +
|
||||
" ? " +
|
||||
argument2 +
|
||||
" : " +
|
||||
argument0 +
|
||||
"))";
|
||||
return [code, Blockly.Arduino.ORDER_UNARY_POSTFIX];
|
||||
};
|
||||
|
||||
@ -312,28 +363,26 @@ Blockly.Arduino['math_constrain'] = function (block) {
|
||||
* @param {!Blockly.Block} block Block to generate the code from.
|
||||
* @return {array} Completed code with order of operation.
|
||||
*/
|
||||
Blockly.Arduino['math_random_int'] = function (block) {
|
||||
var argument0 = Blockly.Arduino.valueToCode(block, 'FROM',
|
||||
Blockly.Arduino.ORDER_NONE) || '0';
|
||||
var argument1 = Blockly.Arduino.valueToCode(block, 'TO',
|
||||
Blockly.Arduino.ORDER_NONE) || '0';
|
||||
var functionName = Blockly.Arduino.variableDB_.getDistinctName(
|
||||
'math_random_int', Blockly.Generator.NAME_TYPE);
|
||||
Blockly.Arduino.setups_['init_rand'] = 'randomSeed(analogRead(0));';
|
||||
Blockly.Arduino.math_random_int.random_function = functionName;
|
||||
var func = [
|
||||
'int ' + Blockly.Arduino.DEF_FUNC_NAME + '(int min, int max) {',
|
||||
' if (min > max) {',
|
||||
' // Swap min and max to ensure min is smaller.',
|
||||
' int temp = min;',
|
||||
' min = max;',
|
||||
' max = temp;',
|
||||
' }',
|
||||
' return min + (rand() % (max - min + 1));',
|
||||
'}'];
|
||||
var funcName = Blockly.Arduino.addFunction('mathRandomInt', func.join('\n'));
|
||||
var code = funcName + '(' + argument0 + ', ' + argument1 + ')';
|
||||
return [code, Blockly.Arduino.ORDER_UNARY_POSTFIX];
|
||||
Blockly.Arduino["math_random_int"] = function (block) {
|
||||
var argument0 =
|
||||
Blockly.Arduino.valueToCode(block, "FROM", Blockly.Arduino.ORDER_NONE) ||
|
||||
"0";
|
||||
var argument1 =
|
||||
Blockly.Arduino.valueToCode(block, "TO", Blockly.Arduino.ORDER_NONE) || "0";
|
||||
Blockly.Arduino.setupCode_["init_rand"] = "randomSeed(analogRead(0));";
|
||||
Blockly.Arduino.functionNames_[
|
||||
"math_random_int"
|
||||
] = `int mathRandomInt (int min, int max) {\n
|
||||
if (min > max) {
|
||||
int temp = min;
|
||||
min = max;
|
||||
max = temp;
|
||||
}
|
||||
return min + (rand() % (max - min + 1));
|
||||
}
|
||||
`;
|
||||
var code = `mathRandomInt(${argument0},${argument1});`;
|
||||
return [code, Blockly.Arduino.ORDER_ATOMIC];
|
||||
};
|
||||
|
||||
/**
|
||||
@ -342,6 +391,6 @@ Blockly.Arduino['math_random_int'] = function (block) {
|
||||
* @param {!Blockly.Block} block Block to generate the code from.
|
||||
* @return {string} Completed code.
|
||||
*/
|
||||
Blockly.Arduino['math_random_float'] = function (block) {
|
||||
return ['(rand() / RAND_MAX)', Blockly.Arduino.ORDER_UNARY_POSTFIX];
|
||||
Blockly.Arduino["math_random_float"] = function (block) {
|
||||
return ["(rand() / RAND_MAX)", Blockly.Arduino.ORDER_UNARY_POSTFIX];
|
||||
};
|
||||
|
||||
127
src/components/Blockly/generator/sensebox-ble.js
Normal file
127
src/components/Blockly/generator/sensebox-ble.js
Normal file
@ -0,0 +1,127 @@
|
||||
import * as Blockly from "blockly/core";
|
||||
|
||||
Blockly.Arduino.sensebox_phyphox_init = function () {
|
||||
var name = this.getFieldValue("devicename");
|
||||
Blockly.Arduino.libraries_["phyphox_library"] = `#include <phyphoxBle.h>`;
|
||||
Blockly.Arduino.libraries_["library_senseBoxMCU"] =
|
||||
'#include "SenseBoxMCU.h"';
|
||||
Blockly.Arduino.phyphoxSetupCode_[
|
||||
"phyphox_start"
|
||||
] = `PhyphoxBLE::start("${name}");`;
|
||||
var code = ``;
|
||||
return code;
|
||||
};
|
||||
|
||||
Blockly.Arduino.sensebox_phyphox_experiment = function () {
|
||||
var experimentname = "experiment";
|
||||
var title = this.getFieldValue("title").replace(/[^a-zA-Z0-9]/g, "");
|
||||
var description = this.getFieldValue("description");
|
||||
var branch = Blockly.Arduino.statementToCode(this, "view");
|
||||
Blockly.Arduino.phyphoxSetupCode_[
|
||||
`PhyphoxBleExperiment_${experimentname}`
|
||||
] = `PhyphoxBleExperiment ${experimentname};`;
|
||||
Blockly.Arduino.phyphoxSetupCode_[
|
||||
`setTitle_${title}`
|
||||
] = `${experimentname}.setTitle("${title}");`;
|
||||
Blockly.Arduino.phyphoxSetupCode_[
|
||||
`setCategory_senseBoxExperiments}`
|
||||
] = `${experimentname}.setCategory("senseBox Experimente");`;
|
||||
Blockly.Arduino.phyphoxSetupCode_[
|
||||
`setDescription_${description}`
|
||||
] = `${experimentname}.setDescription("${description}");`;
|
||||
Blockly.Arduino.phyphoxSetupCode_[
|
||||
`addView_${experimentname}`
|
||||
] = `PhyphoxBleExperiment::View firstView;\nfirstView.setLabel("Messwerte"); //Create a "view"`;
|
||||
Blockly.Arduino.phyphoxSetupCode_[`addGraph`] = `${branch}`;
|
||||
Blockly.Arduino.phyphoxSetupCode_[
|
||||
`addView_firstview`
|
||||
] = `${experimentname}.addView(firstView);`; //Attach view to experiment
|
||||
Blockly.Arduino.phyphoxSetupCode_[
|
||||
`addExperiment_${experimentname}`
|
||||
] = `PhyphoxBLE::addExperiment(${experimentname});`; //Attach experiment to server
|
||||
|
||||
var code = ``;
|
||||
return code;
|
||||
};
|
||||
|
||||
Blockly.Arduino["sensebox_phyphox_timestamp"] = function () {
|
||||
var code = 0;
|
||||
return [code, Blockly.Arduino.ORDER_ATOMIC];
|
||||
};
|
||||
|
||||
Blockly.Arduino["sensebox_phyphox_channel"] = function () {
|
||||
var channel = parseFloat(this.getFieldValue("channel"));
|
||||
var code = channel;
|
||||
return [code, Blockly.Arduino.ORDER_ATOMIC];
|
||||
};
|
||||
|
||||
Blockly.Arduino.sensebox_phyphox_sendchannel = function (block) {
|
||||
var channel = this.getFieldValue("channel");
|
||||
var value =
|
||||
Blockly.Arduino.valueToCode(this, "value", Blockly.Arduino.ORDER_ATOMIC) ||
|
||||
"1";
|
||||
|
||||
var code = `float channel${channel} = ${value};\n`;
|
||||
return code;
|
||||
};
|
||||
|
||||
Blockly.Arduino.sensebox_phyphox_graph = function () {
|
||||
var label = this.getFieldValue("label").replace(/[^a-zA-Z0-9]/g, "");
|
||||
var unitx = this.getFieldValue("unitx");
|
||||
var unity = this.getFieldValue("unity");
|
||||
var labelx = this.getFieldValue("labelx");
|
||||
var labely = this.getFieldValue("labely");
|
||||
var style = this.getFieldValue("style");
|
||||
var channelX =
|
||||
Blockly.Arduino.valueToCode(
|
||||
this,
|
||||
"channel0",
|
||||
Blockly.Arduino.ORDER_ATOMIC
|
||||
) || 0;
|
||||
var channelY =
|
||||
Blockly.Arduino.valueToCode(
|
||||
this,
|
||||
"channel1",
|
||||
Blockly.Arduino.ORDER_ATOMIC
|
||||
) || 1;
|
||||
|
||||
var code = `PhyphoxBleExperiment::Graph ${label};\n`; //Create graph which will plot random numbers over time
|
||||
code += `${label}.setLabel("${label}");\n`;
|
||||
code += `${label}.setUnitX("${unitx}");\n`;
|
||||
code += `${label}.setUnitY("${unity}");\n`;
|
||||
code += `${label}.setLabelX("${labelx}");\n`;
|
||||
code += `${label}.setLabelY("${labely}");\n`;
|
||||
code += `${label}.setStyle("${style}");\n`;
|
||||
code += `${label}.setChannel(${channelX}, ${channelY});\n`;
|
||||
code += `firstView.addElement(${label});\n`;
|
||||
return code;
|
||||
};
|
||||
|
||||
Blockly.Arduino.sensebox_phyphox_experiment_send = function () {
|
||||
var branch = Blockly.Arduino.statementToCode(this, "sendValues");
|
||||
var blocks = this.getDescendants();
|
||||
console.log(blocks);
|
||||
var count = 0;
|
||||
if (blocks !== undefined) {
|
||||
for (var i = 0; i < blocks.length; i++) {
|
||||
if (blocks[i].type === "sensebox_phyphox_sendchannel") {
|
||||
count++;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (count === 5) {
|
||||
}
|
||||
var string = "";
|
||||
|
||||
for (var j = 1; j <= count; j++) {
|
||||
console.log("append");
|
||||
if (string === "") {
|
||||
string += `channel${j}`;
|
||||
} else if (string !== "") {
|
||||
string += `, channel${j}`;
|
||||
}
|
||||
}
|
||||
Blockly.Arduino.loopCodeOnce_["phyphox_poll"] = `PhyphoxBLE::poll();`;
|
||||
var code = `${branch}\nPhyphoxBLE::write(${string});`;
|
||||
return code;
|
||||
};
|
||||
@ -1,4 +1,3 @@
|
||||
|
||||
const colours = {
|
||||
sensebox: 120,
|
||||
logic: 210,
|
||||
@ -12,11 +11,10 @@ const colours = {
|
||||
audio: 250,
|
||||
arrays: 33,
|
||||
mqtt: 90,
|
||||
webserver: 40
|
||||
}
|
||||
|
||||
webserver: 40,
|
||||
phyphox: 25,
|
||||
};
|
||||
|
||||
export const getColour = () => {
|
||||
return colours;
|
||||
};
|
||||
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
import { AUDIO } from "./de/audio";
|
||||
import { BLE } from "./de/sensebox-ble";
|
||||
import { FAQ } from "./de/faq";
|
||||
import { IO } from "./de/io";
|
||||
import { LOGIC } from "./de/logic";
|
||||
@ -24,6 +25,7 @@ import { WEBSERVER } from "./de/webserver";
|
||||
|
||||
export const De = {
|
||||
...AUDIO,
|
||||
...BLE,
|
||||
...FAQ,
|
||||
...IO,
|
||||
...LOGIC,
|
||||
|
||||
41
src/components/Blockly/msg/de/sensebox-ble.js
Normal file
41
src/components/Blockly/msg/de/sensebox-ble.js
Normal file
@ -0,0 +1,41 @@
|
||||
export const BLE = {
|
||||
/**
|
||||
* Phyphox Blöcke
|
||||
*/
|
||||
sensebox_phyphox_init: "Initialisiere Phyphox Gerät mit Namen:",
|
||||
sensebox_phyphox_createExperiment: "Erstelle Experiment",
|
||||
sensebox_phyphox_experimentName: "Name des Experiments",
|
||||
sensebox_phyphox_experimentTitle: "Titel",
|
||||
sensebox_phyphox_experimentCategory: "Kategorie",
|
||||
sensebox_phyphox_experimentDescription: "Beschreibung",
|
||||
sensebox_phyphox_experiment_description: "Kurze Beschreibung des Experiments",
|
||||
sensebox_phyphox_writeValues: "Sende Werte",
|
||||
sensebox_phyphox_createView: "Mit Graphen:",
|
||||
sensebox_phyphox_createGraph: "Erstelle Graph",
|
||||
sensebox_phyphox_graphLabel: "",
|
||||
sensebox_phyphox_unitx: "Einheit x-Achse",
|
||||
sensebox_phyphox_unity: "Einheit y-Achse",
|
||||
sensebox_phyphox_labelx: "Beschriftung x-Achse",
|
||||
sensebox_phyphox_labely: "Beschriftung y-Achse",
|
||||
sensebox_phyphox_channel0: "Wert x-Achse",
|
||||
sensebox_phyphox_channel1: "Wert y-Achse",
|
||||
sensebox_phyphox_style_dots: "Punkte",
|
||||
sensebox_phyphox_style_line: "Linie",
|
||||
sensebox_phyphox_timestamp: "Zeitstempel",
|
||||
sensebox_phyphox_channel: "Kanal",
|
||||
sensebox_phyphox_sendchannel: "sende an Kanal:",
|
||||
sensebox_phyphox_graphStyle: "Stil",
|
||||
|
||||
sensebox_phyphox_init_tooltip:
|
||||
"Initialisere das Bluetooth Bee. Stecke diese auf dem Steckplatz **XBEE1**. Gib dem Phphox Messgerät einen eindeutigen Namen, damit du dieses in der App wiederfindest",
|
||||
sensebox_phyphox_experiment_tooltip:
|
||||
"Erstelle ein Experiment und vergib einen eindeutigen Namen und eine kurze Beschreibung. Füge bis zu 5 verschiedene Graphen in der Ansicht hinzu. ",
|
||||
sensebox_phyphox_graph_tooltip:
|
||||
"Erstellt einen neuen Graph für das Experiment. Gibt die Einheit und Beschriftung für die Achsen an und wähle den Stil der Visualisuerng der Messwerte. Füge an die Schnittstellen für die Werte der X- und Y-Achse den Kanal an auf dem die Messwerte später gesendet werden. Möchtest du einen Zeitstempel über die Phyphox App erstellen lassen verbinde den Block *Zeitstempel*",
|
||||
sensebox_phyphox_timestamp_tooltip:
|
||||
"Verwende diesen Block, um einen Zeitstempel über die Phyphox App erstellen zu lassen",
|
||||
sensebox_phyphox_sendchannel_tooltip:
|
||||
"Sendet einen Messwert an den ausgewählten Kanal",
|
||||
sensebox_phyphox_experiment_send_tooltip:
|
||||
"Sendet die Messwerte an die Phyphox App",
|
||||
};
|
||||
@ -6,8 +6,10 @@ export const LED = {
|
||||
senseBox_ws2818_rgb_led_init: "RGB LED (WS2818) initialisieren",
|
||||
senseBox_ws2818_rgb_led_position: "Position",
|
||||
senseBox_ws2818_rgb_led_brightness: "Helligkeit",
|
||||
senseBox_ws2818_rgb_led_tooltip: "Verändere mit diesem Block die Farbe deiner RGB-LED. Verbinde einen Block für die Farbe. Wenn mehrere RGB-LEDs miteinander verkettet werden kannst du über die Position bestimmen welche LED angesteuert wird. ",
|
||||
senseBox_ws2818_rgb_led_init_tooltip: "Schließe die RGB-LED an einen der drei **digital/analog Ports** an. Wenn mehrere RGB-LEDs miteinander verkettet werden kannst du über die Position bestimmen welche LED angesteuert wird. ",
|
||||
senseBox_ws2818_rgb_led_tooltip:
|
||||
"Verändere mit diesem Block die Farbe deiner RGB-LED. Verbinde einen Block für die Farbe. Wenn mehrere RGB-LEDs miteinander verkettet werden kannst du über die Position bestimmen welche LED angesteuert wird. ",
|
||||
senseBox_ws2818_rgb_led_init_tooltip:
|
||||
"Schließe die RGB-LED an einen der drei **digital/analog Ports** an. Wenn mehrere RGB-LEDs miteinander verkettet werden kannst du über die Position bestimmen welche LED angesteuert wird. ",
|
||||
senseBox_ws2818_rgb_led_color: "Farbe",
|
||||
senseBox_ws2818_rgb_led_number: "Anzahl",
|
||||
|
||||
@ -20,9 +22,11 @@ export const LED = {
|
||||
COLOUR_BLEND_HELPURL: "http://meyerweb.com/eric/tools/color-blend/",
|
||||
COLOUR_BLEND_RATIO: "im Verhältnis",
|
||||
COLOUR_BLEND_TITLE: "mische",
|
||||
COLOUR_BLEND_TOOLTIP: "Vermische 2 Farben mit konfigurierbaren Farbverhältnis (0.0 - 1.0).",
|
||||
COLOUR_BLEND_TOOLTIP:
|
||||
"Vermische 2 Farben mit konfigurierbaren Farbverhältnis (0.0 - 1.0).",
|
||||
COLOUR_PICKER_HELPURL: "https://de.wikipedia.org/wiki/Farbe",
|
||||
COLOUR_PICKER_TOOLTIP: "Wähle eine Farbe aus der Palette. Die Farbe wird automatisch in RGB-Werte konvertiert.",
|
||||
COLOUR_PICKER_TOOLTIP:
|
||||
"Wähle eine Farbe aus der Palette. Die Farbe wird automatisch in RGB-Werte konvertiert.",
|
||||
COLOUR_RANDOM_HELPURL: "http://randomcolour.com", // untranslated
|
||||
COLOUR_RANDOM_TITLE: "zufällige Farbe",
|
||||
COLOUR_RANDOM_TOOLTIP: "Erstelle eine Farbe nach dem Zufallsprinzip.",
|
||||
@ -31,6 +35,6 @@ export const LED = {
|
||||
COLOUR_RGB_HELPURL: "https://de.wikipedia.org/wiki/RGB-Farbraum",
|
||||
COLOUR_RGB_RED: "rot",
|
||||
COLOUR_RGB_TITLE: "Farbe mit",
|
||||
COLOUR_RGB_TOOLTIP: "Erstelle eine Farbe mit selbst definierten Rot-, Grün- und Blauwerten. Alle Werte müssen zwischen 0 und 255 liegen. 0 ist hierbei die geringte Intensität der Farbe 255 die höchste.",
|
||||
|
||||
}
|
||||
COLOUR_RGB_TOOLTIP:
|
||||
"Erstelle eine Farbe mit selbst definierten Rot-, Grün- und Blauwerten. Alle Werte müssen zwischen 0 und 255 liegen. 0 ist hierbei die geringte Intensität der Farbe 255 die höchste.",
|
||||
};
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
import { AUDIO } from "./en/audio";
|
||||
import { BLE } from "./en/sensebox-ble";
|
||||
import { FAQ } from "./en/faq";
|
||||
import { IO } from "./en/io";
|
||||
import { LOGIC } from "./en/logic";
|
||||
@ -24,6 +25,7 @@ import { WEBSERVER } from "./en/webserver";
|
||||
|
||||
export const En = {
|
||||
...AUDIO,
|
||||
...BLE,
|
||||
...FAQ,
|
||||
...IO,
|
||||
...LOGIC,
|
||||
|
||||
42
src/components/Blockly/msg/en/sensebox-ble.js
Normal file
42
src/components/Blockly/msg/en/sensebox-ble.js
Normal file
@ -0,0 +1,42 @@
|
||||
export const BLE = {
|
||||
/**
|
||||
* Phyphox Init
|
||||
*/
|
||||
sensebox_phyphox_init: "Initialise Phyphox device with name:",
|
||||
sensebox_phyphox_createExperiment: "Create experiment",
|
||||
sensebox_phyphox_experimentName: "Name of experiment",
|
||||
sensebox_phyphox_experimentTitle: "Title",
|
||||
sensebox_phyphox_experimentCategory: "Category",
|
||||
sensebox_phyphox_experimentDescription: "Description",
|
||||
sensebox_phyphox_experiment_description:
|
||||
"Short description of the experiment",
|
||||
sensebox_phyphox_writeValues: "Send values",
|
||||
sensebox_phyphox_createView: "With graphs:",
|
||||
sensebox_phyphox_createGraph: "Create Graph",
|
||||
sensebox_phyphox_graphLabel: "",
|
||||
sensebox_phyphox_unitx: "Unit x-axis",
|
||||
sensebox_phyphox_unity: "Unit y-axis",
|
||||
sensebox_phyphox_labelx: "Label x-axis",
|
||||
sensebox_phyphox_labely: "Label y-axis",
|
||||
sensebox_phyphox_channel0: "x-axis value",
|
||||
sensebox_phyphox_channel1: "y-axis value",
|
||||
sensebox_phyphox_style_dots: "Dots",
|
||||
sensebox_phyphox_style_line: "Line",
|
||||
sensebox_phyphox_timestamp: "Timestamp",
|
||||
sensebox_phyphox_channel: "Channel",
|
||||
sensebox_phyphox_sendchannel: "send to channel:",
|
||||
sensebox_phyphox_graphStyle: "style",
|
||||
|
||||
sensebox_phyphox_init_tooltip:
|
||||
"Initialise the Bluetooth Bee. Plug it into the **XBEE1** slot. Give the Phphox meter a unique name so you can find it in the app",
|
||||
sensebox_phyphox_experiment_tooltip:
|
||||
"Create an experiment and give it a unique name and a short description. Add up to 5 different graphs in the view. ",
|
||||
sensebox_phyphox_graph_tooltip:
|
||||
"Creates a new graph for the experiment. Specify the unit and label for the axes and choose the style of visualisation of the measured values. Add to the interfaces for the values of the X- and Y-axis the channel on which the measured values will be sent later. If you want to create a timestamp via the Phyphox app, connect the block *Timestamp*",
|
||||
sensebox_phyphox_timestamp_tooltip:
|
||||
"Use this block to have a timestamp created via the Phyphox app",
|
||||
sensebox_phyphox_sendchannel_tooltip:
|
||||
"Sends a reading to the selected channel",
|
||||
sensebox_phyphox_experiment_send_tooltip:
|
||||
"Sends the measured values to the Phyphox App",
|
||||
};
|
||||
@ -362,6 +362,30 @@ class Toolbox extends React.Component {
|
||||
<Block type="sensebox_lora_cayenne_gps" />
|
||||
</Category>
|
||||
</Category>
|
||||
<Category id="phyphox" name="Phyphox" colour={getColour().phyphox}>
|
||||
<Block type="sensebox_phyphox_init"></Block>
|
||||
<Block type="sensebox_phyphox_experiment">
|
||||
<Value name="view">
|
||||
<Block type="sensebox_phyphox_graph">
|
||||
<Value name="channel0">
|
||||
<Block type="sensebox_phyphox_timestamp"></Block>
|
||||
</Value>
|
||||
<Value name="channel1">
|
||||
<Block type="sensebox_phyphox_channel"></Block>
|
||||
</Value>
|
||||
</Block>
|
||||
</Value>
|
||||
</Block>
|
||||
<Block type="sensebox_phyphox_experiment_send">
|
||||
<Value name="sendValues">
|
||||
<Block type="sensebox_phyphox_sendchannel"></Block>
|
||||
</Value>
|
||||
</Block>
|
||||
<Block type="sensebox_phyphox_graph"></Block>
|
||||
<Block type="sensebox_phyphox_timestamp"></Block>
|
||||
<Block type="sensebox_phyphox_channel"></Block>
|
||||
<Block type="sensebox_phyphox_sendchannel"></Block>
|
||||
</Category>
|
||||
<Category
|
||||
id="webserver"
|
||||
name="Webserver"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user