change order of phenomenons

fix #179

CITATION.cff

@@ -0,0 +1,26 @@
+# This CITATION.cff file was generated with cffinit.
+# Visit https://bit.ly/cffinit to generate yours today!
+
+cff-version: 1.2.0
+title: senseBox Learn- and Programming Environment
+message: Please cite this software using these metadata.
+type: software
+version: 1.0.0
+date-released: 2021-09-30
+url: "https://github.com/sensebox/React-Ardublockly"
+authors:
+  - given-names: Mario
+    family-names: Pesch
+    email: mario.pesch@uni-muenster.de
+    affiliation: >-
+      Institute for geoinformatics University of
+      Muenster
+  - given-names: Luc
+    family-names: Niski
+    affiliation: >-
+      Institute for geoinformatics University of
+      Muenster
+  - given-names: Felix
+    family-names: Erdmann
+    email: f.erdmann@reedu.de
+    affiliation: Reedu GmbH & Co. KG

README.md

@@ -22,7 +22,4 @@ This project was created with [Create React App](https://github.com/facebook/cre
 Ensure that line 14 in [store.js](https://github.com/sensebox/React-Ardublockly/blob/master/src/store.js#L14) is commented out or otherwise you have installed [Redux DevTools Extension](http://extension.remotedev.io/).
 
 ## Demo
-A demo of the current status of the master branch can be accessed via [sensebox-ardublockly.netlify.app](https://sensebox-ardublockly.netlify.app/) :rocket:.
-* [Home](https://sensebox-ardublockly.netlify.app/)
-* [Tutorial Overview](https://sensebox-ardublockly.netlify.app/tutorial)
-* [Tutorial-Builder](https://sensebox-ardublockly.netlify.app/tutorial/builder)
+A demo of the current status of the master branch can be accessed via [https://blockly-react.netlify.app/](https://blockly-react.netlify.app/) :rocket:.

package.json

@@ -4,6 +4,7 @@
   "private": true,
   "dependencies": {
     "@blockly/block-plus-minus": "^2.0.10",
+    "@blockly/field-grid-dropdown": "^1.0.25",
     "@blockly/field-slider": "^2.1.1",
     "@blockly/plugin-scroll-options": "^1.0.2",
     "@blockly/plugin-typed-variable-modal": "^3.1.26",
@@ -14,17 +15,17 @@
     "@material-ui/core": "^4.11.0",
     "@sentry/react": "^6.0.0",
     "@sentry/tracing": "^6.0.0",
-    "@testing-library/jest-dom": "^4.2.4",
-    "@testing-library/react": "^9.5.0",
+    "@testing-library/jest-dom": "^5.16.1",
+    "@testing-library/react": "^12.1.2",
     "@testing-library/user-event": "^7.2.1",
-    "axios": "^0.21.0",
+    "axios": "^0.22.0",
     "blockly": "^6.20210701.0",
     "file-saver": "^2.0.2",
     "mnemonic-id": "^3.2.7",
     "moment": "^2.28.0",
-    "prismjs": "^1.24.0",
+    "prismjs": "^1.27.0",
     "react": "^17.0.2",
-    "react-cookie-consent": "^5.2.0",
+    "react-cookie-consent": "^7.0.0",
     "react-dom": "^17.0.2",
     "react-markdown": "^5.0.2",
     "react-mde": "^11.5.0",

src/actions/generalActions.js

@@ -1,32 +1,52 @@
-import { VISIT, LANGUAGE, RENDERER, STATISTICS } from './types';
-
+import {
+  VISIT,
+  LANGUAGE,
+  RENDERER,
+  SOUNDS,
+  STATISTICS,
+  PLATFORM,
+} from "./types";
 
 export const visitPage = () => (dispatch) => {
   dispatch({
-    type: VISIT
+    type: VISIT,
+  });
+};
+
+export const setPlatform = (platform) => (dispatch) => {
+  dispatch({
+    type: PLATFORM,
+    payload: platform,
   });
 };
 
 export const setLanguage = (language) => (dispatch, getState) => {
-  if(!getState().auth.progress && !getState().auth.isAuthenticated){
-    window.localStorage.setItem('locale', language);
+  if (!getState().auth.progress && !getState().auth.isAuthenticated) {
+    window.localStorage.setItem("locale", language);
   }
   dispatch({
     type: LANGUAGE,
-    payload: language
+    payload: language,
   });
 };
 
 export const setRenderer = (renderer) => (dispatch) => {
   dispatch({
     type: RENDERER,
-    payload: renderer
+    payload: renderer,
+  });
+};
+
+export const setSounds = (sounds) => (dispatch) => {
+  dispatch({
+    type: SOUNDS,
+    payload: sounds,
   });
 };
 
 export const setStatistics = (showStatistics) => (dispatch) => {
   dispatch({
     type: STATISTICS,
-    payload: showStatistics
+    payload: showStatistics,
   });
 };

src/actions/types.js

@@ -43,7 +43,9 @@ export const PROGRESS = "PROGRESS";
 
 export const VISIT = "VISIT";
 export const LANGUAGE = "LANGUAGE";
+export const PLATFORM = "PLATFORM";
 export const RENDERER = "RENDERER";
+export const SOUNDS = "SOUNDS";
 export const STATISTICS = "STATISTICS";
 
 // messages

src/components/Blockly/BlocklyWindow.js

@@ -11,6 +11,7 @@ import "./blocks/index";
 import "./generator/index";
 import { ZoomToFitControl } from "@blockly/zoom-to-fit";
 import { initialXml } from "./initialXml.js";
+import { getMaxInstances } from "./helpers/maxInstances";
 
 class BlocklyWindow extends Component {
   constructor(props) {
@@ -24,6 +25,7 @@ class BlocklyWindow extends Component {
     this.props.clearStats();
     workspace.addChangeListener((event) => {
       this.props.onChangeWorkspace(event);
+
       // switch on that a block is displayed disabled or not depending on whether it is correctly connected
       // for SVG display, a deactivated block in the display is undesirable
       if (this.props.blockDisabled) {
@@ -37,6 +39,7 @@ class BlocklyWindow extends Component {
 
   componentDidUpdate(props) {
     const workspace = Blockly.getMainWorkspace();
+
     var xml = this.props.initialXml;
     // if svg is true, then the update process is done in the BlocklySvg component
     if (props.initialXml !== xml && !this.props.svg) {
@@ -69,6 +72,8 @@ class BlocklyWindow extends Component {
             this.props.trashcan !== undefined ? this.props.trashcan : true
           }
           renderer={this.props.renderer}
+          sounds={this.props.sounds}
+          maxInstances={getMaxInstances()}
           zoom={{
             // https://developers.google.com/blockly/guides/configure/web/zoom
             controls:
@@ -119,11 +124,13 @@ BlocklyWindow.propTypes = {
   onChangeWorkspace: PropTypes.func.isRequired,
   clearStats: PropTypes.func.isRequired,
   renderer: PropTypes.string.isRequired,
+  sounds: PropTypes.string.isRequired,
   language: PropTypes.string.isRequired,
 };
 
 const mapStateToProps = (state) => ({
   renderer: state.general.renderer,
+  sounds: state.general.sounds,
   language: state.general.language,
 });
 

src/components/Blockly/blocks/index.js

@@ -18,9 +18,11 @@ import "./audio";
 import "./math";
 import "./map";
 import "./procedures";
+import "./serial";
 import "./time";
 import "./variables";
 import "./lists";
+import "./watchdog";
 import "./webserver";
 
 import "../helpers/types";

src/components/Blockly/blocks/io.js

@@ -10,23 +10,24 @@
  *
  * TODO: maybe change this to a "PIN" BlocklyType
  */
-import Blockly from 'blockly/core';
-import { selectedBoard } from '../helpers/board'
-import * as Types from '../helpers/types'
+import Blockly from "blockly/core";
+import { selectedBoard } from "../helpers/board";
+import * as Types from "../helpers/types";
 
-
-Blockly.Blocks['io_digitalwrite'] = {
+Blockly.Blocks["io_digitalwrite"] = {
   /**
    * Block for creating a 'set pin' to a state.
    * @this Blockly.Block
    */
   init: function () {
-        this.setHelpUrl('http://arduino.cc/en/Reference/DigitalWrite');
+    this.setHelpUrl("http://arduino.cc/en/Reference/DigitalWrite");
     this.setColour(250);
-        this.appendValueInput('STATE')
+    this.appendValueInput("STATE")
       .appendField(Blockly.Msg.ARD_DIGITALWRITE)
-            .appendField(new Blockly.FieldDropdown(
-                selectedBoard().digitalPins), 'PIN')
+      .appendField(
+        new Blockly.FieldDropdown(selectedBoard().digitalPins),
+        "PIN"
+      )
       .appendField(Blockly.Msg.ARD_WRITE_TO)
       .setCheck(Types.BOOLEAN.checkList);
     this.setInputsInline(false);
@@ -40,23 +41,28 @@ Blockly.Blocks['io_digitalwrite'] = {
    */
   updateFields: function () {
     Blockly.Arduino.Boards.refreshBlockFieldDropdown(
-            this, 'PIN', 'digitalPins');
-    }
+      this,
+      "PIN",
+      "digitalPins"
+    );
+  },
 };
 
-Blockly.Blocks['io_digitalread'] = {
+Blockly.Blocks["io_digitalread"] = {
   /**
    * Block for creating a 'read pin'.
    * @this Blockly.Block
    */
   init: function () {
-        this.setHelpUrl('http://arduino.cc/en/Reference/DigitalRead');
+    this.setHelpUrl("http://arduino.cc/en/Reference/DigitalRead");
     this.setColour(250);
     this.appendDummyInput()
       .appendField(Blockly.Msg.ARD_DIGITALREAD)
-            .appendField(new Blockly.FieldDropdown(
-                selectedBoard().digitalPins), 'PIN');
-        this.setOutput(true, 'boolean');
+      .appendField(
+        new Blockly.FieldDropdown(selectedBoard().digitalPins),
+        "PIN"
+      );
+    this.setOutput(true, "boolean");
     this.setTooltip(Blockly.Msg.ARD_DIGITALREAD_TIP);
   },
   /** @return {!string} The type of return value for the block, an integer. */
@@ -69,22 +75,27 @@ Blockly.Blocks['io_digitalread'] = {
    */
   updateFields: function () {
     Blockly.Arduino.Boards.refreshBlockFieldDropdown(
-            this, 'PIN', 'digitalPins');
-    }
+      this,
+      "PIN",
+      "digitalPins"
+    );
+  },
 };
 
-Blockly.Blocks['io_builtin_led'] = {
+Blockly.Blocks["io_builtin_led"] = {
   /**
    * Block for setting built-in LED to a state.
    * @this Blockly.Block
    */
   init: function () {
-        this.setHelpUrl('http://arduino.cc/en/Reference/DigitalWrite');
+    this.setHelpUrl("http://arduino.cc/en/Reference/DigitalWrite");
     this.setColour(250);
-        this.appendValueInput('STATE')
+    this.appendValueInput("STATE")
       .appendField(Blockly.Msg.ARD_BUILTIN_LED)
-            .appendField(new Blockly.FieldDropdown(
-                selectedBoard().builtinLed), 'BUILT_IN_LED')
+      .appendField(
+        new Blockly.FieldDropdown(selectedBoard().builtinLed),
+        "BUILT_IN_LED"
+      )
       .appendField(Blockly.Msg.ARD_WRITE_TO)
       .setCheck(Types.BOOLEAN.compatibleTypes);
     this.setInputsInline(false);
@@ -98,7 +109,10 @@ Blockly.Blocks['io_builtin_led'] = {
    */
   updateFields: function () {
     Blockly.Arduino.Boards.refreshBlockFieldDropdown(
-            this, 'BUILT_IN_LED', 'builtinLed');
+      this,
+      "BUILT_IN_LED",
+      "builtinLed"
+    );
   },
   /** @return {!string} The type of input value for the block, an integer. */
   getBlockType: function () {
@@ -106,18 +120,17 @@ Blockly.Blocks['io_builtin_led'] = {
   },
 };
 
-Blockly.Blocks['io_analogwrite'] = {
+Blockly.Blocks["io_analogwrite"] = {
   /**
    * Block for creating a 'set pin' to an analogue value.
    * @this Blockly.Block
    */
   init: function () {
-        this.setHelpUrl('http://arduino.cc/en/Reference/AnalogWrite');
+    this.setHelpUrl("http://arduino.cc/en/Reference/AnalogWrite");
     this.setColour(250);
-        this.appendValueInput('NUM')
+    this.appendValueInput("NUM")
       .appendField(Blockly.Msg.ARD_ANALOGWRITE)
-            .appendField(new Blockly.FieldDropdown(
-                selectedBoard().pwmPins), 'PIN')
+      .appendField(new Blockly.FieldDropdown(selectedBoard().pwmPins), "PIN")
       .appendField(Blockly.Msg.ARD_WRITE_TO)
       .setCheck(Types.NUMBER.compatibleTypes);
     this.setInputsInline(false);
@@ -130,7 +143,7 @@ Blockly.Blocks['io_analogwrite'] = {
    * @this Blockly.Block
    */
   updateFields: function () {
-        Blockly.Arduino.Boards.refreshBlockFieldDropdown(this, 'PIN', 'pwmPins');
+    Blockly.Arduino.Boards.refreshBlockFieldDropdown(this, "PIN", "pwmPins");
   },
   /** @return {!string} The type of input value for the block, an integer. */
   getBlockType: function () {
@@ -138,88 +151,95 @@ Blockly.Blocks['io_analogwrite'] = {
   },
 };
 
-Blockly.Blocks['io_analogread'] = {
+Blockly.Blocks["io_analogread"] = {
   /**
    * Block for reading an analogue input.
    * @this Blockly.Block
    */
   init: function () {
-        this.setHelpUrl('http://arduino.cc/en/Reference/AnalogRead');
+    this.setHelpUrl("http://arduino.cc/en/Reference/AnalogRead");
     this.setColour(250);
     this.appendDummyInput()
       .appendField(Blockly.Msg.ARD_ANALOGREAD)
-            .appendField(new Blockly.FieldDropdown(
-                selectedBoard().analogPins), 'PIN');
-        this.setOutput(true, Types.NUMBER.typeId);
+      .appendField(
+        new Blockly.FieldDropdown(selectedBoard().analogPins),
+        "PIN"
+      );
+    this.setOutput(true, Types.NUMBER.typeName);
     this.setTooltip(Blockly.Msg.ARD_ANALOGREAD_TIP);
   },
   /** @return {!string} The type of return value for the block, an integer. */
   getBlockType: function () {
-        return Types.NUMBER.typeId;
+    return Types.NUMBER.typeName;
   },
   /**
    * Updates the content of the the pin related fields.
    * @this Blockly.Block
    */
   updateFields: function () {
-        Blockly.Arduino.Boards.refreshBlockFieldDropdown(this, 'PIN', 'analogPins');
-    }
+    Blockly.Arduino.Boards.refreshBlockFieldDropdown(this, "PIN", "analogPins");
+  },
 };
 
-Blockly.Blocks['io_highlow'] = {
+Blockly.Blocks["io_highlow"] = {
   /**
    * Block for creating a pin state.
    * @this Blockly.Block
    */
   init: function () {
-        this.setHelpUrl('http://arduino.cc/en/Reference/Constants');
+    this.setHelpUrl("http://arduino.cc/en/Reference/Constants");
     this.setColour(250);
-        this.appendDummyInput()
-            .appendField(
-                new Blockly.FieldDropdown([[Blockly.Msg.ARD_HIGH, 'HIGH'], [Blockly.Msg.ARD_LOW, 'LOW']]),
-                'STATE');
-        this.setOutput(true, Types.BOOLEAN.typeId);
+    this.appendDummyInput().appendField(
+      new Blockly.FieldDropdown([
+        [Blockly.Msg.ARD_HIGH, "HIGH"],
+        [Blockly.Msg.ARD_LOW, "LOW"],
+      ]),
+      "STATE"
+    );
+    this.setOutput(true, Types.BOOLEAN.typeName);
     this.setTooltip(Blockly.Msg.ARD_HIGHLOW_TIP);
   },
   /** @return {!string} The type of return value for the block, an integer. */
   getBlockType: function () {
     return Types.BOOLEAN;
-    }
+  },
 };
 
-Blockly.Blocks['io_pulsein'] = {
+Blockly.Blocks["io_pulsein"] = {
   /**
    * Block for measuring the duration of a pulse in an input pin.
    * @this Blockly.Block
    */
   init: function () {
     this.jsonInit({
-            "type": "math_foo",
-            "message0": Blockly.Msg.ARD_PULSE_READ,
-            "args0": [{
-                "type": "input_value",
-                "name": "PULSETYPE",
-                "check": Types.BOOLEAN.compatibleTypes
-            }, {
-                "type": "field_dropdown",
-                "name": "PULSEPIN",
-                "options": selectedBoard().digitalPins,
-            }
+      type: "math_foo",
+      message0: Blockly.Msg.ARD_PULSE_READ,
+      args0: [
+        {
+          type: "input_value",
+          name: "PULSETYPE",
+          check: Types.BOOLEAN.compatibleTypes,
+        },
+        {
+          type: "field_dropdown",
+          name: "PULSEPIN",
+          options: selectedBoard().digitalPins,
+        },
       ],
-            "output": Types.NUMBER.typeId,
-            "inputsInline": true,
-            "colour": 250,
-            "tooltip": Blockly.Msg.ARD_PULSE_TIP,
-            "helpUrl": 'https://www.arduino.cc/en/Reference/PulseIn'
+      output: Types.NUMBER.typeName,
+      inputsInline: true,
+      colour: 250,
+      tooltip: Blockly.Msg.ARD_PULSE_TIP,
+      helpUrl: "https://www.arduino.cc/en/Reference/PulseIn",
     });
   },
   /** @return {!string} The type of input value for the block, an integer. */
   getBlockType: function () {
-        return Types.NUMBER.typeId;
-    }
+    return Types.NUMBER.typeName;
+  },
 };
 
-Blockly.Blocks['io_pulsetimeout'] = {
+Blockly.Blocks["io_pulsetimeout"] = {
   /**
    * Block for measuring (with a time-out) the duration of a pulse in an input
    * pin.
@@ -227,31 +247,34 @@ Blockly.Blocks['io_pulsetimeout'] = {
    */
   init: function () {
     this.jsonInit({
-            "type": "math_foo",
-            "message0": Blockly.Msg.ARD_PULSE_READ_TIMEOUT,
-            "args0": [{
-                "type": "input_value",
-                "name": "PULSETYPE",
-                "check": Types.BOOLEAN.compatibleTypes
-            }, {
-                "type": "field_dropdown",
-                "name": "PULSEPIN",
-                "options": selectedBoard().digitalPins,
-            }, {
-                "type": "input_value",
-                "name": "TIMEOUT",
-                "check": Types.NUMBER.compatibleTypes
-            }
+      type: "math_foo",
+      message0: Blockly.Msg.ARD_PULSE_READ_TIMEOUT,
+      args0: [
+        {
+          type: "input_value",
+          name: "PULSETYPE",
+          check: Types.BOOLEAN.compatibleTypes,
+        },
+        {
+          type: "field_dropdown",
+          name: "PULSEPIN",
+          options: selectedBoard().digitalPins,
+        },
+        {
+          type: "input_value",
+          name: "TIMEOUT",
+          check: Types.NUMBER.compatibleTypes,
+        },
       ],
-            "output": Types.NUMBER.typeId,
-            "inputsInline": true,
-            "colour": 250,
-            "tooltip": Blockly.Msg.ARD_PULSETIMEOUT_TIP,
-            "helpUrl": 'https://www.arduino.cc/en/Reference/PulseIn'
+      output: Types.NUMBER.typeName,
+      inputsInline: true,
+      colour: 250,
+      tooltip: Blockly.Msg.ARD_PULSETIMEOUT_TIP,
+      helpUrl: "https://www.arduino.cc/en/Reference/PulseIn",
     });
   },
   /** @return {!string} The type of input value for the block, an integer. */
   getBlockType: function () {
-        return Types.NUMBER.typeId;
-    }
+    return Types.NUMBER.typeName;
+  },
 };

src/components/Blockly/blocks/lists.js

@@ -1,57 +1,52 @@
-import Blockly, { FieldDropdown } from 'blockly/core'
-import * as Types from '../helpers/types'
-import { getColour } from '../helpers/colour';
+import Blockly, { FieldDropdown } from "blockly/core";
+import * as Types from "../helpers/types";
+import { getColour } from "../helpers/colour";
 
-Blockly.Blocks['lists_create_empty'] = {
+Blockly.Blocks["lists_create_empty"] = {
   /**
    * Elapsed time in milliseconds block definition
    * @this Blockly.Block
    */
   init: function () {
-        this.setHelpUrl('http://arduino.cc/en/Reference/Millis');
+    this.setHelpUrl("http://arduino.cc/en/Reference/Millis");
     this.setColour(getColour().arrays);
-        this.appendDummyInput()
-            .appendField("create List with")
-        this.appendValueInput('NUMBER');
+    this.appendDummyInput().appendField("create List with");
+    this.appendValueInput("NUMBER");
     this.appendDummyInput()
       .appendField("Items of Type")
-            .appendField(new FieldDropdown(Types.VARIABLE_TYPES), 'type');
-        this.setOutput(true, Types.ARRAY.typeId);
+      .appendField(new FieldDropdown(Types.VARIABLE_TYPES), "type");
+    this.setOutput(true, Types.ARRAY.typeName);
     this.setTooltip(Blockly.Msg.ARD_TIME_MILLIS_TIP);
   },
 };
 
-
-Blockly.Blocks['array_getIndex'] = {
+Blockly.Blocks["array_getIndex"] = {
   /**
    * Elapsed time in milliseconds block definition
    * @this Blockly.Block
    */
   init: function () {
-        this.setHelpUrl('http://arduino.cc/en/Reference/Millis');
+    this.setHelpUrl("http://arduino.cc/en/Reference/Millis");
     this.setColour(getColour().arrays);
-        this.appendDummyInput()
-            .appendField(new Blockly.FieldVariable(
-                'X',
-                null,
-                ['Array'],
-                'Array'
-            ), 'FIELDNAME');
-        this.setOutput(true, Types.ARRAY.typeId);
+    this.appendDummyInput().appendField(
+      new Blockly.FieldVariable("X", null, ["Array"], "Array"),
+      "FIELDNAME"
+    );
+    this.setOutput(true, Types.ARRAY.typeName);
     this.setTooltip(Blockly.Msg.ARD_TIME_MILLIS_TIP);
   },
 };
 
-Blockly.Blocks['lists_length'] = {
+Blockly.Blocks["lists_length"] = {
   /**
    * Elapsed time in milliseconds block definition
    * @this Blockly.Block
    */
   init: function () {
-        this.setHelpUrl('http://arduino.cc/en/Reference/Millis');
+    this.setHelpUrl("http://arduino.cc/en/Reference/Millis");
     this.setColour(getColour().arrays);
-        this.appendValueInput('ARRAY')
-            .appendField('length of')
+    this.appendValueInput("ARRAY")
+      .appendField("length of")
       .setCheck(Types.ARRAY.compatibleTypes);
     this.setOutput(true, Types.NUMBER.typeName);
     this.setTooltip(Blockly.Msg.ARD_TIME_MILLIS_TIP);

src/components/Blockly/blocks/logic.js

@@ -1,11 +1,9 @@
-import Blockly from 'blockly/core';
-import { getColour } from '../helpers/colour';
-import * as Types from '../helpers/types';
-import { getCompatibleTypes } from '../helpers/types';
+import Blockly from "blockly/core";
+import { getColour } from "../helpers/colour";
+import * as Types from "../helpers/types";
+import { getCompatibleTypes } from "../helpers/types";
 
-
-
-Blockly.Blocks['controls_if'] = {
+Blockly.Blocks["controls_if"] = {
   /**
    * Block for if/elseif/else condition.
    * @this Blockly.Block
@@ -13,29 +11,18 @@ Blockly.Blocks['controls_if'] = {
   init: function () {
     this.setHelpUrl(Blockly.Msg.CONTROLS_IF_HELPURL);
     this.setColour(getColour().logic);
-        this.appendValueInput('IF0')
-            .setCheck(Types.getCompatibleTypes('boolean'))
+    this.appendValueInput("IF0")
+      .setCheck(Types.getCompatibleTypes("boolean"))
       .appendField(Blockly.Msg.CONTROLS_IF_MSG_IF);
-        this.appendStatementInput('DO0')
-            .appendField(Blockly.Msg.CONTROLS_IF_MSG_THEN);
+    this.appendStatementInput("DO0").appendField(
+      Blockly.Msg.CONTROLS_IF_MSG_THEN
+    );
     this.setPreviousStatement(true);
     this.setNextStatement(true);
-        this.setMutator(new Blockly.Mutator(['controls_if_elseif',
-            'controls_if_else']));
-        // Assign 'this' to a variable for use in the tooltip closure below.
-        var thisBlock = this;
-        this.setTooltip(function () {
-            if (!thisBlock.elseifCount_ && !thisBlock.elseCount_) {
-                return Blockly.Msg.CONTROLS_IF_TOOLTIP_1;
-            } else if (!thisBlock.elseifCount_ && thisBlock.elseCount_) {
-                return Blockly.Msg.CONTROLS_IF_TOOLTIP_2;
-            } else if (thisBlock.elseifCount_ && !thisBlock.elseCount_) {
-                return Blockly.Msg.CONTROLS_IF_TOOLTIP_3;
-            } else if (thisBlock.elseifCount_ && thisBlock.elseCount_) {
-                return Blockly.Msg.CONTROLS_IF_TOOLTIP_4;
-            }
-            return '';
-        });
+    this.setMutator(
+      new Blockly.Mutator(["controls_if_elseif", "controls_if_else"])
+    );
+    this.setTooltip(Blockly.Msg.CONTROLS_IF_TOOLTIP_1);
     this.elseifCount_ = 0;
     this.elseCount_ = 0;
   },
@@ -48,12 +35,12 @@ Blockly.Blocks['controls_if'] = {
     if (!this.elseifCount_ && !this.elseCount_) {
       return null;
     }
-        var container = document.createElement('mutation');
+    var container = document.createElement("mutation");
     if (this.elseifCount_) {
-            container.setAttribute('elseif', this.elseifCount_);
+      container.setAttribute("elseif", this.elseifCount_);
     }
     if (this.elseCount_) {
-            container.setAttribute('else', 1);
+      container.setAttribute("else", 1);
     }
     return container;
   },
@@ -63,8 +50,8 @@ Blockly.Blocks['controls_if'] = {
    * @this Blockly.Block
    */
   domToMutation: function (xmlElement) {
-        this.elseifCount_ = parseInt(xmlElement.getAttribute('elseif'), 10) || 0;
-        this.elseCount_ = parseInt(xmlElement.getAttribute('else'), 10) || 0;
+    this.elseifCount_ = parseInt(xmlElement.getAttribute("elseif"), 10) || 0;
+    this.elseCount_ = parseInt(xmlElement.getAttribute("else"), 10) || 0;
     this.updateShape_();
   },
   /**
@@ -74,17 +61,17 @@ Blockly.Blocks['controls_if'] = {
    * @this Blockly.Block
    */
   decompose: function (workspace) {
-        var containerBlock = workspace.newBlock('controls_if_if');
+    var containerBlock = workspace.newBlock("controls_if_if");
     containerBlock.initSvg();
     var connection = containerBlock.nextConnection;
     for (var i = 1; i <= this.elseifCount_; i++) {
-            var elseifBlock = workspace.newBlock('controls_if_elseif');
+      var elseifBlock = workspace.newBlock("controls_if_elseif");
       elseifBlock.initSvg();
       connection.connect(elseifBlock.previousConnection);
       connection = elseifBlock.nextConnection;
     }
     if (this.elseCount_) {
-            var elseBlock = workspace.newBlock('controls_if_else');
+      var elseBlock = workspace.newBlock("controls_if_else");
       elseBlock.initSvg();
       connection.connect(elseBlock.previousConnection);
     }
@@ -105,28 +92,28 @@ Blockly.Blocks['controls_if'] = {
     var elseStatementConnection = null;
     while (clauseBlock) {
       switch (clauseBlock.type) {
-                case 'controls_if_elseif':
+        case "controls_if_elseif":
           this.elseifCount_++;
           valueConnections.push(clauseBlock.valueConnection_);
           statementConnections.push(clauseBlock.statementConnection_);
           break;
-                case 'controls_if_else':
+        case "controls_if_else":
           this.elseCount_++;
           elseStatementConnection = clauseBlock.statementConnection_;
           break;
         default:
-                    throw new Error('Unknown block type.');
+          throw new Error("Unknown block type.");
       }
-            clauseBlock = clauseBlock.nextConnection &&
-                clauseBlock.nextConnection.targetBlock();
+      clauseBlock =
+        clauseBlock.nextConnection && clauseBlock.nextConnection.targetBlock();
     }
     this.updateShape_();
     // Reconnect any child blocks.
     for (var i = 1; i <= this.elseifCount_; i++) {
-            Blockly.Mutator.reconnect(valueConnections[i], this, 'IF' + i);
-            Blockly.Mutator.reconnect(statementConnections[i], this, 'DO' + i);
+      Blockly.Mutator.reconnect(valueConnections[i], this, "IF" + i);
+      Blockly.Mutator.reconnect(statementConnections[i], this, "DO" + i);
     }
-        Blockly.Mutator.reconnect(elseStatementConnection, this, 'ELSE');
+    Blockly.Mutator.reconnect(elseStatementConnection, this, "ELSE");
   },
   /**
    * Store pointers to any connected child blocks.
@@ -139,25 +126,25 @@ Blockly.Blocks['controls_if'] = {
     var inputDo;
     while (clauseBlock) {
       switch (clauseBlock.type) {
-                case 'controls_if_elseif':
-                    var inputIf = this.getInput('IF' + i);
-                    inputDo = this.getInput('DO' + i);
+        case "controls_if_elseif":
+          var inputIf = this.getInput("IF" + i);
+          inputDo = this.getInput("DO" + i);
           clauseBlock.valueConnection_ =
             inputIf && inputIf.connection.targetConnection;
           clauseBlock.statementConnection_ =
             inputDo && inputDo.connection.targetConnection;
           i++;
           break;
-                case 'controls_if_else':
-                    inputDo = this.getInput('ELSE');
+        case "controls_if_else":
+          inputDo = this.getInput("ELSE");
           clauseBlock.statementConnection_ =
             inputDo && inputDo.connection.targetConnection;
           break;
         default:
-                    throw new Error('Unknown block type.');
+          throw new Error("Unknown block type.");
       }
-            clauseBlock = clauseBlock.nextConnection &&
-                clauseBlock.nextConnection.targetBlock();
+      clauseBlock =
+        clauseBlock.nextConnection && clauseBlock.nextConnection.targetBlock();
     }
   },
   /**
@@ -167,290 +154,296 @@ Blockly.Blocks['controls_if'] = {
    */
   updateShape_: function () {
     // Delete everything.
-        if (this.getInput('ELSE')) {
-            this.removeInput('ELSE');
+    if (this.getInput("ELSE")) {
+      this.removeInput("ELSE");
     }
     var j = 1;
-        while (this.getInput('IF' + j)) {
-            this.removeInput('IF' + j);
-            this.removeInput('DO' + j);
+    while (this.getInput("IF" + j)) {
+      this.removeInput("IF" + j);
+      this.removeInput("DO" + j);
       j++;
     }
     // Rebuild block.
     for (var i = 1; i <= this.elseifCount_; i++) {
-            this.appendValueInput('IF' + i)
-                .setCheck(Types.getCompatibleTypes('boolean'))
+      this.appendValueInput("IF" + i)
+        .setCheck(Types.getCompatibleTypes("boolean"))
         .appendField(Blockly.Msg.CONTROLS_IF_MSG_ELSEIF);
-            this.appendStatementInput('DO' + i)
-                .appendField(Blockly.Msg.CONTROLS_IF_MSG_THEN);
+      this.appendStatementInput("DO" + i).appendField(
+        Blockly.Msg.CONTROLS_IF_MSG_THEN
+      );
     }
     if (this.elseCount_) {
-            this.appendStatementInput('ELSE')
-                .appendField(Blockly.Msg.CONTROLS_IF_MSG_ELSE);
-        }
+      this.appendStatementInput("ELSE").appendField(
+        Blockly.Msg.CONTROLS_IF_MSG_ELSE
+      );
     }
+  },
 };
 
-Blockly.Blocks['controls_if_if'] = {
+Blockly.Blocks["controls_if_if"] = {
   /**
    * Mutator block for if container.
    * @this Blockly.Block
    */
   init: function () {
     this.setColour(getColour().logic);
-        this.appendDummyInput()
-            .appendField(Blockly.Msg.CONTROLS_IF_IF_TITLE_IF);
+    this.appendDummyInput().appendField(Blockly.Msg.CONTROLS_IF_IF_TITLE_IF);
     this.setNextStatement(true);
     this.setTooltip(Blockly.Msg.CONTROLS_IF_IF_TOOLTIP);
     this.contextMenu = false;
-    }
+  },
 };
 
-Blockly.Blocks['controls_if_elseif'] = {
+Blockly.Blocks["controls_if_elseif"] = {
   /**
    * Mutator bolck for else-if condition.
    * @this Blockly.Block
    */
   init: function () {
     this.setColour(getColour().logic);
-        this.appendDummyInput()
-            .appendField(Blockly.Msg.CONTROLS_IF_ELSEIF_TITLE_ELSEIF);
+    this.appendDummyInput().appendField(
+      Blockly.Msg.CONTROLS_IF_ELSEIF_TITLE_ELSEIF
+    );
     this.setPreviousStatement(true);
     this.setNextStatement(true);
     this.setTooltip(Blockly.Msg.CONTROLS_IF_ELSEIF_TOOLTIP);
     this.contextMenu = false;
-    }
+  },
 };
 
-Blockly.Blocks['controls_if_else'] = {
+Blockly.Blocks["controls_if_else"] = {
   /**
    * Mutator block for else condition.
    * @this Blockly.Block
    */
   init: function () {
     this.setColour(getColour().logic);
-        this.appendDummyInput()
-            .appendField(Blockly.Msg.CONTROLS_IF_ELSE_TITLE_ELSE);
+    this.appendDummyInput().appendField(
+      Blockly.Msg.CONTROLS_IF_ELSE_TITLE_ELSE
+    );
     this.setPreviousStatement(true);
     this.setTooltip(Blockly.Msg.CONTROLS_IF_ELSE_TOOLTIP);
     this.contextMenu = false;
-    }
+  },
 };
 
-
-Blockly.defineBlocksWithJsonArray([  // BEGIN JSON EXTRACT
+Blockly.defineBlocksWithJsonArray([
+  // BEGIN JSON EXTRACT
   // Block for boolean data type: true and false.
   {
-        "type": "logic_boolean",
-        "message0": "%1",
-        "args0": [
+    type: "logic_boolean",
+    message0: "%1",
+    args0: [
       {
-                "type": "field_dropdown",
-                "name": "BOOL",
-                "options": [
+        type: "field_dropdown",
+        name: "BOOL",
+        options: [
           ["%{BKY_LOGIC_BOOLEAN_TRUE}", "TRUE"],
-                    ["%{BKY_LOGIC_BOOLEAN_FALSE}", "FALSE"]
-                ]
-            }
+          ["%{BKY_LOGIC_BOOLEAN_FALSE}", "FALSE"],
         ],
-        "output": Types.BOOLEAN.typeName,
-        "style": "logic_blocks",
-        "tooltip": "%{BKY_LOGIC_BOOLEAN_TOOLTIP}",
-        "helpUrl": "%{BKY_LOGIC_BOOLEAN_HELPURL}"
+      },
+    ],
+    output: Types.BOOLEAN.typeName,
+    style: "logic_blocks",
+    tooltip: "%{BKY_LOGIC_BOOLEAN_TOOLTIP}",
+    helpUrl: "%{BKY_LOGIC_BOOLEAN_HELPURL}",
   },
   {
-        "type": "controls_ifelse",
-        "message0": "%{BKY_CONTROLS_IF_MSG_IF} %1",
-        "args0": [
+    type: "controls_ifelse",
+    message0: "%{BKY_CONTROLS_IF_MSG_IF} %1",
+    args0: [
       {
-                "type": "input_value",
-                "name": "IF0",
-                "check": Types.getCompatibleTypes('boolean')
-            }
+        type: "input_value",
+        name: "IF0",
+        check: Types.getCompatibleTypes("boolean"),
+      },
     ],
-        "message1": "%{BKY_CONTROLS_IF_MSG_THEN} %1",
-        "args1": [
+    message1: "%{BKY_CONTROLS_IF_MSG_THEN} %1",
+    args1: [
       {
-                "type": "input_statement",
-                "name": "DO0"
-            }
+        type: "input_statement",
+        name: "DO0",
+      },
     ],
-        "message2": "%{BKY_CONTROLS_IF_MSG_ELSE} %1",
-        "args2": [
+    message2: "%{BKY_CONTROLS_IF_MSG_ELSE} %1",
+    args2: [
       {
-                "type": "input_statement",
-                "name": "ELSE"
-            }
+        type: "input_statement",
+        name: "ELSE",
+      },
     ],
-        "previousStatement": null,
-        "nextStatement": null,
-        "style": "logic_blocks",
-        "tooltip": "%{BKYCONTROLS_IF_TOOLTIP_2}",
-        "helpUrl": "%{BKY_CONTROLS_IF_HELPURL}",
-        "extensions": ["controls_if_tooltip"]
+    previousStatement: null,
+    nextStatement: null,
+    style: "logic_blocks",
+    tooltip: "%{BKYCONTROLS_IF_TOOLTIP_2}",
+    helpUrl: "%{BKY_CONTROLS_IF_HELPURL}",
+    extensions: ["controls_if_tooltip"],
   },
   // Block for comparison operator.
   {
-        "type": "logic_compare",
-        "message0": "%1 %2 %3",
-        "args0": [
+    type: "logic_compare",
+    message0: "%1 %2 %3",
+    args0: [
       {
-                "type": "input_value",
-                "name": "A"
+        type: "input_value",
+        name: "A",
       },
       {
-                "type": "field_dropdown",
-                "name": "OP",
-                "options": [
+        type: "field_dropdown",
+        name: "OP",
+        options: [
           ["=", "EQ"],
           ["\u2260", "NEQ"],
           ["\u200F<", "LT"],
           ["\u200F\u2264", "LTE"],
           ["\u200F>", "GT"],
-                    ["\u200F\u2265", "GTE"]
-                ]
+          ["\u200F\u2265", "GTE"],
+        ],
       },
       {
-                "type": "input_value",
-                "name": "B"
-            }
+        type: "input_value",
+        name: "B",
+      },
     ],
-        "inputsInline": true,
-        "output": Types.BOOLEAN.typeName,
-        "style": "logic_blocks",
-        "helpUrl": "%{BKY_LOGIC_COMPARE_HELPURL}",
-        "extensions": ["logic_compare", "logic_op_tooltip"]
+    inputsInline: true,
+    output: Types.BOOLEAN.typeName,
+    style: "logic_blocks",
+    helpUrl: "%{BKY_LOGIC_COMPARE_HELPURL}",
+    extensions: ["logic_compare", "logic_op_tooltip"],
   },
   // Block for logical operations: 'and', 'or'.
   {
-        "type": "logic_operation",
-        "message0": "%1 %2 %3",
-        "args0": [
+    type: "logic_operation",
+    message0: "%1 %2 %3",
+    args0: [
       {
-                "type": "input_value",
-                "name": "A",
-                "check": Types.getCompatibleTypes('boolean')
+        type: "input_value",
+        name: "A",
+        check: Types.getCompatibleTypes("boolean"),
       },
       {
-                "type": "field_dropdown",
-                "name": "OP",
-                "options": [
+        type: "field_dropdown",
+        name: "OP",
+        options: [
           ["%{BKY_LOGIC_OPERATION_AND}", "AND"],
-                    ["%{BKY_LOGIC_OPERATION_OR}", "OR"]
-                ]
+          ["%{BKY_LOGIC_OPERATION_OR}", "OR"],
+        ],
       },
       {
-                "type": "input_value",
-                "name": "B",
-                "check": Types.getCompatibleTypes('boolean')
-            }
+        type: "input_value",
+        name: "B",
+        check: Types.getCompatibleTypes("boolean"),
+      },
     ],
-        "inputsInline": true,
-        "output": Types.BOOLEAN.typeName,
-        "style": "logic_blocks",
-        "helpUrl": "%{BKY_LOGIC_OPERATION_HELPURL}",
-        "extensions": ["logic_op_tooltip"]
+    inputsInline: true,
+    output: Types.BOOLEAN.typeName,
+    style: "logic_blocks",
+    helpUrl: "%{BKY_LOGIC_OPERATION_HELPURL}",
+    extensions: ["logic_op_tooltip"],
   },
   // Block for negation.
   {
-        "type": "logic_negate",
-        "message0": "%{BKY_LOGIC_NEGATE_TITLE}",
-        "args0": [
+    type: "logic_negate",
+    message0: "%{BKY_LOGIC_NEGATE_TITLE}",
+    args0: [
       {
-                "type": "input_value",
-                "name": "BOOL",
-                "check": Types.getCompatibleTypes('boolean'),
-            }
+        type: "input_value",
+        name: "BOOL",
+        check: Types.getCompatibleTypes("boolean"),
+      },
     ],
-        "output": Types.BOOLEAN.typeName,
-        "style": "logic_blocks",
-        "tooltip": "%{BKY_LOGIC_NEGATE_TOOLTIP}",
-        "helpUrl": "%{BKY_LOGIC_NEGATE_HELPURL}"
+    output: Types.BOOLEAN.typeName,
+    style: "logic_blocks",
+    tooltip: "%{BKY_LOGIC_NEGATE_TOOLTIP}",
+    helpUrl: "%{BKY_LOGIC_NEGATE_HELPURL}",
   },
   // Block for null data type.
   {
-        "type": "logic_null",
-        "message0": "%{BKY_LOGIC_NULL}",
-        "output": null,
-        "style": "logic_blocks",
-        "tooltip": "%{BKY_LOGIC_NULL_TOOLTIP}",
-        "helpUrl": "%{BKY_LOGIC_NULL_HELPURL}"
+    type: "logic_null",
+    message0: "%{BKY_LOGIC_NULL}",
+    output: null,
+    style: "logic_blocks",
+    tooltip: "%{BKY_LOGIC_NULL_TOOLTIP}",
+    helpUrl: "%{BKY_LOGIC_NULL_HELPURL}",
   },
   // Block for ternary operator.
   {
-        "type": "logic_ternary",
-        "message0": "%{BKY_LOGIC_TERNARY_CONDITION} %1",
-        "args0": [
+    type: "logic_ternary",
+    message0: "%{BKY_LOGIC_TERNARY_CONDITION} %1",
+    args0: [
       {
-                "type": "input_value",
-                "name": "IF",
-                "check": Types.getCompatibleTypes('boolean'),
-            }
+        type: "input_value",
+        name: "IF",
+        check: Types.getCompatibleTypes("boolean"),
+      },
     ],
-        "message1": "%{BKY_LOGIC_TERNARY_IF_TRUE} %1",
-        "args1": [
+    message1: "%{BKY_LOGIC_TERNARY_IF_TRUE} %1",
+    args1: [
       {
-                "type": "input_value",
-                "name": "THEN",
-                "check": Types.getCompatibleTypes('boolean'),
-            }
+        type: "input_value",
+        name: "THEN",
+        check: Types.getCompatibleTypes("boolean"),
+      },
     ],
-        "message2": "%{BKY_LOGIC_TERNARY_IF_FALSE} %1",
-        "args2": [
+    message2: "%{BKY_LOGIC_TERNARY_IF_FALSE} %1",
+    args2: [
       {
-                "type": "input_value",
-                "name": "ELSE",
-                "check": Types.getCompatibleTypes('boolean'),
-            }
+        type: "input_value",
+        name: "ELSE",
+        check: Types.getCompatibleTypes("boolean"),
+      },
     ],
-        "output": null,
-        "style": "logic_blocks",
-        "tooltip": "%{BKY_LOGIC_TERNARY_TOOLTIP}",
-        "helpUrl": "%{BKY_LOGIC_TERNARY_HELPURL}",
-        "extensions": ["logic_ternary"]
-    }
+    output: null,
+    style: "logic_blocks",
+    tooltip: "%{BKY_LOGIC_TERNARY_TOOLTIP}",
+    helpUrl: "%{BKY_LOGIC_TERNARY_HELPURL}",
+    extensions: ["logic_ternary"],
+  },
 ]); // END JSON EXTRACT (Do not delete this comment.)
 
-
-Blockly.Blocks['logic_compare'] = {
+Blockly.Blocks["logic_compare"] = {
   /**
    * Block for comparison operator.
    * @this Blockly.Block
    */
   init: function () {
-        var OPERATORS = this.RTL ? [
-            ['=', 'EQ'],
-            ['\u2260', 'NEQ'],
-            ['>', 'LT'],
-            ['\u2265', 'LTE'],
-            ['<', 'GT'],
-            ['\u2264', 'GTE']
-        ] : [
-                ['=', 'EQ'],
-                ['\u2260', 'NEQ'],
-                ['<', 'LT'],
-                ['\u2264', 'LTE'],
-                ['>', 'GT'],
-                ['\u2265', 'GTE']
+    var OPERATORS = this.RTL
+      ? [
+          ["=", "EQ"],
+          ["\u2260", "NEQ"],
+          [">", "LT"],
+          ["\u2265", "LTE"],
+          ["<", "GT"],
+          ["\u2264", "GTE"],
+        ]
+      : [
+          ["=", "EQ"],
+          ["\u2260", "NEQ"],
+          ["<", "LT"],
+          ["\u2264", "LTE"],
+          [">", "GT"],
+          ["\u2265", "GTE"],
         ];
     this.setHelpUrl(Blockly.Msg.LOGIC_COMPARE_HELPURL);
     this.setColour(getColour().logic);
     this.setOutput(true, Types.BOOLEAN.typeName);
-        this.appendValueInput('A');
-        this.appendValueInput('B')
-            .appendField(new Blockly.FieldDropdown(OPERATORS), 'OP');
+    this.appendValueInput("A");
+    this.appendValueInput("B").appendField(
+      new Blockly.FieldDropdown(OPERATORS),
+      "OP"
+    );
     this.setInputsInline(true);
     // Assign 'this' to a variable for use in the tooltip closure below.
     var thisBlock = this;
     this.setTooltip(function () {
-            var op = thisBlock.getFieldValue('OP');
+      var op = thisBlock.getFieldValue("OP");
       var TOOLTIPS = {
-                'EQ': Blockly.Msg.LOGIC_COMPARE_TOOLTIP_EQ,
-                'NEQ': Blockly.Msg.LOGIC_COMPARE_TOOLTIP_NEQ,
-                'LT': Blockly.Msg.LOGIC_COMPARE_TOOLTIP_LT,
-                'LTE': Blockly.Msg.LOGIC_COMPARE_TOOLTIP_LTE,
-                'GT': Blockly.Msg.LOGIC_COMPARE_TOOLTIP_GT,
-                'GTE': Blockly.Msg.LOGIC_COMPARE_TOOLTIP_GTE
+        EQ: Blockly.Msg.LOGIC_COMPARE_TOOLTIP_EQ,
+        NEQ: Blockly.Msg.LOGIC_COMPARE_TOOLTIP_NEQ,
+        LT: Blockly.Msg.LOGIC_COMPARE_TOOLTIP_LT,
+        LTE: Blockly.Msg.LOGIC_COMPARE_TOOLTIP_LTE,
+        GT: Blockly.Msg.LOGIC_COMPARE_TOOLTIP_GT,
+        GTE: Blockly.Msg.LOGIC_COMPARE_TOOLTIP_GTE,
       };
       return TOOLTIPS[op];
     });
@@ -462,37 +455,43 @@ Blockly.Blocks['logic_compare'] = {
    * @this Blockly.Block
    */
   onchange: function (e) {
-        var blockA = this.getInputTargetBlock('A');
-        var blockB = this.getInputTargetBlock('B');
+    var blockA = this.getInputTargetBlock("A");
+    var blockB = this.getInputTargetBlock("B");
     if (blockA === null && blockB === null) {
-            this.getInput('A').setCheck(null);
-            this.getInput('B').setCheck(null);
+      this.getInput("A").setCheck(null);
+      this.getInput("B").setCheck(null);
     }
     if (blockA !== null && blockB === null) {
-            this.getInput('A').setCheck(getCompatibleTypes(blockA.outputConnection.check_[0]));
-            this.getInput('B').setCheck(getCompatibleTypes(blockA.outputConnection.check_[0]));
+      this.getInput("A").setCheck(
+        getCompatibleTypes(blockA.outputConnection.check_[0])
+      );
+      this.getInput("B").setCheck(
+        getCompatibleTypes(blockA.outputConnection.check_[0])
+      );
     }
     if (blockB !== null && blockA === null) {
-            this.getInput('B').setCheck(getCompatibleTypes(blockB.outputConnection.check_[0]));
-            this.getInput('A').setCheck(getCompatibleTypes(blockB.outputConnection.check_[0]));
-        }
+      this.getInput("B").setCheck(
+        getCompatibleTypes(blockB.outputConnection.check_[0])
+      );
+      this.getInput("A").setCheck(
+        getCompatibleTypes(blockB.outputConnection.check_[0])
+      );
     }
+  },
 };
 
-
-Blockly.Blocks['switch_case'] = {
+Blockly.Blocks["switch_case"] = {
   init: function () {
     this.setColour(getColour().logic);
     this.setPreviousStatement(true);
     this.setTooltip(Blockly.Msg.cases_tooltip);
     this.setNextStatement(true);
-        this.appendValueInput('CONDITION')
-            .appendField(Blockly.Msg.cases_switch);
-        this.appendValueInput('CASECONDITION0')
-            .appendField(Blockly.Msg.cases_condition);
-        this.appendStatementInput('CASE0')
-            .appendField(Blockly.Msg.cases_do);
-        this.setMutator(new Blockly.Mutator(['case_incaseof', 'case_default']));
+    this.appendValueInput("CONDITION").appendField(Blockly.Msg.cases_switch);
+    this.appendValueInput("CASECONDITION0").appendField(
+      Blockly.Msg.cases_condition
+    );
+    this.appendStatementInput("CASE0").appendField(Blockly.Msg.cases_do);
+    this.setMutator(new Blockly.Mutator(["case_incaseof", "case_default"]));
     this.caseCount_ = 0;
     this.defaultCount_ = 0;
   },
@@ -501,43 +500,42 @@ Blockly.Blocks['switch_case'] = {
     if (!this.caseCount_ && !this.defaultCount_) {
       return null;
     }
-        var container = document.createElement('mutation');
+    var container = document.createElement("mutation");
     if (this.caseCount_) {
-            container.setAttribute('case', this.caseCount_);
+      container.setAttribute("case", this.caseCount_);
     }
     if (this.defaultCount_) {
-            container.setAttribute('default', 1);
+      container.setAttribute("default", 1);
     }
     return container;
   },
 
   domToMutation: function (xmlElement) {
-        this.caseCount_ = parseInt(xmlElement.getAttribute('case'), 10);
-        this.defaultCount_ = parseInt(xmlElement.getAttribute('default'), 10);
+    this.caseCount_ = parseInt(xmlElement.getAttribute("case"), 10);
+    this.defaultCount_ = parseInt(xmlElement.getAttribute("default"), 10);
     for (var x = 0; x <= this.caseCount_; x++) {
-            this.appendValueInput('CASECONDITION' + x)
-                .appendField(Blockly.Msg.cases_condition);
-            this.appendStatementInput('CASE' + x)
-                .appendField(Blockly.Msg.cases_do);
+      this.appendValueInput("CASECONDITION" + x).appendField(
+        Blockly.Msg.cases_condition
+      );
+      this.appendStatementInput("CASE" + x).appendField(Blockly.Msg.cases_do);
     }
     if (this.defaultCount_) {
-            this.appendStatementInput('ONDEFAULT')
-                .appendField('default');
+      this.appendStatementInput("ONDEFAULT").appendField("default");
     }
   },
 
   decompose: function (workspace) {
-        var containerBlock = workspace.newBlock('control_case');
+    var containerBlock = workspace.newBlock("control_case");
     containerBlock.initSvg();
-        var connection = containerBlock.getInput('STACK').connection;
+    var connection = containerBlock.getInput("STACK").connection;
     for (var x = 1; x <= this.caseCount_; x++) {
-            var caseBlock = workspace.newBlock('case_incaseof');
+      var caseBlock = workspace.newBlock("case_incaseof");
       caseBlock.initSvg();
       connection.connect(caseBlock.previousConnection);
       connection = caseBlock.nextConnection;
     }
     if (this.defaultCount_) {
-            var defaultBlock = Blockly.Block.obtain(workspace, 'case_default');
+      var defaultBlock = Blockly.Block.obtain(workspace, "case_default");
       defaultBlock.initSvg();
       connection.connect(defaultBlock.previousConnection);
     }
@@ -547,23 +545,25 @@ Blockly.Blocks['switch_case'] = {
   compose: function (containerBlock) {
     //Disconnect all input blocks and remove all inputs.
     if (this.defaultCount_) {
-            this.removeInput('ONDEFAULT');
+      this.removeInput("ONDEFAULT");
     }
     this.defaultCount_ = 0;
     for (var x = this.caseCount_; x > 0; x--) {
-            this.removeInput('CASECONDITION' + x);
-            this.removeInput('CASE' + x);
+      this.removeInput("CASECONDITION" + x);
+      this.removeInput("CASE" + x);
     }
     this.caseCount_ = 0;
-        var caseBlock = containerBlock.getInputTargetBlock('STACK');
+    var caseBlock = containerBlock.getInputTargetBlock("STACK");
     while (caseBlock) {
       switch (caseBlock.type) {
-                case 'case_incaseof':
+        case "case_incaseof":
           this.caseCount_++;
-                    var caseconditionInput = this.appendValueInput('CASECONDITION' + this.caseCount_)
-                        .appendField(Blockly.Msg.cases_condition);
-                    var caseInput = this.appendStatementInput('CASE' + this.caseCount_)
-                        .appendField(Blockly.Msg.cases_do);
+          var caseconditionInput = this.appendValueInput(
+            "CASECONDITION" + this.caseCount_
+          ).appendField(Blockly.Msg.cases_condition);
+          var caseInput = this.appendStatementInput(
+            "CASE" + this.caseCount_
+          ).appendField(Blockly.Msg.cases_do);
           if (caseBlock.valueConnection_) {
             caseconditionInput.connection.connect(caseBlock.valueConnection_);
           }
@@ -571,78 +571,81 @@ Blockly.Blocks['switch_case'] = {
             caseInput.connection.connect(caseBlock.statementConnection_);
           }
           break;
-                case 'case_default':
+        case "case_default":
           this.defaultCount_++;
-                    var defaultInput = this.appendStatementInput('ONDEFAULT')
-                        .appendField('default');
+          var defaultInput =
+            this.appendStatementInput("ONDEFAULT").appendField("default");
           if (caseBlock.statementConnection_) {
             defaultInput.connection.connect(caseBlock.statementConnection_);
           }
           break;
         default:
-                    throw new Error('Unknown block type.');
+          throw new Error("Unknown block type.");
       }
-            caseBlock = caseBlock.nextConnection &&
-                caseBlock.nextConnection.targetBlock();
+      caseBlock =
+        caseBlock.nextConnection && caseBlock.nextConnection.targetBlock();
     }
   },
 
   saveConnections: function (containerBlock) {
-        var caseBlock = containerBlock.getInputTargetBlock('STACK');
+    var caseBlock = containerBlock.getInputTargetBlock("STACK");
     var x = 1;
     while (caseBlock) {
       switch (caseBlock.type) {
-                case 'case_incaseof':
-                    var caseconditionInput = this.getInput('CASECONDITION' + x);
-                    var caseInput = this.getInput('CASE' + x);
-                    caseBlock.valueConnection_ = caseconditionInput && caseconditionInput.connection.targetConnection;
-                    caseBlock.statementConnection_ = caseInput && caseInput.connection.targetConnection;
+        case "case_incaseof":
+          var caseconditionInput = this.getInput("CASECONDITION" + x);
+          var caseInput = this.getInput("CASE" + x);
+          caseBlock.valueConnection_ =
+            caseconditionInput &&
+            caseconditionInput.connection.targetConnection;
+          caseBlock.statementConnection_ =
+            caseInput && caseInput.connection.targetConnection;
           x++;
           break;
-                case 'case_default':
-                    var defaultInput = this.getInput('ONDEFAULT');
-                    caseBlock.satementConnection_ = defaultInput && defaultInput.connection.targetConnection;
+        case "case_default":
+          var defaultInput = this.getInput("ONDEFAULT");
+          caseBlock.satementConnection_ =
+            defaultInput && defaultInput.connection.targetConnection;
           break;
         default:
-                    throw new Error('Unknown block type');
-            }
-            caseBlock = caseBlock.nextConnection &&
-                caseBlock.nextConnection.targetBlock();
+          throw new Error("Unknown block type");
       }
+      caseBlock =
+        caseBlock.nextConnection && caseBlock.nextConnection.targetBlock();
     }
+  },
 };
 
-Blockly.Blocks['control_case'] = {
+Blockly.Blocks["control_case"] = {
   init: function () {
     this.setColour(getColour().logic);
-        this.appendDummyInput()
-            .appendField(Blockly.Msg.cases_switch);
-        this.appendStatementInput('STACK');
-        this.setTooltip('--Placeholder--');
+    this.appendDummyInput().appendField(Blockly.Msg.cases_switch);
+    this.appendStatementInput("STACK");
+    this.setTooltip("--Placeholder--");
     this.contextMenu = false;
-    }
+  },
 };
 
-Blockly.Blocks['case_incaseof'] = {
+Blockly.Blocks["case_incaseof"] = {
   init: function () {
     this.setColour(getColour().logic);
-        this.appendDummyInput()
-            .appendField(Blockly.Msg.cases_add);
+    this.appendDummyInput().appendField(Blockly.Msg.cases_add);
     this.setPreviousStatement(true);
     this.setNextStatement(true);
-        this.setTooltip('--Placeholder--');
+    this.setTooltip("--Placeholder--");
     this.contextMenu = false;
-    }
+  },
 };
 
-Blockly.Blocks['case_default'] = {
+Blockly.Blocks["case_default"] = {
   init: function () {
     this.setColour(getColour().logic);
-        this.appendValueInput('default')
-            .appendField('default');
+    this.appendValueInput("default").appendField("default");
     this.setPreviousStatement(true);
     this.setNextStatement(false);
-        this.setTooltip('This function will run if there aren\'t any matching cases.');
+    this.setTooltip(
+      "This function will run if there aren't any matching cases."
+    );
     this.contextMenu = false;
-    }
+  },
 };

src/components/Blockly/blocks/map.js

@@ -11,32 +11,31 @@
  * TODO: This block can be improved to set the new range properly.
  */
 
+import * as Blockly from "blockly/core";
+import { getColour } from "../helpers/colour";
+import * as Types from "../helpers/types";
 
-import * as Blockly from 'blockly/core';
-import { getColour } from '../helpers/colour';
-import * as Types from '../helpers/types'
-
-Blockly.Blocks['base_map'] = {
+Blockly.Blocks["base_map"] = {
   /**
    * Block for creating a the map function.
    * @this Blockly.Block
    */
   init: function () {
-        this.setHelpUrl('http://arduino.cc/en/Reference/map');
+    this.setHelpUrl("http://arduino.cc/en/Reference/map");
     this.setColour(getColour().math);
-        this.appendValueInput('NUM')
+    this.appendValueInput("NUM")
       .appendField(Blockly.Msg.ARD_MAP)
       .setCheck(Types.NUMBER.compatibleTypes);
-        this.appendValueInput('FMIN')
+    this.appendValueInput("FMIN")
       .appendField(Blockly.Msg.ARD_MAP_FROMMIN)
       .setCheck(Types.NUMBER.compatibleTypes);
-        this.appendValueInput('FMAX')
+    this.appendValueInput("FMAX")
       .appendField(Blockly.Msg.ARD_MAP_FROMMAX)
       .setCheck(Types.NUMBER.compatibleTypes);
-        this.appendValueInput('DMIN')
+    this.appendValueInput("DMIN")
       .appendField(Blockly.Msg.ARD_MAP_TOMIN)
       .setCheck(Types.NUMBER.compatibleTypes);
-        this.appendValueInput('DMAX')
+    this.appendValueInput("DMAX")
       .appendField(Blockly.Msg.ARD_MAP_TOMAX)
       .setCheck(Types.NUMBER.compatibleTypes);
     this.setOutput(true);
@@ -45,6 +44,6 @@ Blockly.Blocks['base_map'] = {
   },
   /** @return {string} The type of return value for the block, an integer. */
   getBlockType: function () {
-        return Types.NUMBER.typeId;
-    }
+    return Types.NUMBER.typeName;
+  },
 };

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

@@ -4,6 +4,7 @@ import { getColour } from "../helpers/colour";
 Blockly.Blocks["sensebox_phyphox_init"] = {
   init: function () {
     this.setColour(getColour().phyphox);
+    this.setHelpUrl(Blockly.Msg.sensebox_phyphox_helpurl);
     this.appendDummyInput()
       .appendField(Blockly.Msg.sensebox_phyphox_init)
       .appendField(new Blockly.FieldTextInput("Geräte Name"), "devicename");
@@ -37,6 +38,7 @@ Blockly.Blocks["sensebox_phyphox_experiment"] = {
     this.setPreviousStatement(true, null);
     this.setNextStatement(true, null);
     this.setTooltip(Blockly.Msg.sensebox_phyphox_experiment_tooltip);
+    this.setHelpUrl(Blockly.Msg.sensebox_phyphox_helpurl);
   },
 };
 
@@ -63,8 +65,8 @@ Blockly.Blocks["sensebox_phyphox_graph"] = {
       .appendField(Blockly.Msg.sensebox_phyphox_graphStyle)
       .appendField(
         new Blockly.FieldDropdown([
-          [Blockly.Msg.sensebox_phyphox_style_dots, "dots"],
           [Blockly.Msg.sensebox_phyphox_style_line, "line"],
+          [Blockly.Msg.sensebox_phyphox_style_dots, "dots"],
         ]),
         "style"
       );
@@ -77,6 +79,7 @@ Blockly.Blocks["sensebox_phyphox_graph"] = {
     this.setPreviousStatement(true, null);
     this.setNextStatement(true, null);
     this.setTooltip(Blockly.Msg.sensebox_phyphox_graph_tooltip);
+    this.setHelpUrl(Blockly.Msg.sensebox_phyphox_helpurl);
   },
 };
 
@@ -86,6 +89,7 @@ Blockly.Blocks["sensebox_phyphox_timestamp"] = {
     this.appendDummyInput().appendField(Blockly.Msg.sensebox_phyphox_timestamp);
     this.setOutput(true);
     this.setTooltip(Blockly.Msg.sensebox_phyphox_timestamp_tooltip);
+    this.setHelpUrl(Blockly.Msg.sensebox_phyphox_helpurl);
   },
 };
 
@@ -107,6 +111,7 @@ Blockly.Blocks["sensebox_phyphox_channel"] = {
 
     this.setOutput(true);
     this.setTooltip(Blockly.Msg.sensebox_phyphox_channel_tooltip);
+    this.setHelpUrl(Blockly.Msg.sensebox_phyphox_helpurl);
   },
 };
 
@@ -129,6 +134,7 @@ Blockly.Blocks["sensebox_phyphox_sendchannel"] = {
     this.setPreviousStatement(true, null);
     this.setNextStatement(true, null);
     this.setTooltip(Blockly.Msg.sensebox_phyphox_sendchannel_tooltip);
+    this.setHelpUrl(Blockly.Msg.sensebox_phyphox_helpurl);
   },
 };
 
@@ -141,5 +147,6 @@ Blockly.Blocks["sensebox_phyphox_experiment_send"] = {
     this.setPreviousStatement(true, null);
     this.setNextStatement(true, null);
     this.setTooltip(Blockly.Msg.sensebox_phyphox_experiment_send_tooltip);
+    this.setHelpUrl(Blockly.Msg.sensebox_phyphox_helpurl);
   },
 };

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

@@ -1,51 +1,59 @@
-import * as Blockly from 'blockly/core';
-import { getColour } from '../helpers/colour';
-import * as Types from '../helpers/types'
-import { FieldSlider } from '@blockly/field-slider';
+import * as Blockly from "blockly/core";
+import { getColour } from "../helpers/colour";
+import * as Types from "../helpers/types";
+import { FieldSlider } from "@blockly/field-slider";
 
-
-Blockly.Blocks['sensebox_display_beginDisplay'] = {
+Blockly.Blocks["sensebox_display_beginDisplay"] = {
   init: function () {
-        this.appendDummyInput()
-            .appendField(Blockly.Msg.senseBox_display_beginDisplay)
+    this.appendDummyInput().appendField(
+      Blockly.Msg.senseBox_display_beginDisplay
+    );
     this.setPreviousStatement(true, null);
     this.setNextStatement(true, null);
     this.setColour(getColour().sensebox);
     this.setTooltip(Blockly.Msg.senseBox_display_beginDisplay_tooltip);
     this.setHelpUrl(Blockly.Msg.senseBox_display_helpurl);
-    }
+  },
 };
 
-Blockly.Blocks['sensebox_display_clearDisplay'] = {
+Blockly.Blocks["sensebox_display_clearDisplay"] = {
   init: function () {
-        this.appendDummyInput()
-            .appendField(Blockly.Msg.senseBox_display_clearDisplay)
+    this.appendDummyInput().appendField(
+      Blockly.Msg.senseBox_display_clearDisplay
+    );
     this.setPreviousStatement(true, null);
     this.setNextStatement(true, null);
     this.setColour(getColour().sensebox);
     this.setTooltip(Blockly.Msg.senseBox_display_clearDisplay_tooltip);
     this.setHelpUrl(Blockly.Msg.senseBox_display_helpurl);
-    }
+  },
 };
 
-Blockly.Blocks['sensebox_display_printDisplay'] = {
+Blockly.Blocks["sensebox_display_printDisplay"] = {
   init: function (block) {
     this.setColour(getColour().sensebox);
-        this.appendDummyInput()
-            .appendField(Blockly.Msg.senseBox_display_printDisplay);
+    this.appendDummyInput().appendField(
+      Blockly.Msg.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");
+      .appendField(
+        new Blockly.FieldDropdown([
+          [Blockly.Msg.senseBox_display_white, "WHITE,BLACK"],
+          [Blockly.Msg.senseBox_display_black, "BLACK,WHITE"],
+        ]),
+        "COLOR"
+      );
     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");
+      .appendField(new FieldSlider(0, 0, 127), "X");
     this.appendDummyInput()
       .appendField(Blockly.Msg.senseBox_display_printDisplay_y)
-            .appendField(new FieldSlider(0, 0, 128), "Y");
-        this.appendValueInput('printDisplay')
+      .appendField(new FieldSlider(0, 0, 63), "Y");
+    this.appendValueInput("printDisplay")
       .appendField(Blockly.Msg.senseBox_display_printDisplay_value)
       .setCheck(null);
     this.setPreviousStatement(true, null);
@@ -76,26 +84,33 @@ Blockly.Blocks['sensebox_display_printDisplay'] = {
       this.setWarningText(Blockly.Msg.CONTROLS_FLOW_STATEMENTS_WARNING);
     }
   },
-    LOOP_TYPES: ['sensebox_display_show'],
+  LOOP_TYPES: ["sensebox_display_show"],
 };
 
-Blockly.Blocks['sensebox_display_fastPrint'] = {
+Blockly.Blocks["sensebox_display_fastPrint"] = {
   init: function (block) {
     this.setColour(getColour().sensebox);
-        this.appendDummyInput()
-            .appendField(Blockly.Msg.senseBox_display_fastPrint_show);
-        this.appendValueInput("Title1", 'Title1')
-            .appendField(Blockly.Msg.senseBox_display_fastPrint_title);
-        this.appendValueInput("Value1", 'Value1')
-            .appendField(Blockly.Msg.senseBox_display_fastPrint_value);
-        this.appendValueInput("Dimension1", 'Dimension1')
-            .appendField(Blockly.Msg.senseBox_display_fastPrint_dimension);
-        this.appendValueInput("Title2", 'Title2')
-            .appendField(Blockly.Msg.senseBox_display_fastPrint_title);
-        this.appendValueInput("Value2", 'Value2')
-            .appendField(Blockly.Msg.senseBox_display_fastPrint_value);
-        this.appendValueInput("Dimension2", 'Dimension2')
-            .appendField(Blockly.Msg.senseBox_display_fastPrint_dimension);
+    this.appendDummyInput().appendField(
+      Blockly.Msg.senseBox_display_fastPrint_show
+    );
+    this.appendValueInput("Title1", "Title1").appendField(
+      Blockly.Msg.senseBox_display_fastPrint_title
+    );
+    this.appendValueInput("Value1", "Value1").appendField(
+      Blockly.Msg.senseBox_display_fastPrint_value
+    );
+    this.appendValueInput("Dimension1", "Dimension1").appendField(
+      Blockly.Msg.senseBox_display_fastPrint_dimension
+    );
+    this.appendValueInput("Title2", "Title2").appendField(
+      Blockly.Msg.senseBox_display_fastPrint_title
+    );
+    this.appendValueInput("Value2", "Value2").appendField(
+      Blockly.Msg.senseBox_display_fastPrint_value
+    );
+    this.appendValueInput("Dimension2", "Dimension2").appendField(
+      Blockly.Msg.senseBox_display_fastPrint_dimension
+    );
     this.setPreviousStatement(true, null);
     this.setNextStatement(true, null);
     this.setTooltip(Blockly.Msg.sensebox_display_fastPrint_tooltip);
@@ -124,37 +139,47 @@ Blockly.Blocks['sensebox_display_fastPrint'] = {
       this.setWarningText(Blockly.Msg.CONTROLS_FLOW_STATEMENTS_WARNING);
     }
   },
-    LOOP_TYPES: ['sensebox_display_show'],
+  LOOP_TYPES: ["sensebox_display_show"],
 };
 
-
-Blockly.Blocks['sensebox_display_plotDisplay'] = {
+Blockly.Blocks["sensebox_display_plotDisplay"] = {
   init: function () {
     this.setColour(getColour().sensebox);
-        this.appendDummyInput()
-            .appendField(Blockly.Msg.senseBox_display_plotDisplay)
-        this.appendValueInput("Title", 'Text')
-            .appendField(Blockly.Msg.senseBox_display_plotTitle);
-        this.appendValueInput("YLabel", 'Text')
-            .appendField(Blockly.Msg.senseBox_display_plotYLabel);
-        this.appendValueInput("XLabel", 'Text')
-            .appendField(Blockly.Msg.senseBox_display_plotXLabel);
-        this.appendValueInput("XRange1", 'Number')
-            .appendField(Blockly.Msg.senseBox_display_plotXRange1);
-        this.appendValueInput("XRange2", 'Number')
-            .appendField(Blockly.Msg.senseBox_display_plotXRange2)
-        this.appendValueInput("YRange1", 'Number')
-            .appendField(Blockly.Msg.senseBox_display_plotYRange1);
-        this.appendValueInput("YRange2", 'Number')
-            .appendField(Blockly.Msg.senseBox_display_plotYRange2);
+    this.appendDummyInput().appendField(
+      Blockly.Msg.senseBox_display_plotDisplay
+    );
+    this.appendValueInput("Title", "Text").appendField(
+      Blockly.Msg.senseBox_display_plotTitle
+    );
+    this.appendValueInput("YLabel", "Text").appendField(
+      Blockly.Msg.senseBox_display_plotYLabel
+    );
+    this.appendValueInput("XLabel", "Text").appendField(
+      Blockly.Msg.senseBox_display_plotXLabel
+    );
+    this.appendValueInput("XRange1", "Number").appendField(
+      Blockly.Msg.senseBox_display_plotXRange1
+    );
+    this.appendValueInput("XRange2", "Number").appendField(
+      Blockly.Msg.senseBox_display_plotXRange2
+    );
+    this.appendValueInput("YRange1", "Number").appendField(
+      Blockly.Msg.senseBox_display_plotYRange1
+    );
+    this.appendValueInput("YRange2", "Number").appendField(
+      Blockly.Msg.senseBox_display_plotYRange2
+    );
     this.setInputsInline(false);
-        this.appendValueInput("XTick", 'Number')
-            .appendField(Blockly.Msg.senseBox_display_plotXTick);
-        this.appendValueInput("YTick", 'Number')
-            .appendField(Blockly.Msg.senseBox_display_plotYTick);
-        this.appendValueInput("TimeFrame", 'Number')
-            .appendField(Blockly.Msg.senseBox_display_plotTimeFrame);
-        this.appendValueInput('plotDisplay')
+    this.appendValueInput("XTick", "Number").appendField(
+      Blockly.Msg.senseBox_display_plotXTick
+    );
+    this.appendValueInput("YTick", "Number").appendField(
+      Blockly.Msg.senseBox_display_plotYTick
+    );
+    this.appendValueInput("TimeFrame", "Number").appendField(
+      Blockly.Msg.senseBox_display_plotTimeFrame
+    );
+    this.appendValueInput("plotDisplay")
       .appendField(Blockly.Msg.senseBox_display_printDisplay_value)
       .setCheck(null);
     this.setPreviousStatement(true, null);
@@ -185,43 +210,42 @@ Blockly.Blocks['sensebox_display_plotDisplay'] = {
       this.setWarningText(Blockly.Msg.CONTROLS_FLOW_STATEMENTS_WARNING);
     }
   },
-    LOOP_TYPES: ['sensebox_display_show'],
+  LOOP_TYPES: ["sensebox_display_show"],
 };
 
-Blockly.Blocks['sensebox_display_show'] = {
+Blockly.Blocks["sensebox_display_show"] = {
   init: function () {
-
     this.setColour(getColour().sensebox);
-        this.appendDummyInput()
-            .appendField(Blockly.Msg.sensebox_display_show);
-        this.appendStatementInput('SHOW');
+    this.appendDummyInput().appendField(Blockly.Msg.sensebox_display_show);
+    this.appendStatementInput("SHOW");
     this.setTooltip(Blockly.Msg.sensebox_display_show_tip);
-        this.setHelpUrl('');
+    this.setHelpUrl("");
     this.setPreviousStatement(true, null);
     this.setNextStatement(true, null);
-    }
+  },
 };
 
-Blockly.Blocks['sensebox_display_fillCircle'] = {
+Blockly.Blocks["sensebox_display_fillCircle"] = {
   init: function () {
     this.setColour(getColour().sensebox);
-        this.appendDummyInput()
-            .appendField(Blockly.Msg.sensebox_display_fillCircle);
-        this.appendValueInput('X')
+    this.appendDummyInput().appendField(
+      Blockly.Msg.sensebox_display_fillCircle
+    );
+    this.appendValueInput("X")
       .appendField(Blockly.Msg.senseBox_display_printDisplay_x)
       .setCheck(Types.NUMBER.compatibleTypes);
-        this.appendValueInput('Y')
+    this.appendValueInput("Y")
       .appendField(Blockly.Msg.senseBox_display_printDisplay_y)
       .setCheck(Types.NUMBER.compatibleTypes);
-        this.appendValueInput('Radius')
+    this.appendValueInput("Radius")
       .appendField(Blockly.Msg.sensebox_display_fillCircle_radius)
       .setCheck(Types.NUMBER.compatibleTypes);
-        this.appendDummyInput('fill')
+    this.appendDummyInput("fill")
       .appendField(Blockly.Msg.senseBox_display_filled)
       .appendField(new Blockly.FieldCheckbox("TRUE"), "FILL");
     this.setInputsInline(false);
-        this.setTooltip(Blockly.Msg.senseBox_display_fillCircle_tooltip)
-        this.setHelpUrl(Blockly.Msg.senseBox_display_helpurl)
+    this.setTooltip(Blockly.Msg.senseBox_display_fillCircle_tooltip);
+    this.setHelpUrl(Blockly.Msg.senseBox_display_helpurl);
     this.setPreviousStatement(true, null);
     this.setNextStatement(true, null);
   },
@@ -248,32 +272,33 @@ Blockly.Blocks['sensebox_display_fillCircle'] = {
       this.setWarningText(Blockly.Msg.CONTROLS_FLOW_STATEMENTS_WARNING);
     }
   },
-    LOOP_TYPES: ['sensebox_display_show'],
+  LOOP_TYPES: ["sensebox_display_show"],
 };
 
-Blockly.Blocks['sensebox_display_drawRectangle'] = {
+Blockly.Blocks["sensebox_display_drawRectangle"] = {
   init: function () {
     this.setColour(getColour().sensebox);
-        this.appendDummyInput()
-            .appendField(Blockly.Msg.sensebox_display_drawRectangle);
-        this.appendValueInput('X')
+    this.appendDummyInput().appendField(
+      Blockly.Msg.sensebox_display_drawRectangle
+    );
+    this.appendValueInput("X")
       .appendField(Blockly.Msg.senseBox_display_printDisplay_x)
       .setCheck(Types.NUMBER.compatibleTypes);
-        this.appendValueInput('Y')
+    this.appendValueInput("Y")
       .appendField(Blockly.Msg.senseBox_display_printDisplay_y)
       .setCheck(Types.NUMBER.compatibleTypes);
-        this.appendValueInput('width')
+    this.appendValueInput("width")
       .appendField(Blockly.Msg.sensebox_display_drawRectangle_width)
       .setCheck(Types.NUMBER.compatibleTypes);
-        this.appendValueInput('height')
+    this.appendValueInput("height")
       .appendField(Blockly.Msg.sensebox_display_drawRectangle_height)
       .setCheck(Types.NUMBER.compatibleTypes);
-        this.appendDummyInput('fill')
+    this.appendDummyInput("fill")
       .appendField(Blockly.Msg.senseBox_display_filled)
       .appendField(new Blockly.FieldCheckbox("TRUE"), "FILL");
     this.setInputsInline(false);
-        this.setTooltip(Blockly.Msg.senseBox_display_drawRectangle_tooltip)
-        this.setHelpUrl(Blockly.Msg.senseBox_display_helpurl)
+    this.setTooltip(Blockly.Msg.senseBox_display_drawRectangle_tooltip);
+    this.setHelpUrl(Blockly.Msg.senseBox_display_helpurl);
     this.setPreviousStatement(true, null);
     this.setNextStatement(true, null);
   },
@@ -300,5 +325,5 @@ Blockly.Blocks['sensebox_display_drawRectangle'] = {
       this.setWarningText(Blockly.Msg.CONTROLS_FLOW_STATEMENTS_WARNING);
     }
   },
-    LOOP_TYPES: ['sensebox_display_show'],
+  LOOP_TYPES: ["sensebox_display_show"],
 };

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

@@ -158,7 +158,8 @@ Blockly.Blocks["sensebox_lora_ttn_mapper"] = {
     this.appendValueInput("Fix Type").appendField("Fix Type").setCheck(null);
     this.setPreviousStatement(true, null);
     this.setNextStatement(true, null);
-    this.setTooltip(Blockly.Msg.senseBox_display_printDisplay_tip);
+    this.setTooltip(Blockly.Msg.sensebox_lora_ttn_mapper_tip);
+    this.setHelpUrl(Blockly.Msg.sensebox_lora_ttn_mapper_helpurl);
   },
 };
 
@@ -299,3 +300,21 @@ Blockly.Blocks["sensebox_lora_cayenne_gps"] = {
   },
   LOOP_TYPES: ["sensebox_lora_cayenne_send"],
 };
+
+Blockly.Blocks["sensebox_lora_cayenne_concentration"] = {
+  init: function () {
+    this.setTooltip(Blockly.Msg.senseBox_LoRa_cayenne_concentration_tip);
+    this.setHelpUrl("");
+    this.setColour(getColour().sensebox);
+    this.appendValueInput("Value").appendField(
+      Blockly.Msg.senseBox_LoRa_cayenne_concentration
+    );
+    this.appendDummyInput()
+      .setAlign(Blockly.ALIGN_LEFT)
+      .appendField(Blockly.Msg.senseBox_LoRa_cayenne_channel)
+      .appendField(new Blockly.FieldTextInput("1"), "CHANNEL");
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+  },
+  LOOP_TYPES: ["sensebox_lora_cayenne_send"],
+};

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

@@ -1,56 +1,70 @@
-import * as Blockly from 'blockly/core';
-import { getColour } from '../helpers/colour';
+import * as Blockly from "blockly/core";
+import { getColour } from "../helpers/colour";
 
-import store from '../../../store';
+import store from "../../../store";
 
-var boxes = store.getState().auth.user ? store.getState().auth.user.boxes : null;
+var boxes = store.getState().auth.user
+  ? store.getState().auth.user.boxes
+  : null;
 store.subscribe(() => {
   boxes = store.getState().auth.user ? store.getState().auth.user.boxes : null;
 });
-var selectedBox = '';
+var selectedBox = "";
 
-
-Blockly.Blocks['sensebox_osem_connection'] = {
+Blockly.Blocks["sensebox_osem_connection"] = {
   init: function () {
+    var ssl = "TRUE";
     this.setTooltip(Blockly.Msg.senseBox_osem_connection_tip);
-        this.setHelpUrl('');
+    this.setHelpUrl(Blockly.Msg.senseBox_osem_connection_helpurl);
     this.setColour(getColour().sensebox);
     this.appendDummyInput()
       .appendField(Blockly.Msg.senseBox_osem_connection)
-            .appendField(new Blockly.FieldDropdown([[Blockly.Msg.senseBox_osem_host, '"ingress.opensensemap.org"'], [Blockly.Msg.senseBox_osem_host_workshop, '"ingress.workshop.opensensemap.org"']]), "host")
-            .appendField('SSL')
-            .appendField(new Blockly.FieldCheckbox("TRUE"), "SSL");
+      .appendField("SSL")
+      .appendField(new Blockly.FieldCheckbox(ssl), "SSL");
+    this.appendDummyInput()
+      .appendField(Blockly.Msg.senseBox_osem_restart)
+      .appendField(new Blockly.FieldCheckbox("TRUE"), "RESTART");
     this.appendDummyInput()
       .setAlign(Blockly.ALIGN_LEFT)
       .appendField(Blockly.Msg.senseBox_osem_exposure)
-            .appendField(new Blockly.FieldDropdown([[Blockly.Msg.senseBox_osem_stationary, 'Stationary'], [Blockly.Msg.senseBox_osem_mobile, 'Mobile']]), "type");
+      .appendField(
+        new Blockly.FieldDropdown([
+          [Blockly.Msg.senseBox_osem_stationary, "Stationary"],
+          [Blockly.Msg.senseBox_osem_mobile, "Mobile"],
+        ]),
+        "type"
+      );
     if (!boxes) {
       this.appendDummyInput()
         .setAlign(Blockly.ALIGN_LEFT)
         .appendField("senseBox ID")
         .appendField(new Blockly.FieldTextInput("senseBox ID"), "BoxID");
     } else {
-            var dropdown = []
+      var dropdown = [];
       for (var i = 0; i < boxes.length; i++) {
-                dropdown.push([boxes[i].name, boxes[i]._id])
+        dropdown.push([boxes[i].name, boxes[i]._id]);
       }
       this.appendDummyInput()
         .setAlign(Blockly.ALIGN_LEFT)
         .appendField("senseBox ID")
-                .appendField(new Blockly.FieldDropdown(dropdown), 'BoxID');
+        .appendField(new Blockly.FieldDropdown(dropdown), "BoxID");
     }
     this.appendDummyInput()
       .setAlign(Blockly.ALIGN_LEFT)
       .appendField(Blockly.Msg.senseBox_osem_access_token)
       .appendField(new Blockly.FieldTextInput("access_token"), "access_token");
-        this.appendStatementInput('DO')
+    this.appendStatementInput("DO")
       .appendField(Blockly.Msg.senseBox_sensor)
       .setCheck(null);
     this.setPreviousStatement(true, null);
     this.setNextStatement(true, null);
+    this.getField("type").setValidator(
+      function (val) {
+        this.updateShape_(val === "Mobile");
+      }.bind(this)
+    );
   },
   onchange: function (e) {
-
     var legal = false;
     // Is the block nested in a loop?
     var block = this;
@@ -72,77 +86,62 @@ Blockly.Blocks['sensebox_osem_connection'] = {
      * To add a new loop type add this to your code:
      * Blockly.Blocks['controls_flow_statements'].LOOP_TYPES.push('custom_loop');
      */
-        selectedBox = this.getFieldValue('BoxID');
-        if (selectedBox !== '' && boxes) {
-            var accessToken = boxes.find(element => element._id === selectedBox).access_token
+    selectedBox = this.getFieldValue("BoxID");
+    if (selectedBox !== "" && boxes) {
+      var accessToken = boxes.find(
+        (element) => element._id === selectedBox
+      ).access_token;
       if (accessToken !== undefined) {
-                this.getField('access_token').setValue(accessToken)
+        this.getField("access_token").setValue(accessToken);
       } else {
-                this.getField('access_token').setValue('access_token')
+        this.getField("access_token").setValue("access_token");
       }
     }
-
   },
-
-    mutationToDom: function () {
-        var container = document.createElement('mutation');
-        var input = this.getFieldValue('type');
-        this.updateShape_(input);
-        container.setAttribute('type', input);
-        return container;
-    },
-
-    domToMutation: function (xmlElement) {
-        var connections = xmlElement.getAttribute('connections');
-        this.updateShape_(connections);
-    },
-    /**
-     * Modify this block to have the correct number of pins available.
-     * @param {boolean}
-     * @private
-     * @this Blockly.Block
-     */
-    updateShape_: function () {
-        var extraFieldExist = this.getFieldValue('gps');
-        var input = this.getFieldValue('type');
-        if ((input === 'Mobile') && extraFieldExist === null) {
-            this.appendValueInput('lat', 'Number')
-                .appendField(Blockly.Msg.senseBox_gps_lat, 'gps');
-            this.appendValueInput('lng', 'Number')
-                .appendField(Blockly.Msg.senseBox_gps_lng);
-            this.appendValueInput('altitude', 'Number')
-                .appendField(Blockly.Msg.senseBox_gps_alt);
-            this.appendValueInput('timeStamp', 'Number')
-                .appendField(Blockly.Msg.senseBox_gps_timeStamp);
+  updateShape_(isMobile) {
+    if (isMobile) {
+      if (this.getInput("lat") == null) {
+        this.appendValueInput("lat", "Number").appendField(
+          Blockly.Msg.senseBox_gps_lat,
+          "gps"
+        );
+        this.appendValueInput("lng", "Number").appendField(
+          Blockly.Msg.senseBox_gps_lng
+        );
+        this.appendValueInput("altitude", "Number").appendField(
+          Blockly.Msg.senseBox_gps_alt
+        );
+        this.appendValueInput("timeStamp", "Number").appendField(
+          Blockly.Msg.senseBox_gps_timeStamp
+        );
       }
-
-        if (input === 'Stationary' && extraFieldExist !== null) {
-            this.removeInput('lat');
-            this.removeInput('lng');
-            this.removeInput('altitude');
-            this.removeInput('timeStamp');
+    } else {
+      this.removeInput("lat", true);
+      this.removeInput("lng", true);
+      this.removeInput("altitude", true);
+      this.removeInput("timeStamp", true);
     }
   },
-    LOOP_TYPES: ['sensebox_interval_timer']
+  LOOP_TYPES: ["sensebox_interval_timer"],
 };
-Blockly.Blocks['sensebox_send_to_osem'] = {
+Blockly.Blocks["sensebox_send_to_osem"] = {
   init: function () {
     this.setTooltip(Blockly.Msg.senseBox_send_to_osem_tip);
-        this.setHelpUrl('');
+    this.setHelpUrl("");
     this.setColour(getColour().sensebox);
-        this.appendDummyInput()
-            .appendField(Blockly.Msg.senseBox_send_to_osem);
+    this.appendDummyInput().appendField(Blockly.Msg.senseBox_send_to_osem);
     if (boxes) {
-            this.appendValueInput('Value')
-                .appendField('Phänomen')
-                .appendField(new Blockly.FieldDropdown(
-                    this.generateOptions), 'SensorID');
+      this.appendValueInput("Value")
+        .appendField("Phänomen")
+        .appendField(
+          new Blockly.FieldDropdown(this.generateOptions),
+          "SensorID"
+        );
     } else {
-            this.appendValueInput('Value')
+      this.appendValueInput("Value")
         .setAlign(Blockly.ALIGN_LEFT)
-                .appendField('Phänomen')
-                .appendField(new Blockly.FieldTextInput(
-                    'sensorID'), 'SensorID')
+        .appendField("Phänomen")
+        .appendField(new Blockly.FieldTextInput("sensorID"), "SensorID");
     }
 
     this.setPreviousStatement(true, null);
@@ -150,24 +149,23 @@ Blockly.Blocks['sensebox_send_to_osem'] = {
   },
 
   generateOptions: function () {
-        var dropdown = [['', '']];
+    var dropdown = [["", ""]];
     var boxID = selectedBox;
-        if (boxID !== '' && boxes) {
-
-            let box = boxes.find(el => el._id === boxID);
+    if (boxID !== "" && boxes) {
+      let box = boxes.find((el) => el._id === boxID);
       if (box !== undefined) {
         for (var i = 0; i < box.sensors.length; i++) {
-                    dropdown.push([box.sensors[i].title, box.sensors[i]._id])
+          dropdown.push([box.sensors[i].title, box.sensors[i]._id]);
         }
       }
       if (dropdown.length > 1) {
-                var options = dropdown.slice(1)
-                return options
+        var options = dropdown.slice(1);
+        return options;
       } else {
-                return dropdown
+        return dropdown;
       }
     }
-        return dropdown
+    return dropdown;
   },
   /**
    * Called whenever anything on the workspace changes.
@@ -176,7 +174,6 @@ Blockly.Blocks['sensebox_send_to_osem'] = {
    * @this Blockly.Block
    */
   onchange: function () {
-
     var legal = false;
     // Is the block nested in a loop?
     var block = this;
@@ -198,5 +195,5 @@ Blockly.Blocks['sensebox_send_to_osem'] = {
    * To add a new loop type add this to your code:
    * Blockly.Blocks['controls_flow_statements'].LOOP_TYPES.push('custom_loop');
    */
-    LOOP_TYPES: ['sensebox_osem_connection']
+  LOOP_TYPES: ["sensebox_osem_connection"],
 };

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

@@ -62,7 +62,7 @@ Blockly.Blocks["sensebox_rtc_get"] = {
         ]),
         "dropdown"
       );
-    this.setOutput(true, Types.LARGE_NUMBER.typeId);
+    this.setOutput(true, Types.LARGE_NUMBER.typeName);
     this.setTooltip(Blockly.Msg.sensebox_rtc_get_tooltip);
   },
 };

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

@@ -1,57 +1,81 @@
-import * as Blockly from 'blockly/core';
-import { getColour } from '../helpers/colour';
+import * as Blockly from "blockly/core";
+import { getColour } from "../helpers/colour";
 
+var checkFileName = function (filename) {
+  var length = filename.length;
+  if (length > 8) {
+    alert("dateiname sollte kleiner als 8 Zeichen sein");
+    return filename.slice(0, 8);
+  }
+  return filename;
+};
 
-Blockly.Blocks['sensebox_sd_open_file'] = {
+Blockly.Blocks["sensebox_sd_open_file"] = {
   init: function () {
     this.appendDummyInput()
       .appendField(Blockly.Msg.senseBox_sd_open_file)
       .setAlign(Blockly.ALIGN_LEFT)
       .appendField(
-                new Blockly.FieldTextInput('Data.txt'),
-                'Filename');
-        this.appendStatementInput('SD')
-            .setCheck(null);
+        new Blockly.FieldTextInput("Data", checkFileName),
+        "Filename"
+      )
+      .appendField(".")
+      .appendField(
+        new Blockly.FieldDropdown([
+          ["txt", "txt"],
+          ["csv", "csv"],
+        ]),
+        "extension"
+      );
+    this.appendStatementInput("SD").setCheck(null);
     this.setPreviousStatement(true, null);
     this.setNextStatement(true, null);
     this.setColour(getColour().sensebox);
     this.setTooltip(Blockly.Msg.senseBox_sd_open_file_tooltip);
-        this.setHelpUrl('https://docs.sensebox.de/hardware/bee-sd/');
-    }
+    this.setHelpUrl(Blockly.Msg.sensebox_sd_helpurl);
+  },
 };
 
-Blockly.Blocks['sensebox_sd_create_file'] = {
+Blockly.Blocks["sensebox_sd_create_file"] = {
   init: function () {
     this.appendDummyInput()
       .appendField(Blockly.Msg.senseBox_sd_create_file)
       .setAlign(Blockly.ALIGN_LEFT)
       .appendField(Blockly.Msg.senseBox_output_filename)
       .appendField(
-                new Blockly.FieldTextInput('Data.txt'),
-                'Filename');
+        new Blockly.FieldTextInput("Data", checkFileName),
+        "Filename"
+      )
+      .appendField(".")
+      .appendField(
+        new Blockly.FieldDropdown([
+          ["txt", "txt"],
+          ["csv", "csv"],
+        ]),
+        "extension"
+      );
     this.setPreviousStatement(true, null);
     this.setNextStatement(true, null);
     this.setColour(getColour().sensebox);
     this.setTooltip(Blockly.Msg.senseBox_sd_create_file_tooltip);
-        this.setHelpUrl('https://docs.sensebox.de/hardware/bee-sd/');
-    }
+    this.setHelpUrl(Blockly.Msg.sensebox_sd_helpurl);
+  },
 };
 
-Blockly.Blocks['sensebox_sd_write_file'] = {
+Blockly.Blocks["sensebox_sd_write_file"] = {
   init: function () {
     this.appendDummyInput()
       .appendField(Blockly.Msg.senseBox_sd_write_file)
       .setAlign(Blockly.ALIGN_LEFT);
-        this.appendValueInput('DATA')
-            .setCheck(null);
-        this.appendDummyInput('CheckboxText')
+    this.appendValueInput("DATA").setCheck(null);
+    this.appendDummyInput("CheckboxText")
       .appendField(Blockly.Msg.senseBox_output_linebreak)
-            .appendField(new Blockly.FieldCheckbox('TRUE'), 'linebreak');
+      .appendField(new Blockly.FieldCheckbox("TRUE"), "linebreak");
     this.setPreviousStatement(true, null);
     this.setNextStatement(true, null);
     this.setColour(getColour().sensebox);
     this.setTooltip(Blockly.Msg.senseBox_sd_write_file_tooltip);
-        this.setHelpUrl('https://docs.sensebox.de/hardware/bee-sd/');
+    this.setHelpUrl(Blockly.Msg.sensebox_sd_helpurl);
   },
   /**
    * Called whenever anything on the workspace changes.
@@ -76,5 +100,75 @@ Blockly.Blocks['sensebox_sd_write_file'] = {
       this.setWarningText(Blockly.Msg.CONTROLS_FLOW_STATEMENTS_WARNING);
     }
   },
-    LOOP_TYPES: ['sensebox_sd_open_file'],
+  LOOP_TYPES: ["sensebox_sd_open_file"],
+};
+
+Blockly.Blocks["sensebox_sd_osem"] = {
+  init: function () {
+    this.setTooltip(Blockly.Msg.sensebox_sd_osem_tip);
+    this.setHelpUrl(Blockly.Msg.sensebox_sd_helpurl);
+    this.setColour(getColour().sensebox);
+    this.appendDummyInput()
+      .setAlign(Blockly.ALIGN_LEFT)
+      .appendField(Blockly.Msg.sensebox_sd_osem);
+    this.appendDummyInput()
+      .setAlign(Blockly.ALIGN_LEFT)
+      .appendField(Blockly.Msg.senseBox_osem_exposure)
+      .appendField(
+        new Blockly.FieldDropdown([
+          [Blockly.Msg.senseBox_osem_stationary, "Stationary"],
+          [Blockly.Msg.senseBox_osem_mobile, "Mobile"],
+        ]),
+        "type"
+      );
+    this.appendValueInput("timeStamp", "Number").appendField(
+      Blockly.Msg.senseBox_gps_timeStamp
+    );
+    this.appendStatementInput("DO")
+      .appendField(Blockly.Msg.sensebox_sd_measurement)
+      .setCheck(null);
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+    this.getField("type").setValidator(
+      function (val) {
+        this.updateShape_(val === "Mobile");
+      }.bind(this)
+    );
+  },
+
+  updateShape_(isMobile) {
+    if (isMobile) {
+      if (this.getInput("lat") == null) {
+        this.appendValueInput("lat", "Number").appendField(
+          Blockly.Msg.senseBox_gps_lat,
+          "gps"
+        );
+        this.appendValueInput("lng", "Number").appendField(
+          Blockly.Msg.senseBox_gps_lng
+        );
+        this.appendValueInput("altitude", "Number").appendField(
+          Blockly.Msg.senseBox_gps_alt
+        );
+      }
+    } else {
+      this.removeInput("lat", true);
+      this.removeInput("lng", true);
+      this.removeInput("altitude", true);
+    }
+  },
+};
+
+Blockly.Blocks["sensebox_sd_save_for_osem"] = {
+  init: function () {
+    this.setTooltip(Blockly.Msg.sensebox_sd_save_for_osem_tip);
+    this.setHelpUrl(Blockly.Msg.sensebox_sd_helpurl);
+    this.setColour(getColour().sensebox);
+    this.appendDummyInput().appendField(Blockly.Msg.sensebox_sd_save_for_osem);
+    this.appendValueInput("Value")
+      .setAlign(Blockly.ALIGN_LEFT)
+      .appendField(Blockly.Msg.sensebox_sd_save_for_osem_id)
+      .appendField(new Blockly.FieldTextInput("sensorID"), "SensorID");
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+  },
 };

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

@@ -1,26 +1,32 @@
-import Blockly from 'blockly';
-import { getColour } from '../helpers/colour'
-import * as Types from '../helpers/types'
-import { selectedBoard } from '../helpers/board'
+import Blockly from "blockly";
+import { getColour } from "../helpers/colour";
+import * as Types from "../helpers/types";
+import { selectedBoard } from "../helpers/board";
+import { FieldGridDropdown } from "@blockly/field-grid-dropdown";
 
 /**
  * HDC1080 Temperature and Humidity Sensor
  *
  */
 
-Blockly.Blocks['sensebox_sensor_temp_hum'] = {
+Blockly.Blocks["sensebox_sensor_temp_hum"] = {
   init: function () {
-    this.appendDummyInput()
-      .appendField(Blockly.Msg.senseBox_temp_hum);
+    this.appendDummyInput().appendField(Blockly.Msg.senseBox_temp_hum);
     this.appendDummyInput()
       .setAlign(Blockly.ALIGN_RIGHT)
       .appendField(Blockly.Msg.senseBox_value)
-      .appendField(new Blockly.FieldDropdown([[Blockly.Msg.senseBox_temp, "Temperature"], [Blockly.Msg.senseBox_hum, "Humidity"]]), "NAME");
+      .appendField(
+        new Blockly.FieldDropdown([
+          [Blockly.Msg.senseBox_temp, "Temperature"],
+          [Blockly.Msg.senseBox_hum, "Humidity"],
+        ]),
+        "NAME"
+      );
     this.setOutput(true, Types.DECIMAL.typeName);
     this.setColour(getColour().sensebox);
     this.setTooltip(Blockly.Msg.senseBox_temp_hum_tooltip);
     this.setHelpUrl(Blockly.Msg.senseBox_temp_hum_helpurl);
-  }
+  },
 };
 
 /**
@@ -28,44 +34,64 @@ Blockly.Blocks['sensebox_sensor_temp_hum'] = {
  *
  */
 
-
-
-Blockly.Blocks['sensebox_sensor_uv_light'] = {
+Blockly.Blocks["sensebox_sensor_uv_light"] = {
   init: function () {
-    this.appendDummyInput()
-      .appendField(Blockly.Msg.senseBox_uv_light);
+    this.appendDummyInput().appendField(Blockly.Msg.senseBox_uv_light);
     this.appendDummyInput()
       .setAlign(Blockly.ALIGN_RIGHT)
       .appendField(Blockly.Msg.senseBox_value)
-      .appendField(new Blockly.FieldDropdown([[Blockly.Msg.senseBox_light, "Illuminance"], [Blockly.Msg.senseBox_uv, "UvIntensity"]]), "NAME");
+      .appendField(
+        new Blockly.FieldDropdown([
+          [Blockly.Msg.senseBox_light, "Illuminance"],
+          [Blockly.Msg.senseBox_uv, "UvIntensity"],
+        ]),
+        "NAME"
+      );
     this.setOutput(true, Types.DECIMAL.typeName);
     this.setColour(getColour().sensebox);
     this.setTooltip(Blockly.Msg.senseBox_uv_light_tooltip);
     this.setHelpUrl(Blockly.Msg.senseBox_uv_light_helpurl);
-  }
+  },
 };
 
 /*
 BMX055 Three differen Blocks for Accelerometer, Gyroscope, Compass
 */
 
-Blockly.Blocks['sensebox_sensor_bmx055_accelerometer'] = {
+Blockly.Blocks["sensebox_sensor_bmx055_accelerometer"] = {
   init: function () {
-    this.appendDummyInput()
-      .appendField(Blockly.Msg.senseBox_bmx055_accelerometer);
+    this.appendDummyInput().appendField(
+      Blockly.Msg.senseBox_bmx055_accelerometer
+    );
     this.appendDummyInput()
       .setAlign(Blockly.ALIGN_LEFT)
       .appendField(Blockly.Msg.senseBox_bmx055_accelerometer_direction)
-      .appendField(new Blockly.FieldDropdown([[Blockly.Msg.senseBox_bmx055_accelerometer_direction_x, "X"], [Blockly.Msg.senseBox_bmx055_accelerometer_direction_y, "Y"], [Blockly.Msg.senseBox_bmx055_accelerometer_direction_z, "Z"], [Blockly.Msg.senseBox_bmx055_accelerometer_direction_total, "Total"]]), "VALUE");
+      .appendField(
+        new Blockly.FieldDropdown([
+          [Blockly.Msg.senseBox_bmx055_accelerometer_direction_x, "X"],
+          [Blockly.Msg.senseBox_bmx055_accelerometer_direction_y, "Y"],
+          [Blockly.Msg.senseBox_bmx055_accelerometer_direction_z, "Z"],
+          [Blockly.Msg.senseBox_bmx055_accelerometer_direction_total, "Total"],
+        ]),
+        "VALUE"
+      );
     this.appendDummyInput()
       .setAlign(Blockly.ALIGN_LEFT)
       .appendField(Blockly.Msg.senseBox_bmx055_accelerometer_range)
-      .appendField(new Blockly.FieldDropdown([[Blockly.Msg.senseBox_bmx055_accelerometer_range_2g, "0x3"], [Blockly.Msg.senseBox_bmx055_accelerometer_range_4g, "0x5"], [Blockly.Msg.senseBox_bmx055_accelerometer_range_8g, "0x8"], [Blockly.Msg.senseBox_bmx055_accelerometer_range_16g, "0x0C"]]), "RANGE");
+      .appendField(
+        new Blockly.FieldDropdown([
+          [Blockly.Msg.senseBox_bmx055_accelerometer_range_2g, "0x3"],
+          [Blockly.Msg.senseBox_bmx055_accelerometer_range_4g, "0x5"],
+          [Blockly.Msg.senseBox_bmx055_accelerometer_range_8g, "0x8"],
+          [Blockly.Msg.senseBox_bmx055_accelerometer_range_16g, "0x0C"],
+        ]),
+        "RANGE"
+      );
     this.setOutput(true, Types.DECIMAL.typeName);
     this.setColour(getColour().sensebox);
     this.setTooltip(Blockly.Msg.senseBox_bmx055_accelerometer_tooltip);
     this.setHelpUrl(Blockly.Msg.senseBox_bmx055_helpurl);
-  }
+  },
 };
 
 /**
@@ -73,38 +99,56 @@ Blockly.Blocks['sensebox_sensor_bmx055_accelerometer'] = {
  *
  */
 
-Blockly.Blocks['sensebox_sensor_sds011'] = {
+Blockly.Blocks["sensebox_sensor_sds011"] = {
   init: function () {
-    this.appendDummyInput()
-      .appendField(Blockly.Msg.senseBox_sds011);
+    this.appendDummyInput().appendField(Blockly.Msg.senseBox_sds011);
     this.appendDummyInput()
       .setAlign(Blockly.ALIGN_RIGHT)
       .appendField(Blockly.Msg.senseBox_value)
-      .appendField(new Blockly.FieldDropdown([[Blockly.Msg.senseBox_sds011_pm25, "Pm25"], [Blockly.Msg.senseBox_sds011_pm10, "Pm10"]]), "NAME")
+      .appendField(
+        new Blockly.FieldDropdown([
+          [Blockly.Msg.senseBox_sds011_pm25, "pm25"],
+          [Blockly.Msg.senseBox_sds011_pm10, "pm10"],
+        ]),
+        "NAME"
+      )
       .appendField(Blockly.Msg.senseBox_sds011_dimension)
-      .appendField(new Blockly.FieldDropdown([[Blockly.Msg.senseBox_sds011_serial1, "Serial1"], [Blockly.Msg.senseBox_sds011_serial2, "Serial2"]]), "SERIAL");
+      .appendField(
+        new Blockly.FieldDropdown([
+          [Blockly.Msg.senseBox_sds011_serial1, "Serial1"],
+          [Blockly.Msg.senseBox_sds011_serial2, "Serial2"],
+        ]),
+        "SERIAL"
+      );
     this.setOutput(true, Types.DECIMAL.typeName);
     this.setColour(getColour().sensebox);
     this.setTooltip(Blockly.Msg.senseBox_sds011_tooltip);
     this.setHelpUrl(Blockly.Msg.senseBox_sds011_helpurl);
-  }
+  },
 };
 
-
 /**
  * BMP280 Pressure Sensor
  *
  */
 
-Blockly.Blocks['sensebox_sensor_pressure'] = {
+Blockly.Blocks["sensebox_sensor_pressure"] = {
   init: function () {
-    var dropdownOptions = [[Blockly.Msg.senseBox_pressure, "Pressure"], [Blockly.Msg.senseBox_temp, "Temperature"], [Blockly.Msg.senseBox_gps_alt, "Altitude"]];
-    var dropdown = new Blockly.FieldDropdown(dropdownOptions, function (option) {
-      var input = (option === 'Pressure') || (option === 'Temperature') || (option === 'Altitude');
+    var dropdownOptions = [
+      [Blockly.Msg.senseBox_pressure, "Pressure"],
+      [Blockly.Msg.senseBox_temp, "Temperature"],
+      [Blockly.Msg.senseBox_gps_alt, "Altitude"],
+    ];
+    var dropdown = new Blockly.FieldDropdown(dropdownOptions, function (
+      option
+    ) {
+      var input =
+        option === "Pressure" ||
+        option === "Temperature" ||
+        option === "Altitude";
       this.sourceBlock_.updateShape_(input);
     });
-    this.appendDummyInput()
-      .appendField(Blockly.Msg.senseBox_pressure_sensor);
+    this.appendDummyInput().appendField(Blockly.Msg.senseBox_pressure_sensor);
     this.appendDummyInput()
       .setAlign(Blockly.ALIGN_RIGHT)
       .appendField(Blockly.Msg.senseBox_value)
@@ -113,72 +157,53 @@ Blockly.Blocks['sensebox_sensor_pressure'] = {
     this.setOutput(true, Types.DECIMAL.typeName);
     this.setTooltip(Blockly.Msg.senseBox_pressure_tooltip);
     this.setHelpUrl(Blockly.Msg.senseBox_pressure_helpurl);
+    this.getField("NAME").setValidator(
+      function (val) {
+        this.updateShape_(val === "Altitude");
+      }.bind(this)
+    );
   },
-  /**
-   * Parse XML to restore the number of pins available.
-   * @param {!Element} xmlElement XML storage element.
-   * @this Blockly.Block
-   */
-
-  domToMutation: function (xmlElement) {
-    (xmlElement.getAttribute('port'));
-
-  },
-  /**
-   * Create XML to represent number of pins selection.
-   * @return {!Element} XML storage element.
-   * @this Blockly.Block
-   */
-  mutationToDom: function () {
-    var container = document.createElement('mutation');
-    var input = this.getFieldValue('NAME');
-    this.updateShape_(input);
-    container.setAttribute('NAME', input);
-    return container;
-  },
-  /**
-   * Modify this block to have the correct number of pins available.
-   * @param {boolean}
-   * @private
-   * @this Blockly.Block
-   */
-  updateShape_: function () {
-    var extraFieldExist = this.getFieldValue('referencePressure');
-    var input = this.getFieldValue('NAME');
-    if (input === 'Altitude' && extraFieldExist === null) {
-      this.appendDummyInput('extraField')
+  updateShape_(isAltitude) {
+    if (isAltitude) {
+      if (this.getInput("extraField") == null) {
+        this.appendDummyInput("extraField")
           .setAlign(Blockly.ALIGN_RIGHT)
           .appendField(Blockly.Msg.senseBox_pressure_referencePressure)
           .appendField(new Blockly.FieldTextInput("1013"), "referencePressure")
           .appendField(Blockly.Msg.senseBox_pressure_referencePressure_dim);
       }
-
-    if ((input === 'Pressure' || input === 'Temperature') && extraFieldExist !== null) {
-      this.removeInput('extraField');
-    }
+    } else {
+      this.removeInput("extraField", true);
     }
+  },
 };
 
-
 /**
  * BME680 Environmental Sensor
  *
  */
 
-Blockly.Blocks['sensebox_sensor_bme680_bsec'] = {
+Blockly.Blocks["sensebox_sensor_bme680_bsec"] = {
   init: function () {
-    var dropdownOptions = [[Blockly.Msg.senseBox_temp, "temperature"], [Blockly.Msg.senseBox_hum, "humidity"], [Blockly.Msg.senseBox_pressure, "pressure"], [Blockly.Msg.senseBox_bme_iaq, "IAQ"], [Blockly.Msg.senseBox_bme_iaq_accuracy, "IAQAccuracy"], [Blockly.Msg.senseBox_bme_co2, "CO2"], [Blockly.Msg.senseBox_bme_breatheVocEquivalent, "breathVocEquivalent"]];
-    this.appendDummyInput()
-      .appendField(Blockly.Msg.senseBox_bme680);
+    var dropdownOptions = [
+      [Blockly.Msg.senseBox_temp, "temperature"],
+      [Blockly.Msg.senseBox_hum, "humidity"],
+      [Blockly.Msg.senseBox_pressure, "pressure"],
+      [Blockly.Msg.senseBox_bme_iaq, "IAQ"],
+      [Blockly.Msg.senseBox_bme_iaq_accuracy, "IAQAccuracy"],
+      [Blockly.Msg.senseBox_bme_co2, "CO2"],
+      [Blockly.Msg.senseBox_bme_breatheVocEquivalent, "breathVocEquivalent"],
+    ];
+    this.appendDummyInput().appendField(Blockly.Msg.senseBox_bme680);
     this.appendDummyInput()
       .setAlign(Blockly.ALIGN_RIGHT)
       .appendField(Blockly.Msg.senseBox_value)
-      .appendField(new Blockly.FieldDropdown(dropdownOptions), "dropdown")
+      .appendField(new Blockly.FieldDropdown(dropdownOptions), "dropdown");
     this.setOutput(true, Types.DECIMAL.typeName);
     this.setColour(getColour().sensebox);
     this.setTooltip(Blockly.Msg.senseBox_bme_tooltip);
-    this.setHelpUrl(Blockly.Msg.senseBox_bme680_helpurl)
-  }
+    this.setHelpUrl(Blockly.Msg.senseBox_bme680_helpurl);
+  },
 };
 
 /**
@@ -187,14 +212,15 @@ Blockly.Blocks['sensebox_sensor_bme680_bsec'] = {
  *
  */
 
-
-Blockly.Blocks['sensebox_sensor_ultrasonic_ranger'] = {
+Blockly.Blocks["sensebox_sensor_ultrasonic_ranger"] = {
   init: function () {
-
-    var dropdownOptions = [[Blockly.Msg.senseBox_ultrasonic_port_A, 'A'],
-    [Blockly.Msg.senseBox_ultrasonic_port_B, 'B'], [Blockly.Msg.senseBox_ultrasonic_port_C, 'C']];
-    var dropdown = new Blockly.FieldDropdown(dropdownOptions, function (option) {
-      var input = (option === 'A') || (option === 'B') || (option === 'C');
+    var dropdownOptions = [
+      [Blockly.Msg.senseBox_ultrasonic_port_A, "A"],
+      [Blockly.Msg.senseBox_ultrasonic_port_B, "B"],
+      [Blockly.Msg.senseBox_ultrasonic_port_C, "C"],
+    ];
+    var dropdown = new FieldGridDropdown(dropdownOptions, function (option) {
+      var input = option === "A" || option === "B" || option === "C";
       this.sourceBlock_.updateShape_(input);
     });
 
@@ -202,14 +228,22 @@ Blockly.Blocks['sensebox_sensor_ultrasonic_ranger'] = {
     this.appendDummyInput()
       .appendField(Blockly.Msg.senseBox_ultrasonic)
       .appendField(dropdown, "port");
-    this.appendDummyInput('TrigEcho')
+    this.appendDummyInput("TrigEcho")
       .setAlign(Blockly.ALIGN_RIGHT)
       .appendField(Blockly.Msg.senseBox_ultrasonic_trigger)
-      .appendField(new Blockly.FieldDropdown(
-        selectedBoard().digitalPins), 'ultrasonic_trigger')
+      .appendField(
+        new Blockly.FieldDropdown(selectedBoard().digitalPins),
+        "ultrasonic_trigger"
+      )
       .appendField(Blockly.Msg.senseBox_ultrasonic_echo)
-      .appendField(new Blockly.FieldDropdown(
-        selectedBoard().digitalPins), 'ultrasonic_echo');
+      .appendField(
+        new Blockly.FieldDropdown(selectedBoard().digitalPins),
+        "ultrasonic_echo"
+      );
+    this.appendDummyInput("maxDistance")
+      .appendField(Blockly.Msg.senseBox_ultrasonic_maxDistance)
+      .appendField(new Blockly.FieldTextInput("250"), "maxDistance")
+      .appendField("cm");
     this.setOutput(true, Types.NUMBER.typeName);
     this.setTooltip(Blockly.Msg.senseBox_ultrasonic_tooltip);
     this.setHelpUrl(Blockly.Msg.senseBox_ultrasonic_helpurl);
@@ -220,8 +254,7 @@ Blockly.Blocks['sensebox_sensor_ultrasonic_ranger'] = {
    * @this Blockly.Block
    */
   domToMutation: function (xmlElement) {
-    (xmlElement.getAttribute('port'));
-
+    xmlElement.getAttribute("port");
   },
   /**
    * Create XML to represent number of pins selection.
@@ -229,8 +262,8 @@ Blockly.Blocks['sensebox_sensor_ultrasonic_ranger'] = {
    * @this Blockly.Block
    */
   mutationToDom: function () {
-    var container = document.createElement('mutation');
-    var input = this.getFieldValue('port');
+    var container = document.createElement("mutation");
+    var input = this.getFieldValue("port");
     this.updateShape_(input);
     container.setAttribute("port", input);
     return container;
@@ -242,159 +275,204 @@ Blockly.Blocks['sensebox_sensor_ultrasonic_ranger'] = {
    * @this Blockly.Block
    */
   updateShape_: function () {
-    var input = this.getFieldValue('port');
+    var input = this.getFieldValue("port");
     switch (input) {
-      case 'A':
-        this.setFieldValue('1', 'ultrasonic_trigger');
-        this.setFieldValue('2', 'ultrasonic_echo');
+      case "A":
+        this.setFieldValue("1", "ultrasonic_trigger");
+        this.setFieldValue("2", "ultrasonic_echo");
         break;
-      case 'B':
-        this.setFieldValue('3', 'ultrasonic_trigger');
-        this.setFieldValue('4', 'ultrasonic_echo');
+      case "B":
+        this.setFieldValue("3", "ultrasonic_trigger");
+        this.setFieldValue("4", "ultrasonic_echo");
         break;
-      case 'C':
-        this.setFieldValue('5', 'ultrasonic_trigger');
-        this.setFieldValue('6', 'ultrasonic_echo');
+      case "C":
+        this.setFieldValue("5", "ultrasonic_trigger");
+        this.setFieldValue("6", "ultrasonic_echo");
         break;
       default:
         break;
     }
-  }
+  },
 };
 
-
 /**
  * Microphone
  *
  */
 
-Blockly.Blocks['sensebox_sensor_sound'] = {
+Blockly.Blocks["sensebox_sensor_sound"] = {
   init: function () {
     this.setColour(getColour().sensebox);
     this.appendDummyInput()
       .appendField(Blockly.Msg.senseBox_sound)
       .appendField("Pin:")
-      .appendField(new Blockly.FieldDropdown(selectedBoard().analogPins), "PIN")
+      .appendField(
+        new Blockly.FieldDropdown(selectedBoard().analogPins),
+        "PIN"
+      );
     this.setOutput(true, Types.NUMBER.typeName);
     this.setHelpUrl(Blockly.Msg.senseBox_sound_helpurl);
     this.setTooltip(Blockly.Msg.senseBox_sound_tooltip);
-  }
+  },
 };
 
-
 /**
  * Button
  *
  *
  */
 
-Blockly.Blocks['sensebox_button'] = {
+Blockly.Blocks["sensebox_button"] = {
   init: function () {
     this.appendDummyInput()
       .appendField(Blockly.Msg.senseBox_button)
-      .appendField(new Blockly.FieldDropdown([[Blockly.Msg.senseBox_button_isPressed, "isPressed"], [Blockly.Msg.senseBox_button_wasPressed, "wasPressed"], [Blockly.Msg.senseBox_button_switch, "Switch"]]), "FUNCTION")
+      .appendField(
+        new Blockly.FieldDropdown([
+          [Blockly.Msg.senseBox_button_isPressed, "isPressed"],
+          [Blockly.Msg.senseBox_button_wasPressed, "wasPressed"],
+          [Blockly.Msg.senseBox_button_longPress, "longPress"],
+        ]),
+        "FUNCTION"
+      )
       .appendField("Pin:")
-      .appendField(new Blockly.FieldDropdown(selectedBoard().digitalPinsButton), "PIN");
+      .appendField(
+        new Blockly.FieldDropdown(selectedBoard().digitalPinsButton),
+        "PIN"
+      );
     this.setOutput(true, Types.BOOLEAN.typeName);
     this.setColour(getColour().sensebox);
     this.setTooltip(Blockly.Msg.senseBox_button_tooltip);
+    this.getField("FUNCTION").setValidator(
+      function (val) {
+        this.updateShape_(val === "longPress");
+      }.bind(this)
+    );
+  },
+  updateShape_(isLongPress) {
+    if (isLongPress) {
+      if (this.getInput("extraField") == null) {
+        this.appendDummyInput("extraField")
+          .setAlign(Blockly.ALIGN_RIGHT)
+          .appendField(Blockly.Msg.senseBox_button_longPress_time)
+          .appendField(new Blockly.FieldTextInput("1000"), "time")
+          .appendField("ms");
       }
+    } else {
+      this.removeInput("extraField", true);
+    }
+  },
 };
 
-
 /**
  * SCD30 CO2 Sensor
  *
  */
 
-
-Blockly.Blocks['sensebox_scd30'] = {
+Blockly.Blocks["sensebox_scd30"] = {
   init: function () {
-    var dropdownOptions = [[Blockly.Msg.senseBox_scd_co2, "CO2"], [Blockly.Msg.senseBox_temp, "temperature"], [Blockly.Msg.senseBox_hum, "humidity"]];
-    this.appendDummyInput()
-      .appendField(Blockly.Msg.senseBox_scd30);
+    var dropdownOptions = [
+      [Blockly.Msg.senseBox_scd_co2, "CO2"],
+      [Blockly.Msg.senseBox_temp, "temperature"],
+      [Blockly.Msg.senseBox_hum, "humidity"],
+    ];
+    this.appendDummyInput().appendField(Blockly.Msg.senseBox_scd30);
     this.appendDummyInput()
       .setAlign(Blockly.ALIGN_RIGHT)
       .appendField(Blockly.Msg.senseBox_value)
-      .appendField(new Blockly.FieldDropdown(dropdownOptions), "dropdown")
+      .appendField(new Blockly.FieldDropdown(dropdownOptions), "dropdown");
     this.setOutput(true, Types.NUMBER.typeName);
     this.setColour(getColour().sensebox);
     this.setTooltip(Blockly.Msg.senseBox_scd_tooltip);
     this.setHelpUrl(Blockly.Msg.senseBox_scd_helpurl);
   },
   onchange: function (e) {
-    var dropdown = this.getFieldValue('dropdown');
-    if (dropdown === 'temperature' || dropdown === 'humidity') {
+    var dropdown = this.getFieldValue("dropdown");
+    if (dropdown === "temperature" || dropdown === "humidity") {
       this.setOutput(true, Types.DECIMAL.typeName);
-    } else if (dropdown === 'CO2') {
+    } else if (dropdown === "CO2") {
       this.setOutput(true, Types.NUMBER.typeName);
     }
-  }
+  },
 };
 
-
 /**
  * GPS Module
  *
  */
 
-
-Blockly.Blocks['sensebox_gps'] = {
+Blockly.Blocks["sensebox_gps"] = {
   init: function () {
-    var dropdownOptions = [[Blockly.Msg.senseBox_gps_lat, "latitude"], [Blockly.Msg.senseBox_gps_lng, "longitude"], [Blockly.Msg.senseBox_gps_alt, "altitude"], ["pDOP", "pDOP"], ["Fix Type", "fixType"]];
-    this.appendDummyInput()
-      .appendField("GPS Modul");
+    var dropdownOptions = [
+      [Blockly.Msg.senseBox_gps_lat, "latitude"],
+      [Blockly.Msg.senseBox_gps_lng, "longitude"],
+      [Blockly.Msg.senseBox_gps_alt, "altitude"],
+      [Blockly.Msg.senseBox_gps_timeStamp, "timestamp"],
+      [Blockly.Msg.senseBox_gps_speed, "speed"],
+      ["pDOP", "pDOP"],
+      ["Fix Type", "fixType"],
+    ];
+    this.appendDummyInput().appendField("GPS Modul");
     this.appendDummyInput()
       .setAlign(Blockly.ALIGN_RIGHT)
       .appendField(Blockly.Msg.senseBox_value)
-      .appendField(new Blockly.FieldDropdown(dropdownOptions), "dropdown")
+      .appendField(new Blockly.FieldDropdown(dropdownOptions), "dropdown");
     this.setOutput(true, Types.NUMBER.typeName);
     this.setColour(getColour().sensebox);
     this.setTooltip(Blockly.Msg.senseBox_gps_tooltip);
-  }
+  },
 };
 
 /**
  * Block for Truebner STM50
  */
 
-Blockly.Blocks['sensebox_sensor_truebner_smt50'] = {
+Blockly.Blocks["sensebox_sensor_truebner_smt50"] = {
   init: function () {
-    var dropdownOptions = [[Blockly.Msg.senseBox_ultrasonic_port_A, 'A'],
-    [Blockly.Msg.senseBox_ultrasonic_port_B, 'B'], [Blockly.Msg.senseBox_ultrasonic_port_C, 'C']];
+    var dropdownOptions = [
+      [Blockly.Msg.senseBox_ultrasonic_port_A, "A"],
+      [Blockly.Msg.senseBox_ultrasonic_port_B, "B"],
+      [Blockly.Msg.senseBox_ultrasonic_port_C, "C"],
+    ];
     this.setColour(getColour().sensebox);
-    this.appendDummyInput()
-      .appendField(Blockly.Msg.senseBox_smt50);
+    this.appendDummyInput().appendField(Blockly.Msg.senseBox_smt50);
     this.appendDummyInput()
       .appendField("Port:")
-      .appendField(new Blockly.FieldDropdown(dropdownOptions), "Port")
+      .appendField(new Blockly.FieldDropdown(dropdownOptions), "Port");
     this.appendDummyInput()
       .appendField(Blockly.Msg.senseBox_value)
-      .appendField(new Blockly.FieldDropdown([[Blockly.Msg.senseBox_temp, "temp"], [Blockly.Msg.senseBox_soil, "soil"]]), 'value')
+      .appendField(
+        new Blockly.FieldDropdown([
+          [Blockly.Msg.senseBox_temp, "temp"],
+          [Blockly.Msg.senseBox_soil, "soil"],
+        ]),
+        "value"
+      );
     this.setOutput(true, Types.NUMBER.typeName);
     this.setTooltip(Blockly.Msg.senseBox_smt50_tooltip);
     this.setHelpUrl(Blockly.Msg.senseBox_smt50_helpurl);
-  }
+  },
 };
 
-
 /**
  * DS18B20 Watertemperature
  *
  */
 
-Blockly.Blocks['sensebox_sensor_watertemperature'] = {
+Blockly.Blocks["sensebox_sensor_watertemperature"] = {
   init: function () {
-    var dropdownOptions = [[Blockly.Msg.senseBox_ultrasonic_port_A, 'A'],
-    [Blockly.Msg.senseBox_ultrasonic_port_B, 'B'], [Blockly.Msg.senseBox_ultrasonic_port_C, 'C']];
+    var dropdownOptions = [
+      [Blockly.Msg.senseBox_ultrasonic_port_A, "A"],
+      [Blockly.Msg.senseBox_ultrasonic_port_B, "B"],
+      [Blockly.Msg.senseBox_ultrasonic_port_C, "C"],
+    ];
     this.setColour(getColour().sensebox);
     this.appendDummyInput()
       .appendField(Blockly.Msg.senseBox_watertemperature)
       .appendField("Port:")
-      .appendField(new Blockly.FieldDropdown(dropdownOptions), "Port")
+      .appendField(new Blockly.FieldDropdown(dropdownOptions), "Port");
     this.setOutput(true, Types.NUMBER.typeName);
     this.setTooltip(Blockly.Msg.senseBox_watertemperature_tip);
-  }
+  },
 };
 
 /**
@@ -418,18 +496,105 @@ Blockly.Blocks['sensebox_windspeed'] = {
  * DF Robot Soundsensor
  */
 
-
-Blockly.Blocks['sensebox_soundsensor_dfrobot'] = {
+Blockly.Blocks["sensebox_soundsensor_dfrobot"] = {
   init: function () {
-    var dropdownOptions = [[Blockly.Msg.senseBox_ultrasonic_port_A, 'A'],
-    [Blockly.Msg.senseBox_ultrasonic_port_B, 'B'], [Blockly.Msg.senseBox_ultrasonic_port_C, 'C']];
+    var dropdownOptions = [
+      [Blockly.Msg.senseBox_ultrasonic_port_A, "A"],
+      [Blockly.Msg.senseBox_ultrasonic_port_B, "B"],
+      [Blockly.Msg.senseBox_ultrasonic_port_C, "C"],
+    ];
     this.setColour(getColour().sensebox);
     this.appendDummyInput()
       .appendField(Blockly.Msg.senseBox_soundsensor_dfrobot)
       .appendField("Port:")
-      .appendField(new Blockly.FieldDropdown(dropdownOptions), "Port")
+      .appendField(new Blockly.FieldDropdown(dropdownOptions), "Port");
     this.setOutput(true, Types.DECIMAL.typeName);
     this.setTooltip(Blockly.Msg.senseBox_soundsensor_dfrobot_tooltip);
-    this.setHelpUrl(Blockly.Msg.senseBox_soundsensor_dfrobot_helpurl)
+    this.setHelpUrl(Blockly.Msg.senseBox_soundsensor_dfrobot_helpurl);
+  },
+};
+
+
+
+/**
+ * rainsensor hydreon rg-15 
+ */
+
+Blockly.Blocks["sensebox_rainsensor_hydreon_rg15"] = {
+  init: function () {
+    var dropdownOptionsPorts = [
+      [Blockly.Msg.sensebox_rainsensor_hydreon_rg15_serial1, "Serial1"],
+      [Blockly.Msg.sensebox_rainsensor_hydreon_rg15_serial2, "Serial2"],
+    ];
+    var dropdownOptionsValues = [
+      [Blockly.Msg.sensebox_rainsensor_hydreon_rg15_acc, "getAccumulation"],
+      [Blockly.Msg.sensebox_rainsensor_hydreon_rg15_totalAcc, "getTotalAccumulation"],
+      [Blockly.Msg.sensebox_rainsensor_hydreon_rg15_eventAcc, "getEventAccumulation"],
+      [Blockly.Msg.sensebox_rainsensor_hydreon_rg15_rainInt, "getRainfallIntensity"],
+    ];
+    this.setColour(getColour().sensebox);
+    this.appendDummyInput()
+      .appendField(Blockly.Msg.sensebox_rainsensor_hydreon_rg15);
+    this.appendDummyInput()
+      .appendField(Blockly.Msg.sensebox_rainsensor_hydreon_rg15_port)
+      .appendField(new Blockly.FieldDropdown(dropdownOptionsPorts), "SERIAL");
+    this.appendDummyInput()
+      .appendField(Blockly.Msg.sensebox_rainsensor_hydreon_rg15_value)
+      .appendField(new Blockly.FieldDropdown(dropdownOptionsValues), "VALUE");
+    this.setOutput(true, Types.DECIMAL.typeName);
+    this.setTooltip(Blockly.Msg.sensebox_rainsensor_hydreon_rg15_tooltip);
+    this.setHelpUrl(Blockly.Msg.sensebox_rainsensor_hydreon_rg15_helpurl);
+  },
+};
+
+
+/**
+ * Infineon DPS310 Pressure Sensor
+ *
+ */
+
+Blockly.Blocks["sensebox_sensor_dps310"] = {
+  init: function () {
+    var dropdownOptions = [
+      [Blockly.Msg.senseBox_pressure, "Pressure"],
+      [Blockly.Msg.senseBox_temp, "Temperature"],
+      [Blockly.Msg.senseBox_gps_alt, "Altitude"],
+    ];
+    var dropdown = new Blockly.FieldDropdown(dropdownOptions, function (
+      option
+    ) {
+      var input =
+        option === "Pressure" ||
+        option === "Temperature" ||
+        option === "Altitude";
+      this.sourceBlock_.updateShape_(input);
+    });
+    this.appendDummyInput().appendField(Blockly.Msg.senseBox_sensor_dps310);
+    this.appendDummyInput()
+      .setAlign(Blockly.ALIGN_RIGHT)
+      .appendField(Blockly.Msg.senseBox_value)
+      .appendField(dropdown, "NAME");
+    this.setColour(getColour().sensebox);
+    this.setOutput(true, Types.DECIMAL.typeName);
+    this.setTooltip(Blockly.Msg.senseBox_sensor_dps310_tooltip);
+    this.setHelpUrl(Blockly.Msg.senseBox_sensor_dps310_helpurl);
+    this.getField("NAME").setValidator(
+      function (val) {
+        this.updateShape_(val === "Altitude");
+      }.bind(this)
+    );
+  },
+  updateShape_(isAltitude) {
+    if (isAltitude) {
+      if (this.getInput("extraField") == null) {
+        this.appendDummyInput("extraField")
+          .setAlign(Blockly.ALIGN_RIGHT)
+          .appendField(Blockly.Msg.senseBox_pressure_referencePressure)
+          .appendField(new Blockly.FieldTextInput("1013"), "referencePressure")
+          .appendField(Blockly.Msg.senseBox_pressure_referencePressure_dim);
       }
+    } else {
+      this.removeInput("extraField", true);
+    }
+  },
 };

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

@@ -1,13 +1,13 @@
-import Blockly from 'blockly';
-import { getColour } from '../helpers/colour'
+import Blockly from "blockly";
+import { getColour } from "../helpers/colour";
+import * as Types from "../helpers/types";
 
-Blockly.Blocks['sensebox_wifi'] = {
+Blockly.Blocks["sensebox_wifi"] = {
   init: function () {
     this.setTooltip(Blockly.Msg.senseBox_wifi_tooltip);
-        this.setHelpUrl('');
+    this.setHelpUrl("");
     this.setColour(getColour().sensebox);
-        this.appendDummyInput()
-            .appendField(Blockly.Msg.senseBox_wifi_connect);
+    this.appendDummyInput().appendField(Blockly.Msg.senseBox_wifi_connect);
     this.appendDummyInput()
       .setAlign(Blockly.ALIGN_LEFT)
       .appendField(Blockly.Msg.senseBox_wifi_ssid)
@@ -16,7 +16,7 @@ Blockly.Blocks['sensebox_wifi'] = {
       .setAlign(Blockly.ALIGN_LEFT)
       .appendField(Blockly.Msg.senseBox_output_password)
       .appendField(new Blockly.FieldTextInput("Password"), "Password");
-        this.setHelpUrl(Blockly.Msg.senseBox_wifi_helpurl)
+    this.setHelpUrl(Blockly.Msg.senseBox_wifi_helpurl);
     this.setPreviousStatement(true, null);
     this.setNextStatement(true, null);
   },
@@ -33,28 +33,121 @@ Blockly.Blocks['sensebox_wifi'] = {
     } while (block);
     if (legal) {
       this.setWarningText(null);
-
     } else {
       this.setWarningText(Blockly.Msg.CONTROLS_FLOW_STATEMENTS_WARNING);
-
     }
   },
-    LOOP_TYPES: ['arduino_functions'],
+  LOOP_TYPES: ["arduino_functions"],
 };
 
-Blockly.Blocks['sensebox_startap'] = {
+Blockly.Blocks["sensebox_startap"] = {
   init: function () {
     this.setTooltip(Blockly.Msg.senseBox_wifi_startap_tooltip);
-        this.setHelpUrl('');
+    this.setHelpUrl("");
     this.setColour(getColour().sensebox);
-        this.appendDummyInput()
-            .appendField(Blockly.Msg.senseBox_wifi_startap);
+    this.appendDummyInput().appendField(Blockly.Msg.senseBox_wifi_startap);
     this.appendDummyInput()
       .setAlign(Blockly.ALIGN_LEFT)
       .appendField(Blockly.Msg.senseBox_wifi_ssid)
       .appendField(new Blockly.FieldTextInput("SSID"), "SSID");
-        this.setHelpUrl(Blockly.Msg.senseBox_wifi_helpurl)
+    this.setHelpUrl(Blockly.Msg.senseBox_wifi_helpurl);
     this.setPreviousStatement(true, null);
     this.setNextStatement(true, null);
+  },
+};
+
+Blockly.Blocks["sensebox_ethernet"] = {
+  init: function () {
+    this.setTooltip(Blockly.Msg.senseBox_ethernet_tooltip);
+    this.setHelpUrl("");
+    this.setColour(getColour().sensebox);
+    this.appendDummyInput()
+      .appendField(Blockly.Msg.senseBox_ethernet)
+      .appendField(
+        new Blockly.FieldDropdown([
+          [Blockly.Msg.senseBox_ethernet_dhcp, "Dhcp"],
+          [Blockly.Msg.senseBox_ethernet_manuel_config, "Manual"],
+        ]),
+        "dhcp"
+      );
+    this.appendDummyInput()
+      .appendField(Blockly.Msg.senseBox_ethernet_mac)
+      .appendField(
+        new Blockly.FieldTextInput("0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED"),
+        "mac"
+      );
+
+    this.setHelpUrl(Blockly.Msg.senseBox_ethernet_helpurl);
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+    this.getField("dhcp").setValidator(
+      function (val) {
+        this.updateShape_(val === "Manual");
+      }.bind(this)
+    );
+  },
+
+  updateShape_(isManual) {
+    if (isManual) {
+      this.appendDummyInput("ip-field")
+        .appendField(Blockly.Msg.senseBox_ethernet_ip)
+        .appendField(new Blockly.FieldTextInput("192.168.1.100"), "ip");
+      this.appendDummyInput("subnetmask-field")
+        .appendField(Blockly.Msg.senseBox_ethernet_subnetmask)
+        .appendField(new Blockly.FieldTextInput("255.255.255.0"), "subnetmask");
+      this.appendDummyInput("gateway-field")
+        .appendField(Blockly.Msg.senseBox_ethernet_gateway)
+        .appendField(new Blockly.FieldTextInput("192.168.1.1"), "gateway");
+      this.appendDummyInput("dns-field")
+        .appendField(Blockly.Msg.senseBox_ethernet_dns)
+        .appendField(new Blockly.FieldTextInput("8.8.8.8"), "dns");
+    } else {
+      this.removeInput("ip-field", true);
+      this.removeInput("subnetmask-field", true);
+      this.removeInput("gateway-field", true);
+      this.removeInput("dns-field", true);
+    }
+  },
+};
+
+Blockly.Blocks["sensebox_ethernetIp"] = {
+  init: function () {
+    this.appendDummyInput().appendField(Blockly.Msg.senseBox_ethernet_ip);
+
+    this.setColour(getColour().sensebox);
+    this.setHelpUrl(Blockly.Msg.senseBox_ethernetIp_helpurl);
+    this.setTooltip(Blockly.Msg.senseBox_ethernet_ip_tooltip);
+    this.setOutput(true, null);
   }
 };
+
+Blockly.Blocks["sensebox_wifi_status"] = {
+  init: function () {
+    this.setTooltip(Blockly.Msg.senseBox_wifi_status_tooltip);
+    this.setColour(getColour().sensebox);
+    this.appendDummyInput().appendField(Blockly.Msg.senseBox_wifi_status);
+    this.setOutput(true, Types.BOOLEAN.typeName);
+    this.setHelpUrl(Blockly.Msg.senseBox_wifi_status_helpurl);
+  },
+};
+
+Blockly.Blocks["sensebox_get_ip"] = {
+  init: function () {
+    this.setTooltip(Blockly.Msg.senseBox_wifi_ip_tooltip);
+    this.setColour(getColour().sensebox);
+    this.appendDummyInput().appendField(Blockly.Msg.senseBox_wifi_ip);
+    this.setOutput(true, Types.TEXT.typeName);
+    this.setHelpUrl(Blockly.Msg.senseBox_wifi_ip_helpurl);
+  },
+};
+
+Blockly.Blocks["sensebox_wifi_rssi"] = {
+  init: function () {
+    this.setTooltip(Blockly.Msg.senseBox_wifi_rssi_tooltip);
+    this.setColour(getColour().sensebox);
+    this.appendDummyInput().appendField(Blockly.Msg.senseBox_wifi_rssi);
+    this.setOutput(true, Types.NUMBER.typeName);
+    this.setHelpUrl(Blockly.Msg.senseBox_wifi_rssi_helpurl);
+  },
+};
+

src/components/Blockly/blocks/serial.js

@@ -0,0 +1,47 @@
+import * as Blockly from "blockly/core";
+import { getColour } from "../helpers/colour";
+import { selectedBoard } from "../helpers/board";
+
+Blockly.Blocks["init_serial_monitor"] = {
+  init: function () {
+    this.setPreviousStatement(true);
+    this.setNextStatement(true);
+    this.setColour(getColour().serial);
+    this.setHelpUrl("http://arduino.cc/en/Serial/Begin");
+    this.appendDummyInput()
+      .appendField(Blockly.Msg.ARD_SERIAL_SETUP)
+      .appendField(
+        new Blockly.FieldDropdown(selectedBoard().serial),
+        "SERIAL_ID"
+      )
+      .appendField(Blockly.Msg.ARD_SERIAL_SPEED)
+      .appendField(
+        new Blockly.FieldDropdown(selectedBoard().serialSpeed),
+        "SPEED"
+      )
+      .appendField(Blockly.Msg.ARD_SERIAL_BPS);
+    this.setInputsInline(true);
+    this.setTooltip(Blockly.Msg.ARD_SERIAL_SETUP_TIP);
+  },
+};
+
+Blockly.Blocks["print_serial_monitor"] = {
+  init: function () {
+    this.setPreviousStatement(true);
+    this.setNextStatement(true);
+    this.setColour(getColour().serial);
+    this.setHelpUrl("http://www.arduino.cc/en/Serial/Print");
+    this.appendDummyInput()
+      .appendField(
+        new Blockly.FieldDropdown(selectedBoard().serial),
+        "SERIAL_ID"
+      )
+      .appendField(Blockly.Msg.ARD_SERIAL_PRINT);
+    this.appendValueInput("CONTENT");
+    this.appendDummyInput()
+      .appendField(new Blockly.FieldCheckbox("TRUE"), "NEW_LINE")
+      .appendField(Blockly.Msg.ARD_SERIAL_PRINT_NEWLINE);
+    this.setInputsInline(true);
+    this.setTooltip(Blockly.Msg.ARD_SERIAL_PRINT_TIP);
+  },
+};

src/components/Blockly/blocks/time.js

@@ -8,81 +8,76 @@
  *     The arduino built in functions syntax can be found in
  *     http://arduino.cc/en/Reference/HomePage
  */
-import Blockly from 'blockly';
-import { getColour } from '../helpers/colour'
-import * as Types from '../helpers/types'
+import Blockly from "blockly";
+import { getColour } from "../helpers/colour";
+import * as Types from "../helpers/types";
 
-
-Blockly.Blocks['time_delay'] = {
+Blockly.Blocks["time_delay"] = {
   /**
    * Delay block definition
    * @this Blockly.Block
    */
   init: function () {
-        this.setHelpUrl('http://arduino.cc/en/Reference/Delay');
+    this.setHelpUrl("http://arduino.cc/en/Reference/Delay");
     this.setColour(getColour().time);
-        this.appendValueInput('DELAY_TIME_MILI')
+    this.appendValueInput("DELAY_TIME_MILI")
       .setCheck(Types.NUMBER.checkList)
       .appendField(Blockly.Msg.ARD_TIME_DELAY);
-        this.appendDummyInput()
-            .appendField(Blockly.Msg.ARD_TIME_MS);
+    this.appendDummyInput().appendField(Blockly.Msg.ARD_TIME_MS);
     this.setInputsInline(true);
     this.setPreviousStatement(true, null);
     this.setNextStatement(true, null);
     this.setTooltip(Blockly.Msg.ARD_TIME_DELAY_TIP);
-    }
+  },
 };
 
-Blockly.Blocks['time_delaymicros'] = {
+Blockly.Blocks["time_delaymicros"] = {
   /**
    * delayMicroseconds block definition
    * @this Blockly.Block
    */
   init: function () {
-        this.setHelpUrl('http://arduino.cc/en/Reference/DelayMicroseconds');
+    this.setHelpUrl("http://arduino.cc/en/Reference/DelayMicroseconds");
     this.setColour(getColour().time);
-        this.appendValueInput('DELAY_TIME_MICRO')
+    this.appendValueInput("DELAY_TIME_MICRO")
       .setCheck(Types.NUMBER.checkList)
       .appendField(Blockly.Msg.ARD_TIME_DELAY);
-        this.appendDummyInput()
-            .appendField(Blockly.Msg.ARD_TIME_DELAY_MICROS);
+    this.appendDummyInput().appendField(Blockly.Msg.ARD_TIME_DELAY_MICROS);
     this.setInputsInline(true);
     this.setPreviousStatement(true, null);
     this.setNextStatement(true, null);
     this.setTooltip(Blockly.Msg.ARD_TIME_DELAY_MICRO_TIP);
-    }
+  },
 };
 
-Blockly.Blocks['time_millis'] = {
+Blockly.Blocks["time_millis"] = {
   /**
    * Elapsed time in milliseconds block definition
    * @this Blockly.Block
    */
   init: function () {
-        this.setHelpUrl('http://arduino.cc/en/Reference/Millis');
+    this.setHelpUrl("http://arduino.cc/en/Reference/Millis");
     this.setColour(getColour().time);
-        this.appendDummyInput()
-            .appendField(Blockly.Msg.ARD_TIME_MILLIS);
-        this.setOutput(true, Types.LARGE_NUMBER.typeId);
+    this.appendDummyInput().appendField(Blockly.Msg.ARD_TIME_MILLIS);
+    this.setOutput(true, Types.LARGE_NUMBER.typeName);
     this.setTooltip(Blockly.Msg.ARD_TIME_MILLIS_TIP);
   },
   /** @return {string} The type of return value for the block, an integer. */
   getBlockType: function () {
     return Blockly.Types.LARGE_NUMBER;
-    }
+  },
 };
 
-Blockly.Blocks['time_micros'] = {
+Blockly.Blocks["time_micros"] = {
   /**
    * Elapsed time in microseconds block definition
    * @this Blockly.Block
    */
   init: function () {
-        this.setHelpUrl('http://arduino.cc/en/Reference/Micros');
+    this.setHelpUrl("http://arduino.cc/en/Reference/Micros");
     this.setColour(getColour().time);
-        this.appendDummyInput()
-            .appendField(Blockly.Msg.ARD_TIME_MICROS);
-        this.setOutput(true, Types.LARGE_NUMBER.typeId);
+    this.appendDummyInput().appendField(Blockly.Msg.ARD_TIME_MICROS);
+    this.setOutput(true, Types.LARGE_NUMBER.typeName);
     this.setTooltip(Blockly.Msg.ARD_TIME_MICROS_TIP);
   },
   /**
@@ -91,40 +86,57 @@ Blockly.Blocks['time_micros'] = {
    */
   getBlockType: function () {
     return Types.LARGE_NUMBER;
-    }
+  },
 };
 
-Blockly.Blocks['infinite_loop'] = {
+Blockly.Blocks["infinite_loop"] = {
   /**
    * Waits forever, end of program.
    * @this Blockly.Block
    */
   init: function () {
-        this.setHelpUrl('');
+    this.setHelpUrl("");
     this.setColour(getColour().time);
-        this.appendDummyInput()
-            .appendField(Blockly.Msg.ARD_TIME_INF);
+    this.appendDummyInput().appendField(Blockly.Msg.ARD_TIME_INF);
     this.setInputsInline(true);
     this.setPreviousStatement(true);
     this.setTooltip(Blockly.Msg.ARD_TIME_INF_TIP);
-    }
+  },
 };
 
-Blockly.Blocks['sensebox_interval_timer'] = {
+// Blockly.Blocks["sensebox_interval_timer"] = {
+//   init: function () {
+//     this.setTooltip(Blockly.Msg.senseBox_interval_timer_tip);
+//     this.setInputsInline(true);
+//     this.setHelpUrl("");
+//     this.setColour(getColour().time);
+//     this.appendDummyInput().appendField(Blockly.Msg.senseBox_interval_timer);
+//     this.appendDummyInput()
+//       .setAlign(Blockly.ALIGN_LEFT)
+//       .appendField(new Blockly.FieldTextInput("10000"), "interval")
+//       .appendField(Blockly.Msg.senseBox_interval);
+//     this.appendStatementInput("DO").setCheck(null);
+//     this.setPreviousStatement(true, null);
+//     this.setNextStatement(true, null);
+//   },
+// };
+
+Blockly.Blocks["sensebox_interval_timer"] = {
   init: function () {
     this.setTooltip(Blockly.Msg.senseBox_interval_timer_tip);
     this.setInputsInline(true);
-        this.setHelpUrl('');
+    this.setHelpUrl("");
     this.setColour(getColour().time);
     this.appendDummyInput()
-            .appendField(Blockly.Msg.senseBox_interval_timer);
+      .appendField(Blockly.Msg.senseBox_interval_timer)
+      .appendField(new Blockly.FieldTextInput("Interval"), "name");
     this.appendDummyInput()
+      .appendField(Blockly.Msg.senseBox_interval_time)
       .setAlign(Blockly.ALIGN_LEFT)
       .appendField(new Blockly.FieldTextInput("10000"), "interval")
       .appendField(Blockly.Msg.senseBox_interval);
-        this.appendStatementInput('DO')
-            .setCheck(null);
+    this.appendStatementInput("DO").setCheck(null);
     this.setPreviousStatement(true, null);
     this.setNextStatement(true, null);
-    }
+  },
 };

src/components/Blockly/blocks/watchdog.js

@@ -0,0 +1,28 @@
+import Blockly from "blockly/core";
+import { getColour } from "../helpers/colour";
+
+Blockly.Blocks["watchdog_enable"] = {
+  init: function () {
+    this.appendDummyInput()
+      .appendField("Watchdog aktivieren")
+      .appendField(new Blockly.FieldTextInput("10000"), "TIME")
+      .appendField("ms");
+
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+    this.setColour(getColour().io);
+    this.setTooltip("");
+    this.setHelpUrl("");
+  },
+};
+
+Blockly.Blocks["watchdog_reset"] = {
+  init: function () {
+    this.appendDummyInput().appendField("Watchdog zurücksetzen");
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+    this.setColour(getColour().io);
+    this.setTooltip("");
+    this.setHelpUrl("");
+  },
+};

src/components/Blockly/generator/generator.js

@@ -26,6 +26,17 @@
 
 import * as Blockly from "blockly/core";
 
+import store from "../../../store";
+
+var ota = store.getState().general.platform
+  ? store.getState().general.platform
+  : null;
+store.subscribe(() => {
+  ota = store.getState().general.platform
+    ? store.getState().general.platform
+    : null;
+});
+
 /**
  * Arduino code generator.
  * @type !Blockly.Generator
@@ -51,9 +62,7 @@ Blockly["Arduino"].addReservedWords(
     "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"
+    "bit,attachInterrupt,detachInterrupt,interrupts,noInterrupts,short,isBtnPressed"
 );
 
 /**
@@ -121,21 +130,21 @@ Blockly["Arduino"].init = function (workspace) {
 
   Blockly["Arduino"].variablesInitCode_ = "";
 
-  if (!Blockly["Arduino"].variableDB_) {
-    Blockly["Arduino"].variableDB_ = new Blockly.Names(
+  if (!Blockly["Arduino"].nameDB_) {
+    Blockly["Arduino"].nameDB_ = new Blockly.Names(
       Blockly["Arduino"].RESERVED_WORDS_
     );
   } else {
-    Blockly["Arduino"].variableDB_.reset();
+    Blockly["Arduino"].nameDB_.reset();
   }
 
-  Blockly["Arduino"].variableDB_.setVariableMap(workspace.getVariableMap());
+  Blockly["Arduino"].nameDB_.setVariableMap(workspace.getVariableMap());
 
   // We don't have developer variables for now
   // // Add developer variables (not created or named by the user).
   // var devVarList = Blockly.Variables.allDeveloperVariables(workspace);
   // for (var i = 0; i < devVarList.length; i++) {
-  //     defvars.push(Blockly['Arduino'].variableDB_.getName(devVarList[i],
+  //     defvars.push(Blockly['Arduino'].nameDB_.getName(devVarList[i],
   //         Blockly.Names.DEVELOPER_VARIABLE_TYPE));
   // }
 
@@ -145,7 +154,7 @@ Blockly["Arduino"].init = function (workspace) {
   for (i = 0; i < doubleVariables.length; i += 1) {
     variableCode +=
       "double " +
-      Blockly["Arduino"].variableDB_.getName(
+      Blockly["Arduino"].nameDB_.getName(
         doubleVariables[i].getId(),
         Blockly.Variables.NAME_TYPE
       ) +
@@ -156,7 +165,7 @@ Blockly["Arduino"].init = function (workspace) {
   for (i = 0; i < stringVariables.length; i += 1) {
     variableCode +=
       "String " +
-      Blockly["Arduino"].variableDB_.getName(
+      Blockly["Arduino"].nameDB_.getName(
         stringVariables[i].getId(),
         Blockly.Variables.NAME_TYPE
       ) +
@@ -167,7 +176,7 @@ Blockly["Arduino"].init = function (workspace) {
   for (i = 0; i < booleanVariables.length; i += 1) {
     variableCode +=
       "boolean " +
-      Blockly["Arduino"].variableDB_.getDistinctName(
+      Blockly["Arduino"].nameDB_.getDistinctName(
         booleanVariables[i].getId(),
         Blockly.Variables.NAME_TYPE
       ) +
@@ -178,7 +187,7 @@ Blockly["Arduino"].init = function (workspace) {
   for (i = 0; i < colourVariables.length; i += 1) {
     variableCode +=
       "RGB " +
-      Blockly["Arduino"].variableDB_.getName(
+      Blockly["Arduino"].nameDB_.getName(
         colourVariables[i].getId(),
         Blockly.Variables.NAME_TYPE
       ) +
@@ -254,7 +263,29 @@ Blockly["Arduino"].finish = function (code) {
     "\n}\n";
 
   let loopCode = "\nvoid loop() { \n" + loopCodeOnce + code + "\n}\n";
-
+  // only add OTA code if tablet mode is enabled
+  if (ota === true) {
+    code =
+      devVariables +
+      "\n" +
+      "#include <SenseBoxOTA.h>" +
+      "\n" +
+      libraryCode +
+      "\n" +
+      variablesCode +
+      "\n" +
+      definitionsCode +
+      "\n" +
+      codeFunctions +
+      "\n" +
+      Blockly["Arduino"].variablesInitCode_ +
+      "\n" +
+      functionsCode +
+      "\n" +
+      setupCode +
+      "\n" +
+      loopCode;
+  } else {
     // Convert the definitions dictionary into a list.
     code =
       devVariables +
@@ -274,6 +305,7 @@ Blockly["Arduino"].finish = function (code) {
       setupCode +
       "\n" +
       loopCode;
+  }
 
   // Clean up temporary data.
   delete Blockly["Arduino"].definitions_;
@@ -281,7 +313,7 @@ Blockly["Arduino"].finish = function (code) {
   delete Blockly["Arduino"].loopCodeOnce_;
   delete Blockly["Arduino"].variablesInitCode_;
   delete Blockly["Arduino"].libraries_;
-  Blockly["Arduino"].variableDB_.reset();
+  Blockly["Arduino"].nameDB_.reset();
 
   return code;
 };

src/components/Blockly/generator/index.js

@@ -19,7 +19,9 @@ import "./map";
 import "./io";
 import "./audio";
 import "./procedures";
+import "./serial";
 import "./time";
 import "./variables";
 import "./lists";
+import "./watchdog";
 import "./webserver";

src/components/Blockly/generator/math.js

@@ -275,7 +275,7 @@ Blockly.Arduino["math_change"] = function (block) {
       "DELTA",
       Blockly.Arduino.ORDER_ADDITIVE
     ) || "0";
-  var varName = Blockly.Arduino.variableDB_.getName(
+  var varName = Blockly.Arduino.nameDB_.getName(
     block.getFieldValue("VAR"),
     Blockly.Variables.NAME_TYPE
   );

src/components/Blockly/generator/mqtt.js

@@ -1,52 +1,77 @@
-import * as Blockly from 'blockly/core';
+import * as Blockly from "blockly/core";
 /**
-* MQTT Blocks 
-*/
+ * MQTT Blocks
+ */
 
 let service;
 
 Blockly.Arduino.sensebox_mqtt_setup = function () {
-    var server = this.getFieldValue('server');
-    var port = this.getFieldValue('port');
-    var username = this.getFieldValue('username');
-    var pass = this.getFieldValue('password');
-    service = this.getFieldValue('service');
-    Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"';
-    Blockly.Arduino.libraries_['library_adafruitmqtt'] = '#include "Adafruit_MQTT.h"';
-    Blockly.Arduino.libraries_['library_adafruitmqttclient'] = '#include "Adafruit_MQTT_Client.h"';
-    Blockly.Arduino.definitions_['mqtt_server'] = '#define SERVER      "' + server + '"';
-    Blockly.Arduino.definitions_['mqtt_port'] = '#define SERVERPORT      ' + port + '';
-    Blockly.Arduino.definitions_['mqtt_username'] = '#define USERNAME      "' + username + '"';
-    Blockly.Arduino.definitions_['mqtt_pass'] = '#define PASS      "' + pass + '"';
-    Blockly.Arduino.definitions_['wifi_client'] = 'WiFiClient client;';
-    Blockly.Arduino.definitions_['mqtt_client'] = 'Adafruit_MQTT_Client mqtt(&client, SERVER, SERVERPORT, USERNAME, PASS);'
-    var code = '';
+  var server = this.getFieldValue("server");
+  var port = this.getFieldValue("port");
+  var username = this.getFieldValue("username");
+  var pass = this.getFieldValue("password");
+  service = this.getFieldValue("service");
+  Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
+  Blockly.Arduino.libraries_["library_adafruitmqtt"] =
+    '#include <Adafruit_MQTT.h> //http://librarymanager/All#Adafruit_MQTT_Library"';
+  Blockly.Arduino.libraries_["library_adafruitmqttclient"] =
+    '#include <Adafruit_MQTT_Client.h>';
+  Blockly.Arduino.definitions_["mqtt_server"] =
+    '#define SERVER      "' + server + '"';
+  Blockly.Arduino.definitions_["mqtt_port"] =
+    "#define SERVERPORT      " + port + "";
+  Blockly.Arduino.definitions_["mqtt_username"] =
+    '#define USERNAME      "' + username + '"';
+  Blockly.Arduino.definitions_["mqtt_pass"] =
+    '#define PASS      "' + pass + '"';
+  Blockly.Arduino.definitions_["wifi_client"] = "WiFiClient client;";
+  Blockly.Arduino.definitions_["mqtt_client"] =
+    "Adafruit_MQTT_Client mqtt(&client, SERVER, SERVERPORT, USERNAME, PASS);";
+  var code = "";
   return code;
 };
 
 Blockly.Arduino.sensebox_mqtt_publish = function (block) {
-    var feedname = this.getFieldValue('publishfeed');
+  var feedname = this.getFieldValue("publishfeed");
   var res = feedname.split("/");
   var feed_client = res[res.length - 1];
-    var value = Blockly.Arduino.valueToCode(this, 'value', Blockly.Arduino.ORDER_ATOMIC) || '"No Block connected"';
+  var value =
+    Blockly.Arduino.valueToCode(this, "value", Blockly.Arduino.ORDER_ATOMIC) ||
+    '"No Block connected"';
 
   switch (service) {
-        case 'adafruitio':
-            Blockly.Arduino.definitions_['mqtt_' + feed_client + ''] = 'Adafruit_MQTT_Publish ' + feed_client + ' = Adafruit_MQTT_Publish(&mqtt, USERNAME "/feeds/' + feedname + '");'
+    case "adafruitio":
+      Blockly.Arduino.definitions_["mqtt_" + feed_client + ""] =
+        "Adafruit_MQTT_Publish " +
+        feed_client +
+        ' = Adafruit_MQTT_Publish(&mqtt, USERNAME "/feeds/' +
+        feedname +
+        '");';
       break;
-        case 'dioty':
-            Blockly.Arduino.definitions_['mqtt_' + feed_client + ''] = 'Adafruit_MQTT_Publish ' + feed_client + ' = Adafruit_MQTT_Publish(&mqtt, "/"USERNAME"/' + feedname + '");'
+    case "dioty":
+      Blockly.Arduino.definitions_["mqtt_" + feed_client + ""] =
+        "Adafruit_MQTT_Publish " +
+        feed_client +
+        ' = Adafruit_MQTT_Publish(&mqtt, "/"USERNAME"/' +
+        feedname +
+        '");';
       break;
-        case 'custom':
-            Blockly.Arduino.definitions_['mqtt_' + feed_client + ''] = 'Adafruit_MQTT_Publish ' + feed_client + ' = Adafruit_MQTT_Publish(&mqtt, "' + feedname + '");'
+    case "custom":
+      Blockly.Arduino.definitions_["mqtt_" + feed_client + ""] =
+        "Adafruit_MQTT_Publish " +
+        feed_client +
+        ' = Adafruit_MQTT_Publish(&mqtt, "' +
+        feedname +
+        '");';
       break;
     default:
       break;
-
   }
 
   //Blockly.Arduino.definitions_['mqtt_' + feed_client + ''] = 'Adafruit_MQTT_Publish ' + feed_client + ' = Adafruit_MQTT_Publish(&mqtt, USERNAME "/feeds/' + feedname + '");'
-    Blockly.Arduino.codeFunctions_['mqtt_connect_function'] = `// Function to connect and reconnect as necessary to the MQTT server.
+  Blockly.Arduino.codeFunctions_[
+    "mqtt_connect_function"
+  ] = `// Function to connect and reconnect as necessary to the MQTT server.
     // Should be called in the loop function and it will take care if connecting.
 void MQTT_connect() {
       int8_t ret;
@@ -59,23 +84,34 @@ void MQTT_connect() {
            delay(5000);  // wait 5 seconds
       }
 }`;
-    Blockly.Arduino.loopCodeOnce_['mqtt_connect'] = 'MQTT_connect();';
-    var code = '' + feed_client + '.publish(' + value + ');';
-    return code
-};
-
-Blockly.Arduino.sensebox_mqtt_subscribe = function (block) {
-    var feedname = this.getFieldValue('subscribefeed');
-    var x = 5, feed_client;
-    feed_client = feedname.substr(feedname.length - x, x);
-    Blockly.Arduino.definitions_['mqtt_' + feed_client + ''] = 'Adafruit_MQTT_Subscribe ' + feed_client + '= Adafruit_MQTT_Subscribe(&mqtt,' + feedname + ');';
-    Blockly.Arduino.codeFunctions_['mqtt_' + feed_client + 'callbackFunction'] = `void ` + feed_client + `Callback (double x){
-      Serial.println(x);
-    }`;
-    Blockly.Arduino.setupCode_['mqtt_' + feed_client + '_callback'] = '' + feed_client + '.setCallback(' + feed_client + 'Callback);';
-    Blockly.Arduino.setupCode_['mqtt_' + feed_client + '_subscribe'] = 'mqtt.subscribe(&' + feed_client + ');';
-    Blockly.Arduino.loopCodeOnce_['mqtt_processPackages'] = 'mqtt.processPackets(10);';
-    var code = '';
+  Blockly.Arduino.loopCodeOnce_["mqtt_connect"] = "MQTT_connect();";
+  var code = "" + feed_client + ".publish(" + value + ");";
   return code;
 };
 
+Blockly.Arduino.sensebox_mqtt_subscribe = function (block) {
+  var feedname = this.getFieldValue("subscribefeed");
+  var x = 5,
+    feed_client;
+  feed_client = feedname.substr(feedname.length - x, x);
+  Blockly.Arduino.definitions_["mqtt_" + feed_client + ""] =
+    "Adafruit_MQTT_Subscribe " +
+    feed_client +
+    "= Adafruit_MQTT_Subscribe(&mqtt," +
+    feedname +
+    ");";
+  Blockly.Arduino.codeFunctions_["mqtt_" + feed_client + "callbackFunction"] =
+    `void ` +
+    feed_client +
+    `Callback (double x){
+      Serial.println(x);
+    }`;
+  Blockly.Arduino.setupCode_["mqtt_" + feed_client + "_callback"] =
+    "" + feed_client + ".setCallback(" + feed_client + "Callback);";
+  Blockly.Arduino.setupCode_["mqtt_" + feed_client + "_subscribe"] =
+    "mqtt.subscribe(&" + feed_client + ");";
+  Blockly.Arduino.loopCodeOnce_["mqtt_processPackages"] =
+    "mqtt.processPackets(10);";
+  var code = "";
+  return code;
+};

src/components/Blockly/generator/procedures.js

@@ -1,5 +1,4 @@
-import * as Blockly from 'blockly/core';
-
+import * as Blockly from "blockly/core";
 
 /**
  * Code generator to add code into the setup() and loop() functions.
@@ -7,91 +6,92 @@ import * as Blockly from 'blockly/core';
  * @param {!Blockly.Block} block Block to generate the code from.
  * @return {string} Completed code.
  */
-Blockly.Arduino['arduino_functions'] = function (block) {
+Blockly.Arduino["arduino_functions"] = function (block) {
   // Edited version of Blockly.Generator.prototype.statementToCode
   function statementToCodeNoTab(block, name) {
     var targetBlock = block.getInputTargetBlock(name);
     var code = Blockly.Arduino.blockToCode(targetBlock);
-        if (typeof code != 'string') {
-            throw new Error('Expecting code from statement block "' + targetBlock.type + '".');
+    if (typeof code != "string") {
+      throw new Error(
+        'Expecting code from statement block "' + targetBlock.type + '".'
+      );
     }
     return code;
   }
 
-    var setupBranch = Blockly.Arduino.statementToCode(block, 'SETUP_FUNC');
+  var setupBranch = Blockly.Arduino.statementToCode(block, "SETUP_FUNC");
   // //var setupCode = Blockly.Arduino.scrub_(block, setupBranch); No comment block
   if (setupBranch) {
-        Blockly.Arduino.setupCode_['mainsetup'] = setupBranch;
+    Blockly.Arduino.setupCode_["mainsetup"] = setupBranch;
   }
 
-    var loopBranch = statementToCodeNoTab(block, 'LOOP_FUNC');
+  var loopBranch = statementToCodeNoTab(block, "LOOP_FUNC");
   //var loopcode = Blockly.Arduino.scrub_(block, loopBranch); No comment block
   return loopBranch;
 };
 
-Blockly.Arduino['procedures_defreturn'] = function (block) {
+Blockly.Arduino["procedures_defreturn"] = function (block) {
   // Define a procedure with a return value.
-    const funcName = Blockly.Arduino.variableDB_.getName(
-        block.getFieldValue('NAME'),
+  const funcName = Blockly.Arduino.nameDB_.getName(
+    block.getFieldValue("NAME"),
     Blockly.Procedures.NAME_TYPE
   );
-    const branch = Blockly.Arduino.statementToCode(block, 'STACK');
-    const returnType = block.getFieldValue('RETURN TYPE') || 'void';
+  const branch = Blockly.Arduino.statementToCode(block, "STACK");
+  const returnType = block.getFieldValue("RETURN TYPE") || "void";
 
   let returnValue =
-        Blockly.Arduino.valueToCode(block, 'RETURN', Blockly.Arduino.ORDER_NONE) ||
-        '';
+    Blockly.Arduino.valueToCode(block, "RETURN", Blockly.Arduino.ORDER_NONE) ||
+    "";
   if (returnValue) {
-        returnValue = Blockly.Arduino.INDENT + 'return ' + returnValue + ';\n';
+    returnValue = Blockly.Arduino.INDENT + "return " + returnValue + ";\n";
   }
   const args = [];
   for (let i = 0; i < block.argumentVarModels_.length; i++) {
     args[i] =
       translateType(block.argumentVarModels_[i].type) +
-            ' ' +
+      " " +
       block.argumentVarModels_[i].name;
   }
   let code =
     translateType(returnType) +
-        ' ' +
+    " " +
     funcName +
-        '(' +
-        args.join(', ') +
-        ') {\n' +
+    "(" +
+    args.join(", ") +
+    ") {\n" +
     branch +
     returnValue +
-        '}';
+    "}";
   code = Blockly.Arduino.scrub_(block, code);
   // Add % so as not to collide with helper functions in definitions list.
-    Blockly.Arduino.functionNames_['%' + funcName] = code;
+  Blockly.Arduino.functionNames_["%" + funcName] = code;
   return null;
 };
 
 function translateType(type) {
   switch (type) {
-
-        case 'int':
-            return 'int';
-        case 'String':
-            return 'String';
-        case 'void':
-            return 'void';
-        case 'boolean':
-            return 'boolean';
-        case 'float':
-            return 'float'
+    case "int":
+      return "int";
+    case "String":
+      return "String";
+    case "void":
+      return "void";
+    case "boolean":
+      return "boolean";
+    case "float":
+      return "float";
     default:
-            throw new Error('Invalid Parameter Type');
+      throw new Error("Invalid Parameter Type");
   }
 }
 
-Blockly.Arduino['procedures_defnoreturn'] =
-    Blockly.Arduino['procedures_defreturn'];
+Blockly.Arduino["procedures_defnoreturn"] =
+  Blockly.Arduino["procedures_defreturn"];
 
-Blockly.Arduino['procedures_callreturn'] = function (block) {
+Blockly.Arduino["procedures_callreturn"] = function (block) {
   // Call a procedure with a return value.
-    const funcName = Blockly.Arduino.variableDB_.getName(
-        block.getFieldValue('NAME'),
+  const funcName = Blockly.Arduino.nameDB_.getName(
+    block.getFieldValue("NAME"),
     Blockly.Procedures.NAME_TYPE
   );
   const args = [];
@@ -99,18 +99,18 @@ Blockly.Arduino['procedures_callreturn'] = function (block) {
     args[i] =
       Blockly.Arduino.valueToCode(
         block,
-                'ARG' + i,
+        "ARG" + i,
         Blockly.Arduino.ORDER_COMMA
-            ) || 'null';
+      ) || "null";
   }
-    const code = funcName + '(' + args.join(', ') + ')';
+  const code = funcName + "(" + args.join(", ") + ")";
   return [code, Blockly.Arduino.ORDER_ATOMIC];
 };
 
-Blockly.Arduino['procedures_callnoreturn'] = function (block) {
+Blockly.Arduino["procedures_callnoreturn"] = function (block) {
   // Call a procedure with no return value.
-    const funcName = Blockly.Arduino.variableDB_.getName(
-        block.getFieldValue('NAME'),
+  const funcName = Blockly.Arduino.nameDB_.getName(
+    block.getFieldValue("NAME"),
     Blockly.Procedures.NAME_TYPE
   );
   const args = [];
@@ -118,10 +118,10 @@ Blockly.Arduino['procedures_callnoreturn'] = function (block) {
     args[i] =
       Blockly.Arduino.valueToCode(
         block,
-                'ARG' + i,
+        "ARG" + i,
         Blockly.Arduino.ORDER_COMMA
-            ) || 'null';
+      ) || "null";
   }
 
-    return funcName + '(' + args.join(', ') + ');\n';
+  return funcName + "(" + args.join(", ") + ");\n";
 };

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

@@ -2,9 +2,8 @@ import * as Blockly from "blockly/core";
 
 Blockly.Arduino.sensebox_phyphox_init = function () {
   var name = this.getFieldValue("devicename");
+  Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
   Blockly.Arduino.libraries_["phyphox_library"] = `#include <phyphoxBle.h>`;
-  Blockly.Arduino.libraries_["library_senseBoxMCU"] =
-    '#include "SenseBoxMCU.h"';
   Blockly.Arduino.phyphoxSetupCode_[
     "phyphox_start"
   ] = `PhyphoxBLE::start("${name}");`;
@@ -91,7 +90,9 @@ Blockly.Arduino.sensebox_phyphox_graph = function () {
   code += `${label}.setUnitY("${unity}");\n`;
   code += `${label}.setLabelX("${labelx}");\n`;
   code += `${label}.setLabelY("${labely}");\n`;
+  if (style === "dots"){
     code += `${label}.setStyle("${style}");\n`;
+  }
   code += `${label}.setChannel(${channelX}, ${channelY});\n`;
   code += `firstView.addElement(${label});\n`;
   return code;

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

@@ -1,45 +1,79 @@
-import * as Blockly from 'blockly/core';
+import * as Blockly from "blockly/core";
 
 /*Display Blocks*/
 Blockly.Arduino.sensebox_display_beginDisplay = function () {
-    Blockly.Arduino.libraries_['library_spi'] = '#include <SPI.h>';
-    Blockly.Arduino.libraries_['library_wire'] = '#include <Wire.h>';
-    Blockly.Arduino.libraries_['library_AdafruitGFX'] = '#include <Adafruit_GFX.h>';
-    Blockly.Arduino.libraries_['library_AdafruitSSD1306'] = '#include <Adafruit_SSD1306.h>';
-    Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"';
-    Blockly.Arduino.definitions_['define_display'] = '#define OLED_RESET 4\nAdafruit_SSD1306 display(OLED_RESET);';
-    Blockly.Arduino.setupCode_['sensebox_display_begin'] = 'senseBoxIO.powerI2C(true);\ndelay(2000);\ndisplay.begin(SSD1306_SWITCHCAPVCC, 0x3D);\ndisplay.display();\ndelay(100);\ndisplay.clearDisplay();';
-    var code = '';
+  Blockly.Arduino.libraries_["library_spi"] = "#include <SPI.h>";
+  Blockly.Arduino.libraries_["library_wire"] = "#include <Wire.h>";
+  Blockly.Arduino.libraries_["library_AdafruitGFX"] =
+    "#include <Adafruit_GFX.h> // http://librarymanager/All#Adafruit_GFX_Library";
+  Blockly.Arduino.libraries_["library_AdafruitSSD1306"] =
+    "#include <Adafruit_SSD1306.h> // http://librarymanager/All#Adafruit_SSD1306";
+  Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
+  Blockly.Arduino.definitions_[
+    "define_display_size"
+  ] = `#define SCREEN_WIDTH 128\n#define SCREEN_HEIGHT 64`;
+  Blockly.Arduino.definitions_["define_display"] =
+    "#define OLED_RESET -1\nAdafruit_SSD1306 display(SCREEN_WIDTH, SCREEN_HEIGHT, &Wire, OLED_RESET);";
+
+  Blockly.Arduino.setupCode_["sensebox_display_begin"] =
+    "senseBoxIO.powerI2C(true);\ndelay(2000);\ndisplay.begin(SSD1306_SWITCHCAPVCC, 0x3D);\ndisplay.display();\ndelay(100);\ndisplay.clearDisplay();";
+  var code = "";
   return code;
 };
 
 Blockly.Arduino.sensebox_display_clearDisplay = function () {
-    var code = 'display.clearDisplay();\n';
+  var code = "display.clearDisplay();\n";
   return code;
 };
 
 Blockly.Arduino.sensebox_display_printDisplay = function () {
-    var x = this.getFieldValue('X');
-    var y = this.getFieldValue('Y');
-    var printDisplay = Blockly.Arduino.valueToCode(this, 'printDisplay', Blockly.Arduino.ORDER_ATOMIC) || '"Keine Eingabe"';
-    var size = this.getFieldValue('SIZE');
-    var color = this.getFieldValue('COLOR');
-    var code = 'display.setCursor(' + x + ',' + y + ');\n';
-    code += 'display.setTextSize(' + size + ');\n';
-    code += 'display.setTextColor(' + color + ');\n';
-    code += 'display.println(' + printDisplay + ');\n';
+  var x = this.getFieldValue("X");
+  var y = this.getFieldValue("Y");
+  var printDisplay =
+    Blockly.Arduino.valueToCode(
+      this,
+      "printDisplay",
+      Blockly.Arduino.ORDER_ATOMIC
+    ) || '"Keine Eingabe"';
+  var size = this.getFieldValue("SIZE");
+  var color = this.getFieldValue("COLOR");
+  var code = "display.setCursor(" + x + "," + y + ");\n";
+  code += "display.setTextSize(" + size + ");\n";
+  code += "display.setTextColor(" + color + ");\n";
+  code += "display.println(" + printDisplay + ");\n";
   return code;
 };
 
-
 Blockly.Arduino.sensebox_display_fastPrint = function () {
-    var title1 = Blockly.Arduino.valueToCode(this, 'Title1', Blockly.Arduino.ORDER_ATOMIC) || '0'
-    var value1 = Blockly.Arduino.valueToCode(this, 'Value1', Blockly.Arduino.ORDER_ATOMIC);
-    var dimension1 = Blockly.Arduino.valueToCode(this, 'Dimension1', Blockly.Arduino.ORDER_ATOMIC) || '0'
-    var title2 = Blockly.Arduino.valueToCode(this, 'Title2', Blockly.Arduino.ORDER_ATOMIC) || '0'
-    var value2 = Blockly.Arduino.valueToCode(this, 'Value2', Blockly.Arduino.ORDER_ATOMIC);
-    var dimension2 = Blockly.Arduino.valueToCode(this, 'Dimension2', Blockly.Arduino.ORDER_ATOMIC) || '0'
-    Blockly.Arduino.codeFunctions_['sensebox_fastPrint'] = `
+  var title1 =
+    Blockly.Arduino.valueToCode(this, "Title1", Blockly.Arduino.ORDER_ATOMIC) ||
+    "0";
+  var value1 = Blockly.Arduino.valueToCode(
+    this,
+    "Value1",
+    Blockly.Arduino.ORDER_ATOMIC
+  );
+  var dimension1 =
+    Blockly.Arduino.valueToCode(
+      this,
+      "Dimension1",
+      Blockly.Arduino.ORDER_ATOMIC
+    ) || "0";
+  var title2 =
+    Blockly.Arduino.valueToCode(this, "Title2", Blockly.Arduino.ORDER_ATOMIC) ||
+    "0";
+  var value2 = Blockly.Arduino.valueToCode(
+    this,
+    "Value2",
+    Blockly.Arduino.ORDER_ATOMIC
+  );
+  var dimension2 =
+    Blockly.Arduino.valueToCode(
+      this,
+      "Dimension2",
+      Blockly.Arduino.ORDER_ATOMIC
+    ) || "0";
+  Blockly.Arduino.codeFunctions_["sensebox_fastPrint"] = `
     void printOnDisplay(String title1, String measurement1, String unit1, String title2, String measurement2, String unit2) {
      
       display.setCursor(0, 0);
@@ -62,67 +96,141 @@ Blockly.Arduino.sensebox_display_fastPrint = function () {
       display.setTextSize(1);
       display.println(unit2);
     }
-    `
+    `;
   var code = ` printOnDisplay(${title1}, String(${value1}), ${dimension1}, ${title2}, String(${value2}), ${dimension2});\n`;
   return code;
 };
 
 Blockly.Arduino.sensebox_display_show = function (block) {
-    var show = Blockly.Arduino.statementToCode(block, 'SHOW');
-    var code = '';
+  var show = Blockly.Arduino.statementToCode(block, "SHOW");
+  var code = "";
   code += show;
-    code += 'display.display();\n';
+  code += "display.display();\n";
   return code;
 };
 Blockly.Arduino.sensebox_display_plotDisplay = function () {
-    var YLabel = Blockly.Arduino.valueToCode(this, 'YLabel', Blockly.Arduino.ORDER_ATOMIC) || 'Y'
-    var XLabel = Blockly.Arduino.valueToCode(this, 'XLabel', Blockly.Arduino.ORDER_ATOMIC) || 'X'
-    var Title = Blockly.Arduino.valueToCode(this, 'Title', Blockly.Arduino.ORDER_ATOMIC) || 'Title'
-    var XRange1 = Blockly.Arduino.valueToCode(this, 'XRange1', Blockly.Arduino.ORDER_ATOMIC) || '0'
-    var XRange2 = Blockly.Arduino.valueToCode(this, 'XRange2', Blockly.Arduino.ORDER_ATOMIC) || '0'
-    var YRange1 = Blockly.Arduino.valueToCode(this, 'YRange1', Blockly.Arduino.ORDER_ATOMIC) || '0'
-    var YRange2 = Blockly.Arduino.valueToCode(this, 'YRange2', Blockly.Arduino.ORDER_ATOMIC) || '0'
-    var XTick = Blockly.Arduino.valueToCode(this, 'XTick', Blockly.Arduino.ORDER_ATOMIC) || '0'
-    var YTick = Blockly.Arduino.valueToCode(this, 'YTick', Blockly.Arduino.ORDER_ATOMIC) || '0'
-    var TimeFrame = Blockly.Arduino.valueToCode(this, 'TimeFrame', Blockly.Arduino.ORDER_ATOMIC) || '0'
-    var plotDisplay = Blockly.Arduino.valueToCode(this, 'plotDisplay', Blockly.Arduino.ORDER_ATOMIC) || '"Keine Eingabe"';
-    Blockly.Arduino.libraries_['library_plot'] = '#include <Plot.h>';
-    Blockly.Arduino.definitions_['define_plot_class'] = 'Plot DataPlot(&display);\n';
-    Blockly.Arduino.variables_['define_plot_class'] = 'const double TIMEFRAME = ' + TimeFrame + ';\n';
-    Blockly.Arduino.setupCode_['sensebox_plot_setup'] = 'DataPlot.setTitle(' + Title + ');\nDataPlot.setXLabel(' + XLabel + ');\nDataPlot.setYLabel(' + YLabel + ');\nDataPlot.setXRange(' + XRange1 + ',' + XRange2 + ');\nDataPlot.setYRange(' + YRange1 + ',' + YRange2 + ');\nDataPlot.setXTick(' + XTick + ');\nDataPlot.setYTick(' + YTick + ');\nDataPlot.setXPrecision(0);\nDataPlot.setYPrecision(0);\n';
-    var code = 'DataPlot.clear();'
-    code += 'double starttime = millis();\ndouble t = 0;\nwhile (t <= TIMEFRAME) {\nt = (millis() - starttime) / 1000.0;\nfloat value = ' + plotDisplay + ';\n';
-    code += 'DataPlot.addDataPoint(t,value);\n}\n';
+  var YLabel =
+    Blockly.Arduino.valueToCode(this, "YLabel", Blockly.Arduino.ORDER_ATOMIC) ||
+    "Y";
+  var XLabel =
+    Blockly.Arduino.valueToCode(this, "XLabel", Blockly.Arduino.ORDER_ATOMIC) ||
+    "X";
+  var Title =
+    Blockly.Arduino.valueToCode(this, "Title", Blockly.Arduino.ORDER_ATOMIC) ||
+    "Title";
+  var XRange1 =
+    Blockly.Arduino.valueToCode(
+      this,
+      "XRange1",
+      Blockly.Arduino.ORDER_ATOMIC
+    ) || "0";
+  var XRange2 =
+    Blockly.Arduino.valueToCode(
+      this,
+      "XRange2",
+      Blockly.Arduino.ORDER_ATOMIC
+    ) || "0";
+  var YRange1 =
+    Blockly.Arduino.valueToCode(
+      this,
+      "YRange1",
+      Blockly.Arduino.ORDER_ATOMIC
+    ) || "0";
+  var YRange2 =
+    Blockly.Arduino.valueToCode(
+      this,
+      "YRange2",
+      Blockly.Arduino.ORDER_ATOMIC
+    ) || "0";
+  var XTick =
+    Blockly.Arduino.valueToCode(this, "XTick", Blockly.Arduino.ORDER_ATOMIC) ||
+    "0";
+  var YTick =
+    Blockly.Arduino.valueToCode(this, "YTick", Blockly.Arduino.ORDER_ATOMIC) ||
+    "0";
+  var TimeFrame =
+    Blockly.Arduino.valueToCode(
+      this,
+      "TimeFrame",
+      Blockly.Arduino.ORDER_ATOMIC
+    ) || "0";
+  var plotDisplay =
+    Blockly.Arduino.valueToCode(
+      this,
+      "plotDisplay",
+      Blockly.Arduino.ORDER_ATOMIC
+    ) || '"Keine Eingabe"';
+  Blockly.Arduino.libraries_["library_plot"] = "#include <Plot.h>";
+  Blockly.Arduino.definitions_["define_plot_class"] =
+    "Plot DataPlot(&display);\n";
+  Blockly.Arduino.variables_["define_plot_class"] =
+    "const double TIMEFRAME = " + TimeFrame + ";\n";
+  Blockly.Arduino.setupCode_["sensebox_plot_setup"] =
+    "DataPlot.setTitle(" +
+    Title +
+    ");\nDataPlot.setXLabel(" +
+    XLabel +
+    ");\nDataPlot.setYLabel(" +
+    YLabel +
+    ");\nDataPlot.setXRange(" +
+    XRange1 +
+    "," +
+    XRange2 +
+    ");\nDataPlot.setYRange(" +
+    YRange1 +
+    "," +
+    YRange2 +
+    ");\nDataPlot.setXTick(" +
+    XTick +
+    ");\nDataPlot.setYTick(" +
+    YTick +
+    ");\nDataPlot.setXPrecision(0);\nDataPlot.setYPrecision(0);\n";
+  var code = "DataPlot.clear();";
+  code +=
+    "double starttime = millis();\ndouble t = 0;\nwhile (t <= TIMEFRAME) {\nt = (millis() - starttime) / 1000.0;\nfloat value = " +
+    plotDisplay +
+    ";\n";
+  code += "DataPlot.addDataPoint(t,value);\n}\n";
   return code;
 };
 
 Blockly.Arduino.sensebox_display_fillCircle = function () {
-    let code = '';
-    var x = Blockly.Arduino.valueToCode(this, 'X', Blockly.Arduino.ORDER_ATOMIC) || '0'
-    var y = Blockly.Arduino.valueToCode(this, 'Y', Blockly.Arduino.ORDER_ATOMIC) || '0'
-    var radius = Blockly.Arduino.valueToCode(this, 'Radius', Blockly.Arduino.ORDER_ATOMIC) || '0'
-    var fill = this.getFieldValue('FILL');
-    if (fill === 'TRUE') {
-        code = 'display.fillCircle(' + x + ',' + y + ',' + radius + ',1);\n';
-    }
-    else {
-        code = 'display.drawCircle(' + x + ',' + y + ',' + radius + ',1);\n';
+  let code = "";
+  var x =
+    Blockly.Arduino.valueToCode(this, "X", Blockly.Arduino.ORDER_ATOMIC) || "0";
+  var y =
+    Blockly.Arduino.valueToCode(this, "Y", Blockly.Arduino.ORDER_ATOMIC) || "0";
+  var radius =
+    Blockly.Arduino.valueToCode(this, "Radius", Blockly.Arduino.ORDER_ATOMIC) ||
+    "0";
+  var fill = this.getFieldValue("FILL");
+  if (fill === "TRUE") {
+    code = "display.fillCircle(" + x + "," + y + "," + radius + ",1);\n";
+  } else {
+    code = "display.drawCircle(" + x + "," + y + "," + radius + ",1);\n";
   }
   return code;
-}
+};
 
 Blockly.Arduino.sensebox_display_drawRectangle = function () {
-    let code = '';
-    var x = Blockly.Arduino.valueToCode(this, 'X', Blockly.Arduino.ORDER_ATOMIC) || '0'
-    var y = Blockly.Arduino.valueToCode(this, 'Y', Blockly.Arduino.ORDER_ATOMIC) || '0'
-    var width = Blockly.Arduino.valueToCode(this, 'width', Blockly.Arduino.ORDER_ATOMIC) || '0'
-    var height = Blockly.Arduino.valueToCode(this, 'height', Blockly.Arduino.ORDER_ATOMIC) || '0'
-    var fill = this.getFieldValue('FILL');
-    if (fill === 'TRUE') {
-        code = 'display.fillRect(' + x + ',' + y + ',' + width + ',' + height + ',1);\n';
-    }
-    else {
-        code = 'display.drawRect(' + x + ',' + y + ',' + width + ',' + height + ',1);\n';
+  let code = "";
+  var x =
+    Blockly.Arduino.valueToCode(this, "X", Blockly.Arduino.ORDER_ATOMIC) || "0";
+  var y =
+    Blockly.Arduino.valueToCode(this, "Y", Blockly.Arduino.ORDER_ATOMIC) || "0";
+  var width =
+    Blockly.Arduino.valueToCode(this, "width", Blockly.Arduino.ORDER_ATOMIC) ||
+    "0";
+  var height =
+    Blockly.Arduino.valueToCode(this, "height", Blockly.Arduino.ORDER_ATOMIC) ||
+    "0";
+  var fill = this.getFieldValue("FILL");
+  if (fill === "TRUE") {
+    code =
+      "display.fillRect(" + x + "," + y + "," + width + "," + height + ",1);\n";
+  } else {
+    code =
+      "display.drawRect(" + x + "," + y + "," + width + "," + height + ",1);\n";
   }
   return code;
-}
+};

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

@@ -3,6 +3,7 @@ import * as Blockly from 'blockly/core';
 Blockly.Arduino.sensebox_led = function () {
     var dropdown_pin = this.getFieldValue('PIN');
     var dropdown_stat = this.getFieldValue('STAT');
+    Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
     Blockly.Arduino.setupCode_['setup_led_' + dropdown_pin] = 'pinMode(' + dropdown_pin + ', OUTPUT);';
     var code = 'digitalWrite(' + dropdown_pin + ',' + dropdown_stat + ');\n'
     return code;
@@ -11,6 +12,7 @@ Blockly.Arduino.sensebox_led = function () {
 Blockly.Arduino.sensebox_rgb_led = function () {
     var dropdown_pin = this.getFieldValue('PIN');
     var color = Blockly.Arduino.valueToCode(this, 'COLOR', Blockly.Arduino.ORDER_ATOMIC) || '0'
+    Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
     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(' + color + '));\n';
@@ -23,6 +25,7 @@ Blockly.Arduino.sensebox_ws2818_led_init = function () {
     var dropdown_pin = this.getFieldValue('Port');
     var numPixel = Blockly.Arduino.valueToCode(this, 'NUMBER', Blockly.Arduino.ORDER_ATOMIC) || '1';
     var brightness = Blockly.Arduino.valueToCode(this, 'BRIGHTNESS', Blockly.Arduino.ORDER_ATOMIC) || '50'
+    Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
     Blockly.Arduino.definitions_['define_rgb_led' + dropdown_pin] = `#include <Adafruit_NeoPixel.h>\n Adafruit_NeoPixel rgb_led_${dropdown_pin}= Adafruit_NeoPixel(${numPixel}, ${dropdown_pin},NEO_GRB + NEO_KHZ800);\n`;
     Blockly.Arduino.setupCode_['setup_rgb_led' + dropdown_pin] = 'rgb_led_' + dropdown_pin + '.begin();\n';
     Blockly.Arduino.setupCode_['setup_rgb_led_brightness' + dropdown_pin] = `rgb_led_${dropdown_pin}.setBrightness(${brightness});\n`;
@@ -30,6 +33,7 @@ Blockly.Arduino.sensebox_ws2818_led_init = function () {
 };
 
 Blockly.Arduino.sensebox_ws2818_led = function () {
+    Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
     var dropdown_pin = this.getFieldValue('Port');
     var position = Blockly.Arduino.valueToCode(this, 'POSITION', Blockly.Arduino.ORDER_ATOMIC) || '0';
     var color = Blockly.Arduino.valueToCode(this, 'COLOR', Blockly.Arduino.ORDER_ATOMIC) || '0'
@@ -48,6 +52,7 @@ function hexToRgb(hex) {
 }
 
 Blockly.Arduino['colour_picker'] = function (block) {
+    Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
     const rgb = hexToRgb(block.getFieldValue('COLOUR'));
 
     return [rgb.r + ', ' + rgb.g + ', ' + rgb.b, Blockly.Arduino.ORDER_ATOMIC];
@@ -58,6 +63,7 @@ Blockly.Arduino['colour_random'] = function (block) {
 };
 
 Blockly.Arduino['colour_rgb'] = function (block) {
+    Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
     const red = Blockly.Arduino.valueToCode(block, 'RED', Blockly.Arduino.ORDER_ATOMIC);
     const green = Blockly.Arduino.valueToCode(block, 'GREEN', Blockly.Arduino.ORDER_ATOMIC);
     const blue = Blockly.Arduino.valueToCode(block, 'BLUE', Blockly.Arduino.ORDER_ATOMIC);

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

@@ -5,10 +5,10 @@ Blockly.Arduino.sensebox_lora_initialize_otaa = function (block) {
   var appID = this.getFieldValue("APPID");
   var appKey = this.getFieldValue("APPKEY");
   var interval = this.getFieldValue("INTERVAL");
-  Blockly.Arduino.libraries_["library_senseBoxMCU"] =
-    '#include "SenseBoxMCU.h"';
+  Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
   Blockly.Arduino.libraries_["library_spi"] = "#include <SPI.h>";
-  Blockly.Arduino.libraries_["library_lmic"] = "#include <lmic.h>";
+  Blockly.Arduino.libraries_["library_lmic"] =
+    "#include <lmic.h> // http://librarymanager/All#IBM_LMIC_framework";
   Blockly.Arduino.libraries_["library_hal"] = "#include <hal/hal.h>";
   Blockly.Arduino.definitions_["define_LoRaVariablesOTAA"] = `
     static const u1_t PROGMEM APPEUI[8]= {${appID}};
@@ -177,7 +177,8 @@ Blockly.Arduino.sensebox_send_lora_sensor_value = function (block) {
 };
 
 Blockly.Arduino.sensebox_lora_cayenne_send = function (block) {
-  Blockly.Arduino.libraries_["library_cayene"] = "#include <CayenneLPP.h>";
+  Blockly.Arduino.libraries_["library_cayene"] =
+    "#include <CayenneLPP.h> // http://librarymanager/All#CayenneLPP";
   Blockly.Arduino.variables_["variable_cayenne"] = "CayenneLPP lpp(51);";
   var lora_sensor_values = Blockly.Arduino.statementToCode(block, "DO");
   Blockly.Arduino.functionNames_["functions_do_send"] = `
@@ -278,8 +279,7 @@ Blockly.Arduino.sensebox_lora_initialize_abp = function (block) {
   var appskey = this.getFieldValue("APPSKEY");
   var devaddr = this.getFieldValue("DEVADDR");
   var interval = this.getFieldValue("INTERVAL");
-  Blockly.Arduino.libraries_["library_senseBoxMCU"] =
-    '#include "SenseBoxMCU.h"';
+  Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
   Blockly.Arduino.libraries_["library_spi"] = "#include <SPI.h>";
   Blockly.Arduino.libraries_["library_lmic"] = "#include <lmic.h>";
   Blockly.Arduino.libraries_["library_hal"] = "#include <hal/hal.h>";
@@ -525,3 +525,12 @@ Blockly.Arduino.sensebox_lora_cayenne_gps = function (block) {
   var code = `lpp.addGPS(${channel}, ${lat}, ${lng}, ${alt});\n`;
   return code;
 };
+
+Blockly.Arduino.sensebox_lora_cayenne_concentration = function (block) {
+  var value =
+    Blockly.Arduino.valueToCode(this, "Value", Blockly.Arduino.ORDER_ATOMIC) ||
+    0;
+  var channel = this.getFieldValue("CHANNEL");
+  var code = `lpp.addConcentration(${channel}, ${value});\n`;
+  return code;
+};

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

@@ -1,66 +1,125 @@
-import Blockly from 'blockly';
-
+import Blockly from "blockly";
 
 /**
-* Block send Data to the openSenseMap
-*/
+ * Block send Data to the openSenseMap
+ */
 Blockly.Arduino.sensebox_send_to_osem = function (block) {
-  var code = '';
-  var sensor_id = this.getFieldValue('SensorID');
+  var code = "";
+  var sensor_id = this.getFieldValue("SensorID");
   var id = sensor_id.slice(-3).toUpperCase();
-  var sensor_value = Blockly.Arduino.valueToCode(this, 'Value', Blockly.Arduino.ORDER_ATOMIC) || '"Keine Eingabe"';
-  Blockly.Arduino.definitions_['SENSOR_ID' + id + ''] = 'const char SENSOR_ID' + id + '[] PROGMEM = "' + sensor_id + '";';
-  code += 'addMeasurement(SENSOR_ID' + id + ',' + sensor_value + ');\n';
+  var sensor_value =
+    Blockly.Arduino.valueToCode(this, "Value", Blockly.Arduino.ORDER_ATOMIC) ||
+    '"Keine Eingabe"';
+  Blockly.Arduino.definitions_["SENSOR_ID" + id + ""] =
+    "const char SENSOR_ID" + id + '[] PROGMEM = "' + sensor_id + '";';
+  code += "addMeasurement(SENSOR_ID" + id + "," + sensor_value + ");\n";
   return code;
 };
 
 Blockly.Arduino.sensebox_osem_connection = function (Block) {
-  var box_id = this.getFieldValue('BoxID');
-  var host = this.getFieldValue('host');
-  var branch = Blockly.Arduino.statementToCode(Block, 'DO');
-  var access_token = this.getFieldValue('access_token');
+  var workspace = Blockly.getMainWorkspace();
+  var wifi = false;
+  var ethernet = false;
+  if (workspace.getBlocksByType("sensebox_wifi").length > 0) {
+    wifi = true;
+    ethernet = false;
+  } else if (workspace.getBlocksByType("sensebox_ethernet").length > 0) {
+    ethernet = true;
+    wifi = false;
+  }
+  var box_id = this.getFieldValue("BoxID");
+  var branch = Blockly.Arduino.statementToCode(Block, "DO");
+  var access_token = this.getFieldValue("access_token");
   var blocks = this.getDescendants();
-  var type = this.getFieldValue('type');
-  var ssl = this.getFieldValue('SSL');
+  var type = this.getFieldValue("type");
+  var ssl = this.getFieldValue("SSL");
+  var restart = this.getFieldValue("RESTART");
   var port = 0;
   var count = 0;
   if (blocks !== undefined) {
     for (var i = 0; i < blocks.length; i++) {
-      if (blocks[i].type === 'sensebox_send_to_osem') {
+      if (blocks[i].type === "sensebox_send_to_osem") {
         count++;
-
       }
     }
   }
   var num_sensors = count;
-  Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"';
-  Blockly.Arduino.definitions_['num_sensors'] = 'static const uint8_t NUM_SENSORS = ' + num_sensors + ';'
-  Blockly.Arduino.definitions_['SenseBoxID'] = 'const char SENSEBOX_ID [] PROGMEM = "' + box_id + '";';
-  Blockly.Arduino.definitions_['host'] = 'const char server [] PROGMEM =' + host + ';';
-  if (ssl === 'TRUE') {
-    Blockly.Arduino.definitions_['WiFiSSLClient'] = 'WiFiSSLClient client;';
+  Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
+  Blockly.Arduino.definitions_["num_sensors"] =
+    "static const uint8_t NUM_SENSORS = " + num_sensors + ";";
+  Blockly.Arduino.definitions_["SenseBoxID"] =
+    'const char SENSEBOX_ID [] PROGMEM = "' + box_id + '";';
+  Blockly.Arduino.definitions_["host"] =
+    'const char server [] PROGMEM ="ingress.opensensemap.org";';
+  if (wifi === true) {
+    if (ssl === "TRUE") {
+      Blockly.Arduino.libraries_["library_bearSSL"] =
+        "#include <ArduinoBearSSL.h>";
+      Blockly.Arduino.libraries_["library_arduinoECC08"] =
+        "#include <ArduinoECCX08.h>";
+      Blockly.Arduino.definitions_["WiFiClient"] = "WiFiClient wifiClient;";
+      Blockly.Arduino.definitions_["BearSSLClient"] =
+        "BearSSLClient client(wifiClient);";
+      Blockly.Arduino.functionNames_["getTime"] = `unsigned long getTime() {
+      return WiFi.getTime();
+    }`;
+      Blockly.Arduino.setupCode_["initBearSSL"] =
+        "ArduinoBearSSL.onGetTime(getTime);";
       port = 443;
-  } else if (ssl === 'FALSE') {
-    Blockly.Arduino.definitions_['WiFiClient'] = 'WiFiClient client;';
+    } else if (ssl === "FALSE") {
+      Blockly.Arduino.definitions_["WiFiClient"] = "WiFiClient client;";
       port = 80;
     }
+  } else if (ethernet === true) {
+    if (ssl === "TRUE") {
+      Blockly.Arduino.libraries_["library_bearSSL"] =
+        "#include <ArduinoBearSSL.h>";
+      Blockly.Arduino.libraries_["library_arduinoECC08"] =
+        "#include <ArduinoECCX08.h>";
+      Blockly.Arduino.libraries_["library_ethernetUdp"] =
+        "#include <EthernetUdp.h>";
+      Blockly.Arduino.libraries_["library_NTPClient"] =
+        "#include <NTPClient.h>";
+      Blockly.Arduino.definitions_["EthernetClient"] =
+        "EthernetClient eclient;";
+      Blockly.Arduino.definitions_["BearSSLClient"] =
+        "BearSSLClient client(eclient);";
+      Blockly.Arduino.definitions_["EthernetUDP"] = "EthernetUDP Udp;";
+      Blockly.Arduino.definitions_["NTPClient"] = "NTPClient timeClient(Udp);";
+      Blockly.Arduino.functionNames_["getTime"] = `
+unsigned long getTime() {
+  timeClient.update();
+  return timeClient.getEpochTime();
+}`;
 
-  Blockly.Arduino.definitions_['measurement'] = `typedef struct measurement {
+      Blockly.Arduino.setupCode_["timeClient_begin"] = "timeClient.begin();";
+      Blockly.Arduino.setupCode_["initBearSSL"] =
+        "ArduinoBearSSL.onGetTime(getTime);";
+      port = 443;
+    } else if (ssl === "FALSE") {
+      Blockly.Arduino.definitions_["EthernetClient"] = "EthernetClient client;";
+      port = 80;
+    }
+  }
+  Blockly.Arduino.definitions_["measurement"] = `typedef struct measurement {
       const char *sensorId;
       float value;
     } measurement;`;
-  Blockly.Arduino.definitions_['buffer'] = 'char buffer[750];';
-  Blockly.Arduino.definitions_['num_measurement'] = `measurement measurements[NUM_SENSORS];
+  Blockly.Arduino.definitions_["buffer"] = "char buffer[750];";
+  Blockly.Arduino.definitions_[
+    "num_measurement"
+  ] = `measurement measurements[NUM_SENSORS];
     uint8_t num_measurements = 0;`;
-  Blockly.Arduino.definitions_['lengthMultiplikator'] = 'const int lengthMultiplikator = 35;';
-  Blockly.Arduino.functionNames_['addMeasurement'] = `
+  Blockly.Arduino.definitions_["lengthMultiplikator"] =
+    "const int lengthMultiplikator = 35;";
+  Blockly.Arduino.functionNames_["addMeasurement"] = `
     void addMeasurement(const char *sensorId, float value) {
     measurements[num_measurements].sensorId = sensorId;
     measurements[num_measurements].value = value;
     num_measurements++;
     }`;
-  if (type === 'Stationary') {
-    Blockly.Arduino.functionNames_['writeMeasurementsToClient'] = `
+  if (type === "Stationary") {
+    Blockly.Arduino.functionNames_["writeMeasurementsToClient"] = `
     void writeMeasurementsToClient() {
     // iterate throug the measurements array
     for (uint8_t i = 0; i < num_measurements; i++) {
@@ -72,18 +131,26 @@ Blockly.Arduino.sensebox_osem_connection = function (Block) {
     // reset num_measurements
     num_measurements = 0;
   }`;
-    Blockly.Arduino.functionNames_['submitValues'] = `
+    Blockly.Arduino.functionNames_["submitValues"] =
+      `
   void submitValues() {
+${
+  wifi === true
+    ? "if (WiFi.status() != WL_CONNECTED) {\nWiFi.disconnect();\ndelay(1000); // wait 1s\nWiFi.begin(ssid, pass);\ndelay(5000); // wait 5s\n}"
+    : ""
+}
   if (client.connected()) {
       client.stop();
-    delay(10);
+      delay(1000);
     }
   bool connected = false;
   char _server[strlen_P(server)];
   strcpy_P(_server, server);
   for (uint8_t timeout = 2; timeout != 0; timeout--) {
     Serial.println(F("connecting..."));
-    connected = client.connect(_server, `+ port + `);
+    connected = client.connect(_server, ` +
+      port +
+      `);
     if (connected == true) {
       // construct the HTTP POST request:
       sprintf_P(buffer,
@@ -105,22 +172,56 @@ Blockly.Arduino.sensebox_osem_connection = function (Block) {
           break;
         }
       }
-      num_measurements = 0;
+
+      while (client.available()) {
+        char c = client.read();
+        // if the server's disconnected, stop the client:
+        if (!client.connected()) {
+          client.stop();
           break;
         }
       }
+
+      num_measurements = 0;
+      break;
+    }
+    delay(1000);
+  }
+
+  ${
+    restart === "TRUE"
+      ? "if (connected == false) {\n  delay(5000);\n  noInterrupts();\n NVIC_SystemReset();\n while (1)\n ;\n }"
+      : ""
+  }
   }`;
-    var code = '';
+
+    var code = "";
     code += branch;
     code += "submitValues();\n";
-  }
-  else if (type === 'Mobile') {
-    var lat = Blockly.Arduino.valueToCode(Block, 'lat', Blockly.Arduino.ORDER_ATOMIC);
-    var lng = Blockly.Arduino.valueToCode(Block, 'lng', Blockly.Arduino.ORDER_ATOMIC);
-    var timestamp = Blockly.Arduino.valueToCode(Block, 'timeStamp', Blockly.Arduino.ORDER_ATOMIC);
-    var altitude = Blockly.Arduino.valueToCode(Block, 'altitude', Blockly.Arduino.ORDER_ATOMIC);
-    Blockly.Arduino.definitions_['lengthMultiplikator'] = 'const int lengthMultiplikator = 77;';
-    Blockly.Arduino.functionNames_['writeMeasurementsToClient'] = `
+  } else if (type === "Mobile") {
+    var lat = Blockly.Arduino.valueToCode(
+      Block,
+      "lat",
+      Blockly.Arduino.ORDER_ATOMIC
+    );
+    var lng = Blockly.Arduino.valueToCode(
+      Block,
+      "lng",
+      Blockly.Arduino.ORDER_ATOMIC
+    );
+    var timestamp = Blockly.Arduino.valueToCode(
+      Block,
+      "timeStamp",
+      Blockly.Arduino.ORDER_ATOMIC
+    );
+    var altitude = Blockly.Arduino.valueToCode(
+      Block,
+      "altitude",
+      Blockly.Arduino.ORDER_ATOMIC
+    );
+    Blockly.Arduino.definitions_["lengthMultiplikator"] =
+      "const int lengthMultiplikator = 77;";
+    Blockly.Arduino.functionNames_["writeMeasurementsToClient"] = `
       void writeMeasurementsToClient(float lat, float lng, float altitude, char* timeStamp) {
       // iterate throug the measurements array
       for (uint8_t i = 0; i < num_measurements; i++) {
@@ -132,7 +233,10 @@ Blockly.Arduino.sensebox_osem_connection = function (Block) {
       // reset num_measurements
       num_measurements = 0;
       }`;
-    Blockly.Arduino.functionNames_['submitValues'] = `
+    Blockly.Arduino.variables_["latitude"] = "float latitude;";
+    Blockly.Arduino.variables_["longitude"] = "float longitude;";
+    Blockly.Arduino.functionNames_["submitValues"] =
+      `
       void submitValues(float lat, float lng, float altitude, char* timeStamp) {
     if (client.connected()) {
       client.stop();
@@ -143,7 +247,9 @@ Blockly.Arduino.sensebox_osem_connection = function (Block) {
     strcpy_P(_server, server);
     for (uint8_t timeout = 2; timeout != 0; timeout--) {
       Serial.println(F("connecting..."));
-      connected = client.connect(_server, `+ port + `);
+      connected = client.connect(_server, ` +
+      port +
+      `);
       if (connected == true) {
         // construct the HTTP POST request:
         sprintf_P(buffer,
@@ -165,15 +271,40 @@ Blockly.Arduino.sensebox_osem_connection = function (Block) {
             break;
           }
         }
+        while (client.available()) {
+          char c = client.read();
+          // if the server's disconnected, stop the client:
+          if (!client.connected()) {
+            client.stop();
+            break;
+          }
+          delay(1000);
+        }
     
         num_measurements = 0;
         break;
       }
     }
-  }`
-    code = '';
+
+    ${
+      restart === "TRUE"
+        ? "if (connected == false) {\n  delay(5000);\n  noInterrupts();\n NVIC_SystemReset();\n while (1)\n ;\n }"
+        : ""
+    }
+
+  }`;
+    code = "";
     code += branch;
-    code += 'submitValues(' + lat + ',' + lng + ',' + altitude + ',' + timestamp + ');\n';
+    code +=
+      "submitValues((" +
+      lat +
+      "/float(10000000)),(" +
+      lng +
+      "/float(10000000)),(" +
+      altitude +
+      "/float(100))," +
+      timestamp +
+      ");\n";
   }
   return code;
 };

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

@@ -3,8 +3,7 @@ import Blockly from "blockly";
 Blockly.Arduino.sensebox_rtc_init = function () {
   Blockly.Arduino.libraries_["RV8523"] = `#include <RV8523.h>`;
   Blockly.Arduino.definitions_["RTC"] = `RV8523 rtc;`;
-  Blockly.Arduino.libraries_["library_senseBoxMCU"] =
-    '#include "SenseBoxMCU.h"';
+  Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
   Blockly.Arduino.setupCode_["rtc.begin"] = `rtc.begin();`;
   var code = ``;
   return code;
@@ -15,19 +14,22 @@ Blockly.Arduino.sensebox_rtc_set = function () {
     Blockly.Arduino.valueToCode(this, "second", Blockly.Arduino.ORDER_ATOMIC) ||
     "0";
   var minutes =
-    Blockly.Arduino.valueToCode(this, "second", Blockly.Arduino.ORDER_ATOMIC) ||
-    "0";
+    Blockly.Arduino.valueToCode(
+      this,
+      "minutes",
+      Blockly.Arduino.ORDER_ATOMIC
+    ) || "0";
   var hour =
-    Blockly.Arduino.valueToCode(this, "second", Blockly.Arduino.ORDER_ATOMIC) ||
+    Blockly.Arduino.valueToCode(this, "hour", Blockly.Arduino.ORDER_ATOMIC) ||
     "0";
   var day =
-    Blockly.Arduino.valueToCode(this, "second", Blockly.Arduino.ORDER_ATOMIC) ||
+    Blockly.Arduino.valueToCode(this, "day", Blockly.Arduino.ORDER_ATOMIC) ||
     "0";
   var month =
-    Blockly.Arduino.valueToCode(this, "second", Blockly.Arduino.ORDER_ATOMIC) ||
+    Blockly.Arduino.valueToCode(this, "month", Blockly.Arduino.ORDER_ATOMIC) ||
     "0";
   var year =
-    Blockly.Arduino.valueToCode(this, "second", Blockly.Arduino.ORDER_ATOMIC) ||
+    Blockly.Arduino.valueToCode(this, "year", Blockly.Arduino.ORDER_ATOMIC) ||
     "0";
   Blockly.Arduino.libraries_["RV8523"] = `#include <RV8523.h>`;
   Blockly.Arduino.setupCode_["rtc.start"] = `rtc.start();`;
@@ -79,18 +81,16 @@ Blockly.Arduino.sensebox_rtc_get_timestamp = function () {
   Blockly.Arduino.setupCode_[
     "rtc.batterySwitchOver"
   ] = `rtc.batterySwitchOver(1);`;
-  Blockly.Arduino.loopCodeOnce_[
-    "rtc_variables"
-  ] = `uint8_t sec, min, hour, day, month;\nuint16_t year;`;
   Blockly.Arduino.variables_["rtc_timestamp"] = `char timestamp[20];`;
-  Blockly.Arduino.loopCodeOnce_[
-    "rtc_get"
-  ] = `rtc.get(&sec, &min, &hour, &day, &month, &year);`;
-
-  Blockly.Arduino.loopCodeOnce_[
-    ""
-  ] = `sprintf(timestamp, "%02d-%02d-%02dT%02d:%02d:%02dZ", year, month, day, hour, min, sec);`;
-
-  var code = `timestamp`;
+  Blockly.Arduino.codeFunctions_["getTimeStamp"] = `
+char* getTimeStamp() {
+uint8_t sec, min, hour, day, month;
+ uint16_t year;
+ rtc.get(&sec, &min, &hour, &day, &month, &year);
+ sprintf(timestamp, "%02d-%02d-%02dT%02d:%02d:%02dZ", year, month, day, hour, min, sec);
+ return timestamp;
+ }
+  `;
+  var code = `getTimeStamp()`;
   return [code, Blockly.Arduino.ORDER_ATOMIC];
 };

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

@@ -1,5 +1,4 @@
-import Blockly from 'blockly';
-
+import Blockly from "blockly";
 
 /* SD-Card Blocks using the Standard SD Library*/
 /**
@@ -10,45 +9,200 @@ import Blockly from 'blockly';
  */
 
 Blockly.Arduino.sensebox_sd_create_file = function (block) {
-    var filename = this.getFieldValue('Filename');
-    var res = filename.slice(0, 4);
-    Blockly.Arduino.libraries_['library_spi'] = '#include <SPI.h>';
-    Blockly.Arduino.libraries_['library_sd'] = '#include <SD.h>';
-    Blockly.Arduino.definitions_['define_' + res] = 'File dataFile' + res + ';';
-    Blockly.Arduino.setupCode_['sensebox_sd'] = 'SD.begin(28);';
-    Blockly.Arduino.setupCode_['sensebox_sd' + filename] = 'dataFile' + res + ' = SD.open("' + filename + '", FILE_WRITE);\ndataFile' + res + '.close();\n';
-    var code = '';
+  var filename = this.getFieldValue("Filename");
+  var extension = this.getFieldValue("extension");
+  var newFileName = filename.concat(".", extension);
+  Blockly.Arduino.libraries_["library_spi"] = "#include <SPI.h>";
+  Blockly.Arduino.libraries_["library_sd"] = "#include <SD.h>";
+  Blockly.Arduino.definitions_["define_" + filename] = `File ${filename};`;
+  Blockly.Arduino.setupCode_["sensebox_sd"] = "SD.begin(28);\n";
+  Blockly.Arduino.setupCode_[
+    "sensebox_sd" + filename
+  ] = `${filename} = SD.open("${newFileName}", FILE_WRITE);\n${filename}.close();\n`;
+  var code = "";
   return code;
 };
 
 Blockly.Arduino.sensebox_sd_open_file = function (block) {
-    var filename = this.getFieldValue('Filename');
-    var res = filename.slice(0, 4);
-    var branch = Blockly.Arduino.statementToCode(block, 'SD');
-    var code = 'dataFile' + res + ' = SD.open("' + filename + '", FILE_WRITE);\n'
+  var filename = this.getFieldValue("Filename");
+  var extension = this.getFieldValue("extension");
+  var newFileName = filename.concat(".", extension);
+  var branch = Blockly.Arduino.statementToCode(block, "SD");
+  var code = `${filename} = SD.open("${newFileName}", FILE_WRITE);\n`;
   code += branch;
-    code += 'dataFile' + res + '.close();\n'
+  code += `${filename}.close();\n`;
   return code;
 };
 
 Blockly.Arduino.sensebox_sd_write_file = function (block) {
   if (this.parentBlock_ != null) {
-        var filename = this.getSurroundParent().getFieldValue('Filename');
+    var filename = this.getSurroundParent().getFieldValue("Filename");
   }
-    var res = filename.slice(0, 4);
-    var text = Blockly.Arduino.valueToCode(this, 'DATA', Blockly.Arduino.ORDER_ATOMIC) || '"Keine Eingabe"';
-    var linebreak = this.getFieldValue('linebreak');
+  var branch =
+    Blockly.Arduino.valueToCode(this, "DATA", Blockly.Arduino.ORDER_ATOMIC) ||
+    '"Keine Eingabe"';
+  var linebreak = this.getFieldValue("linebreak");
   if (linebreak === "TRUE") {
     linebreak = "ln";
   } else {
     linebreak = "";
   }
-    var code = '';
-    if (text === "gps.getLongitude()" || text === "gps.getLatitude()") {
-        code = 'dataFile' + res + '.print' + linebreak + '(' + text + ',5);\n'
-    }
-    else {
-        code = 'dataFile' + res + '.print' + linebreak + '(' + text + ');\n'
+  var code = "";
+  if (branch === "gps.getLongitude()" || branch === "gps.getLatitude()") {
+    code = `${filename}.print${linebreak}(${branch},5);\n`;
+  } else {
+    code = `${filename}.print${linebreak}(${branch});\n`;
   }
   return code;
 };
+
+Blockly.Arduino.sensebox_sd_osem = function () {
+  if (this.parentBlock_ != null) {
+    var filename = this.getSurroundParent().getFieldValue("Filename");
+  }
+
+  var type = this.getFieldValue("type");
+  var blocks = this.getDescendants();
+  var branch = Blockly.Arduino.statementToCode(this, "DO");
+  var count = 0;
+  if (blocks !== undefined) {
+    for (var i = 0; i < blocks.length; i++) {
+      if (blocks[i].type === "sensebox_sd_save_for_osem") {
+        count++;
+      }
+    }
+  }
+  var num_sensors = count;
+  var timestamp = Blockly.Arduino.valueToCode(
+    this,
+    "timeStamp",
+    Blockly.Arduino.ORDER_ATOMIC
+  );
+  Blockly.Arduino.definitions_["num_sensors"] =
+    "static const uint8_t NUM_SENSORS = " + num_sensors + ";";
+
+  Blockly.Arduino.definitions_["measurement"] = `typedef struct measurement {
+    const char *sensorId;
+    float value;
+  } measurement;`;
+  Blockly.Arduino.definitions_["buffer"] = "char buffer[750];";
+  Blockly.Arduino.definitions_[
+    "num_measurement"
+  ] = `measurement measurements[NUM_SENSORS];
+  uint8_t num_measurements = 0;`;
+  if (type === "Stationary") {
+    Blockly.Arduino.functionNames_["addMeasurement"] = `
+void addMeasurement(const char *sensorId, float value) {
+    measurements[num_measurements].sensorId = sensorId;
+    measurements[num_measurements].value = value;
+    num_measurements++;
+    }
+`;
+    Blockly.Arduino.functionNames_["writeMeasurementsToSdCard"] = `
+void writeMeasurementsToSdCard(char* timeStamp) {
+    // iterate throug the measurements array
+    for (uint8_t i = 0; i < num_measurements; i++) {
+sprintf_P(buffer, PSTR("%s,%9.2f,%s"), measurements[i].sensorId, measurements[i].value, timeStamp);         
+      // transmit buffer to client
+      ${filename}.println(buffer);
+    }
+    // reset num_measurements
+    num_measurements = 0;
+}
+`;
+    Blockly.Arduino.functionNames_["saveValues"] = `
+void saveValues() {
+
+
+      // send measurements
+      writeMeasurementsToSdCard(${timestamp}); 
+      num_measurements = 0;
+} 
+`;
+    var code = "";
+    code += branch;
+    code += "saveValues();";
+  } else if (type === "Mobile") {
+    /**
+     * add mobile functions here
+     */
+    Blockly.Arduino.libraries_["dtostrf.h"] = "#include <avr/dtostrf.h>";
+    var lat = Blockly.Arduino.valueToCode(
+      this,
+      "lat",
+      Blockly.Arduino.ORDER_ATOMIC
+    );
+    var lng = Blockly.Arduino.valueToCode(
+      this,
+      "lng",
+      Blockly.Arduino.ORDER_ATOMIC
+    );
+    // var altitude = Blockly.Arduino.valueToCode(
+    //   this,
+    //   "altitude",
+    //   Blockly.Arduino.ORDER_ATOMIC
+    // );
+    Blockly.Arduino.definitions_["num_sensors"] =
+      "static const uint8_t NUM_SENSORS = " + num_sensors + ";";
+
+    Blockly.Arduino.definitions_["measurement"] = `typedef struct measurement {
+        const char *sensorId;
+        float value;
+      } measurement;`;
+    Blockly.Arduino.definitions_["buffer"] = "char buffer[750];";
+    Blockly.Arduino.definitions_[
+      "num_measurement"
+    ] = `measurement measurements[NUM_SENSORS];
+      uint8_t num_measurements = 0;`;
+    Blockly.Arduino.functionNames_["addMeasurement"] = `
+void addMeasurement(const char *sensorId, float value) {
+        measurements[num_measurements].sensorId = sensorId;
+        measurements[num_measurements].value = value;
+        num_measurements++;
+        }
+    `;
+    Blockly.Arduino.functionNames_["writeMeasurementsToSdCard"] = `
+void writeMeasurementsToSdCard(char* timeStamp, int32_t latitudes, int32_t longitudes) {
+    // iterate throug the measurements array
+        for (uint8_t i = 0; i < num_measurements; i++) {
+            char lng[20];
+            char lat[20];
+            float longitude = longitudes / (float)10000000;
+            float latitude = latitudes / (float)10000000;
+            dtostrf(longitude, 8, 7, lng);
+            dtostrf(latitude, 8, 7, lat);
+            sprintf_P(buffer, PSTR("%s,%9.2f,%s,%02s,%02s"),  measurements[i].sensorId, measurements[i].value, timeStamp, lng, lat);
+            // transmit buffer to client
+            ${filename}.println(buffer);
+            }
+            // reset num_measurements
+            num_measurements = 0;
+        }
+    `;
+    Blockly.Arduino.functionNames_["saveValues"] = `
+    void saveValues() {
+          // send measurements
+          writeMeasurementsToSdCard(${timestamp}, ${lat}, ${lng}); 
+          num_measurements = 0;
+    } 
+    `;
+    code = "";
+    code += branch;
+    code += "saveValues();\n";
+  }
+  return code;
+};
+
+Blockly.Arduino.sensebox_sd_save_for_osem = function (block) {
+  var code = "";
+  var sensor_id = this.getFieldValue("SensorID");
+  var id = sensor_id.slice(-3).toUpperCase();
+  var sensor_value =
+    Blockly.Arduino.valueToCode(block, "Value", Blockly.Arduino.ORDER_ATOMIC) ||
+    '"Keine Eingabe"';
+  Blockly.Arduino.definitions_["SENSOR_ID" + id + ""] =
+    "const char SENSOR_ID" + id + '[] PROGMEM = "' + sensor_id + '";';
+  code += "addMeasurement(SENSOR_ID" + id + "," + sensor_value + ");\n";
+  console.log(code);
+  return code;
+};

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

@@ -1,4 +1,4 @@
-import Blockly from 'blockly';
+import Blockly from "blockly";
 
 /**
  * HDC1080 Temperature and Humidity Sensor
@@ -6,11 +6,14 @@ import Blockly from 'blockly';
  */
 
 Blockly.Arduino.sensebox_sensor_temp_hum = function () {
-  var dropdown_name = this.getFieldValue('NAME');
-  Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"';
-  Blockly.Arduino.definitions_['define_hdc'] = 'HDC1080 hdc;';
-  Blockly.Arduino.setupCode_['sensebox_sensor_temp_hum'] = 'hdc.begin();';
-  var code = 'hdc.get' + dropdown_name + '()';
+  var dropdown_name = this.getFieldValue("NAME");
+
+  Blockly.Arduino.libraries_["library_adafruithdc1000"] =
+    "#include <Adafruit_HDC1000.h> // http://librarymanager/All#Adafruit_HDC1000_Library";
+  Blockly.Arduino.definitions_["define_hdc"] =
+    "Adafruit_HDC1000 hdc = Adafruit_HDC1000();";
+  Blockly.Arduino.setupCode_["sensebox_sensor_temp_hum"] = "hdc.begin();";
+  var code = `hdc.read${dropdown_name}()`;
   return [code, Blockly.Arduino.ORDER_ATOMIC];
 };
 
@@ -20,43 +23,125 @@ Blockly.Arduino.sensebox_sensor_temp_hum = function () {
  */
 
 Blockly.Arduino.sensebox_sensor_uv_light = function () {
-  var dropdown_name = this.getFieldValue('NAME');
-  let code = '';
-  Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"';
-  if (dropdown_name === 'UvIntensity') {
-    Blockly.Arduino.definitions_['define_veml'] = 'VEML6070 veml;'
-    Blockly.Arduino.setupCode_['sensebox_sensor_uv_light'] = 'veml.begin();'
-    code = 'veml.get' + dropdown_name + '()';
+  var dropdown_name = this.getFieldValue("NAME");
+  let code = "";
+  Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
+
+  if (dropdown_name === "UvIntensity") {
+    Blockly.Arduino.libraries_["library_veml6070"] = "#include <VEML6070.h>";
+    Blockly.Arduino.definitions_["define_veml"] = "VEML6070 veml;";
+    Blockly.Arduino.setupCode_["sensebox_sensor_uv_light"] = "veml.begin();";
+    code = "veml.getUV()";
   }
-  // if (dropdown_name === 'Illuminance') {
-  //   Blockly.Arduino.definitions_['define_tsl'] = 'TSL45315 tsl;'
-  //   Blockly.Arduino.setupCode_['sensebox_sensor_illuminance'] = 'tsl.begin();'
-  //   code = 'tsl.get' + dropdown_name + '()';
-  // }
-  if (dropdown_name === 'Illuminance') {
-    Blockly.Arduino.definitions_['define_lightsensor'] = 'Lightsensor lightsensor;'
-    Blockly.Arduino.setupCode_['sensebox_sensor_illuminance'] = 'lightsensor.begin();'
-    code = 'lightsensor.get' + dropdown_name + '()';
+  if (dropdown_name === "Illuminance") {
+    Blockly.Arduino.libraries_["library_ltr329"] = `#include <LTR329.h>`;
+    Blockly.Arduino.libraries_["library_wire"] = "#include <Wire.h>";
+    Blockly.Arduino.codeFunctions_["read_reg"] = `
+int read_reg(byte address, uint8_t reg)
+  {
+    int i = 0;
+    Wire.beginTransmission(address);
+    Wire.write(reg);
+    Wire.endTransmission();
+    Wire.requestFrom((uint8_t)address, (uint8_t)1);
+    delay(1);
+    if(Wire.available())
+      i = Wire.read();
+    return i;
+  }
+    `;
+    Blockly.Arduino.codeFunctions_["write_reg"] = `
+void write_reg(byte address, uint8_t reg, uint8_t val)
+  {
+    Wire.beginTransmission(address);
+    Wire.write(reg);
+    Wire.write(val);
+    Wire.endTransmission();
+  }`;
+
+    Blockly.Arduino.codeFunctions_["Lightsensor_begin"] = `
+void Lightsensor_begin()
+  {
+    Wire.begin();
+    unsigned int u = 0;
+    u = read_reg(0x29, 0x80 | 0x0A); //id register
+    if ((u & 0xF0) == 0xA0)            // TSL45315
+      {
+        write_reg(0x29, 0x80 | 0x00, 0x03); //control: power on
+        write_reg(0x29, 0x80 | 0x01, 0x02); //config: M=4 T=100ms
+        delay(120);
+        lightsensortype = 0; //TSL45315
+      }
+    else
+      {
+        LTR.begin();
+        LTR.setControl(gain, false, false);
+        LTR.setMeasurementRate(integrationTime, measurementRate);
+        LTR.setPowerUp(); //power on with default settings
+        delay(10); //Wait 10 ms (max) - wakeup time from standby
+        lightsensortype = 1;                     //
+      }
+  }
+`;
+
+    Blockly.Arduino.codeFunctions_["Lightsensor_getIlluminance"] = `
+unsigned int Lightsensor_getIlluminance()
+  {
+    unsigned int lux = 0;
+    if (lightsensortype == 0) // TSL45315
+    {
+      unsigned int u = (read_reg(0x29, 0x80 | 0x04) << 0);  //data low
+      u |= (read_reg(0x29, 0x80 | 0x05) << 8); //data high
+      lux = u * 4; // calc lux with M=4 and T=100ms
+    }
+    else if (lightsensortype == 1) //LTR-329ALS-01
+    {
+      delay(100);
+      unsigned int data0, data1;
+      for (int i = 0; i < 5; i++) {
+        if (LTR.getData(data0, data1)) {
+          if(LTR.getLux(gain, integrationTime, data0, data1, lux));
+          if(lux > 0) break;
+          else delay(10);
+        }
+        else {
+        byte error = LTR.getError();
+      }
+    }
+  }
+  return lux;
+  }
+    `;
+    Blockly.Arduino.definitions_["define_lightsensor"] = `
+bool lightsensortype = 0; //0 for tsl - 1 for ltr
+//settings for LTR sensor
+LTR329 LTR;
+unsigned char gain = 1;
+unsigned char integrationTime = 0;
+unsigned char measurementRate = 3;
+`;
+    Blockly.Arduino.setupCode_["sensebox_sensor_illuminance"] =
+      "Lightsensor_begin();";
+    code = "Lightsensor_getIlluminance()";
   }
 
   return [code, Blockly.Arduino.ORDER_ATOMIC];
 };
 
-
-
-
 /**
  * BMX055 Accelerometer
  *
  */
 
 Blockly.Arduino.sensebox_sensor_bmx055_accelerometer = function () {
-  var dropdown_value = this.getFieldValue('VALUE');
-  var range = this.getFieldValue('RANGE');
-  Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"';
-  Blockly.Arduino.definitions_['define_bmx'] = 'BMX055 bmx;';
-  Blockly.Arduino.setupCode_['sensebox_sensor_bmx055'] = 'bmx.beginAcc(' + range + ');';
-  var code = 'bmx.getAcceleration' + dropdown_value + '()';
+  var dropdown_value = this.getFieldValue("VALUE");
+  var range = this.getFieldValue("RANGE");
+  Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
+  Blockly.Arduino.libraries_["library_bmx055"] = `#include <BMX055.h>`;
+  Blockly.Arduino.definitions_["define_bmx"] = "BMX055 bmx;";
+  Blockly.Arduino.setupCode_["sensebox_sensor_bmx055"] =
+    "bmx.beginAcc(" + range + ");";
+  var code = "bmx.getAcceleration" + dropdown_value + "()";
   return [code, Blockly.Arduino.ORDER_ATOMIC];
 };
 
@@ -66,13 +151,21 @@ Blockly.Arduino.sensebox_sensor_bmx055_accelerometer = function () {
  */
 
 Blockly.Arduino.sensebox_sensor_sds011 = function () {
-  var dropdown_name = this.getFieldValue('NAME');
-  var serial_name = this.getFieldValue('SERIAL');
-  Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"';
-  Blockly.Arduino.codeFunctions_['define_sds011'] = 'SDS011 my_sds(' + serial_name + ');';
-  Blockly.Arduino.variables_['variables_sds011'] = 'float p10,p25;\n';
-  Blockly.Arduino.setupCode_['sensebox_sensor_sds011'] = serial_name + '.begin(9600);';
-  var code = 'my_sds.get' + dropdown_name + '()';
+  var dropdown_name = this.getFieldValue("NAME");
+  var serial_name = this.getFieldValue("SERIAL");
+  Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
+  Blockly.Arduino.libraries_[
+    "SdsDustSensor"
+  ] = `#include <SdsDustSensor.h> // http://librarymanager/All#Nova_Fitness_Sds_dust_sensors_library`;
+  Blockly.Arduino.definitions_["define_sds011"] =
+    "SdsDustSensor sds(" + serial_name + ");";
+  Blockly.Arduino.setupCode_["sds011_begin"] = "sds.begin();";
+  Blockly.Arduino.setupCode_["sds011_setQueryReportingMode"] =
+    "sds.setQueryReportingMode();";
+  Blockly.Arduino.loopCodeOnce_[
+    "sds011_getData"
+  ] = `PmResult pm = sds.queryPm();`;
+  var code = `pm.${dropdown_name}`;
   return [code, Blockly.Arduino.ORDER_ATOMIC];
 };
 
@@ -82,42 +175,60 @@ Blockly.Arduino.sensebox_sensor_sds011 = function () {
  */
 
 Blockly.Arduino.sensebox_sensor_pressure = function () {
-  var dropdown_name = this.getFieldValue('NAME');
-  var code = '';
-  var referencePressure = this.getFieldValue('referencePressure');
-  Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"';
-  Blockly.Arduino.definitions_['define_pressure'] = 'BMP280 bmp_sensor;';
-  Blockly.Arduino.setupCode_['sensebox_bmp_sensor'] = 'bmp_sensor.begin();';
-  if (dropdown_name === 'Pressure' || dropdown_name === 'Temperature') {
-    code = 'bmp_sensor.get' + dropdown_name + '()';
-  }
-  else if (dropdown_name === 'Altitude') {
-    code = 'bmp_sensor.getAltitude(' + referencePressure + ')';
+  var dropdown_name = this.getFieldValue("NAME");
+  var code = "";
+  var referencePressure = this.getFieldValue("referencePressure");
+  Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
+  Blockly.Arduino.libraries_[
+    "adafruit_bmp280"
+  ] = `#include <Adafruit_BMP280.h> // http://librarymanager/All#Adafruit_BMP280_Library`;
+  Blockly.Arduino.definitions_["define_pressure"] = "Adafruit_BMP280 bmp;";
+  Blockly.Arduino.setupCode_["sensebox_bmp_sensor"] = "bmp.begin(0x76);";
+  Blockly.Arduino.setupCode_["bmp_setSampling"] = `
+bmp.setSampling(Adafruit_BMP280::MODE_NORMAL,    
+                  Adafruit_BMP280::SAMPLING_X2,  
+                  Adafruit_BMP280::SAMPLING_X16,  
+                  Adafruit_BMP280::FILTER_X16,      
+                  Adafruit_BMP280::STANDBY_MS_500);
+  `;
+  switch (dropdown_name) {
+    case "Temperature":
+      code = "bmp.readTemperature()";
+      break;
+    case "Pressure":
+      code = "bmp.readPressure()/100";
+      break;
+    case "Altitude":
+      code = "bmp.readAltitude(" + referencePressure + ")";
+      break;
+    default:
+      code = "";
   }
   return [code, Blockly.Arduino.ORDER_ATOMIC];
 };
 
-
 /**
  * BME680 Environmental Sensor
  *
  */
 
-
 Blockly.Arduino.sensebox_sensor_bme680_bsec = function () {
-  var dropdown_name = this.getFieldValue('dropdown');
-  let code = '';
-  Blockly.Arduino.libraries_['library_bsec'] = '#include "bsec.h"';
-  Blockly.Arduino.definitions_['bsec_iaqSensor'] = 'Bsec iaqSensor;'
-  Blockly.Arduino.variables_['bmeTemperatur'] = 'float bmeTemperatur;';
-  Blockly.Arduino.variables_['bmeHumidity'] = 'float bmeHumidity;';
-  Blockly.Arduino.variables_['bmePressure'] = 'double bmePressure;';
-  Blockly.Arduino.variables_['bmeIAQ'] = 'float bmeIAQ;';
-  Blockly.Arduino.variables_['bmeIAQAccuracy'] = 'float bmeIAQAccuracy;';
-  Blockly.Arduino.variables_['bmeCO2'] = 'int bmeCO2;';
-  Blockly.Arduino.variables_['bmeBreathVocEquivalent'] = 'float bmeBreathVocEquivalent;'
+  var dropdown_name = this.getFieldValue("dropdown");
+  let code = "";
+  Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
+  Blockly.Arduino.libraries_["library_bsec"] =
+    "#include <bsec.h> // http://librarymanager/All#BSEC_Software_Library";
+  Blockly.Arduino.definitions_["bsec_iaqSensor"] = "Bsec iaqSensor;";
+  Blockly.Arduino.variables_["bmeTemperatur"] = "float bmeTemperatur;";
+  Blockly.Arduino.variables_["bmeHumidity"] = "float bmeHumidity;";
+  Blockly.Arduino.variables_["bmePressure"] = "double bmePressure;";
+  Blockly.Arduino.variables_["bmeIAQ"] = "float bmeIAQ;";
+  Blockly.Arduino.variables_["bmeIAQAccuracy"] = "float bmeIAQAccuracy;";
+  Blockly.Arduino.variables_["bmeCO2"] = "int bmeCO2;";
+  Blockly.Arduino.variables_["bmeBreathVocEquivalent"] =
+    "float bmeBreathVocEquivalent;";
 
-  Blockly.Arduino.functionNames_['checkIaqSensorStatus'] = `
+  Blockly.Arduino.functionNames_["checkIaqSensorStatus"] = `
     void checkIaqSensorStatus(void)
   {
     if (iaqSensor.status != BSEC_OK) {
@@ -135,7 +246,7 @@ Blockly.Arduino.sensebox_sensor_bme680_bsec = function () {
     }
   }
   `;
-  Blockly.Arduino.functionNames_['errLeds'] = `
+  Blockly.Arduino.functionNames_["errLeds"] = `
   void errLeds(void)
   {
     pinMode(LED_BUILTIN, OUTPUT);
@@ -145,10 +256,12 @@ Blockly.Arduino.sensebox_sensor_bme680_bsec = function () {
     delay(100);
   }`;
   //Setup Code
-  Blockly.Arduino.setupCode_['Wire.begin'] = 'Wire.begin();';
-  Blockly.Arduino.setupCode_['iaqSensor.begin'] = 'iaqSensor.begin(BME680_I2C_ADDR_PRIMARY, Wire);';
-  Blockly.Arduino.setupCode_['checkIaqSensorStatus'] = 'checkIaqSensorStatus();';
-  Blockly.Arduino.setupCode_['bsec_sensorlist'] = `
+  Blockly.Arduino.setupCode_["Wire.begin"] = "Wire.begin();";
+  Blockly.Arduino.setupCode_["iaqSensor.begin"] =
+    "iaqSensor.begin(BME680_I2C_ADDR_PRIMARY, Wire);";
+  Blockly.Arduino.setupCode_["checkIaqSensorStatus"] =
+    "checkIaqSensorStatus();";
+  Blockly.Arduino.setupCode_["bsec_sensorlist"] = `
     bsec_virtual_sensor_t sensorList[10] = {
       BSEC_OUTPUT_RAW_TEMPERATURE,
       BSEC_OUTPUT_RAW_PRESSURE,
@@ -162,9 +275,10 @@ Blockly.Arduino.sensebox_sensor_bme680_bsec = function () {
       BSEC_OUTPUT_SENSOR_HEAT_COMPENSATED_HUMIDITY,
     };
     `;
-  Blockly.Arduino.setupCode_['iaqSensorUpdateSubscription'] = 'iaqSensor.updateSubscription(sensorList, 10, BSEC_SAMPLE_RATE_LP);\ncheckIaqSensorStatus();';
+  Blockly.Arduino.setupCode_["iaqSensorUpdateSubscription"] =
+    "iaqSensor.updateSubscription(sensorList, 10, BSEC_SAMPLE_RATE_LP);\ncheckIaqSensorStatus();";
   //Loop Code
-  Blockly.Arduino.loopCodeOnce_['iaqloop'] = `
+  Blockly.Arduino.loopCodeOnce_["iaqloop"] = `
     if (iaqSensor.run()) {
       bmeTemperatur = iaqSensor.temperature;
       bmeHumidity = iaqSensor.humidity;
@@ -178,26 +292,26 @@ Blockly.Arduino.sensebox_sensor_bme680_bsec = function () {
     }
     `;
   switch (dropdown_name) {
-    case 'temperature':
-      code = 'bmeTemperatur';
+    case "temperature":
+      code = "bmeTemperatur";
       break;
-    case 'humidity':
-      code = 'bmeHumidity';
+    case "humidity":
+      code = "bmeHumidity";
       break;
-    case 'pressure':
-      code = 'bmePressure'
+    case "pressure":
+      code = "bmePressure";
       break;
-    case 'IAQ':
-      code = 'bmeIAQ';
+    case "IAQ":
+      code = "bmeIAQ";
       break;
-    case 'IAQAccuracy':
-      code = 'bmeIAQAccuracy';
+    case "IAQAccuracy":
+      code = "bmeIAQAccuracy";
       break;
-    case 'CO2':
-      code = 'bmeCO2';
+    case "CO2":
+      code = "bmeCO2";
       break;
-    case 'breathVocEquivalent':
-      code = 'bmeBreathVocEquivalent';
+    case "breathVocEquivalent":
+      code = "bmeBreathVocEquivalent";
       break;
     default:
       break;
@@ -205,20 +319,30 @@ Blockly.Arduino.sensebox_sensor_bme680_bsec = function () {
   return [code, Blockly.Arduino.ORDER_ATOMIC];
 };
 
-
 /**
  * Ultrasonic Distance Sensor
  *
  */
 
 Blockly.Arduino.sensebox_sensor_ultrasonic_ranger = function () {
-  var dropdown_pin_RX = this.getFieldValue('ultrasonic_trigger');
-  var dropdown_pin_TX = this.getFieldValue('ultrasonic_echo');
-  var port = this.getFieldValue('port');
-  Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"';
-  Blockly.Arduino.definitions_['var_ultrasonic' + port] = 'Ultrasonic Ultrasonic' + port + '(' + dropdown_pin_RX + ',' + dropdown_pin_TX + ');';
+  var dropdown_pin_RX = this.getFieldValue("ultrasonic_trigger");
+  var dropdown_pin_TX = this.getFieldValue("ultrasonic_echo");
+  var port = this.getFieldValue("port");
+  var maxDistance = this.getFieldValue("maxDistance");
+  Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
+  Blockly.Arduino.libraries_[
+    "library_newPing"
+  ] = `#include <NewPing.h> // http://librarymanager/All#NewPing`;
+  Blockly.Arduino.variables_["define_newPingVariables" + port] = `
+#define TRIGGER_PIN_${port} ${dropdown_pin_RX}
+#define ECHO_PIN_${port} ${dropdown_pin_TX}
+#define MAX_DISTANCE_${port} ${maxDistance}
+  `;
+  Blockly.Arduino.definitions_[
+    "define_newPing" + port
+  ] = `NewPing sonar${port}(TRIGGER_PIN_${port}, ECHO_PIN_${port}, MAX_DISTANCE_${port});`;
   var code;
-  code = 'Ultrasonic' + port + '.getDistance()';
+  code = `sonar${port}.ping_cm()`;
   return [code, Blockly.Arduino.ORDER_ATOMIC];
 };
 
@@ -228,35 +352,67 @@ Blockly.Arduino.sensebox_sensor_ultrasonic_ranger = function () {
  */
 
 Blockly.Arduino.sensebox_sensor_sound = function () {
-  var dropdown_pin = this.getFieldValue('PIN');
-  Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"';
-  Blockly.Arduino.definitions_['define_microphone'] = 'Microphone microphone(' + dropdown_pin + ');'
-  var code = 'microphone.getValue()';
+  var dropdown_pin = this.getFieldValue("PIN");
+  Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
+  Blockly.Arduino.codeFunctions_["define_sound"] = `
+float getSoundValue(int pin) {
+    unsigned long start = millis(); // Start des Messintervalls
+    unsigned int peakToPeak = 0;	// Abstand von maximalem zu minimalem Amplitudenausschlag
+    unsigned int signalMax = 0;
+    unsigned int signalMin = 1023;
+    const int sampleTime = 100;
+    unsigned int micValue;
+  
+    // Sammle Daten für 100 Millisekunden
+    while (millis() - start < sampleTime)
+    {
+      micValue = analogRead(pin); // Messe den aktuellen Wert
+      if (micValue < 1023)		 // sortiere Fehlmessungen aus, deren Werte über dem max Wert 1024 liegen
+      {
+        if (micValue > signalMax)
+        {
+          signalMax = micValue; // speichere den maximal gemessenen Wert
+        }
+        else if (micValue < signalMin)
+        {
+          signalMin = micValue; // speichere den minimal gemessenen Wert
+        }
+      }
+    }
+    peakToPeak = signalMax - signalMin;		  // max - min = Abstand von maximalem zu minimalem Amplitudenausschlag
+    double volts = (peakToPeak * 5.0) / 1023; // wandle in Volt um
+    return volts;
+}`;
+  var code = "getSoundValue(" + dropdown_pin + ")";
   return [code, Blockly.Arduino.ORDER_ATOMIC];
 };
 
-
 /**
  * Button
  *
  */
 
-
 Blockly.Arduino.sensebox_button = function () {
-  var dropdown_pin = this.getFieldValue('PIN');
-  var dropown_function = this.getFieldValue('FUNCTION');
-  Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"';
-  Blockly.Arduino.definitions_['define_button' + dropdown_pin + ''] = 'Button button_' + dropdown_pin + '(' + dropdown_pin + ');';
-  Blockly.Arduino.setupCode_['setup_button' + dropdown_pin + ''] = 'button_' + dropdown_pin + '.begin();';
-  var code = '';
-  if (dropown_function === 'isPressed') {
-    code = 'button_' + dropdown_pin + '.isPressed()';
-  }
-  else if (dropown_function === 'Switch') {
-    code = 'button_' + dropdown_pin + '.getSwitch()';
-  }
-  else if (dropown_function === 'wasPressed') {
-    code = 'button_' + dropdown_pin + '.wasPressed()';
+  var dropdown_pin = this.getFieldValue("PIN");
+  var dropown_function = this.getFieldValue("FUNCTION");
+  Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
+  Blockly.Arduino.libraries_[
+    "library_jcButtons"
+  ] = `#include <JC_Button.h> // http://librarymanager/All#JC_Button`;
+  Blockly.Arduino.definitions_["define_button" + dropdown_pin + ""] =
+    "Button button_" + dropdown_pin + "(" + dropdown_pin + ");";
+  Blockly.Arduino.setupCode_["setup_button" + dropdown_pin + ""] =
+    "button_" + dropdown_pin + ".begin();";
+  Blockly.Arduino.loopCodeOnce_["loop_button" + dropdown_pin + ""] =
+    "button_" + dropdown_pin + ".read();";
+  var code = "";
+  if (dropown_function === "isPressed") {
+    code = "button_" + dropdown_pin + ".isPressed()";
+  } else if (dropown_function === "wasPressed") {
+    code = "button_" + dropdown_pin + ".wasPressed()";
+  } else if (dropown_function === "longPress") {
+    var time = this.getFieldValue("time");
+    code = "button_" + dropdown_pin + ".pressedFor(" + time + ")";
   }
   return [code, Blockly.Arduino.ORDER_ATOMIC];
 };
@@ -267,34 +423,33 @@ Blockly.Arduino.sensebox_button = function () {
  */
 
 Blockly.Arduino.sensebox_scd30 = function () {
-  var dropdown = this.getFieldValue('dropdown');
-  Blockly.Arduino.libraries_['scd30_library'] = '#include "SparkFun_SCD30_Arduino_Library.h"'
-  Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"';
-  Blockly.Arduino.definitions_['SCD30'] = 'SCD30 airSensor;';
-  Blockly.Arduino.setupCode_['init_scd30'] = ` Wire.begin();
+  var dropdown = this.getFieldValue("dropdown");
+  Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
+  Blockly.Arduino.libraries_["scd30_library"] =
+    "#include <SparkFun_SCD30_Arduino_Library.h> // http://librarymanager/All#SparkFun_SCD30_Arduino_Library";
+  Blockly.Arduino.definitions_["SCD30"] = "SCD30 airSensor;";
+  Blockly.Arduino.setupCode_["init_scd30"] = ` Wire.begin();
   if (airSensor.begin() == false)
   {
     while (1)
       ;
   }`;
-  var code = '';
+  var code = "";
   switch (dropdown) {
-    case 'temperature':
-      code = 'airSensor.getTemperature()';
+    case "temperature":
+      code = "airSensor.getTemperature()";
       break;
-    case 'humidity':
-      code = 'airSensor.getHumiditiy()';
+    case "humidity":
+      code = "airSensor.getHumidity()";
       break;
-    case 'CO2':
-      code = 'airSensor.getCO2()';
+    case "CO2":
+      code = "airSensor.getCO2()";
       break;
     default:
-      code = ''
+      code = "";
   }
   return [code, Blockly.Arduino.ORDER_ATOMIC];
-
-}
-
+};
 
 /**
  * GPS Module
@@ -302,12 +457,13 @@ Blockly.Arduino.sensebox_scd30 = function () {
  */
 
 Blockly.Arduino.sensebox_gps = function () {
-  var dropdown = this.getFieldValue('dropdown');
-  Blockly.Arduino.libraries_['gps_library'] = '#include <SparkFun_u-blox_GNSS_Arduino_Library.h>'
-  Blockly.Arduino.libraries_['library_wire'] = '#include <Wire.h>';
-  Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"';
-  Blockly.Arduino.definitions_['GPS'] = 'SFE_UBLOX_GNSS myGNSS;';
-  Blockly.Arduino.setupCode_['init_gps'] = ` Wire.begin();
+  var dropdown = this.getFieldValue("dropdown");
+  Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
+  Blockly.Arduino.libraries_["gps_library"] =
+    "#include <SparkFun_u-blox_GNSS_Arduino_Library.h> // http://librarymanager/All#SparkFun_u-blox_GNSS_Arduino_Library";
+  Blockly.Arduino.libraries_["library_wire"] = "#include <Wire.h>";
+  Blockly.Arduino.definitions_["GPS"] = "SFE_UBLOX_GNSS myGNSS;";
+  Blockly.Arduino.setupCode_["init_gps"] = ` Wire.begin();
 
   if (myGNSS.begin() == false) //Connect to the Ublox module using Wire port
   {
@@ -317,69 +473,88 @@ Blockly.Arduino.sensebox_gps = function () {
 
   myGNSS.setI2COutput(COM_TYPE_UBX); //Set the I2C port to output UBX only (turn off NMEA noise)
   myGNSS.saveConfiguration(); //Save the current settings to flash and BBR`;
-  var code = '';
+  var code = "";
   switch (dropdown) {
-    case 'latitude':
-      code = 'myGNSS.getLatitude()';
+    case "latitude":
+      code = "myGNSS.getLatitude()";
       break;
-    case 'longitude':
-      code = 'myGNSS.getLongitude()';
+    case "longitude":
+      code = "myGNSS.getLongitude()";
       break;
-    case 'altitude':
-      code = 'myGNSS.getAltitudeMSL()';
+    case "altitude":
+      code = "myGNSS.getAltitudeMSL()";
       break;
-    case 'pDOP':
-      code = 'myGNSS.getPDOP()';
+    case "pDOP":
+      code = "myGNSS.getPDOP()";
       break;
-    case 'fixType':
-      code = 'myGNSS.getFixType()';
+    case "fixType":
+      code = "myGNSS.getFixType()";
+      break;
+    case "timestamp":
+      Blockly.Arduino.variables_["timestampVars"] = `
+char tsBuffer[21];
+      `;
+      Blockly.Arduino.codeFunctions_["getTimeStamp()"] = `
+char* getTimeStamp()
+{
+  if (myGNSS.getTimeValid() == true)
+    {
+    sprintf(tsBuffer, "%04d-%02d-%02dT%02d:%02d:%02dZ",
+    myGNSS.getYear(), myGNSS.getMonth(), myGNSS.getDay(), myGNSS.getHour(), myGNSS.getMinute(), myGNSS.getSecond());
+    }
+return tsBuffer;
+}
+      `;
+      code = "getTimeStamp()";
+      break;
+    case "speed":
+      code = "myGNSS.getGroundSpeed()";
       break;
     default:
-      code = ''
+      code = "";
   }
   return [code, Blockly.Arduino.ORDER_ATOMIC];
-
-}
+};
 
 /**
  * Block for Truebner STM50
  */
 
-
 Blockly.Arduino.sensebox_sensor_truebner_smt50 = function () {
-  var dropdown_port = this.getFieldValue('Port')
-  var dropdown_value = this.getFieldValue('value');
+  Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
+  var dropdown_port = this.getFieldValue("Port");
+  var dropdown_value = this.getFieldValue("value");
   var dropdown_pin = 1;
-  var code = '';
-  if (dropdown_value === 'temp') {
-    if (dropdown_port === 'A') {
+  var code = "";
+  if (dropdown_value === "temp") {
+    if (dropdown_port === "A") {
       dropdown_pin = 1;
     }
-    if (dropdown_port === 'B') {
+    if (dropdown_port === "B") {
       dropdown_pin = 3;
     }
-    if (dropdown_port === 'C') {
+    if (dropdown_port === "C") {
       dropdown_pin = 5;
     }
-    Blockly.Arduino.codeFunctions_['sensebox_smt50_temp'] = 'float getSMT50Temperature(int analogPin){\n  int sensorValue = analogRead(analogPin);\n  float voltage = sensorValue * (3.3 / 1024.0);\n   return (voltage - 0.5) * 100;\n}';
-    code = 'getSMT50Temperature(' + dropdown_pin + ')';
+    Blockly.Arduino.codeFunctions_["sensebox_smt50_temp"] =
+      "float getSMT50Temperature(int analogPin){\n  int sensorValue = analogRead(analogPin);\n  float voltage = sensorValue * (3.3 / 1024.0);\n   return (voltage - 0.5) * 100;\n}";
+    code = "getSMT50Temperature(" + dropdown_pin + ")";
     return [code, Blockly.Arduino.ORDER_ATOMIC];
-  }
-  else if (dropdown_value === 'soil') {
-    if (dropdown_port === 'A') {
+  } else if (dropdown_value === "soil") {
+    if (dropdown_port === "A") {
       dropdown_pin = 2;
     }
-    if (dropdown_port === 'B') {
+    if (dropdown_port === "B") {
       dropdown_pin = 4;
     }
-    if (dropdown_port === 'C') {
+    if (dropdown_port === "C") {
       dropdown_pin = 6;
     }
-    Blockly.Arduino.codeFunctions_['sensebox_smt50_soil'] = 'float getSMT50Moisture(int analogPin){\n   int sensorValue = analogRead(analogPin);\n    float voltage = sensorValue * (3.3 / 1024.0);\n   return (voltage * 50) / 3;\n}';
-    code = 'getSMT50Moisture(' + dropdown_pin + ')';
+    Blockly.Arduino.codeFunctions_["sensebox_smt50_soil"] =
+      "float getSMT50Moisture(int analogPin){\n   int sensorValue = analogRead(analogPin);\n    float voltage = sensorValue * (3.3 / 1024.0);\n   return (voltage * 50) / 3;\n}";
+    code = "getSMT50Moisture(" + dropdown_pin + ")";
     return [code, Blockly.Arduino.ORDER_ATOMIC];
   }
-
 };
 
 /**
@@ -388,24 +563,30 @@ Blockly.Arduino.sensebox_sensor_truebner_smt50 = function () {
  */
 
 Blockly.Arduino.sensebox_sensor_watertemperature = function () {
-
-  var dropdown_port = this.getFieldValue('Port');
+  var dropdown_port = this.getFieldValue("Port");
   var dropdown_pin = 1;
-  if (dropdown_port === 'A') {
+  if (dropdown_port === "A") {
     dropdown_pin = 1;
   }
-  if (dropdown_port === 'B') {
+  if (dropdown_port === "B") {
     dropdown_pin = 3;
   }
-  if (dropdown_port === 'C') {
+  if (dropdown_port === "C") {
     dropdown_pin = 5;
   }
-  Blockly.Arduino.libraries_['library_oneWire'] = '#include "OneWire.h"';
-  Blockly.Arduino.libraries_['library_oneDallasTemperature'] = '#include "DallasTemperature.h"';
-  Blockly.Arduino.definitions_['define_OneWire'] = '#define ONE_WIRE_BUS ' + dropdown_pin + '\nOneWire oneWire(ONE_WIRE_BUS);\nDallasTemperature sensors(&oneWire);';
-  Blockly.Arduino.setupCode_['sensebox_oneWireSetup'] = 'sensors.begin();';
-  Blockly.Arduino.codeFunctions_['sensebox_requestTemp'] = 'float getWaterTemp(){\nsensors.requestTemperatures();\nsensors.getTempCByIndex(0);\n}';
-  var code = 'getWaterTemp()';
+  Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
+  Blockly.Arduino.libraries_["library_oneWire"] =
+    "#include <OneWire.h> // http://librarymanager/All#OneWire";
+  Blockly.Arduino.libraries_["library_oneDallasTemperature"] =
+    "#include <DallasTemperature.h> // http://librarymanager/All#DallasTemperature";
+  Blockly.Arduino.definitions_["define_OneWire"] =
+    "#define ONE_WIRE_BUS " +
+    dropdown_pin +
+    "\nOneWire oneWire(ONE_WIRE_BUS);\nDallasTemperature sensors(&oneWire);";
+  Blockly.Arduino.setupCode_["sensebox_oneWireSetup"] = "sensors.begin();";
+  Blockly.Arduino.codeFunctions_["sensebox_requestTemp"] =
+    "float getWaterTemp(){\nsensors.requestTemperatures();\nsensors.getTempCByIndex(0);\n}";
+  var code = "getWaterTemp()";
   return [code, Blockly.Arduino.ORDER_ATOMIC];
 };
 
@@ -443,28 +624,88 @@ float getWindspeed(){
  */
 
 /**
-* 
-* 
-*/
+ *
+ *
+ */
 
 Blockly.Arduino.sensebox_soundsensor_dfrobot = function () {
-  var dropdown_port = this.getFieldValue('Port');
+  Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
+  var dropdown_port = this.getFieldValue("Port");
   var dropdown_pin = 1;
-  if (dropdown_port === 'A') {
+  if (dropdown_port === "A") {
     dropdown_pin = 1;
   }
-  if (dropdown_port === 'B') {
+  if (dropdown_port === "B") {
     dropdown_pin = 3;
   }
-  if (dropdown_port === 'C') {
+  if (dropdown_port === "C") {
     dropdown_pin = 5;
   }
-  Blockly.Arduino.codeFunctions_['soundsensor'] = `    
+  Blockly.Arduino.codeFunctions_["soundsensor"] =
+    `    
 float getSoundValue(){
-  float v = analogRead(`+ dropdown_pin + `) * (3.3 / 1024.0);
+  float v = analogRead(` +
+    dropdown_pin +
+    `) * (3.3 / 1024.0);
   float decibel = v * 50;
   return decibel;
-}`
-  var code = 'getSoundValue()';
+}`;
+  var code = "getSoundValue()";
+  return [code, Blockly.Arduino.ORDER_ATOMIC];
+};
+
+/**
+ * rainsensor hydreon rg-15
+ */
+
+Blockly.Arduino.sensebox_rainsensor_hydreon_rg15 = function () {
+  var port = this.getFieldValue("SERIAL");
+  var value = this.getFieldValue("VALUE");
+  Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
+  Blockly.Arduino.libraries_["library_rainsensor_rg15"] = "#include <hydreon.h>";
+  Blockly.Arduino.definitions_["def_rainsensor_rg15_" + port] = "HYDREON rainsensor_" + port + "(" + port + ");";
+  Blockly.Arduino.setupCode_["setup_rainsensor_rg15_" + port] = "rainsensor_" + port + ".begin();";
+  Blockly.Arduino.loopCodeOnce_["loop_rainsensor_rg15_" + port] = "rainsensor_" + port + ".readAllData();"
+
+  var code = "rainsensor_" + port + "." + value + "()";
+  return [code, Blockly.Arduino.ORDER_ATOMIC];
+};
+
+/**
+ * Infineon DPS310 Pressure Sensor
+ *
+ */
+
+Blockly.Arduino.sensebox_sensor_dps310 = function () {
+  var dropdown_name = this.getFieldValue("NAME");
+  var code = "";
+  var referencePressure = this.getFieldValue("referencePressure");
+  Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
+  Blockly.Arduino.libraries_[
+    "adafruit_dps310"
+  ] = `#include <Adafruit_DPS310.h> // http://librarymanager/All#Adafruit_DPS310`;
+  Blockly.Arduino.definitions_["define_dps"] = "Adafruit_DPS310 dps;";
+  Blockly.Arduino.setupCode_["dps_begin"] = "dps.begin_I2C(0x76);";
+  Blockly.Arduino.setupCode_["dps_configuration"] = `
+  dps.configurePressure(DPS310_64HZ, DPS310_64SAMPLES);
+  dps.configureTemperature(DPS310_64HZ, DPS310_64SAMPLES);
+  `;
+  Blockly.Arduino.loopCodeOnce_["dps_events"] =
+    "sensors_event_t temp_event, pressure_event;";
+  Blockly.Arduino.loopCodeOnce_["dps_getEvents"] =
+    "dps.getEvents(&temp_event, &pressure_event);";
+  switch (dropdown_name) {
+    case "Temperature":
+      code = "temp_event.temperature";
+      break;
+    case "Pressure":
+      code = "pressure_event.pressure";
+      break;
+    case "Altitude":
+      code = "dps.readAltitude(" + referencePressure + ")";
+      break;
+    default:
+      code = "";
+  }
   return [code, Blockly.Arduino.ORDER_ATOMIC];
 };

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

@@ -1,29 +1,40 @@
-import * as Blockly from 'blockly/core';
-
+import * as Blockly from "blockly/core";
 
 /**
  * Telegram Bot by re:edu
  */
 Blockly.Arduino.sensebox_telegram = function (Block) {
-  let token = Block.getFieldValue('telegram_token');
-  Blockly['Arduino'].libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"';
-  Blockly['Arduino'].libraries_['library_telegram'] = `#include <UniversalTelegramBot.h>`
-  Blockly['Arduino'].functionNames_['WiFiSSLClient'] = 'WiFiSSLClient client;';
-  Blockly['Arduino'].functionNames_['telegram_objects'] = `#define BOTtoken "${token}"  // your Bot Token (Get from Botfather)
+  let token = Block.getFieldValue("telegram_token");
+  Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
+  Blockly["Arduino"].libraries_[
+    "library_telegram"
+  ] = `#include <UniversalTelegramBot.h>`;
+  Blockly["Arduino"].functionNames_["WiFiSSLClient"] = "WiFiSSLClient client;";
+  Blockly["Arduino"].functionNames_[
+    "telegram_objects"
+  ] = `#define BOTtoken "${token}"  // your Bot Token (Get from Botfather)
       
-    UniversalTelegramBot bot(BOTtoken, client);`
+    UniversalTelegramBot bot(BOTtoken, client);`;
 
-  let code = '';
+  let code = "";
   return code;
 };
 
 Blockly.Arduino.sensebox_telegram_do = function (block) {
-  var messageProcessing = Blockly.Arduino.statementToCode(block, 'telegram_do', Blockly.Arduino.ORDER_ATOMIC);
+  var messageProcessing = Blockly.Arduino.statementToCode(
+    block,
+    "telegram_do",
+    Blockly.Arduino.ORDER_ATOMIC
+  );
 
-  Blockly.Arduino.definitions_['telegram_variables'] = `int Bot_mtbs = 1000; //mean time between scan messages
-  long Bot_lasttime;   //last time messages' scan has been done`
+  Blockly.Arduino.definitions_[
+    "telegram_variables"
+  ] = `int Bot_mtbs = 1000; //mean time between scan messages
+  long Bot_lasttime;   //last time messages' scan has been done`;
 
-  Blockly.Arduino.loopCodeOnce_['sensebox_telegram_loop'] = `if (millis() > Bot_lasttime + Bot_mtbs)  {
+  Blockly.Arduino.loopCodeOnce_[
+    "sensebox_telegram_loop"
+  ] = `if (millis() > Bot_lasttime + Bot_mtbs)  {
       int numNewMessages = bot.getUpdates(bot.last_message_received + 1);
       while(numNewMessages) {
         for(int i=0; i<numNewMessages; i++) {
@@ -36,13 +47,17 @@ Blockly.Arduino.sensebox_telegram_do = function (block) {
       }
       Bot_lasttime = millis();
     }`;
-  var code = '';
+  var code = "";
   return code;
 };
 
 Blockly.Arduino.sensebox_telegram_do_on_message = function (block) {
-  var message = this.getFieldValue('telegram_message');
-  var stuffToDo = Blockly.Arduino.statementToCode(block, 'telegram_do_on_message', Blockly.Arduino.ORDER_ATOMIC);
+  var message = this.getFieldValue("telegram_message");
+  var stuffToDo = Blockly.Arduino.statementToCode(
+    block,
+    "telegram_do_on_message",
+    Blockly.Arduino.ORDER_ATOMIC
+  );
   var code = `
         if (text == "${message}") {
           ${stuffToDo}
@@ -51,7 +66,12 @@ Blockly.Arduino.sensebox_telegram_do_on_message = function (block) {
 };
 
 Blockly.Arduino.sensebox_telegram_send = function (block) {
-  var textToSend = Blockly.Arduino.valueToCode(this, 'telegram_text_to_send', Blockly.Arduino.ORDER_ATOMIC) || '"Keine Eingabe"';
+  var textToSend =
+    Blockly.Arduino.valueToCode(
+      this,
+      "telegram_text_to_send",
+      Blockly.Arduino.ORDER_ATOMIC
+    ) || '"Keine Eingabe"';
   var code = `bot.sendMessage(chat_id, String(${textToSend}), "");\n`;
   return code;
 };

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

@@ -1,25 +1,112 @@
-import Blockly from 'blockly';
-
+import Blockly from "blockly";
 
 /* Wifi connection and openSenseMap Blocks*/
 Blockly.Arduino.sensebox_wifi = function (block) {
-    var pw = this.getFieldValue('Password');
-    var ssid = this.getFieldValue('SSID');
-    Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"';
-    Blockly.Arduino.definitions_['define_network'] = 'Bee* b = new Bee();';
+  var pw = this.getFieldValue("Password");
+  var ssid = this.getFieldValue("SSID");
+  Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
+  Blockly.Arduino.libraries_["library_WiFi"] = "#include <WiFi101.h>";
+  Blockly.Arduino.variables_["ssid"] = `char ssid[] = "${ssid}";`;
+  Blockly.Arduino.variables_["pass"] = `char pass[] = "${pw}";`;
+  Blockly.Arduino.variables_["wifi_Status"] = "int status = WL_IDLE_STATUS;";
   if (pw === "") {
-        Blockly.Arduino.setupCode_['sensebox_network'] = 'b->connectToWifi("' + ssid + '");\ndelay(1000);';
+    Blockly.Arduino.setupCode_["wifi_begin"] = `
+    if (WiFi.status() == WL_NO_SHIELD) {
+        while (true);
+    }
+    while (status != WL_CONNECTED) {
+        status = WiFi.begin(ssid);
+        delay(5000);
+    }
+    `;
   } else
-        Blockly.Arduino.setupCode_['sensebox_network'] = 'b->connectToWifi("' + ssid + '","' + pw + '");\ndelay(1000);';
-    var code = '';
+    Blockly.Arduino.setupCode_["wifi_begin"] = `
+if (WiFi.status() == WL_NO_SHIELD) {
+    while (true);
+}
+while (status != WL_CONNECTED) {
+    status = WiFi.begin(ssid, pass);
+    delay(5000);
+}
+`;
+  var code = "";
   return code;
 };
 
+Blockly.Arduino.sensebox_wifi_status = function () {
+  var code = "WiFi.status()";
+  return [code, Blockly.Arduino.ORDER_ATOMIC];
+};
+
+Blockly.Arduino.sensebox_wifi_rssi = function () {
+  var code = "WiFi.RSSI()";
+  return [code, Blockly.Arduino.ORDER_ATOMIC];
+};
+
+Blockly.Arduino.sensebox_get_ip = function () {
+  Blockly.Arduino.definitions_["define_ipadress"] = "IPAddress ip;";
+  Blockly.Arduino.setupCode_["sensebox_get_ip"] = " ip = WiFi.localIP();";
+  var code = "ip";
+  return [code, Blockly.Arduino.ORDER_ATOMIC];
+};
+
 Blockly.Arduino.sensebox_startap = function (block) {
-    var ssid = this.getFieldValue('SSID');
-    Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"';
-    Blockly.Arduino.definitions_['define_network'] = 'Bee* b = new Bee();';
-    Blockly.Arduino.setupCode_['sensebox_network'] = 'b->startAP("' + ssid + '");'
-    var code = '';
+  var ssid = this.getFieldValue("SSID");
+  Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
+  Blockly.Arduino.libraries_["library_WiFi"] = "#include <WiFi101.h>";
+  Blockly.Arduino.setupCode_["wifi_startAP"] = `WiFi.beginAP(${ssid});`;
+  var code = "";
   return code;
 };
+
+Blockly.Arduino.sensebox_ethernet = function () {
+  var ip = this.getFieldValue("ip");
+  var gateway = this.getFieldValue("gateway");
+  var subnetmask = this.getFieldValue("subnetmask");
+  var dns = this.getFieldValue("dns");
+  var mac = this.getFieldValue("mac");
+  var dhcp = this.getFieldValue("dhcp");
+
+  Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
+  Blockly.Arduino.libraries_["library_ethernet"] =
+    "#include <Ethernet.h> // http://librarymanager/All#Ethernet";
+
+  Blockly.Arduino.definitions_["ethernet_config"] = `
+byte mac[] = { ${mac}};`;
+  if (dhcp === "Manual") {
+    Blockly.Arduino.definitions_["ethernet_manual_config"] = `
+//Configure static IP setup (only needed if DHCP is disabled)
+IPAddress myIp(${ip.replaceAll(".", ", ")});
+IPAddress myDns(${dns.replaceAll(".", ",")});
+IPAddress myGateway(${gateway.replaceAll(".", ",")});
+IPAddress mySubnet(${subnetmask.replaceAll(".", ",")});
+    `;
+    Blockly.Arduino.setupCode_["ethernet_setup"] = `
+Ethernet.init(23);
+// start the Ethernet connection:
+if (Ethernet.begin(mac) == 0) {
+    // no point in carrying on, so do nothing forevermore:
+    // try to congifure using IP address instead of DHCP:
+    Ethernet.begin(mac, myIp);
+}
+// give the Ethernet shield a second to initialize:
+delay(1000);
+    `;
+  } else {
+    Blockly.Arduino.setupCode_["ethernet_setup"] = `
+Ethernet.init(23);
+// start the Ethernet connection:
+Ethernet.begin(mac);
+// give the Ethernet shield a second to initialize:
+delay(1000);
+    `;
+  }
+
+  var code = "";
+  return code;
+};
+
+Blockly.Arduino.sensebox_ethernetIp = function () {
+  var code = "Ethernet.localIP()";
+  return [code, Blockly.Arduino.ORDER_ATOMIC];
+};

src/components/Blockly/generator/serial.js

@@ -0,0 +1,35 @@
+import * as Blockly from "blockly/core";
+
+Blockly.Arduino["print_serial_monitor"] = function (block) {
+  var serialId = block.getFieldValue("SERIAL_ID");
+  var content =
+    Blockly.Arduino.valueToCode(
+      block,
+      "CONTENT",
+      Blockly.Arduino.ORDER_ATOMIC
+    ) || "0";
+  var checkbox_name = block.getFieldValue("NEW_LINE") === "TRUE";
+  var code = "";
+  if (checkbox_name) {
+    code = serialId + ".println(" + content + ");\n";
+  } else {
+    code = serialId + ".print(" + content + ");\n";
+  }
+  return code;
+};
+
+/**
+ * Code generator for block for setting the serial com speed.
+ * Arduino code: setup{ Serial.begin(X); }
+ * @param {!Blockly.Block} block Block to generate the code from.
+ * @return {array} Completed code.
+ */
+Blockly.Arduino["init_serial_monitor"] = function (block) {
+  var serialId = block.getFieldValue("SERIAL_ID");
+  var serialSpeed = block.getFieldValue("SPEED");
+  Blockly.Arduino.setupCode_[
+    "init_serial"
+  ] = `${serialId}.begin(${serialSpeed});`;
+  var code = "";
+  return code;
+};

src/components/Blockly/generator/text.js

@@ -1,5 +1,4 @@
-import * as Blockly from 'blockly/core';
-
+import * as Blockly from "blockly/core";
 
 /**
  * Code generator for a literal String (X).
@@ -7,12 +6,11 @@ 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['text'] = function (block) {
-    var code = Blockly.Arduino.quote_(block.getFieldValue('TEXT'));
+Blockly.Arduino["text"] = function (block) {
+  var code = Blockly.Arduino.quote_(block.getFieldValue("TEXT"));
   return [code, Blockly.Arduino.ORDER_ATOMIC];
 };
 
-
 /**
  * Code generator for a String concatenation (X...Y). This string can be made
  * up of any number of elements of any type.
@@ -22,28 +20,35 @@ Blockly.Arduino['text'] = function (block) {
  * @param {!Blockly.Block} block Block to generate the code from.
  * @return {array} Completed code with order of operation.
  */
-Blockly.Arduino['text_join'] = function (block) {
+Blockly.Arduino["text_join"] = function (block) {
   var code;
   if (block.itemCount_ === 0) {
     return ['""', Blockly.Arduino.ORDER_ATOMIC];
   } else if (block.itemCount_ === 1) {
-        var argument0 = Blockly.Arduino.valueToCode(block, 'ADD0',
-            Blockly.Arduino.ORDER_UNARY_POSTFIX) || '""';
-        code = 'String(' + argument0 + ')';
+    var argument0 =
+      Blockly.Arduino.valueToCode(
+        block,
+        "ADD0",
+        Blockly.Arduino.ORDER_UNARY_POSTFIX
+      ) || '""';
+    code = "String(" + argument0 + ")";
     return [code, Blockly.Arduino.ORDER_UNARY_POSTFIX];
   } else {
     var argument;
     code = [];
     for (var n = 0; n < block.itemCount_; n++) {
       argument = Blockly.Arduino.valueToCode(
-                block, 'ADD' + n, Blockly.Arduino.ORDER_NONE);
-            if (argument === '') {
+        block,
+        "ADD" + n,
+        Blockly.Arduino.ORDER_NONE
+      );
+      if (argument === "") {
         code[n] = '""';
       } else {
-                code[n] = 'String(' + argument + ')';
+        code[n] = "String(" + argument + ")";
       }
     }
-        code = code.join(' + ');
+    code = code.join(" + ");
     return [code, Blockly.Arduino.ORDER_UNARY_POSTFIX];
   }
 };
@@ -55,18 +60,23 @@ Blockly.Arduino['text_join'] = function (block) {
  * @param {!Blockly.Block} block Block to generate the code from.
  * @return {string} Completed code.
  */
-Blockly.Arduino['text_append'] = function (block) {
+Blockly.Arduino["text_append"] = function (block) {
   // Append to a variable in place.
-    var varName = Blockly.Arduino.variableDB_.getName(
-        block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
-    var argument0 = Blockly.Arduino.valueToCode(block, 'TEXT',
-        Blockly.Arduino.ORDER_UNARY_POSTFIX);
-    if (argument0 === '') {
+  var varName = Blockly.Arduino.nameDB_.getName(
+    block.getFieldValue("VAR"),
+    Blockly.Variables.NAME_TYPE
+  );
+  var argument0 = Blockly.Arduino.valueToCode(
+    block,
+    "TEXT",
+    Blockly.Arduino.ORDER_UNARY_POSTFIX
+  );
+  if (argument0 === "") {
     argument0 = '""';
   } else {
-        argument0 = 'String(' + argument0 + ')';
+    argument0 = "String(" + argument0 + ")";
   }
-    return varName + ' += ' + argument0 + ';\n';
+  return varName + " += " + argument0 + ";\n";
 };
 
 /**
@@ -76,10 +86,13 @@ Blockly.Arduino['text_append'] = function (block) {
  * @param {!Blockly.Block} block Block to generate the code from.
  * @return {array} Completed code with order of operation.
  */
-Blockly.Arduino['text_length'] = function (block) {
-    var argument0 = Blockly.Arduino.valueToCode(block, 'VALUE',
-        Blockly.Arduino.ORDER_UNARY_POSTFIX) || '""';
-    var code = 'String(' + argument0 + ').length()';
+Blockly.Arduino["text_length"] = function (block) {
+  var argument0 =
+    Blockly.Arduino.valueToCode(
+      block,
+      "VALUE",
+      Blockly.Arduino.ORDER_UNARY_POSTFIX
+    ) || '""';
+  var code = "String(" + argument0 + ").length()";
   return [code, Blockly.Arduino.ORDER_UNARY_POSTFIX];
 };
-

src/components/Blockly/generator/time.js

@@ -1,4 +1,4 @@
-import Blockly from 'blockly';
+import Blockly from "blockly";
 
 /**
  * @license Licensed under the Apache License, Version 2.0 (the "License"):
@@ -16,10 +16,14 @@ import Blockly from 'blockly';
  * @param {!Blockly.Block} block Block to generate the code from.
  * @return {string} Completed code.
  */
-Blockly.Arduino['time_delay'] = function (block) {
-    var delayTime = Blockly.Arduino.valueToCode(
-        block, 'DELAY_TIME_MILI', Blockly.Arduino.ORDER_ATOMIC) || '0';
-    var code = 'delay(' + delayTime + ');\n';
+Blockly.Arduino["time_delay"] = function (block) {
+  var delayTime =
+    Blockly.Arduino.valueToCode(
+      block,
+      "DELAY_TIME_MILI",
+      Blockly.Arduino.ORDER_ATOMIC
+    ) || "0";
+  var code = "delay(" + delayTime + ");\n";
   return code;
 };
 
@@ -29,10 +33,14 @@ Blockly.Arduino['time_delay'] = function (block) {
  * @param {!Blockly.Block} block Block to generate the code from.
  * @return {string} Completed code.
  */
-Blockly.Arduino['time_delaymicros'] = function (block) {
-    var delayTimeMs = Blockly.Arduino.valueToCode(
-        block, 'DELAY_TIME_MICRO', Blockly.Arduino.ORDER_ATOMIC) || '0';
-    var code = 'delayMicroseconds(' + delayTimeMs + ');\n';
+Blockly.Arduino["time_delaymicros"] = function (block) {
+  var delayTimeMs =
+    Blockly.Arduino.valueToCode(
+      block,
+      "DELAY_TIME_MICRO",
+      Blockly.Arduino.ORDER_ATOMIC
+    ) || "0";
+  var code = "delayMicroseconds(" + delayTimeMs + ");\n";
   return code;
 };
 
@@ -42,8 +50,8 @@ Blockly.Arduino['time_delaymicros'] = function (block) {
  * @param {!Blockly.Block} block Block to generate the code from.
  * @return {array} Completed code with order of operation.
  */
-Blockly.Arduino['time_millis'] = function (block) {
-    var code = 'millis()';
+Blockly.Arduino["time_millis"] = function (block) {
+  var code = "millis()";
   return [code, Blockly.Arduino.ORDER_ATOMIC];
 };
 
@@ -53,8 +61,8 @@ Blockly.Arduino['time_millis'] = function (block) {
  * @param {!Blockly.Block} block Block to generate the code from.
  * @return {array} Completed code with order of operation.
  */
-Blockly.Arduino['time_micros'] = function (block) {
-    var code = 'micros()';
+Blockly.Arduino["time_micros"] = function (block) {
+  var code = "micros()";
   return [code, Blockly.Arduino.ORDER_ATOMIC];
 };
 
@@ -64,17 +72,39 @@ Blockly.Arduino['time_micros'] = function (block) {
  * @param {!Blockly.Block} block Block to generate the code from.
  * @return {string} Completed code.
  */
-Blockly.Arduino['infinite_loop'] = function (block) {
-    return 'while(true);\n';
+Blockly.Arduino["infinite_loop"] = function (block) {
+  return "while(true);\n";
 };
 
+// Blockly.Arduino.sensebox_interval_timer = function (block) {
+//   var interval = this.getFieldValue("interval");
+//   Blockly.Arduino.variables_["define_interval_variables"] =
+//     "const long interval = " +
+//     interval +
+//     ";\nlong time_start = 0;\nlong time_actual = 0;";
+//   var branch = Blockly.Arduino.statementToCode(block, "DO");
+//   var code = "time_start = millis();\n";
+//   code +=
+//     "if (time_start > time_actual + interval) {\n  time_actual = millis();\n";
+//   code += branch;
+//   code += "}\n";
+//   return code;
+// };
+
 Blockly.Arduino.sensebox_interval_timer = function (block) {
-    var interval = this.getFieldValue('interval');
-    Blockly.Arduino.variables_['define_interval_variables'] = 'const long interval = ' + interval + ';\nlong time_start = 0;\nlong time_actual = 0;';
-    var branch = Blockly.Arduino.statementToCode(block, 'DO');
-    var code = 'time_start = millis();\n';
-    code += 'if (time_start > time_actual + interval) {\n  time_actual = millis();\n'
+  var intervalTime = this.getFieldValue("interval");
+  var intervalName = this.getFieldValue("name");
+  Blockly.Arduino.variables_[`define_interval_variables${intervalName}`] = `
+  const long interval${intervalName} = ${intervalTime};
+  long time_start${intervalName} = 0;
+  long time_actual${intervalName} = 0;`;
+  Blockly.Arduino.loopCodeOnce_[
+    `interval_loop${intervalName}`
+  ] = `time_start${intervalName} = millis();\n`;
+  var branch = Blockly.Arduino.statementToCode(block, "DO");
+  var code = `
+  if (time_start${intervalName} > time_actual${intervalName} + interval${intervalName}) {\n  time_actual${intervalName} = millis();\n`;
   code += branch;
-    code += '}\n'
+  code += "}\n";
   return code;
 };

src/components/Blockly/generator/variables.js

@@ -2,7 +2,7 @@ import Blockly from "blockly";
 
 const setVariableFunction = function (defaultValue) {
   return function (block) {
-    const variableName = Blockly["Arduino"].variableDB_.getName(
+    const variableName = Blockly["Arduino"].nameDB_.getName(
       block.getFieldValue("VAR"),
       Blockly.Variables.NAME_TYPE
     );
@@ -48,7 +48,7 @@ const setVariableFunction = function (defaultValue) {
 };
 
 const getVariableFunction = function (block) {
-  const variableName = Blockly["Arduino"].variableDB_.getName(
+  const variableName = Blockly["Arduino"].nameDB_.getName(
     block.getFieldValue("VAR"),
     Blockly.Variables.NAME_TYPE
   );

src/components/Blockly/generator/watchdog.js

@@ -0,0 +1,16 @@
+import * as Blockly from "blockly/core";
+
+Blockly.Arduino.watchdog_enable = function () {
+  var time = this.getFieldValue("TIME");
+
+  Blockly.Arduino.libraries_["Adafruit_sleepydog"] =
+    "#include <Adafruit_SleepyDog.h> // http://librarymanager/All#Adafruit_SleepyDog_Library";
+  Blockly.Arduino.setupCode_["watchdog_enable"] = `Watchdog.enable(${time});`;
+  var code = "";
+  return code;
+};
+
+Blockly.Arduino.watchdog_reset = function () {
+  var code = "Watchdog.reset();";
+  return code;
+};

src/components/Blockly/generator/webserver.js

@@ -1,31 +1,34 @@
-import Blockly from 'blockly';
+import Blockly from "blockly";
 /**
  * Webserver Blocks by Lucas Steinmann
  *
  */
 
 Blockly.Arduino.sensebox_initialize_http_server = function (block) {
-    var box_id = this.getFieldValue('Port');
-    Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"';
-    Blockly.Arduino.codeFunctions_['define_wifi_server'] = 'WiFiServer server(' + box_id + ');';
-    Blockly.Arduino.setupCode_['sensebox_wifi_server_beging'] = 'server.begin();';
-    return '';
+  var box_id = this.getFieldValue("Port");
+  Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
+  Blockly.Arduino.libraries_["library_http"] = "#include <WebUtil.h>";
+
+  Blockly.Arduino.codeFunctions_["define_wifi_server"] =
+    "WiFiServer server(" + box_id + ");";
+  Blockly.Arduino.setupCode_["sensebox_wifi_server_beging"] = "server.begin();";
+  return "";
 };
 
 Blockly.Arduino.sensebox_http_on_client_connect = function (block) {
-    var onConnect = Blockly.Arduino.statementToCode(block, 'ON_CONNECT');
-    var code = '';
-    code += 'WiFiClient client = server.available();\n';
-    code += 'if (client && client.available()) {\n';
-    code += '  String request_string = listenClient(client);\n';
-    code += '  Request request;\n';
-    code += '  if (parseRequestSafe(request_string, request)) {\n';
+  var onConnect = Blockly.Arduino.statementToCode(block, "ON_CONNECT");
+  var code = "";
+  code += "WiFiClient client = server.available();\n";
+  code += "if (client && client.available()) {\n";
+  code += "  String request_string = listenClient(client);\n";
+  code += "  Request request;\n";
+  code += "  if (parseRequestSafe(request_string, request)) {\n";
   code += onConnect;
-    code += '  }\n';
-    code += '  delay(1);\n';
-    code += '  client.stop();\n';
-    code += '  delay(1);\n';
-    code += '}\n';
+  code += "  }\n";
+  code += "  delay(1);\n";
+  code += "  client.stop();\n";
+  code += "  delay(1);\n";
+  code += "}\n";
   return code;
 };
 
@@ -34,7 +37,6 @@ Blockly.Arduino.sensebox_http_method = function (block) {
   return [code, Blockly.Arduino.ORDER_ATOMIC];
 };
 
-
 Blockly.Arduino.sensebox_http_uri = function (block) {
   var code = "request.uri";
   return [code, Blockly.Arduino.ORDER_ATOMIC];
@@ -51,64 +53,81 @@ Blockly.Arduino.sensebox_http_user_agent = function (block) {
 };
 
 Blockly.Arduino.sensebox_generate_html_doc = function (block) {
-    var header = Blockly.Arduino.valueToCode(block, 'HEADER', Blockly.Arduino.ORDER_NONE) || '""';
-    var body = Blockly.Arduino.valueToCode(block, 'BODY', Blockly.Arduino.ORDER_NONE) || '""';
-    var code = 'buildHTML(' + header + ', ' + body + ')';
+  var header =
+    Blockly.Arduino.valueToCode(block, "HEADER", Blockly.Arduino.ORDER_NONE) ||
+    '""';
+  var body =
+    Blockly.Arduino.valueToCode(block, "BODY", Blockly.Arduino.ORDER_NONE) ||
+    '""';
+  var code = "buildHTML(" + header + ", " + body + ")";
   return [code, Blockly.Arduino.ORDER_ATOMIC];
 };
 
 Blockly.Arduino.sensebox_generate_http_succesful_response = function (block) {
-    var content = Blockly.Arduino.valueToCode(block, 'CONTENT', Blockly.Arduino.ORDER_NONE) || '""';
-    var code = 'client.println(buildSuccessfulResponse(request, ' + content + '));\n';
+  var content =
+    Blockly.Arduino.valueToCode(block, "CONTENT", Blockly.Arduino.ORDER_NONE) ||
+    '""';
+  var code =
+    "client.println(buildSuccessfulResponse(request, " + content + "));\n";
   return code;
 };
 
 Blockly.Arduino.sensebox_generate_http_not_found_response = function (block) {
-    var code = 'client.println(buildNotFoundResponse(request));\n';
+  var code = "client.println(buildNotFoundResponse(request));\n";
   return code;
 };
 
-
 Blockly.Arduino.sensebox_ip_address = function (block) {
   var code = "b->getIpAddress()";
   return [code, Blockly.Arduino.ORDER_ATOMIC];
 };
 
 Blockly.Arduino.sensebox_general_html_tag = function (block) {
-    var tag = this.getFieldValue('TAG');
+  var tag = this.getFieldValue("TAG");
   var code = 'buildTag("' + tag + '",';
   var n = 0;
-    var branch = Blockly.Arduino.valueToCode(block, 'DO' + n, Blockly.Arduino.ORDER_NONE);
+  var branch = Blockly.Arduino.valueToCode(
+    block,
+    "DO" + n,
+    Blockly.Arduino.ORDER_NONE
+  );
   if (branch.length > 0) {
-        code += '\n ' + branch;
+    code += "\n " + branch;
   } else {
     code += '""';
   }
   for (n = 1; n <= block.additionalChildCount_; n++) {
-        branch = Blockly.Arduino.valueToCode(block, 'DO' + n, Blockly.Arduino.ORDER_NONE);
-        code += ' +' + branch;
+    branch = Blockly.Arduino.valueToCode(
+      block,
+      "DO" + n,
+      Blockly.Arduino.ORDER_NONE
+    );
+    code += " +" + branch;
   }
-    return [code + ')', Blockly.Arduino.ORDER_ATOMIC];
+  return [code + ")", Blockly.Arduino.ORDER_ATOMIC];
 };
 
 Blockly.Arduino.sensebox_web_readHTML = function (block) {
-    var filename = this.getFieldValue('FILENAME');
-    Blockly.Arduino.libraries_['library_spi'] = '#include <SPI.h>';
-    Blockly.Arduino.libraries_['library_sd'] = '#include <SD.h>';
-    Blockly.Arduino.codeFunctions_['define_sd' + filename] = 'File webFile;';
-    Blockly.Arduino.setupCode_['sensebox_sd'] = 'SD.begin(28);';
+  var filename = this.getFieldValue("FILENAME");
+  Blockly.Arduino.libraries_["library_spi"] = "#include <SPI.h>";
+  Blockly.Arduino.libraries_["library_sd"] = "#include <SD.h>";
+  Blockly.Arduino.codeFunctions_["define_sd" + filename] = "File webFile;";
+  Blockly.Arduino.setupCode_["sensebox_sd"] = "SD.begin(28);";
   var func = [
-        'String generateHTML(){',
+    "String generateHTML(){",
     ' webFile = SD.open("' + filename + '", FILE_READ);',
     ' String finalString ="";',
-        ' while (webFile.available())',
-        '   {',
-        '   finalString+=(char)webFile.read();',
-        '   }',
-        ' return finalString;',
-        '}'];
+    " while (webFile.available())",
+    "   {",
+    "   finalString+=(char)webFile.read();",
+    "   }",
+    " return finalString;",
+    "}",
+  ];
   var functionName = Blockly.Arduino.addFunction(
-        'generateHTML', func.join('\n'));
-    var code = functionName + '()';
+    "generateHTML",
+    func.join("\n")
+  );
+  var code = functionName + "()";
   return [code, Blockly.Arduino.ORDER_ATOMIC];
 };

src/components/Blockly/helpers/board.js

@@ -3,40 +3,127 @@
  *
  */
 const sensebox_mcu = {
-    description: 'senseBox Microcontroller Unit based on Microchip SAMD21G18A',
-    compilerFlag: 'arduino:samd',
-    digitalPins: [['D1', '1'], ['D2', '2'], ['D3', '3'], ['D4', '4'], ['D5', '5'], ['D6', '6']],
-    digitalPinsLED: [['BUILTIN_1', '7'], ['BUILTIN_2', '8'], ['D1', '1'], ['D2', '2'], ['D3', '3'], ['D4', '4'], ['D5', '5'], ['D6', '6']],
-    digitalPinsButton: [['on Board', '0'], ['D1', '1'], ['D2', '2'], ['D3', '3'], ['D4', '4'], ['D5', '5'], ['D6', '6']],
-    pwmPins: [['D1', '1'], ['D2', '2'], ['D3', '3'], ['D4', '4'], ['D5', '5'], ['D6', '6']],
-    serial: [['serial', 'SerialUSB'], ['serial_1', 'Serial1'], ['serial_2', 'Serial2']],
+  description: "senseBox Microcontroller Unit based on Microchip SAMD21G18A",
+  compilerFlag: "arduino:samd",
+  digitalPins: [
+    ["A1", "1"],
+    ["A2", "2"],
+    ["B3", "3"],
+    ["B4", "4"],
+    ["C5", "5"],
+    ["C6", "6"],
+  ],
+  digitalPinsLED: [
+    ["BUILTIN_1", "7"],
+    ["BUILTIN_2", "8"],
+    ["A1", "1"],
+    ["A2", "2"],
+    ["B3", "3"],
+    ["B4", "4"],
+    ["C5", "5"],
+    ["C6", "6"],
+  ],
+  digitalPinsButton: [
+    ["on Board", "0"],
+    ["A1", "1"],
+    ["A2", "2"],
+    ["B3", "3"],
+    ["B4", "4"],
+    ["C5", "5"],
+    ["C6", "6"],
+  ],
+  pwmPins: [
+    ["A1", "1"],
+    ["A2", "2"],
+    ["B3", "3"],
+    ["B4", "4"],
+    ["C5", "5"],
+    ["C6", "6"],
+  ],
+  serial: [
+    ["serial", "SerialUSB"],
+    ["serial_1", "Serial1"],
+    ["serial_2", "Serial2"],
+  ],
   serialPins: {
-        SerialUSB: [['RX', ''], ['TX', '']],
-        Serial1: [['RX', '11'], ['TX', '10']],
-        Serial2: [['RX', '13'], ['TX', '12']]
+    SerialUSB: [
+      ["RX", ""],
+      ["TX", ""],
+    ],
+    Serial1: [
+      ["RX", "11"],
+      ["TX", "10"],
+    ],
+    Serial2: [
+      ["RX", "13"],
+      ["TX", "12"],
+    ],
   },
-    serialSpeed: [['300', '300'], ['600', '600'], ['1200', '1200'],
-    ['2400', '2400'], ['4800', '4800'], ['9600', '9600'],
-    ['14400', '14400'], ['19200', '19200'], ['28800', '28800'],
-    ['31250', '31250'], ['38400', '38400'], ['57600', '57600'],
-    ['115200', '115200']],
-    spi: [['SPI', 'SPI']],
-    spiPins: { SPI: [['MOSI', '19'], ['MISO', '21'], ['SCK', '20']] },
-    spiClockDivide: [['2 (8MHz)', 'SPI_CLOCK_DIV2'],
-    ['4 (4MHz)', 'SPI_CLOCK_DIV4'],
-    ['8 (2MHz)', 'SPI_CLOCK_DIV8'],
-    ['16 (1MHz)', 'SPI_CLOCK_DIV16'],
-    ['32 (500KHz)', 'SPI_CLOCK_DIV32'],
-    ['64 (250KHz)', 'SPI_CLOCK_DIV64'],
-    ['128 (125KHz)', 'SPI_CLOCK_DIV128']],
-    i2c: [['I2C', 'Wire']],
-    i2cPins: { Wire: [['SDA', '17'], ['SCL', '16']] },
-    i2cSpeed: [['100kHz', '100000L'], ['400kHz', '400000L']],
-    builtinLed: [['BUILTIN_1', '7'], ['BUILTIN_2', '8']],
-    interrupt: [['interrupt1', '1'], ['interrupt2', '2'], ['interrupt3', '3'], ['interrupt4', '4'], ['interrupt5', '5'], ['interrupt6', '6']],
-    analogPins: [['A1', 'A1'], ['A2', 'A2'], ['A3', 'A3'], ['A4', 'A4'], ['A5', 'A5'], ['A6', 'A6']],
+  serialSpeed: [
+    ["300", "300"],
+    ["600", "600"],
+    ["1200", "1200"],
+    ["2400", "2400"],
+    ["4800", "4800"],
+    ["9600", "9600"],
+    ["14400", "14400"],
+    ["19200", "19200"],
+    ["28800", "28800"],
+    ["31250", "31250"],
+    ["38400", "38400"],
+    ["57600", "57600"],
+    ["115200", "115200"],
+  ],
+  spi: [["SPI", "SPI"]],
+  spiPins: {
+    SPI: [
+      ["MOSI", "19"],
+      ["MISO", "21"],
+      ["SCK", "20"],
+    ],
+  },
+  spiClockDivide: [
+    ["2 (8MHz)", "SPI_CLOCK_DIV2"],
+    ["4 (4MHz)", "SPI_CLOCK_DIV4"],
+    ["8 (2MHz)", "SPI_CLOCK_DIV8"],
+    ["16 (1MHz)", "SPI_CLOCK_DIV16"],
+    ["32 (500KHz)", "SPI_CLOCK_DIV32"],
+    ["64 (250KHz)", "SPI_CLOCK_DIV64"],
+    ["128 (125KHz)", "SPI_CLOCK_DIV128"],
+  ],
+  i2c: [["I2C", "Wire"]],
+  i2cPins: {
+    Wire: [
+      ["SDA", "17"],
+      ["SCL", "16"],
+    ],
+  },
+  i2cSpeed: [
+    ["100kHz", "100000L"],
+    ["400kHz", "400000L"],
+  ],
+  builtinLed: [
+    ["BUILTIN_1", "7"],
+    ["BUILTIN_2", "8"],
+  ],
+  interrupt: [
+    ["interrupt1", "1"],
+    ["interrupt2", "2"],
+    ["interrupt3", "3"],
+    ["interrupt4", "4"],
+    ["interrupt5", "5"],
+    ["interrupt6", "6"],
+  ],
+  analogPins: [
+    ["A1", "A1"],
+    ["A2", "A2"],
+    ["B3", "A3"],
+    ["B4", "A4"],
+    ["C5", "A5"],
+    ["C6", "A6"],
+  ],
   serial_baud_rate: 9600,
-    parseKey: '_*_'
+  parseKey: "_*_",
 };
 
 export const selectedBoard = () => {

src/components/Blockly/helpers/colour.js

@@ -11,6 +11,7 @@ const colours = {
   audio: 250,
   arrays: 33,
   mqtt: 90,
+  serial: 230,
   webserver: 40,
   phyphox: 25,
 };

src/components/Blockly/helpers/maxInstances.js

@@ -0,0 +1,21 @@
+/**
+ * To limit number of specific blocks in the workspace add block name and number of maxInstances here.
+ *
+ */
+
+const maxInstances = {
+  sensebox_wifi: 1,
+  sensebox_startap: 1,
+  sensebox_display_beginDisplay: 1,
+  sensebox_telegram: 1,
+  sensebox_telegram_do: 1,
+  sensebox_osem_connection: 1,
+  sensebox_lora_initialize_otaa: 1,
+  sensebox_lora_initialize_abp: 1,
+  sensebox_phyphox_init: 1,
+  sensebox_ethernet: 1,
+};
+
+export const getMaxInstances = () => {
+  return maxInstances;
+};

src/components/Blockly/msg/de/faq.js

@@ -19,9 +19,11 @@ Das Kopieren der Programme unter MacOS funktioniert nicht über den Finder, es g
 Grundsätzlich kann die Programmierumgebung mit jeder senseBox mit senseBox MCU verwendet werden. 
 `,
 
-
   faq_q3_question: `Ich habe einen Fehler gefunden oder etwas funktioniert nicht. Wo kann ich diesen melden?`,
   faq_q3_answer: `
 Am besten legst du dazu ein Issue auf [Github](https://github.com/sensebox/React-Ardublockly/issues) an. Alternativ kannst du uns auch eine Email an info(at)sensebox.de senden
 `,
-}
+
+  faq_tablet_question: `Kann ich die senseBox auch über ein Tablet programmieren?`,
+  faq_tablet_answer: `Ja! Installiere dazu die senseBox Connect App aus dem App Store und rufe die Learn- und Programmierumgebung in deinem Browser am Tablet auf. Genaue Informationen zur Verwendung der App findest du unter [https://sensebox.de/app](https://sensebox.de/app)`,
+};

src/components/Blockly/msg/de/io.js

@@ -1,23 +1,26 @@
-
 export const IO = {
-
   ARD_ANALOGREAD: "lese analogen Pin#",
-    ARD_ANALOGREAD_TIP: "Gibt einen Wert zwischen 0 und 1024 zurüch",
+  ARD_ANALOGREAD_TIP: "Gibt einen Wert zwischen 0 und 1023 zurück",
   ARD_ANALOGWRITE: "setzte analogen Pin#",
-    ARD_ANALOGWRITE_TIP: "Schreibe analogen Wert zwischen 0 und 255 an einen spezifischen PWM Port",
+  ARD_ANALOGWRITE_TIP:
+    "Schreibe analogen Wert zwischen 0 und 255 an einen spezifischen PWM Port",
   ARD_BUILTIN_LED: "eingebaute LED",
   ARD_BUILTIN_LED_TIP: "Schaltet die interne LED An oder Aus",
-    ARD_COMPONENT_WARN1: "A %1 configuration block with the same %2 name must be added to use this block!",
+  ARD_COMPONENT_WARN1:
+    "A %1 configuration block with the same %2 name must be added to use this block!",
   ARD_DEFINE: "Definiere",
   ARD_DIGITALREAD: "lesen digitalen Pin#",
   ARD_DIGITALREAD_TIP: "Lese Wert an digitalen Pin: HIGH(1) oder LOW(0)",
   ARD_DIGITALWRITE: "setzte digitalen Pin#",
-    ARD_DIGITALWRITE_TIP: "Schreibe digitalen Wert HIGH (1) oder LOW(0) an spezifischen Port",
+  ARD_DIGITALWRITE_TIP:
+    "Schreibe digitalen Wert HIGH (1) oder LOW(0) an spezifischen Port",
   ARD_FUN_RUN_LOOP: "Endlosschleife()",
   ARD_FUN_RUN_SETUP: "Setup()",
-    ARD_FUN_RUN_TIP: "Definiert die setup() und loop() Funktionen. Die setup()-Funktion wird beim starten **einmal** ausgeführt. Anschließend wir die loop()-Funktion in einer **Endlosschleife** ausgeführt. Füge in die Setup()-Funktion Blöcke ein, um z.B. das Display zu initalisieren, eine Verbindung zum WiFi-Netzwerk herzustellen oder um die LoRa Verbindung zu initialsieren.",
+  ARD_FUN_RUN_TIP:
+    "Definiert die setup() und loop() Funktionen. Die setup()-Funktion wird beim starten **einmal** ausgeführt. Anschließend wir die loop()-Funktion in einer **Endlosschleife** ausgeführt. Füge in die Setup()-Funktion Blöcke ein, um z.B. das Display zu initalisieren, eine Verbindung zum WiFi-Netzwerk herzustellen oder um die LoRa Verbindung zu initialsieren.",
   ARD_HIGH: "HIGH",
-    ARD_HIGHLOW_TIP: "Setzt einen Status auf HIGH oder LOWSet a pin state logic High or Low.",
+  ARD_HIGHLOW_TIP:
+    "Setzt einen Status auf HIGH oder LOWSet a pin state logic High or Low.",
   ARD_LOW: "LOW",
   ARD_MAP: "Verteile Wert",
   ARD_MAP_FROMMIN: "von Minimum",
@@ -30,16 +33,21 @@ export const IO = {
   ARD_NOTONE_PIN: "keinen Ton an Pin",
   ARD_NOTONE_PIN_TIP: "Stoppe die Tonerzeugung an Pin",
   ARD_NOTONE_TIP: "Schaltet den Ton am ausgewählten Pin aus",
-    ARD_PIN_WARN1: "Pin %1 wird benötigt für  %2 als Pin %3. Bereitsgenutzt als %4.",
-    ARD_PULSETIMEOUT_TIP: "Misst die Laufzeit eines Impulses am ausgewählten Pin, wenn die Zeit ist in Microsekunden.",
+  ARD_PIN_WARN1:
+    "Pin %1 wird benötigt für  %2 als Pin %3. Bereitsgenutzt als %4.",
+  ARD_PULSETIMEOUT_TIP:
+    "Misst die Laufzeit eines Impulses am ausgewählten Pin, wenn die Zeit ist in Microsekunden.",
   ARD_PULSE_READ: "Misst %1 Impuls an Pin #%2",
-    ARD_PULSE_READ_TIMEOUT: "Misst %1 Impuls an Pin #%2 (Unterbrechung nach %3 μs)",
+  ARD_PULSE_READ_TIMEOUT:
+    "Misst %1 Impuls an Pin #%2 (Unterbrechung nach %3 μs)",
   ARD_PULSE_TIP: "Misst die Zeit eines Impulses an dem ausgewählten Pin.",
   ARD_SERIAL_BPS: "bps",
   ARD_SERIAL_PRINT: "schreibe",
   ARD_SERIAL_PRINT_NEWLINE: "neue Zeile hinzufügen",
-    ARD_SERIAL_PRINT_TIP: "Prints data to the console/serial port as human-readable ASCII text.",  // untranslated
-    ARD_SERIAL_PRINT_WARN: "A setup block for %1 must be added to the workspace to use this block!",  // untranslated
+  ARD_SERIAL_PRINT_TIP:
+    "Prints data to the console/serial port as human-readable ASCII text.", // untranslated
+  ARD_SERIAL_PRINT_WARN:
+    "A setup block for %1 must be added to the workspace to use this block!", // untranslated
   ARD_SERIAL_SETUP: "Setup",
   ARD_SERIAL_SETUP_TIP: "Selects the speed for a specific Serial peripheral", // untranslated
   ARD_SERIAL_SPEED: ":  Übertragungsgeschwindigkeit zu",
@@ -62,12 +70,14 @@ export const IO = {
   ARD_SPI_SETUP_MSBFIRST: "MSBFIRST", // untranslated
   ARD_SPI_SETUP_SHIFT: "data shift", // untranslated
   ARD_SPI_SETUP_TIP: "Configures the SPI peripheral.", // untranslated
-    ARD_SPI_TRANSRETURN_TIP: "Send a SPI message to an specified slave device and get data back.",  // untranslated
+  ARD_SPI_TRANSRETURN_TIP:
+    "Send a SPI message to an specified slave device and get data back.", // untranslated
   ARD_SPI_TRANS_NONE: "none", // untranslated
   ARD_SPI_TRANS_SLAVE: "to slave pin", // untranslated
   ARD_SPI_TRANS_TIP: "Send a SPI message to an specified slave device.", // untranslated
   ARD_SPI_TRANS_VAL: "transfer", // untranslated
-    ARD_SPI_TRANS_WARN1: "A setup block for %1 must be added to the workspace to use this block!",  // untranslated
+  ARD_SPI_TRANS_WARN1:
+    "A setup block for %1 must be added to the workspace to use this block!", // untranslated
   ARD_SPI_TRANS_WARN2: "Old pin value %1 is no longer available.", // untranslated
   ARD_STEPPER_COMPONENT: "stepper", // untranslated
   ARD_STEPPER_DEFAULT_NAME: "MyStepper", // untranslated
@@ -80,7 +90,8 @@ export const IO = {
   ARD_STEPPER_PIN4: "pin4#", // untranslated
   ARD_STEPPER_REVOLVS: "how many steps per revolution", // untranslated
   ARD_STEPPER_SETUP: "Setup stepper motor", // untranslated
-    ARD_STEPPER_SETUP_TIP: "Configures a stepper motor pinout and other settings.",  // untranslated
+  ARD_STEPPER_SETUP_TIP:
+    "Configures a stepper motor pinout and other settings.", // untranslated
   ARD_STEPPER_SPEED: "set speed (rpm) to", // untranslated
   ARD_STEPPER_STEP: "move stepper", // untranslated
   ARD_STEPPER_STEPS: "steps", // untranslated
@@ -104,5 +115,4 @@ export const IO = {
   NEW_INSTANCE_TITLE: "Neue Instanz mit Name:",
   RENAME_INSTANCE: "Instanz umbenennen...",
   RENAME_INSTANCE_TITLE: "Benenne alle '%1' Instanzen zu:",
-
-}
+};

src/components/Blockly/msg/de/logic.js

@@ -1,43 +1,56 @@
 export const LOGIC = {
-
   CONTROLS_IF_ELSEIF_TOOLTIP: "Eine weitere Bedingung hinzufügen.",
-    CONTROLS_IF_ELSE_TOOLTIP: "Eine sonst-Bedingung hinzufügen, führt eine Anweisung aus, falls keine Bedingung zutrifft.",
+  CONTROLS_IF_ELSE_TOOLTIP:
+    "Eine sonst-Bedingung hinzufügen, führt eine Anweisung aus, falls keine Bedingung zutrifft.",
   CONTROLS_IF_HELPURL: "https://github.com/google/blockly/wiki/IfElse", // untranslated
   CONTROLS_IF_IF_TOOLTIP: "Hinzufügen, entfernen oder sortieren von Sektionen",
   CONTROLS_IF_MSG_ELSE: "sonst",
   CONTROLS_IF_MSG_ELSEIF: "sonst wenn",
   CONTROLS_IF_MSG_IF: "wenn",
-    CONTROLS_IF_TOOLTIP_1: "Wenn eine Bedingung wahr (true) ist, dann führe eine Anweisung aus.",
-    CONTROLS_IF_TOOLTIP_2: "Wenn eine Bedingung wahr (true) ist, dann führe die erste Anweisung aus.  Ansonsten führe die zweite Anweisung aus.",
-    CONTROLS_IF_TOOLTIP_3: "Wenn die erste Bedingung wahr (true) ist, dann führe die erste Anweisung aus.  Oder wenn die zweite Bedingung wahr (true) ist, dann führe die zweite Anweisung aus.",
-    CONTROLS_IF_TOOLTIP_4: "Wenn die erste Bedingung wahr (true) ist, dann führe die erste Anweisung aus.  Oder wenn die zweite Bedingung wahr (true) ist, dann führe die zweite Anweisung aus.  Falls keine der beiden Bedingungen wahr (true) ist, dann führe die dritte Anweisung aus.",
+  CONTROLS_IF_TOOLTIP_1:
+    "Wenn eine Bedingung wahr (true) ist, dann führe eine Anweisung aus.",
+  CONTROLS_IF_TOOLTIP_2:
+    "Wenn eine Bedingung wahr (true) ist, dann führe die erste Anweisung aus.  Ansonsten führe die zweite Anweisung aus.",
+  CONTROLS_IF_TOOLTIP_3:
+    "Wenn die erste Bedingung wahr (true) ist, dann führe die erste Anweisung aus.  Oder wenn die zweite Bedingung wahr (true) ist, dann führe die zweite Anweisung aus.",
+  CONTROLS_IF_TOOLTIP_4:
+    "Wenn die erste Bedingung wahr (true) ist, dann führe die erste Anweisung aus.  Oder wenn die zweite Bedingung wahr (true) ist, dann führe die zweite Anweisung aus.  Falls keine der beiden Bedingungen wahr (true) ist, dann führe die dritte Anweisung aus.",
   LOGIC_BOOLEAN_HELPURL: "https://github.com/google/blockly/wiki/Logic#values", // untranslated
   LOGIC_BOOLEAN_TOOLTIP: "Ist entweder wahr (true) oder falsch (false)",
   LOGIC_BOOLEAN_TRUE: "wahr",
   LOGIC_COMPARE_HELPURL: "https://de.wikipedia.org/wiki/Vergleich_%28Zahlen%29",
   LOGIC_COMPARE_TOOLTIP_EQ: "Ist wahr (true), wenn beide Werte gleich sind.",
-    LOGIC_COMPARE_TOOLTIP_GT: "Ist wahr (true), wenn der erste Wert größer als der zweite Wert ist.",
-    LOGIC_COMPARE_TOOLTIP_GTE: "Ist wahr (true), wenn der erste Wert größer als oder gleich groß wie der zweite Wert ist.",
-    LOGIC_COMPARE_TOOLTIP_LT: "Ist wahr (true), wenn der erste Wert kleiner als der zweite Wert ist.",
-    LOGIC_COMPARE_TOOLTIP_LTE: "Ist wahr (true), wenn der erste Wert kleiner als oder gleich groß wie der zweite Wert ist.",
-    LOGIC_COMPARE_TOOLTIP_NEQ: "Ist wahr (true), wenn beide Werte unterschiedlich sind.",
+  LOGIC_COMPARE_TOOLTIP_GT:
+    "Ist wahr (true), wenn der erste Wert größer als der zweite Wert ist.",
+  LOGIC_COMPARE_TOOLTIP_GTE:
+    "Ist wahr (true), wenn der erste Wert größer als oder gleich groß wie der zweite Wert ist.",
+  LOGIC_COMPARE_TOOLTIP_LT:
+    "Ist wahr (true), wenn der erste Wert kleiner als der zweite Wert ist.",
+  LOGIC_COMPARE_TOOLTIP_LTE:
+    "Ist wahr (true), wenn der erste Wert kleiner als oder gleich groß wie der zweite Wert ist.",
+  LOGIC_COMPARE_TOOLTIP_NEQ:
+    "Ist wahr (true), wenn beide Werte unterschiedlich sind.",
   LOGIC_NEGATE_HELPURL: "https://github.com/google/blockly/wiki/Logic#not", // untranslated
   LOGIC_NEGATE_TITLE: "nicht %1",
-    LOGIC_NEGATE_TOOLTIP: "Ist wahr (true), wenn der Eingabewert falsch (false) ist.  Ist falsch (false), wenn der Eingabewert wahr (true) ist.",
+  LOGIC_NEGATE_TOOLTIP:
+    "Ist wahr (true), wenn der Eingabewert falsch (false) ist.  Ist falsch (false), wenn der Eingabewert wahr (true) ist.",
   LOGIC_NULL: "null",
   LOGIC_NULL_HELPURL: "https://de.wikipedia.org/wiki/Nullwert",
   LOGIC_NULL_TOOLTIP: "Ist NULL.",
   LOGIC_OPERATION_AND: "und",
-    LOGIC_OPERATION_HELPURL: "https://github.com/google/blockly/wiki/Logic#logical-operations",  // untranslated
+  LOGIC_OPERATION_HELPURL:
+    "https://github.com/google/blockly/wiki/Logic#logical-operations", // untranslated
   LOGIC_OPERATION_OR: "oder",
-    LOGIC_OPERATION_TOOLTIP_AND: "Ist wahr (true), wenn beide Werte wahr (true) sind.",
-    LOGIC_OPERATION_TOOLTIP_OR: "Ist wahr (true), wenn einer der beiden Werte wahr (true) ist.",
+  LOGIC_OPERATION_TOOLTIP_AND:
+    "Ist wahr (true), wenn beide Werte wahr (true) sind.",
+  LOGIC_OPERATION_TOOLTIP_OR:
+    "Ist wahr (true), wenn einer der beiden Werte wahr (true) ist.",
   LOGIC_TERNARY_CONDITION: "teste",
   LOGIC_TERNARY_HELPURL: "https://de.wikipedia.org/wiki/%3F:#Auswahloperator",
   LOGIC_TERNARY_IF_FALSE: "wenn falsch",
   LOGIC_TERNARY_IF_TRUE: "wenn wahr",
-    LOGIC_TERNARY_TOOLTIP: "Überprüft eine Bedingung \"teste\". Wenn die Bedingung wahr ist, wird der \"wenn wahr\" Wert zurückgegeben, andernfalls der \"wenn falsch\" Wert",
-
+  LOGIC_TERNARY_TOOLTIP:
+    'Überprüft eine Bedingung "teste". Wenn die Bedingung wahr ist, wird der "wenn wahr" Wert zurückgegeben, andernfalls der "wenn falsch" Wert',
 
   /**
    * Cases
@@ -46,5 +59,6 @@ export const LOGIC = {
   cases_condition: "Fall (Variable): ",
   cases_switch: "Variable",
   cases_add: "Fall",
-    cases_tooltip: "Führt den entsprechenden Fall aus, wenn die Überprüfung der Variable TRUE ergibt. Über das Zahnrad kannst du weitere Fälle hinzufügen. Über den 'Default' fall kannst du bestimmen, was passieren soll wenn keiner der vorher definierten Fälle eingetreten ist.",
-}
+  cases_tooltip:
+    "Führt den entsprechenden Fall aus, wenn die Überprüfung der Variable TRUE ergibt. Über das Zahnrad kannst du weitere Fälle hinzufügen. Über den 'Default' fall kannst du bestimmen, was passieren soll wenn keiner der vorher definierten Fälle eingetreten ist.",
+};

src/components/Blockly/msg/de/sensebox-ble.js

@@ -27,7 +27,7 @@ export const BLE = {
   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",
+    "Initialisere das Bluetooth Bee. Stecke diese auf dem Steckplatz **XBEE1**. Gib dem Phyphox 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:

src/components/Blockly/msg/de/sensebox-lora.js

@@ -28,17 +28,32 @@ export const LORA = {
   senseBox_LoRa_cayenne_lat: "Breitengrad",
   senseBox_LoRa_cayenne_lng: "Längengrad",
   senseBox_LoRa_cayenne_alt: "Höhe",
+  senseBox_LoRa_cayenne_concentration: "Konzentration",
 
   senseBox_LoRa_cayenne_tip: "Sende Daten als Cayenne Payload Format",
   senseBox_LoRa_cayenne_gps_tip: "Sende GPS",
-    senseBox_LoRa_cayenne_temperature_tip: "Sendet Temperaturwert mit einer Nachkommastelle",
-    senseBox_LoRa_cayenne_pressure_tip: "Sendet Luftdruck mit einer Nachkommastelle",
+  senseBox_LoRa_cayenne_temperature_tip:
+    "Sendet Temperaturwert mit einer Nachkommastelle",
+  senseBox_LoRa_cayenne_pressure_tip:
+    "Sendet Luftdruck mit einer Nachkommastelle",
   senseBox_LoRa_cayenne_luminosity_tip: "Sendet Helligkeitswert",
-    senseBox_LoRa_cayenne_analog_tip: "Sendet einen Dezimalwert mit einer Nachkommastelle",
+  senseBox_LoRa_cayenne_analog_tip:
+    "Sendet einen Dezimalwert mit einer Nachkommastelle",
+
+  senseBox_LoRa_cayenne_concentration_tip: "Sendet eine Konzentration in PPM",
 
   senseBox_LoRa_message_tooltip: "Sende eine Nachricht über LoRa",
-    senseBox_LoRa_sensor_tip: "Sende einen Sensorwert mit einer bestimmten Anzahl an Bytes",
-    senseBox_LoRa_init_abp_tooltip: "Initialisiere die LoRa übertragung. Die Aktivierung erfolgt über ABP. Registriere eine Application auf [thethingsnetwork](https://thethingsnetwork.com) und kopiere den **Network Session Key** und den **App Session Key** im **msb Format** und die **Device ID** im **hex Format**.",
-    senseBox_LoRa_init_helpurl: "https://docs.sensebox.de/blockly/blockly-web-lora/",
-    senseBox_LoRa_init_otaa_tooltip: "Initialisiere die LoRa übertragung. Die Aktivierung erfolgt über OTAA. Registriere eine Application auf [thethingsnetwork](https://thethingsnetwork.com) und kopiere die **DEVICE EUI** und die **Application EUI** im **lsb Format** den **App Key** im **msb Format**.",
-}
+  senseBox_LoRa_sensor_tip:
+    "Sende einen Sensorwert mit einer bestimmten Anzahl an Bytes",
+  senseBox_LoRa_init_abp_tooltip:
+    "Initialisiere die LoRa übertragung. Die Aktivierung erfolgt über ABP. Registriere eine Application auf [thethingsnetwork](https://thethingsnetwork.com) und kopiere den **Network Session Key** und den **App Session Key** im **msb Format** und die **Device ID** im **hex Format**.",
+  senseBox_LoRa_init_helpurl:
+    "https://docs.sensebox.de/blockly/blockly-web-lora/",
+  senseBox_LoRa_init_otaa_tooltip:
+    "Initialisiere die LoRa übertragung. Die Aktivierung erfolgt über OTAA. Registriere eine Application auf [thethingsnetwork](https://thethingsnetwork.com) und kopiere die **DEVICE EUI** und die **Application EUI** im **lsb Format** den **App Key** im **msb Format**.",
+
+  sensebox_lora_ttn_mapper_tip:
+    "Mit einem TTN Mapper kannst du die LoRa-Netzabdeckung in deiner Umgebung aufzeichnen. Die Daten werden dann auf [ttnmaper](https://ttnmapper.org) angezeigt. Den notwendigen Decoder findest du [hier](https://gist.github.com/felixerdy/f959ac03df98c6947f1c7f35d537f23e#file-decoder-js).",
+  sensebox_lora_ttn_mapper_helpurl:
+    "https://sensebox.de/projects/de/2020-03-06-ttn-mapper",
+};

src/components/Blockly/msg/de/sensebox-osem.js

@@ -2,8 +2,11 @@ export const OSEM = {
   /**
    * openSenseMap
    */
-    senseBox_osem_connection_tip: "stellt eine WLAN verbindung her",
-    senseBox_send_to_osem_tip: "sende Messwert an",
+  senseBox_osem_connection_tip:
+    "Verwende diesen Block, um deine senseBox mit der openSenseMap zu verbinden. Registriere deine senseBox auf der openSenseMap und trage die IDs und den API-Schlüssel ein. Verwende anschließend den Block ***Sende Messwert an die openSenseMap*** und die Sensor-ID, um die Messwerte zu übertragen.",
+  senseBox_osem_connection_helpurl: "https://www.opensensemap.org/",
+  senseBox_send_to_osem_tip:
+    "Sende mit diesem Block Messwerte an die openSenseMap. Verwende pro Messwert einen Block und trage die zugewiesene Sensor ID ein",
   senseBox_send_to_osem: "Sende Messwert an die openSenseMap",
   senseBox_osem_connection: "Verbinde mit openSenseMap:",
   senseBox_osem_host: "opensensemap.org",
@@ -12,6 +15,9 @@ export const OSEM = {
   senseBox_osem_stationary: "Stationär",
   senseBox_osem_mobile: "Mobil",
   senseBox_osem_access_token: "API Schlüssel",
-    senseBox_send_mobile_to_osem: "Sende Messwert und Standort an die openSenseMap",
-    senseBox_send_mobile_to_osem_tip: "Sende Messwert und Standort an die openSenseMap",
-}
+  senseBox_send_mobile_to_osem:
+    "Sende Messwert und Standort an die openSenseMap",
+  senseBox_send_mobile_to_osem_tip:
+    "Sende Messwert und Standort an die openSenseMap",
+  senseBox_osem_restart: "Bei Verbindungsverlust Gerät neustarten?",
+};

src/components/Blockly/msg/de/sensebox-rtc.js

@@ -5,7 +5,7 @@ export const RTC = {
   sensebox_rtc_set: "Setze Uhrzeit/Datum der RTC",
   sensebox_rtc_set_tooltip:
     "Stellt die Uhrzeit der RTC ein. Beachte, dass du diesen Block im Setup ausführst.",
-  sensebox_rtc_get_timestamp: "Zeitstempel",
+  sensebox_rtc_get_timestamp: "Zeitstempel (RFC 3339)",
   sensebox_rtc_get_timestamp_tooltip:
     "Gibt dir einen in ISO 8601 formatierten Zeitstempel zurück. Bsp: 2021-12-24T18:21Z",
   sensebox_rtc_get: "Wert: ",

src/components/Blockly/msg/de/sensebox-sd.js

@@ -3,11 +3,23 @@ export const SD = {
    * SD-Block
    */
   senseBox_sd_create_file: "Erstelle Datei auf SD-Karte",
+  sensebox_sd_helpurl: "https://docs.sensebox.de/hardware/bee-sd/",
   senseBox_sd_write_file: "Schreibe Daten auf SD-Karte",
   senseBox_sd_open_file: "Öffne eine Datei auf der SD-Karte",
-    senseBox_sd_create_file_tooltip: "Erstellt eine Datei auf der Karte. Stecke das SD-Bee auf den Steckplatz **XBEE2**. Die **maximale** Länge des Dateinamen sind **8 Zeichen**. Die Datei sollte zuerst im *Setup()* erstellt werden",
-    senseBox_sd_write_file_tooptip: "Schreibe Daten auf die SD-Karte. Beachte, dass die Datei zuerst geöffnet werden muss.",
-    senseBox_sd_open_file_tooltip: "Öffne die Datei auf der SD-Karte, um Dateien zu speichern. Am Ende der Schleife wird die Datei automatisch wieder geschlossen.",
+  senseBox_sd_create_file_tooltip:
+    "Erstellt eine Datei auf der Karte. Stecke das SD-Bee auf den Steckplatz **XBEE2**. Die **maximale** Länge des Dateinamen sind **8 Zeichen**. Die Datei sollte zuerst im *Setup()* erstellt werden",
+  senseBox_sd_write_file_tooptip:
+    "Schreibe Daten auf die SD-Karte. Beachte, dass die Datei zuerst geöffnet werden muss.",
+  senseBox_sd_open_file_tooltip:
+    "Öffne die Datei auf der SD-Karte, um Dateien zu speichern. Am Ende der Schleife wird die Datei automatisch wieder geschlossen.",
   sensebox_sd_filename: "Daten",
   senseBox_sd_decimals: "Dezimalen",
-}
+  sensebox_sd_osem: "Erstelle CSV-Datei für openSenseMap",
+  sensebox_sd_osem_tip:
+    "Erstellt eine CSV-Datei, die später auf die openSenseMap hochgeladen werden kann. ",
+  sensebox_sd_save_for_osem: "Speichere Messwert",
+  sensebox_sd_save_for_osem_tip:
+    "Füge eine Messung mit Sensor ID zur CSV-Datei hinzu",
+  sensebox_sd_save_for_osem_id: "Sensor ID:",
+  sensebox_sd_measurement: "Messwerte",
+};

src/components/Blockly/msg/de/sensebox-sensors.js

@@ -9,19 +9,29 @@ export const SENSORS = {
    * BMP280
    */
   senseBox_pressure_sensor: "Luftdruck-/Temperatursensor (BMP280)",
-    senseBox_pressure: "Luftdruck in Pa",
-    senseBox_pressure_dimension: "Luftdruck in Pa",
-    senseBox_pressure_tip: "Schließe den Sensor an einen der 5 **I2C-Anschlüsse** an. Der Sensor gibt dir den Messwert für den Luftdruck in Pa. Um die korrekte Höhe über NN zu berechnen benötigt der Sensor einen aktuellen Referenzwert.",
+  senseBox_pressure: "Luftdruck in hPa",
+  senseBox_pressure_dimension: "Luftdruck in hPa",
+  senseBox_pressure_tooltip:
+    "Schließe den Sensor an einen der 5 **I2C-Anschlüsse** an. Der Sensor gibt dir den Messwert für den Luftdruck in hPa. Um die korrekte Höhe über NN zu berechnen benötigt der Sensor einen aktuellen Referenzwert.",
   senseBox_pressure_referencePressure: "Luftdruck auf NN",
   senseBox_pressure_referencePressure_dim: "hPa",
-    senseBox_pressure_helpurl: "",
+  senseBox_pressure_helpurl:
+    "https://docs.sensebox.de/hardware/sensoren-luftdruck-temperatur/",
 
+  /**
+   * DPS310
+   */
+  senseBox_sensor_dps310: "Luftdruck-/Temperatursensor (DPS310)",
+  senseBox_sensor_dps310_tooltip:
+    "Schließe den Sensor an einen der 5 **I2C-Anschlüsse** an. Der Sensor gibt dir den Messwert für den Luftdruck in hPa. Um die korrekte Höhe über NN zu berechnen benötigt der Sensor einen aktuellen Referenzwert.",
+  senseBox_sensor_dps310_helpurl: "",
 
   /**
    * Mikro
    */
   senseBox_sound: "Mikrofon",
-    senseBox_sound_tip: "Schließe den Sensor über das Breadbord an einen der 3 **analog/digital** Ports an. Gibt den Messwert des Mikrofons in Volt zurück",
+  senseBox_sound_tip:
+    "Schließe den Sensor über das Breadbord an einen der 3 **analog/digital** Ports an. Gibt den Messwert des Mikrofons in Volt zurück",
   senseBox_sound_helpurl: "https://docs.sensebox.de/hardware/sensoren-mikro/",
 
   /**
@@ -29,8 +39,10 @@ export const SENSORS = {
    */
   senseBox_temp: "Temperatur in °C",
   senseBox_temp_hum: "Temperatur-/Luftfeuchtigkeitssensor (HDC1080)",
-    senseBox_temp_hum_tooltip: "Dieser Block gibt dir die Messwerte des Temperatur- und Luftfeuchtigkeitssensor zurück. Schließe den Sensor an einen der 5 I2C Anschlüsse an. Messwert wird mit 2 Nachkommastellen ausgegeben.",
-    senseBox_temp_hum_helpurl: "https://docs.sensebox.de/hardware/sensoren-temperatur-luftfeuchte/",
+  senseBox_temp_hum_tooltip:
+    "Dieser Block gibt dir die Messwerte des Temperatur- und Luftfeuchtigkeitssensor zurück. Schließe den Sensor an einen der 5 I2C Anschlüsse an. Messwert wird mit 2 Nachkommastellen ausgegeben.",
+  senseBox_temp_hum_helpurl:
+    "https://docs.sensebox.de/hardware/sensoren-temperatur-luftfeuchte/",
 
   /**
    * Ultraschalldistanzsensor
@@ -39,23 +51,28 @@ export const SENSORS = {
   senseBox_ultrasonic: "Ultraschall-Abstandssensor an Port",
   senseBox_ultrasonic_trigger: "Trigger",
   senseBox_ultrasonic_echo: "Echo",
+  senseBox_ultrasonic_maxDistance: "Maximale Distanz",
   senseBox_ultrasonic_port_A: "A",
   senseBox_ultrasonic_port_B: "B",
   senseBox_ultrasonic_port_C: "C",
   senseBox_ultrasonic_tooltip: `Misst die Distanz mithilfe von Ultraschall in cm. Schließe den Sensor an einen der drei Digital/Analog Ports an:
 
 - Trigger: Grünes Kabel
-- Echo: gelbes Kabel`,
-    senseBox_ultrasonic_helpurl: "https://docs.sensebox.de/hardware/sensoren-distanz/",
+- Echo: gelbes Kabel
+Wenn die maximale Distanz überschritten wird, wird ein Wert von **O** ausgegeben`,
+  senseBox_ultrasonic_helpurl:
+    "https://docs.sensebox.de/hardware/sensoren-distanz/",
   /**
    * UV and Lightsensor
    */
   senseBox_value: "Messwert:",
   senseBox_uv_light: "Helligkeit-/UV-Sensor",
-    senseBox_uv_light_tooltip: "Sensor misst UV-Licht oder die Helligkeit. Die Helligkeit wird als **Ganzezahl** in Lux ausgegeben. Die UV-Intensität als **Kommazahl** in µW/cm².",
+  senseBox_uv_light_tooltip:
+    "Sensor misst UV-Licht oder die Helligkeit. Die Helligkeit wird als **Ganzezahl** in Lux ausgegeben. Die UV-Intensität als **Kommazahl** in µW/cm².",
   senseBox_uv: "UV-Intensität in µW/cm²",
   senseBox_light: "Beleuchtungsstärke in Lux",
-    senseBox_uv_light_helpurl: "https://docs.sensebox.de/hardware/sensoren-helligkeit-uv/",
+  senseBox_uv_light_helpurl:
+    "https://docs.sensebox.de/hardware/sensoren-helligkeit-uv/",
 
   /**
    * BMX055
@@ -82,7 +99,6 @@ export const SENSORS = {
   senseBox_bmx055_accelerometer_tooltip: `Dieser Block gibt dir den Messwert des Beschleunigungssensors der direkt auf der senseBox MCU aufgelötet ist. Im Dropdown Menü kannst du die Richtung und den Messbereich auswählen.`,
   senseBox_bmx055_helpurl: "",
 
-
   /**
    *
    * GPS
@@ -112,12 +128,29 @@ export const SENSORS = {
    * Soundsensor
    */
   senseBox_soundsensor_dfrobot: "Soundsensor (DF Robot)",
-    senseBox_soundsensor_dfrobot_tooltip: "Schließe den Sensor an einen der 3 **digital/analog Ports** an. Der Sensor gibt dir den Messwert in dB mit einer Nachkommastelle",
-    senseBox_soundsensor_dfrobot_helpurl: "https://docs.sensebox.de/hardware/sensoren-lautstaerke/",
+  senseBox_soundsensor_dfrobot_tooltip:
+    "Schließe den Sensor an einen der 3 **digital/analog Ports** an. Der Sensor gibt dir den Messwert in dB mit einer Nachkommastelle",
+  senseBox_soundsensor_dfrobot_helpurl:
+    "https://docs.sensebox.de/hardware/sensoren-lautstaerke/",
+
+  /*
+  * rainsensor hydreon rg-15
+  */
+  sensebox_rainsensor_hydreon_rg15: "Regensensor (RG-15)",
+  sensebox_rainsensor_hydreon_rg15_port: "Serieller Port:",
+  sensebox_rainsensor_hydreon_rg15_serial1: "Serial1",
+  sensebox_rainsensor_hydreon_rg15_serial2: "Serial2",
+  sensebox_rainsensor_hydreon_rg15_value: "Messwert:",
+  sensebox_rainsensor_hydreon_rg15_totalAcc: "gesamter Niederschlag in mm",
+  sensebox_rainsensor_hydreon_rg15_rainInt: "Niederschlagsintensität in mm/h",
+  sensebox_rainsensor_hydreon_rg15_eventAcc: "Niederschlag pro Event in mm",
+  sensebox_rainsensor_hydreon_rg15_acc: "Niederschlag seit letzter Messung in mm",
+  sensebox_rainsensor_hydreon_rg15_tooltip: "Regensensor (RG-15) an einen der Seriellen Ports anschließen.",
+  sensebox_rainsensor_hydreon_rg15_helpurl: "https://rainsensors.com/products/rg-15/",
+
   /*
   * BME680
   */
-
   senseBox_bme680: "Umweltsensor (BME680)",
   senseBox_bme_iaq: "Innenraumluftqualität (IAQ)",
   senseBox_bme_iaq_accuracy: "Kalibrierungswert",
@@ -132,21 +165,24 @@ Den Status der Kalibrierung kann über den Kalibrierungswert abgelesen werden. E
 - IAQ Accuracy : 3 heißt Sensor erfolgreich kalibriert.
 
 Die Messwerte für Temperatur, Luftfeuchtigkeit und Luftdruck können direkt verwendet werden.`,
-    senseBox_bme680_helpurl: "https://docs.sensebox.de/hardware/sensoren-umweltsensor/",
-
+  senseBox_bme680_helpurl:
+    "https://docs.sensebox.de/hardware/sensoren-umweltsensor/",
 
   /**
    * Truebner SMT50
    */
   senseBox_smt50: "Bodenfeuchte/-temperatur (SMT50)",
-    senseBox_smt50_helpurl: "https://docs.sensebox.de/hardware/sensoren-truebner/",
-    senseBox_smt50_tooltip: "Schließe den Bodenfeuchtigkeit- und Temperatursensor an einen der 3 digital/analog Ports an und wähle den Port im Block aus. Der Sensor gibt die Bodentemperatur in °C und die Bodenfeuchtigkeit in % aus.",
+  senseBox_smt50_helpurl:
+    "https://docs.sensebox.de/hardware/sensoren-truebner/",
+  senseBox_smt50_tooltip:
+    "Schließe den Bodenfeuchtigkeit- und Temperatursensor an einen der 3 digital/analog Ports an und wähle den Port im Block aus. Der Sensor gibt die Bodentemperatur in °C und die Bodenfeuchtigkeit in % aus.",
 
   /**
    * SCD30 CO2 Sensor
    */
   senseBox_scd30: "CO2 Sensor (Sensirion SCD30)",
-    senseBox_scd_tooltip: "Schließe den Sensor an einen der 5 **I2C-Anschlüsse** an. Der Sensor gibt dir den Messwert für die CO2-Konzentration in ppm. Der Temperaturmesswert kann aufgrund der Messung direkt am Sensor um einige Grad vom realen Wert abweichen.",
+  senseBox_scd_tooltip:
+    "Schließe den Sensor an einen der 5 **I2C-Anschlüsse** an. Der Sensor gibt dir den Messwert für die CO2-Konzentration in ppm. Der Temperaturmesswert kann aufgrund der Messung direkt am Sensor um einige Grad vom realen Wert abweichen.",
   senseBox_scd_co2: "CO2 in ppm",
   senseBox_scd_helpurl: "https://docs.sensebox.de/hardware/sensoren-co2/",
 
@@ -158,11 +194,12 @@ Die Messwerte für Temperatur, Luftfeuchtigkeit und Luftdruck können direkt ver
   senseBox_sds011_dimension: "in µg/m³ an",
   senseBox_sds011_pm25: "PM2.5",
   senseBox_sds011_pm10: "PM10",
-    senseBox_sds011_tooltip: "Dieser Block gibt dir den Messwert des Feinstaubsensor. Schließe den Feinstaubsensor an einen der 2 **Serial/UART** Anschlüssen an. Im Dropdown Menü zwischen PM2.5 und PM10 auswählen. Der Messwert wird dir als **Kommazahl** in µg/m3",
+  senseBox_sds011_tooltip:
+    "Dieser Block gibt dir den Messwert des Feinstaubsensor. Schließe den Feinstaubsensor an einen der 2 **Serial/UART** Anschlüssen an. Im Dropdown Menü zwischen PM2.5 und PM10 auswählen. Der Messwert wird dir als **Kommazahl** in µg/m3",
   senseBox_sds011_serial1: "Serial1",
   senseBox_sds011_serial2: "Serial2",
-    senseBox_sds011_helpurl: "https://docs.sensebox.de/hardware/sensoren-feinstaub/",
-
+  senseBox_sds011_helpurl:
+    "https://docs.sensebox.de/hardware/sensoren-feinstaub/",
 
   /**
    * Button
@@ -171,10 +208,11 @@ Die Messwerte für Temperatur, Luftfeuchtigkeit und Luftdruck können direkt ver
   senseBox_button_isPressed: "ist gedrückt",
   senseBox_button_switch: "als Schalter",
   senseBox_button_wasPressed: "wurde gedrückt",
+  senseBox_button_longPress: "Gedrückt für",
+
   senseBox_button_tooltip: `Dieser Block gibt dir den Status des angeschlossenen Buttons. Im Dropdown Menü können verschiedene Modi für den Button ausgewählt werden. Angesteuert können entweder der on Board Button oder ein Button, der an einen der 6 digitalen Pins angeschlossen ist. verschiedene Modi:
 - "ist gedrückt": Mit diesem Modus kannst du abfragen ob der Block gerade gedrückt wird. Du erhältst entweder den Wert TRUE oder FALSE.
 - "wurde gedrückt": Mit diesem Modus kannst du abfragen ob der Block gedrückt wurde. Erst wenn der Knopf gedrückt und wieder losgelassen wurde erhältst du TRUE zurück
 - "als Schalter": Wenn du diesen Block verwendest kannst du den Knopf wie ein Lichtschalter verwenden. Der Status wird gespeichert bis der Button erneut gedrückt wird`,
   senseBox_button_helpurl: "",
-
-}
+};

src/components/Blockly/msg/de/sensebox-web.js

@@ -4,8 +4,26 @@ export const WEB = {
    */
   senseBox_wifi_connect: "Verbinde mit WLAN",
   senseBox_wifi_ssid: "Netzwerkname",
-    senseBox_wifi_tooltip: "Stellt eine Verbindung mit einem WLAN-Netzwerk her. Möchtest du dich mit einem ungesicheren Netzwerk (z.B. Freifunk) verbinden lösche das Feld Passwort. Das WiFi-Bee muss auf den Steckplatz **XBEE1** aufgesteckt werden.",
+  senseBox_wifi_ip: "IP-Address",
+  senseBox_wifi_ip_tooltip: "Gibt die IP-Address der senseBox aus",
+  senseBox_wifi_status: "WiFi-Status",
+  senseBox_wifi_status_tooltip: "Gibt den Status der WiFi-Verbindung aus",
+  senseBox_wifi_rssi: "RSSI",
+  senseBox_wifi_rssi_tooltip: "Gibt die Sigal Stärke der WiFi-Verbindung",
+  senseBox_wifi_tooltip:
+    "Stellt eine Verbindung mit einem WLAN-Netzwerk her. Möchtest du dich mit einem ungesicheren Netzwerk (z.B. Freifunk) verbinden lösche das Feld Passwort. Das WiFi-Bee muss auf den Steckplatz **XBEE1** aufgesteckt werden.",
   senseBox_wifi_startap: "Initialisiere WLAN Access Point",
-    senseBox_wifi_startap_tooltip: "Erstellt einen WiFi-Accesspoint zu dem du dich verbinden kannst. Beachte, dass immer nur 1 Gerät gleichzeitig verbunden werden kann.",
+  senseBox_wifi_startap_tooltip:
+    "Erstellt einen WiFi-Accesspoint zu dem du dich verbinden kannst. Beachte, dass immer nur 1 Gerät gleichzeitig verbunden werden kann.",
   senseBox_wifi_helpurl: "https://docs.sensebox.de/blockly/blockly-web-wifi/",
-}
+  senseBox_ethernet: "Verbinde mit Ethernet",
+  senseBox_ethernet_dhcp: "DHCP",
+  senseBox_ethernet_manuel_config: "Manuelle Konfiguration",
+  senseBox_ethernet_ip: "IP-Adresse",
+  senseBox_ethernet_gateway: "Gateway",
+  senseBox_ethernet_subnetmask: "Subnetzmaske",
+  senseBox_ethernet_mac: "MAC-Adresse",
+  senseBox_ethernet_dns: "DNS-Server",
+  senseBox_ethernet_tooltip:
+    "Verbinde das LAN-Bee mit dem Steckplatz XBEE1. Die meisten Netzwerke verwenden DHCP und vergeben automatisch eine IP-Adresse. Solltest du eine Manuelle Konfiguration durchführen wollen wählen im Dropdown Menü **Manuelle Konfiguration** aus und gebe die entsprechenden Daten ein.",
+};

src/components/Blockly/msg/de/time.js

@@ -1,11 +1,11 @@
 export const TIME = {
-
   /**
    * Interval Block
    */
-    senseBox_interval_timer: "Messintervall",
+  senseBox_interval_timer: "Intervall: ",
   senseBox_interval: "ms",
-    senseBox_interval_timer_tip: "Intervall",
+  senseBox_interval_timer_tip:
+    "Definiere ein Intervall, das alle x Millisekunden ausgeführt wird",
   ARD_TIME_DELAY: "Warte",
   ARD_TIME_DELAY_MICROS: "Mikrosekunden",
   ARD_TIME_DELAY_MICRO_TIP: "Warte eine spezifischen Zeit in Microsekunden",
@@ -13,8 +13,10 @@ export const TIME = {
   ARD_TIME_INF: "Warte für immer (Beende Programm)",
   ARD_TIME_INF_TIP: "Stoppt das Programm.",
   ARD_TIME_MICROS: "Bereits vergangen Zeit (Mikrosekunden)",
-    ARD_TIME_MICROS_TIP: "Gibt eine Zahl in Microsekunden zurück, die der Zeitdauer des Aktuellen Programms entspricht. Muss als positiven Integer gespeichert werden",  // untranslated
+  ARD_TIME_MICROS_TIP:
+    "Gibt eine Zahl in Microsekunden zurück, die der Zeitdauer des Aktuellen Programms entspricht. Muss als positiven Integer gespeichert werden", // untranslated
   ARD_TIME_MILLIS: "Bereits vergangen Zeit (Millisekunden)",
-    ARD_TIME_MILLIS_TIP: "Gibt eine Zahl in Millisekunden zurück, die der Zeitdauer des Aktuellen Programms entspricht. Muss als positiven Integer gespeichert werden",  // untranslated
+  ARD_TIME_MILLIS_TIP:
+    "Gibt eine Zahl in Millisekunden zurück, die der Zeitdauer des Aktuellen Programms entspricht. Muss als positiven Integer gespeichert werden", // untranslated
   ARD_TIME_MS: "Millisekunden",
-}
+};

src/components/Blockly/msg/de/translations.js

@@ -1,5 +1,4 @@
 export const TRANSLATIONS = {
-
   AUTH: "Bitte autorisiere diese App zum Aktivieren der Speicherung deiner Arbeit und zum Teilen.",
   CHANGE_VALUE_TITLE: "Wert ändern:",
   CHAT: "Chatte mit unserem Mitarbeiter durch Eingeben von Text in diesen Kasten!",
@@ -17,12 +16,15 @@ export const TRANSLATIONS = {
   EXTERNAL_INPUTS: "externe Eingänge",
   HELP: "Hilfe",
   INLINE_INPUTS: "interne Eingänge",
-    LISTS_CREATE_EMPTY_HELPURL: "https://github.com/google/blockly/wiki/Lists#create-empty-list",
+  LISTS_CREATE_EMPTY_HELPURL:
+    "https://github.com/google/blockly/wiki/Lists#create-empty-list",
   LISTS_CREATE_EMPTY_TITLE: "Erzeuge eine leere Liste",
   LISTS_CREATE_EMPTY_TOOLTIP: "Erzeugt eine leere Liste ohne Inhalt.",
   LISTS_CREATE_WITH_CONTAINER_TITLE_ADD: "Liste",
-    LISTS_CREATE_WITH_CONTAINER_TOOLTIP: "Hinzufügen, entfernen und sortieren von Elementen.",
-    LISTS_CREATE_WITH_HELPURL: "https://github.com/google/blockly/wiki/Lists#create-list-with",
+  LISTS_CREATE_WITH_CONTAINER_TOOLTIP:
+    "Hinzufügen, entfernen und sortieren von Elementen.",
+  LISTS_CREATE_WITH_HELPURL:
+    "https://github.com/google/blockly/wiki/Lists#create-list-with",
   LISTS_CREATE_WITH_INPUT_WITH: "Erzeuge Liste mit",
   LISTS_CREATE_WITH_ITEM_TOOLTIP: "Ein Element zur Liste hinzufügen.",
   LISTS_CREATE_WITH_TOOLTIP: "Erzeugt eine List mit konfigurierten Elementen.",
@@ -35,59 +37,92 @@ export const TRANSLATIONS = {
   LISTS_GET_INDEX_RANDOM: "zufälliges",
   LISTS_GET_INDEX_REMOVE: "entferne",
   LISTS_GET_INDEX_TAIL: "",
-    LISTS_GET_INDEX_TOOLTIP_GET_FIRST: "Extrahiere das erste Element aus der Liste.",
-    LISTS_GET_INDEX_TOOLTIP_GET_FROM_END: "Extrahiere das #1te Element aus Ende der Liste.",
-    LISTS_GET_INDEX_TOOLTIP_GET_FROM_START: "Extrahiere das #1te Element aus der Liste.",
-    LISTS_GET_INDEX_TOOLTIP_GET_LAST: "Extrahiere das letzte Element aus der Liste.",
-    LISTS_GET_INDEX_TOOLTIP_GET_RANDOM: "Extrahiere ein zufälliges Element aus der Liste.",
-    LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST: "Extrahiere und entfernt das erste Element aus der Liste.",
-    LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END: "Extrahiere und entfernt das #1te Element aus Ende der Liste.",
-    LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START: "Extrahiere und entfernt das #1te Element aus der Liste.",
-    LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST: "Extrahiere und entfernt das letzte Element aus der Liste.",
-    LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM: "Extrahiere und entfernt ein zufälliges Element aus der Liste.",
-    LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST: "Entfernt das erste Element von der Liste.",
-    LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END: "Entfernt das #1te Element von Ende der Liste.",
-    LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START: "Entfernt das #1te Element von der Liste.",
-    LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST: "Entfernt das letzte Element von der Liste.",
-    LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM: "Entfernt ein zufälliges Element von der Liste.",
+  LISTS_GET_INDEX_TOOLTIP_GET_FIRST:
+    "Extrahiere das erste Element aus der Liste.",
+  LISTS_GET_INDEX_TOOLTIP_GET_FROM_END:
+    "Extrahiere das #1te Element aus Ende der Liste.",
+  LISTS_GET_INDEX_TOOLTIP_GET_FROM_START:
+    "Extrahiere das #1te Element aus der Liste.",
+  LISTS_GET_INDEX_TOOLTIP_GET_LAST:
+    "Extrahiere das letzte Element aus der Liste.",
+  LISTS_GET_INDEX_TOOLTIP_GET_RANDOM:
+    "Extrahiere ein zufälliges Element aus der Liste.",
+  LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST:
+    "Extrahiere und entfernt das erste Element aus der Liste.",
+  LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END:
+    "Extrahiere und entfernt das #1te Element aus Ende der Liste.",
+  LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START:
+    "Extrahiere und entfernt das #1te Element aus der Liste.",
+  LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST:
+    "Extrahiere und entfernt das letzte Element aus der Liste.",
+  LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM:
+    "Extrahiere und entfernt ein zufälliges Element aus der Liste.",
+  LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST:
+    "Entfernt das erste Element von der Liste.",
+  LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END:
+    "Entfernt das #1te Element von Ende der Liste.",
+  LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START:
+    "Entfernt das #1te Element von der Liste.",
+  LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST:
+    "Entfernt das letzte Element von der Liste.",
+  LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM:
+    "Entfernt ein zufälliges Element von der Liste.",
   LISTS_GET_SUBLIST_END_FROM_END: "bis zu # von hinten",
   LISTS_GET_SUBLIST_END_FROM_START: "bis zu #",
   LISTS_GET_SUBLIST_END_LAST: "bis zum Ende",
-    LISTS_GET_SUBLIST_HELPURL: "http://publib.boulder.ibm.com/infocenter/lnxpcomp/v8v101/index.jsp?topic:%2Fcom.ibm.xlcpp8l.doc%2Flanguage%2Fref%2Farsubex.htm",
+  LISTS_GET_SUBLIST_HELPURL:
+    "http://publib.boulder.ibm.com/infocenter/lnxpcomp/v8v101/index.jsp?topic:%2Fcom.ibm.xlcpp8l.doc%2Flanguage%2Fref%2Farsubex.htm",
   LISTS_GET_SUBLIST_START_FIRST: "erhalte Unterliste vom Anfang",
   LISTS_GET_SUBLIST_START_FROM_END: "erhalte Unterliste von # von hinten",
   LISTS_GET_SUBLIST_START_FROM_START: "erhalte Unterliste von #",
   LISTS_GET_SUBLIST_TAIL: "",
-    LISTS_GET_SUBLIST_TOOLTIP: "Erstellt eine Kopie mit dem angegebenen Abschnitt der Liste.",
+  LISTS_GET_SUBLIST_TOOLTIP:
+    "Erstellt eine Kopie mit dem angegebenen Abschnitt der Liste.",
   LISTS_INDEX_OF_FIRST: "suche erstes Auftreten von",
-    LISTS_INDEX_OF_HELPURL: "http://publib.boulder.ibm.com/infocenter/lnxpcomp/v8v101/index.jsp?topic:%2Fcom.ibm.xlcpp8l.doc%2Flanguage%2Fref%2Farsubex.htm",
+  LISTS_INDEX_OF_HELPURL:
+    "http://publib.boulder.ibm.com/infocenter/lnxpcomp/v8v101/index.jsp?topic:%2Fcom.ibm.xlcpp8l.doc%2Flanguage%2Fref%2Farsubex.htm",
   LISTS_INDEX_OF_LAST: "suche letztes Auftreten von",
-    LISTS_INDEX_OF_TOOLTIP: "Sucht die Position (index) eines Elementes in der Liste. Gibt 0 zurück, falls kein Element gefunden wurde.",
+  LISTS_INDEX_OF_TOOLTIP:
+    "Sucht die Position (index) eines Elementes in der Liste. Gibt 0 zurück, falls kein Element gefunden wurde.",
   LISTS_INLIST: "von der Liste",
-    LISTS_ISEMPTY_HELPURL: "https://github.com/google/blockly/wiki/Lists#is-empty",  // untranslated
+  LISTS_ISEMPTY_HELPURL:
+    "https://github.com/google/blockly/wiki/Lists#is-empty", // untranslated
   LISTS_ISEMPTY_TITLE: "%1 ist leer?",
   LISTS_ISEMPTY_TOOLTIP: "Ist wahr (true), wenn die Liste leer ist.",
-    LISTS_LENGTH_HELPURL: "https://github.com/google/blockly/wiki/Lists#length-of",  // untranslated
+  LISTS_LENGTH_HELPURL:
+    "https://github.com/google/blockly/wiki/Lists#length-of", // untranslated
   LISTS_LENGTH_TITLE: "Länge von %1",
   LISTS_LENGTH_TOOLTIP: "Die Anzahl von Elementen in der Liste.",
-    LISTS_REPEAT_HELPURL: "http://publib.boulder.ibm.com/infocenter/lnxpcomp/v8v101/index.jsp?topic:%2Fcom.ibm.xlcpp8l.doc%2Flanguage%2Fref%2Farsubex.htm",
+  LISTS_REPEAT_HELPURL:
+    "http://publib.boulder.ibm.com/infocenter/lnxpcomp/v8v101/index.jsp?topic:%2Fcom.ibm.xlcpp8l.doc%2Flanguage%2Fref%2Farsubex.htm",
   LISTS_REPEAT_TITLE: "Erzeuge Liste mit Element %1 wiederhole es %2 mal",
-    LISTS_REPEAT_TOOLTIP: "Erzeugt eine Liste mit einer variablen Anzahl von Elementen",
-    LISTS_SET_INDEX_HELPURL: "http://publib.boulder.ibm.com/infocenter/lnxpcomp/v8v101/index.jsp?topic:%2Fcom.ibm.xlcpp8l.doc%2Flanguage%2Fref%2Farsubex.htm",
+  LISTS_REPEAT_TOOLTIP:
+    "Erzeugt eine Liste mit einer variablen Anzahl von Elementen",
+  LISTS_SET_INDEX_HELPURL:
+    "http://publib.boulder.ibm.com/infocenter/lnxpcomp/v8v101/index.jsp?topic:%2Fcom.ibm.xlcpp8l.doc%2Flanguage%2Fref%2Farsubex.htm",
   LISTS_SET_INDEX_INPUT_TO: "ein",
   LISTS_SET_INDEX_INSERT: "füge",
   LISTS_SET_INDEX_SET: "setze",
-    LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST: "Fügt das Element an den Anfang der Liste an.",
-    LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END: "Fügt das Element an der angegebenen Position in der Liste ein.  #1 ist das letzte Element.",
-    LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START: "Fügt das Element an der angegebenen Position in der Liste ein.  #1 ist die erste Element.",
-    LISTS_SET_INDEX_TOOLTIP_INSERT_LAST: "Fügt das Element ans Ende der Liste an.",
-    LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM: "Fügt das Element zufällig in die Liste ein.",
+  LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST:
+    "Fügt das Element an den Anfang der Liste an.",
+  LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END:
+    "Fügt das Element an der angegebenen Position in der Liste ein.  #1 ist das letzte Element.",
+  LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START:
+    "Fügt das Element an der angegebenen Position in der Liste ein.  #1 ist die erste Element.",
+  LISTS_SET_INDEX_TOOLTIP_INSERT_LAST:
+    "Fügt das Element ans Ende der Liste an.",
+  LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM:
+    "Fügt das Element zufällig in die Liste ein.",
   LISTS_SET_INDEX_TOOLTIP_SET_FIRST: "Setzt das erste Element in der Liste.",
-    LISTS_SET_INDEX_TOOLTIP_SET_FROM_END: "Setzt das Element an der angegebenen Position in der Liste.  #1 ist das letzte Element.",
-    LISTS_SET_INDEX_TOOLTIP_SET_FROM_START: "Setzte das Element an der angegebenen Position in der Liste.  #1 ist das erste Element.",
+  LISTS_SET_INDEX_TOOLTIP_SET_FROM_END:
+    "Setzt das Element an der angegebenen Position in der Liste.  #1 ist das letzte Element.",
+  LISTS_SET_INDEX_TOOLTIP_SET_FROM_START:
+    "Setzte das Element an der angegebenen Position in der Liste.  #1 ist das erste Element.",
   LISTS_SET_INDEX_TOOLTIP_SET_LAST: "Setzt das letzte Element in der Liste.",
-    LISTS_SET_INDEX_TOOLTIP_SET_RANDOM: "Setzt ein zufälliges Element in der Liste.",
-    LISTS_SORT_HELPURL: "https://github.com/google/blockly/wiki/Lists#sorting-a-list",
+  LISTS_SET_INDEX_TOOLTIP_SET_RANDOM:
+    "Setzt ein zufälliges Element in der Liste.",
+  LISTS_SORT_HELPURL:
+    "https://github.com/google/blockly/wiki/Lists#sorting-a-list",
   LISTS_SORT_ORDER_ASCENDING: "aufsteigend",
   LISTS_SORT_ORDER_DESCENDING: "absteigend",
   LISTS_SORT_TITLE: "%1 %2 %3 sortieren",
@@ -95,11 +130,14 @@ export const TRANSLATIONS = {
   LISTS_SORT_TYPE_IGNORECASE: "alphabetisch, Schreibung ignorieren",
   LISTS_SORT_TYPE_NUMERIC: "numerisch",
   LISTS_SORT_TYPE_TEXT: "alphabetisch",
-    LISTS_SPLIT_HELPURL: "https://github.com/google/blockly/wiki/Lists#splitting-strings-and-joining-lists",
+  LISTS_SPLIT_HELPURL:
+    "https://github.com/google/blockly/wiki/Lists#splitting-strings-and-joining-lists",
   LISTS_SPLIT_LIST_FROM_TEXT: "Liste aus Text erstellen",
   LISTS_SPLIT_TEXT_FROM_LIST: "Text aus Liste erstellen",
-    LISTS_SPLIT_TOOLTIP_JOIN: "Liste mit Texten in einen Text vereinen, getrennt durch ein Trennzeichen.",
-    LISTS_SPLIT_TOOLTIP_SPLIT: "Text in eine Liste mit Texten aufteilen, unterbrochen bei jedem Trennzeichen.",
+  LISTS_SPLIT_TOOLTIP_JOIN:
+    "Liste mit Texten in einen Text vereinen, getrennt durch ein Trennzeichen.",
+  LISTS_SPLIT_TOOLTIP_SPLIT:
+    "Text in eine Liste mit Texten aufteilen, unterbrochen bei jedem Trennzeichen.",
   LISTS_SPLIT_WITH_DELIMITER: "mit Trennzeichen",
   LOGIC_BOOLEAN_FALSE: "falsch",
 
@@ -108,49 +146,61 @@ export const TRANSLATIONS = {
   NEW_VARIABLE_TITLE: "Name der neuen Variable:",
   ORDINAL_NUMBER_SUFFIX: "",
   PROCEDURES_ALLOW_STATEMENTS: "Aussagen erlauben",
-    PROCEDURES_CALLNORETURN_HELPURL: "https://de.wikipedia.org/wiki/Prozedur_%28Programmierung%29",
-    PROCEDURES_CALLNORETURN_TOOLTIP: "Rufe einen Funktionsblock ohne Rückgabewert auf.",
-    PROCEDURES_CALLRETURN_HELPURL: "https://de.wikipedia.org/wiki/Prozedur_%28Programmierung%29",
-    PROCEDURES_CALLRETURN_TOOLTIP: "Rufe einen Funktionsblock mit Rückgabewert auf.",
+  PROCEDURES_CALLNORETURN_HELPURL:
+    "https://de.wikipedia.org/wiki/Prozedur_%28Programmierung%29",
+  PROCEDURES_CALLNORETURN_TOOLTIP:
+    "Rufe einen Funktionsblock ohne Rückgabewert auf.",
+  PROCEDURES_CALLRETURN_HELPURL:
+    "https://de.wikipedia.org/wiki/Prozedur_%28Programmierung%29",
+  PROCEDURES_CALLRETURN_TOOLTIP:
+    "Rufe einen Funktionsblock mit Rückgabewert auf.",
   PROCEDURES_CALL: "Rufe",
   PROCEDURES_CALL_END: "auf",
   PROCEDURES_DEFNORETURN: "Erstelle Funktion",
   PROCEDURES_BEFORE_PARAMS: "mit Eingabeparameter:",
   PROCEDURES_DEFRETURN_RETURN_TYPE: "Rückgabetype",
   PROCEDURES_CALL_BEFORE_PARAMS: "mit:",
-    PROCEDURES_CREATE_DO: "Erzeuge \"Aufruf %1\"",
+  PROCEDURES_CREATE_DO: 'Erzeuge "Aufruf %1"',
   PROCEDURES_DEFNORETURN_COMMENT: "Beschreibe diese Funktion …",
   PROCEDURES_DEFNORETURN_DO: "",
-    PROCEDURES_DEFNORETURN_HELPURL: "https://de.wikipedia.org/wiki/Prozedur_%28Programmierung%29",
+  PROCEDURES_DEFNORETURN_HELPURL:
+    "https://de.wikipedia.org/wiki/Prozedur_%28Programmierung%29",
   PROCEDURES_DEFNORETURN_PROCEDURE: "Funktionsblock",
   PROCEDURES_DEFNORETURN_TITLE: "zu",
   PROCEDURES_DEFNORETURN_TOOLTIP: "Ein Funktionsblock ohne Rückgabewert.",
-    PROCEDURES_DEFRETURN_HELPURL: "https://de.wikipedia.org/wiki/Prozedur_%28Programmierung%29",
+  PROCEDURES_DEFRETURN_HELPURL:
+    "https://de.wikipedia.org/wiki/Prozedur_%28Programmierung%29",
   PROCEDURES_DEFRETURN_RETURN: "gebe zurück",
   PROCEDURES_DEFRETURN_TOOLTIP: "Ein Funktionsblock mit Rückgabewert.",
-    PROCEDURES_DEF_DUPLICATE_WARNING: "Warnung: dieser Funktionsblock hat zwei gleich benannte Parameter.",
+  PROCEDURES_DEF_DUPLICATE_WARNING:
+    "Warnung: dieser Funktionsblock hat zwei gleich benannte Parameter.",
   PROCEDURES_HIGHLIGHT_DEF: "Markiere Funktionsblock",
   PROCEDURES_IFRETURN_HELPURL: "http://c2.com/cgi/wiki?GuardClause",
-    PROCEDURES_IFRETURN_TOOLTIP: "Wenn der erste Wert wahr (true) ist, Gebe den zweiten Wert zurück.",
-    PROCEDURES_IFRETURN_WARNING: "Warnung: Dieser Block darf nur innerhalb eines Funktionsblock genutzt werden.",
+  PROCEDURES_IFRETURN_TOOLTIP:
+    "Wenn der erste Wert wahr (true) ist, Gebe den zweiten Wert zurück.",
+  PROCEDURES_IFRETURN_WARNING:
+    "Warnung: Dieser Block darf nur innerhalb eines Funktionsblock genutzt werden.",
   PROCEDURES_MUTATORARG_TITLE: "Variable:",
   PROCEDURES_MUTATORARG_TOOLTIP: "Eine Eingabe zur Funktion hinzufügen.",
   PROCEDURES_MUTATORCONTAINER_TITLE: "Parameter",
-    PROCEDURES_MUTATORCONTAINER_TOOLTIP: "Die Eingaben zu dieser Funktion hinzufügen, entfernen oder neu anordnen.",
+  PROCEDURES_MUTATORCONTAINER_TOOLTIP:
+    "Die Eingaben zu dieser Funktion hinzufügen, entfernen oder neu anordnen.",
   REDO: "Wiederholen",
   REMOVE_COMMENT: "Kommentar entfernen",
   RENAME_VARIABLE: "Variable umbenennen...",
-    RENAME_VARIABLE_TITLE: "Alle \"%1\" Variablen umbenennen in:",
+  RENAME_VARIABLE_TITLE: 'Alle "%1" Variablen umbenennen in:',
 
   TODAY: "Heute",
   UNDO: "Rückgängig",
   VARIABLES_DEFAULT_NAME: "Element",
-    VARIABLES_GET_CREATE_SET: "Erzeuge \"Schreibe %1\"",
-    VARIABLES_GET_HELPURL: "https://de.wikipedia.org/wiki/Variable_%28Programmierung%29",
+  VARIABLES_GET_CREATE_SET: 'Erzeuge "Schreibe %1"',
+  VARIABLES_GET_HELPURL:
+    "https://de.wikipedia.org/wiki/Variable_%28Programmierung%29",
   VARIABLES_GET_TOOLTIP: "Gibt den Wert der Variable zurück.",
   VARIABLES_SET: "Schreibe %1 %2",
-    VARIABLES_SET_CREATE_GET: "Erzeuge \"Lese %1\"",
-    VARIABLES_SET_HELPURL: "https://de.wikipedia.org/wiki/Variable_%28Programmierung%29",
+  VARIABLES_SET_CREATE_GET: 'Erzeuge "Lese %1"',
+  VARIABLES_SET_HELPURL:
+    "https://de.wikipedia.org/wiki/Variable_%28Programmierung%29",
   VARIABLES_SET_TOOLTIP: "Setzt den Wert einer Variable.",
   MATH_CHANGE_TITLE_ITEM: "Element",
   PROCEDURES_DEFRETURN_TITLE: "zu",
@@ -163,7 +213,8 @@ export const TRANSLATIONS = {
   LISTS_GET_INDEX_INPUT_IN_LIST: "in der Liste",
   PROCEDURES_DEFRETURN_DO: "",
   CONTROLS_IF_ELSEIF_TITLE_ELSEIF: "sonst wenn",
-    LISTS_GET_INDEX_HELPURL: "https://github.com/google/blockly/wiki/Lists#getting-items-from-a-list",
+  LISTS_GET_INDEX_HELPURL:
+    "https://github.com/google/blockly/wiki/Lists#getting-items-from-a-list",
   CONTROLS_FOREACH_INPUT_DO: "mache",
   LISTS_SET_INDEX_INPUT_IN_LIST: "in der Liste",
   CONTROLS_FOR_INPUT_DO: "mache",
@@ -190,12 +241,15 @@ export const TRANSLATIONS = {
   senseBox_output_safetosd: "Auf SD Karte speichern",
   senseBox_output_safetosd_tip: "Speichert Messwerte auf SD Karte",
   senseBox_output_serialprint: "Auf Kommandozeile ausgeben",
-    senseBox_serial_tip: "Gibt Messwerte oder Daten auf dem Seriellen Monitor der Arduino IDE aus. Praktisch um ohne Display zu arbeiten",
-    senseBox_output_timestamp: "Zeitstempel",
-    senseBox_led: "LED an digitalen",
-    senseBox_led_tip: "Einfache LED. Beim Anschluss sollte immer ein Vorwiderstand verwendet werden",
+  senseBox_serial_tip:
+    "Gibt Messwerte oder Daten auf dem Seriellen Monitor der Arduino IDE aus. Praktisch um ohne Display zu arbeiten",
+  senseBox_output_timestamp: "Zeitstempel (RFC 3339)",
+  senseBox_led: "LED an",
+  senseBox_led_tip:
+    "Einfache LED. Beim Anschluss sollte immer ein Vorwiderstand verwendet werden",
   senseBox_piezo: "Piezo an digital",
-    senseBox_piezo_tip: "Piezo an digital PIN. Beim Anschluss sollte immer ein Vorwiderstand verwendet werden",
+  senseBox_piezo_tip:
+    "Piezo an digital PIN. Beim Anschluss sollte immer ein Vorwiderstand verwendet werden",
   senseBox_foto: "Fotowiderstand",
   senseBox_foto_tip: "Fotowiderstand",
   senseBox_hum: "Luftfeuchtigkeit in %",
@@ -208,5 +262,4 @@ export const TRANSLATIONS = {
   senseBox_poti_tip: "Potenziometer",
   senseBox_soil: "Bodenfeuchte",
   senseBox_watertemperature: "Wassertemperatur",
-
-}
+};

src/components/Blockly/msg/de/ui.js

@@ -10,6 +10,8 @@ export const UI = {
   toolbox_time: "Zeit",
   toolbox_functions: "Funktionen",
   toolbox_variables: "Variablen",
+  toolbox_serial: "Seriell",
+  toolbox_advanced: "Erweitert",
   variable_NUMBER: "Zahl (int)",
   variable_SHORT_NUMBER: "char",
   variable_LONG: "große Zahl (long)",
@@ -49,7 +51,14 @@ export const UI = {
   tooltip_project_title: "Titel des Projektes",
   tooltip_check_solution: "Lösung kontrollieren",
   tooltip_copy_code: "Code in die Zwischenablage kopieren",
-
+  tooltip_statistics_current: "Anzahl aktueller Blöcke",
+  tooltip_statistics_new: "Anzahl neuer Blöcke",
+  tooltip_statistics_changed: "Anzahl veränderter Blöcke",
+  tooltip_statistics_moved: "Anzahl bewegter Blöcke",
+  tooltip_statistics_deleted: "Anzahl gelöschter Blöcke",
+  tooltip_statistics_remaining: "Verbleibende Blöcke",
+  tooltip_statistics_show: "Statistiken anzeigen",
+  tooltip_start_tour: "Tour starten",
   /**
    * Messages
    *
@@ -76,13 +85,23 @@ export const UI = {
   messages_rename_success_01: "Das Projekt wurde erfolgreich in ",
   messages_rename_success_02: "umbenannt.",
   messages_newblockly_head:
-    "Willkommen zur neuen Version Blockly für die senseBox",
+    "Willkommen zur neuen senseBox Lern- und Programmierumgebung",
   messages_newblockly_text:
-    "Die neue Blockly-Version befindet sich derzeit in der Testphase. Wenn Sie einen Fehler finden, melden Sie diesen bitte in unserem [Forum](https://forum.sensebox.de/t/neue-blockly-version-beta-test-und-feedback/1176). Eine Übersicht über alle neuen Funktionen finden Sie [hier](/news)",
+    "Nach einer Testphase kann die neue senseBox Lern- und Programmierumgebung verwendet werden. Wenn Sie weiterhin Fehler finden, melden Sie diesen bitte in unserem [Forum](https://forum.sensebox.de/t/neue-blockly-version-beta-test-und-feedback/1176). Eine Übersicht über alle neuen Funktionen finden Sie [hier](/news)",
   messages_GET_TUTORIAL_FAIL: "Zurück zur Tutorials-Übersicht",
   messages_LOGIN_FAIL: "Der Benutzername oder das Passwort ist nicht korrekt.",
   messages_copy_code: "Code wurde in die Zwischenablage kopiert",
 
+  /**
+   * Tablet Dialog
+   */
+
+  tabletDialog_headline: "Tablet Modus ist aktiviert!",
+  tabletDialog_text:
+    "Der Tablet Modus wurde aktiviert. Du kannst nun Programmcodes über die senseBox Connect App auf deine senseBox kopieren. Der Tablet Modus kann in den Einstellungen deaktiviert werden",
+  tabletDialog_more:
+    "Weitere Informationen und den Link zum Download der App findest du unter: ",
+
   /**
    * Reset Dialog
    */
@@ -154,6 +173,14 @@ export const UI = {
     "Die Anzeige von Statistiken zur Nutzung der Blöcke oberhalb der Arbeitsfläche kann ein- oder ausgeblendet werden.",
   settings_statistics_on: "An",
   settings_statistics_off: "Aus",
+  settings_ota_head: "Tablet Modus",
+  settings_ota_text:
+    "Der Tablet Modus deaktiviert die Code anzeige und aktiviert die Möglichkeit den Programmcode über die senseBox Connect App zu übertragen. Weitere Informationen dazu findest du unter: ",
+  settings_ota_on: "Aktiviert",
+  settings_ota_off: "Deaktiviert",
+  settings_sounds: "Töne",
+  settings_sounds_text:
+    "Aktiviere oder Deaktiviere Töne beim hinzufügen und löschen von Blöcken. Standardmäßig deaktiviert",
 
   /**
    * 404
@@ -175,7 +202,7 @@ export const UI = {
   /**
    * Tutorials
    */
-
+  tutorials_home_head: "Tutorial-Übersicht",
   tutorials_assessment_task: "Aufgabe",
   tutorials_hardware_head: "Für die Umsetzung benötigst du folgende Hardware:",
   tutorials_hardware_moreInformation:
@@ -187,7 +214,9 @@ export const UI = {
   /**
    * Tutorial Builder
    */
-
+  builder_createNew: "neues Tutorial erstellen",
+  builder_changeExisting: "bestehendes Tutorial ändern",
+  builder_deleteExisting: "bestehendes Tutorial löschen",
   builder_solution: "Lösung",
   builder_solution_submit: "Lösung einreichen",
   builder_example_submit: "Beispiel einreichen",
@@ -215,7 +244,7 @@ export const UI = {
 
   navbar_tutorials: "Tutorials",
   navbar_tutorialbuilder: "Tutorial erstellen",
-  navbar_gallery: "Gallerie",
+  navbar_gallery: "Galerie",
   navbar_projects: "Projekte",
 
   navbar_menu: "Menü",

src/components/Blockly/msg/de_old.js

@@ -726,7 +726,7 @@ Blockly.Msg.senseBox_output_safetosd_tip = "Speichert Messwerte auf SD Karte";
 Blockly.Msg.senseBox_output_serialprint = "Auf Kommandozeile ausgeben";
 Blockly.Msg.senseBox_serial_tip =
   "Gibt Messwerte oder Daten auf dem Seriellen Monitor der Arduino IDE aus. Praktisch um ohne Display zu arbeiten";
-Blockly.Msg.senseBox_output_timestamp = "Zeitstempel";
+Blockly.Msg.senseBox_output_timestamp = "Zeitstempel (RFC 3339)";
 
 Blockly.Msg.senseBox_led = "LED an digitalen";
 Blockly.Msg.senseBox_led_tip =
@@ -745,8 +745,8 @@ Blockly.Msg.senseBox_lux_tip = "Helligkeitssensor";
 Blockly.Msg.senseBox_poti = "Potenziometer";
 Blockly.Msg.senseBox_poti_tip = "Potenziometer";
 Blockly.Msg.senseBox_pressure_sensor = "Luftdruck-/Temperatursensor (BMP280)";
-Blockly.Msg.senseBox_pressure = "Luftdruck in Pa";
-Blockly.Msg.senseBox_pressure_dimension = "Luftdruck in Pa";
+Blockly.Msg.senseBox_pressure = "Luftdruck in hPa";
+Blockly.Msg.senseBox_pressure_dimension = "Luftdruck in hPa";
 Blockly.Msg.senseBox_pressure_tip = "Luftdrucksensor";
 Blockly.Msg.senseBox_pressure_referencePressure = "Luftdruck auf NN";
 Blockly.Msg.senseBox_pressure_referencePressure_dim = "hPa";

src/components/Blockly/msg/en/faq.js

@@ -3,7 +3,6 @@ export const FAQ = {
    * FAQ
    */
 
-
   faq_q1_question: `How can I copy my program to the senseBox?`,
   faq_q1_answer: `To copy programs to the senseBox, connect it to the computer with the Micro USB cable. Then double click on the red reset button on the senseBox MCU. The senseBox will now be recognized as a removable disk on your computer and the previously created programs can be copied via drag & drop. After each change of the program code the program must be recompiled and transferred again.
 #### Activate learning mode of the MCU
@@ -20,10 +19,10 @@ Copying programs under MacOS does not work via the Finder, but there are still t
 Basically the programming environment can be used with any senseBox with senseBox MCU. 
 `,
 
-
   faq_q3_question: `I found an error or something is not working. Where can I report it?`,
   faq_q3_answer: `
 The best way to do this is to create an issue on [Github](https://github.com/sensebox/React-Ardublockly/issues). Alternatively you can send us an email to info(at)sensebox.de
 `,
-
-}
+  faq_tablet_question: `Can I program the senseBox with a tablet?`,
+  faq_tablet_answer: `Yes! Install the senseBox Connect app from the App Store and call up the learning and programming environment in your browser on the tablet. Detailed information on how to use the app can be found at [https://sensebox.de/app](https://sensebox.de/app)`,
+};

src/components/Blockly/msg/en/io.js

@@ -1,13 +1,13 @@
 export const IO = {
-
-
   ARD_ANALOGREAD: "read analog pin#",
-    ARD_ANALOGREAD_TIP: "Return value between 0 and 1024",
+  ARD_ANALOGREAD_TIP: "Return value between 0 and 1023",
   ARD_ANALOGWRITE: "set analog pin#",
-    ARD_ANALOGWRITE_TIP: "Write analog value between 0 and 255 to a specific PWM Port",
+  ARD_ANALOGWRITE_TIP:
+    "Write analog value between 0 and 255 to a specific PWM Port",
   ARD_BUILTIN_LED: "set built-in LED",
   ARD_BUILTIN_LED_TIP: "Light on or off for the built-in LED of the Arduino",
-    ARD_COMPONENT_WARN1: "A %1 configuration block with the same %2 name must be added to use this block!",
+  ARD_COMPONENT_WARN1:
+    "A %1 configuration block with the same %2 name must be added to use this block!",
   ARD_DEFINE: "Define",
   ARD_DIGITALREAD: "read digital pin#",
   ARD_DIGITALREAD_TIP: "Read digital value on a pin: HIGH or LOW",
@@ -31,15 +31,18 @@ export const IO = {
   ARD_NOTONE_PIN_TIP: "Stop generating a tone on a pin",
   ARD_NOTONE_TIP: "Turns the tone off on the selected pin",
   ARD_PIN_WARN1: "Pin %1 is needed for %2 as pin %3. Already used as %4.",
-    ARD_PULSETIMEOUT_TIP: "Measures the duration of a pulse on the selected pin, if it is within the time-out in microseconds.",
+  ARD_PULSETIMEOUT_TIP:
+    "Measures the duration of a pulse on the selected pin, if it is within the time-out in microseconds.",
   ARD_PULSE_READ: "measure %1 pulse on pin #%2",
   ARD_PULSE_READ_TIMEOUT: "measure %1 pulse on pin #%2 (timeout after %3 μs)",
   ARD_PULSE_TIP: "Measures the duration of a pulse on the selected pin.",
   ARD_SERIAL_BPS: "bps",
   ARD_SERIAL_PRINT: "print",
   ARD_SERIAL_PRINT_NEWLINE: "add new line",
-    ARD_SERIAL_PRINT_TIP: "Prints data to the console/serial port as human-readable ASCII text.",
-    ARD_SERIAL_PRINT_WARN: "A setup block for %1 must be added to the workspace to use this block!",
+  ARD_SERIAL_PRINT_TIP:
+    "Prints data to the console/serial port as human-readable ASCII text.",
+  ARD_SERIAL_PRINT_WARN:
+    "A setup block for %1 must be added to the workspace to use this block!",
   ARD_SERIAL_SETUP: "Setup",
   ARD_SERIAL_SETUP_TIP: "Selects the speed for a specific Serial peripheral",
   ARD_SERIAL_SPEED: ":  speed to",
@@ -62,12 +65,14 @@ export const IO = {
   ARD_SPI_SETUP_MSBFIRST: "MSBFIRST",
   ARD_SPI_SETUP_SHIFT: "data shift",
   ARD_SPI_SETUP_TIP: "Configures the SPI peripheral.",
-    ARD_SPI_TRANSRETURN_TIP: "Send a SPI message to an specified slave device and get data back.",
+  ARD_SPI_TRANSRETURN_TIP:
+    "Send a SPI message to an specified slave device and get data back.",
   ARD_SPI_TRANS_NONE: "none",
   ARD_SPI_TRANS_SLAVE: "to slave pin",
   ARD_SPI_TRANS_TIP: "Send a SPI message to an specified slave device.",
   ARD_SPI_TRANS_VAL: "transfer",
-    ARD_SPI_TRANS_WARN1: "A setup block for %1 must be added to the workspace to use this block!",
+  ARD_SPI_TRANS_WARN1:
+    "A setup block for %1 must be added to the workspace to use this block!",
   ARD_SPI_TRANS_WARN2: "Old pin value %1 is no longer available.",
   ARD_STEPPER_COMPONENT: "stepper",
   ARD_STEPPER_DEFAULT_NAME: "MyStepper",
@@ -80,7 +85,8 @@ export const IO = {
   ARD_STEPPER_PIN4: "pin4#",
   ARD_STEPPER_REVOLVS: "how many steps per revolution",
   ARD_STEPPER_SETUP: "Setup stepper motor",
-    ARD_STEPPER_SETUP_TIP: "Configures a stepper motor pinout and other settings.",
+  ARD_STEPPER_SETUP_TIP:
+    "Configures a stepper motor pinout and other settings.",
   ARD_STEPPER_SPEED: "set speed (rpm) to",
   ARD_STEPPER_STEP: "move stepper",
   ARD_STEPPER_STEPS: "steps",
@@ -104,4 +110,4 @@ export const IO = {
   NEW_INSTANCE_TITLE: "New instance name:",
   RENAME_INSTANCE: "Rename instance...",
   RENAME_INSTANCE_TITLE: "Rename all '%1' instances to:",
-}
+};

src/components/Blockly/msg/en/sensebox-ble.js

@@ -28,7 +28,9 @@ export const BLE = {
   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",
+    "Initialise the Bluetooth Bee. Plug it into the **XBEE1** slot. Give the Phyphox meter a unique name so you can find it in the app",
+  sensebox_phyphox_helpurl:
+    "https://sensebox.de/projects/de/2021-12-21-verbindung%20mit%20der%20phyphox%20app",
   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:

src/components/Blockly/msg/en/sensebox-led.js

@@ -1,8 +1,5 @@
 export const LED = {
-
-
-
-    senseBox_led: "LED connected to digital",
+  senseBox_led: "LED connected to",
   senseBox_led_tip: "simple LED. Don't forget the resistor",
 
   senseBox_rgb_led: "RGB-LED",
@@ -15,8 +12,10 @@ export const LED = {
   senseBox_ws2818_rgb_led_init: "Initialise RGB LED (WS2818)",
   senseBox_ws2818_rgb_led_position: "Position",
   senseBox_ws2818_rgb_led_brightness: "Brightness",
-    senseBox_ws2818_rgb_led_tooltip: "Change the color of your RGB LED with this block. Link a block for the color. If multiple RGB LEDs are chained together you can use the position to determine which LED is controlled.",
-    senseBox_ws2818_rgb_led_init_tooltip: "Connect the RGB LED to one of the three **digital/analog ports**. If multiple RGB LEDs are daisy-chained together you can determine which LED is controlled by position.",
+  senseBox_ws2818_rgb_led_tooltip:
+    "Change the color of your RGB LED with this block. Link a block for the color. If multiple RGB LEDs are chained together you can use the position to determine which LED is controlled.",
+  senseBox_ws2818_rgb_led_init_tooltip:
+    "Connect the RGB LED to one of the three **digital/analog ports**. If multiple RGB LEDs are daisy-chained together you can determine which LED is controlled by position.",
   senseBox_ws2818_rgb_led_color: "Color",
   senseBox_ws2818_rgb_led_number: "Number",
 
@@ -29,7 +28,8 @@ export const LED = {
   COLOUR_BLEND_HELPURL: "http://meyerweb.com/eric/tools/color-blend/",
   COLOUR_BLEND_RATIO: "ratio",
   COLOUR_BLEND_TITLE: "blend",
-    COLOUR_BLEND_TOOLTIP: "Blends two colours together with a given ratio (0.0 - 1.0).",
+  COLOUR_BLEND_TOOLTIP:
+    "Blends two colours together with a given ratio (0.0 - 1.0).",
   COLOUR_PICKER_HELPURL: "https://en.wikipedia.org/wiki/Color",
   COLOUR_PICKER_TOOLTIP: "Choose a colour from the palette.",
   COLOUR_RANDOM_HELPURL: "http://randomcolour.com",
@@ -40,6 +40,6 @@ export const LED = {
   COLOUR_RGB_HELPURL: "http://www.december.com/html/spec/colorper.html",
   COLOUR_RGB_RED: "red",
   COLOUR_RGB_TITLE: "colour with",
-    COLOUR_RGB_TOOLTIP: "Create a colour with the specified amount of red, green, and blue. All values must be between 0 and 255.",
-
-}
+  COLOUR_RGB_TOOLTIP:
+    "Create a colour with the specified amount of red, green, and blue. All values must be between 0 and 255.",
+};

src/components/Blockly/msg/en/sensebox-lora.js

@@ -3,7 +3,6 @@ export const LORA = {
    * LoRa Blöcke
    */
 
-
   senseBox_LoRa_connect: "Send to TTN",
   senseBox_LoRa_device_id: "Device EUI (lsb)",
   senseBox_LoRa_app_id: "Application EUI (lsb)",
@@ -29,6 +28,7 @@ export const LORA = {
   senseBox_LoRa_cayenne_lat: "Latitude",
   senseBox_LoRa_cayenne_lng: "Longitude",
   senseBox_LoRa_cayenne_alt: "Altitude",
+  senseBox_LoRa_cayenne_concentration: "Concentration",
 
   senseBox_LoRa_cayenne_humidity_tip: "Send temperature with one decimal",
   senseBox_LoRa_cayenne_tip: "Send Data as Cayenne Payload Format",
@@ -40,12 +40,13 @@ export const LORA = {
 
   senseBox_LoRa_message_tooltip: "Send a message with LoRa",
   senseBox_LoRa_sensor_tip: "Send a value with a specific number of bytes",
-    senseBox_LoRa_init_abp_tooltip: "Initialize the LoRa transmission. The activation is done via ABP. Register an application on [thethingsnetwork](https://thethingsnetwork.com) and copy the **Network Session Key** and the **App Session Key** in **msb format** and the **Device ID** in **hex format**.",
-    senseBox_LoRa_init_helpurl: "https://en.docs.sensebox.de/blockly/blockly-web-lora/",
-
-    senseBox_LoRa_init_otaa_tooltip: "Initialize the LoRa transmission. The activation is done via OTAA. Register an application on [thethingsnetwork](https://thethingsnetwork.com) and copy the **DEVICE EUI** and the **Application EUI** in **lsb format** the **App Key** in **msb format**.",
-
-}
-
-
+  senseBox_LoRa_init_abp_tooltip:
+    "Initialize the LoRa transmission. The activation is done via ABP. Register an application on [thethingsnetwork](https://thethingsnetwork.com) and copy the **Network Session Key** and the **App Session Key** in **msb format** and the **Device ID** in **hex format**.",
+  senseBox_LoRa_init_helpurl:
+    "https://en.docs.sensebox.de/blockly/blockly-web-lora/",
 
+  senseBox_LoRa_init_otaa_tooltip:
+    "Initialize the LoRa transmission. The activation is done via OTAA. Register an application on [thethingsnetwork](https://thethingsnetwork.com) and copy the **DEVICE EUI** and the **Application EUI** in **lsb format** the **App Key** in **msb format**.",
+  sensebox_lora_ttn_mapper_tip:
+    "You can use a TTN Mapper to map LoRa network coverage in your area. The data is then displayed on [ttnmaper](https://ttnmapper.org). You can find the necessary decoder [here](https://gist.github.com/felixerdy/f959ac03df98c6947f1c7f35d537f23e#file-decoder-js).",
+};

src/components/Blockly/msg/en/sensebox-osem.js

@@ -3,8 +3,11 @@ export const OSEM = {
    * openSenseMap
    */
 
-    senseBox_osem_connection_tip: "connect to the openSenseMap",
-    senseBox_send_to_osem_tip: "sends the measurement to openSenseMap. Make shure to enter the correct BoxID and SensorID",
+  senseBox_osem_connection_tip:
+    "Use this block to connect your senseBox to the openSenseMap. Register your senseBox on the openSenseMap and enter the IDs and the API key. Then use the block ***Send reading to the openSenseMap*** and the sensor ID to transfer the readings.",
+  senseBox_osem_connection_helpurl: "https://www.opensensemap.org/",
+  senseBox_send_to_osem_tip:
+    "Send measured values to the openSenseMap with this block. Use one block per measurement value and enter the assigned sensor ID",
   senseBox_send_to_osem: "Send measurement to openSenseMap",
   senseBox_osem_connection: "Connect to openSenseMap",
   senseBox_osem_host: "opensensemap.org",
@@ -15,6 +18,5 @@ export const OSEM = {
   senseBox_osem_access_token: "API Key",
   senseBox_send_mobile_to_osem: "Send measurement and location to openSenseMap",
   senseBox_send_mobile_to_osem_tip: "Send Value and Location to openSenseMap",
-}
-
-
+  senseBox_osem_restart: "Restart device if disconnected?",
+};

src/components/Blockly/msg/en/sensebox-sd.js

@@ -5,11 +5,19 @@ export const SD = {
   senseBox_sd_create_file: "Create file on SD-Card",
   senseBox_sd_write_file: " Write Data to SD-Card",
   senseBox_sd_open_file: "Open a file from SD-Card",
-    senseBox_sd_create_file_tooltip: "Creates a file on the card. Plug the SD-Bee into the **XBEE2** slot. The **maximum** length of the file name is **8 characters**. The file should be created first in *Setup()*",
-    senseBox_sd_write_file_tooptip: "Write data to the SD card. Note that the file must be opened first.",
-    senseBox_sd_open_file_tooltip: "Open the file on the SD card to save files. At the end of the loop, the file will be closed again automatically.",
-    sensebox_sd_filename: "Data.txt",
+  senseBox_sd_create_file_tooltip:
+    "Creates a file on the card. Plug the SD-Bee into the **XBEE2** slot. The **maximum** length of the file name is **8 characters**. The file should be created first in *Setup()*",
+  senseBox_sd_write_file_tooptip:
+    "Write data to the SD card. Note that the file must be opened first.",
+  senseBox_sd_open_file_tooltip:
+    "Open the file on the SD card to save files. At the end of the loop, the file will be closed again automatically.",
+  sensebox_sd_filename: "Data.csv",
   senseBox_sd_decimals: "decimals",
-
-}
-
+  sensebox_sd_osem: "Create CSV-file for openSenseMap",
+  sensebox_sd_osem_tip: "Creates a CSV-file for openSenseMap upload",
+  sensebox_sd_save_for_osem: "Save measurement",
+  sensebox_sd_save_for_osem_tip:
+    "Adds a measurement witht the corresponding Sensor ID to the CSV-file",
+  sensebox_sd_save_for_osem_id: "Sensor ID:",
+  sensebox_sd_measurement: "measurements",
+};

src/components/Blockly/msg/en/sensebox-sensors.js

@@ -1,5 +1,4 @@
 export const SENSORS = {
-
   /**
    * Sensors
    * ---------------------------------------------------
@@ -10,32 +9,42 @@ export const SENSORS = {
    * BMP280
    */
   senseBox_pressure_sensor: "Airpressure/Temperature Sensor (BMP280)",
-    senseBox_pressure: "Airpressure in Pa",
-    senseBox_pressure_dimension: "Airpressure in Pa",
-    senseBox_pressure_tip: "Connect the sensor to one of the 5 **I2C ports**. The sensor gives you the measured value for the air pressure in Pa. To calculate the correct altitude above sea level the sensor needs a current reference value.",
+  senseBox_pressure: "Airpressure in hPa",
+  senseBox_pressure_dimension: "Airpressure in hPa",
+  senseBox_pressure_tooltip:
+    "Connect the sensor to one of the 5 **I2C ports**. The sensor gives you the measured value for the air pressure in hPa. To calculate the correct altitude above sea level the sensor needs a current reference value.",
   senseBox_pressure_referencePressure: "Pressure at Sea Level",
   senseBox_pressure_referencePressure_dim: "hPa",
   senseBox_pressure_helpurl: "",
 
+  /**
+   * DPS310
+   */
+  senseBox_sensor_dps310: "Airpressure/Temperature Sensor (DPS310)",
+  senseBox_sensor_dps310_tooltip:
+    "Connect the sensor to one of the 5 **I2C ports**. The sensor gives you the measured value for the air pressure in hPa. To calculate the correct altitude above sea level the sensor needs a current reference value.",
 
   /**
    * Mikro
    */
   senseBox_sound: "Microphone",
-    senseBox_sound_tip: "Connect the sensor to one of the 3 **analog/digital** ports via the breadbord. Returns the reading of the microphone in volt",
-    senseBox_sound_helpurl: "https://en.docs.sensebox.de/hardware/sensoren-mikro/",
+  senseBox_sound_tip:
+    "Connect the sensor to one of the 3 **analog/digital** ports via the breadbord. Returns the reading of the microphone in volt",
+  senseBox_sound_helpurl:
+    "https://en.docs.sensebox.de/hardware/sensoren-mikro/",
 
   /**
    * Temperature and Humidity Sensor (HDC1080)
    */
   senseBox_temp: "Temperature in °C",
   senseBox_temp_hum: "Temperature/Humidity Sensor (HDC1080)",
-    senseBox_temp_hum_tooltip: "This block returns the temperature and humidity sensor readings. Connect the sensor to one of the 5 I2C ports. Measured value is output with 2 decimal places.",
-    senseBox_temp_hum_helpurl: "https://en.docs.sensebox.de/hardware/sensoren-temperatur-luftfeuchte/",
+  senseBox_temp_hum_tooltip:
+    "This block returns the temperature and humidity sensor readings. Connect the sensor to one of the 5 I2C ports. Measured value is output with 2 decimal places.",
+  senseBox_temp_hum_helpurl:
+    "https://en.docs.sensebox.de/hardware/sensoren-temperatur-luftfeuchte/",
   senseBox_hum: "humidity in %",
   senseBox_hum_tip: "Measures humidity in %",
 
-
   /**
    * Ultraschalldistanzsensor
    */
@@ -43,13 +52,16 @@ export const SENSORS = {
   senseBox_ultrasonic: "Ultrasonic distance sensor at Port",
   senseBox_ultrasonic_trigger: "Trigger",
   senseBox_ultrasonic_echo: "Echo",
+  senseBox_ultrasonic_maxDistance: "Max distance",
   senseBox_ultrasonic_port_A: "A",
   senseBox_ultrasonic_port_B: "B",
   senseBox_ultrasonic_port_C: "C",
   senseBox_ultrasonic_tooltip: `Measures the distance using ultrasound in cm. Connect the sensor to one of the three digital/analog ports:
 - Trigger: Green Cable
-- Echo: Yellow Cable`,
-    senseBox_ultrasonic_helpurl: "https://en.docs.sensebox.de/hardware/sensoren-distanz/",
+- Echo: Yellow Cable
+If the max distance is reached the a value of **O** will be returned`,
+  senseBox_ultrasonic_helpurl:
+    "https://en.docs.sensebox.de/hardware/sensoren-distanz/",
 
   /**
    * UV and Lightsensor
@@ -57,9 +69,11 @@ export const SENSORS = {
   senseBox_uv: "UV-Light in µW/cm²",
   senseBox_uv_light: "Light Visible + UV",
   senseBox_value: "Value:",
-    senseBox_uv_light_tooltip: "Sensor measures UV light or brightness. Brightness is output as **integer** in lux. UV intensity as **decimal** in µW/cm².",
+  senseBox_uv_light_tooltip:
+    "Sensor measures UV light or brightness. Brightness is output as **integer** in lux. UV intensity as **decimal** in µW/cm².",
   senseBox_light: "Illuminance in Lux",
-    senseBox_uv_light_helpurl: "https://en.docs.sensebox.de/hardware/sensoren-helligkeit-uv/",
+  senseBox_uv_light_helpurl:
+    "https://en.docs.sensebox.de/hardware/sensoren-helligkeit-uv/",
 
   /**
    * BMX055
@@ -86,7 +100,6 @@ export const SENSORS = {
   senseBox_bmx055_accelerometer_tooltip: `This block gives you the measurement value of the accelerometer which is soldered directly on the senseBox MCU. In the dropdown menu you can select the direction and the measuring range.`,
   senseBox_bmx055_helpurl: "",
 
-
   /**
    *
    * GPS
@@ -116,8 +129,25 @@ export const SENSORS = {
    * Soundsensor
    */
   senseBox_soundsensor_dfrobot: "Soundsensor (DF Robot)",
-    senseBox_soundsensor_dfrobot_tooltip: "Connect the sensor to one of the 3 **digital/analog ports**. The sensor will give you the reading in dB with one decimal.",
-    senseBox_soundsensor_dfrobot_helpurl: "https://en.docs.sensebox.de/hardware/sensoren-lautstaerke/",
+  senseBox_soundsensor_dfrobot_tooltip:
+    "Connect the sensor to one of the 3 **digital/analog ports**. The sensor will give you the reading in dB with one decimal.",
+  senseBox_soundsensor_dfrobot_helpurl:
+    "https://en.docs.sensebox.de/hardware/sensoren-lautstaerke/",
+
+  /*
+  * rainsensor hydreon rg-15
+  */
+  sensebox_rainsensor_hydreon_rg15: "Rainsensor (RG-15)",
+  sensebox_rainsensor_hydreon_rg15_port: "Serial Port:",
+  sensebox_rainsensor_hydreon_rg15_serial1: "Serial1",
+  sensebox_rainsensor_hydreon_rg15_serial2: "Serial2",
+  sensebox_rainsensor_hydreon_rg15_value: "value:",
+  sensebox_rainsensor_hydreon_rg15_totalAcc: "total Accumulation in mm",
+  sensebox_rainsensor_hydreon_rg15_rainInt: "Rainfall Intensity in mm/h",
+  sensebox_rainsensor_hydreon_rg15_eventAcc: "Accumulation per Event in mm",
+  sensebox_rainsensor_hydreon_rg15_acc: "Accumulation since last loop in mm",
+  sensebox_rainsensor_hydreon_rg15_tooltip: "Connect Rainsensor (RG-15) to one of the Serial ports.",
+  sensebox_rainsensor_hydreon_rg15_helpurl: "https://rainsensors.com/products/rg-15/",
 
   /*
    * BME680
@@ -137,21 +167,24 @@ The status of the calibration can be read from the calibration value. It is eith
 - IAQ Accuracy : 3 means sensor calibrated successfully.
 
 The measured values for temperature, humidity and air pressure can be used directly,`,
-    senseBox_bme680_helpurl: "https://en.docs.sensebox.de/hardware/sensoren-umweltsensor/",
-
+  senseBox_bme680_helpurl:
+    "https://en.docs.sensebox.de/hardware/sensoren-umweltsensor/",
 
   /**
    * Truebner SMT50
    */
   senseBox_smt50: "Soil Moisture and Temperature (SMT50)",
-    senseBox_smt50_helpurl: "https://docs.sensebox.de/hardware/sensoren-truebner/",
-    senseBox_smt50_tooltip: "Schließe den Bodenfeuchtigkeit- und Temperatursensor an einen der 3 digital/analog Ports an und wähle den Port im Block aus. Der Sensor gibt die Bodentemperatur in °C und die Bodenfeuchtigkeit in % aus.",
+  senseBox_smt50_helpurl:
+    "https://docs.sensebox.de/hardware/sensoren-truebner/",
+  senseBox_smt50_tooltip:
+    "Schließe den Bodenfeuchtigkeit- und Temperatursensor an einen der 3 digital/analog Ports an und wähle den Port im Block aus. Der Sensor gibt die Bodentemperatur in °C und die Bodenfeuchtigkeit in % aus.",
 
   /**
    * SCD30 CO2 Sensor
    */
   senseBox_scd30: "CO2 Sensor (Sensirion SCD30)",
-    senseBox_scd_tooltip: "Connect the sensor to one of the 5 **I2C ports**. The sensor will give you the reading for the CO2 concentration in ppm. The temperature reading may differ from the real value by a few degrees due to the measurement directly at the sensor.",
+  senseBox_scd_tooltip:
+    "Connect the sensor to one of the 5 **I2C ports**. The sensor will give you the reading for the CO2 concentration in ppm. The temperature reading may differ from the real value by a few degrees due to the measurement directly at the sensor.",
   senseBox_scd_co2: "CO2 in ppm",
   senseBox_scd_helpurl: "https://en.docs.sensebox.de/hardware/sensoren-co2/",
   /**
@@ -161,11 +194,12 @@ The measured values for temperature, humidity and air pressure can be used direc
   senseBox_sds011_dimension: "in µg/m³ at",
   senseBox_sds011_pm25: "PM2.5",
   senseBox_sds011_pm10: "PM10",
-    senseBox_sds011_tooltip: "This block gives you the reading of the fine dust sensor. Connect the fine dust sensor to one of the 2 **Serial/UART** ports. Select between PM2.5 and PM10 in the dropdown menu. The measured value will be displayed as **comma number** in µg/m3",
+  senseBox_sds011_tooltip:
+    "This block gives you the reading of the fine dust sensor. Connect the fine dust sensor to one of the 2 **Serial/UART** ports. Select between PM2.5 and PM10 in the dropdown menu. The measured value will be displayed as **comma number** in µg/m3",
   senseBox_sds011_serial1: "Serial1",
   senseBox_sds011_serial2: "Serial2",
-    senseBox_sds011_helpurl: "https://en.docs.sensebox.de/hardware/sensoren-feinstaub/",
-
+  senseBox_sds011_helpurl:
+    "https://en.docs.sensebox.de/hardware/sensoren-feinstaub/",
 
   /**
    * Button
@@ -174,6 +208,7 @@ The measured values for temperature, humidity and air pressure can be used direc
   senseBox_button_isPressed: "is Pressed",
   senseBox_button_switch: "as Switch",
   senseBox_button_wasPressed: "was Pressed",
+  senseBox_button_longPress: "Pressed for",
   senseBox_button_tooltip: `This block gives you the status of the connected button. In the dropdown menu you can select different modes for the button. Either the on board button or a button connected to one of the 6 digital pins can be controlled. different modes:
 - "is pressed": With this mode you can check if the block is currently pressed. You get either the value TRUE or FALSE.
 - "was pressed": With this mode you can query if the block was pressed. Only if the button was pressed and released you will get TRUE.
@@ -181,9 +216,8 @@ The measured values for temperature, humidity and air pressure can be used direc
 `,
   senseBox_button_helpurl: "",
 
-
   /**
    *
    */
   senseBox_watertemperature: "Water Temperature",
-}
+};

src/components/Blockly/msg/en/sensebox-web.js

@@ -4,8 +4,27 @@ export const WEB = {
    */
   senseBox_wifi_connect: "Connect to Wifi",
   senseBox_wifi_ssid: "Networkname",
-    senseBox_wifi_tooltip: "Connects to a wireless network. If you want to connect to an unsecured network (e.g. Freifunk) clear the password field. The WiFi-Bee must be plugged into the **XBEE1** slot.",
+  senseBox_wifi_ip: "IP-Address",
+  senseBox_wifi_ip_tooltip: "The IP-Address of the SenseBox",
+  senseBox_wifi_status: "Status",
+  senseBox_wifi_status_tooltip: "The status of the Wifi connection",
+  senseBox_wifi_rssi: "RSSI",
+  senseBox_wifi_rssi_tooltip: "The signal strength of the Wifi connection",
+  senseBox_wifi_tooltip:
+    "Connects to a wireless network. If you want to connect to an unsecured network (e.g. Freifunk) clear the password field. The WiFi-Bee must be plugged into the **XBEE1** slot.",
   senseBox_wifi_startap: "Initialize Wifi Access Point",
-    senseBox_wifi_startap_tooltip: "Creates a WiFi access point to which you can connect. Note that only 1 device can be connected at a time.",
-    senseBox_wifi_helpurl: "https://en.docs.sensebox.de/blockly/blockly-web-wifi/",
-}
+  senseBox_wifi_startap_tooltip:
+    "Creates a WiFi access point to which you can connect. Note that only 1 device can be connected at a time.",
+  senseBox_wifi_helpurl:
+    "https://en.docs.sensebox.de/blockly/blockly-web-wifi/",
+  senseBox_ethernet: "Connect to Ethernet",
+  senseBox_ethernet_dhcp: "DHCP",
+  senseBox_ethernet_manuel_config: "Manual configuration",
+  senseBox_ethernet_ip: "IP address",
+  senseBox_ethernet_gateway: "Gateway",
+  senseBox_ethernet_subnetmask: "Subnet mask",
+  senseBox_ethernet_mac: "MAC address",
+  senseBox_ethernet_dns: "DNS-Server",
+  senseBox_ethernet_tooltip:
+    "Connect the LAN-Bee to the XBEE1 slot. Most networks use DHCP and assign an IP address automatically. If you want to do a manual configuration select **Manual Configuration** in the dropdown menu and enter the appropriate data.",
+};

src/components/Blockly/msg/en/time.js

@@ -1,8 +1,8 @@
 export const TIME = {
-
   senseBox_interval: "ms",
-    senseBox_interval_timer: "Measuring interval",
-    senseBox_interval_timer_tip: "Setup an Intervall",
+  senseBox_interval_timer: "Interval: ",
+  senseBox_interval_timer_tip:
+    "Define an interval to be executed every x milliseconds",
   ARD_TIME_DELAY: "wait",
   ARD_TIME_DELAY_MICROS: "microseconds",
   ARD_TIME_DELAY_MICRO_TIP: "Wait specific time in microseconds",
@@ -10,8 +10,10 @@ export const TIME = {
   ARD_TIME_INF: "wait forever (end program)",
   ARD_TIME_INF_TIP: "Wait indefinitely, stopping the program.",
   ARD_TIME_MICROS: "current elapsed Time (microseconds)",
-    ARD_TIME_MICROS_TIP: "Returns the number of microseconds since the Arduino board began running the current program. Has to be stored in a positive long integer",
+  ARD_TIME_MICROS_TIP:
+    "Returns the number of microseconds since the Arduino board began running the current program. Has to be stored in a positive long integer",
   ARD_TIME_MILLIS: "current elapsed Time (milliseconds)",
-    ARD_TIME_MILLIS_TIP: "Returns the number of milliseconds since the Arduino board began running the current program. Has to be stored in a positive long integer",
+  ARD_TIME_MILLIS_TIP:
+    "Returns the number of milliseconds since the Arduino board began running the current program. Has to be stored in a positive long integer",
   ARD_TIME_MS: "milliseconds",
-}
+};

src/components/Blockly/msg/en/ui.js

@@ -10,6 +10,8 @@ export const UI = {
   toolbox_time: "Time",
   toolbox_functions: "Functions",
   toolbox_variables: "Variables",
+  toolbox_serial: "Serial",
+  toolbox_advanced: "Erweitert",
   variable_NUMBER: "Number (int)",
   variable_SHORT_NUMBER: "char",
   variable_LONG: " Zahl (long)",
@@ -49,6 +51,14 @@ export const UI = {
   tooltip_project_title: "Project title",
   tooltip_check_solution: "Check solution",
   tooltip_copy_code: "Copy Code to clipboard",
+  tooltip_statistics_current: "Number of current blocks",
+  tooltip_statistics_new: "Number of new blocks",
+  tooltip_statistics_changed: "Number of changed blocks",
+  tooltip_statistics_moved: "Number of moved blocks",
+  tooltip_statistics_deleted: "Number of deleted blocks",
+  tooltip_statistics_remaining: "Remaining blocks",
+  tooltip_statistics_show: "Show statistics",
+  tooltip_start_tour: "start Tour",
 
   /**
    * Messages
@@ -80,6 +90,15 @@ export const UI = {
   messages_login_error: "Enter both a username and a password.",
   messages_copy_code: "Copy code to clipboard succesfull",
 
+  /**
+   * Tablet Dialog
+   */
+  tabletDialog_headline: "Tablet mode is enabled!",
+  tabletDialog_text:
+    "Tablet mode has been activated. You can now copy program codes to your senseBox via the senseBox Connect app. Tablet mode can be deactivated in the settings",
+  tabletDialog_more:
+    "For more information and the link to download the app, please visit: ",
+
   /**
    * Reset Dialog
    */
@@ -149,6 +168,14 @@ export const UI = {
     "The display of statistics on the usage of the blocks above the workspace can be shown or hidden.",
   settings_statistics_on: "On",
   settings_statistics_off: "Off",
+  settings_ota_head: "Tablet mode",
+  settings_ota_text:
+    "Tablet mode disables the code display and enables the possibility to transfer the program code via the senseBox Connect app. You can find more information on: ",
+  settings_ota_on: "Activated",
+  settings_ota_off: "Deactivated",
+  settings_sounds: "Sound",
+  settings_sounds_text:
+    "Enable or disable sounds when adding and deleting blocks. Disabled by default",
 
   /**
    * 404
@@ -169,7 +196,7 @@ export const UI = {
   /**
    * Tutorials
    */
-
+  tutorials_home_head: "Tutorials",
   tutorials_assessment_task: "Task",
   tutorials_hardware_head:
     "For the implementation you need the following hardware:",
@@ -182,7 +209,9 @@ export const UI = {
   /**
    * Tutorial Builder
    */
-
+  uilder_createNew: "create new Tutorial",
+  builder_changeExisting: "change existing Tutorial",
+  builder_deleteExisting: "remove existing Tutorial",
   builder_solution: "Solution",
   builder_solution_submit: "Submit Solution",
   builder_example_submit: "Submit example",

src/components/Blockly/msg/en_old.js

@@ -544,7 +544,7 @@ Blockly.Msg.PROCEDURES_DEFRETURN_COMMENT =
 
 // Ardublockly strings
 Blockly.Msg.ARD_ANALOGREAD = "read analog pin#";
-Blockly.Msg.ARD_ANALOGREAD_TIP = "Return value between 0 and 1024";
+Blockly.Msg.ARD_ANALOGREAD_TIP = "Return value between 0 and 1023";
 Blockly.Msg.ARD_ANALOGWRITE = "set analog pin#";
 Blockly.Msg.ARD_ANALOGWRITE_TIP =
   "Write analog value between 0 and 255 to a specific PWM Port";
@@ -887,13 +887,13 @@ Blockly.Msg.senseBox_output_timestamp = "timestamp";
 Blockly.Msg.senseBox_piezo_tip = "simple piezo to make sound";
 Blockly.Msg.senseBox_poti = "Potentiometer";
 Blockly.Msg.senseBox_poti_tip = "Potentiometer";
-Blockly.Msg.senseBox_pressure = "Airpressure in Pa";
+Blockly.Msg.senseBox_pressure = "Airpressure in hPa";
 Blockly.Msg.senseBox_pressure_referencePressure = "Pressure at Sea Level";
 Blockly.Msg.senseBox_pressure_referencePressure_dim = "hPa";
 Blockly.Msg.senseBox_pressure_sensor =
   "Airpressure/Temperature Sensor (BMP280)";
 Blockly.Msg.senseBox_pressure_tip =
-  "airpressure sensor can measure the airpressure in Pa";
+  "airpressure sensor can measure the airpressure in hPa";
 Blockly.Msg.senseBox_rgb_led = "RGB-LED";
 Blockly.Msg.senseBox_rgb_led_tip = "RGB-LED";
 Blockly.Msg.senseBox_sd_create_file = "Create file on SD-Card";

src/components/Blockly/toolbox/Toolbox.js

@@ -65,6 +65,7 @@ class Toolbox extends React.Component {
           <Block type="sensebox_sensor_bmx055_accelerometer" />
           <Block type="sensebox_sensor_sds011" />
           <Block type="sensebox_sensor_pressure" />
+          <Block type="sensebox_sensor_dps310" />
           <Block type="sensebox_sensor_bme680_bsec" />
           <Block type="sensebox_scd30" />
           <Block type="sensebox_gps" />
@@ -75,6 +76,7 @@ class Toolbox extends React.Component {
           <Block type="sensebox_sensor_watertemperature" />
           {/* <Block type="sensebox_windspeed" /> */}
           <Block type="sensebox_soundsensor_dfrobot" />
+          <Block type="sensebox_rainsensor_hydreon_rg15" />
           <Block type="sensebox_multiplexer_init">
             <Value name="nrChannels">
               <Block type="math_number">
@@ -92,8 +94,15 @@ class Toolbox extends React.Component {
         </Category>
         <Category name="WIFI" colour={getColour().sensebox}>
           <Block type="sensebox_wifi" />
+          <Block type="sensebox_wifi_status" />
+          <Block type="sensebox_wifi_rssi" />
+          <Block type="sensebox_get_ip" />
           <Block type="sensebox_startap" />
         </Category>
+        <Category name="Ethernet" colour={getColour().sensebox}>
+          <Block type="sensebox_ethernet" />
+          <Block type="sensebox_ethernetIp" />
+        </Category>
         <Category name="SD" colour={getColour().sensebox}>
           <Block type="sensebox_sd_create_file" />
           <Block type="sensebox_sd_open_file">
@@ -102,6 +111,17 @@ class Toolbox extends React.Component {
             </Value>
           </Block>
           <Block type="sensebox_sd_write_file" />
+          <Block type="sensebox_sd_open_file">
+            <Value name="SD">
+              <Block type="sensebox_sd_osem">
+                <Value name="DO">
+                  <Block type="sensebox_sd_save_for_osem"></Block>
+                </Value>
+              </Block>
+            </Value>
+          </Block>
+          <Block type="sensebox_sd_osem" />
+          <Block type="sensebox_sd_save_for_osem" />
         </Category>
         <Category name="LED" colour={getColour().sensebox}>
           <Block type="sensebox_rgb_led"></Block>
@@ -279,12 +299,12 @@ class Toolbox extends React.Component {
             </Value>
           </Block>
         </Category>
-        <Category name="Telegram" colour={getColour().sensebox}>
+        {/* <Category name="Telegram" colour={getColour().sensebox}>
           <Block type="sensebox_telegram" />
           <Block type="sensebox_telegram_do" />
           <Block type="sensebox_telegram_do_on_message" />
           <Block type="sensebox_telegram_send" />
-        </Category>
+        </Category> */}
         <Category name="openSenseMap" colour={getColour().sensebox}>
           <Block type="sensebox_interval_timer">
             <Value name="DO">
@@ -357,6 +377,7 @@ class Toolbox extends React.Component {
             <Block type="sensebox_lora_cayenne_humidity" />
             <Block type="sensebox_lora_cayenne_pressure" />
             <Block type="sensebox_lora_cayenne_luminosity" />
+            <Block type="sensebox_lora_cayenne_concentration" />
             <Block type="sensebox_lora_cayenne_sensor" />
             <Block type="sensebox_lora_cayenne_accelerometer" />
             <Block type="sensebox_lora_cayenne_gps" />
@@ -583,17 +604,25 @@ class Toolbox extends React.Component {
           colour={getColour().variables}
           custom="CREATE_TYPED_VARIABLE"
         ></Category>
-        <Category name="Arrays" colour={getColour().arrays}>
+        {/* <Category name="Arrays" colour={getColour().arrays}>
           <Block type="lists_create_empty" />
           <Block type="array_getIndex" />
           <Block type="lists_length" />
-        </Category>
+        </Category> */}
         <Category
           name={Blockly.Msg.toolbox_functions}
           colour={getColour().procedures}
           custom="PROCEDURE"
         ></Category>
         <sep></sep>
+        <Category name={Blockly.Msg.toolbox_advanced} colour={getColour().io}>
+          <Category
+            name={Blockly.Msg.toolbox_serial}
+            colour={getColour().serial}
+          >
+            <Block type="init_serial_monitor"></Block>
+            <Block type="print_serial_monitor"></Block>
+          </Category>
           <Category name={Blockly.Msg.toolbox_io} colour={getColour().io}>
             <Block type="io_digitalwrite"></Block>
             <Block type="io_digitalread"></Block>
@@ -617,6 +646,11 @@ class Toolbox extends React.Component {
               </Value>
             </Block>
           </Category>
+          <Category name="Watchdog" colour={getColour().io}>
+            <Block type="watchdog_enable"></Block>
+            <Block type="watchdog_reset"></Block>
+          </Category>
+        </Category>
         {/* this block is the initial block of the workspace; not necessary
                     to display, because it can only be used once anyway
                 <Category name="Procedures" colour={getColour().procedures}>

src/components/Home.js

@@ -1,68 +1,78 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import { clearStats, workspaceName } from '../actions/workspaceActions';
+import React, { Component } from "react";
+import PropTypes from "prop-types";
+import { connect } from "react-redux";
+import { clearStats, workspaceName } from "../actions/workspaceActions";
 
-import * as Blockly from 'blockly/core';
-import { createNameId } from 'mnemonic-id';
+import * as Blockly from "blockly/core";
+import { createNameId } from "mnemonic-id";
 
-import WorkspaceStats from './Workspace/WorkspaceStats';
-import WorkspaceFunc from './Workspace/WorkspaceFunc';
-import BlocklyWindow from './Blockly/BlocklyWindow';
-import CodeViewer from './CodeViewer';
-import TrashcanButtons from './Workspace/TrashcanButtons';
-import HintTutorialExists from './Tutorial/HintTutorialExists';
-import Snackbar from './Snackbar';
+import WorkspaceStats from "./Workspace/WorkspaceStats";
+import WorkspaceFunc from "./Workspace/WorkspaceFunc";
+import BlocklyWindow from "./Blockly/BlocklyWindow";
+import CodeViewer from "./CodeViewer";
+import TrashcanButtons from "./Workspace/TrashcanButtons";
+import HintTutorialExists from "./Tutorial/HintTutorialExists";
 
-import Grid from '@material-ui/core/Grid';
-import IconButton from '@material-ui/core/IconButton';
-import Tooltip from '@material-ui/core/Tooltip';
-import { withStyles } from '@material-ui/core/styles';
+import Grid from "@material-ui/core/Grid";
+import IconButton from "@material-ui/core/IconButton";
+import Tooltip from "@material-ui/core/Tooltip";
+import { withStyles } from "@material-ui/core/styles";
 
 import { faCode } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import TooltipViewer from './TooltipViewer';
-
+import TooltipViewer from "./TooltipViewer";
+import Dialog from "./Dialog";
 
 const styles = (theme) => ({
   codeOn: {
     backgroundColor: theme.palette.primary.main,
     color: theme.palette.primary.contrastText,
-    '&:hover': {
+    "&:hover": {
       backgroundColor: theme.palette.primary.contrastText,
       color: theme.palette.primary.main,
-      border: `1px solid ${theme.palette.secondary.main}`
-    }
+      border: `1px solid ${theme.palette.secondary.main}`,
+    },
   },
   codeOff: {
     backgroundColor: theme.palette.primary.contrastText,
     color: theme.palette.primary.main,
     border: `1px solid ${theme.palette.secondary.main}`,
-    '&:hover': {
+    "&:hover": {
       backgroundColor: theme.palette.primary.main,
       color: theme.palette.primary.contrastText,
-    }
-  }
+    },
+  },
 });
 
-
 class Home extends Component {
-
-  state = {
+  constructor(props) {
+    super(props);
+    this.state = {
       codeOn: true,
       snackbar: false,
-    type: '',
-    key: '',
-    message: ''
+      type: "",
+      key: "",
+      message: "",
+      open: true,
+    };
   }
 
   componentDidMount() {
-    this.setState({ stats: window.localStorage.getItem('stats') });
+    console.log(this.props.platform);
+    if (this.props.platform === true) {
+      this.setState({ codeOn: false });
+    }
+    this.setState({ stats: window.localStorage.getItem("stats") });
     if (!this.props.project) {
       this.props.workspaceName(createNameId());
     }
-    if (this.props.message && this.props.message.id === 'GET_SHARE_FAIL') {
-      this.setState({ snackbar: true, key: Date.now(), message: `Das angefragte geteilte Projekt konnte nicht gefunden werden.`, type: 'error' });
+    if (this.props.message && this.props.message.id === "GET_SHARE_FAIL") {
+      this.setState({
+        snackbar: true,
+        key: Date.now(),
+        message: `Das angefragte geteilte Projekt konnte nicht gefunden werden.`,
+        type: "error",
+      });
     }
   }
 
@@ -80,6 +90,18 @@ class Home extends Component {
     this.props.workspaceName(null);
   }
 
+  toggleDialog = () => {
+    this.setState({ open: !this.state });
+  };
+
+  onChangeCheckbox = (e) => {
+    if (e.target.checked) {
+      window.localStorage.setItem("ota", e.target.checked);
+    } else {
+      window.localStorage.removeItem("ota");
+    }
+  };
+
   onChange = () => {
     this.setState({ codeOn: !this.state.codeOn });
     const workspace = Blockly.getMainWorkspace();
@@ -87,67 +109,122 @@ class Home extends Component {
     if (workspace.trashcan && workspace.trashcan.flyout) {
       workspace.trashcan.flyout.hide(); // in case of resize, the trash flyout does not reposition
     }
-  }
+  };
 
   render() {
     return (
       <div>
-        {this.props.statistics ?
-          <div style={{ float: 'left', height: '40px', position: 'relative' }}><WorkspaceStats /></div>
-          : null
-        }
-        <div className='workspaceFunc' style={{ float: 'right', height: '40px', marginBottom: '20px' }}>
-          <WorkspaceFunc project={this.props.project} projectType={this.props.projectType} />
+        {this.props.statistics ? (
+          <div style={{ float: "left", height: "40px", position: "relative" }}>
+            <WorkspaceStats />
+          </div>
+        ) : null}
+        <div
+          className="workspaceFunc"
+          style={{ float: "right", height: "40px", marginBottom: "20px" }}
+        >
+          <WorkspaceFunc
+            project={this.props.project}
+            projectType={this.props.projectType}
+          />
         </div>
         <Grid container spacing={2}>
-          <Grid item xs={12} md={this.state.codeOn ? 8 : 12} style={{ position: 'relative' }}>
-            <Tooltip title={this.state.codeOn ? 'Code ausblenden' : 'Code anzeigen'} >
+          <Grid
+            item
+            xs={12}
+            md={this.state.codeOn ? 8 : 12}
+            style={{ position: "relative" }}
+          >
+            <Tooltip
+              title={
+                this.state.codeOn
+                  ? Blockly.Msg.tooltip_hide_code
+                  : Blockly.Msg.tooltip_show_code
+              }
+            >
               <IconButton
-                className={`showCode ${this.state.codeOn ? this.props.classes.codeOn : this.props.classes.codeOff}`}
-                style={{ width: '40px', height: '40px', position: 'absolute', top: -12, right: 8, zIndex: 21 }}
+                className={`showCode ${
+                  this.state.codeOn
+                    ? this.props.classes.codeOn
+                    : this.props.classes.codeOff
+                }`}
+                style={{
+                  width: "40px",
+                  height: "40px",
+                  position: "absolute",
+                  top: -12,
+                  right: 8,
+                  zIndex: 21,
+                }}
                 onClick={() => this.onChange()}
               >
                 <FontAwesomeIcon icon={faCode} size="xs" />
               </IconButton>
             </Tooltip>
             <TrashcanButtons />
-            <div className='blocklyWindow'>
-              {this.props.project ?
-                < BlocklyWindow blocklyCSS={{ height: '80vH' }} initialXml={this.props.project.xml} />
-                : < BlocklyWindow blocklyCSS={{ height: '80vH' }} />
-              }
+            <div className="blocklyWindow">
+              {this.props.project ? (
+                <BlocklyWindow
+                  blocklyCSS={{ height: "80vH" }}
+                  initialXml={this.props.project.xml}
+                />
+              ) : (
+                <BlocklyWindow blocklyCSS={{ height: "80vH" }} />
+              )}
             </div>
           </Grid>
-          {this.state.codeOn ?
+          {this.state.codeOn ? (
             <Grid item xs={12} md={4}>
               <CodeViewer />
               <TooltipViewer />
             </Grid>
-            : null}
+          ) : null}
         </Grid>
         <HintTutorialExists />
-        <Snackbar
-          open={this.state.snackbar}
-          message={this.state.message}
-          type={this.state.type}
-          key={this.state.key}
-        />
+        {this.props.platform ? (
+          <Dialog
+            style={{ zIndex: 9999999 }}
+            fullWidth
+            maxWidth={"sm"}
+            open={this.state.open}
+            title={Blockly.Msg.tabletDialog_headline}
+            content={""}
+            onClose={this.toggleDialog}
+            onClick={this.toggleDialog}
+            button={Blockly.Msg.button_close}
+          >
+            <div>{Blockly.Msg.tabletDialog_text}</div>
+            <div>
+              {Blockly.Msg.tabletDialog_more}{" "}
+              <a
+                href="https://sensebox.de/app"
+                target="_blank"
+                rel="noreferrer"
+              >
+                https://sensebox.de/app
+              </a>
+            </div>
+          </Dialog>
+        ) : null}
       </div>
     );
-  };
+  }
 }
 
 Home.propTypes = {
   clearStats: PropTypes.func.isRequired,
   workspaceName: PropTypes.func.isRequired,
   message: PropTypes.object.isRequired,
-  statistics: PropTypes.bool.isRequired
+  statistics: PropTypes.bool.isRequired,
+  platform: PropTypes.object.isRequired,
 };
 
-const mapStateToProps = state => ({
+const mapStateToProps = (state) => ({
   message: state.message,
-  statistics: state.general.statistics
+  statistics: state.general.statistics,
+  platform: state.general.platform,
 });
 
-
-export default connect(mapStateToProps, { clearStats, workspaceName })(withStyles(styles, { withTheme: true })(Home));
+export default connect(mapStateToProps, { clearStats, workspaceName })(
+  withStyles(styles, { withTheme: true })(Home)
+);

src/components/Navbar.js

@@ -139,7 +139,7 @@ class Navbar extends Component {
               </Link>
             ) : null}
             {isHome ? (
-              <Tooltip title="Hilfe starten" arrow>
+              <Tooltip title={Blockly.Msg.tooltip_start_tour} arrow>
                 <IconButton
                   color="inherit"
                   className={`openTour ${this.props.classes.button}`}
@@ -153,7 +153,7 @@ class Navbar extends Component {
               </Tooltip>
             ) : null}
             {isAssessment ? (
-              <Tooltip title="Hilfe starten" arrow>
+              <Tooltip title={Blockly.Msg.tooltip_start_tour} arrow>
                 <IconButton
                   color="inherit"
                   className={`openTour ${this.props.classes.button}`}

src/components/Settings/OtaSelector.js

@@ -0,0 +1,66 @@
+import React, { Component } from "react";
+import PropTypes from "prop-types";
+import { connect } from "react-redux";
+import { setPlatform } from "../../actions/generalActions";
+
+import * as Blockly from "blockly/core";
+
+import InputLabel from "@material-ui/core/InputLabel";
+import MenuItem from "@material-ui/core/MenuItem";
+import FormControl from "@material-ui/core/FormControl";
+import Select from "@material-ui/core/Select";
+import Typography from "@material-ui/core/Typography";
+import FormHelperText from "@material-ui/core/FormHelperText";
+
+class OtaSelector extends Component {
+  componentDidMount() {
+    // Ensure that Blockly.setLocale is adopted in the component.
+    // Otherwise, the text will not be displayed until the next update of the component.
+    this.forceUpdate();
+  }
+
+  render() {
+    return (
+      <div>
+        <Typography style={{ fontWeight: "bold" }}>
+          {Blockly.Msg.settings_ota_head}
+        </Typography>
+        <FormHelperText
+          style={{ color: "black", lineHeight: 1.3, marginBottom: "8px" }}
+        >
+          {Blockly.Msg.settings_ota_text}
+          <a href="https://sensebox.de/app" target="_blank" rel="noreferrer">
+            https://sensebox.de/app
+          </a>
+        </FormHelperText>
+        <FormControl>
+          <InputLabel id="demo-simple-select-label">
+            {Blockly.Msg.settings_statistics}
+          </InputLabel>
+          <Select
+            labelId="demo-simple-select-label"
+            id="demo-simple-select"
+            value={this.props.platform}
+            onChange={(e) => this.props.setPlatform(e.target.value)}
+          >
+            <MenuItem value={true}>{Blockly.Msg.settings_ota_on}</MenuItem>
+            <MenuItem value={false}>{Blockly.Msg.settings_ota_off}</MenuItem>
+          </Select>
+        </FormControl>
+      </div>
+    );
+  }
+}
+
+OtaSelector.propTypes = {
+  setPlatform: PropTypes.func.isRequired,
+  language: PropTypes.string.isRequired,
+  platform: PropTypes.bool.isRequired,
+};
+
+const mapStateToProps = (state) => ({
+  language: state.general.language,
+  platform: state.general.platform,
+});
+
+export default connect(mapStateToProps, { setPlatform })(OtaSelector);

src/components/Settings/Settings.js

@@ -1,22 +1,23 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
+import React, { Component } from "react";
+import PropTypes from "prop-types";
+import { connect } from "react-redux";
 
-import { withRouter } from 'react-router-dom';
+import { withRouter } from "react-router-dom";
 
-import * as Blockly from 'blockly/core';
+import * as Blockly from "blockly/core";
 
-import Breadcrumbs from '../Breadcrumbs';
-import LanguageSelector from './LanguageSelector';
-import RenderSelector from './RenderSelector';
-import StatsSelector from './StatsSelector';
+import Breadcrumbs from "../Breadcrumbs";
+import LanguageSelector from "./LanguageSelector";
+import RenderSelector from "./RenderSelector";
+import StatsSelector from "./StatsSelector";
+import OtaSelector from "./OtaSelector";
+import SoundsSelector from "./SoundsSelector";
 
-import Button from '@material-ui/core/Button';
-import Paper from '@material-ui/core/Paper';
+import Button from "@material-ui/core/Button";
+import Paper from "@material-ui/core/Paper";
 
 class Settings extends Component {
-
-  componentDidMount(){
+  componentDidMount() {
     // Ensure that Blockly.setLocale is adopted in the component.
     // Otherwise, the text will not be displayed until the next update of the component.
     this.forceUpdate();
@@ -25,41 +26,58 @@ class Settings extends Component {
   render() {
     return (
       <div>
-        <Breadcrumbs content={[{ link: this.props.location.pathname, title: Blockly.Msg.settings_head }]} />
+        <Breadcrumbs
+          content={[
+            {
+              link: this.props.location.pathname,
+              title: Blockly.Msg.settings_head,
+            },
+          ]}
+        />
 
         <h1>{Blockly.Msg.settings_head}</h1>
 
-        <Paper style={{margin: '10px 0px', padding: '10px'}}>
+        <Paper style={{ margin: "10px 0px", padding: "10px" }}>
           <LanguageSelector />
         </Paper>
-        <Paper style={{margin: '10px 0px', padding: '10px'}}>
+        <Paper style={{ margin: "10px 0px", padding: "10px" }}>
           <RenderSelector />
         </Paper>
-        <Paper style={{margin: '10px 0px', padding: '10px'}}>
+        <Paper style={{ margin: "10px 0px", padding: "10px" }}>
           <StatsSelector />
         </Paper>
+        <Paper style={{ margin: "10px 0px", padding: "10px" }}>
+          <OtaSelector />
+        </Paper>
+        <Paper style={{ margin: "10px 0px", padding: "10px" }}>
+          <SoundsSelector />
+        </Paper>
 
         <Button
-          style={{ marginTop: '10px' }}
+          style={{ marginTop: "10px" }}
           variant="contained"
           color="primary"
-          onClick={this.props.pageVisits > 0 ? () => this.props.history.goBack() : () => this.props.history.push('/')}
+          onClick={
+            this.props.pageVisits > 0
+              ? () => this.props.history.goBack()
+              : () => this.props.history.push("/")
+          }
         >
           {Blockly.Msg.button_back}
         </Button>
       </div>
     );
-  };
+  }
 }
 
 Settings.propTypes = {
   language: PropTypes.string.isRequired,
-  pageVisits: PropTypes.number.isRequired
+  pageVisits: PropTypes.number.isRequired,
 };
 
-const mapStateToProps = state => ({
+const mapStateToProps = (state) => ({
   language: state.general.language,
-  pageVisits: state.general.pageVisits
+  pageVisits: state.general.pageVisits,
 });
 
 export default connect(mapStateToProps, null)(withRouter(Settings));

src/components/Settings/SoundsSelector.js

@@ -0,0 +1,63 @@
+import React, { Component } from "react";
+import PropTypes from "prop-types";
+import { connect } from "react-redux";
+import { setSounds } from "../../actions/generalActions";
+
+import * as Blockly from "blockly/core";
+
+import InputLabel from "@material-ui/core/InputLabel";
+import MenuItem from "@material-ui/core/MenuItem";
+import FormControl from "@material-ui/core/FormControl";
+import Select from "@material-ui/core/Select";
+import Typography from "@material-ui/core/Typography";
+import FormHelperText from "@material-ui/core/FormHelperText";
+
+class SoundsSelector extends Component {
+  componentDidMount() {
+    // Ensure that Blockly.setLocale is adopted in the component.
+    // Otherwise, the text will not be displayed until the next update of the component.
+    this.forceUpdate();
+  }
+
+  render() {
+    return (
+      <div>
+        <Typography style={{ fontWeight: "bold" }}>
+          {Blockly.Msg.settings_sounds}
+        </Typography>
+        <FormHelperText
+          style={{ color: "black", lineHeight: 1.3, marginBottom: "8px" }}
+        >
+          {Blockly.Msg.settings_sounds_text}
+        </FormHelperText>
+        <FormControl>
+          <InputLabel id="demo-simple-select-label">
+            {Blockly.Msg.settings_sounds}
+          </InputLabel>
+          <Select
+            labelId="demo-simple-select-label"
+            id="demo-simple-select"
+            value={this.props.sounds}
+            onChange={(e) => this.props.setSounds(e.target.value)}
+          >
+            <MenuItem value={false}>{Blockly.Msg.settings_ota_off}</MenuItem>
+            <MenuItem value={true}>{Blockly.Msg.settings_ota_on}</MenuItem>
+          </Select>
+        </FormControl>
+      </div>
+    );
+  }
+}
+
+SoundsSelector.propTypes = {
+  setSounds: PropTypes.func.isRequired,
+  language: PropTypes.string.isRequired,
+  sounds: PropTypes.string.isRequired,
+};
+
+const mapStateToProps = (state) => ({
+  sounds: state.general.sounds,
+  language: state.general.language,
+});
+
+export default connect(mapStateToProps, { setSounds })(SoundsSelector);

src/components/Tutorial/Builder/Builder.js

@@ -39,6 +39,7 @@ import InputLabel from "@material-ui/core/InputLabel";
 import MenuItem from "@material-ui/core/MenuItem";
 import FormControl from "@material-ui/core/FormControl";
 import Select from "@material-ui/core/Select";
+import * as Blockly from "blockly";
 
 const styles = (theme) => ({
   backdrop: {
@@ -392,7 +393,7 @@ class Builder extends Component {
             style={{ color: "black" }}
             value="new"
             control={<Radio color="primary" />}
-            label="neues Tutorial erstellen"
+            label={Blockly.Msg.builder_createNew}
             labelPlacement="end"
           />
           {filteredTutorials.length > 0 ? (
@@ -402,7 +403,7 @@ class Builder extends Component {
                 disabled={this.props.index === 0}
                 value="change"
                 control={<Radio color="primary" />}
-                label="bestehendes Tutorial ändern"
+                label={Blockly.Msg.builder_changeExisting}
                 labelPlacement="end"
               />
               <FormControlLabel
@@ -410,7 +411,7 @@ class Builder extends Component {
                 disabled={this.props.index === 0}
                 value="delete"
                 control={<Radio color="primary" />}
-                label="bestehendes Tutorial löschen"
+                label={Blockly.Msg.builder_deleteExisting}
                 labelPlacement="end"
               />
             </div>

src/components/Tutorial/TutorialHome.js

@@ -1,129 +1,224 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import { getTutorials, resetTutorial, tutorialProgress } from '../../actions/tutorialActions';
-import { clearMessages } from '../../actions/messageActions';
+import React, { Component } from "react";
+import PropTypes from "prop-types";
+import { connect } from "react-redux";
+import {
+  getTutorials,
+  resetTutorial,
+  tutorialProgress,
+} from "../../actions/tutorialActions";
+import { clearMessages } from "../../actions/messageActions";
 
-import clsx from 'clsx';
+import clsx from "clsx";
 
-import Breadcrumbs from '../Breadcrumbs';
+import Breadcrumbs from "../Breadcrumbs";
 
-import { Link } from 'react-router-dom';
+import { Link } from "react-router-dom";
 
-import { fade } from '@material-ui/core/styles/colorManipulator';
-import { withStyles } from '@material-ui/core/styles';
-import Grid from '@material-ui/core/Grid';
-import Paper from '@material-ui/core/Paper';
-import Typography from '@material-ui/core/Typography';
+import { fade } from "@material-ui/core/styles/colorManipulator";
+import { withStyles } from "@material-ui/core/styles";
+import Grid from "@material-ui/core/Grid";
+import Paper from "@material-ui/core/Paper";
+import Typography from "@material-ui/core/Typography";
 
 import { faCheck, faTimes } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import * as Blockly from "blockly";
 
 const styles = (theme) => ({
   outerDiv: {
-    position: 'absolute',
-    right: '-30px',
-    bottom: '-30px',
-    width: '160px',
-    height: '160px',
-    color: fade(theme.palette.secondary.main, 0.6)
+    position: "absolute",
+    right: "-30px",
+    bottom: "-30px",
+    width: "160px",
+    height: "160px",
+    color: fade(theme.palette.secondary.main, 0.6),
   },
   outerDivError: {
     stroke: fade(theme.palette.error.dark, 0.6),
-    color: fade(theme.palette.error.dark, 0.6)
+    color: fade(theme.palette.error.dark, 0.6),
   },
   outerDivSuccess: {
     stroke: fade(theme.palette.primary.main, 0.6),
-    color: fade(theme.palette.primary.main, 0.6)
+    color: fade(theme.palette.primary.main, 0.6),
   },
   outerDivOther: {
-    stroke: fade(theme.palette.secondary.main, 0.6)
+    stroke: fade(theme.palette.secondary.main, 0.6),
   },
   innerDiv: {
-    width: 'inherit',
-    height: 'inherit',
-    display: 'table-cell',
-    verticalAlign: 'middle',
-    textAlign: 'center'
-  }
+    width: "inherit",
+    height: "inherit",
+    display: "table-cell",
+    verticalAlign: "middle",
+    textAlign: "center",
+  },
 });
 
-
 class TutorialHome extends Component {
-
   componentDidMount() {
     this.props.tutorialProgress();
     // retrieve tutorials only if a potential user is loaded - authentication
     // is finished (success or failed)
-    if(!this.props.progress){
+    if (!this.props.progress) {
       this.props.getTutorials();
     }
   }
 
   componentDidUpdate(props, state) {
-    if(props.progress !== this.props.progress && !this.props.progress){
+    if (props.progress !== this.props.progress && !this.props.progress) {
       // authentication is completed
       this.props.getTutorials();
     }
-    if(this.props.message.id === 'GET_TUTORIALS_FAIL'){
+    if (this.props.message.id === "GET_TUTORIALS_FAIL") {
       alert(this.props.message.msg);
     }
   }
 
   componentWillUnmount() {
     this.props.resetTutorial();
-    if(this.props.message.msg){
+    if (this.props.message.msg) {
       this.props.clearMessages();
     }
   }
 
   render() {
-    return (
-      this.props.isLoading ? null :
+    return this.props.isLoading ? null : (
       <div>
-        <Breadcrumbs content={[{ link: '/tutorial', title: 'Tutorial' }]} />
+        <Breadcrumbs content={[{ link: "/tutorial", title: "Tutorial" }]} />
 
-        <h1>Tutorial-Übersicht</h1>
+        <h1>{Blockly.Msg.tutorials_home_head}</h1>
         <Grid container spacing={2}>
           {this.props.tutorials.map((tutorial, i) => {
-            var status = this.props.status.filter(status => status._id === tutorial._id)[0];
+            var status = this.props.status.filter(
+              (status) => status._id === tutorial._id
+            )[0];
             var tasks = status.tasks;
-            var error = status.tasks.filter(task => task.type === 'error').length > 0;
-            var success = status.tasks.filter(task => task.type === 'success').length / tasks.length
-            var tutorialStatus = success === 1 ? 'Success' : error ? 'Error' : 'Other';
+            var error =
+              status.tasks.filter((task) => task.type === "error").length > 0;
+            var success =
+              status.tasks.filter((task) => task.type === "success").length /
+              tasks.length;
+            var tutorialStatus =
+              success === 1 ? "Success" : error ? "Error" : "Other";
             return (
               <Grid item xs={12} sm={6} md={4} xl={3} key={i} style={{}}>
-                <Link to={`/tutorial/${tutorial._id}`} style={{ textDecoration: 'none', color: 'inherit' }}>
-                  <Paper style={{ height: '150px', padding: '10px', position: 'relative', overflow: 'hidden' }}>
+                <Link
+                  to={`/tutorial/${tutorial._id}`}
+                  style={{ textDecoration: "none", color: "inherit" }}
+                >
+                  <Paper
+                    style={{
+                      height: "150px",
+                      padding: "10px",
+                      position: "relative",
+                      overflow: "hidden",
+                    }}
+                  >
                     {tutorial.title}
-                    <div className={clsx(this.props.classes.outerDiv)} style={{ width: '160px', height: '160px', border: 0 }}>
-                      <svg style={{ width: '100%', height: '100%' }}>
-                        {error || success === 1 ?
-                          <circle className={error ? this.props.classes.outerDivError : this.props.classes.outerDivSuccess} style={{ transform: 'rotate(-44deg)', transformOrigin: "50% 50%" }} r="75" cx="50%" cy="50%" fill="none" stroke-width="10"></circle>
-                          : <circle className={this.props.classes.outerDivOther} style={{ transform: 'rotate(-44deg)', transformOrigin: "50% 50%" }} r="75" cx="50%" cy="50%" fill="none" stroke-width="10" stroke-dashoffset={`${(75 * 2 * Math.PI) * (1 - (50 / 100 + success / 2))}`} stroke-dasharray={`${(75 * 2 * Math.PI) * (1 - (50 / 100 - success / 2))} ${(75 * 2 * Math.PI) * (1 - (50 / 100 + success / 2))}`}></circle>}
-                        {success < 1 && !error ?
-                          <circle className={this.props.classes.outerDivSuccess} style={{ transform: 'rotate(-44deg)', transformOrigin: "50% 50%" }} r="75" cx="50%" cy="50%" fill="none" stroke-width="10" stroke-dashoffset={`${(75 * 2 * Math.PI) * (1 - (50 / 100 + success / 2))}`} stroke-dasharray={`${(75 * 2 * Math.PI)}`}>
-                          </circle>
-                          : null}
+                    <div
+                      className={clsx(this.props.classes.outerDiv)}
+                      style={{ width: "160px", height: "160px", border: 0 }}
+                    >
+                      <svg style={{ width: "100%", height: "100%" }}>
+                        {error || success === 1 ? (
+                          <circle
+                            className={
+                              error
+                                ? this.props.classes.outerDivError
+                                : this.props.classes.outerDivSuccess
+                            }
+                            style={{
+                              transform: "rotate(-44deg)",
+                              transformOrigin: "50% 50%",
+                            }}
+                            r="75"
+                            cx="50%"
+                            cy="50%"
+                            fill="none"
+                            stroke-width="10"
+                          ></circle>
+                        ) : (
+                          <circle
+                            className={this.props.classes.outerDivOther}
+                            style={{
+                              transform: "rotate(-44deg)",
+                              transformOrigin: "50% 50%",
+                            }}
+                            r="75"
+                            cx="50%"
+                            cy="50%"
+                            fill="none"
+                            stroke-width="10"
+                            stroke-dashoffset={`${
+                              75 * 2 * Math.PI * (1 - (50 / 100 + success / 2))
+                            }`}
+                            stroke-dasharray={`${
+                              75 * 2 * Math.PI * (1 - (50 / 100 - success / 2))
+                            } ${
+                              75 * 2 * Math.PI * (1 - (50 / 100 + success / 2))
+                            }`}
+                          ></circle>
+                        )}
+                        {success < 1 && !error ? (
+                          <circle
+                            className={this.props.classes.outerDivSuccess}
+                            style={{
+                              transform: "rotate(-44deg)",
+                              transformOrigin: "50% 50%",
+                            }}
+                            r="75"
+                            cx="50%"
+                            cy="50%"
+                            fill="none"
+                            stroke-width="10"
+                            stroke-dashoffset={`${
+                              75 * 2 * Math.PI * (1 - (50 / 100 + success / 2))
+                            }`}
+                            stroke-dasharray={`${75 * 2 * Math.PI}`}
+                          ></circle>
+                        ) : null}
                       </svg>
                     </div>
-                    <div className={clsx(this.props.classes.outerDiv, tutorialStatus === 'Error' ? this.props.classes.outerDivError : tutorialStatus === 'Success' ? this.props.classes.outerDivSuccess : null)}>
+                    <div
+                      className={clsx(
+                        this.props.classes.outerDiv,
+                        tutorialStatus === "Error"
+                          ? this.props.classes.outerDivError
+                          : tutorialStatus === "Success"
+                          ? this.props.classes.outerDivSuccess
+                          : null
+                      )}
+                    >
                       <div className={this.props.classes.innerDiv}>
-                        {error || success === 1 ?
-                          <FontAwesomeIcon size='4x' icon={tutorialStatus === 'Success' ? faCheck : faTimes} />
-                          : <Typography variant='h3' className={success > 0 ? this.props.classes.outerDivSuccess : {}}>{Math.round(success * 100)}%</Typography>
+                        {error || success === 1 ? (
+                          <FontAwesomeIcon
+                            size="4x"
+                            icon={
+                              tutorialStatus === "Success" ? faCheck : faTimes
                             }
+                          />
+                        ) : (
+                          <Typography
+                            variant="h3"
+                            className={
+                              success > 0
+                                ? this.props.classes.outerDivSuccess
+                                : {}
+                            }
+                          >
+                            {Math.round(success * 100)}%
+                          </Typography>
+                        )}
                       </div>
                     </div>
                   </Paper>
                 </Link>
               </Grid>
-            )
+            );
           })}
         </Grid>
       </div>
     );
-  };
+  }
 }
 
 TutorialHome.propTypes = {
@@ -136,16 +231,21 @@ TutorialHome.propTypes = {
   tutorials: PropTypes.array.isRequired,
   isLoading: PropTypes.bool.isRequired,
   message: PropTypes.object.isRequired,
-  progress: PropTypes.bool.isRequired
+  progress: PropTypes.bool.isRequired,
 };
 
-const mapStateToProps = state => ({
+const mapStateToProps = (state) => ({
   change: state.tutorial.change,
   status: state.tutorial.status,
   tutorials: state.tutorial.tutorials,
   isLoading: state.tutorial.progress,
   message: state.message,
-  progress: state.auth.progress
+  progress: state.auth.progress,
 });
 
-export default connect(mapStateToProps, { getTutorials, resetTutorial, clearMessages, tutorialProgress })(withStyles(styles, { withTheme: true })(TutorialHome));
+export default connect(mapStateToProps, {
+  getTutorials,
+  resetTutorial,
+  clearMessages,
+  tutorialProgress,
+})(withStyles(styles, { withTheme: true })(TutorialHome));

src/components/User/Login.js

@@ -124,6 +124,7 @@ export class Login extends Component {
             type={this.state.type}
             key={this.state.key}
           />
+          <form onSubmit={this.onSubmit}>
             <TextField
               style={{ marginBottom: "10px" }}
               // variant='outlined'
@@ -163,7 +164,7 @@ export class Login extends Component {
               <Button
                 color="primary"
                 variant="contained"
-              onClick={this.onSubmit}
+                type="submit"
                 style={{ width: "100%" }}
               >
                 {this.props.progress ? (
@@ -175,6 +176,7 @@ export class Login extends Component {
                 )}
               </Button>
             </p>
+          </form>
           <p style={{ textAlign: "center", fontSize: "0.8rem" }}>
             <Link
               rel="noreferrer"

src/components/Workspace/Compile.js

@@ -21,6 +21,7 @@ import "prismjs/themes/prism.css";
 import "prismjs/plugins/line-numbers/prism-line-numbers";
 import "prismjs/plugins/line-numbers/prism-line-numbers.css";
 import MuiDrawer from "@material-ui/core/Drawer";
+import Dialog from "../Dialog";
 
 const styles = (theme) => ({
   backdrop: {
@@ -65,6 +66,8 @@ class Compile extends Component {
       content: "",
       name: props.name,
       error: "",
+      appLink: "",
+      appDialog: false,
     };
   }
 
@@ -126,10 +129,19 @@ class Compile extends Component {
   };
 
   toggleDialog = () => {
-    this.setState({ open: !this.state, progress: false });
+    this.setState({ open: !this.state, progress: false, appDialog: false });
   };
 
   createFileName = () => {
+    if (this.props.platform === true) {
+      const filename = detectWhitespacesAndReturnReadableResult(
+        this.state.name
+      );
+      this.setState({
+        link: `blocklyconnect-app://sketch/${filename}/${this.state.id}`,
+      });
+      this.setState({ appDialog: true });
+    } else {
       if (this.state.name) {
         this.download();
       } else {
@@ -141,6 +153,19 @@ class Compile extends Component {
             "Bitte gib einen Namen für die Bennenung des zu kompilierenden Programms ein und bestätige diesen mit einem Klick auf 'Eingabe'.",
         });
       }
+    }
+
+    // if (this.state.name) {
+    //   this.download();
+    // } else {
+    //   this.setState({
+    //     file: true,
+    //     open: true,
+    //     title: "Projekt kompilieren",
+    //     content:
+    //       "Bitte gib einen Namen für die Bennenung des zu kompilierenden Programms ein und bestätige diesen mit einem Klick auf 'Eingabe'.",
+    //   });
+    // }
   };
 
   setFileName = (e) => {
@@ -188,6 +213,8 @@ class Compile extends Component {
             Kompilieren
           </Button>
         )}
+
+        {this.props.platform === false ? (
           <Backdrop
             className={this.props.classes.backdrop}
             open={this.state.progress}
@@ -205,6 +232,25 @@ class Compile extends Component {
               <CircularProgress color="inherit" />
             </div>
           </Backdrop>
+        ) : (
+          <Backdrop
+            className={this.props.classes.backdrop}
+            open={this.state.progress}
+          >
+            <div className="overlay">
+              {/* <img src={Copy} width="400" alt="copyimage"></img> */}
+              <h2>Dein Code wird kompiliert!</h2>
+              <p>übertrage ihn anschließend mithlfe der senseBoxConnect-App</p>
+              <p>
+                {Blockly.Msg.compile_overlay_help}
+                <a href="/faq" target="_blank">
+                  FAQ
+                </a>
+              </p>
+              <CircularProgress color="inherit" />
+            </div>
+          </Backdrop>
+        )}
         <Drawer
           anchor={"bottom"}
           open={this.state.open}
@@ -240,29 +286,35 @@ class Compile extends Component {
             {`${this.state.error}`}{" "}
           </p>
         </Drawer>
-        {/* <Dialog
-          open={this.state.open}
-          title={this.state.title}
-          content={this.state.content}
+        <Dialog
+          style={{ zIndex: 9999999 }}
+          fullWidth
+          maxWidth={"sm"}
+          open={this.state.appDialog}
+          title=""
+          content={""}
           onClose={this.toggleDialog}
-          onClick={this.state.file ? () => { this.toggleDialog(); this.setState({ name: this.props.name }) } : this.toggleDialog}
-          button={this.state.file ? Blockly.Msg.button_cancel : Blockly.Msg.button_close}
+          onClick={this.toggleDialog}
+          button={Blockly.Msg.button_close}
         >
-          {this.state.file ?
-            <div style={{ marginTop: '10px' }}>
-              <TextField autoFocus placeholder='Dateiname' value={this.state.name} onChange={this.setFileName} style={{ marginRight: '10px' }} />
-              <Button disabled={!this.state.name} variant='contained' color='primary' onClick={() => this.download()}>Eingabe</Button>
+          <div>
+            <p>Dein Code wurde erfolgreich kompiliert</p>
+            <a href={this.state.link}>
+              <Button
+                style={{ color: "white" }}
+                variant="contained"
+                className={this.props.classes.button}
+                onClick={() => this.toggleDialog()}
+              >
+                <FontAwesomeIcon
+                  icon={faClipboardCheck}
+                  style={{ marginRight: "5px" }}
+                />{" "}
+                Starte Übertragung
+              </Button>
+            </a>
           </div>
-            : 
-           
-        <pre className="line-numbers" style={{ paddingBottom: 0, width: '100%', overflow: 'auto', scrollbarWidth: 'thin', height: '100%', margin: '15px 0', paddingTop: 0, whiteSpace: 'pre-wrap', backgroundColor: 'white' }}><code className="language-json">
-                {`${this.state.error}`}
-              </code></pre>
-        </AccordionDetails>
-      </Accordion>
-      
-            }
-        </Dialog> */}
+        </Dialog>
       </div>
     );
   }
@@ -272,11 +324,13 @@ Compile.propTypes = {
   arduino: PropTypes.string.isRequired,
   name: PropTypes.string,
   workspaceName: PropTypes.func.isRequired,
+  platform: PropTypes.bool.isRequired,
 };
 
 const mapStateToProps = (state) => ({
   arduino: state.workspace.code.arduino,
   name: state.workspace.name,
+  platform: state.general.platform,
 });
 
 export default connect(mapStateToProps, { workspaceName })(

src/components/Workspace/WorkspaceStats.js

@@ -1,117 +1,176 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
+import React, { Component } from "react";
+import PropTypes from "prop-types";
+import { connect } from "react-redux";
 
-import * as Blockly from 'blockly/core';
+import * as Blockly from "blockly/core";
 
-import withWidth, { isWidthDown } from '@material-ui/core/withWidth';
-import { withStyles } from '@material-ui/core/styles';
-import Tooltip from '@material-ui/core/Tooltip';
-import IconButton from '@material-ui/core/IconButton';
-import Chip from '@material-ui/core/Chip';
-import Avatar from '@material-ui/core/Avatar';
-import Popover from '@material-ui/core/Popover';
+import withWidth, { isWidthDown } from "@material-ui/core/withWidth";
+import { withStyles } from "@material-ui/core/styles";
+import Tooltip from "@material-ui/core/Tooltip";
+import IconButton from "@material-ui/core/IconButton";
+import Chip from "@material-ui/core/Chip";
+import Avatar from "@material-ui/core/Avatar";
+import Popover from "@material-ui/core/Popover";
 
-import { faPuzzlePiece, faTrash, faPlus, faPen, faArrowsAlt, faEllipsisH } from "@fortawesome/free-solid-svg-icons";
+import {
+  faPuzzlePiece,
+  faTrash,
+  faPlus,
+  faPen,
+  faArrowsAlt,
+  faEllipsisH,
+} from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
 const styles = (theme) => ({
   stats: {
     backgroundColor: theme.palette.primary.main,
-    display: 'inline',
-    marginLeft: '50px',
-    padding: '3px 10px',
+    display: "inline",
+    marginLeft: "50px",
+    padding: "3px 10px",
     // borderRadius: '25%'
   },
   menu: {
     backgroundColor: theme.palette.secondary.main,
     color: theme.palette.secondary.contrastText,
-    width: '40px',
-    height: '40px',
-    '&:hover': {
+    width: "40px",
+    height: "40px",
+    "&:hover": {
       backgroundColor: theme.palette.secondary.main,
       color: theme.palette.primary.main,
-    }
-  }
+    },
+  },
 });
 
 class WorkspaceStats extends Component {
-
   state = {
-    anchor: null
-  }
+    anchor: null,
+  };
 
   handleClose = () => {
     this.setState({ anchor: null });
-  }
+  };
 
   handleClick = (event) => {
     this.setState({ anchor: event.currentTarget });
   };
 
   render() {
-
-    const bigDisplay = !isWidthDown('sm', this.props.width);
+    const bigDisplay = !isWidthDown("sm", this.props.width);
     const workspace = Blockly.getMainWorkspace();
-    const remainingBlocksInfinity = workspace ? workspace.remainingCapacity() !== Infinity : null;
-    const stats = <div style={bigDisplay ? { display: 'flex' } : { display: 'inline' }}>
-      <Tooltip title="Anzahl aktueller Blöcke" arrow>
+    const remainingBlocksInfinity = workspace
+      ? workspace.remainingCapacity() !== Infinity
+      : null;
+    const stats = (
+      <div style={bigDisplay ? { display: "flex" } : { display: "inline" }}>
+        <Tooltip title={Blockly.Msg.tooltip_statistics_current} arrow>
           <Chip
-          style={bigDisplay ? { marginRight: '1rem' } : { marginRight: '1rem', marginBottom: '5px' }}
+            style={
+              bigDisplay
+                ? { marginRight: "1rem" }
+                : { marginRight: "1rem", marginBottom: "5px" }
+            }
             color="primary"
-          avatar={<Avatar><FontAwesomeIcon icon={faPuzzlePiece} /></Avatar>}
-          label={workspace ? workspace.getAllBlocks().length : 0}>
+            avatar={
+              <Avatar>
+                <FontAwesomeIcon icon={faPuzzlePiece} />
+              </Avatar>
+            }
+            label={workspace ? workspace.getAllBlocks().length : 0}
+          ></Chip>
+        </Tooltip>
+        <Tooltip title={Blockly.Msg.tooltip_statistics_new} arrow>
+          <Chip
+            style={
+              bigDisplay
+                ? { marginRight: "1rem" }
+                : { marginRight: "1rem", marginBottom: "5px" }
+            }
+            color="primary"
+            avatar={
+              <Avatar>
+                <FontAwesomeIcon icon={faPlus} />
+              </Avatar>
+            }
+            label={this.props.create > 0 ? this.props.create : 0}
+          >
+            {" "}
+            {/* initialXML is created automatically, Block is not part of the statistics */}
           </Chip>
         </Tooltip>
-      <Tooltip title="Anzahl neuer Blöcke" arrow>
+        <Tooltip title={Blockly.Msg.tooltip_statistics_changed} arrow>
           <Chip
-          style={bigDisplay ? { marginRight: '1rem' } : { marginRight: '1rem', marginBottom: '5px' }}
+            style={
+              bigDisplay
+                ? { marginRight: "1rem" }
+                : { marginRight: "1rem", marginBottom: "5px" }
+            }
             color="primary"
-          avatar={<Avatar><FontAwesomeIcon icon={faPlus} /></Avatar>}
-          label={this.props.create > 0 ? this.props.create : 0}> {/* initialXML is created automatically, Block is not part of the statistics */}
+            avatar={
+              <Avatar>
+                <FontAwesomeIcon icon={faPen} />
+              </Avatar>
+            }
+            label={this.props.change}
+          ></Chip>
+        </Tooltip>
+        <Tooltip title={Blockly.Msg.tooltip_statistics_moved} arrow>
+          <Chip
+            style={
+              bigDisplay
+                ? { marginRight: "1rem" }
+                : { marginRight: "1rem", marginBottom: "5px" }
+            }
+            color="primary"
+            avatar={
+              <Avatar>
+                <FontAwesomeIcon icon={faArrowsAlt} />
+              </Avatar>
+            }
+            label={this.props.move > 0 ? this.props.move : 0}
+          >
+            {" "}
+            {/* initialXML is moved automatically, Block is not part of the statistics */}
           </Chip>
         </Tooltip>
-      <Tooltip title="Anzahl veränderter Blöcke" arrow>
+        <Tooltip title={Blockly.Msg.tooltip_statistics_deleted} arrow>
           <Chip
-          style={bigDisplay ? { marginRight: '1rem' } : { marginRight: '1rem', marginBottom: '5px' }}
+            style={
+              remainingBlocksInfinity
+                ? bigDisplay
+                  ? { marginRight: "1rem" }
+                  : { marginRight: "1rem", marginBottom: "5px" }
+                : {}
+            }
             color="primary"
-          avatar={<Avatar><FontAwesomeIcon icon={faPen} /></Avatar>}
-          label={this.props.change}>
-        </Chip>
+            avatar={
+              <Avatar>
+                <FontAwesomeIcon icon={faTrash} />
+              </Avatar>
+            }
+            label={this.props.delete}
+          ></Chip>
         </Tooltip>
-      <Tooltip title="Anzahl bewegter Blöcke" arrow>
+        {remainingBlocksInfinity ? (
+          <Tooltip title={Blockly.Msg.tooltip_statistics_remaining} arrow>
             <Chip
-          style={bigDisplay ? { marginRight: '1rem' } : { marginRight: '1rem', marginBottom: '5px' }}
+              style={
+                bigDisplay
+                  ? { marginRight: "1rem" }
+                  : { marginRight: "1rem", marginBottom: "5px" }
+              }
               color="primary"
-          avatar={<Avatar><FontAwesomeIcon icon={faArrowsAlt} /></Avatar>}
-          label={this.props.move > 0 ? this.props.move : 0}> {/* initialXML is moved automatically, Block is not part of the statistics */}
-        </Chip>
+              label={workspace.remainingCapacity()}
+            ></Chip>
           </Tooltip>
-      <Tooltip title="Anzahl gelöschter Blöcke" arrow>
-        <Chip
-          style={remainingBlocksInfinity ? bigDisplay ? { marginRight: '1rem' } : { marginRight: '1rem', marginBottom: '5px' } : {}}
-          color="primary"
-          avatar={<Avatar><FontAwesomeIcon icon={faTrash} /></Avatar>}
-          label={this.props.delete}>
-        </Chip>
-      </Tooltip>
-      {remainingBlocksInfinity ?
-        <Tooltip title="Verbleibende Blöcke" arrow>
-          <Chip
-            style={bigDisplay ? { marginRight: '1rem' } : { marginRight: '1rem', marginBottom: '5px' }}
-            color="primary"
-            label={workspace.remainingCapacity()}>
-          </Chip>
-        </Tooltip> : null}
+        ) : null}
       </div>
-    return (
-      bigDisplay ?
-        <div style={{ bottom: 0, position: 'absolute' }}>
-          {stats}
-        </div>
-        :
+    );
+    return bigDisplay ? (
+      <div style={{ bottom: 0, position: "absolute" }}>{stats}</div>
+    ) : (
       <div>
-          <Tooltip title='Statistiken anzeigen' arrow>
+        <Tooltip title={Blockly.Msg.tooltip_statistics_show} arrow>
           <IconButton
             className={this.props.classes.menu}
             onClick={(event) => this.handleClick(event)}
@@ -124,24 +183,22 @@ class WorkspaceStats extends Component {
           anchorEl={this.state.anchor}
           onClose={this.handleClose}
           anchorOrigin={{
-              vertical: 'bottom',
-              horizontal: 'center',
+            vertical: "bottom",
+            horizontal: "center",
           }}
           transformOrigin={{
-              vertical: 'top',
-              horizontal: 'center',
+            vertical: "top",
+            horizontal: "center",
           }}
           PaperProps={{
-              style: { margin: '5px' }
+            style: { margin: "5px" },
           }}
         >
-            <div style={{ margin: '10px' }}>
-              {stats}
-            </div>
+          <div style={{ margin: "10px" }}>{stats}</div>
         </Popover>
       </div>
     );
-  };
+  }
 }
 
 WorkspaceStats.propTypes = {
@@ -149,15 +206,18 @@ WorkspaceStats.propTypes = {
   change: PropTypes.number.isRequired,
   delete: PropTypes.number.isRequired,
   move: PropTypes.number.isRequired,
-  workspaceChange: PropTypes.number.isRequired
+  workspaceChange: PropTypes.number.isRequired,
 };
 
-const mapStateToProps = state => ({
+const mapStateToProps = (state) => ({
   create: state.workspace.stats.create,
   change: state.workspace.stats.change,
   delete: state.workspace.stats.delete,
   move: state.workspace.stats.move,
-  workspaceChange: state.workspace.change
+  workspaceChange: state.workspace.change,
 });
 
-export default connect(mapStateToProps, null)(withStyles(styles, { withTheme: true })(withWidth()(WorkspaceStats)));
+export default connect(
+  mapStateToProps,
+  null
+)(withStyles(styles, { withTheme: true })(withWidth()(WorkspaceStats)));

src/data/faq.js

@@ -1,9 +1,7 @@
-import * as Blockly from 'blockly/core';
-
+import * as Blockly from "blockly/core";
 
 export const FaqQuestions = () => {
-  return (
-    [
+  return [
     {
       question: `${Blockly.Msg.faq_q1_question}`,
       answer: `${Blockly.Msg.faq_q1_answer}`,
@@ -12,10 +10,13 @@ export const FaqQuestions = () => {
       question: `${Blockly.Msg.faq_q2_question}`,
       answer: `${Blockly.Msg.faq_q2_answer}`,
     },
+    {
+      question: `${Blockly.Msg.faq_tablet_question}`,
+      answer: `${Blockly.Msg.faq_tablet_answer}`,
+    },
     {
       question: `${Blockly.Msg.faq_q3_question}`,
       answer: `${Blockly.Msg.faq_q3_answer}`,
     },
-
-    ])
-}
+  ];
+};

src/data/hardware.json

@@ -83,6 +83,12 @@
     "src": "lora-bee.png",
     "url": "https://docs.sensebox.de/hardware/bee-lora/"
   },
+  {
+    "id": "bluetooth-bee",
+    "name": "Bluetooth-Bee",
+    "src": "ble-bee.png",
+    "url": "https://docs.sensebox.de/hardware/bee-ble/"
+  },
   {
     "id": "button",
     "name": "Knopf",
@@ -125,6 +131,18 @@
     "src": "rgb-led.png",
     "url": ""
   },
+  {
+    "id": "ws2818-rgb-led",
+    "name": "RGB-LED",
+    "src": "ws2818.png",
+    "url": ""
+  },
+  {
+    "id": "ds1820b",
+    "name": "Wassertemperatur",
+    "src": "ws2818.png",
+    "url": ""
+  },
   {
     "id": "jst-adapter",
     "name": "JST-Adapterkabel",
@@ -137,6 +155,12 @@
     "src": "jst-jst.png",
     "url": ""
   },
+  {
+    "id": "jst-female",
+    "name": "JST-JST Kabel",
+    "src": "jst-jst.png",
+    "url": ""
+  },
   {
     "id": "jumperwire",
     "name": "Steckkabel",

src/reducers/generalReducer.js

@@ -1,60 +1,116 @@
-import { VISIT, LANGUAGE, RENDERER, STATISTICS } from '../actions/types';
+import {
+  VISIT,
+  LANGUAGE,
+  RENDERER,
+  SOUNDS,
+  STATISTICS,
+  PLATFORM,
+} from "../actions/types";
 
 const initialLanguage = () => {
-  if (window.localStorage.getItem('locale')) {
-    return window.localStorage.getItem('locale');
+  if (window.localStorage.getItem("locale")) {
+    return window.localStorage.getItem("locale");
   }
-  if (navigator.language === 'de-DE'){
-    return 'de_DE';
+  if (navigator.language === "de-DE") {
+    return "de_DE";
   }
-  return 'en_US';
+  return "en_US";
+};
+
+const initialPlatform = () => {
+  return getPlatform();
+};
+
+const initialSounds = () => {
+  if (window.localStorage.getItem("sounds")) {
+    return window.localStorage.getItem("sounds");
+  } else {
+    return "off";
+  }
+};
+
+const getPlatform = () => {
+  if (window.localStorage.getItem("platform")) {
+    return JSON.parse(window.localStorage.getItem("platform"));
+  }
+  var userAgent = window.navigator.userAgent,
+    platform = window.navigator.platform,
+    macosPlatforms = ["Macintosh", "MacIntel", "MacPPC", "Mac68K"],
+    windowsPlatforms = ["Win32", "Win64", "Windows", "WinCE"],
+    iosPlatforms = ["iPhone", "iPad", "iPod"],
+    os = null;
+  if (macosPlatforms.indexOf(platform) !== -1) {
+    os = false;
+  } else if (iosPlatforms.indexOf(platform) !== -1) {
+    os = true;
+  } else if (windowsPlatforms.indexOf(userAgent) !== -1) {
+    os = false;
+  } else if (/Android/.test(userAgent)) {
+    os = true;
+  } else if (!os && /Linux/.test(platform)) {
+    os = false;
+  }
+  return os;
 };
 
 const initialRenderer = () => {
-  if (window.localStorage.getItem('renderer')) {
-    return window.localStorage.getItem('renderer');
+  if (window.localStorage.getItem("renderer")) {
+    return window.localStorage.getItem("renderer");
   }
-  return 'geras';
+  return "geras";
 };
 
 const initialStatistics = () => {
-  if (window.localStorage.getItem('statistics')) {
-    return JSON.parse(window.localStorage.getItem('statistics'));
+  if (window.localStorage.getItem("statistics")) {
+    return JSON.parse(window.localStorage.getItem("statistics"));
   }
   return false;
 };
 
-
 const initialState = {
   pageVisits: 0, // detect if previous URL was
   language: initialLanguage(),
   renderer: initialRenderer(),
-  statistics: initialStatistics()
+  sounds: initialSounds(),
+  statistics: initialStatistics(),
+  platform: initialPlatform(),
 };
 
-export default function foo(state = initialState, action){
-  switch(action.type){
+export default function foo(state = initialState, action) {
+  switch (action.type) {
     case VISIT:
       return {
         ...state,
-        pageVisits: state.pageVisits += 1
+        pageVisits: (state.pageVisits += 1),
       };
     case LANGUAGE:
       return {
         ...state,
-        language: action.payload
+        language: action.payload,
+      };
+    case PLATFORM:
+      window.localStorage.setItem("platform", action.payload);
+      return {
+        ...state,
+        platform: action.payload,
       };
     case RENDERER:
-      window.localStorage.setItem('renderer', action.payload);
+      window.localStorage.setItem("renderer", action.payload);
       return {
         ...state,
-        renderer: action.payload
+        renderer: action.payload,
+      };
+    case SOUNDS:
+      window.localStorage.setItem("sounds", action.payload);
+      return {
+        ...state,
+        sounds: action.payload,
       };
     case STATISTICS:
-      window.localStorage.setItem('statistics', action.payload);
+      window.localStorage.setItem("statistics", action.payload);
       return {
         ...state,
-        statistics: action.payload
+        statistics: action.payload,
       };
     default:
       return state;