Merge branch 'development' into dev/add-more-board-features

Dev/migrate mUI

.env

@@ -2,8 +2,7 @@ REACT_APP_COMPILER_URL=https://compiler.sensebox.de
 REACT_APP_BOARD=sensebox-mcu
 REACT_APP_BLOCKLY_API=https://api.blockly.sensebox.de
 
-REACT_APP_MYBADGES=https://mybadges.org
-REACT_APP_MYBADGES_API=https://mybadges.org/api/v1
+GENERATE_SOURCEMAP=false
 
 # in days
 REACT_APP_SHARE_LINK_EXPIRES=30

.gitignore

@@ -22,4 +22,4 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 package-lock.json
-package-lock.json
+

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

NEWS.md

@@ -0,0 +1,93 @@
+# Blockly 2020
+
+(aktuelles Preview unter: https://deploy-preview-37--blockly-react.netlify.app/)
+
+In den letzten Wochen haben wir eine komplett neue Lern- und Programmierumgebung für die senseBox geschaffen. Die Basis bildet hierbei weiterhin Google Blockly und das Frontend wird über React realisiert. Fast alle Blöcke wurden bereits aus der alten Version in die neue Version migriert. 
+
+
+![](https://radosgw.public.os.wwu.de/pad/uploads/upload_880bb55f28e0dbb0bb9c2160d8e50594.png)
+
+
+
+## Blockly Core
+Nachdem die bisherige Version, die unter [blockly.sensebox.de](https://blockly.sensebox.de) verfügbar ist, auf einen Google Blockly Core von 2016 aufbaut, wurde es Zeit ein großes Update durchzuführen. Durch den neuen Blockly Core lassen sich auch andere Renderer der Blöcke verwenden. In den Einstellungen kannst du zwischen den zwei Renderern Geras und Zelos auswählen. Geras ist der klassische Blockly Renderer während Zelos vor allem für Touchoberfläche optimiert worden ist.
+
+### Typed Variablen
+
+Neue Variablen werden nun direkt mit einem bestimmten Datentyp angelegt. Ein einfacher Check überprüft ob der zurückgegeben Typ eines Blockes mit dem der Variablen kompatibel ist. 
+
+![](https://radosgw.public.os.wwu.de/pad/uploads/upload_0d505fc2472178182995732af226e736.png)
+
+
+### Funktionen (funktioniert aktuell nicht!)
+
+Funktionen mit Rückgabe Wert und Eingabeparametern können angelegt werden. Durch die Verwendung von Funktionen lassen sich auch komplexere Programme übersichtlicher darstellen und bearbeiten. Beim Anlegen einer Funktion kann über das Zahnrad weitere Eingabeparameter hinzuefügt werden. 
+
+![](https://radosgw.public.os.wwu.de/pad/uploads/upload_bd9544b118a1dbe83d149c00678eb39d.png)
+
+
+### GPS
+
+Der Code für das GPS Modul wurde neu aufgebaut und ermöglicht es deutlich schneller einen GPS Fix zu bekommen. Zusätzlich lassen sich bald! die Koordinaten in zwei verschiedenen Formaten zurückgebenlassen. Zum einen als Kommazahl zum anderen als Zahl ohne nachkommastellen 
+
+### MQTT
+Zwei einfache Blöcke ermöglichen es nun die Daten über MQTT an einen Broker zu versenden. Zwei Broker sind bereits "vorprogrammiert" (Adafruit IO und DIOTY). Natürlich können auch eigene Broker verwendet werden. Falls ihr gute freie Broker kennt, die wir hinzufügen sollten meldet euch einfach bei uns.
+
+![](https://radosgw.public.os.wwu.de/pad/uploads/upload_a9df4b0b9b1e6f39f09cf3b1743caad2.png)
+
+
+### TTN Mapper
+Bisher war es möglich einen "kleinen" TTN Mapper zu bauen, der die Daten als Cayenne Payload versendet hat. Es gibt nun einen Block der es direkt ermöglicht einen vollständigen TTN Mapper zu Programmieren, der die Daten auch auf [TTNMapper](https://ttnmapper.org/) veröffentlichen kann.
+
+![](https://radosgw.public.os.wwu.de/pad/uploads/upload_b59691f2ebcf04d8b67a5f4e7fbe70b6.png)
+
+
+## Fronted
+
+In der Oberfläche gibt es einige Neuigkeiten. Ziel ist es Blockly für die senseBox zu einer vollständigen Lern- und Programmierumgebung weiterzuentwickeln.  
+
+Die Codeanzeige ist standardmäßig ausgeblendet kann aber einfach durch eine Klick auf das `</>` Icon hinzugefügt werden.
+
+### Login mit openSenseMap/senseBox Account
+
+Im Menü unter Login könnt ihr euch mit eurem openSenseMap Account anmelden. Sobald ihr angemeldet seid habt ihr die Möglichkeit Projekte online zu speichern. 
+Sobald der Login mit dem openSenseMap Account erfolgreich war lassen sich die bereits registrierten senseBox unter Account einsehen. 
+
+![](https://radosgw.public.os.wwu.de/pad/uploads/upload_c3965edc99021339a30b8d6704471e50.png)
+
+
+Im Block zum senden an die openSenseMap müssen dann auch keine IDs mehr ausgewählt werden sondern die registrierten senseBox können einfach aus dem Dropdown Menü ausgewählt werden.
+
+![](https://radosgw.public.os.wwu.de/pad/uploads/upload_57284cea57bfa5df3d55fe456f9d7cfa.png)
+
+### Speichern von Projekten
+
+Nach dem Login über den openSenseMap Account lassen sich Projekte online speichern und wieder abrufen
+
+![](https://radosgw.public.os.wwu.de/pad/uploads/upload_148146b1206fde184afff6edce26b515.png)
+
+
+### Tutorials
+
+Es gibt jetzt Tutorials! Eine reihe von verschiedenen Tutorials zeigt dir die ersten Schritte in der Programmierung mit Blockly. (Inhalte werden noch ausgebaut)
+
+![](https://radosgw.public.os.wwu.de/pad/uploads/upload_db0e64df48d4c34a9540ffb089e95769.png)
+
+### Gallery
+
+In der Gallery finden sich Beispiele mit verschiedenen Programmen. Die Beispiele können direkt in Blockly geöffnet werden, um Änderungen vorzunehmen oder das Programm direkt auf deine senseBox zu übertragen. 
+
+![](https://radosgw.public.os.wwu.de/pad/uploads/upload_c61e1fa98f9d840507a8a53b00605484.png)
+
+
+### Teilen von Programmen
+
+Über den Share Button kann ein Link zum Teilen der aktuellen Blöcke erstellt werden. Wann immer du dein Projekt mit anderen Teilen willst musst du nicht mehr eine XML Datei erstellen und verschicken sondern kannst einen Link erstellen, der direkt zu deinem Programm führt. Beachte, dass vor dem Teilen von Blöcken sämtliche sensiblen Daten, wie zum Beispiel Passwörter, Netzwerknamen, Lora oder openSenseMap Keys entfernt werden sollten. Die Links zum teilen von Programmen laufen nach 30 Tagen ab.
+
+![](https://radosgw.public.os.wwu.de/pad/uploads/upload_a8dba6720fe2fb39cadf129d9bb04a62.png)
+
+
+## Fehler
+
+Falls ihr Fehler findet legt bitte ein Issue in folgendem Repository an: https://github.com/sensebox/React-Ardublockly/issues
+

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

@@ -1,38 +1,64 @@
 {
   "name": "blockly-react",
-  "version": "0.1.0",
+  "version": "1.0.0",
   "private": true,
   "dependencies": {
-    "@blockly/block-plus-minus": "^2.0.10",
-    "@blockly/field-slider": "^2.1.1",
-    "@blockly/plugin-typed-variable-modal": "^3.1.1",
-    "@fortawesome/fontawesome-svg-core": "^1.2.30",
-    "@fortawesome/free-solid-svg-icons": "^5.14.0",
-    "@fortawesome/react-fontawesome": "^0.1.11",
-    "@material-ui/core": "^4.11.0",
-    "@testing-library/jest-dom": "^4.2.4",
-    "@testing-library/react": "^9.5.0",
+    "@blockly/block-plus-minus": "^3.0.5",
+    "@blockly/field-grid-dropdown": "^1.0.31",
+    "@blockly/field-slider": "^3.0.5",
+    "@blockly/plugin-scroll-options": "^2.0.5",
+    "@blockly/plugin-typed-variable-modal": "^4.0.5",
+    "@blockly/workspace-backpack": "^2.0.12",
+    "@blockly/zoom-to-fit": "^2.0.14",
+    "@emotion/react": "^11.10.5",
+    "@emotion/styled": "^11.10.5",
+    "@fortawesome/fontawesome-svg-core": "^1.2.36",
+    "@fortawesome/free-solid-svg-icons": "^5.15.4",
+    "@fortawesome/react-fontawesome": "^0.1.19",
+    "@monaco-editor/react": "^4.3.1",
+    "@mui/lab": "^5.0.0-alpha.110",
+    "@mui/material": "^5.10.16",
+    "@mui/styles": "^5.10.16",
+    "@testing-library/jest-dom": "^5.16.1",
+    "@testing-library/react": "^12.1.2",
     "@testing-library/user-event": "^7.2.1",
-    "axios": "^0.21.0",
-    "blockly": "^3.20200924.0",
-    "file-saver": "^2.0.2",
+    "axios": "^0.22.0",
+    "blockly": "^8.0.3",
+    "file-saver": "^2.0.5",
+    "markdown-it": "^12.3.2",
     "mnemonic-id": "^3.2.7",
-    "moment": "^2.28.0",
-    "prismjs": "^1.20.0",
-    "react": "^16.13.1",
-    "react-cookie-consent": "^5.2.0",
-    "react-dom": "^16.13.1",
-    "react-markdown": "^5.0.2",
-    "react-redux": "^7.2.0",
-    "react-router-dom": "^5.2.0",
-    "react-scripts": "3.4.1",
-    "redux": "^4.0.5",
-    "redux-thunk": "^2.3.0",
-    "uuid": "^8.3.1"
+    "moment": "^2.29.4",
+    "prismjs": "^1.27.0",
+    "qrcode.react": "^3.1.0",
+    "react": "^17.0.2",
+    "react-cookie-consent": "^7.2.1",
+    "react-dom": "^17.0.2",
+    "react-markdown": "^8.0.0",
+    "react-markdown-editor-lite": "^1.3.3",
+    "react-mde": "^11.5.0",
+    "react-rating-stars-component": "^2.2.0",
+    "react-redux": "^7.2.9",
+    "react-router-dom": "^5.3.3",
+    "react-scripts": "^5.0.1",
+    "react-share": "^4.4.0",
+    "react-spinners": "^0.13.3",
+    "reactour": "^1.18.7",
+    "redux": "^4.2.0",
+    "redux-thunk": "^2.4.1",
+    "rehype-raw": "^6.1.1",
+    "remark-gemoji": "^7.0.1",
+    "remark-gfm": "^3.0.1",
+    "styled-components": "^4.4.1",
+    "uuid": "^8.3.1",
+    "watchpack": "^2.3.1"
+  },
+  "resolutions": {
+    "//": "See https://github.com/facebook/create-react-app/issues/11773",
+    "react-error-overlay": "6.0.9"
   },
   "scripts": {
-    "start": "react-scripts start",
-    "dev": "set \"REACT_APP_BLOCKLY_API=http://localhost:8080\" && set \"REACT_APP_MYBADGES_API=http://localhost:3001/api/v1\"&& npm start",
+    "start": "node_modules/react-scripts/bin/react-scripts.js start",
+    "dev": "set \"REACT_APP_BLOCKLY_API=http://localhost:8080\" && npm start",
     "build": "react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject"
@@ -40,16 +66,9 @@
   "eslintConfig": {
     "extends": "react-app"
   },
-  "browserslist": {
-    "production": [
+  "browserslist": [
     ">0.2%",
     "not dead",
     "not op_mini all"
-    ],
-    "development": [
-      "last 1 chrome version",
-      "last 1 firefox version",
-      "last 1 safari version"
   ]
-  }
 }

public/index.html

@@ -24,6 +24,13 @@
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
+    <!-- Matomo Image Tracker-->
+    <img
+      src="https://piwik.sensebox.kaufen/matomo.php?idsite=9&amp;rec=1"
+      style="border: 0; display: none"
+      alt=""
+    />
+    <!-- End Matomo -->
     <div id="root"></div>
     <!--
       This HTML file is a template.

src/App.css

@@ -1,35 +1,74 @@
 .wrapper {
-  min-height: calc(100vh - 60px); /* will cover the 100% of viewport - height of footer (padding-bottom) */
+  min-height: calc(
+    100vh - 60px
+  ); /* will cover the 100% of viewport - height of footer (padding-bottom) */
   overflow: hidden;
   display: block;
   position: relative;
   padding-bottom: 60px; /* height of your footer + 30px*/
 }
 
-
-.tutorial img{
+.tutorial img {
   display: flex;
   align-items: center;
-  max-height: 40vH;
+  max-height: 40vh;
   max-width: 100%;
   margin: auto;
 }
 
-.tutorial blockquote{
+.news img {
+  display: flex;
+  align-items: center;
+  max-height: 40vh;
+  max-width: 100%;
+  margin: auto;
+}
+
+.tutorial blockquote {
   background: #f9f9f9;
   border-left: 10px solid#4EAF47;
   margin: 1.5em 10px;
   padding: 0.5em 10px;
   quotes: "\201C""\201D""\2018""\2019";
-  }
-  blockquote:before {
-    color:#4EAF47;
+}
+blockquote:before {
+  color: #4eaf47;
   content: open-quote;
   font-size: 4em;
   line-height: 0.1em;
   margin-right: 0.25em;
   vertical-align: -0.4em;
-  }
-  blockquote p {
+}
+blockquote p {
   display: inline;
-  }
+}
+
+.tutorial table,
+th,
+td {
+  border: 1px solid #ddd;
+}
+
+.tutorial th {
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  border-color: #4eaf47;
+  color: white;
+}
+
+.overlay {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+:root {
+  --url: url('./data/mcu_opacity.png');
+}
+
+.blocklySvg {
+  background-image: var(--url);
+  background-position: center;
+  background-repeat: no-repeat;
+}

src/App.js

@@ -1,35 +1,34 @@
-import React, { Component } from 'react';
+import React, { Component } from "react";
 
-import { BrowserRouter as Router } from 'react-router-dom';
+import { Router } from "react-router-dom";
 import { createBrowserHistory } from "history";
 
-import { Provider } from 'react-redux';
-import store from './store';
-import { loadUser } from './actions/authActions';
+import { Provider } from "react-redux";
+import store from "./store";
+import { loadUser } from "./actions/authActions";
 
-import './App.css';
+import "./App.css";
 
-import { ThemeProvider, createMuiTheme } from '@material-ui/core/styles';
+import { ThemeProvider, StyledEngineProvider, createTheme } from "@mui/material/styles";
 
-import Content from './components/Content';
+import Content from "./components/Content";
 
-const theme = createMuiTheme({
+const theme = createTheme({
   palette: {
     primary: {
-      main: '#4EAF47',
-      contrastText: '#ffffff'
+      main: "#4EAF47",
+      contrastText: "#ffffff",
     },
     secondary: {
-      main: '#DDDDDD'
+      main: "#DDDDDD",
     },
     button: {
-      compile: '#e27136'
-    }
-  }
+      compile: "#e27136",
+    },
+  },
 });
 
 class App extends Component {
-
   componentDidMount() {
     store.dispatch(loadUser());
   }
@@ -37,6 +36,7 @@ class App extends Component {
   render() {
     const customHistory = createBrowserHistory();
     return (
+      <StyledEngineProvider injectFirst>
         <ThemeProvider theme={theme}>
           <Provider store={store}>
             <Router history={customHistory}>
@@ -44,6 +44,7 @@ class App extends Component {
             </Router>
           </Provider>
         </ThemeProvider>
+      </StyledEngineProvider>
     );
   }
 }

src/actions/arduinoActions.js

@@ -0,0 +1,150 @@
+import { GET_ARDUINO_EXAMPLES } from './types';
+
+import axios from 'axios';
+import { returnErrors, returnSuccess } from './messageActions';
+
+
+export const getArduinoExamples = () => (dispatch) => {
+  const config = {
+    success: res => {
+      var examples = res.data.arduinoExamples;
+      console.log(examples);
+      dispatch({
+        type: GET_ARDUINO_EXAMPLES,
+        payload: examples
+      });
+      dispatch(returnSuccess(res.data.message, res.status));
+    },
+    error: err => {
+      if (err.response) {
+        dispatch(returnErrors(err.response.data.message, err.response.status, 'GET_PROJECTS_FAIL'));
+      }
+    }
+  };
+  axios.get(`${process.env.REACT_APP_BLOCKLY_API}/arduino`, config)
+    .then(res => {
+      res.config.success(res);
+    })
+    .catch(err => {
+      err.config.error(err);
+    });
+};
+
+// export const updateProject = (type, id) => (dispatch, getState) => {
+//   var workspace = getState().workspace;
+//   var body = {
+//     xml: workspace.code.xml,
+//     title: workspace.name,
+//     board: getState().board.board,
+//   };
+//   var project = getState().project;
+//   if (type === 'gallery') {
+//     body.description = project.description;
+//   }
+//   const config = {
+//     success: res => {
+//       var project = res.data[type];
+//       var projects = getState().project.projects;
+//       var index = projects.findIndex(res => res._id === project._id);
+//       projects[index] = project;
+//       dispatch({
+//         type: GET_PROJECTS,
+//         payload: projects
+//       });
+//       if (type === 'project') {
+//         dispatch(returnSuccess(res.data.message, res.status, 'PROJECT_UPDATE_SUCCESS'));
+//       } else {
+//         dispatch(returnSuccess(res.data.message, res.status, 'GALLERY_UPDATE_SUCCESS'));
+//       }
+//     },
+//     error: err => {
+//       if (err.response) {
+//         if (type === 'project') {
+//           dispatch(returnErrors(err.response.data.message, err.response.status, 'PROJECT_UPDATE_FAIL'));
+//         } else {
+//           dispatch(returnErrors(err.response.data.message, err.response.status, 'GALLERY_UPDATE_FAIL'));
+//         }
+//       }
+//     }
+//   };
+//   axios.put(`${process.env.REACT_APP_BLOCKLY_API}/${type}/${id}`, body, config)
+//     .then(res => {
+//       res.config.success(res);
+//     })
+//     .catch(err => {
+//       err.config.error(err);
+//     });
+// };
+
+// export const deleteProject = (type, id) => (dispatch, getState) => {
+//   const config = {
+//     success: res => {
+//       var projects = getState().project.projects;
+//       var index = projects.findIndex(res => res._id === id);
+//       projects.splice(index, 1)
+//       dispatch({
+//         type: GET_PROJECTS,
+//         payload: projects
+//       });
+//       if (type === 'project') {
+//         dispatch(returnSuccess(res.data.message, res.status, 'PROJECT_DELETE_SUCCESS'));
+//       } else {
+//         dispatch(returnSuccess(res.data.message, res.status, 'GALLERY_DELETE_SUCCESS'));
+//       }
+//     },
+//     error: err => {
+//       dispatch(returnErrors(err.response.data.message, err.response.status, 'PROJECT_DELETE_FAIL'));
+//     }
+//   };
+//   axios.delete(`${process.env.REACT_APP_BLOCKLY_API}/${type}/${id}`, config)
+//     .then(res => {
+//       res.config.success(res);
+//     })
+//     .catch(err => {
+//       if (err.response && err.response.status !== 401) {
+//         err.config.error(err);
+//       }
+//     });
+// };
+
+
+// export const shareProject = (title, type, id) => (dispatch, getState) => {
+//   var body = {
+//     title: title,
+//     board: getState().board.board
+//   };
+//   if (type === 'project') {
+//     body.projectId = id;
+//   } else {
+//     body.xml = getState().workspace.code.xml;
+//   }
+//   axios.post(`${process.env.REACT_APP_BLOCKLY_API}/share`, body)
+//     .then(res => {
+//       var shareContent = res.data.content;
+//       if (body.projectId) {
+//         var projects = getState().project.projects;
+//         var index = projects.findIndex(res => res._id === id);
+//         projects[index].shared = shareContent.expiresAt;
+//         dispatch({
+//           type: GET_PROJECTS,
+//           payload: projects
+//         });
+//       }
+//       dispatch(returnSuccess(res.data.message, shareContent._id, 'SHARE_SUCCESS'));
+//     })
+//     .catch(err => {
+//       if (err.response) {
+//         dispatch(returnErrors(err.response.data.message, err.response.status, 'SHARE_FAIL'));
+//       }
+//     });
+// };
+
+
+// export const resetProject = () => (dispatch) => {
+//   dispatch({
+//     type: GET_PROJECTS,
+//     payload: []
+//   });
+//   dispatch(setType(''));
+//   dispatch(setDescription(''));
+// };

src/actions/authActions.js

@@ -1,245 +1,202 @@
-import { MYBADGES_CONNECT, MYBADGES_DISCONNECT, GET_STATUS, USER_LOADED, USER_LOADING, AUTH_ERROR, LOGIN_SUCCESS, LOGIN_FAIL, LOGOUT_SUCCESS, LOGOUT_FAIL, REFRESH_TOKEN_SUCCESS } from '../actions/types';
+import {
+  GET_STATUS,
+  USER_LOADED,
+  USER_LOADING,
+  AUTH_ERROR,
+  LOGIN_SUCCESS,
+  LOGIN_FAIL,
+  LOGOUT_SUCCESS,
+  LOGOUT_FAIL,
+  REFRESH_TOKEN_SUCCESS,
+} from "../actions/types";
 
-import axios from 'axios';
-import { returnErrors, returnSuccess } from './messageActions';
-import { setLanguage } from './generalActions';
+import axios from "axios";
+import { returnErrors, returnSuccess } from "./messageActions";
+import { setLanguage } from "./generalActions";
 
 // Check token & load user
 export const loadUser = () => (dispatch) => {
   // user loading
   dispatch({
-    type: USER_LOADING
+    type: USER_LOADING,
   });
   const config = {
-    success: res => {
+    success: (res) => {
       dispatch({
         type: GET_STATUS,
-        payload: res.data.user.status
+        payload: res.data.user.status,
       });
       dispatch(setLanguage(res.data.user.language));
       dispatch({
         type: USER_LOADED,
-        payload: res.data.user
+        payload: res.data.user,
       });
     },
-    error: err => {
-      if(err.response){
+    error: (err) => {
+      if (err.response) {
         dispatch(returnErrors(err.response.data.message, err.response.status));
       }
       var status = [];
-      if (window.localStorage.getItem('status')) {
-        status = JSON.parse(window.localStorage.getItem('status'));
+      if (window.localStorage.getItem("status")) {
+        status = JSON.parse(window.localStorage.getItem("status"));
       }
       dispatch({
         type: GET_STATUS,
-        payload: status
+        payload: status,
       });
       dispatch({
-        type: AUTH_ERROR
+        type: AUTH_ERROR,
       });
-    }
+    },
   };
-  axios.get(`${process.env.REACT_APP_BLOCKLY_API}/user`, config, dispatch(authInterceptor()))
-    .then(res => {
+  axios
+    .get(
+      `${process.env.REACT_APP_BLOCKLY_API}/user`,
+      config,
+      dispatch(authInterceptor())
+    )
+    .then((res) => {
       res.config.success(res);
     })
-    .catch(err => {
+    .catch((err) => {
       err.config.error(err);
     });
 };
 
-
-var logoutTimerId;
-const timeToLogout = 14.9*60*1000; // nearly 15 minutes corresponding to the API
-
 // Login user
-export const login = ({ email, password }) => (dispatch) => {
+export const login =
+  ({ email, password }) =>
+    (dispatch) => {
       dispatch({
-    type: USER_LOADING
+        type: USER_LOADING,
       });
       // Headers
       const config = {
         headers: {
-      'Content-Type': 'application/json'
-    }
+          "Content-Type": "application/json",
+        },
       };
       // Request Body
       const body = JSON.stringify({ email, password });
-  axios.post(`${process.env.REACT_APP_BLOCKLY_API}/user`, body, config)
-  .then(res => {
-    // Logout automatically if refreshToken "expired"
-    const logoutTimer = () => setTimeout(
-      () => dispatch(logout()),
-      timeToLogout
-    );
-    logoutTimerId = logoutTimer();
+      axios
+        .post(`${process.env.REACT_APP_BLOCKLY_API}/user`, body, config)
+        .then((res) => {
           dispatch(setLanguage(res.data.user.language));
           dispatch({
             type: LOGIN_SUCCESS,
-      payload: res.data
+            payload: res.data,
           });
           dispatch({
             type: GET_STATUS,
-      payload: res.data.user.status
+            payload: res.data.user.status,
           });
-    dispatch(returnSuccess(res.data.message, res.status, 'LOGIN_SUCCESS'));
+          dispatch(returnSuccess(res.data.message, res.status, "LOGIN_SUCCESS"));
         })
-  .catch(err => {
-    dispatch(returnErrors(err.response.data.message, err.response.status, 'LOGIN_FAIL'));
+        .catch((err) => {
+          dispatch(
+            returnErrors(
+              err.response.data.message,
+              err.response.status,
+              "LOGIN_FAIL"
+            )
+          );
           dispatch({
-      type: LOGIN_FAIL
+            type: LOGIN_FAIL,
           });
           var status = [];
-    if (window.localStorage.getItem('status')) {
-      status = JSON.parse(window.localStorage.getItem('status'));
+          if (window.localStorage.getItem("status")) {
+            status = JSON.parse(window.localStorage.getItem("status"));
           }
           dispatch({
             type: GET_STATUS,
-      payload: status
+            payload: status,
           });
         });
-};
-
-
-// Connect to MyBadges-Account
-export const connectMyBadges = ({ username, password }) => (dispatch, getState) => {
-  const config = {
-    success: res => {
-      var user = getState().auth.user;
-      user.badge = res.data.account;
-      user.badges = res.data.badges;
-      dispatch({
-        type: MYBADGES_CONNECT,
-        payload: user
-      });
-      dispatch(returnSuccess(res.data.message, res.status, 'MYBADGES_CONNECT_SUCCESS'));
-    },
-    error: err => {
-      dispatch(returnErrors(err.response.data.message, err.response.status, 'MYBADGES_CONNECT_FAIL'));
-    }
     };
-  // Request Body
-  const body = JSON.stringify({ username, password });
-  axios.post(`${process.env.REACT_APP_BLOCKLY_API}/user/badge`, body, config)
-  .then(res => {
-    res.config.success(res);
-  })
-  .catch(err => {
-    if(err.response && err.response.status !== 401){
-      err.config.error(err);
-    }
-  });
-};
-
-// Disconnect MyBadges-Account
-export const disconnectMyBadges = () => (dispatch, getState) => {
-  const config = {
-    success: res => {
-      var user = getState().auth.user;
-      user.badge = null;
-      user.badges = null;
-      dispatch({
-        type: MYBADGES_DISCONNECT,
-        payload: user
-      });
-      dispatch(returnSuccess(res.data.message, res.status, 'MYBADGES_DISCONNECT_SUCCESS'));
-    },
-    error: err => {
-      dispatch(returnErrors(err.response.data.message, err.response.status, 'MYBADGES_DISCONNECT_FAIL'));
-    }
-  };
-  axios.put(`${process.env.REACT_APP_BLOCKLY_API}/user/badge`, {}, config)
-  .then(res => {
-    res.config.success(res);
-  })
-  .catch(err => {
-    if(err.response && err.response.status !== 401){
-      err.config.error(err);
-    }
-  });
-};
-
 
 // Logout User
 export const logout = () => (dispatch) => {
   const config = {
-    success: res => {
+    success: (res) => {
       dispatch({
-        type: LOGOUT_SUCCESS
+        type: LOGOUT_SUCCESS,
       });
       var status = [];
-      if (window.localStorage.getItem('status')) {
-        status = JSON.parse(window.localStorage.getItem('status'));
+      if (window.localStorage.getItem("status")) {
+        status = JSON.parse(window.localStorage.getItem("status"));
       }
       dispatch({
         type: GET_STATUS,
-        payload: status
+        payload: status,
       });
-      var locale = 'en_US';
-      if (window.localStorage.getItem('locale')) {
-        locale = window.localStorage.getItem('locale');
-      }
-      else if (navigator.language === 'de-DE'){
-        locale = 'de_DE';
+      var locale = "en_US";
+      if (window.localStorage.getItem("locale")) {
+        locale = window.localStorage.getItem("locale");
+      } else if (navigator.language === "de-DE") {
+        locale = "de_DE";
       }
       dispatch(setLanguage(locale));
-      dispatch(returnSuccess(res.data.message, res.status, 'LOGOUT_SUCCESS'));
-      clearTimeout(logoutTimerId);
+      dispatch(returnSuccess(res.data.message, res.status, "LOGOUT_SUCCESS"));
     },
-    error: err => {
-      dispatch(returnErrors(err.response.data.message, err.response.status, 'LOGOUT_FAIL'));
+    error: (err) => {
+      dispatch(
+        returnErrors(
+          err.response.data.message,
+          err.response.status,
+          "LOGOUT_FAIL"
+        )
+      );
       dispatch({
-        type: LOGOUT_FAIL
+        type: LOGOUT_FAIL,
       });
       var status = [];
-      if (window.localStorage.getItem('status')) {
-        status = JSON.parse(window.localStorage.getItem('status'));
+      if (window.localStorage.getItem("status")) {
+        status = JSON.parse(window.localStorage.getItem("status"));
       }
       dispatch({
         type: GET_STATUS,
-        payload: status
+        payload: status,
       });
-      clearTimeout(logoutTimerId);
-    }
+    },
   };
-  axios.post('https://api.opensensemap.org/users/sign-out', {}, config)
-  .then(res => {
+  axios
+    .post("https://api.opensensemap.org/users/sign-out", {}, config)
+    .then((res) => {
       res.config.success(res);
     })
-  .catch(err => {
-    if(err.response && err.response.status !== 401){
+    .catch((err) => {
+      if (err.response && err.response.status !== 401) {
         err.config.error(err);
       }
     });
 };
 
-
 export const authInterceptor = () => (dispatch, getState) => {
   // Add a request interceptor
   axios.interceptors.request.use(
-    config => {
-      config.headers['Content-Type'] = 'application/json';
+    (config) => {
+      config.headers["Content-Type"] = "application/json";
       const token = getState().auth.token;
       if (token) {
-       config.headers['Authorization'] = `Bearer ${token}`;
+        config.headers["Authorization"] = `Bearer ${token}`;
       }
       return config;
     },
-   error => {
+    (error) => {
       Promise.reject(error);
     }
   );
 
   // Add a response interceptor
   axios.interceptors.response.use(
-    response => {
+    (response) => {
       // request was successfull
       return response;
     },
-    error => {
+    (error) => {
       const originalRequest = error.config;
       const refreshToken = getState().auth.refreshToken;
-      if(refreshToken){
+      if (refreshToken) {
         // try to refresh the token failed
         if (error.response.status === 401 && originalRequest._retry) {
           // router.push('/login');
@@ -250,38 +207,38 @@ export const authInterceptor = () => (dispatch, getState) => {
           originalRequest._retry = true;
           const refreshToken = getState().auth.refreshToken;
           // request to refresh the token, in request-body is the refreshToken
-          axios.post('https://api.opensensemap.org/users/refresh-auth', {"token": refreshToken})
-               .then(res => {
+          axios
+            .post("https://api.opensensemap.org/users/refresh-auth", {
+              token: refreshToken,
+            })
+            .then((res) => {
               if (res.status === 200) {
-                   clearTimeout(logoutTimerId);
-                   const logoutTimer = () => setTimeout(
-                     () => dispatch(logout()),
-                     timeToLogout
-                   );
-                   logoutTimerId = logoutTimer();
                 dispatch({
                   type: REFRESH_TOKEN_SUCCESS,
-                     payload: res.data
+                  payload: res.data,
                 });
-                   axios.defaults.headers.common['Authorization'] = 'Bearer ' + getState().auth.token;
+                axios.defaults.headers.common["Authorization"] =
+                  "Bearer " + getState().auth.token;
                 // request was successfull, new request with the old parameters and the refreshed token
                 return axios(originalRequest)
-                          .then(res => {
+                  .then((res) => {
                     originalRequest.success(res);
                   })
-                           .catch(err => {
+                  .catch((err) => {
                     originalRequest.error(err);
                   });
               }
               return Promise.reject(error);
             })
-               .catch(err => {
+            .catch((err) => {
               // request failed, token could not be refreshed
-                 if(err.response){
-                   dispatch(returnErrors(err.response.data.message, err.response.status));
+              if (err.response) {
+                dispatch(
+                  returnErrors(err.response.data.message, err.response.status)
+                );
               }
               dispatch({
-                   type: AUTH_ERROR
+                type: AUTH_ERROR,
               });
               return Promise.reject(error);
             });

src/actions/boardActions.js

@@ -0,0 +1,15 @@
+import {
+  BOARD,
+} from "./types";
+import mini_opacity from "../data/mini_opacity.png"
+import mcu_opacity from "../data/mcu_opacity.png"
+
+export const setBoard = (board) => (dispatch) => {
+  window.sessionStorage.setItem("board", board);
+  const root = document.querySelector(':root');
+  root.style.setProperty('--url', `url(${board === "mcu" ? mcu_opacity : mini_opacity})`);
+  dispatch({
+    type: BOARD,
+    payload: board,
+  });
+};

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/projectActions.js

@@ -42,10 +42,10 @@ export const getProject = (type, id) => (dispatch) => {
       }
     },
     error: err => {
-      if(err.response){
+      if (err.response) {
         dispatch(returnErrors(err.response.data.message, err.response.status, 'GET_PROJECT_FAIL'));
       }
-      dispatch({type: PROJECT_PROGRESS});
+      dispatch({ type: PROJECT_PROGRESS });
     }
   };
   axios.get(`${process.env.REACT_APP_BLOCKLY_API}/${type}/${id}`, config)
@@ -58,7 +58,7 @@ export const getProject = (type, id) => (dispatch) => {
 };
 
 export const getProjects = (type) => (dispatch) => {
-  dispatch({type: PROJECT_PROGRESS});
+  dispatch({ type: PROJECT_PROGRESS });
   const config = {
     success: res => {
       var data = type === 'project' ? 'projects' : 'galleries';
@@ -71,10 +71,10 @@ export const getProjects = (type) => (dispatch) => {
       dispatch(returnSuccess(res.data.message, res.status));
     },
     error: err => {
-      if(err.response){
+      if (err.response) {
         dispatch(returnErrors(err.response.data.message, err.response.status, 'GET_PROJECTS_FAIL'));
       }
-      dispatch({type: PROJECT_PROGRESS});
+      dispatch({ type: PROJECT_PROGRESS });
     }
   };
   axios.get(`${process.env.REACT_APP_BLOCKLY_API}/${type}`, config)
@@ -90,7 +90,8 @@ export const updateProject = (type, id) => (dispatch, getState) => {
   var workspace = getState().workspace;
   var body = {
     xml: workspace.code.xml,
-    title: workspace.name
+    title: workspace.name,
+    board: getState().board.board,
   };
   var project = getState().project;
   if (type === 'gallery') {
@@ -113,8 +114,8 @@ export const updateProject = (type, id) => (dispatch, getState) => {
       }
     },
     error: err => {
-      if(err.response){
-        if(type === 'project'){
+      if (err.response) {
+        if (type === 'project') {
           dispatch(returnErrors(err.response.data.message, err.response.status, 'PROJECT_UPDATE_FAIL'));
         } else {
           dispatch(returnErrors(err.response.data.message, err.response.status, 'GALLERY_UPDATE_FAIL'));
@@ -132,7 +133,6 @@ export const updateProject = (type, id) => (dispatch, getState) => {
 };
 
 export const deleteProject = (type, id) => (dispatch, getState) => {
-  var project = getState().project;
   const config = {
     success: res => {
       var projects = getState().project.projects;
@@ -157,7 +157,7 @@ export const deleteProject = (type, id) => (dispatch, getState) => {
       res.config.success(res);
     })
     .catch(err => {
-      if(err.response && err.response.status !== 401){
+      if (err.response && err.response.status !== 401) {
         err.config.error(err);
       }
     });
@@ -166,7 +166,8 @@ export const deleteProject = (type, id) => (dispatch, getState) => {
 
 export const shareProject = (title, type, id) => (dispatch, getState) => {
   var body = {
-    title: title
+    title: title,
+    board: getState().board.board
   };
   if (type === 'project') {
     body.projectId = id;

src/actions/sensorwikiActions.js

@@ -0,0 +1,18 @@
+import axios from 'axios'
+
+const fetchSensorWikiSuccess = sensors => ({
+    type: 'FETCH_SENSORWIKI_SUCCESS',
+    payload: { sensors }
+})
+
+export const fetchSensors =  () => {
+    return async dispatch => {
+        try {
+            let sensors = await axios.get('https://api.sensors.wiki/sensors/all')
+            dispatch(fetchSensorWikiSuccess(sensors.data))
+        }
+        catch(e){
+            console.log(e)
+        }
+    }
+}

src/actions/tutorialActions.js

@@ -1,109 +1,176 @@
-import { MYBADGES_DISCONNECT, TUTORIAL_PROGRESS, GET_TUTORIAL, GET_TUTORIALS, TUTORIAL_SUCCESS, TUTORIAL_ERROR, TUTORIAL_CHANGE, TUTORIAL_XML, TUTORIAL_STEP } from './types';
+import {
+  TUTORIAL_PROGRESS,
+  GET_TUTORIAL,
+  GET_TUTORIALS,
+  TUTORIAL_SUCCESS,
+  TUTORIAL_ERROR,
+  TUTORIAL_CHANGE,
+  TUTORIAL_XML,
+  TUTORIAL_STEP,
+} from "./types";
 
-import axios from 'axios';
-import { returnErrors, returnSuccess } from './messageActions';
+import axios from "axios";
+import { returnErrors, returnSuccess } from "./messageActions";
 
 export const tutorialProgress = () => (dispatch) => {
-  dispatch({type: TUTORIAL_PROGRESS});
+  dispatch({ type: TUTORIAL_PROGRESS });
 };
 
-
 export const getTutorial = (id) => (dispatch, getState) => {
-  axios.get(`${process.env.REACT_APP_BLOCKLY_API}/tutorial/${id}`)
-    .then(res => {
+  axios
+    .get(`${process.env.REACT_APP_BLOCKLY_API}/tutorial/${id}`)
+    .then((res) => {
       var tutorial = res.data.tutorial;
-      existingTutorial(tutorial, getState().tutorial.status).then(status => {
+      existingTutorial(tutorial, getState().tutorial.status).then((status) => {
         dispatch({
           type: TUTORIAL_SUCCESS,
-          payload: status
+          payload: status,
         });
         dispatch(updateStatus(status));
         dispatch({
           type: GET_TUTORIAL,
-          payload: tutorial
+          payload: tutorial,
         });
-        dispatch({type: TUTORIAL_PROGRESS});
+        dispatch({ type: TUTORIAL_PROGRESS });
         dispatch(returnSuccess(res.data.message, res.status));
       });
     })
-    .catch(err => {
+    .catch((err) => {
       if (err.response) {
-        dispatch(returnErrors(err.response.data.message, err.response.status, 'GET_TUTORIAL_FAIL'));
+        dispatch(
+          returnErrors(
+            err.response.data.message,
+            err.response.status,
+            "GET_TUTORIAL_FAIL"
+          )
+        );
       }
       dispatch({ type: TUTORIAL_PROGRESS });
     });
 };
 
 export const getTutorials = () => (dispatch, getState) => {
-  axios.get(`${process.env.REACT_APP_BLOCKLY_API}/tutorial`)
-    .then(res => {
+  axios
+    .get(`${process.env.REACT_APP_BLOCKLY_API}/tutorial`)
+    .then((res) => {
       var tutorials = res.data.tutorials;
-      console.log(tutorials);
-      existingTutorials(tutorials, getState().tutorial.status).then(status => {
+      existingTutorials(tutorials, getState().tutorial.status).then(
+        (status) => {
           dispatch({
             type: TUTORIAL_SUCCESS,
-          payload: status
+            payload: status,
           });
-        console.log('zwei');
           dispatch(updateStatus(status));
           dispatch({
             type: GET_TUTORIALS,
-          payload: tutorials
+            payload: tutorials,
           });
           dispatch({ type: TUTORIAL_PROGRESS });
           dispatch(returnSuccess(res.data.message, res.status));
-      });
+        }
+      );
     })
-    .catch(err => {
+    .catch((err) => {
       if (err.response) {
-        dispatch(returnErrors(err.response.data.message, err.response.status, 'GET_TUTORIALS_FAIL'));
+        dispatch(
+          returnErrors(
+            err.response.data.message,
+            err.response.status,
+            "GET_TUTORIALS_FAIL"
+          )
+        );
       }
       dispatch({ type: TUTORIAL_PROGRESS });
     });
 };
 
-export const assigneBadge = (id) => (dispatch, getState) => {
-  const config = {
-    success: res => {
-      var badge = res.data.badge;
-      var user = getState().auth.user;
-      user.badges.push(badge._id);
+export const getAllTutorials = () => (dispatch, getState) => {
+  axios
+    .get(`${process.env.REACT_APP_BLOCKLY_API}/tutorial/getAllTutorials`)
+    .then((res) => {
+      var tutorials = res.data.tutorials;
+      existingTutorials(tutorials, getState().tutorial.status).then(
+        (status) => {
           dispatch({
-        type: MYBADGES_DISCONNECT,
-        payload: user
+            type: TUTORIAL_SUCCESS,
+            payload: status,
           });
-      dispatch(returnSuccess(badge, res.status, 'ASSIGNE_BADGE_SUCCESS'));
-    },
-    error: err => {
-      dispatch(returnErrors(err.response.data.message, err.response.status, 'ASSIGNE_BADGE_FAIL'));
+          dispatch(updateStatus(status));
+          dispatch({
+            type: GET_TUTORIALS,
+            payload: tutorials,
+          });
+          dispatch({ type: TUTORIAL_PROGRESS });
+          dispatch(returnSuccess(res.data.message, res.status));
         }
-  };
-  axios.put(`${process.env.REACT_APP_BLOCKLY_API}/user/badge/${id}`, {}, config)
-    .then(res => {
-      res.config.success(res);
+      );
     })
-    .catch(err => {
-      if(err.response && err.response.status !== 401){
-        err.config.error(err);
+    .catch((err) => {
+      if (err.response) {
+        dispatch(
+          returnErrors(
+            err.response.data.message,
+            err.response.status,
+            "GET_TUTORIALS_FAIL"
+          )
+        );
       }
+      dispatch({ type: TUTORIAL_PROGRESS });
+    });
+};
+
+export const getUserTutorials = () => (dispatch, getState) => {
+  axios
+    .get(`${process.env.REACT_APP_BLOCKLY_API}/tutorial/getUserTutorials`)
+    .then((res) => {
+      var tutorials = res.data.tutorials;
+      existingTutorials(tutorials, getState().tutorial.status).then(
+        (status) => {
+          dispatch({
+            type: TUTORIAL_SUCCESS,
+            payload: status,
+          });
+          dispatch(updateStatus(status));
+          dispatch({
+            type: GET_TUTORIALS,
+            payload: tutorials,
+          });
+          dispatch({ type: TUTORIAL_PROGRESS });
+          dispatch(returnSuccess(res.data.message, res.status));
+        }
+      );
+    })
+    .catch((err) => {
+      console.log(err);
+      if (err.response) {
+        dispatch(
+          returnErrors(
+            err.response.data.message,
+            err.response.status,
+            "GET_TUTORIALS_FAIL"
+          )
+        );
+      }
+      dispatch({ type: TUTORIAL_PROGRESS });
     });
 };
 
 export const updateStatus = (status) => (dispatch, getState) => {
-  if(getState().auth.isAuthenticated){
+  if (getState().auth.isAuthenticated) {
     // update user account in database - sync with redux store
-    axios.put(`${process.env.REACT_APP_BLOCKLY_API}/user/status`, {status: status})
-      .then(res => {
-        // dispatch(returnSuccess(badge, res.status, 'UPDATE_STATUS_SUCCESS'));
+    axios
+      .put(`${process.env.REACT_APP_BLOCKLY_API}/user/status`, {
+        status: status,
       })
-      .catch(err => {
-        if(err.response){
+      .then((res) => {})
+      .catch((err) => {
+        if (err.response) {
           // dispatch(returnErrors(err.response.data.message, err.response.status, 'UPDATE_STATUS_FAIL'));
         }
       });
   } else {
     // update locale storage - sync with redux store
-    window.localStorage.setItem('status', JSON.stringify(status));
+    window.localStorage.setItem("status", JSON.stringify(status));
   }
 };
 
@@ -111,66 +178,77 @@ export const deleteTutorial = (id) => (dispatch, getState) => {
   var tutorial = getState().tutorial;
   var id = getState().builder.id;
   const config = {
-    success: res => {
+    success: (res) => {
       var tutorials = tutorial.tutorials;
-      var index = tutorials.findIndex(res => res._id === id);
-      tutorials.splice(index, 1)
+      var index = tutorials.findIndex((res) => res._id === id);
+      tutorials.splice(index, 1);
       dispatch({
         type: GET_TUTORIALS,
-        payload: tutorials
+        payload: tutorials,
       });
-      dispatch(returnSuccess(res.data.message, res.status, 'TUTORIAL_DELETE_SUCCESS'));
+      dispatch(
+        returnSuccess(res.data.message, res.status, "TUTORIAL_DELETE_SUCCESS")
+      );
+    },
+    error: (err) => {
+      dispatch(
+        returnErrors(
+          err.response.data.message,
+          err.response.status,
+          "TUTORIAL_DELETE_FAIL"
+        )
+      );
     },
-    error: err => {
-      dispatch(returnErrors(err.response.data.message, err.response.status, 'TUTORIAL_DELETE_FAIL'));
-    }
   };
-  axios.delete(`${process.env.REACT_APP_BLOCKLY_API}/tutorial/${id}`, config)
-    .then(res => {
+  axios
+    .delete(`${process.env.REACT_APP_BLOCKLY_API}/tutorial/${id}`, config)
+    .then((res) => {
       res.config.success(res);
     })
-    .catch(err => {
-      if(err.response && err.response.status !== 401){
+    .catch((err) => {
+      if (err.response && err.response.status !== 401) {
         err.config.error(err);
       }
     });
 };
 
-
 export const resetTutorial = () => (dispatch) => {
   dispatch({
     type: GET_TUTORIALS,
-    payload: []
+    payload: [],
   });
   dispatch({
     type: TUTORIAL_STEP,
-    payload: 0
+    payload: 0,
   });
 };
 
 export const tutorialChange = () => (dispatch) => {
   dispatch({
-    type: TUTORIAL_CHANGE
+    type: TUTORIAL_CHANGE,
   });
 };
 
 export const tutorialCheck = (status, step) => (dispatch, getState) => {
   var tutorialsStatus = getState().tutorial.status;
   var id = getState().tutorial.tutorials[0]._id;
-  var tutorialsStatusIndex = tutorialsStatus.findIndex(tutorialStatus => tutorialStatus._id === id);
-  var tasksIndex = tutorialsStatus[tutorialsStatusIndex].tasks.findIndex(task => task._id === step._id);
+  var tutorialsStatusIndex = tutorialsStatus.findIndex(
+    (tutorialStatus) => tutorialStatus._id === id
+  );
+  var tasksIndex = tutorialsStatus[tutorialsStatusIndex].tasks.findIndex(
+    (task) => task._id === step._id
+  );
   tutorialsStatus[tutorialsStatusIndex].tasks[tasksIndex] = {
     ...tutorialsStatus[tutorialsStatusIndex].tasks[tasksIndex],
-    type: status
+    type: status,
   };
   dispatch({
-    type: status === 'success' ? TUTORIAL_SUCCESS : TUTORIAL_ERROR,
-    payload: tutorialsStatus
+    type: status === "success" ? TUTORIAL_SUCCESS : TUTORIAL_ERROR,
+    payload: tutorialsStatus,
   });
-  console.log('drei');
   dispatch(updateStatus(tutorialsStatus));
   dispatch(tutorialChange());
-  dispatch(returnSuccess('', '', 'TUTORIAL_CHECK_SUCCESS'));
+  dispatch(returnSuccess("", "", "TUTORIAL_CHECK_SUCCESS"));
 };
 
 export const storeTutorialXml = (code) => (dispatch, getState) => {
@@ -179,17 +257,21 @@ export const storeTutorialXml = (code) => (dispatch, getState) => {
     var id = tutorial._id;
     var activeStep = getState().tutorial.activeStep;
     var steps = tutorial.steps;
-    if (steps && steps[activeStep].type === 'task') {
+    if (steps && steps[activeStep].type === "task") {
       var tutorialsStatus = getState().tutorial.status;
-      var tutorialsStatusIndex = tutorialsStatus.findIndex(tutorialStatus => tutorialStatus._id === id);
-      var tasksIndex = tutorialsStatus[tutorialsStatusIndex].tasks.findIndex(task => task._id === steps[activeStep]._id);
+      var tutorialsStatusIndex = tutorialsStatus.findIndex(
+        (tutorialStatus) => tutorialStatus._id === id
+      );
+      var tasksIndex = tutorialsStatus[tutorialsStatusIndex].tasks.findIndex(
+        (task) => task._id === steps[activeStep]._id
+      );
       tutorialsStatus[tutorialsStatusIndex].tasks[tasksIndex] = {
         ...tutorialsStatus[tutorialsStatusIndex].tasks[tasksIndex],
-        xml: code
+        xml: code,
       };
       dispatch({
         type: TUTORIAL_XML,
-        payload: tutorialsStatus
+        payload: tutorialsStatus,
       });
       dispatch(updateStatus(tutorialsStatus));
     }
@@ -199,38 +281,45 @@ export const storeTutorialXml = (code) => (dispatch, getState) => {
 export const tutorialStep = (step) => (dispatch) => {
   dispatch({
     type: TUTORIAL_STEP,
-    payload: step
+    payload: step,
   });
 };
 
-
-const existingTutorials = (tutorials, status) => new Promise(function (resolve, reject) {
+const existingTutorials = (tutorials, status) =>
+  new Promise(function (resolve, reject) {
     var newstatus;
     new Promise(function (resolve, reject) {
       var existingTutorialIds = tutorials.map((tutorial, i) => {
-      existingTutorial(tutorial, status).then(status => {
+        existingTutorial(tutorial, status).then((status) => {
           newstatus = status;
         });
         return tutorial._id;
       });
-    resolve(existingTutorialIds)
-  }).then(existingTutorialIds => {
+      resolve(existingTutorialIds);
+    }).then((existingTutorialIds) => {
       // deleting old tutorials which do not longer exist
       if (existingTutorialIds.length > 0) {
-      status = newstatus.filter(status => existingTutorialIds.indexOf(status._id) > -1);
+        status = newstatus.filter(
+          (status) => existingTutorialIds.indexOf(status._id) > -1
+        );
       }
       resolve(status);
     });
-});
+  });
 
-const existingTutorial = (tutorial, status) => new Promise(function(resolve, reject){
+const existingTutorial = (tutorial, status) =>
+  new Promise(function (resolve, reject) {
     var tutorialsId = tutorial._id;
-  var statusIndex = status.findIndex(status => status._id === tutorialsId);
+    var statusIndex = status.findIndex((status) => status._id === tutorialsId);
     if (statusIndex > -1) {
-    var tasks = tutorial.steps.filter(step => step.type === 'task');
+      var tasks = tutorial.steps.filter((step) => step.type === "task");
       var existingTaskIds = tasks.map((task, j) => {
         var tasksId = task._id;
-      if (status[statusIndex].tasks.findIndex(task => task._id === tasksId) === -1) {
+        if (
+          status[statusIndex].tasks.findIndex(
+            (task) => task._id === tasksId
+          ) === -1
+        ) {
           // task does not exist
           status[statusIndex].tasks.push({ _id: tasksId });
         }
@@ -238,11 +327,19 @@ const existingTutorial = (tutorial, status) => new Promise(function(resolve, rej
       });
       // deleting old tasks which do not longer exist
       if (existingTaskIds.length > 0) {
-      status[statusIndex].tasks = status[statusIndex].tasks.filter(task => existingTaskIds.indexOf(task._id) > -1);
+        status[statusIndex].tasks = status[statusIndex].tasks.filter(
+          (task) => existingTaskIds.indexOf(task._id) > -1
+        );
       }
-  }
-  else {
-    status.push({ _id: tutorialsId, tasks: tutorial.steps.filter(step => step.type === 'task').map(task => { return { _id: task._id }; }) });
+    } else {
+      status.push({
+        _id: tutorialsId,
+        tasks: tutorial.steps
+          .filter((step) => step.type === "task")
+          .map((task) => {
+            return { _id: task._id };
+          }),
+      });
     }
     resolve(status);
-});
+  });

src/actions/tutorialBuilderActions.js

@@ -1,24 +1,63 @@
-import { PROGRESS, JSON_STRING, BUILDER_CHANGE, BUILDER_ERROR, BUILDER_TITLE, BUILDER_ID, BUILDER_BADGE, BUILDER_ADD_STEP, BUILDER_DELETE_STEP, BUILDER_CHANGE_STEP, BUILDER_CHANGE_ORDER, BUILDER_DELETE_PROPERTY } from './types';
+import {
+  PROGRESS,
+  JSON_STRING,
+  BUILDER_CHANGE,
+  BUILDER_ERROR,
+  BUILDER_TITLE,
+  BUILDER_PUBLIC,
+  BUILDER_DIFFICULTY,
+  BUILDER_REVIEW,
+  BUILDER_ID,
+  BUILDER_ADD_STEP,
+  BUILDER_DELETE_STEP,
+  BUILDER_CHANGE_STEP,
+  BUILDER_CHANGE_ORDER,
+  BUILDER_DELETE_PROPERTY,
+} from "./types";
 
-import data from '../data/hardware.json';
+import data from "../data/hardware.json";
 
 export const changeTutorialBuilder = () => (dispatch) => {
   dispatch({
-    type: BUILDER_CHANGE
+    type: BUILDER_CHANGE,
   });
 };
 
 export const jsonString = (json) => (dispatch) => {
   dispatch({
     type: JSON_STRING,
-    payload: json
+    payload: json,
   });
 };
 
 export const tutorialTitle = (title) => (dispatch) => {
   dispatch({
     type: BUILDER_TITLE,
-    payload: title
+    payload: title,
+  });
+  dispatch(changeTutorialBuilder());
+};
+
+export const tutorialPublic = (pub) => (dispatch) => {
+  dispatch({
+    type: BUILDER_PUBLIC,
+    payload: pub,
+  });
+  dispatch(changeTutorialBuilder());
+};
+
+export const tutorialDifficulty = (difficulty) => (dispatch) => {
+  dispatch({
+    type: BUILDER_DIFFICULTY,
+    payload: difficulty,
+  });
+  dispatch(changeTutorialBuilder());
+};
+
+export const tutorialReview = (review) => (dispatch) => {
+  dispatch({
+    type: BUILDER_REVIEW,
+    payload: review,
   });
   dispatch(changeTutorialBuilder());
 };
@@ -26,7 +65,7 @@ export const tutorialTitle = (title) => (dispatch) => {
 export const tutorialSteps = (steps) => (dispatch) => {
   dispatch({
     type: BUILDER_ADD_STEP,
-    payload: steps
+    payload: steps,
   });
   dispatch(changeTutorialBuilder());
 };
@@ -34,15 +73,7 @@ export const tutorialSteps = (steps) => (dispatch) => {
 export const tutorialId = (id) => (dispatch) => {
   dispatch({
     type: BUILDER_ID,
-    payload: id
-  });
-  dispatch(changeTutorialBuilder());
-};
-
-export const tutorialBadge = (badge) => (dispatch) => {
-  dispatch({
-    type: BUILDER_BADGE,
-    payload: badge
+    payload: id,
   });
   dispatch(changeTutorialBuilder());
 };
@@ -51,14 +82,14 @@ export const addStep = (index) => (dispatch, getState) => {
   var steps = getState().builder.steps;
   var step = {
     id: index + 1,
-    type: 'instruction',
-    headline: '',
-    text: ''
+    type: "instruction",
+    headline: "",
+    text: "",
   };
   steps.splice(index, 0, step);
   dispatch({
     type: BUILDER_ADD_STEP,
-    payload: steps
+    payload: steps,
   });
   dispatch(addErrorStep(index));
   dispatch(changeTutorialBuilder());
@@ -69,7 +100,7 @@ export const addErrorStep = (index) => (dispatch, getState) => {
   error.steps.splice(index, 0, {});
   dispatch({
     type: BUILDER_ERROR,
-    payload: error
+    payload: error,
   });
 };
 
@@ -78,7 +109,7 @@ export const removeStep = (index) => (dispatch, getState) => {
   steps.splice(index, 1);
   dispatch({
     type: BUILDER_DELETE_STEP,
-    payload: steps
+    payload: steps,
   });
   dispatch(removeErrorStep(index));
   dispatch(changeTutorialBuilder());
@@ -89,11 +120,12 @@ export const removeErrorStep = (index) => (dispatch, getState) => {
   error.steps.splice(index, 1);
   dispatch({
     type: BUILDER_ERROR,
-    payload: error
+    payload: error,
   });
 };
 
-export const changeContent = (content, index, property1, property2) => (dispatch, getState) => {
+export const changeContent =
+  (content, index, property1, property2) => (dispatch, getState) => {
     var steps = getState().builder.steps;
     var step = steps[index];
     if (property2) {
@@ -107,12 +139,13 @@ export const changeContent = (content, index, property1, property2) => (dispatch
     }
     dispatch({
       type: BUILDER_CHANGE_STEP,
-    payload: steps
+      payload: steps,
     });
     dispatch(changeTutorialBuilder());
-};
+  };
 
-export const deleteProperty = (index, property1, property2) => (dispatch, getState) => {
+export const deleteProperty =
+  (index, property1, property2) => (dispatch, getState) => {
     var steps = getState().builder.steps;
     var step = steps[index];
     if (property2) {
@@ -124,10 +157,10 @@ export const deleteProperty = (index, property1, property2) => (dispatch, getSta
     }
     dispatch({
       type: BUILDER_DELETE_PROPERTY,
-    payload: steps
+      payload: steps,
     });
     dispatch(changeTutorialBuilder());
-};
+  };
 
 export const changeStepIndex = (fromIndex, toIndex) => (dispatch, getState) => {
   var steps = getState().builder.steps;
@@ -136,34 +169,34 @@ export const changeStepIndex = (fromIndex, toIndex) => (dispatch, getState) => {
   steps.splice(toIndex, 0, step);
   dispatch({
     type: BUILDER_CHANGE_ORDER,
-    payload: steps
+    payload: steps,
   });
   dispatch(changeErrorStepIndex(fromIndex, toIndex));
   dispatch(changeTutorialBuilder());
 };
 
-export const changeErrorStepIndex = (fromIndex, toIndex) => (dispatch, getState) => {
+export const changeErrorStepIndex =
+  (fromIndex, toIndex) => (dispatch, getState) => {
     var error = getState().builder.error;
     var errorStep = error.steps[fromIndex];
     error.steps.splice(fromIndex, 1);
     error.steps.splice(toIndex, 0, errorStep);
     dispatch({
       type: BUILDER_ERROR,
-    payload: error
+      payload: error,
     });
-};
+  };
 
 export const setError = (index, property) => (dispatch, getState) => {
   var error = getState().builder.error;
   if (index !== undefined) {
     error.steps[index][property] = true;
-  }
-  else {
+  } else {
     error[property] = true;
   }
   dispatch({
     type: BUILDER_ERROR,
-    payload: error
+    payload: error,
   });
   dispatch(changeTutorialBuilder());
 };
@@ -172,13 +205,12 @@ export const deleteError = (index, property) => (dispatch, getState) => {
   var error = getState().builder.error;
   if (index !== undefined) {
     delete error.steps[index][property];
-  }
-  else {
+  } else {
     delete error[property];
   }
   dispatch({
     type: BUILDER_ERROR,
-    payload: error
+    payload: error,
   });
   dispatch(changeTutorialBuilder());
 };
@@ -188,11 +220,11 @@ export const setSubmitError = () => (dispatch, getState) => {
   // if(builder.id === undefined || builder.id === ''){
   //   dispatch(setError(undefined, 'id'));
   // }
-  if (builder.title === '') {
-    dispatch(setError(undefined, 'title'));
+  if (builder.title === "") {
+    dispatch(setError(undefined, "title"));
   }
   if (builder.title === null) {
-    dispatch(setError(undefined, 'badge'));
+    dispatch(setError(undefined, "title"));
   }
   var type = builder.steps.map((step, i) => {
     // media and xml are directly checked for errors in their components and
@@ -200,76 +232,82 @@ export const setSubmitError = () => (dispatch, getState) => {
     step.id = i + 1;
     if (i === 0) {
       if (step.requirements && step.requirements.length > 0) {
-        var requirements = step.requirements.filter(requirement => /^[0-9a-fA-F]{24}$/.test(requirement));
+        var requirements = step.requirements.filter((requirement) =>
+          /^[0-9a-fA-F]{24}$/.test(requirement)
+        );
         if (requirements.length < step.requirements.length) {
-          dispatch(changeContent(requirements, i, 'requirements'));
+          dispatch(changeContent(requirements, i, "requirements"));
         }
       }
       if (step.hardware === undefined || step.hardware.length < 1) {
-        dispatch(setError(i, 'hardware'));
-      }
-      else {
-        var hardwareIds = data.map(hardware => hardware.id);
-        var hardware = step.hardware.filter(hardware => hardwareIds.includes(hardware));
+        dispatch(setError(i, "hardware"));
+      } else {
+        var hardwareIds = data.map((hardware) => hardware.id);
+        var hardware = step.hardware.filter((hardware) =>
+          hardwareIds.includes(hardware)
+        );
         if (hardware.length < step.hardware.length) {
-          dispatch(changeContent(hardware, i, 'hardware'));
+          dispatch(changeContent(hardware, i, "hardware"));
         }
       }
     }
-    if (step.headline === undefined || step.headline === '') {
-      dispatch(setError(i, 'headline'));
+    if (step.headline === undefined || step.headline === "") {
+      dispatch(setError(i, "headline"));
     }
-    if (step.text === undefined || step.text === '') {
-      dispatch(setError(i, 'text'));
+    if (step.text === undefined || step.text === "") {
+      dispatch(setError(i, "text"));
     }
     return step.type;
   });
-  if (!(type.filter(item => item === 'task').length > 0 && type.filter(item => item === 'instruction').length > 0)) {
-    dispatch(setError(undefined, 'type'));
+  if (
+    !(
+      type.filter((item) => item === "task").length > 0 &&
+      type.filter((item) => item === "instruction").length > 0
+    )
+  ) {
+    dispatch(setError(undefined, "type"));
   }
 };
 
-
 export const checkError = () => (dispatch, getState) => {
   dispatch(setSubmitError());
   var error = getState().builder.error;
-  if (error.id || error.title || error.badge ||error.type) {
+  if (error.id || error.title || error.type) {
     return true;
   }
   for (var i = 0; i < error.steps.length; i++) {
     if (Object.keys(error.steps[i]).length > 0) {
-      return true
+      return true;
     }
   }
   return false;
-}
+};
 
 export const progress = (inProgress) => (dispatch) => {
   dispatch({
     type: PROGRESS,
-    payload: inProgress
-  })
+    payload: inProgress,
+  });
 };
 
 export const resetTutorial = () => (dispatch, getState) => {
-  dispatch(jsonString(''));
-  dispatch(tutorialTitle(''));
-  dispatch(tutorialBadge(undefined));
+  dispatch(jsonString(""));
+  dispatch(tutorialTitle(""));
   var steps = [
     {
-      type: 'instruction',
-      headline: '',
-      text: '',
+      type: "instruction",
+      headline: "",
+      text: "",
       hardware: [],
-      requirements: []
-    }
+      requirements: [],
+    },
   ];
   dispatch(tutorialSteps(steps));
   dispatch({
     type: BUILDER_ERROR,
     payload: {
-      steps: [{}]
-    }
+      steps: [{}],
+    },
   });
 };
 
@@ -278,8 +316,10 @@ export const readJSON = (json) => (dispatch, getState) => {
   dispatch({
     type: BUILDER_ERROR,
     payload: {
-      steps: json.steps.map(() => { return {}; })
-    }
+      steps: json.steps.map(() => {
+        return {};
+      }),
+    },
   });
   // accept only valid attributes
   var steps = json.steps.map((step, i) => {
@@ -287,7 +327,7 @@ export const readJSON = (json) => (dispatch, getState) => {
       _id: step._id,
       type: step.type,
       headline: step.headline,
-      text: step.text
+      text: step.text,
     };
     if (i === 0) {
       object.hardware = step.hardware;
@@ -296,19 +336,18 @@ export const readJSON = (json) => (dispatch, getState) => {
     if (step.xml) {
       object.xml = step.xml;
     }
-    if (step.media && step.type === 'instruction') {
+    if (step.media && step.type === "instruction") {
       object.media = {};
       if (step.media.picture) {
         object.media.picture = step.media.picture;
-      }
-      else if (step.media.youtube) {
+      } else if (step.media.youtube) {
         object.media.youtube = step.media.youtube;
       }
     }
     return object;
   });
   dispatch(tutorialTitle(json.title));
-  dispatch(tutorialBadge(json.badge));
+  dispatch(tutorialDifficulty(json.difficulty));
   dispatch(tutorialSteps(steps));
   dispatch(setSubmitError());
   dispatch(progress(false));

src/actions/types.js

@@ -1,65 +1,70 @@
 // authentication
-export const USER_LOADING = 'USER_LOADING';
-export const USER_LOADED = 'USER_LOADED';
-export const AUTH_ERROR = 'AUTH_ERROR';
-export const LOGIN_SUCCESS = 'LOGIN_SUCCESS';
-export const LOGIN_FAIL = 'LOGIN_FAIL';
-export const LOGOUT_SUCCESS = 'LOGOUT_SUCCESS';
-export const LOGOUT_FAIL = 'LOGOUT_FAIL';
-export const REFRESH_TOKEN_FAIL = 'REFRESH_TOKEN_FAIL';
-export const REFRESH_TOKEN_SUCCESS = 'REFRESH_TOKEN_SUCCESS';
-export const MYBADGES_CONNECT = 'MYBADGES_CONNECT';
-export const MYBADGES_DISCONNECT = 'MYBADGES_DISCONNECT';
+export const USER_LOADING = "USER_LOADING";
+export const USER_LOADED = "USER_LOADED";
+export const AUTH_ERROR = "AUTH_ERROR";
+export const LOGIN_SUCCESS = "LOGIN_SUCCESS";
+export const LOGIN_FAIL = "LOGIN_FAIL";
+export const LOGOUT_SUCCESS = "LOGOUT_SUCCESS";
+export const LOGOUT_FAIL = "LOGOUT_FAIL";
+export const REFRESH_TOKEN_FAIL = "REFRESH_TOKEN_FAIL";
+export const REFRESH_TOKEN_SUCCESS = "REFRESH_TOKEN_SUCCESS";
 
-export const NEW_CODE = 'NEW_CODE';
-export const CHANGE_WORKSPACE = 'CHANGE_WORKSPACE';
-export const CREATE_BLOCK = 'CREATE_BLOCK';
-export const MOVE_BLOCK = 'MOVE_BLOCK';
-export const CHANGE_BLOCK = 'CHANGE_BLOCK';
-export const DELETE_BLOCK = 'DELETE_BLOCK';
-export const CLEAR_STATS = 'CLEAR_STATS';
-export const NAME = 'NAME';
+export const NEW_CODE = "NEW_CODE";
+export const CHANGE_WORKSPACE = "CHANGE_WORKSPACE";
+export const CREATE_BLOCK = "CREATE_BLOCK";
+export const MOVE_BLOCK = "MOVE_BLOCK";
+export const CHANGE_BLOCK = "CHANGE_BLOCK";
+export const DELETE_BLOCK = "DELETE_BLOCK";
+export const CLEAR_STATS = "CLEAR_STATS";
+export const NAME = "NAME";
 
-export const TUTORIAL_PROGRESS = 'TUTORIAL_PROGRESS';
-export const GET_TUTORIAL = 'GET_TUTORIAL';
-export const GET_TUTORIALS = 'GET_TUTORIALS';
-export const GET_STATUS = 'GET_STATUS';
-export const TUTORIAL_SUCCESS = 'TUTORIAL_SUCCESS';
-export const TUTORIAL_ERROR = 'TUTORIAL_ERROR';
-export const TUTORIAL_CHANGE = 'TUTORIAL_CHANGE';
-export const TUTORIAL_XML = 'TUTORIAL_XML';
-export const TUTORIAL_ID = 'TUTORIAL_ID';
-export const TUTORIAL_STEP = 'TUTORIAL_STEP';
-export const JSON_STRING = 'JSON_STRING';
+export const TUTORIAL_PROGRESS = "TUTORIAL_PROGRESS";
+export const GET_TUTORIAL = "GET_TUTORIAL";
+export const GET_TUTORIALS = "GET_TUTORIALS";
+export const GET_USERTUTORIALS = "GET_USERTUTORIALS";
+export const GET_STATUS = "GET_STATUS";
+export const TUTORIAL_SUCCESS = "TUTORIAL_SUCCESS";
+export const TUTORIAL_ERROR = "TUTORIAL_ERROR";
+export const TUTORIAL_CHANGE = "TUTORIAL_CHANGE";
+export const TUTORIAL_XML = "TUTORIAL_XML";
+export const TUTORIAL_ID = "TUTORIAL_ID";
+export const TUTORIAL_STEP = "TUTORIAL_STEP";
+export const JSON_STRING = "JSON_STRING";
 
+export const BUILDER_CHANGE = "BUILDER_CHANGE";
+export const BUILDER_TITLE = "BUILDER_TITLE";
+export const BUILDER_DIFFICULTY = "BUILDER_DIFFICULTY";
+export const BUILDER_PUBLIC = "BUILDER_PUBLIC";
+export const BUILDER_REVIEW = "BUILDER_REVIEW";
+export const BUILDER_ID = "BUILDER_ID";
+export const BUILDER_ADD_STEP = "BUILDER_ADD_STEP";
+export const BUILDER_DELETE_STEP = "BUILDER_DELETE_STEP";
+export const BUILDER_CHANGE_STEP = "BUILDER_CHANGE_STEP";
+export const BUILDER_CHANGE_ORDER = "BUILDER_CHANGE_ORDER";
+export const BUILDER_DELETE_PROPERTY = "BUILDER_DELETE_PROPERTY";
+export const BUILDER_ERROR = "BUILDER_ERROR";
+export const PROGRESS = "PROGRESS";
 
-export const BUILDER_CHANGE = 'BUILDER_CHANGE';
-export const BUILDER_TITLE = 'BUILDER_TITLE';
-export const BUILDER_BADGE = 'BUILDER_BADGE';
-export const BUILDER_ID = 'BUILDER_ID';
-export const BUILDER_ADD_STEP = 'BUILDER_ADD_STEP';
-export const BUILDER_DELETE_STEP = 'BUILDER_DELETE_STEP';
-export const BUILDER_CHANGE_STEP = 'BUILDER_CHANGE_STEP';
-export const BUILDER_CHANGE_ORDER = 'BUILDER_CHANGE_ORDER';
-export const BUILDER_DELETE_PROPERTY = 'BUILDER_DELETE_PROPERTY';
-export const BUILDER_ERROR = 'BUILDER_ERROR';
-export const PROGRESS = 'PROGRESS';
-
-
-export const VISIT = 'VISIT';
-export const LANGUAGE = 'LANGUAGE';
-export const RENDERER = 'RENDERER';
-export const STATISTICS = 'STATISTICS';
+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
-export const GET_ERRORS = 'GET_ERRORS';
-export const GET_SUCCESS = 'GET_SUCCESS';
-export const CLEAR_MESSAGES = 'CLEAR_MESSAGES';
-
+export const GET_ERRORS = "GET_ERRORS";
+export const GET_SUCCESS = "GET_SUCCESS";
+export const CLEAR_MESSAGES = "CLEAR_MESSAGES";
 
 // projects: share, gallery, project
-export const PROJECT_PROGRESS = 'PROJECT_PROGRESS';
-export const GET_PROJECT = 'GET_PROJECT';
-export const GET_PROJECTS = 'GET_PROJECTS';
-export const PROJECT_TYPE = 'PROJECT_TYPE';
-export const PROJECT_DESCRIPTION = 'PROJECT_DESCRIPTION';
+export const PROJECT_PROGRESS = "PROJECT_PROGRESS";
+export const GET_PROJECT = "GET_PROJECT";
+export const GET_PROJECTS = "GET_PROJECTS";
+export const PROJECT_TYPE = "PROJECT_TYPE";
+export const PROJECT_DESCRIPTION = "PROJECT_DESCRIPTION";
+
+export const GET_ARDUINO_EXAMPLES = "GET_ARDUINO_EXAMPLES";
+
+//board
+export const BOARD = "BOARD";

src/actions/workspaceActions.js

@@ -16,6 +16,22 @@ export const onChangeCode = () => (dispatch, getState) => {
   code.arduino = Blockly.Arduino.workspaceToCode(workspace);
   var xmlDom = Blockly.Xml.workspaceToDom(workspace);
   code.xml = Blockly.Xml.domToPrettyText(xmlDom);
+  var selectedBlock = Blockly.selected
+  if (selectedBlock !== null) {
+    code.helpurl = selectedBlock.helpUrl
+    code.tooltip = selectedBlock.tooltip
+    if (selectedBlock.data) {
+      code.data = selectedBlock.data
+    } else {
+      code.data = null
+    }
+  } else if (selectedBlock === null) {
+    code.tooltip = Blockly.Msg.tooltip_hint
+    code.helpurl = ''
+    code.data = null
+  }
+
+
   dispatch({
     type: NEW_CODE,
     payload: code

src/components/Alert.js

@@ -1,34 +1,29 @@
-import React, { Component } from 'react';
+import React, { Component } from "react";
 
-import { withStyles } from '@material-ui/core/styles';
-import { fade } from '@material-ui/core/styles/colorManipulator';
+import withStyles from '@mui/styles/withStyles';
+import { alpha } from "@mui/material/styles";
 
-import Typography from '@material-ui/core/Typography';
+import Typography from "@mui/material/Typography";
 
 const styles = (theme) => ({
   alert: {
-    marginBottom: '20px',
+    marginBottom: "20px",
     border: `1px solid ${theme.palette.primary.main}`,
-    padding: '10px 20px',
-    borderRadius: '4px',
-    background: fade(theme.palette.primary.main, 0.3),
-    color: 'rgb(70,70,70)'
-  }
+    padding: "10px 20px",
+    borderRadius: "4px",
+    background: alpha(theme.palette.primary.main, 0.3),
+    color: "rgb(70,70,70)",
+  },
 });
 
-
 export class Alert extends Component {
-
-  render(){
-    return(
+  render() {
+    return (
       <div className={this.props.classes.alert}>
-        <Typography>
-          {this.props.children}
-        </Typography>
+        <Typography>{this.props.children}</Typography>
       </div>
     );
   }
 }
 
-
 export default withStyles(styles, { withTheme: true })(Alert);

src/components/Blockly/BlocklyComponent.jsx

@@ -21,18 +21,20 @@
  * @author samelh@google.com (Sam El-Husseini)
  */
 
-import React from 'react';
-
-import Blockly from 'blockly/core';
-import 'blockly/blocks';
-import Toolbox from './toolbox/Toolbox';
-
-import { Card } from '@material-ui/core';
+import React from "react";
 
+import Blockly from "blockly/core";
+import "blockly/blocks";
+import Toolbox from "./toolbox/Toolbox";
 
+import { Card } from "@mui/material";
+import {
+  ScrollOptions,
+  ScrollBlockDragger,
+  ScrollMetricsManager,
+} from "@blockly/plugin-scroll-options";
 
 class BlocklyComponent extends React.Component {
-
   constructor(props) {
     super(props);
     this.blocklyDiv = React.createRef();
@@ -42,17 +44,25 @@ class BlocklyComponent extends React.Component {
 
   componentDidMount() {
     const { initialXml, children, ...rest } = this.props;
-        this.primaryWorkspace = Blockly.inject(
-            this.blocklyDiv.current,
-            {
+    this.primaryWorkspace = Blockly.inject(this.blocklyDiv.current, {
       toolbox: this.toolbox.current,
-                ...rest
+      plugins: {
+        // These are both required.
+        blockDragger: ScrollBlockDragger,
+        metricsManager: ScrollMetricsManager,
       },
-        );
-        this.setState({ workspace: this.primaryWorkspace })
+      ...rest,
+    });
+    // Initialize plugin.
 
+    this.setState({ workspace: this.primaryWorkspace });
+    const plugin = new ScrollOptions(this.workspace);
+    plugin.init({ enableWheelScroll: true, enableEdgeScroll: false });
     if (initialXml) {
-            Blockly.Xml.domToWorkspace(Blockly.Xml.textToDom(initialXml), this.primaryWorkspace);
+      Blockly.Xml.domToWorkspace(
+        Blockly.Xml.textToDom(initialXml),
+        this.primaryWorkspace
+      );
     }
   }
 
@@ -61,14 +71,23 @@ class BlocklyComponent extends React.Component {
   }
 
   setXml(xml) {
-        Blockly.Xml.domToWorkspace(Blockly.Xml.textToDom(xml), this.primaryWorkspace);
+    Blockly.Xml.domToWorkspace(
+      Blockly.Xml.textToDom(xml),
+      this.primaryWorkspace
+    );
   }
 
   render() {
-        return <React.Fragment>
-            <Card ref={this.blocklyDiv} id="blocklyDiv" style={this.props.style ? this.props.style : {}} />
+    return (
+      <React.Fragment>
+        <Card
+          ref={this.blocklyDiv}
+          id="blocklyDiv"
+          style={this.props.style ? this.props.style : {}}
+        />
         <Toolbox toolbox={this.toolbox} workspace={this.state.workspace} />
-        </React.Fragment>;
+      </React.Fragment>
+    );
   }
 }
 

src/components/Blockly/BlocklyWindow.js

@@ -1,20 +1,20 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import { onChangeWorkspace, clearStats } from '../../actions/workspaceActions';
+import React, { Component } from "react";
+import PropTypes from "prop-types";
+import { connect } from "react-redux";
+import { onChangeWorkspace, clearStats } from "../../actions/workspaceActions";
 
-import BlocklyComponent from './BlocklyComponent';
-import BlocklySvg from './BlocklySvg';
-
-import * as Blockly from 'blockly/core';
-import './blocks/index';
-import './generator/index';
-
-import { initialXml } from './initialXml.js';
+import BlocklyComponent from "./BlocklyComponent";
+import BlocklySvg from "./BlocklySvg";
 
+import * as Blockly from "blockly/core";
+import "./blocks/index";
+import "./generator/index";
+import { ZoomToFitControl } from "@blockly/zoom-to-fit";
+import { initialXml } from "./initialXml.js";
+import { getMaxInstances } from "./helpers/maxInstances";
+import { Backpack } from "@blockly/workspace-backpack";
 
 class BlocklyWindow extends Component {
-
   constructor(props) {
     super(props);
     this.simpleWorkspace = React.createRef();
@@ -26,6 +26,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) {
@@ -33,11 +34,25 @@ class BlocklyWindow extends Component {
       }
     });
     Blockly.svgResize(workspace);
+    const zoomToFit = new ZoomToFitControl(workspace);
+    zoomToFit.init();
+    // Initialize plugin.
+    const backpack = new Backpack(workspace);
+    backpack.init();
   }
 
   componentDidUpdate(props) {
     const workspace = Blockly.getMainWorkspace();
     var xml = this.props.initialXml;
+    if (props.selectedBoard !== this.props.selectedBoard) {
+      // change board
+      if(!xml) xml = initialXml;
+      var xmlDom = Blockly.Xml.textToDom(xml);
+      Blockly.Xml.clearWorkspaceAndLoadFromXml(xmlDom, workspace);
+      // var toolbox = workspace.getToolbox();
+      // workspace.updateToolbox(toolbox.toolboxDef_);
+    }
+ 
     // if svg is true, then the update process is done in the BlocklySvg component
     if (props.initialXml !== xml && !this.props.svg) {
       // guarantees that the current xml-code (this.props.initialXml) is rendered
@@ -45,13 +60,12 @@ class BlocklyWindow extends Component {
       if (!xml) xml = initialXml;
       Blockly.Xml.domToWorkspace(Blockly.Xml.textToDom(xml), workspace);
     }
-    if(props.language !== this.props.language){
+    if (props.language !== this.props.language) {
       // change language
       if (!xml) xml = initialXml;
-      var xmlDom = Blockly.Xml.textToDom(xml);
+       xmlDom = Blockly.Xml.textToDom(xml);
       Blockly.Xml.clearWorkspaceAndLoadFromXml(xmlDom, workspace);
       // var toolbox = workspace.getToolbox();
-      // console.log(toolbox);
       // workspace.updateToolbox(toolbox.toolboxDef_);
     }
     Blockly.svgResize(workspace);
@@ -60,52 +74,80 @@ class BlocklyWindow extends Component {
   render() {
     return (
       <div>
-        <BlocklyComponent ref={this.simpleWorkspace}
+        <BlocklyComponent
+          ref={this.simpleWorkspace}
           style={this.props.svg ? { height: 0 } : this.props.blocklyCSS}
-          readOnly={this.props.readOnly !== undefined ? this.props.readOnly : false}
-          trashcan={this.props.trashcan !== undefined ? this.props.trashcan : true}
+          readOnly={
+            this.props.readOnly !== undefined ? this.props.readOnly : false
+          }
+          trashcan={
+            this.props.trashcan !== undefined ? this.props.trashcan : true
+          }
           renderer={this.props.renderer}
-          zoom={{ // https://developers.google.com/blockly/guides/configure/web/zoom
-            controls: this.props.zoomControls !== undefined ? this.props.zoomControls : true,
+          sounds={this.props.sounds}
+          maxInstances={getMaxInstances()}
+          zoom={{
+            // https://developers.google.com/blockly/guides/configure/web/zoom
+            controls:
+              this.props.zoomControls !== undefined
+                ? this.props.zoomControls
+                : true,
             wheel: false,
             startScale: 1,
             maxScale: 3,
             minScale: 0.3,
-            scaleSpeed: 1.2
+            scaleSpeed: 1.2,
           }}
-          grid={this.props.grid !== undefined && !this.props.grid ? {} :
-            { // https://developers.google.com/blockly/guides/configure/web/grid
+          grid={
+            this.props.grid !== undefined && !this.props.grid
+              ? {}
+              : {
+                  // https://developers.google.com/blockly/guides/configure/web/grid
                   spacing: 20,
                   length: 1,
-              colour: '#4EAF47', // senseBox-green
-              snap: false
-            }}
-          media={'/media/blockly/'}
-          move={this.props.move !== undefined && !this.props.move ? {} :
-            { // https://developers.google.com/blockly/guides/configure/web/move
+                  colour: "#4EAF47", // senseBox-green
+                  snap: false,
+                }
+          }
+          media={"/media/blockly/"}
+          move={
+            this.props.move !== undefined && !this.props.move
+              ? {}
+              : {
+                  // https://developers.google.com/blockly/guides/configure/web/move
                   scrollbars: true,
                   drag: true,
-              wheel: false
-            }}
-          initialXml={this.props.initialXml ? this.props.initialXml : initialXml}
-        >
-        </BlocklyComponent >
-        {this.props.svg && this.props.initialXml ? <BlocklySvg initialXml={this.props.initialXml} /> : null}
+                  wheel: true,
+                }
+          }
+          initialXml={
+            this.props.initialXml ? this.props.initialXml : initialXml
+          }
+        ></BlocklyComponent>
+        {this.props.svg && this.props.initialXml ? (
+          <BlocklySvg initialXml={this.props.initialXml} />
+        ) : null}
       </div>
     );
-  };
+  }
 }
 
 BlocklyWindow.propTypes = {
   onChangeWorkspace: PropTypes.func.isRequired,
   clearStats: PropTypes.func.isRequired,
   renderer: PropTypes.string.isRequired,
-  language: PropTypes.string.isRequired
+  sounds: PropTypes.bool.isRequired,
+  language: PropTypes.string.isRequired,
+  selectedBoard: PropTypes.string.isRequired,
 };
 
-const mapStateToProps = state => ({
+const mapStateToProps = (state) => ({
   renderer: state.general.renderer,
-  language: state.general.language
+  sounds: state.general.sounds,
+  language: state.general.language,
+  selectedBoard: state.board.board,
 });
 
-export default connect(mapStateToProps, { onChangeWorkspace, clearStats })(BlocklyWindow);
+export default connect(mapStateToProps, { onChangeWorkspace, clearStats })(
+  BlocklyWindow
+);

src/components/Blockly/blocks/index.js

@@ -1,24 +1,29 @@
-import './loops';
-import './sensebox';
-import './logic';
-import './sensebox-sensors';
-import './sensebox-telegram';
-import './sensebox-osem';
-import './sensebox-web';
-import './sensebox-display';
-import './sensebox-lora';
-import './sensebox-led';
-import './sensebox-sd';
-import './mqtt';
-import './text';
-import './io';
-import './audio';
-import './math';
-import './map';
-import './procedures';
-import './time';
-import './variables';
-import './lists';
-import './webserver';
+import "./loops";
+import "./sensebox";
+import "./logic";
+import "./sensebox-sensors";
+import "./sensebox-telegram";
+import "./sensebox-osem";
+import "./sensebox-web";
+import "./sensebox-display";
+import "./sensebox-motors";
+import "./sensebox-lora";
+import "./sensebox-led";
+import "./sensebox-rtc";
+import "./sensebox-ble";
+import "./sensebox-sd";
+import "./mqtt";
+import "./text";
+import "./io";
+import "./audio";
+import "./math";
+import "./map";
+import "./procedures";
+import "./serial";
+import "./time";
+import "./variables";
+import "./lists";
+import "./watchdog";
+import "./webserver";
 
-import '../helpers/types'
+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.
@@ -136,27 +123,28 @@ Blockly.Blocks['controls_if'] = {
   saveConnections: function (containerBlock) {
     var clauseBlock = containerBlock.nextConnection.targetBlock();
     var i = 1;
+    var inputDo;
     while (clauseBlock) {
       switch (clauseBlock.type) {
-                case 'controls_if_elseif':
-                    var inputIf = this.getInput('IF' + i);
-                    var 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':
-                    var 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();
     }
   },
   /**
@@ -166,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 i = 1;
-        while (this.getInput('IF' + i)) {
-            this.removeInput('IF' + i);
-            this.removeInput('DO' + i);
-            i++;
+    var j = 1;
+    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];
     });
@@ -461,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.setTooltip('Does something if the condition is true. If there isn\'t a matching case the default function will be executed.');
+    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;
   },
@@ -500,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);
     }
@@ -546,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_);
           }
@@ -570,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/loops.js

@@ -2,7 +2,7 @@
 import Blockly from 'blockly';
 import { getColour } from '../helpers/colour';
 import { getCompatibleTypes } from '../helpers/types'
-
+import * as Types from '../helpers/types';
 
 Blockly.Blocks['controls_whileUntil'] = {
     /**
@@ -16,7 +16,7 @@ Blockly.Blocks['controls_whileUntil'] = {
         this.setHelpUrl(Blockly.Msg.CONTROLS_WHILEUNTIL_HELPURL);
         this.setColour(getColour().loops);
         this.appendValueInput('BOOL')
-            .setCheck(getCompatibleTypes(Boolean))
+            .setCheck(getCompatibleTypes('boolean'))
             .appendField(new Blockly.FieldDropdown(OPERATORS), 'MODE');
         this.appendStatementInput('DO')
             .appendField(Blockly.Msg.CONTROLS_WHILEUNTIL_INPUT_DO);
@@ -47,24 +47,25 @@ Blockly.Blocks['controls_for'] = {
                 {
                     "type": "field_variable",
                     "name": "VAR",
+                    "defaultType": Types.NUMBER.typeName,
                     "variable": null
                 },
                 {
                     "type": "input_value",
                     "name": "FROM",
-                    "check": getCompatibleTypes(Number),
+                    "check": getCompatibleTypes('int'),
                     "align": "RIGHT"
                 },
                 {
                     "type": "input_value",
                     "name": "TO",
-                    "check": getCompatibleTypes(Number),
+                    "check": getCompatibleTypes('int'),
                     "align": "RIGHT"
                 },
                 {
                     "type": "input_value",
                     "name": "BY",
-                    "check": getCompatibleTypes(Number),
+                    "check": getCompatibleTypes('int'),
                     "align": "RIGHT"
                 }
             ],
@@ -97,12 +98,13 @@ Blockly.Blocks['controls_forEach'] = {
                 {
                     "type": "field_variable",
                     "name": "VAR",
+                    "defaultType": Types.NUMBER.typeName,
                     "variable": null
                 },
                 {
                     "type": "input_value",
                     "name": "LIST",
-                    "check": getCompatibleTypes(Array)
+                    "check": getCompatibleTypes('Array')
                 }
             ],
             "previousStatement": null,
@@ -195,7 +197,7 @@ Blockly.Blocks['controls_repeat_ext'] = {
                 {
                     "type": "input_value",
                     "name": "TIMES",
-                    "check": getCompatibleTypes(Number),
+                    "check": getCompatibleTypes('int'),
                 }
             ],
             "previousStatement": null,

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/math.js

@@ -287,7 +287,8 @@ Blockly.Blocks['math_change'] = {
                 {
                     "type": "field_variable",
                     "name": "VAR",
-                    "variable": Blockly.Msg.MATH_CHANGE_TITLE_ITEM
+                    "defaultType": Types.NUMBER.typeName,
+                    "variable": null
                 },
                 {
                     "type": "input_value",

src/components/Blockly/blocks/mqtt.js

@@ -32,6 +32,7 @@ Blockly.Blocks["sensebox_mqtt_setup"] = {
             .appendField(new Blockly.FieldTextInput("Password"), "password");
         this.setPreviousStatement(true, null);
         this.setNextStatement(true, null);
+        this.setTooltip(Blockly.Msg.senseBox_mqtt_init_tooltip);
     },
     onchange: function (e) {
         let service = this.getFieldValue('service');
@@ -48,9 +49,6 @@ Blockly.Blocks["sensebox_mqtt_setup"] = {
                 break;
 
             case "custom":
-                this.getField('server').setValue("server");
-                this.getField('port').setValue("port");
-                this.getField('passwordmsg').setValue(Blockly.Msg.senseBox_mqtt_password);
                 break;
             default:
 
@@ -71,6 +69,7 @@ Blockly.Blocks["sensebox_mqtt_publish"] = {
             .appendField(new Blockly.FieldTextInput('Name'), 'publishfeed');
         this.setPreviousStatement(true, null);
         this.setNextStatement(true, null);
+        this.setTooltip(Blockly.Msg.senseBox_mqtt_publish_tooltip);
     }
 };
 
@@ -84,3 +83,4 @@ Blockly.Blocks["sensebox_mqtt_subscribe"] = {
         this.setOutput(true, null);
     }
 };
+

src/components/Blockly/blocks/procedures.js

@@ -1148,9 +1148,7 @@ Blockly.Blocks['procedures_callnoreturn'] = {
                     // This should only be possible programatically and may indicate a problem
                     // with event grouping. If you see this message please investigate. If the
                     // use ends up being valid we may need to reorder events in the undo stack.
-                    console.log(
-                        'Saw an existing group while responding to a definition change'
-                    );
+                   
                 }
                 Blockly.Events.setGroup(event.group);
                 if (event.newValue) {

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

@@ -0,0 +1,152 @@
+import * as Blockly from "blockly";
+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");
+
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+    this.setTooltip(Blockly.Msg.sensebox_phyphox_init_tooltip);
+  },
+};
+
+Blockly.Blocks["sensebox_phyphox_experiment"] = {
+  init: function () {
+    this.setColour(getColour().phyphox);
+    this.appendDummyInput().appendField(
+      Blockly.Msg.sensebox_phyphox_createExperiment
+    );
+    this.appendDummyInput()
+      .appendField(Blockly.Msg.sensebox_phyphox_experimentTitle)
+      .appendField(new Blockly.FieldTextInput("Experiment Title"), "title");
+    this.appendDummyInput()
+      .appendField(Blockly.Msg.sensebox_phyphox_experimentDescription)
+      .appendField(
+        new Blockly.FieldTextInput(
+          Blockly.Msg.sensebox_phyphox_experiment_description
+        ),
+        "description"
+      );
+    this.appendStatementInput("view").appendField(
+      Blockly.Msg.sensebox_phyphox_createView
+    );
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+    this.setTooltip(Blockly.Msg.sensebox_phyphox_experiment_tooltip);
+    this.setHelpUrl(Blockly.Msg.sensebox_phyphox_helpurl);
+  },
+};
+
+Blockly.Blocks["sensebox_phyphox_graph"] = {
+  init: function () {
+    this.setColour(getColour().phyphox);
+    this.appendDummyInput()
+      .appendField(Blockly.Msg.sensebox_phyphox_createGraph)
+      .appendField(Blockly.Msg.sensebox_phyphox_graphLabel)
+      .appendField(new Blockly.FieldTextInput("Label"), "label");
+    this.appendDummyInput()
+      .appendField(Blockly.Msg.sensebox_phyphox_unitx)
+      .appendField(new Blockly.FieldTextInput("Unit X"), "unitx");
+    this.appendDummyInput()
+      .appendField(Blockly.Msg.sensebox_phyphox_unity)
+      .appendField(new Blockly.FieldTextInput("Unit Y"), "unity");
+    this.appendDummyInput()
+      .appendField(Blockly.Msg.sensebox_phyphox_labelx)
+      .appendField(new Blockly.FieldTextInput("Label X"), "labelx");
+    this.appendDummyInput()
+      .appendField(Blockly.Msg.sensebox_phyphox_labely)
+      .appendField(new Blockly.FieldTextInput("Label Y"), "labely");
+    this.appendDummyInput()
+      .appendField(Blockly.Msg.sensebox_phyphox_graphStyle)
+      .appendField(
+        new Blockly.FieldDropdown([
+          [Blockly.Msg.sensebox_phyphox_style_line, "line"],
+          [Blockly.Msg.sensebox_phyphox_style_dots, "dots"],
+        ]),
+        "style"
+      );
+    this.appendValueInput("channel0").appendField(
+      Blockly.Msg.sensebox_phyphox_channel0
+    );
+    this.appendValueInput("channel1").appendField(
+      Blockly.Msg.sensebox_phyphox_channel1
+    );
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+    this.setTooltip(Blockly.Msg.sensebox_phyphox_graph_tooltip);
+    this.setHelpUrl(Blockly.Msg.sensebox_phyphox_helpurl);
+  },
+};
+
+Blockly.Blocks["sensebox_phyphox_timestamp"] = {
+  init: function () {
+    this.setColour(getColour().phyphox);
+    this.appendDummyInput().appendField(Blockly.Msg.sensebox_phyphox_timestamp);
+    this.setOutput(true);
+    this.setTooltip(Blockly.Msg.sensebox_phyphox_timestamp_tooltip);
+    this.setHelpUrl(Blockly.Msg.sensebox_phyphox_helpurl);
+  },
+};
+
+Blockly.Blocks["sensebox_phyphox_channel"] = {
+  init: function () {
+    this.setColour(getColour().phyphox);
+    this.appendDummyInput()
+      .appendField(Blockly.Msg.sensebox_phyphox_channel)
+      .appendField(
+        new Blockly.FieldDropdown([
+          ["1", "1"],
+          ["2", "2"],
+          ["3", "3"],
+          ["4", "4"],
+          ["5", "5"],
+        ]),
+        "channel"
+      );
+
+    this.setOutput(true);
+    this.setTooltip(Blockly.Msg.sensebox_phyphox_channel_tooltip);
+    this.setHelpUrl(Blockly.Msg.sensebox_phyphox_helpurl);
+  },
+};
+
+Blockly.Blocks["sensebox_phyphox_sendchannel"] = {
+  init: function () {
+    this.setColour(getColour().phyphox);
+    this.appendValueInput("value")
+      .appendField(Blockly.Msg.sensebox_phyphox_sendchannel)
+      .appendField(
+        new Blockly.FieldDropdown([
+          ["1", "1"],
+          ["2", "2"],
+          ["3", "3"],
+          ["4", "4"],
+          ["5", "5"],
+        ]),
+        "channel"
+      );
+
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+    this.setTooltip(Blockly.Msg.sensebox_phyphox_sendchannel_tooltip);
+    this.setHelpUrl(Blockly.Msg.sensebox_phyphox_helpurl);
+  },
+};
+
+Blockly.Blocks["sensebox_phyphox_experiment_send"] = {
+  init: function () {
+    this.setColour(getColour().phyphox);
+    this.appendStatementInput("sendValues").appendField(
+      Blockly.Msg.sensebox_phyphox_writeValues
+    );
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+    this.setTooltip(Blockly.Msg.sensebox_phyphox_experiment_send_tooltip);
+    this.setHelpUrl(Blockly.Msg.sensebox_phyphox_helpurl);
+  },
+};

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

@@ -1,57 +1,65 @@
-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_tip);
-        this.setHelpUrl('https://sensebox.de/books');
-    }
+    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_tip);
-        this.setHelpUrl('https://sensebox.de/books');
-    }
+    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);
     this.setNextStatement(true, null);
-        this.setTooltip(Blockly.Msg.senseBox_display_printDisplay_tip);
-        this.setHelpUrl('https://sensebox.de/books');
+    this.setTooltip(Blockly.Msg.senseBox_display_printDisplay_tooltip);
+    this.setHelpUrl(Blockly.Msg.senseBox_display_helpurl);
   },
   /**
    * Called whenever anything on the workspace changes.
@@ -76,30 +84,37 @@ 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_tip);
-        this.setHelpUrl('https://sensebox.de/books');
+    this.setTooltip(Blockly.Msg.sensebox_display_fastPrint_tooltip);
+    this.setHelpUrl(Blockly.Msg.senseBox_display_helpurl);
   },
   /**
    * Called whenever anything on the workspace changes.
@@ -112,7 +127,7 @@ Blockly.Blocks['sensebox_display_fastPrint'] = {
     // Is the block nested in a loop?
     var block = this;
     do {
-            if (this.LOOP_TYPES.indexOf(block.type) != -1) {
+      if (this.LOOP_TYPES.indexOf(block.type) !== -1) {
         legal = true;
         break;
       }
@@ -124,43 +139,53 @@ 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);
     this.setNextStatement(true, null);
-        this.setTooltip(Blockly.Msg.senseBox_display_printDisplay_tip);
-        this.setHelpUrl('https://sensebox.de/books');
+    this.setTooltip(Blockly.Msg.senseBox_display_printDisplay_tooltip);
+    this.setHelpUrl(Blockly.Msg.senseBox_display_helpurl);
   },
   /**
    * Called whenever anything on the workspace changes.
@@ -185,41 +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.setPreviousStatement(true, null);
     this.setNextStatement(true, null);
   },
@@ -246,30 +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.setPreviousStatement(true, null);
     this.setNextStatement(true, null);
   },
@@ -296,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-led.js

@@ -1,8 +1,7 @@
 import * as Blockly from 'blockly';
-import { FieldSlider } from '@blockly/field-slider';
 import { getColour } from '../helpers/colour'
 import { selectedBoard } from '../helpers/board'
-
+import * as Types from '../helpers/types'
 
 
 Blockly.Blocks['sensebox_led'] = {
@@ -16,7 +15,7 @@ Blockly.Blocks['sensebox_led'] = {
             .appendField(new Blockly.FieldDropdown([[Blockly.Msg.senseBox_on, "HIGH"], [Blockly.Msg.senseBox_off, "LOW"]]), "STAT");
         this.setPreviousStatement(true, null);
         this.setNextStatement(true, null);
-        this.setTooltip(Blockly.Msg.senseBox_led_tip);
+        this.setTooltip(Blockly.Msg.senseBox_led_tooltip);
     }
 };
 
@@ -27,47 +26,147 @@ Blockly.Blocks['sensebox_rgb_led'] = {
             .appendField(Blockly.Msg.senseBox_rgb_led)
             .appendField("Pin:")
             .appendField(new Blockly.FieldDropdown(selectedBoard().digitalPins), "PIN");
-        this.appendDummyInput()
-            .appendField(Blockly.Msg.COLOUR_RGB_RED)//Blockly.Msg.senseBox_basic_red
-            .appendField(new FieldSlider(255, 0, 255), "RED");
-        this.appendDummyInput()
-            .appendField(Blockly.Msg.COLOUR_RGB_GREEN)//Blockly.Msg.senseBox_basic_green
-            .appendField(new FieldSlider(255, 0, 255), "GREEN");
-        this.appendDummyInput()
-            .appendField(Blockly.Msg.COLOUR_RGB_BLUE)//Blockly.Msg.senseBox_basic_green
-            .appendField(new FieldSlider(255, 0, 255), "BLUE");
+
+        this.appendValueInput("COLOR", 'Number')
+            .appendField(Blockly.Msg.senseBox_ws2818_rgb_led_color)
+            .setCheck("Colour");
+        // this.appendValueInput("RED", 'Number')
+        //     .appendField(Blockly.Msg.COLOUR_RGB_RED);//Blockly.Msg.senseBox_basic_red
+        // this.appendValueInput("GREEN", 'Number')
+        //     .appendField(Blockly.Msg.COLOUR_RGB_GREEN);//Blockly.Msg.senseBox_basic_green
+        // this.appendValueInput("BLUE", 'Number')
+        //     .appendField(Blockly.Msg.COLOUR_RGB_BLUE);
         this.setPreviousStatement(true, null);
         this.setNextStatement(true, null);
         this.setTooltip(Blockly.Msg.senseBox_rgb_led_tip);
-        this.setHelpUrl('https://sensebox.de/books');
     }
 };
 
 
+Blockly.Blocks['sensebox_ws2818_led_init'] = {
+    init: function () {
+        this.setColour(getColour().sensebox);
+        this.appendDummyInput()
+            .appendField(Blockly.Msg.senseBox_ws2818_rgb_led_init)
+            .appendField("Port:")
+            .appendField(new Blockly.FieldDropdown(selectedBoard().digitalPinsRGB), "Port")
+        this.appendValueInput("BRIGHTNESS", "brightness")
+            .appendField((Blockly.Msg.senseBox_ws2818_rgb_led_brightness));
+        this.appendValueInput("NUMBER", "number")
+            .appendField((Blockly.Msg.senseBox_ws2818_rgb_led_number));
+        this.setPreviousStatement(true, null);
+        this.setNextStatement(true, null);
+        this.setTooltip(Blockly.Msg.senseBox_ws2818_rgb_led_init_tooltip);
+    }
+};
+
 Blockly.Blocks['sensebox_ws2818_led'] = {
     init: function () {
-
-        var dropdownOptions = [[Blockly.Msg.senseBox_ultrasonic_port_A, '1'],
-        [Blockly.Msg.senseBox_ultrasonic_port_B, '3'], [Blockly.Msg.senseBox_ultrasonic_port_C, '5']];
-
         this.setColour(getColour().sensebox);
         this.appendDummyInput()
             .appendField(Blockly.Msg.senseBox_ws2818_rgb_led)
-            .appendField("Pin:")
-            .appendField(new Blockly.FieldDropdown(dropdownOptions), "Port")
-        this.appendValueInput("BRIGHTNESS", "brightness")
-            .appendField((Blockly.Msg.senseBox_ws2818_rgb_led_brightness));
+            .appendField("Port:")
+            .appendField(new Blockly.FieldDropdown(selectedBoard().digitalPinsRGB), "Port")
         this.appendValueInput("POSITION", "position")
             .appendField((Blockly.Msg.senseBox_ws2818_rgb_led_position));
-        this.appendValueInput("RED", 'Number')
-            .appendField(Blockly.Msg.COLOUR_RGB_RED);//Blockly.Msg.senseBox_basic_red
-        this.appendValueInput("GREEN", 'Number')
-            .appendField(Blockly.Msg.COLOUR_RGB_GREEN);//Blockly.Msg.senseBox_basic_green
-        this.appendValueInput("BLUE", 'Number')
-            .appendField(Blockly.Msg.COLOUR_RGB_BLUE);
+        this.appendValueInput("COLOR", 'Number')
+            .appendField(Blockly.Msg.senseBox_ws2818_rgb_led_color)
+            .setCheck("Colour");
         this.setPreviousStatement(true, null);
         this.setNextStatement(true, null);
-        this.setTooltip(Blockly.Msg.senseBox_rgb_led_tip);
-        this.setHelpUrl('https://sensebox.de/books');
+        this.setTooltip(Blockly.Msg.senseBox_ws2818_rgb_led_tooltip);
     }
 };
+
+
+Blockly.defineBlocksWithJsonArray([  // BEGIN JSON EXTRACT
+    // Block for colour picker.
+    {
+        "type": "colour_picker",
+        "message0": "%1",
+        "args0": [
+            {
+                "type": "field_colour",
+                "name": "COLOUR",
+                "colour": "#ff0000"
+            }
+        ],
+        "output": "Colour",
+        "helpUrl": "%{BKY_COLOUR_PICKER_HELPURL}",
+        "colour": getColour().sensebox,
+        "tooltip": "%{BKY_COLOUR_PICKER_TOOLTIP}",
+        "extensions": ["parent_tooltip_when_inline"]
+    },
+
+    // Block for random colour.
+    {
+        "type": "colour_random",
+        "message0": "%{BKY_COLOUR_RANDOM_TITLE}",
+        "output": "Colour",
+        "helpUrl": "%{BKY_COLOUR_RANDOM_HELPURL}",
+        "colour": getColour().sensebox,
+        "tooltip": "%{BKY_COLOUR_RANDOM_TOOLTIP}"
+    },
+
+    // Block for composing a colour from RGB components.
+    {
+        "type": "colour_rgb",
+        "message0": "%{BKY_COLOUR_RGB_TITLE} %{BKY_COLOUR_RGB_RED} %1 %{BKY_COLOUR_RGB_GREEN} %2 %{BKY_COLOUR_RGB_BLUE} %3",
+        "args0": [
+            {
+                "type": "input_value",
+                "name": "RED",
+                "check": Types.getCompatibleTypes('int'),
+                "align": "RIGHT"
+            },
+            {
+                "type": "input_value",
+                "name": "GREEN",
+                "check": Types.getCompatibleTypes('int'),
+                "align": "RIGHT"
+            },
+            {
+                "type": "input_value",
+                "name": "BLUE",
+                "check": Types.getCompatibleTypes('int'),
+                "align": "RIGHT"
+            }
+        ],
+        "output": "Colour",
+        "helpUrl": "%{BKY_COLOUR_RGB_HELPURL}",
+        "colour": getColour().sensebox,
+        "tooltip": "%{BKY_COLOUR_RGB_TOOLTIP}"
+    },
+
+    // Block for blending two colours together.
+    {
+        "type": "colour_blend",
+        "message0": "%{BKY_COLOUR_BLEND_TITLE} %{BKY_COLOUR_BLEND_COLOUR1} " +
+            "%1 %{BKY_COLOUR_BLEND_COLOUR2} %2 %{BKY_COLOUR_BLEND_RATIO} %3",
+        "args0": [
+            {
+                "type": "input_value",
+                "name": "COLOUR1",
+                "check": "Colour",
+                "align": "RIGHT"
+            },
+            {
+                "type": "input_value",
+                "name": "COLOUR2",
+                "check": "Colour",
+                "align": "RIGHT"
+            },
+            {
+                "type": "input_value",
+                "name": "RATIO",
+                "check": "Number",
+                "align": "RIGHT"
+            }
+        ],
+        "output": "Colour",
+        "helpUrl": "%{BKY_COLOUR_BLEND_HELPURL}",
+        "style": "colour_blocks",
+        "tooltip": "%{BKY_COLOUR_BLEND_TOOLTIP}"
+    }
+]);  // END JSON EXTRACT (Do not delete this comment.)
+

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

@@ -1,31 +1,34 @@
-import * as Blockly from 'blockly/core';
-import { getColour } from '../helpers/colour';
-
+import * as Blockly from "blockly/core";
+import { getColour } from "../helpers/colour";
 
 /*
 ----------------------------------LoRa--------------------------------------------------
 */
 
-Blockly.Blocks['sensebox_lora_initialize_otaa'] = {
+Blockly.Blocks["sensebox_lora_initialize_otaa"] = {
   init: function () {
-        this.setTooltip(Blockly.Msg.senseBox_LoRa_init_otaa_tip);
-        this.setHelpUrl('');
+    this.setTooltip(Blockly.Msg.senseBox_LoRa_init_otaa_tooltip);
+    this.setHelpUrl(Blockly.Msg.senseBox_LoRa_init_helpurl);
     this.setColour(getColour().sensebox);
-        this.appendDummyInput()
-            .appendField("Initialize LoRa (OTAA)");
-
+    this.appendDummyInput().appendField("Initialize LoRa (OTAA)");
     this.appendDummyInput()
       .setAlign(Blockly.ALIGN_LEFT)
       .appendField(Blockly.Msg.senseBox_LoRa_device_id)
-            .appendField(new Blockly.FieldTextInput("DEVICE ID"), "DEVICEID");
+      .appendField("{")
+      .appendField(new Blockly.FieldTextInput("DEVICE ID"), "DEVICEID")
+      .appendField("}");
     this.appendDummyInput()
       .setAlign(Blockly.ALIGN_LEFT)
       .appendField(Blockly.Msg.senseBox_LoRa_app_id)
-            .appendField(new Blockly.FieldTextInput("APP ID"), "APPID");
+      .appendField("{")
+      .appendField(new Blockly.FieldTextInput("APP ID"), "APPID")
+      .appendField("}");
     this.appendDummyInput()
       .setAlign(Blockly.ALIGN_LEFT)
       .appendField(Blockly.Msg.senseBox_LoRa_app_key)
-            .appendField(new Blockly.FieldTextInput("APP KEY"), "APPKEY");
+      .appendField("{")
+      .appendField(new Blockly.FieldTextInput("APP KEY"), "APPKEY")
+      .appendField("}");
     this.appendDummyInput()
       .setAlign(Blockly.ALIGN_LEFT)
       .appendField(Blockly.Msg.senseBox_LoRa_interval)
@@ -35,21 +38,24 @@ Blockly.Blocks['sensebox_lora_initialize_otaa'] = {
   },
 };
 
-Blockly.Blocks['sensebox_lora_initialize_abp'] = {
+Blockly.Blocks["sensebox_lora_initialize_abp"] = {
   init: function () {
-        this.setTooltip(Blockly.Msg.senseBox_LoRa_init_abp_tip);
-        this.setHelpUrl('');
+    this.setTooltip(Blockly.Msg.senseBox_LoRa_init_abp_tooltip);
+    this.setHelpUrl(Blockly.Msg.senseBox_LoRa_init_helpurl);
     this.setColour(getColour().sensebox);
-        this.appendDummyInput()
-            .appendField("Initialize LoRa (ABP)");
+    this.appendDummyInput().appendField("Initialize LoRa (ABP)");
     this.appendDummyInput()
       .setAlign(Blockly.ALIGN_LEFT)
       .appendField(Blockly.Msg.senseBox_LoRa_nwskey_id)
-            .appendField(new Blockly.FieldTextInput("NWSKEY"), "NWSKEY");
+      .appendField("{")
+      .appendField(new Blockly.FieldTextInput("NWSKEY"), "NWSKEY")
+      .appendField("}");
     this.appendDummyInput()
       .setAlign(Blockly.ALIGN_LEFT)
       .appendField(Blockly.Msg.senseBox_LoRa_appskey_id)
-            .appendField(new Blockly.FieldTextInput("APPSKEY"), "APPSKEY");
+      .appendField("{")
+      .appendField(new Blockly.FieldTextInput("APPSKEY"), "APPSKEY")
+      .appendField("}");
     this.appendDummyInput()
       .setAlign(Blockly.ALIGN_LEFT)
       .appendField(Blockly.Msg.senseBox_LoRa_devaddr_id)
@@ -66,26 +72,27 @@ Blockly.Blocks['sensebox_lora_initialize_abp'] = {
   },
 };
 
-Blockly.Blocks['sensebox_lora_message_send'] = {
+Blockly.Blocks["sensebox_lora_message_send"] = {
   init: function () {
-        this.setTooltip(Blockly.Msg.senseBox_LoRa_message_tip);
-        this.setHelpUrl('');
+    this.setTooltip(Blockly.Msg.senseBox_LoRa_message_tooltip);
+    this.setHelpUrl("");
     this.setColour(getColour().sensebox);
-        this.appendStatementInput('DO')
+    this.appendStatementInput("DO")
       .appendField(Blockly.Msg.senseBox_LoRa_send_message)
       .setCheck(null);
     this.setPreviousStatement(true, null);
     this.setNextStatement(true, null);
-    }
+  },
 };
 
-Blockly.Blocks['sensebox_send_lora_sensor_value'] = {
+Blockly.Blocks["sensebox_send_lora_sensor_value"] = {
   init: function () {
     this.setTooltip(Blockly.Msg.senseBox_LoRa_sensor_tip);
-        this.setHelpUrl('');
+    this.setHelpUrl("");
     this.setColour(getColour().sensebox);
-        this.appendValueInput('Value')
-            .appendField(Blockly.Msg.senseBox_measurement)
+    this.appendValueInput("Value").appendField(
+      Blockly.Msg.senseBox_measurement
+    );
     this.appendDummyInput()
       .setAlign(Blockly.ALIGN_LEFT)
       .appendField("Bytes")
@@ -116,60 +123,66 @@ Blockly.Blocks['sensebox_send_lora_sensor_value'] = {
       this.setWarningText(Blockly.Msg.CONTROLS_FLOW_STATEMENTS_WARNING);
     }
   },
-    LOOP_TYPES: ['sensebox_lora_message_send'],
+  LOOP_TYPES: ["sensebox_lora_message_send"],
 };
 
-Blockly.Blocks['sensebox_lora_ttn_mapper'] = {
+Blockly.Blocks["sensebox_lora_ttn_mapper"] = {
   init: function (block) {
     this.setColour(getColour().sensebox);
-        this.appendDummyInput()
-            .appendField("TTN Mapper");
+    this.appendDummyInput().appendField("TTN Mapper");
     this.appendDummyInput()
       .setAlign(Blockly.ALIGN_RIGHT)
       .appendField("Fix Type Limit")
-            .appendField(new Blockly.FieldDropdown([["0", "0"], ["1", "1"], ["2", "2"], ["3", "3"]].reverse()), "dropdown");
+      .appendField(
+        new Blockly.FieldDropdown(
+          [
+            ["0", "0"],
+            ["1", "1"],
+            ["2", "2"],
+            ["3", "3"],
+          ].reverse()
+        ),
+        "dropdown"
+      );
     // reverse() because i want 3 be be at first and i'm to lazy to write the array again
-        this.appendValueInput('Latitude')
+    this.appendValueInput("Latitude")
       .appendField(Blockly.Msg.senseBox_gps_lat)
       .setCheck(null);
-        this.appendValueInput('Longitude')
+    this.appendValueInput("Longitude")
       .appendField(Blockly.Msg.senseBox_gps_lng)
       .setCheck(null);
-        this.appendValueInput('Altitude')
+    this.appendValueInput("Altitude")
       .appendField(Blockly.Msg.senseBox_gps_alt)
       .setCheck(null);
-        this.appendValueInput('pDOP')
-            .appendField('pDOP')
-            .setCheck(null);
-        this.appendValueInput('Fix Type')
-            .appendField('Fix Type')
-            .setCheck(null);
+    this.appendValueInput("pDOP").appendField("pDOP").setCheck(null);
+    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);
+  },
 };
 
-Blockly.Blocks['sensebox_lora_cayenne_send'] = {
+Blockly.Blocks["sensebox_lora_cayenne_send"] = {
   init: function () {
     this.setTooltip(Blockly.Msg.senseBox_LoRa_cayenne_tip);
-        this.setHelpUrl('');
+    this.setHelpUrl("");
     this.setColour(getColour().sensebox);
-        this.appendStatementInput('DO')
+    this.appendStatementInput("DO")
       .appendField(Blockly.Msg.senseBox_LoRa_send_cayenne)
       .setCheck(null);
     this.setPreviousStatement(true, null);
     this.setNextStatement(true, null);
-    }
+  },
 };
-Blockly.Blocks['sensebox_lora_cayenne_temperature'] = {
+Blockly.Blocks["sensebox_lora_cayenne_temperature"] = {
   init: function () {
     this.setTooltip(Blockly.Msg.senseBox_LoRa_cayenne_temperature_tip);
-        this.setHelpUrl('');
+    this.setHelpUrl("");
     this.setColour(getColour().sensebox);
-        this.appendValueInput('Value')
-            .appendField(Blockly.Msg.senseBox_LoRa_cayenne_temperature)
+    this.appendValueInput("Value").appendField(
+      Blockly.Msg.senseBox_LoRa_cayenne_temperature
+    );
     this.appendDummyInput()
       .setAlign(Blockly.ALIGN_LEFT)
       .appendField(Blockly.Msg.senseBox_LoRa_cayenne_channel)
@@ -177,15 +190,16 @@ Blockly.Blocks['sensebox_lora_cayenne_temperature'] = {
     this.setPreviousStatement(true, null);
     this.setNextStatement(true, null);
   },
-    LOOP_TYPES: ['sensebox_lora_cayenne_send'],
+  LOOP_TYPES: ["sensebox_lora_cayenne_send"],
 };
-Blockly.Blocks['sensebox_lora_cayenne_humidity'] = {
+Blockly.Blocks["sensebox_lora_cayenne_humidity"] = {
   init: function () {
     this.setTooltip(Blockly.Msg.senseBox_LoRa_cayenne_humidity_tip);
-        this.setHelpUrl('');
+    this.setHelpUrl("");
     this.setColour(getColour().sensebox);
-        this.appendValueInput('Value')
-            .appendField(Blockly.Msg.senseBox_LoRa_cayenne_humidity)
+    this.appendValueInput("Value").appendField(
+      Blockly.Msg.senseBox_LoRa_cayenne_humidity
+    );
     this.appendDummyInput()
       .setAlign(Blockly.ALIGN_LEFT)
       .appendField(Blockly.Msg.senseBox_LoRa_cayenne_channel)
@@ -193,15 +207,16 @@ Blockly.Blocks['sensebox_lora_cayenne_humidity'] = {
     this.setPreviousStatement(true, null);
     this.setNextStatement(true, null);
   },
-    LOOP_TYPES: ['sensebox_lora_cayenne_send'],
+  LOOP_TYPES: ["sensebox_lora_cayenne_send"],
 };
-Blockly.Blocks['sensebox_lora_cayenne_pressure'] = {
+Blockly.Blocks["sensebox_lora_cayenne_pressure"] = {
   init: function () {
     this.setTooltip(Blockly.Msg.senseBox_LoRa_cayenne_pressure_tip);
-        this.setHelpUrl('');
+    this.setHelpUrl("");
     this.setColour(getColour().sensebox);
-        this.appendValueInput('Value')
-            .appendField(Blockly.Msg.senseBox_LoRa_cayenne_pressure)
+    this.appendValueInput("Value").appendField(
+      Blockly.Msg.senseBox_LoRa_cayenne_pressure
+    );
     this.appendDummyInput()
       .setAlign(Blockly.ALIGN_LEFT)
       .appendField(Blockly.Msg.senseBox_LoRa_cayenne_channel)
@@ -209,15 +224,16 @@ Blockly.Blocks['sensebox_lora_cayenne_pressure'] = {
     this.setPreviousStatement(true, null);
     this.setNextStatement(true, null);
   },
-    LOOP_TYPES: ['sensebox_lora_cayenne_send'],
+  LOOP_TYPES: ["sensebox_lora_cayenne_send"],
 };
-Blockly.Blocks['sensebox_lora_cayenne_luminosity'] = {
+Blockly.Blocks["sensebox_lora_cayenne_luminosity"] = {
   init: function () {
     this.setTooltip(Blockly.Msg.senseBox_LoRa_cayenne_luminosity_tip);
-        this.setHelpUrl('');
+    this.setHelpUrl("");
     this.setColour(getColour().sensebox);
-        this.appendValueInput('Value')
-            .appendField(Blockly.Msg.senseBox_LoRa_cayenne_luminosity)
+    this.appendValueInput("Value").appendField(
+      Blockly.Msg.senseBox_LoRa_cayenne_luminosity
+    );
     this.appendDummyInput()
       .setAlign(Blockly.ALIGN_LEFT)
       .appendField(Blockly.Msg.senseBox_LoRa_cayenne_channel)
@@ -225,15 +241,16 @@ Blockly.Blocks['sensebox_lora_cayenne_luminosity'] = {
     this.setPreviousStatement(true, null);
     this.setNextStatement(true, null);
   },
-    LOOP_TYPES: ['sensebox_lora_cayenne_send'],
+  LOOP_TYPES: ["sensebox_lora_cayenne_send"],
 };
-Blockly.Blocks['sensebox_lora_cayenne_sensor'] = {
+Blockly.Blocks["sensebox_lora_cayenne_sensor"] = {
   init: function () {
     this.setTooltip(Blockly.Msg.senseBox_LoRa_cayenne_analog_tip);
-        this.setHelpUrl('');
+    this.setHelpUrl("");
     this.setColour(getColour().sensebox);
-        this.appendValueInput('Value')
-            .appendField(Blockly.Msg.senseBox_LoRa_cayenne_analog)
+    this.appendValueInput("Value").appendField(
+      Blockly.Msg.senseBox_LoRa_cayenne_analog
+    );
     this.appendDummyInput()
       .setAlign(Blockly.ALIGN_LEFT)
       .appendField(Blockly.Msg.senseBox_LoRa_cayenne_channel)
@@ -241,19 +258,16 @@ Blockly.Blocks['sensebox_lora_cayenne_sensor'] = {
     this.setPreviousStatement(true, null);
     this.setNextStatement(true, null);
   },
-    LOOP_TYPES: ['sensebox_lora_cayenne_send'],
+  LOOP_TYPES: ["sensebox_lora_cayenne_send"],
 };
-Blockly.Blocks['sensebox_lora_cayenne_accelerometer'] = {
+Blockly.Blocks["sensebox_lora_cayenne_accelerometer"] = {
   init: function () {
     this.setTooltip(Blockly.Msg.senseBox_LoRa_cayenne_gyros_tip);
-        this.setHelpUrl('');
+    this.setHelpUrl("");
     this.setColour(getColour().sensebox);
-        this.appendValueInput('X')
-            .appendField(Blockly.Msg.senseBox_LoRa_cayenne_x)
-        this.appendValueInput('Y')
-            .appendField(Blockly.Msg.senseBox_LoRa_cayenne_y)
-        this.appendValueInput('Z')
-            .appendField(Blockly.Msg.senseBox_LoRa_cayenne_z)
+    this.appendValueInput("X").appendField(Blockly.Msg.senseBox_LoRa_cayenne_x);
+    this.appendValueInput("Y").appendField(Blockly.Msg.senseBox_LoRa_cayenne_y);
+    this.appendValueInput("Z").appendField(Blockly.Msg.senseBox_LoRa_cayenne_z);
     this.appendDummyInput()
       .setAlign(Blockly.ALIGN_LEFT)
       .appendField(Blockly.Msg.senseBox_LoRa_cayenne_channel)
@@ -261,19 +275,22 @@ Blockly.Blocks['sensebox_lora_cayenne_accelerometer'] = {
     this.setPreviousStatement(true, null);
     this.setNextStatement(true, null);
   },
-    LOOP_TYPES: ['sensebox_lora_cayenne_send'],
+  LOOP_TYPES: ["sensebox_lora_cayenne_send"],
 };
-Blockly.Blocks['sensebox_lora_cayenne_gps'] = {
+Blockly.Blocks["sensebox_lora_cayenne_gps"] = {
   init: function () {
     this.setTooltip(Blockly.Msg.senseBox_LoRa_cayenne_gps_tip);
-        this.setHelpUrl('');
+    this.setHelpUrl("");
     this.setColour(getColour().sensebox);
-        this.appendValueInput('LAT')
-            .appendField(Blockly.Msg.senseBox_LoRa_cayenne_lat)
-        this.appendValueInput('LNG')
-            .appendField(Blockly.Msg.senseBox_LoRa_cayenne_lng)
-        this.appendValueInput('ALT')
-            .appendField(Blockly.Msg.senseBox_LoRa_cayenne_alt)
+    this.appendValueInput("LAT").appendField(
+      Blockly.Msg.senseBox_LoRa_cayenne_lat
+    );
+    this.appendValueInput("LNG").appendField(
+      Blockly.Msg.senseBox_LoRa_cayenne_lng
+    );
+    this.appendValueInput("ALT").appendField(
+      Blockly.Msg.senseBox_LoRa_cayenne_alt
+    );
     this.appendDummyInput()
       .setAlign(Blockly.ALIGN_LEFT)
       .appendField(Blockly.Msg.senseBox_LoRa_cayenne_channel)
@@ -281,5 +298,23 @@ Blockly.Blocks['sensebox_lora_cayenne_gps'] = {
     this.setPreviousStatement(true, null);
     this.setNextStatement(true, null);
   },
-    LOOP_TYPES: ['sensebox_lora_cayenne_send'],
+  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-motors.js

@@ -0,0 +1,144 @@
+import * as Blockly from "blockly/core";
+import { getColour } from "../helpers/colour";
+import { selectedBoard } from "../helpers/board";
+import { FieldSlider } from "@blockly/field-slider";
+
+/**
+ * Servo Motor
+ * 
+ */
+Blockly.Blocks["sensebox_motors_beginServoMotor"] = {
+    init: function () {
+        this.appendDummyInput()
+            .appendField(Blockly.Msg.sensebox_motors_beginServoMotor);
+        this.appendDummyInput()
+            .appendField(Blockly.Msg.sensebox_motors_beginServoMotor_pin)
+            .appendField(new Blockly.FieldDropdown(selectedBoard().digitalPins), "pin")
+            .setAlign(Blockly.ALIGN_RIGHT);
+        this.setPreviousStatement(true, null);
+        this.setNextStatement(true, null);
+        this.setColour(getColour().motors);
+        this.setTooltip(Blockly.Msg.sensebox_motors_beginServoMotor_tooltip);
+        this.setHelpUrl(Blockly.Msg.sensebox_motors_beginServoMotor_helpurl);
+    },
+};
+
+Blockly.Blocks["sensebox_motors_moveServoMotor"] = {
+    init: function () {
+        this.appendDummyInput()
+            .appendField(Blockly.Msg.sensebox_motors_moveServoMotor);
+        this.appendDummyInput()
+            .appendField(Blockly.Msg.sensebox_motors_moveServoMotor_pin)
+            .appendField(new Blockly.FieldDropdown(selectedBoard().digitalPins), "pin")
+            .setAlign(Blockly.ALIGN_RIGHT);
+        this.appendValueInput("degrees", "Number")
+            .appendField(Blockly.Msg.sensebox_motors_moveServoMotor_degrees)
+            .setAlign(Blockly.ALIGN_RIGHT);
+        this.setPreviousStatement(true, null);
+        this.setNextStatement(true, null);
+        this.setColour(getColour().motors);
+        this.setTooltip(Blockly.Msg.sensebox_motors_moveServoMotor_tooltip);
+        this.setHelpUrl(Blockly.Msg.sensebox_motors_moveServoMotor_helpurl);
+    },
+};
+
+
+/**
+ * I2C Motor Board
+ * 
+ */
+Blockly.Blocks["sensebox_motors_I2CMotorBoard_begin"] = {
+    init: function () {
+        this.appendDummyInput()
+            .appendField(Blockly.Msg.sensebox_motors_I2CMotorBoard_begin);
+        this.setPreviousStatement(true, null);
+        this.setNextStatement(true, null);
+        this.setColour(getColour().motors);
+        this.setTooltip(Blockly.Msg.sensebox_motors_I2CMotorBoard_begin_tooltip);
+        this.setHelpUrl(Blockly.Msg.sensebox_motors_I2CMotorBoard_begin_helpurl);
+    },
+};
+
+Blockly.Blocks["sensebox_motors_I2CMotorBoard_moveDCMotor"] = {
+    init: function () {
+        var dropdownOptions = [[Blockly.Msg.sensebox_motors_I2CMotorBoard_moveDCMotor_left, '1'],
+        [Blockly.Msg.sensebox_motors_I2CMotorBoard_moveDCMotor_right, '2']];
+
+        this.appendDummyInput()
+            .appendField(Blockly.Msg.sensebox_motors_I2CMotorBoard_moveDCMotor)
+            .appendField(new Blockly.FieldDropdown(dropdownOptions), "motor")
+            .appendField(Blockly.Msg.sensebox_motors_I2CMotorBoard_moveDCMotor_motor);
+        this.appendValueInput("speed", "Number")
+            .appendField(Blockly.Msg.sensebox_motors_I2CMotorBoard_moveDCMotor_speed)
+            .setAlign(Blockly.ALIGN_RIGHT);
+        this.setPreviousStatement(true, null);
+        this.setNextStatement(true, null);
+        this.setColour(getColour().motors);
+        this.setTooltip(Blockly.Msg.sensebox_motors_I2CMotorBoard_moveDCMotor_tooltip);
+        this.setHelpUrl(Blockly.Msg.sensebox_motors_I2CMotorBoard_moveDCMotor_helpurl);
+    },
+};
+
+Blockly.Blocks["sensebox_motors_I2CMotorBoard_stopDCMotor"] = {
+    init: function () {
+        var dropdownOptions = [[Blockly.Msg.sensebox_motors_I2CMotorBoard_stopDCMotor_left, '1'],
+        [Blockly.Msg.sensebox_motors_I2CMotorBoard_stopDCMotor_right, '2']];
+
+        this.appendDummyInput()
+            .appendField(Blockly.Msg.sensebox_motors_I2CMotorBoard_stopDCMotor)
+            .appendField(new Blockly.FieldDropdown(dropdownOptions), "motor")
+            .appendField(Blockly.Msg.sensebox_motors_I2CMotorBoard_stopDCMotor_motor)
+        this.setPreviousStatement(true, null);
+        this.setNextStatement(true, null);
+        this.setColour(getColour().motors);
+        this.setTooltip(Blockly.Msg.sensebox_motors_I2CMotorBoard_stopDCMotor_tooltip);
+        this.setHelpUrl(Blockly.Msg.sensebox_motors_I2CMotorBoard_stopDCMotor_helpurl);
+    },
+};
+
+
+/**
+ * Stepper Motor
+ * 
+ */
+Blockly.Blocks["sensebox_motors_beginStepperMotor"] = {
+    init: function () {
+        this.appendDummyInput()
+            .appendField(Blockly.Msg.sensebox_motors_beginStepperMotor);
+        this.appendDummyInput()
+            .appendField(Blockly.Msg.sensebox_motors_beginStepperMotor_pins);
+        this.appendDummyInput()
+            .setAlign(Blockly.ALIGN_RIGHT)
+            .appendField(new Blockly.FieldDropdown(selectedBoard().digitalPins), "in1")
+            .appendField(new Blockly.FieldDropdown(selectedBoard().digitalPins), "in2")
+            .appendField(new Blockly.FieldDropdown(selectedBoard().digitalPins), "in3")
+            .appendField(new Blockly.FieldDropdown(selectedBoard().digitalPins), "in4");
+        this.setFieldValue("1", "in1");
+        this.setFieldValue("2", "in2");
+        this.setFieldValue("3", "in3");
+        this.setFieldValue("4", "in4");
+        this.appendDummyInput()
+            .appendField(Blockly.Msg.sensebox_motors_beginStepperMotor_rpm)
+            .appendField(new FieldSlider(3, 1, 3), "rpm");
+        this.setPreviousStatement(true, null);
+        this.setNextStatement(true, null);
+        this.setColour(getColour().motors);
+        this.setTooltip(Blockly.Msg.sensebox_motors_beginStepperMotor_tooltip);
+        this.setHelpUrl(Blockly.Msg.sensebox_motors_beginStepperMotor_helpurl);
+    },
+};
+
+Blockly.Blocks["sensebox_motors_moveStepperMotor"] = {
+    init: function () {
+        this.appendDummyInput()
+            .appendField(Blockly.Msg.sensebox_motors_moveStepperMotor);
+        this.appendValueInput("steps", "Number")
+            .setAlign(Blockly.ALIGN_RIGHT)
+            .appendField(Blockly.Msg.sensebox_motors_moveStepperMotor_step);
+        this.setPreviousStatement(true, null);
+        this.setNextStatement(true, null);
+        this.setColour(getColour().motors);
+        this.setTooltip(Blockly.Msg.sensebox_motors_moveStepperMotor_tooltip);
+        this.setHelpUrl(Blockly.Msg.sensebox_motors_moveStepperMotor_helpurl);
+    },
+};

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

@@ -1,125 +1,147 @@
-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) {
-        selectedBox = this.getFieldValue('BoxID');
-        console.log(selectedBox)
-        if (selectedBox !== '' && boxes) {
-            var accessToken = boxes.find(element => element._id === selectedBox).access_token
-            if (accessToken !== undefined) {
-                this.getField('access_token').setValue(accessToken)
+    var legal = false;
+    // Is the block nested in a loop?
+    var block = this;
+    do {
+      if (this.LOOP_TYPES.indexOf(block.type) !== -1) {
+        legal = true;
+        break;
+      }
+      block = block.getSurroundParent();
+    } while (block);
+    if (legal) {
+      this.setWarningText(null);
     } else {
-                this.getField('access_token').setValue('access_token')
-            }
+      this.setWarningText(Blockly.Msg.CONTROLS_FLOW_STATEMENTS_WARNING);
     }
 
-    },
-    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
+     * List of block types that are loops and thus do not need warnings.
+     * To add a new loop type add this to your code:
+     * Blockly.Blocks['controls_flow_statements'].LOOP_TYPES.push('custom_loop');
      */
-    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);
+    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);
+      } else {
+        this.getField("access_token").setValue("access_token");
       }
-
-        if (input === 'Stationary' && extraFieldExist !== null) {
-            this.removeInput('lat');
-            this.removeInput('lng');
-            this.removeInput('altitude');
-            this.removeInput('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
+        );
+      }
+    } else {
+      this.removeInput("lat", true);
+      this.removeInput("lng", true);
+      this.removeInput("altitude", true);
+      this.removeInput("timeStamp", true);
+    }
+  },
+  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);
@@ -127,25 +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]);
         }
-                console.log(dropdown)
       }
       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.
@@ -154,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;
@@ -176,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

@@ -0,0 +1,78 @@
+import * as Blockly from "blockly";
+import { getColour } from "../helpers/colour";
+import * as Types from "../helpers/types";
+
+Blockly.Blocks["sensebox_rtc_init"] = {
+  init: function () {
+    this.setHelpUrl(Blockly.Msg.sensebox_rtc_helpurl);
+    this.setColour(getColour().time);
+    this.appendDummyInput().appendField(Blockly.Msg.sensebox_rtc_init);
+    this.setPreviousStatement(true);
+    this.setNextStatement(true);
+    this.setTooltip(Blockly.Msg.sensebox_rtc_init_tooltip);
+  },
+};
+
+Blockly.Blocks["sensebox_rtc_set"] = {
+  init: function () {
+    this.setHelpUrl(Blockly.Msg.sensebox_rtc_helpurl);
+    this.setColour(getColour().time);
+    this.appendDummyInput().appendField(Blockly.Msg.sensebox_rtc_set);
+    this.appendValueInput("second").appendField(
+      Blockly.Msg.sensebox_rtc_second
+    );
+    this.appendValueInput("minutes").appendField(
+      Blockly.Msg.sensebox_rtc_minutes
+    );
+    this.appendValueInput("hour").appendField(Blockly.Msg.sensebox_rtc_hour);
+    this.appendValueInput("day").appendField(Blockly.Msg.sensebox_rtc_day);
+    this.appendValueInput("month").appendField(Blockly.Msg.sensebox_rtc_month);
+    this.appendValueInput("year").appendField(Blockly.Msg.sensebox_rtc_year);
+    this.setPreviousStatement(true);
+    this.setNextStatement(true);
+    this.setTooltip(Blockly.Msg.sensebox_rtc_set_tooltip);
+  },
+};
+
+Blockly.Blocks["sensebox_rtc_set_ntp"] = {
+  init: function () {
+    this.setHelpUrl(Blockly.Msg.sensebox_rtc_helpurl);
+    this.setColour(getColour().time);
+    this.appendValueInput("time").appendField(Blockly.Msg.sensebox_rtc_set_ntp);
+    this.setPreviousStatement(true);
+    this.setNextStatement(true);
+    this.setTooltip(Blockly.Msg.sensebox_rtc_set_ntp_tooltip);
+  },
+};
+
+Blockly.Blocks["sensebox_rtc_get"] = {
+  init: function () {
+    this.setHelpUrl(Blockly.Msg.sensebox_rtc_helpurl);
+    this.setColour(getColour().time);
+    this.appendDummyInput()
+      .appendField(Blockly.Msg.sensebox_rtc_get)
+      .appendField(
+        new Blockly.FieldDropdown([
+          [Blockly.Msg.sensebox_rtc_hour, "hour"],
+          [Blockly.Msg.sensebox_rtc_minutes, "minutes"],
+          [Blockly.Msg.sensebox_rtc_second, "seconds"],
+          [Blockly.Msg.sensebox_rtc_day, "day"],
+          [Blockly.Msg.sensebox_rtc_month, "month"],
+          [Blockly.Msg.sensebox_rtc_year, "year"],
+        ]),
+        "dropdown"
+      );
+    this.setOutput(true, Types.LARGE_NUMBER.typeName);
+    this.setTooltip(Blockly.Msg.sensebox_rtc_get_tooltip);
+  },
+};
+
+Blockly.Blocks["sensebox_rtc_get_timestamp"] = {
+  init: function () {
+    this.setHelpUrl(Blockly.Msg.sensebox_rtc_helpurl);
+    this.setColour(getColour().time);
+    this.appendDummyInput().appendField(Blockly.Msg.sensebox_rtc_get_timestamp);
+    this.setOutput(true);
+    this.setTooltip(Blockly.Msg.sensebox_rtc_get_timestamp_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_output_safetosd_tip);
-        this.setHelpUrl('https://sensebox.de/books');
-    }
+    this.setTooltip(Blockly.Msg.senseBox_sd_open_file_tooltip);
+    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_output_safetosd_tip);
-        this.setHelpUrl('https://sensebox.de/books');
-    }
+    this.setTooltip(Blockly.Msg.senseBox_sd_create_file_tooltip);
+    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_output_safetosd_tip);
-        this.setHelpUrl('https://sensebox.de/books');
+    this.setTooltip(Blockly.Msg.senseBox_sd_write_file_tooltip);
+    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,33 @@
-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_tip);
-    this.setHelpUrl('https://edu.books.sensebox.de/de/projekte/diy_umweltstation/temp_und_luftfeuchte.html');
-  }
+    this.setTooltip(Blockly.Msg.senseBox_temp_hum_tooltip);
+    this.setHelpUrl(Blockly.Msg.senseBox_temp_hum_helpurl);
+    this.data = {name: "hdc1080", connection: "I2C"};
+  },
 };
 
 /**
@@ -28,43 +35,66 @@ 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_tip);
-    this.setHelpUrl('https://edu.books.sensebox.de/de/projekte/diy_umweltstation/temp_und_luftfeuchte.html');
-  }
+    this.setTooltip(Blockly.Msg.senseBox_uv_light_tooltip);
+    this.setHelpUrl(Blockly.Msg.senseBox_uv_light_helpurl);
+    this.data = {name: "veml6070"};
+  },
 };
 
 /*
 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_tip);
-    this.setHelpUrl('https://edu.books.sensebox.de/de/projekte/diy_umweltstation/temp_und_luftfeuchte.html');
-  }
+    this.setTooltip(Blockly.Msg.senseBox_bmx055_accelerometer_tooltip);
+    this.setHelpUrl(Blockly.Msg.senseBox_bmx055_helpurl);
+    this.data = {name: "bmx055"};
+  },
 };
 
 /**
@@ -72,111 +102,112 @@ 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(
+          selectedBoard().serial),
+        "SERIAL"
+      );
     this.setOutput(true, Types.DECIMAL.typeName);
     this.setColour(getColour().sensebox);
-    this.setTooltip(Blockly.Msg.senseBox_sds011_tip);
-    this.setHelpUrl('https://edu.books.sensebox.de/de/projekte/diy_umweltstation/temp_und_luftfeuchte.html');
-  }
+    this.setTooltip(Blockly.Msg.senseBox_sds011_tooltip);
+    this.setHelpUrl(Blockly.Msg.senseBox_sds011_helpurl);
+    this.data = {name: "sds011"};
+  },
 };
 
-
 /**
  * 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)
       .appendField(dropdown, "NAME");
     this.setColour(getColour().sensebox);
     this.setOutput(true, Types.DECIMAL.typeName);
-    this.setTooltip(Blockly.Msg.senseBox_pressure_tip);
-    this.setHelpUrl('https://edu.books.sensebox.de/de/projekte/diy_umweltstation/luftdruck.html');
+    this.setTooltip(Blockly.Msg.senseBox_pressure_tooltip);
+    this.setHelpUrl(Blockly.Msg.senseBox_pressure_helpurl);
+    this.data = {name: "bmp280"};
+    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_tip);
-  }
+    this.setTooltip(Blockly.Msg.senseBox_bme_tooltip);
+    this.setHelpUrl(Blockly.Msg.senseBox_bme680_helpurl);
+    this.data = {name: "bme680"};
+  },
 };
 
 /**
@@ -185,14 +216,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);
     });
 
@@ -200,17 +232,26 @@ 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_tip);
-    this.setHelpUrl('https://sensebox.de/books');
+    this.setTooltip(Blockly.Msg.senseBox_ultrasonic_tooltip);
+    this.setHelpUrl(Blockly.Msg.senseBox_ultrasonic_helpurl);
+    this.data = {name: "hc-sr04"};
   },
   /**
    * Parse XML to restore the number of pins available.
@@ -218,8 +259,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.
@@ -227,8 +267,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;
@@ -240,114 +280,296 @@ 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_tip);
-    this.setTooltip('Dieser Sensor mist den Geräuschpegel.');
-  }
+    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_tip);
-    this.setHelpUrl('https://sensebox.de/books');
+    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_tip);
+    this.setTooltip(Blockly.Msg.senseBox_scd_tooltip);
+    this.setHelpUrl(Blockly.Msg.senseBox_scd_helpurl);
+    this.data = {name: "scd30"};
   },
   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_bme_tip);
+    this.setTooltip(Blockly.Msg.senseBox_gps_tooltip);
+  },
+};
+
+/**
+ * Block for Truebner STM50
+ */
+
+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"],
+    ];
+    this.setColour(getColour().sensebox);
+    this.appendDummyInput().appendField(Blockly.Msg.senseBox_smt50);
+    this.appendDummyInput()
+      .appendField("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"
+      );
+    this.setOutput(true, Types.NUMBER.typeName);
+    this.setTooltip(Blockly.Msg.senseBox_smt50_tooltip);
+    this.setHelpUrl(Blockly.Msg.senseBox_smt50_helpurl);
+    this.data = {name: "smt50"};
+  },
+};
+
+/**
+ * DS18B20 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"],
+    ];
+    this.setColour(getColour().sensebox);
+    this.appendDummyInput()
+      .appendField(Blockly.Msg.senseBox_watertemperature)
+      .appendField("Port:")
+      .appendField(new Blockly.FieldDropdown(dropdownOptions), "Port");
+    this.setOutput(true, Types.NUMBER.typeName);
+    this.setTooltip(Blockly.Msg.senseBox_watertemperature_tip);
+    this.data = {name: "ds18b20"};
+  },
+};
+
+/**
+ * Windspeed
+ * removed for now
+
+
+Blockly.Blocks['sensebox_windspeed'] = {
+  init: function () {
+    this.setColour(getColour().sensebox);
+    this.appendDummyInput()
+      .appendField(Blockly.Msg.senseBox_windspeed)
+      .appendField("Pin:")
+      .appendField(new Blockly.FieldDropdown(selectedBoard().analogPins), "PIN")
+    this.setOutput(true, Types.DECIMAL.typeName);
   }
 };
+ */
+
+/**
+ * DF Robot Soundsensor
+ */
+
+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"],
+    ];
+    this.setColour(getColour().sensebox);
+    this.appendDummyInput()
+      .appendField(Blockly.Msg.senseBox_soundsensor_dfrobot)
+      .appendField("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);
+  },
+};
+
+/**
+ * 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.data = {name: "dps310"};
+    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-telegram.js

@@ -12,6 +12,7 @@ Blockly.Blocks["sensebox_telegram"] = {
             .appendField("telegram")
             .appendField(new Blockly.FieldTextInput("token"), "telegram_token");
         this.setPreviousStatement(true, null);
+        this.setTooltip(Blockly.Msg.senseBox_telegram_init_tooltip);
         this.setNextStatement(true, null);
     }
 };
@@ -24,6 +25,7 @@ Blockly.Blocks["sensebox_telegram_do"] = {
         this.appendStatementInput("telegram_do");
         this.setPreviousStatement(true, null);
         this.setNextStatement(true, null);
+        this.setTooltip(Blockly.Msg.senseBox_telegram_do_tooltip)
     }
 };
 
@@ -36,6 +38,7 @@ Blockly.Blocks["sensebox_telegram_do_on_message"] = {
             .appendField(Blockly.Msg.senseBox_telegram_message)
             .appendField(new Blockly.FieldTextInput("/message"), 'telegram_message');
         this.appendStatementInput("telegram_do_on_message").setCheck(null);
+        this.setTooltip(Blockly.Msg.senseBox_telegram_message_tooltip)
         this.setPreviousStatement(true, null);
         this.setNextStatement(true, null);
     }
@@ -46,8 +49,10 @@ Blockly.Blocks["sensebox_telegram_send"] = {
         this.setColour(getColour().sensebox);
         this.appendDummyInput().appendField(Blockly.Msg.senseBox_telegram_send);
         this.appendValueInput("telegram_text_to_send").setCheck(null);
+        this.setTooltip(Blockly.Msg.senseBox_telegram_send_tooltip)
         this.setPreviousStatement(true, null);
         this.setNextStatement(true, null);
+
     },
     LOOP_TYPES: ["sensebox_telegram_do_on_message"]
 };

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_tip);
-        this.setHelpUrl('');
+    this.setTooltip(Blockly.Msg.senseBox_wifi_tooltip);
+    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,6 +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.setPreviousStatement(true, null);
     this.setNextStatement(true, null);
   },
@@ -32,27 +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_tip);
-        this.setHelpUrl('');
+    this.setTooltip(Blockly.Msg.senseBox_wifi_startap_tooltip);
+    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.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/sensebox.js

@@ -1,4 +1,36 @@
+import * as Blockly from "blockly/core";
+import { getColour } from "../helpers/colour";
+import * as Types from "../helpers/types";
 
+Blockly.Blocks["sensebox_multiplexer_init"] = {
+  init: function () {
+    this.appendDummyInput().appendField(Blockly.Msg.senseBox_multiplexer_init);
+    this.appendValueInput("nrChannels").setCheck(
+      Types.getCompatibleTypes("int")
+    );
+    this.appendDummyInput().appendField(
+      Blockly.Msg.senseBox_multplexer_nchannels
+    );
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+    this.setInputsInline("true");
+    this.setColour(getColour().sensebox);
+    this.setTooltip(Blockly.Msg.senseBox_multiplexer_init_tooltip);
+    this.setHelpUrl(Blockly.Msg.senseBox_multiplexer_init_helpurl);
+  },
+};
 
-
-
+Blockly.Blocks["sensebox_multiplexer_changeChannel"] = {
+  init: function () {
+    this.appendDummyInput().appendField(
+      Blockly.Msg.senseBox_multiplexer_changeChannel
+    );
+    this.appendValueInput("Channel").setCheck(Types.getCompatibleTypes("int"));
+    this.setInputsInline("true");
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+    this.setColour(getColour().sensebox);
+    this.setTooltip(Blockly.Msg.sensebox_multiplexer_changeChannel_tooltip);
+    this.setHelpUrl(Blockly.Msg.sensebox_multiplexer_changeChannel_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/variables.js

@@ -1,43 +1,46 @@
-import Blockly from 'blockly/core';
-import { getColour } from '../helpers/colour';
-import { getCompatibleTypes } from '../helpers/types'
+import Blockly from "blockly/core";
+import { getColour } from "../helpers/colour";
+import { getCompatibleTypes } from "../helpers/types";
 
-
-Blockly.Blocks['variables_set_dynamic'] = {
+Blockly.Blocks["variables_set_dynamic"] = {
   init: function () {
-
     // const type = myVar.type;
     this.setColour(getColour().variables);
     this.setPreviousStatement(true, null);
     this.setNextStatement(true, null);
-        this.appendValueInput('VALUE')
-            .appendField('set', 'set')
-            .appendField('', 'type')
-            .appendField(new Blockly.FieldVariable('VAR'), 'VAR')
-            .appendField('to');
+    this.appendValueInput("VALUE")
+      .appendField(Blockly.Msg.variables_set, Blockly.Msg.variables_set)
+      // .appendField("", "type")
+      .appendField(new Blockly.FieldVariable("VAR"), "VAR")
+      .appendField(Blockly.Msg.variables_to);
   },
   onchange: function (e) {
-        let variableID = this.getFieldValue('VAR');
-        let variable = Blockly.getMainWorkspace().getVariableMap().getVariableById(variableID)
-        this.getField('type').setValue(variable.type);
-        this.getInput('VALUE').setCheck(getCompatibleTypes(variable.type));
-
+    let variableID = this.getFieldValue("VAR");
+    let variable = Blockly.getMainWorkspace()
+      .getVariableMap()
+      .getVariableById(variableID);
+    if (variable !== null) {
+      this.getField("type").setValue(variable.type);
+      this.getInput("VALUE").setCheck(getCompatibleTypes(variable.type));
     }
-}
+  },
+};
 
-Blockly.Blocks['variables_get_dynamic'] = {
+Blockly.Blocks["variables_get_dynamic"] = {
   init: function () {
     this.setColour(getColour().variables);
     this.appendDummyInput()
-            .appendField('', 'type')
-            .appendField(new Blockly.FieldVariable('VAR'), 'VAR');
+      .appendField("", "type")
+      .appendField(new Blockly.FieldVariable("VAR"), "VAR");
     this.setOutput(true);
   },
   onchange: function (e) {
-        let variableID = this.getFieldValue('VAR');
-        let variable = Blockly.getMainWorkspace().getVariableMap().getVariableById(variableID)
-        this.getField('type').setValue(variable.type);
-
+    let variableID = this.getFieldValue("VAR");
+    let variable = Blockly.getMainWorkspace()
+      .getVariableMap()
+      .getVariableById(variableID);
+    if (variable !== null) {
+      this.getField("type").setValue(variable.type);
     }
-}
-
+  },
+};

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

@@ -24,13 +24,24 @@
 // More on generating code:
 // https://developers.google.com/blockly/guides/create-custom-blocks/generating-code
 
-import * as Blockly from 'blockly/core';
+import * as Blockly from "blockly/core";
+
+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
  */
-Blockly['Arduino'] = new Blockly.Generator('Arduino');
+Blockly["Arduino"] = new Blockly.Generator("Arduino");
 
 /**
  * List of illegal variable names.
@@ -39,49 +50,44 @@ Blockly['Arduino'] = new Blockly.Generator('Arduino');
  * accidentally clobbering a built-in object or function.
  * @private
  */
-Blockly['Arduino'].addReservedWords(
+Blockly["Arduino"].addReservedWords(
   // http://arduino.cc/en/Reference/HomePage
-    'setup,loop,if,else,for,switch,case,while,' +
-    'do,break,continue,return,goto,define,include,' +
-    'HIGH,LOW,INPUT,OUTPUT,INPUT_PULLUP,true,false,' +
-    'interger, constants,floating,point,void,boolean,char,' +
-    'unsigned,byte,int,word,long,float,double,string,String,array,' +
-    'static, volatile,const,sizeof,pinMode,digitalWrite,digitalRead,' +
-    'analogReference,analogRead,analogWrite,tone,noTone,shiftOut,shitIn,' +
-    'pulseIn,millis,micros,delay,delayMicroseconds,min,max,abs,constrain,' +
-    'map,pow,sqrt,sin,cos,tan,randomSeed,random,lowByte,highByte,bitRead,' +
-    'bitWrite,bitSet,bitClear,ultraSonicDistance,parseDouble,setNeoPixelColor,' +
-    'bit,attachInterrupt,detachInterrupt,interrupts,noInterrupts',
-    'short',
-    'isBtnPressed'
+  "setup,loop,if,else,for,switch,case,while," +
+    "do,break,continue,return,goto,define,include," +
+    "HIGH,LOW,INPUT,OUTPUT,INPUT_PULLUP,true,false," +
+    "interger, constants,floating,point,void,boolean,char," +
+    "unsigned,byte,int,word,long,float,double,string,String,array," +
+    "static, volatile,const,sizeof,pinMode,digitalWrite,digitalRead," +
+    "analogReference,analogRead,analogWrite,tone,noTone,shiftOut,shitIn," +
+    "pulseIn,millis,micros,delay,delayMicroseconds,min,max,abs,constrain," +
+    "map,pow,sqrt,sin,cos,tan,randomSeed,random,lowByte,highByte,bitRead," +
+    "bitWrite,bitSet,bitClear,ultraSonicDistance,parseDouble,setNeoPixelColor," +
+    "bit,attachInterrupt,detachInterrupt,interrupts,noInterrupts,short,isBtnPressed"
 );
 
 /**
  * Order of operation ENUMs.
  *
  */
-Blockly['Arduino'].ORDER_ATOMIC = 0; // 0 "" ...
-Blockly['Arduino'].ORDER_UNARY_POSTFIX = 1; // expr++ expr-- () [] .
-Blockly['Arduino'].ORDER_UNARY_PREFIX = 2; // -expr !expr ~expr ++expr --expr
-Blockly['Arduino'].ORDER_MULTIPLICATIVE = 3; // * / % ~/
-Blockly['Arduino'].ORDER_ADDITIVE = 4; // + -
-Blockly['Arduino'].ORDER_LOGICAL_NOT = 4.4; // !
-Blockly['Arduino'].ORDER_SHIFT = 5; // << >>
-Blockly['Arduino'].ORDER_MODULUS = 5.3; // %
-Blockly['Arduino'].ORDER_RELATIONAL = 6; // is is! >= > <= <
-Blockly['Arduino'].ORDER_EQUALITY = 7; // === !== === !==
-Blockly['Arduino'].ORDER_BITWISE_AND = 8; // &
-Blockly['Arduino'].ORDER_BITWISE_XOR = 9; // ^
-Blockly['Arduino'].ORDER_BITWISE_OR = 10; // |
-Blockly['Arduino'].ORDER_LOGICAL_AND = 11; // &&
-Blockly['Arduino'].ORDER_LOGICAL_OR = 12; // ||
-Blockly['Arduino'].ORDER_CONDITIONAL = 13; // expr ? expr : expr
-Blockly['Arduino'].ORDER_ASSIGNMENT = 14; // = *= /= ~/= %= += -= <<= >>= &= ^= |=
-Blockly['Arduino'].ORDER_COMMA = 18; // ,
-Blockly['Arduino'].ORDER_NONE = 99; // (...)
-
-
-
+Blockly["Arduino"].ORDER_ATOMIC = 0; // 0 "" ...
+Blockly["Arduino"].ORDER_UNARY_POSTFIX = 1; // expr++ expr-- () [] .
+Blockly["Arduino"].ORDER_UNARY_PREFIX = 2; // -expr !expr ~expr ++expr --expr
+Blockly["Arduino"].ORDER_MULTIPLICATIVE = 3; // * / % ~/
+Blockly["Arduino"].ORDER_ADDITIVE = 4; // + -
+Blockly["Arduino"].ORDER_LOGICAL_NOT = 4.4; // !
+Blockly["Arduino"].ORDER_SHIFT = 5; // << >>
+Blockly["Arduino"].ORDER_MODULUS = 5.3; // %
+Blockly["Arduino"].ORDER_RELATIONAL = 6; // is is! >= > <= <
+Blockly["Arduino"].ORDER_EQUALITY = 7; // === !== === !==
+Blockly["Arduino"].ORDER_BITWISE_AND = 8; // &
+Blockly["Arduino"].ORDER_BITWISE_XOR = 9; // ^
+Blockly["Arduino"].ORDER_BITWISE_OR = 10; // |
+Blockly["Arduino"].ORDER_LOGICAL_AND = 11; // &&
+Blockly["Arduino"].ORDER_LOGICAL_OR = 12; // ||
+Blockly["Arduino"].ORDER_CONDITIONAL = 13; // expr ? expr : expr
+Blockly["Arduino"].ORDER_ASSIGNMENT = 14; // = *= /= ~/= %= += -= <<= >>= &= ^= |=
+Blockly["Arduino"].ORDER_COMMA = 18; // ,
+Blockly["Arduino"].ORDER_NONE = 99; // (...)
 
 /**
  *
@@ -90,105 +96,59 @@ Blockly['Arduino'].ORDER_NONE = 99; // (...)
  * Blockly Types
  */
 
-
-
-
 /**
  * Initialise the database of variable names.
  * @param {!Blockly.Workspace} workspace Workspace to generate code from.
  */
-Blockly['Arduino'].init = function (workspace) {
+Blockly["Arduino"].init = function (workspace) {
   // Create a dictionary of definitions to be printed before the code.
-    Blockly['Arduino'].libraries_ = Object.create(null);
+  Blockly["Arduino"].libraries_ = Object.create(null);
 
-    Blockly['Arduino'].definitions_ = Object.create(null);
+  Blockly["Arduino"].definitions_ = Object.create(null);
 
   // creates a list of code to be setup before the setup block
-    Blockly['Arduino'].setupCode_ = Object.create(null);
+  Blockly["Arduino"].setupCode_ = Object.create(null);
 
   // creates a list of code to be setup before the setup block
-    Blockly['Arduino'].loraSetupCode_ = Object.create(null);
+  Blockly["Arduino"].phyphoxSetupCode_ = Object.create(null);
+
+  // creates a list of code to be setup before the setup block
+  Blockly["Arduino"].loraSetupCode_ = Object.create(null);
 
   // creates a list of code for the loop to be runned once
-    Blockly['Arduino'].loopCodeOnce_ = Object.create(null)
+  Blockly["Arduino"].loopCodeOnce_ = Object.create(null);
 
   // creates a list of code for the loop to be runned once
-    Blockly['Arduino'].codeFunctions_ = Object.create(null)
+  Blockly["Arduino"].codeFunctions_ = Object.create(null);
 
   // creates a list of code variables
-    Blockly['Arduino'].variables_ = Object.create(null)
+  Blockly["Arduino"].variables_ = Object.create(null);
 
   // Create a dictionary mapping desired function names in definitions_
   // to actual function names (to avoid collisions with user functions).
-    Blockly['Arduino'].functionNames_ = Object.create(null);
+  Blockly["Arduino"].functionNames_ = Object.create(null);
 
-    Blockly['Arduino'].variablesInitCode_ = '';
+  Blockly["Arduino"].variablesInitCode_ = "";
 
-    if (!Blockly['Arduino'].variableDB_) {
-        Blockly['Arduino'].variableDB_ = new Blockly.Names(
-            Blockly['Arduino'].RESERVED_WORDS_
+  if (!Blockly["Arduino"].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));
   // }
 
-    const doubleVariables = workspace.getVariablesOfType('Number');
-    let i = 0;
-    let variableCode = '';
-    for (i = 0; i < doubleVariables.length; i += 1) {
-        variableCode +=
-            'double ' +
-            Blockly['Arduino'].variableDB_.getName(
-                doubleVariables[i].getId(),
-                Blockly.Variables.NAME_TYPE
-            ) +
-            ' = 0; \n\n';
-    }
 
-    const stringVariables = workspace.getVariablesOfType('String');
-    for (i = 0; i < stringVariables.length; i += 1) {
-        variableCode +=
-            'String ' +
-            Blockly['Arduino'].variableDB_.getName(
-                stringVariables[i].getId(),
-                Blockly.Variables.NAME_TYPE
-            ) +
-            ' = ""; \n\n';
-    }
-
-    const booleanVariables = workspace.getVariablesOfType('Boolean');
-    for (i = 0; i < booleanVariables.length; i += 1) {
-        variableCode +=
-            'boolean ' +
-            Blockly['Arduino'].variableDB_.getDistinctName(
-                booleanVariables[i].getId(),
-                Blockly.Variables.NAME_TYPE
-            ) +
-            ' = false; \n\n';
-    }
-
-    const colourVariables = workspace.getVariablesOfType('Colour');
-    for (i = 0; i < colourVariables.length; i += 1) {
-        variableCode +=
-            'RGB ' +
-            Blockly['Arduino'].variableDB_.getName(
-                colourVariables[i].getId(),
-                Blockly.Variables.NAME_TYPE
-            ) +
-            ' = {0, 0, 0}; \n\n';
-    }
-
-    Blockly['Arduino'].variablesInitCode_ = variableCode;
 };
 
 /**
@@ -196,86 +156,118 @@ Blockly['Arduino'].init = function (workspace) {
  * @param {string} code Generated code.
  * @return {string} Completed code.
  */
-Blockly['Arduino'].finish = function (code) {
-    let libraryCode = '';
-    let variablesCode = '';
-    let codeFunctions = '';
-    let functionsCode = '';
-    let definitionsCode = '';
-    let loopCodeOnce = '';
-    let setupCode = '';
-    let preSetupCode = '';
-    let loraSetupCode = '';
-    let devVariables = '\n';
+Blockly["Arduino"].finish = function (code) {
+  let libraryCode = "";
+  let variablesCode = "";
+  let codeFunctions = "";
+  let functionsCode = "";
+  let definitionsCode = "";
+  let phyphoxSetupCode = "";
+  let loopCodeOnce = "";
+  let setupCode = "";
+  let preSetupCode = "";
+  let loraSetupCode = "";
+  let devVariables = "\n";
 
-    for (const key in Blockly['Arduino'].libraries_) {
-        libraryCode += Blockly['Arduino'].libraries_[key] + '\n';
+  for (const key in Blockly["Arduino"].libraries_) {
+    libraryCode += Blockly["Arduino"].libraries_[key] + "\n";
   }
 
-    for (const key in Blockly['Arduino'].variables_) {
-        variablesCode += Blockly['Arduino'].variables_[key] + '\n';
+  for (const key in Blockly["Arduino"].variables_) {
+    variablesCode += Blockly["Arduino"].variables_[key] + "\n";
   }
 
-    for (const key in Blockly['Arduino'].definitions_) {
-        definitionsCode += Blockly['Arduino'].definitions_[key] + '\n';
+  for (const key in Blockly["Arduino"].definitions_) {
+    definitionsCode += Blockly["Arduino"].definitions_[key] + "\n";
   }
 
-    for (const key in Blockly['Arduino'].loopCodeOnce_) {
-        loopCodeOnce += Blockly['Arduino'].loopCodeOnce_[key] + '\n';
+  for (const key in Blockly["Arduino"].loopCodeOnce_) {
+    loopCodeOnce += Blockly["Arduino"].loopCodeOnce_[key] + "\n";
   }
 
-    for (const key in Blockly['Arduino'].codeFunctions_) {
-        codeFunctions += Blockly['Arduino'].codeFunctions_[key] + '\n';
+  for (const key in Blockly["Arduino"].codeFunctions_) {
+    codeFunctions += Blockly["Arduino"].codeFunctions_[key] + "\n";
   }
 
-    for (const key in Blockly['Arduino'].functionNames_) {
-        functionsCode += Blockly['Arduino'].functionNames_[key] + '\n';
+  for (const key in Blockly["Arduino"].functionNames_) {
+    functionsCode += Blockly["Arduino"].functionNames_[key] + "\n";
   }
 
-
-
-    for (const key in Blockly['Arduino'].setupCode_) {
-        preSetupCode += Blockly['Arduino'].setupCode_[key] || '';
+  for (const key in Blockly["Arduino"].setupCode_) {
+    preSetupCode += Blockly["Arduino"].setupCode_[key] + "\n" || "";
   }
 
-    for (const key in Blockly['Arduino'].loraSetupCode_) {
-        loraSetupCode += Blockly['Arduino'].loraSetupCode_[key] || '';
+  for (const key in Blockly["Arduino"].loraSetupCode_) {
+    loraSetupCode += Blockly["Arduino"].loraSetupCode_[key] + "\n" || "";
   }
 
+  setupCode =
+    "\nvoid setup() { \n" + preSetupCode + "\n" + loraSetupCode + "\n}\n";
+  for (const key in Blockly["Arduino"].phyphoxSetupCode_) {
+    phyphoxSetupCode += Blockly["Arduino"].phyphoxSetupCode_[key] + "\n" || "";
+  }
 
-    setupCode = '\nvoid setup() { \n' + preSetupCode + '\n' + loraSetupCode + '\n}\n';
-
-    let loopCode = '\nvoid loop() { \n' + loopCodeOnce + code + '\n}\n';
-
+  setupCode =
+    "\nvoid setup() { \n" +
+    preSetupCode +
+    "\n" +
+    phyphoxSetupCode +
+    "\n" +
+    loraSetupCode +
+    "\n}\n";
 
+  let loopCode = "\nvoid loop() { \n" + loopCodeOnce + code + "\n}\n";
+  // 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 +
-        '\n' +
+      "\n" +
       libraryCode +
-        '\n' +
+      "\n" +
       variablesCode +
-        '\n' +
+      "\n" +
       definitionsCode +
-        '\n' +
+      "\n" +
       codeFunctions +
-        '\n' +
-        Blockly['Arduino'].variablesInitCode_ +
-        '\n' +
+      "\n" +
+      Blockly["Arduino"].variablesInitCode_ +
+      "\n" +
       functionsCode +
-        '\n' +
+      "\n" +
       setupCode +
-        '\n' +
-        loopCode
-        ;
+      "\n" +
+      loopCode;
+  }
 
   // Clean up temporary data.
-    delete Blockly['Arduino'].definitions_;
-    delete Blockly['Arduino'].functionNames_;
-    delete Blockly['Arduino'].loopCodeOnce_;
-    delete Blockly['Arduino'].variablesInitCode_;
-    delete Blockly['Arduino'].libraries_;
-    Blockly['Arduino'].variableDB_.reset();
+  delete Blockly["Arduino"].definitions_;
+  delete Blockly["Arduino"].functionNames_;
+  delete Blockly["Arduino"].loopCodeOnce_;
+  delete Blockly["Arduino"].variablesInitCode_;
+  delete Blockly["Arduino"].libraries_;
+  Blockly["Arduino"].nameDB_.reset();
 
   return code;
 };
@@ -286,8 +278,8 @@ Blockly['Arduino'].finish = function (code) {
  * @param {string} line Line of generated code.
  * @return {string} Legal line of code.
  */
-Blockly['Arduino'].scrubNakedValue = function (line) {
-    return line + ';\n';
+Blockly["Arduino"].scrubNakedValue = function (line) {
+  return line + ";\n";
 };
 
 /**
@@ -297,12 +289,12 @@ Blockly['Arduino'].scrubNakedValue = function (line) {
  * @return {string} Arduino string.
  * @private
  */
-Blockly['Arduino'].quote_ = function (string) {
+Blockly["Arduino"].quote_ = function (string) {
   // Can't use goog.string.quote since Google's style guide recommends
   // JS string literals use single quotes.
   string = string
-        .replace(/\\/g, '\\\\')
-        .replace(/\n/g, '\\\n')
+    .replace(/\\/g, "\\\\")
+    .replace(/\n/g, "\\\n")
     .replace(/'/g, "\\'");
   return '"' + string + '"';
 };
@@ -317,26 +309,25 @@ Blockly['Arduino'].quote_ = function (string) {
  * @return {string} Arduino code with comments and subsequent blocks added.
  * @private
  */
-Blockly['Arduino'].scrub_ = function (block, code) {
-    let commentCode = '';
+Blockly["Arduino"].scrub_ = function (block, code) {
+  let commentCode = "";
   // Only collect comments for blocks that aren't inline.
   if (!block.outputConnection || !block.outputConnection.targetConnection) {
     // Collect comment for this block.
     let comment = block.getCommentText();
     //@ts-ignore
-        comment = comment ? Blockly.utils.string.wrap(
-            comment,
-            Blockly['Arduino'].COMMENT_WRAP - 3
-        ) : null;
+    comment = comment
+      ? Blockly.utils.string.wrap(comment, Blockly["Arduino"].COMMENT_WRAP - 3)
+      : null;
     if (comment) {
       if (block.getProcedureDef) {
         // Use a comment block for function comments.
         commentCode +=
-                    '/**\n' +
-                    Blockly['Arduino'].prefixLines(comment + '\n', ' * ') +
-                    ' */\n';
+          "/**\n" +
+          Blockly["Arduino"].prefixLines(comment + "\n", " * ") +
+          " */\n";
       } else {
-                commentCode += Blockly['Arduino'].prefixLines(comment + '\n', '// ');
+        commentCode += Blockly["Arduino"].prefixLines(comment + "\n", "// ");
       }
     }
     // Collect comments for all value arguments.
@@ -345,15 +336,15 @@ Blockly['Arduino'].scrub_ = function (block, code) {
       if (block.inputList[i].type === Blockly.INPUT_VALUE) {
         const childBlock = block.inputList[i].connection.targetBlock();
         if (childBlock) {
-                    const comment = Blockly['Arduino'].allNestedComments(childBlock);
+          const comment = Blockly["Arduino"].allNestedComments(childBlock);
           if (comment) {
-                        commentCode += Blockly['Arduino'].prefixLines(comment, '// ');
+            commentCode += Blockly["Arduino"].prefixLines(comment, "// ");
           }
         }
       }
     }
   }
   const nextBlock = block.nextConnection && block.nextConnection.targetBlock();
-    const nextCode = Blockly['Arduino'].blockToCode(nextBlock);
+  const nextCode = Blockly["Arduino"].blockToCode(nextBlock);
   return commentCode + code + nextCode;
 };

src/components/Blockly/generator/index.js

@@ -1,24 +1,28 @@
-import './generator';
-import './loops';
-import './sensebox-sensors';
-import './sensebox-telegram';
-import './sensebox-osem';
-import './sensebox-web';
-import './sensebox-display';
-import './sensebox-lora';
-import './sensebox-led';
-import './sensebox-sd';
-import './mqtt';
-import './logic';
-import './text';
-import './math';
-import './map';
-import './io';
-import './audio';
-import './procedures';
-import './time';
-import './variables';
-import './lists';
-import './webserver';
-
-
+import "./generator";
+import "./loops";
+import "./sensebox-sensors";
+import "./sensebox-telegram";
+import "./sensebox-osem";
+import "./sensebox-web";
+import "./sensebox-display";
+import "./sensebox-motors";
+import "./sensebox-lora";
+import "./sensebox-led";
+import "./sensebox";
+import "./sensebox-rtc";
+import "./sensebox-ble";
+import "./sensebox-sd";
+import "./mqtt";
+import "./logic";
+import "./text";
+import "./math";
+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

@@ -1,5 +1,4 @@
-
-import * as Blockly from 'blockly/core';
+import * as Blockly from "blockly/core";
 
 /**
  * @license Licensed under the Apache License, Version 2.0 (the "License"):
@@ -19,13 +18,13 @@ import * as Blockly from 'blockly/core';
  * @param {!Blockly.Block} block Block to generate the code from.
  * @return {array} Completed code with order of operation.
  */
-Blockly.Arduino['math_number'] = function (block) {
+Blockly.Arduino["math_number"] = function (block) {
   // Numeric value.
-    var code = parseFloat(block.getFieldValue('NUM'));
+  var code = parseFloat(block.getFieldValue("NUM"));
   if (code === Infinity) {
-        code = 'INFINITY';
+    code = "INFINITY";
   } else if (code === -Infinity) {
-        code = '-INFINITY';
+    code = "-INFINITY";
   }
   return [code, Blockly.Arduino.ORDER_ATOMIC];
 };
@@ -37,23 +36,23 @@ Blockly.Arduino['math_number'] = function (block) {
  * @param {!Blockly.Block} block Block to generate the code from.
  * @return {array} Completed code with order of operation.
  */
-Blockly.Arduino['math_arithmetic'] = function (block) {
+Blockly.Arduino["math_arithmetic"] = function (block) {
   var OPERATORS = {
-        ADD: [' + ', Blockly.Arduino.ORDER_ADDITIVE],
-        MINUS: [' - ', Blockly.Arduino.ORDER_ADDITIVE],
-        MULTIPLY: [' * ', Blockly.Arduino.ORDER_MULTIPLICATIVE],
-        DIVIDE: [' / ', Blockly.Arduino.ORDER_MULTIPLICATIVE],
-        POWER: [null, Blockly.Arduino.ORDER_NONE]  // Handle power separately.
+    ADD: [" + ", Blockly.Arduino.ORDER_ADDITIVE],
+    MINUS: [" - ", Blockly.Arduino.ORDER_ADDITIVE],
+    MULTIPLY: [" * ", Blockly.Arduino.ORDER_MULTIPLICATIVE],
+    DIVIDE: [" / ", Blockly.Arduino.ORDER_MULTIPLICATIVE],
+    POWER: [null, Blockly.Arduino.ORDER_NONE], // Handle power separately.
   };
-    var tuple = OPERATORS[block.getFieldValue('OP')];
+  var tuple = OPERATORS[block.getFieldValue("OP")];
   var operator = tuple[0];
   var order = tuple[1];
-    var argument0 = Blockly.Arduino.valueToCode(block, 'A', order) || '0';
-    var argument1 = Blockly.Arduino.valueToCode(block, 'B', order) || '0';
+  var argument0 = Blockly.Arduino.valueToCode(block, "A", order) || "0";
+  var argument1 = Blockly.Arduino.valueToCode(block, "B", order) || "0";
   var code;
   // Power in C++ requires a special case since it has no operator.
   if (!operator) {
-        code = 'Math.pow(' + argument0 + ', ' + argument1 + ')';
+    code = "Math.pow(" + argument0 + ", " + argument1 + ")";
     return [code, Blockly.Arduino.ORDER_UNARY_POSTFIX];
   }
   code = argument0 + operator + argument1;
@@ -66,65 +65,78 @@ Blockly.Arduino['math_arithmetic'] = function (block) {
  * @param {!Blockly.Block} block Block to generate the code from.
  * @return {array} Completed code with order of operation.
  */
-Blockly.Arduino['math_single'] = function (block) {
-    var operator = block.getFieldValue('OP');
+Blockly.Arduino["math_single"] = function (block) {
+  var operator = block.getFieldValue("OP");
   var code;
   var arg;
-    if (operator === 'NEG') {
+  if (operator === "NEG") {
     // Negation is a special case given its different operator precedents.
-        arg = Blockly.Arduino.valueToCode(block, 'NUM',
-            Blockly.Arduino.ORDER_UNARY_PREFIX) || '0';
-        if (arg[0] === '-') {
+    arg =
+      Blockly.Arduino.valueToCode(
+        block,
+        "NUM",
+        Blockly.Arduino.ORDER_UNARY_PREFIX
+      ) || "0";
+    if (arg[0] === "-") {
       // --3 is not legal in C++ in this context.
-            arg = ' ' + arg;
+      arg = " " + arg;
     }
-        code = '-' + arg;
+    code = "-" + arg;
     return [code, Blockly.Arduino.ORDER_UNARY_PREFIX];
   }
-    if (operator === 'ABS' || operator.substring(0, 5) === 'ROUND') {
-        arg = Blockly.Arduino.valueToCode(block, 'NUM',
-            Blockly.Arduino.ORDER_UNARY_POSTFIX) || '0';
-    } else if (operator === 'SIN' || operator === 'COS' || operator === 'TAN') {
-        arg = Blockly.Arduino.valueToCode(block, 'NUM',
-            Blockly.Arduino.ORDER_MULTIPLICATIVE) || '0';
+  if (operator === "ABS" || operator.substring(0, 5) === "ROUND") {
+    arg =
+      Blockly.Arduino.valueToCode(
+        block,
+        "NUM",
+        Blockly.Arduino.ORDER_UNARY_POSTFIX
+      ) || "0";
+  } else if (operator === "SIN" || operator === "COS" || operator === "TAN") {
+    arg =
+      Blockly.Arduino.valueToCode(
+        block,
+        "NUM",
+        Blockly.Arduino.ORDER_MULTIPLICATIVE
+      ) || "0";
   } else {
-        arg = Blockly.Arduino.valueToCode(block, 'NUM',
-            Blockly.Arduino.ORDER_NONE) || '0';
+    arg =
+      Blockly.Arduino.valueToCode(block, "NUM", Blockly.Arduino.ORDER_NONE) ||
+      "0";
   }
   // First, handle cases which generate values that don't need parentheses.
   switch (operator) {
-        case 'ABS':
-            code = 'abs(' + arg + ')';
+    case "ABS":
+      code = "abs(" + arg + ")";
       break;
-        case 'ROOT':
-            code = 'sqrt(' + arg + ')';
+    case "ROOT":
+      code = "sqrt(" + arg + ")";
       break;
-        case 'LN':
-            code = 'log(' + arg + ')';
+    case "LN":
+      code = "log(" + arg + ")";
       break;
-        case 'EXP':
-            code = 'exp(' + arg + ')';
+    case "EXP":
+      code = "exp(" + arg + ")";
       break;
-        case 'POW10':
-            code = 'pow(10,' + arg + ')';
+    case "POW10":
+      code = "pow(10," + arg + ")";
       break;
-        case 'ROUND':
-            code = 'round(' + arg + ')';
+    case "ROUND":
+      code = "round(" + arg + ")";
       break;
-        case 'ROUNDUP':
-            code = 'ceil(' + arg + ')';
+    case "ROUNDUP":
+      code = "ceil(" + arg + ")";
       break;
-        case 'ROUNDDOWN':
-            code = 'floor(' + arg + ')';
+    case "ROUNDDOWN":
+      code = "floor(" + arg + ")";
       break;
-        case 'SIN':
-            code = 'sin(' + arg + ' / 180 * Math.PI)';
+    case "SIN":
+      code = "sin(" + arg + " / 180 * Math.PI)";
       break;
-        case 'COS':
-            code = 'cos(' + arg + ' / 180 * Math.PI)';
+    case "COS":
+      code = "cos(" + arg + " / 180 * Math.PI)";
       break;
-        case 'TAN':
-            code = 'tan(' + arg + ' / 180 * Math.PI)';
+    case "TAN":
+      code = "tan(" + arg + " / 180 * Math.PI)";
       break;
     default:
       break;
@@ -134,20 +146,20 @@ Blockly.Arduino['math_single'] = function (block) {
   }
   // Second, handle cases which generate values that may need parentheses.
   switch (operator) {
-        case 'LOG10':
-            code = 'log(' + arg + ') / log(10)';
+    case "LOG10":
+      code = "log(" + arg + ") / log(10)";
       break;
-        case 'ASIN':
-            code = 'asin(' + arg + ') / M_PI * 180';
+    case "ASIN":
+      code = "asin(" + arg + ") / M_PI * 180";
       break;
-        case 'ACOS':
-            code = 'acos(' + arg + ') / M_PI * 180';
+    case "ACOS":
+      code = "acos(" + arg + ") / M_PI * 180";
       break;
-        case 'ATAN':
-            code = 'atan(' + arg + ') / M_PI * 180';
+    case "ATAN":
+      code = "atan(" + arg + ") / M_PI * 180";
       break;
     default:
-            throw new Error('Unknown math operator: ' + operator);
+      throw new Error("Unknown math operator: " + operator);
   }
   return [code, Blockly.Arduino.ORDER_MULTIPLICATIVE];
 };
@@ -161,16 +173,16 @@ Blockly.Arduino['math_single'] = function (block) {
  * @param {!Blockly.Block} block Block to generate the code from.
  * @return {string} Completed code.
  */
-Blockly.Arduino['math_constant'] = function (block) {
+Blockly.Arduino["math_constant"] = function (block) {
   var CONSTANTS = {
-        'PI': ['M_PI', Blockly.Arduino.ORDER_UNARY_POSTFIX],
-        'E': ['M_E', Blockly.Arduino.ORDER_UNARY_POSTFIX],
-        'GOLDEN_RATIO': ['(1 + sqrt(5)) / 2', Blockly.Arduino.ORDER_MULTIPLICATIVE],
-        'SQRT2': ['M_SQRT2', Blockly.Arduino.ORDER_UNARY_POSTFIX],
-        'SQRT1_2': ['M_SQRT1_2', Blockly.Arduino.ORDER_UNARY_POSTFIX],
-        'INFINITY': ['INFINITY', Blockly.Arduino.ORDER_ATOMIC]
+    PI: ["M_PI", Blockly.Arduino.ORDER_UNARY_POSTFIX],
+    E: ["M_E", Blockly.Arduino.ORDER_UNARY_POSTFIX],
+    GOLDEN_RATIO: ["(1 + sqrt(5)) / 2", Blockly.Arduino.ORDER_MULTIPLICATIVE],
+    SQRT2: ["M_SQRT2", Blockly.Arduino.ORDER_UNARY_POSTFIX],
+    SQRT1_2: ["M_SQRT1_2", Blockly.Arduino.ORDER_UNARY_POSTFIX],
+    INFINITY: ["INFINITY", Blockly.Arduino.ORDER_ATOMIC],
   };
-    return CONSTANTS[block.getFieldValue('CONSTANT')];
+  return CONSTANTS[block.getFieldValue("CONSTANT")];
 };
 
 /**
@@ -180,58 +192,67 @@ Blockly.Arduino['math_constant'] = function (block) {
  * @param {!Blockly.Block} block Block to generate the code from.
  * @return {array} Completed code with order of operation.
  */
-Blockly.Arduino['math_number_property'] = function (block) {
-    var number_to_check = Blockly.Arduino.valueToCode(block, 'NUMBER_TO_CHECK',
-        Blockly.Arduino.ORDER_MULTIPLICATIVE) || '0';
-    var dropdown_property = block.getFieldValue('PROPERTY');
+Blockly.Arduino["math_number_property"] = function (block) {
+  var number_to_check =
+    Blockly.Arduino.valueToCode(
+      block,
+      "NUMBER_TO_CHECK",
+      Blockly.Arduino.ORDER_MULTIPLICATIVE
+    ) || "0";
+  var dropdown_property = block.getFieldValue("PROPERTY");
   var code;
-    if (dropdown_property === 'PRIME') {
+  if (dropdown_property === "PRIME") {
     var func = [
-            'boolean ' + Blockly.Arduino.DEF_FUNC_NAME + '(int n) {',
-            '  // https://en.wikipedia.org/wiki/Primality_test#Naive_methods',
-            '  if (n == 2 || n == 3) {',
-            '    return true;',
-            '  }',
-            '  // False if n is NaN, negative, is 1.',
-            '  // And false if n is divisible by 2 or 3.',
-            '  if (isnan(n) || (n <= 1) || (n == 1) || (n % 2 == 0) || ' +
-            '(n % 3 == 0)) {',
-            '    return false;',
-            '  }',
-            '  // Check all the numbers of form 6k +/- 1, up to sqrt(n).',
-            '  for (int x = 6; x <= sqrt(n) + 1; x += 6) {',
-            '    if (n % (x - 1) == 0 || n % (x + 1) == 0) {',
-            '      return false;',
-            '    }',
-            '  }',
-            '  return true;',
-            '}'];
-        var funcName = Blockly.Arduino.addFunction('mathIsPrime', func.join('\n'));
-        Blockly.Arduino.addInclude('math', '#include <math.h>');
-        code = funcName + '(' + number_to_check + ')';
+      "boolean " + Blockly.Arduino.DEF_FUNC_NAME + "(int n) {",
+      "  // https://en.wikipedia.org/wiki/Primality_test#Naive_methods",
+      "  if (n == 2 || n == 3) {",
+      "    return true;",
+      "  }",
+      "  // False if n is NaN, negative, is 1.",
+      "  // And false if n is divisible by 2 or 3.",
+      "  if (isnan(n) || (n <= 1) || (n == 1) || (n % 2 == 0) || " +
+        "(n % 3 == 0)) {",
+      "    return false;",
+      "  }",
+      "  // Check all the numbers of form 6k +/- 1, up to sqrt(n).",
+      "  for (int x = 6; x <= sqrt(n) + 1; x += 6) {",
+      "    if (n % (x - 1) == 0 || n % (x + 1) == 0) {",
+      "      return false;",
+      "    }",
+      "  }",
+      "  return true;",
+      "}",
+    ];
+    var funcName = Blockly.Arduino.addFunction("mathIsPrime", func.join("\n"));
+    Blockly.Arduino.addInclude("math", "#include <math.h>");
+    code = funcName + "(" + number_to_check + ")";
     return [code, Blockly.Arduino.ORDER_UNARY_POSTFIX];
   }
   switch (dropdown_property) {
-        case 'EVEN':
-            code = number_to_check + ' % 2 == 0';
+    case "EVEN":
+      code = number_to_check + " % 2 == 0";
       break;
-        case 'ODD':
-            code = number_to_check + ' % 2 == 1';
+    case "ODD":
+      code = number_to_check + " % 2 == 1";
       break;
-        case 'WHOLE':
-            Blockly.Arduino.addInclude('math', '#include <math.h>');
-            code = '(floor(' + number_to_check + ') == ' + number_to_check + ')';
+    case "WHOLE":
+      Blockly.Arduino.addInclude("math", "#include <math.h>");
+      code = "(floor(" + number_to_check + ") == " + number_to_check + ")";
       break;
-        case 'POSITIVE':
-            code = number_to_check + ' > 0';
+    case "POSITIVE":
+      code = number_to_check + " > 0";
       break;
-        case 'NEGATIVE':
-            code = number_to_check + ' < 0';
+    case "NEGATIVE":
+      code = number_to_check + " < 0";
       break;
-        case 'DIVISIBLE_BY':
-            var divisor = Blockly.Arduino.valueToCode(block, 'DIVISOR',
-                Blockly.Arduino.ORDER_MULTIPLICATIVE) || '0';
-            code = number_to_check + ' % ' + divisor + ' == 0';
+    case "DIVISIBLE_BY":
+      var divisor =
+        Blockly.Arduino.valueToCode(
+          block,
+          "DIVISOR",
+          Blockly.Arduino.ORDER_MULTIPLICATIVE
+        ) || "0";
+      code = number_to_check + " % " + divisor + " == 0";
       break;
     default:
       break;
@@ -247,19 +268,25 @@ Blockly.Arduino['math_number_property'] = function (block) {
  * @param {!Blockly.Block} block Block to generate the code from.
  * @return {array} Completed code with order of operation.
  */
-Blockly.Arduino['math_change'] = function (block) {
-    var argument0 = Blockly.Arduino.valueToCode(block, 'DELTA',
-        Blockly.Arduino.ORDER_ADDITIVE) || '0';
-    var varName = Blockly.Arduino.variableDB_.getName(
-        block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
-    return varName + ' += ' + argument0 + ';\n';
+Blockly.Arduino["math_change"] = function (block) {
+  var argument0 =
+    Blockly.Arduino.valueToCode(
+      block,
+      "DELTA",
+      Blockly.Arduino.ORDER_ADDITIVE
+    ) || "0";
+  var varName = Blockly.Arduino.nameDB_.getName(
+    block.getFieldValue("VAR"),
+    Blockly.Variables.NAME_TYPE
+  );
+  return varName + " += " + argument0 + ";\n";
 };
 
 /** Rounding functions have a single operand. */
-Blockly.Arduino['math_round'] = Blockly.Arduino['math_single'];
+Blockly.Arduino["math_round"] = Blockly.Arduino["math_single"];
 
 /** Trigonometry functions have a single operand. */
-Blockly.Arduino['math_trig'] = Blockly.Arduino['math_single'];
+Blockly.Arduino["math_trig"] = Blockly.Arduino["math_single"];
 
 /**
  * Generator for the math function to a list.
@@ -268,7 +295,7 @@ Blockly.Arduino['math_trig'] = Blockly.Arduino['math_single'];
  * @param {!Blockly.Block} block Block to generate the code from.
  * @return {array} Completed code with order of operation.
  */
-Blockly.Arduino['math_on_list'] = Blockly.Arduino.noGeneratorCodeInline;
+Blockly.Arduino["math_on_list"] = Blockly.Arduino.noGeneratorCodeInline;
 
 /**
  * Generator for the math modulo function (calculates remainder of X/Y).
@@ -276,12 +303,20 @@ Blockly.Arduino['math_on_list'] = Blockly.Arduino.noGeneratorCodeInline;
  * @param {!Blockly.Block} block Block to generate the code from.
  * @return {array} Completed code with order of operation.
  */
-Blockly.Arduino['math_modulo'] = function (block) {
-    var argument0 = Blockly.Arduino.valueToCode(block, 'DIVIDEND',
-        Blockly.Arduino.ORDER_MULTIPLICATIVE) || '0';
-    var argument1 = Blockly.Arduino.valueToCode(block, 'DIVISOR',
-        Blockly.Arduino.ORDER_MULTIPLICATIVE) || '0';
-    var code = argument0 + ' % ' + argument1;
+Blockly.Arduino["math_modulo"] = function (block) {
+  var argument0 =
+    Blockly.Arduino.valueToCode(
+      block,
+      "DIVIDEND",
+      Blockly.Arduino.ORDER_MULTIPLICATIVE
+    ) || "0";
+  var argument1 =
+    Blockly.Arduino.valueToCode(
+      block,
+      "DIVISOR",
+      Blockly.Arduino.ORDER_MULTIPLICATIVE
+    ) || "0";
+  var code = argument0 + " % " + argument1;
   return [code, Blockly.Arduino.ORDER_MULTIPLICATIVE];
 };
 
@@ -291,17 +326,33 @@ Blockly.Arduino['math_modulo'] = function (block) {
  * @param {!Blockly.Block} block Block to generate the code from.
  * @return {array} Completed code with order of operation.
  */
-Blockly.Arduino['math_constrain'] = function (block) {
+Blockly.Arduino["math_constrain"] = function (block) {
   // Constrain a number between two limits.
-    var argument0 = Blockly.Arduino.valueToCode(block, 'VALUE',
-        Blockly.Arduino.ORDER_NONE) || '0';
-    var argument1 = Blockly.Arduino.valueToCode(block, 'LOW',
-        Blockly.Arduino.ORDER_NONE) || '0';
-    var argument2 = Blockly.Arduino.valueToCode(block, 'HIGH',
-        Blockly.Arduino.ORDER_NONE) || '0';
-    var code = '(' + argument0 + ' < ' + argument1 + ' ? ' + argument1 +
-        ' : ( ' + argument0 + ' > ' + argument2 + ' ? ' + argument2 + ' : ' +
-        argument0 + '))';
+  var argument0 =
+    Blockly.Arduino.valueToCode(block, "VALUE", Blockly.Arduino.ORDER_NONE) ||
+    "0";
+  var argument1 =
+    Blockly.Arduino.valueToCode(block, "LOW", Blockly.Arduino.ORDER_NONE) ||
+    "0";
+  var argument2 =
+    Blockly.Arduino.valueToCode(block, "HIGH", Blockly.Arduino.ORDER_NONE) ||
+    "0";
+  var code =
+    "(" +
+    argument0 +
+    " < " +
+    argument1 +
+    " ? " +
+    argument1 +
+    " : ( " +
+    argument0 +
+    " > " +
+    argument2 +
+    " ? " +
+    argument2 +
+    " : " +
+    argument0 +
+    "))";
   return [code, Blockly.Arduino.ORDER_UNARY_POSTFIX];
 };
 
@@ -312,28 +363,26 @@ Blockly.Arduino['math_constrain'] = function (block) {
  * @param {!Blockly.Block} block Block to generate the code from.
  * @return {array} Completed code with order of operation.
  */
-Blockly.Arduino['math_random_int'] = function (block) {
-    var argument0 = Blockly.Arduino.valueToCode(block, 'FROM',
-        Blockly.Arduino.ORDER_NONE) || '0';
-    var argument1 = Blockly.Arduino.valueToCode(block, 'TO',
-        Blockly.Arduino.ORDER_NONE) || '0';
-    var functionName = Blockly.Arduino.variableDB_.getDistinctName(
-        'math_random_int', Blockly.Generator.NAME_TYPE);
-    Blockly.Arduino.setups_['init_rand'] = 'randomSeed(analogRead(0));';
-    Blockly.Arduino.math_random_int.random_function = functionName;
-    var func = [
-        'int ' + Blockly.Arduino.DEF_FUNC_NAME + '(int min, int max) {',
-        '  if (min > max) {',
-        '    // Swap min and max to ensure min is smaller.',
-        '    int temp = min;',
-        '    min = max;',
-        '    max = temp;',
-        '  }',
-        '  return min + (rand() % (max - min + 1));',
-        '}'];
-    var funcName = Blockly.Arduino.addFunction('mathRandomInt', func.join('\n'));
-    var code = funcName + '(' + argument0 + ', ' + argument1 + ')';
-    return [code, Blockly.Arduino.ORDER_UNARY_POSTFIX];
+Blockly.Arduino["math_random_int"] = function (block) {
+  var argument0 =
+    Blockly.Arduino.valueToCode(block, "FROM", Blockly.Arduino.ORDER_NONE) ||
+    "0";
+  var argument1 =
+    Blockly.Arduino.valueToCode(block, "TO", Blockly.Arduino.ORDER_NONE) || "0";
+  Blockly.Arduino.setupCode_["init_rand"] = "randomSeed(analogRead(0));";
+  Blockly.Arduino.functionNames_[
+    "math_random_int"
+  ] = `int mathRandomInt (int min, int max) {\n
+      if (min > max) {
+        int temp = min;
+        min = max;
+        max = temp;
+      }
+      return min + (rand() % (max - min + 1));
+    }
+    `;
+  var code = `mathRandomInt(${argument0},${argument1});`;
+  return [code, Blockly.Arduino.ORDER_ATOMIC];
 };
 
 /**
@@ -342,6 +391,6 @@ Blockly.Arduino['math_random_int'] = function (block) {
  * @param {!Blockly.Block} block Block to generate the code from.
  * @return {string} Completed code.
  */
-Blockly.Arduino['math_random_float'] = function (block) {
-    return ['(rand() / RAND_MAX)', Blockly.Arduino.ORDER_UNARY_POSTFIX];
+Blockly.Arduino["math_random_float"] = function (block) {
+  return ["(rand() / RAND_MAX)", Blockly.Arduino.ORDER_UNARY_POSTFIX];
 };

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,22 +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.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;
+  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){
+  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.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,92 +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) {
-    console.log(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 = [];
@@ -100,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 = [];
@@ -119,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

@@ -0,0 +1,126 @@
+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.phyphoxSetupCode_[
+    "phyphox_start"
+  ] = `PhyphoxBLE::start("${name}");`;
+  var code = ``;
+  return code;
+};
+
+Blockly.Arduino.sensebox_phyphox_experiment = function () {
+  var experimentname = "experiment";
+  var title = this.getFieldValue("title").replace(/[^a-zA-Z0-9]/g, "");
+  var description = this.getFieldValue("description");
+  var branch = Blockly.Arduino.statementToCode(this, "view");
+  Blockly.Arduino.phyphoxSetupCode_[
+    `PhyphoxBleExperiment_${experimentname}`
+  ] = `PhyphoxBleExperiment ${experimentname};`;
+  Blockly.Arduino.phyphoxSetupCode_[
+    `setTitle_${title}`
+  ] = `${experimentname}.setTitle("${title}");`;
+  Blockly.Arduino.phyphoxSetupCode_[
+    `setCategory_senseBoxExperiments}`
+  ] = `${experimentname}.setCategory("senseBox Experimente");`;
+  Blockly.Arduino.phyphoxSetupCode_[
+    `setDescription_${description}`
+  ] = `${experimentname}.setDescription("${description}");`;
+  Blockly.Arduino.phyphoxSetupCode_[
+    `addView_${experimentname}`
+  ] = `PhyphoxBleExperiment::View firstView;\nfirstView.setLabel("Messwerte"); //Create a "view"`;
+  Blockly.Arduino.phyphoxSetupCode_[`addGraph`] = `${branch}`;
+  Blockly.Arduino.phyphoxSetupCode_[
+    `addView_firstview`
+  ] = `${experimentname}.addView(firstView);`; //Attach view to experiment
+  Blockly.Arduino.phyphoxSetupCode_[
+    `addExperiment_${experimentname}`
+  ] = `PhyphoxBLE::addExperiment(${experimentname});`; //Attach experiment to server
+
+  var code = ``;
+  return code;
+};
+
+Blockly.Arduino["sensebox_phyphox_timestamp"] = function () {
+  var code = 0;
+  return [code, Blockly.Arduino.ORDER_ATOMIC];
+};
+
+Blockly.Arduino["sensebox_phyphox_channel"] = function () {
+  var channel = parseFloat(this.getFieldValue("channel"));
+  var code = channel;
+  return [code, Blockly.Arduino.ORDER_ATOMIC];
+};
+
+Blockly.Arduino.sensebox_phyphox_sendchannel = function (block) {
+  var channel = this.getFieldValue("channel");
+  var value =
+    Blockly.Arduino.valueToCode(this, "value", Blockly.Arduino.ORDER_ATOMIC) ||
+    "1";
+
+  var code = `float channel${channel} = ${value};\n`;
+  return code;
+};
+
+Blockly.Arduino.sensebox_phyphox_graph = function () {
+  var label = this.getFieldValue("label").replace(/[^a-zA-Z0-9]/g, "");
+  var unitx = this.getFieldValue("unitx");
+  var unity = this.getFieldValue("unity");
+  var labelx = this.getFieldValue("labelx");
+  var labely = this.getFieldValue("labely");
+  var style = this.getFieldValue("style");
+  var channelX =
+    Blockly.Arduino.valueToCode(
+      this,
+      "channel0",
+      Blockly.Arduino.ORDER_ATOMIC
+    ) || 0;
+  var channelY =
+    Blockly.Arduino.valueToCode(
+      this,
+      "channel1",
+      Blockly.Arduino.ORDER_ATOMIC
+    ) || 1;
+
+  var code = `PhyphoxBleExperiment::Graph ${label};\n`; //Create graph which will plot random numbers over time
+  code += `${label}.setLabel("${label}");\n`;
+  code += `${label}.setUnitX("${unitx}");\n`;
+  code += `${label}.setUnitY("${unity}");\n`;
+  code += `${label}.setLabelX("${labelx}");\n`;
+  code += `${label}.setLabelY("${labely}");\n`;
+  if (style === "dots"){
+    code += `${label}.setStyle("${style}");\n`;
+  }
+  code += `${label}.setChannel(${channelX}, ${channelY});\n`;
+  code += `firstView.addElement(${label});\n`;
+  return code;
+};
+
+Blockly.Arduino.sensebox_phyphox_experiment_send = function () {
+  var branch = Blockly.Arduino.statementToCode(this, "sendValues");
+  var blocks = this.getDescendants();
+  var count = 0;
+  if (blocks !== undefined) {
+    for (var i = 0; i < blocks.length; i++) {
+      if (blocks[i].type === "sensebox_phyphox_sendchannel") {
+        count++;
+      }
+    }
+  }
+  if (count === 5) {
+  }
+  var string = "";
+
+  for (var j = 1; j <= count; j++) {
+    if (string === "") {
+      string += `channel${j}`;
+    } else if (string !== "") {
+      string += `, channel${j}`;
+    }
+  }
+  Blockly.Arduino.loopCodeOnce_["phyphox_poll"] = `PhyphoxBLE::poll();`;
+  var code = `${branch}\nPhyphoxBLE::write(${string});`;
+  return code;
+};

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;
@@ -10,37 +11,62 @@ Blockly.Arduino.sensebox_led = function () {
 
 Blockly.Arduino.sensebox_rgb_led = function () {
     var dropdown_pin = this.getFieldValue('PIN');
-    var red = this.getFieldValue('RED') || '0'
-    var green = this.getFieldValue('GREEN') || '0'
-    var blue = this.getFieldValue('BLUE') || '0'
+    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(' + red + ',' + green + ',' + blue + '));\n';
+    var code = 'rgb_led_' + dropdown_pin + '.setPixelColor(0,rgb_led_' + dropdown_pin + '.Color(' + color + '));\n';
     code += 'rgb_led_' + dropdown_pin + '.show();';
     return code;
 };
 
 
-Blockly.Arduino.sensebox_ws2818_led = function () {
+Blockly.Arduino.sensebox_ws2818_led_init = function () {
     var dropdown_pin = this.getFieldValue('Port');
-    var blocks = Blockly.mainWorkspace.getAllBlocks();
-    var count = 0;
-    for (var i = 0; i < blocks.length; i++) {
-        if (blocks[i].type === 'sensebox_ws2818_led' && blocks[i].getFieldValue('Port') === dropdown_pin) {
-            count++;
-
-        }
-    }
-    var numPixel = count;
+    var numPixel = Blockly.Arduino.valueToCode(this, 'NUMBER', Blockly.Arduino.ORDER_ATOMIC) || '1';
     var brightness = Blockly.Arduino.valueToCode(this, 'BRIGHTNESS', Blockly.Arduino.ORDER_ATOMIC) || '50'
-    var position = Blockly.Arduino.valueToCode(this, 'POSITION', Blockly.Arduino.ORDER_ATOMIC) || '0';
-    var red = Blockly.Arduino.valueToCode(this, 'RED', Blockly.Arduino.ORDER_ATOMIC) || '0'
-    var green = Blockly.Arduino.valueToCode(this, 'GREEN', Blockly.Arduino.ORDER_ATOMIC) || '0'
-    var blue = Blockly.Arduino.valueToCode(this, 'BLUE', Blockly.Arduino.ORDER_ATOMIC) || '0'
+    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`;
-    var code = `rgb_led_${dropdown_pin}.setPixelColor(${position},rgb_led_${dropdown_pin}.Color(${red},${green},${blue}));\nrgb_led_${dropdown_pin}.show();\n`;
+    return '';
+};
+
+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'
+    var code = `rgb_led_${dropdown_pin}.setPixelColor(${position},rgb_led_${dropdown_pin}.Color(${color}));\nrgb_led_${dropdown_pin}.show();\n`;
     return code;
 };
+
+
+function hexToRgb(hex) {
+    const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
+    return result ? {
+        r: parseInt(result[1], 16),
+        g: parseInt(result[2], 16),
+        b: parseInt(result[3], 16)
+    } : null;
+}
+
+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];
+};
+
+Blockly.Arduino['colour_random'] = function (block) {
+    return ['random(0, 255), random(0, 255), random(0, 255)', Blockly.Arduino.ORDER_ATOMIC];
+};
+
+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);
+
+    return [red + ', ' + green + ', ' + blue, Blockly.Arduino.ORDER_ATOMIC];
+};

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

@@ -1,27 +1,27 @@
-import * as Blockly from 'blockly/core';
-
+import * as Blockly from "blockly/core";
 
 Blockly.Arduino.sensebox_lora_initialize_otaa = function (block) {
-    var deivceID = this.getFieldValue('DEVICEID');
-    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_spi'] = '#include <SPI.h>';
-    Blockly.Arduino.libraries_['library_lmic'] = '#include <lmic.h>';
-    Blockly.Arduino.libraries_['library_hal'] = '#include <hal/hal.h>';
-    Blockly.Arduino.definitions_['define_LoRaVariablesOTAA'] = `
-    static const u1_t PROGMEM APPEUI[8]= `+ appID + ` ;
+  var deivceID = this.getFieldValue("DEVICEID");
+  var appID = this.getFieldValue("APPID");
+  var appKey = this.getFieldValue("APPKEY");
+  var interval = this.getFieldValue("INTERVAL");
+  Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
+  Blockly.Arduino.libraries_["library_spi"] = "#include <SPI.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}};
     void os_getArtEui (u1_t* buf) { memcpy_P(buf, APPEUI , 8);}
   
-    static const u1_t PROGMEM DEVEUI[8]= `+ deivceID + `;
+    static const u1_t PROGMEM DEVEUI[8]= {${deivceID}};
     void os_getDevEui (u1_t* buf) { memcpy_P(buf, DEVEUI , 8);}
   
     // This key should be in big endian format (or, since it is not really a
     // number but a block of memory, endianness does not really apply). In
     // practice, a key taken from ttnctl can be copied as-is.
     // The key shown here is the semtech default key.
-    static const u1_t PROGMEM APPKEY[16] = `+ appKey + `;
+    static const u1_t PROGMEM APPKEY[16] = {${appKey}};
     void os_getDevKey (u1_t* buf) {  memcpy_P(buf, APPKEY , 16);}
   
     static osjob_t sendjob;
@@ -38,7 +38,7 @@ Blockly.Arduino.sensebox_lora_initialize_otaa = function (block) {
         .dio = {PIN_XB1_INT, PIN_XB1_INT, LMIC_UNUSED_PIN},
     };`;
 
-    Blockly.Arduino.codeFunctions_['functions_initLora'] = `
+  Blockly.Arduino.codeFunctions_["functions_initLora"] = `
     void initLora() {
       delay(2000);
       // LMIC init
@@ -48,9 +48,9 @@ Blockly.Arduino.sensebox_lora_initialize_otaa = function (block) {
     
       // Start job (sending automatically starts OTAA too)
       do_send(&sendjob);
-    }`
+    }`;
 
-    Blockly.Arduino.codeFunctions_['functions_onEvent'] = `
+  Blockly.Arduino.codeFunctions_["functions_onEvent"] = `
     void onEvent (ev_t ev) {
       Serial.print(os_getTime());
       Serial.print(": ");
@@ -120,16 +120,18 @@ Blockly.Arduino.sensebox_lora_initialize_otaa = function (block) {
               break;
       }
   }`;
-    Blockly.Arduino.loraSetupCode_['initLora'] = 'initLora();\n';
-    Blockly.Arduino.setupCode_['serial.begin'] = 'Serial.begin(9600);\ndelay(1000);\n';
-    var code = '';
+  Blockly.Arduino.loraSetupCode_["initLora"] = "initLora();\n";
+  Blockly.Arduino.setupCode_["serial.begin"] =
+    "Serial.begin(9600);\ndelay(1000);\n";
+  var code = "";
   return code;
 };
 
 Blockly.Arduino.sensebox_lora_message_send = function (block) {
-    Blockly.Arduino.libraries_['library_lora_message'] = '#include <LoraMessage.h>';
-    var lora_sensor_values = Blockly.Arduino.statementToCode(block, 'DO');
-    Blockly.Arduino.functionNames_['functions_do_send'] = `
+  Blockly.Arduino.libraries_["library_lora_message"] =
+    "#include <LoraMessage.h>";
+  var lora_sensor_values = Blockly.Arduino.statementToCode(block, "DO");
+  Blockly.Arduino.functionNames_["functions_do_send"] = `
   void do_send(osjob_t* j){
       // Check if there is not a current TX/RX job running
       if (LMIC.opmode & OP_TXRXPEND) {
@@ -144,39 +146,42 @@ Blockly.Arduino.sensebox_lora_message_send = function (block) {
       }
       // Next TX is scheduled after TX_COMPLETE event.
   }`;
-    Blockly.Arduino.loopCodeOnce_['os_runloop'] = 'os_runloop_once();'
-    return ''
-}
+  Blockly.Arduino.loopCodeOnce_["os_runloop"] = "os_runloop_once();";
+  return "";
+};
 
 /**
  * Block send Data to TTN
  */
 Blockly.Arduino.sensebox_send_lora_sensor_value = function (block) {
-    const reading = Blockly.Arduino.valueToCode(this, 'Value', Blockly.Arduino.ORDER_ATOMIC) || '"Keine Eingabe"';
-    var messageBytes = this.getFieldValue('MESSAGE_BYTES');
-    var code = ''
+  const reading =
+    Blockly.Arduino.valueToCode(this, "Value", Blockly.Arduino.ORDER_ATOMIC) ||
+    '"Keine Eingabe"';
+  var messageBytes = this.getFieldValue("MESSAGE_BYTES");
+  var code = "";
   switch (Number(messageBytes)) {
     case 1:
-            code = `message.addUint8(${reading});\n`
+      code = `message.addUint8(${reading});\n`;
       break;
     case 2:
-            code = `message.addUint16(${reading});\n`
+      code = `message.addUint16(${reading});\n`;
       break;
     case 3:
       code = `message.addUint8(${reading});
-        message.addUint16(${reading} >> 8);\n`
+        message.addUint16(${reading} >> 8);\n`;
       break;
     default:
-            code = `message.addUint16(${reading});\n`
+      code = `message.addUint16(${reading});\n`;
   }
   return code;
 };
 
 Blockly.Arduino.sensebox_lora_cayenne_send = function (block) {
-    Blockly.Arduino.libraries_['library_cayene'] = '#include <CayenneLPP.h>';
-    Blockly.Arduino.variables_['variable_cayenne'] = 'CayenneLPP lpp(51);'
-    var lora_sensor_values = Blockly.Arduino.statementToCode(block, 'DO');
-    Blockly.Arduino.functionNames_['functions_do_send'] = `
+  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"] = `
   void do_send(osjob_t* j){
       // Check if there is not a current TX/RX job running
       if (LMIC.opmode & OP_TXRXPEND) {
@@ -191,18 +196,38 @@ Blockly.Arduino.sensebox_lora_cayenne_send = function (block) {
       }
       // Next TX is scheduled after TX_COMPLETE event.
   }`;
-    Blockly.Arduino.loopCodeOnce_['os_runloop'] = 'os_runloop_once();'
-    return '';
-}
+  Blockly.Arduino.loopCodeOnce_["os_runloop"] = "os_runloop_once();";
+  return "";
+};
 
 Blockly.Arduino.sensebox_lora_ttn_mapper = function (block) {
-    var latitude = Blockly.Arduino.valueToCode(this, 'Latitude', Blockly.Arduino.ORDER_ATOMIC)
-    var longitude = Blockly.Arduino.valueToCode(this, 'Longitude', Blockly.Arduino.ORDER_ATOMIC)
-    var altitude = Blockly.Arduino.valueToCode(this, 'Altitude', Blockly.Arduino.ORDER_ATOMIC)
-    var pDOP = Blockly.Arduino.valueToCode(this, 'pDOP', Blockly.Arduino.ORDER_ATOMIC)
-    var fixType = Blockly.Arduino.valueToCode(this, 'Fix Type', Blockly.Arduino.ORDER_ATOMIC)
-    var fixTypeLimit = this.getFieldValue('dropdown');
-    Blockly.Arduino.functionNames_['functions_do_send'] = `
+  var latitude = Blockly.Arduino.valueToCode(
+    this,
+    "Latitude",
+    Blockly.Arduino.ORDER_ATOMIC
+  );
+  var longitude = Blockly.Arduino.valueToCode(
+    this,
+    "Longitude",
+    Blockly.Arduino.ORDER_ATOMIC
+  );
+  var altitude = Blockly.Arduino.valueToCode(
+    this,
+    "Altitude",
+    Blockly.Arduino.ORDER_ATOMIC
+  );
+  var pDOP = Blockly.Arduino.valueToCode(
+    this,
+    "pDOP",
+    Blockly.Arduino.ORDER_ATOMIC
+  );
+  var fixType = Blockly.Arduino.valueToCode(
+    this,
+    "Fix Type",
+    Blockly.Arduino.ORDER_ATOMIC
+  );
+  var fixTypeLimit = this.getFieldValue("dropdown");
+  Blockly.Arduino.functionNames_["functions_do_send"] = `
   void do_send(osjob_t* j){
       // Check if there is not a current TX/RX job running
       if (LMIC.opmode & OP_TXRXPEND) {
@@ -245,29 +270,29 @@ Blockly.Arduino.sensebox_lora_ttn_mapper = function (block) {
       }
       // Next TX is scheduled after TX_COMPLETE event.
   }`;
-    Blockly.Arduino.loopCodeOnce_['os_runloop'] = 'os_runloop_once();'
-    return '';
-}
+  Blockly.Arduino.loopCodeOnce_["os_runloop"] = "os_runloop_once();";
+  return "";
+};
 
 Blockly.Arduino.sensebox_lora_initialize_abp = function (block) {
-    var nwskey = this.getFieldValue('NWSKEY');
-    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_spi'] = '#include <SPI.h>';
-    Blockly.Arduino.libraries_['library_lmic'] = '#include <lmic.h>';
-    Blockly.Arduino.libraries_['library_hal'] = '#include <hal/hal.h>';
-    Blockly.Arduino.definitions_['define_LoRaVariablesABP'] = `
+  var nwskey = this.getFieldValue("NWSKEY");
+  var appskey = this.getFieldValue("APPSKEY");
+  var devaddr = this.getFieldValue("DEVADDR");
+  var interval = this.getFieldValue("INTERVAL");
+  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>";
+  Blockly.Arduino.definitions_["define_LoRaVariablesABP"] = `
     // LoRaWAN NwkSKey, network session key
     // This is the default Semtech key, which is used by the early prototype TTN
     // network.
-    static const PROGMEM u1_t NWKSKEY[16] = ${nwskey};
+    static const PROGMEM u1_t NWKSKEY[16] = { ${nwskey} };
     
     // LoRaWAN AppSKey, application session key
     // This is the default Semtech key, which is used by the early prototype TTN
     // network.
-    static const u1_t PROGMEM APPSKEY[16] = ${appskey};
+    static const u1_t PROGMEM APPSKEY[16] = { ${appskey} };
     
     // LoRaWAN end-device address (DevAddr)
     static const u4_t DEVADDR = 0x${devaddr};
@@ -293,7 +318,7 @@ Blockly.Arduino.sensebox_lora_initialize_abp = function (block) {
         .dio = {PIN_XB1_INT, PIN_XB1_INT, LMIC_UNUSED_PIN},
     };`;
 
-    Blockly.Arduino.codeFunctions_['functions_initLora'] = `
+  Blockly.Arduino.codeFunctions_["functions_initLora"] = `
     void initLora() {
       delay(2000);
       // LMIC init
@@ -359,9 +384,9 @@ Blockly.Arduino.sensebox_lora_initialize_abp = function (block) {
   
       // Start job
       do_send(&sendjob);
-    }`
+    }`;
 
-    Blockly.Arduino.codeFunctions_['functions_onEvent'] = `
+  Blockly.Arduino.codeFunctions_["functions_onEvent"] = `
     void onEvent (ev_t ev) {
       Serial.print(os_getTime());
       Serial.print(": ");
@@ -426,60 +451,86 @@ Blockly.Arduino.sensebox_lora_initialize_abp = function (block) {
               break;
       }
   }`;
-    Blockly.Arduino.loraSetupCode_['initLora'] = 'initLora();\n';
-    Blockly.Arduino.setupCode_['serial.begin'] = 'Serial.begin(9600);\ndelay(1000);\n';
-    return '';
-}
+  Blockly.Arduino.loraSetupCode_["initLora"] = "initLora();\n";
+  Blockly.Arduino.setupCode_["serial.begin"] =
+    "Serial.begin(9600);\ndelay(1000);\n";
+  return "";
+};
 
 Blockly.Arduino.sensebox_lora_cayenne_temperature = function (block) {
-    var temperature = Blockly.Arduino.valueToCode(this, 'Value', Blockly.Arduino.ORDER_ATOMIC) || 0
-    var channel = this.getFieldValue('CHANNEL');
+  var temperature =
+    Blockly.Arduino.valueToCode(this, "Value", Blockly.Arduino.ORDER_ATOMIC) ||
+    0;
+  var channel = this.getFieldValue("CHANNEL");
   var code = `lpp.addTemperature(${channel}, ${temperature});\n`;
   return code;
-}
+};
 
 Blockly.Arduino.sensebox_lora_cayenne_humidity = function (block) {
-    var humidity = Blockly.Arduino.valueToCode(this, 'Value', Blockly.Arduino.ORDER_ATOMIC) || 0
-    var channel = this.getFieldValue('CHANNEL');
+  var humidity =
+    Blockly.Arduino.valueToCode(this, "Value", Blockly.Arduino.ORDER_ATOMIC) ||
+    0;
+  var channel = this.getFieldValue("CHANNEL");
   var code = `lpp.addRelativeHumidity(${channel}, ${humidity});\n`;
   return code;
-}
+};
 
 Blockly.Arduino.sensebox_lora_cayenne_pressure = function (block) {
-    var pressure = Blockly.Arduino.valueToCode(this, 'Value', Blockly.Arduino.ORDER_ATOMIC) || 0
-    var channel = this.getFieldValue('CHANNEL');
+  var pressure =
+    Blockly.Arduino.valueToCode(this, "Value", Blockly.Arduino.ORDER_ATOMIC) ||
+    0;
+  var channel = this.getFieldValue("CHANNEL");
   var code = `lpp.addBarometricPressure(${channel}, ${pressure});\n`;
   return code;
-}
+};
 
 Blockly.Arduino.sensebox_lora_cayenne_luminosity = function (block) {
-    var luminosity = Blockly.Arduino.valueToCode(this, 'Value', Blockly.Arduino.ORDER_ATOMIC) || 0
-    var channel = this.getFieldValue('CHANNEL');
+  var luminosity =
+    Blockly.Arduino.valueToCode(this, "Value", Blockly.Arduino.ORDER_ATOMIC) ||
+    0;
+  var channel = this.getFieldValue("CHANNEL");
   var code = `lpp.addLuminosity(${channel}, ${luminosity});\n`;
   return code;
-}
+};
 
 Blockly.Arduino.sensebox_lora_cayenne_sensor = function (block) {
-    var sensorValue = Blockly.Arduino.valueToCode(this, 'Value', Blockly.Arduino.ORDER_ATOMIC) || 0
-    var channel = this.getFieldValue('CHANNEL');
+  var sensorValue =
+    Blockly.Arduino.valueToCode(this, "Value", Blockly.Arduino.ORDER_ATOMIC) ||
+    0;
+  var channel = this.getFieldValue("CHANNEL");
   var code = `lpp.addAnalogInput(${channel}, ${sensorValue});\n`;
   return code;
-}
+};
 
 Blockly.Arduino.sensebox_lora_cayenne_accelerometer = function (block) {
-    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 z = Blockly.Arduino.valueToCode(this, 'Z', Blockly.Arduino.ORDER_ATOMIC) || 0
-    var channel = this.getFieldValue('CHANNEL');
+  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 z =
+    Blockly.Arduino.valueToCode(this, "Z", Blockly.Arduino.ORDER_ATOMIC) || 0;
+  var channel = this.getFieldValue("CHANNEL");
   var code = `lpp.addAccelerometer(${channel}, ${x}, ${y}, ${z});\n`;
   return code;
-}
+};
 
 Blockly.Arduino.sensebox_lora_cayenne_gps = function (block) {
-    var lat = Blockly.Arduino.valueToCode(this, 'LAT', Blockly.Arduino.ORDER_ATOMIC) || 0
-    var lng = Blockly.Arduino.valueToCode(this, 'LNG', Blockly.Arduino.ORDER_ATOMIC) || 0
-    var alt = Blockly.Arduino.valueToCode(this, 'ALT', Blockly.Arduino.ORDER_ATOMIC) || 0
-    var channel = this.getFieldValue('CHANNEL');
-    var code = `lpp.addGPS(${channel}, ${lat}, ${lng}, ${alt});\n`
+  var lat =
+    Blockly.Arduino.valueToCode(this, "LAT", Blockly.Arduino.ORDER_ATOMIC) || 0;
+  var lng =
+    Blockly.Arduino.valueToCode(this, "LNG", Blockly.Arduino.ORDER_ATOMIC) || 0;
+  var alt =
+    Blockly.Arduino.valueToCode(this, "ALT", Blockly.Arduino.ORDER_ATOMIC) || 0;
+  var channel = this.getFieldValue("CHANNEL");
+  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-motors.js

@@ -0,0 +1,77 @@
+import * as Blockly from "blockly/core";
+
+
+/**
+ * Servo Motor
+ * 
+ */
+Blockly.Arduino.sensebox_motors_beginServoMotor = function () {
+    var pin = this.getFieldValue("pin");
+    Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
+    Blockly.Arduino.libraries_["include_servo_motor"] = "#include <Servo.h>";
+    Blockly.Arduino.definitions_[`define_servo_motor_${pin}`] = `Servo servo_motor_${pin}; // servo Motor`;
+    Blockly.Arduino.setupCode_[`setup_servo_motor_${pin}`] = `servo_motor_${pin}.attach(${pin}); // attach servo motor to pin ${pin}`;
+    var code = "";
+    return code;
+};
+
+Blockly.Arduino.sensebox_motors_moveServoMotor = function () {
+    var pin = this.getFieldValue("pin");
+    var degrees = Blockly.Arduino.valueToCode(this, 'degrees', Blockly.Arduino.ORDER_ATOMIC) || "90";
+    var code = `servo_motor_${pin}.write(${degrees});  // move servo motor to ${degrees} degrees\n`;
+    return code;
+};
+
+/**
+ * I2C Motor Board
+ * 
+ */
+Blockly.Arduino.sensebox_motors_I2CMotorBoard_begin = function () {
+    Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
+    Blockly.Arduino.libraries_["include_i2c_motor_board"] = "#include <Grove_I2C_Motor_Driver.h>";
+    Blockly.Arduino.definitions_["define_i2c_motor_board"] = `
+#define I2C_MOTOR_BOARD_ADDRESS 0x0f // default I2C address of I2C Motor Board`;
+    Blockly.Arduino.setupCode_["setup_i2c_motor_board"] = `
+    Motor.begin(I2C_MOTOR_BOARD_ADDRESS); // Initialize I2C Motor Board`;
+    var code = "";
+    return code;
+};
+
+Blockly.Arduino.sensebox_motors_I2CMotorBoard_moveDCMotor = function () {
+    var motor = this.getFieldValue("motor");
+    var speed = Blockly.Arduino.valueToCode(this, 'speed', Blockly.Arduino.ORDER_ATOMIC) || "50";
+    var code = `Motor.speed(MOTOR${motor}, ${speed}); // set speed of motor\n`;
+    return code;
+};
+
+Blockly.Arduino.sensebox_motors_I2CMotorBoard_stopDCMotor = function () {
+    var motor = this.getFieldValue("motor");
+    var code = `Motor.stop(MOTOR${motor}); // stop motor\n`;
+    return code;
+};
+
+
+/**
+ * Stepper Motor
+ */
+Blockly.Arduino.sensebox_motors_beginStepperMotor = function () {
+    var in1 = this.getFieldValue("in1");
+    var in2 = this.getFieldValue("in2");
+    var in3 = this.getFieldValue("in3");
+    var in4 = this.getFieldValue("in4");
+    var rpm = this.getFieldValue("rpm");
+    Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
+    Blockly.Arduino.libraries_["include_stepper_motor"] = "#include <Stepper.h>";
+    Blockly.Arduino.definitions_["define_stepper_motor"] = `
+Stepper stepper_motor(2048, ${in1}, ${in2}, ${in3}, ${in4}); // stepper Motor with 2048 steps per rotation`;
+    Blockly.Arduino.setupCode_["setup_stepper_motor"] =
+        `stepper_motor.setSpeed(${rpm}); // speed in rotations per minute`;
+    var code = "";
+    return code;
+};
+
+Blockly.Arduino.sensebox_motors_moveStepperMotor = function () {
+    var steps = Blockly.Arduino.valueToCode(this, 'steps', Blockly.Arduino.ORDER_ATOMIC) || '2048';
+    var code = `stepper_motor.step(${steps});  // 2048 steps correspond to one rotation\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) {
+  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

@@ -0,0 +1,96 @@
+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_senseBoxIO"] = "#include <senseBoxIO.h>";
+  Blockly.Arduino.setupCode_["rtc.begin"] = `rtc.begin();`;
+  var code = ``;
+  return code;
+};
+
+Blockly.Arduino.sensebox_rtc_set = function () {
+  var second =
+    Blockly.Arduino.valueToCode(this, "second", Blockly.Arduino.ORDER_ATOMIC) ||
+    "0";
+  var minutes =
+    Blockly.Arduino.valueToCode(
+      this,
+      "minutes",
+      Blockly.Arduino.ORDER_ATOMIC
+    ) || "0";
+  var hour =
+    Blockly.Arduino.valueToCode(this, "hour", Blockly.Arduino.ORDER_ATOMIC) ||
+    "0";
+  var day =
+    Blockly.Arduino.valueToCode(this, "day", Blockly.Arduino.ORDER_ATOMIC) ||
+    "0";
+  var month =
+    Blockly.Arduino.valueToCode(this, "month", Blockly.Arduino.ORDER_ATOMIC) ||
+    "0";
+  var year =
+    Blockly.Arduino.valueToCode(this, "year", Blockly.Arduino.ORDER_ATOMIC) ||
+    "0";
+  Blockly.Arduino.libraries_["RV8523"] = `#include <RV8523.h>`;
+  Blockly.Arduino.setupCode_["rtc.start"] = `rtc.start();`;
+  Blockly.Arduino.setupCode_[
+    "rtc.batterySwitchOver"
+  ] = `rtc.batterySwitchOver(1);`;
+  Blockly.Arduino.setupCode_[
+    "rtc.set"
+  ] = `rtc.set(${second}, ${minutes}, ${hour}, ${day}, ${month}, ${year});`;
+  var code = ``;
+  return code;
+};
+
+Blockly.Arduino.sensebox_rtc_ntp = function () {
+  Blockly.Arduino.libraries_["RV8523"] = `#include <RV8523.h>`;
+  Blockly.Arduino.setupCode_["rtc.start"] = `rtc.start();`;
+  Blockly.Arduino.setupCode_[
+    "rtc.batterySwitchOver"
+  ] = `rtc.batterySwitchOver(1);`;
+  Blockly.Arduino.setupCode_[
+    "rtc.set"
+  ] = `rtc.set(SECOND, MINUTE, HOUR, DAY, MONTH, YEAR);`;
+  var code = ``;
+  return code;
+};
+
+Blockly.Arduino.sensebox_rtc_get = function () {
+  var dropdown = this.getFieldValue("dropdown");
+  Blockly.Arduino.libraries_["RV8523"] = `#include <RV8523.h>`;
+  Blockly.Arduino.setupCode_["rtc.start"] = `rtc.start();`;
+  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.loopCodeOnce_[
+    "rtc_get"
+  ] = `rtc.get(&sec, &min, &hour, &day, &month, &year);`;
+
+  var code = `${dropdown}`;
+  return [code, Blockly.Arduino.ORDER_ATOMIC];
+};
+
+Blockly.Arduino.sensebox_rtc_get_timestamp = function () {
+  Blockly.Arduino.libraries_["RV8523"] = `#include <RV8523.h>`;
+  Blockly.Arduino.setupCode_["rtc.start"] = `rtc.start();`;
+  Blockly.Arduino.setupCode_[
+    "rtc.batterySwitchOver"
+  ] = `rtc.batterySwitchOver(1);`;
+  Blockly.Arduino.variables_["rtc_timestamp"] = `char timestamp[20];`;
+  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,199 @@ 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";
+  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,35 +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.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];
 };
 
@@ -58,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];
 };
 
@@ -74,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) {
@@ -127,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);
@@ -137,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,
@@ -154,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;
@@ -170,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;
@@ -197,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];
 };
 
@@ -220,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];
 };
@@ -259,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
@@ -294,41 +457,238 @@ Blockly.Arduino.sensebox_scd30 = function () {
  */
 
 Blockly.Arduino.sensebox_gps = function () {
-  var dropdown = this.getFieldValue('dropdown');
-  Blockly.Arduino.libraries_['gps_library'] = '#include "SparkFun_Ublox_Arduino_Library.h"'
-  Blockly.Arduino.libraries_['wire'] = '#include <Wire.h>'
-  Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"';
-  Blockly.Arduino.definitions_['GPS'] = 'SFE_UBLOX_GPS myGPS;';
-  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 (myGPS.begin() == false) //Connect to the Ublox module using Wire port
+  if (myGNSS.begin() == false) //Connect to the Ublox module using Wire port
   {
     Serial.println(F("Ublox GPS not detected at default I2C address. Please check wiring. Freezing."));
     while (1);
   }
 
-  myGPS.setI2COutput(COM_TYPE_UBX); //Set the I2C port to output UBX only (turn off NMEA noise)
-  myGPS.saveConfiguration(); //Save the current settings to flash and BBR`;
-  var code = '';
+  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 = "";
   switch (dropdown) {
-    case 'latitude':
-      code = 'myGPS.getLatitude()';
+    case "latitude":
+      code = "myGNSS.getLatitude()";
       break;
-    case 'longitude':
-      code = 'myGPS.getLongitude()';
+    case "longitude":
+      code = "myGNSS.getLongitude()";
       break;
-    case 'altitude':
-      code = 'myGPS.getAltitudeMSL()';
+    case "altitude":
+      code = "myGNSS.getAltitudeMSL()";
       break;
-    case 'pDOP':
-      code = 'myGPS.getPDOP()';
+    case "pDOP":
+      code = "myGNSS.getPDOP()";
       break;
-    case 'fixType':
-      code = 'myGPS.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 () {
+  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") {
+      dropdown_pin = 1;
+    }
+    if (dropdown_port === "B") {
+      dropdown_pin = 3;
+    }
+    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 + ")";
+    return [code, Blockly.Arduino.ORDER_ATOMIC];
+  } else if (dropdown_value === "soil") {
+    if (dropdown_port === "A") {
+      dropdown_pin = 2;
+    }
+    if (dropdown_port === "B") {
+      dropdown_pin = 4;
+    }
+    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 + ")";
+    return [code, Blockly.Arduino.ORDER_ATOMIC];
+  }
+};
+
+/**
+ * DS18B20 Watertemperature
+ *
+ */
+
+Blockly.Arduino.sensebox_sensor_watertemperature = function () {
+  var dropdown_port = this.getFieldValue("Port");
+  var dropdown_pin = 1;
+  if (dropdown_port === "A") {
+    dropdown_pin = 1;
+  }
+  if (dropdown_port === "B") {
+    dropdown_pin = 3;
+  }
+  if (dropdown_port === "C") {
+    dropdown_pin = 5;
+  }
+  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];
+};
+
+/**
+ * Windspeed
+ * remove for now
+
+
+
+Blockly.Arduino.sensebox_windspeed = function () {
+  var dropdown_pin = this.getFieldValue('PIN');
+  Blockly.Arduino.codeFunctions_['windspeed'] = `    
+float getWindspeed(){
+  float voltageWind = analogRead(`+ dropdown_pin + `) * (3.3 / 1024.0);
+  float windspeed = 0.0;
+  if (voltageWind >= 0.018){
+    float poly1 = pow(voltageWind, 3);
+    poly1 = 17.0359801998299 * poly1;
+    float poly2 = pow(voltageWind, 2);
+    poly2 = 47.9908168343362 * poly2;
+    float poly3 = 122.899677524413 * voltageWind;
+    float poly4 = 0.657504127272728;
+    windspeed = poly1 - poly2 + poly3 - poly4;
+    windspeed = windspeed * 0.2777777777777778; //conversion in m/s
+  }
+    return windspeed;
+}`
+  var code = 'getWindspeed()';
+  return [code, Blockly.Arduino.ORDER_ATOMIC];
+};
+ */
+
+/**
+ * DF Robot Soundsensor
+ */
+
+/**
+ *
+ *
+ */
+
+Blockly.Arduino.sensebox_soundsensor_dfrobot = function () {
+  Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
+  var dropdown_port = this.getFieldValue("Port");
+  var dropdown_pin = 1;
+  if (dropdown_port === "A") {
+    dropdown_pin = 1;
+  }
+  if (dropdown_port === "B") {
+    dropdown_pin = 3;
+  }
+  if (dropdown_port === "C") {
+    dropdown_pin = 5;
+  }
+  Blockly.Arduino.codeFunctions_["soundsensor"] =
+    `    
+float getSoundValue(){
+  float v = analogRead(` +
+    dropdown_pin +
+    `) * (3.3 / 1024.0);
+  float decibel = v * 50;
+  return decibel;
+}`;
+  var code = "getSoundValue()";
+  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,122 @@
-import Blockly from 'blockly';
+import Blockly from "blockly";
+//import store from "../../../store";
+
+// preperations for the esp board
+// var selectedBoard = store.getState().board.board;
+// store.subscribe(() => {
+//   selectedBoard = store.getState().board.board;
+// });
 
 
 /* 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/sensebox.js

@@ -1,3 +1,38 @@
-import * as Blockly from 'blockly/core';
-import { Block } from 'blockly';
+import * as Blockly from "blockly/core";
 
+/*
+ * Multiplexer
+ */
+Blockly.Arduino.sensebox_multiplexer_init = function () {
+  // Blockly.Arduino.libraries_['library_spi'] = '#include <SPI.h>';
+  var nrChannels =
+    Blockly.Arduino.valueToCode(
+      this,
+      "nrChannels",
+      Blockly.Arduino.ORDER_ATOMIC
+    ) | 0;
+  var array = [];
+  for (var i = 0; i < nrChannels; i++) {
+    array.push(i);
+  }
+  Blockly.Arduino.libraries_["library_wire"] = "#include <Wire.h>";
+  Blockly.Arduino.definitions_[
+    "define_multiplexer"
+  ] = `byte multiplexAddress = 0x77;
+    byte channels[] = {${array}};`;
+  // 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_multiplexer_changeChannel = function () {
+  var channel = Blockly.Arduino.valueToCode(
+    this,
+    "Channel",
+    Blockly.Arduino.ORDER_ATOMIC
+  );
+  var code = `Wire.beginTransmission(0x77);
+  Wire.write(1 << channels[${channel - 1}]);
+  Wire.endTransmission();`;
+  return code;
+};

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

@@ -1,52 +1,57 @@
-import Blockly from 'blockly';
+import Blockly from "blockly";
 
 const setVariableFunction = function (defaultValue) {
   return function (block) {
-        const variableName = Blockly['Arduino'].variableDB_.getName(
-            block.getFieldValue('VAR'),
-            Blockly.Variables.NAME_TYPE
-        );
-        const variableValue = Blockly['Arduino'].valueToCode(
+    var id = block.getFieldValue("VAR");
+
+    const variableName = Blockly.Variables.getVariable(
+      Blockly.getMainWorkspace(),
+      id
+    ).name;
+
+    // const variableName = Blockly["Arduino"].nameDB_.getName(
+    //   id,
+    //   Blockly.Variables.NAME_TYPE
+    // );
+    const variableValue = Blockly["Arduino"].valueToCode(
       block,
-            'VALUE',
-            Blockly['Arduino'].ORDER_ATOMIC
+      "VALUE",
+      Blockly["Arduino"].ORDER_ATOMIC
     );
 
-        const allVars = Blockly.getMainWorkspace().getVariableMap().getAllVariables();
-        const myVar = allVars.filter(v => v.name === variableName)[0]
-        var code = ''
-
-        switch (myVar.type) {
-            default:
-                Blockly.Arduino.variables_[myVar + myVar.type] = myVar.type + " " + myVar.name + ';\n';
-                code = variableName + ' = ' + (variableValue || defaultValue) + ';\n';
-                break;
-            case 'Array':
-                var arrayType;
-                var number;
-
-                if (this.getChildren().length > 0) {
-                    if (this.getChildren()[0].type === 'lists_create_empty') {
-
-                        arrayType = this.getChildren()[0].getFieldValue('type');
-                        number = Blockly.Arduino.valueToCode(this.getChildren()[0], 'NUMBER', Blockly['Arduino'].ORDER_ATOMIC);
-                        Blockly.Arduino.variables_[myVar + myVar.type] = `${arrayType} ${myVar.name} [${number}];\n`;
-                    }
-                }
-                break;
+    const allVars = Blockly.getMainWorkspace()
+      .getVariableMap()
+      .getAllVariables();
+    const myVar = allVars.filter((v) => v.name === variableName)[0];
+    var code = "";
+    if (myVar !== undefined) {
+      Blockly.Arduino.variables_[variableName + myVar.type] =
+        myVar.type + " " + myVar.name + ";\n";
+      code = variableName + " = " + (variableValue || defaultValue) + ";\n";
     }
     return code;
   };
 };
 
 const getVariableFunction = function (block) {
-    const variableName = Blockly['Arduino'].variableDB_.getName(
-        block.getFieldValue('VAR'),
-        Blockly.Variables.NAME_TYPE
-    );
-    var code = variableName;
-    return [code, Blockly['Arduino'].ORDER_ATOMIC];
+  var id = block.getFieldValue("VAR");
+
+  const variableName = Blockly.Variables.getVariable(
+    Blockly.getMainWorkspace(),
+    id
+  ).name;
+
+  const allVars = Blockly.getMainWorkspace()
+  .getVariableMap()
+  .getAllVariables();
+const myVar = allVars.filter((v) => v.name === variableName)[0];
+  // const variableName = Blockly["Arduino"].nameDB_.getName(
+  //   block.getFieldValue("VAR"),
+  //   Blockly.Variables.NAME_TYPE
+  // );
+  var code = myVar.name;
+  return [code, Blockly["Arduino"].ORDER_ATOMIC];
 };
 
-Blockly['Arduino']['variables_set_dynamic'] = setVariableFunction()
-Blockly['Arduino']['variables_get_dynamic'] = getVariableFunction;
+Blockly["Arduino"]["variables_set_dynamic"] = setVariableFunction();
+Blockly["Arduino"]["variables_get_dynamic"] = getVariableFunction;

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,42 +3,252 @@
  *
  */
 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"],
+  ],
+  digitalPinsRGB: [
+    ["A", "1"],
+    ["B", "3"],
+    ["C", "5"],
+  ],
+  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: "_*_",
 };
 
+//senseBox MCU mini
+const sensebox_mini = {
+  description: "senseBox Mini",
+  compilerFlag: "arduino:samd",
+  digitalPins: [
+    ["IO1", "1"],
+    ["IO2", "2"],
+  ],
+  digitalPinsLED: [
+    ["BUILTIN_1", "7"],
+    ["BUILTIN_2", "8"],
+    ["IO1", "1"],
+    ["IO2", "2"],
+  ],
+  digitalPinsRGB: [
+    ["on Board", "6"],
+    ["IO1", "1"],
+    ["IO2", "2"],
+  ],
+  digitalPinsButton: [
+    ["on Board", "0"],
+    ["IO1", "1"],
+    ["IO2", "2"],
+
+  ],
+  pwmPins: [
+    ["IO1", "1"],
+    ["IO2", "2"],
+  ],
+  serial: [
+    ["serial", "SerialUSB"],
+    ["serial_1", "Serial1"],
+  ],
+  serialPins: {
+    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"],
+  ],
+  analogPins: [
+    ["A1", "A1"],
+    ["A2", "A2"],
+  ],
+  serial_baud_rate: 9600,
+  parseKey: "_*_",
+};
+
+var board = sensebox_mcu
+
+export const setBoard = (selectedBoard) => {
+  if (selectedBoard === "mini"){
+    board = sensebox_mini
+  }
+  else {
+    board = sensebox_mcu
+  }
+}
+
+
 export const selectedBoard = () => {
-    return sensebox_mcu;
+  return board;
 };

src/components/Blockly/helpers/colour.js

@@ -1,4 +1,3 @@
-
 const colours = {
   sensebox: 120,
   logic: 210,
@@ -12,11 +11,12 @@ const colours = {
   audio: 250,
   arrays: 33,
   mqtt: 90,
-    webserver: 40
-}
-
+  serial: 230,
+  webserver: 40,
+  phyphox: 25,
+  motors: 190,
+};
 
 export const getColour = () => {
   return colours;
 };
-

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/helpers/types.js

@@ -105,135 +105,3 @@ export const getCompatibleTypes = (type) => {
 };
 
 export const VARIABLE_TYPES = [['SHORT_NUMBER', 'char'], ['NUMBER', 'int'], ['DECIMAL', 'long'], ['TEXT', 'String'], ['CHARACTER', 'char'], ['BOOLEAN', 'boolean'], ['NULL', 'void'], ['UNDEF', 'undefined']];
-
-// /**
-//  * Some Types have circular dependencies on their compatibilities, so add them
-//  * after declaration.
-//  */
-// Blockly.Types.NUMBER.addCompatibleTypes([
-//     Blockly.Types.BOOLEAN,
-//     Blockly.Types.SHORT_NUMBER,
-//     Blockly.Types.LARGE_NUMBER,
-//     Blockly.Types.DECIMAL]);
-
-// Blockly.Types.SHORT_NUMBER.addCompatibleTypes([
-//     Blockly.Types.BOOLEAN,
-//     Blockly.Types.NUMBER,
-//     Blockly.Types.LARGE_NUMBER,
-//     Blockly.Types.DECIMAL]);
-
-// Blockly.Types.LARGE_NUMBER.addCompatibleTypes([
-//     Blockly.Types.BOOLEAN,
-//     Blockly.Types.SHORT_NUMBER,
-//     Blockly.Types.NUMBER,
-//     Blockly.Types.DECIMAL]);
-
-// /**
-//  * Adds another type to the Blockly.Types collection.
-//  * @param {string} typeId_ Identifiable name of the type.
-//  * @param {string} typeMsgName_ Name of the member variable from Blockly.Msg
-//  *     object to identify the translateble string.for the Type name.
-//  * @param {Array<Blockly.Type>} compatibleTypes_ List of types this Type is
-//  *     compatible with.
-//  */
-// Blockly.Types.addType = function (typeId_, typeMsgName_, compatibleTypes_) {
-//     // The Id is used as the key from the value pair in the BlocklyTypes object
-//     var key = typeId_.toUpperCase().replace(/ /g, '_');
-//     if (Blockly.Types[key] !== undefined) {
-//         throw 'The Blockly type ' + key + ' already exists.';
-//     }
-//     Blockly.Types[key] = new Blockly.Type({
-//         typeId: typeId_,
-//         typeName: typeMsgName_,
-//         compatibleTypes: compatibleTypes_
-//     });
-// };
-
-// /**
-//  * Converts the static types dictionary in to a an array with 2-item arrays.
-//  * This array only contains the valid types, excluding any error or temp types.
-//  * @return {!Array<Array<string>>} Blockly types in the format described above.
-//  */
-// Blockly.Types.getValidTypeArray = function () {
-//     var typesArray = [];
-//     for (var typeKey in Blockly.Types) {
-//         if ((typeKey !== 'UNDEF') && (typeKey !== 'CHILD_BLOCK_MISSING') &&
-//             (typeKey !== 'NULL') && (typeKey !== 'ARRAY') &&
-//             (typeof Blockly.Types[typeKey] !== 'function') &&
-//             !(Blockly.Types[typeKey] instanceof RegExp)) {
-//             typesArray.push([Blockly.Types[typeKey].typeName, typeKey]);
-//         }
-//     }
-//     return typesArray;
-// };
-
-// /**
-//  * Navigates through child blocks of the argument block to get this block type.
-//  * @param {!Blockly.Block} block Block to navigate through children.
-//  * @return {Blockly.Type} Type of the input block.
-//  */
-// Blockly.Types.getChildBlockType = function (block) {
-//     var blockType = null;
-//     var nextBlock = block;
-//     // Only checks first input block, so it decides the type. Incoherences amongst
-//     // multiple inputs dealt at a per-block level with their own block warnings
-//     while (nextBlock && (nextBlock.getBlockType === undefined) &&
-//         (nextBlock.inputList.length > 0) &&
-//         (nextBlock.inputList[0].connection)) {
-//         nextBlock = nextBlock.inputList[0].connection.targetBlock();
-//     }
-//     if (nextBlock === block) {
-//         // Set variable block is empty, so no type yet
-//         blockType = Blockly.Types.CHILD_BLOCK_MISSING;
-//     } else if (nextBlock === null) {
-//         // Null return from targetBlock indicates no block connected
-//         blockType = Blockly.Types.CHILD_BLOCK_MISSING;
-//     } else {
-//         var func = nextBlock.getBlockType;
-//         if (func) {
-//             blockType = nextBlock.getBlockType();
-//         } else {
-//             // Most inner block, supposed to define a type, is missing getBlockType()
-//             blockType = Blockly.Types.NULL;
-//         }
-//     }
-//     return blockType;
-// };
-
-// /**
-//  * Regular expressions to identify an integer.
-//  * @private
-//  */
-// Blockly.Types.regExpInt_ = new RegExp(/^-?\d+$/);
-
-// /**
-//  * Regular expressions to identify a decimal.
-//  * @private
-//  */
-// Blockly.Types.regExpFloat_ = new RegExp(/^-?[0-9]*[.][0-9]+$/);
-
-// /**
-//  * Uses regular expressions to identify if the input number is an integer or a
-//  * floating point.
-//  * @param {string} numberString String of the number to identify.
-//  * @return {!Blockly.Type} Blockly type.
-//  */
-// Blockly.Types.identifyNumber = function (numberString) {
-//     if (Blockly.Types.regExpInt_.test(numberString)) {
-//         var intValue = parseInt(numberString);
-//         if (isNaN(intValue)) {
-//             return Blockly.Types.NULL;
-//         }
-//         if (intValue > 32767 || intValue < -32768) {
-//             return Blockly.Types.LARGE_NUMBER;
-//         }
-//         return Blockly.Types.NUMBER;
-//     } else if (Blockly.Types.regExpFloat_.test(numberString)) {
-//         return Blockly.Types.DECIMAL;
-//     }
-//     return Blockly.Types.NULL;
-// };
-
-
-
-

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

@@ -0,0 +1,10 @@
+
+export const AUDIO = {
+    ARD_TONEFREQ: "mit Frequenz",
+    ARD_TONE_FREQ: "Frequenz",
+    ARD_TONE_PIN: "Ton PIN#",
+    ARD_TONE_PIN_TIP: "Erzeugt einen Ton an Pin",
+    ARD_TONE_TIP: "Erzeugt einen Ton an Pin mit einer spezifischen Frequenz zwischen 31 - 65535 Hz",
+    ARD_TONE_WARNING: "Frequenz muss zwischen 31 - 65535 liegen",
+}
+

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

@@ -0,0 +1,29 @@
+export const FAQ = {
+  /**
+   * FAQ
+   */
+
+  faq_q1_question: `Wie kann ich mein Programm auf die senseBox kopieren?`,
+  faq_q1_answer: `Um Programme auf die senseBox zu kopieren wird diese mit dem Micro USB Kabel an den Computer angeschlossen. Mache anschließend auf der senseBox MCU einen Doppelklick auf den roten Reset Button. Die senseBox wird nun als Wechseldatenträger an deinem Computer erkannt und die zuvor erstellen Programm können per Drag & Drop kopiert werden. Nach jeder Änderung des Programmcodes muss das Programm neu kompiliert und übertragen werden
+#### Lernmodus der MCU aktivieren
+<iframe width="560" height="315" src="https://www.youtube.com/embed/jzlOJ7Zuqqw" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+
+#### Kopieren von Programmen unter MacOS
+Das Kopieren der Programme unter MacOS funktioniert nicht über den Finder, es gibt es aber dennoch zwei verschiedene Möglichkeiten die Programme zu kopieren:
+- [senseBox Kopiertool](https://sensebox.de/docs/senseBox_Sketch_Uploader_DE.zip)
+- [muCommander](https://www.mucommander.com/)
+`,
+
+  faq_q2_question: `Mit welcher senseBox ist die Programmierumgebung kompatibel?`,
+  faq_q2_answer: `
+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

@@ -0,0 +1,118 @@
+export const IO = {
+  ARD_ANALOGREAD: "lese analogen Pin#",
+  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_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_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_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_HIGH: "HIGH",
+  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",
+  ARD_MAP_FROMMAX: "bis maximum",
+  ARD_MAP_TOMIN: "auf Minimum",
+  ARD_MAP_TOMAX: "bis Maximum",
+  ARD_MAP_TIP: "Verteilt Werte zwischen [0-1024] zu andere.",
+  ARD_MAP_VAL: "Wert zu [0-",
+  ARD_NOTONE: "Schalte Ton aus an Pin",
+  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_PULSE_READ: "Misst %1 Impuls an Pin #%2",
+  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_SETUP: "Setup",
+  ARD_SERIAL_SETUP_TIP: "Selects the speed for a specific Serial peripheral", // untranslated
+  ARD_SERIAL_SPEED: ":  Übertragungsgeschwindigkeit zu",
+  ARD_SERVO_READ: "liest SERVO an PIN#",
+  ARD_SERVO_READ_TIP: "Liest den Winkel des Servomotors aus",
+  ARD_SERVO_WRITE: "setzt SERVO an Pin",
+  ARD_SERVO_WRITE_DEG_180: "Winkel (0~180)",
+  ARD_SERVO_WRITE_TIP: "Set a Servo to an specified angle", // untranslated
+  ARD_SERVO_WRITE_TO: "", // untranslated
+  ARD_SETTONE: "Spiele Ton an Pin", // untranslated
+  ARD_SPI_SETUP: "Setup",
+  ARD_SPI_SETUP_CONF: "Konfiguration:",
+  ARD_SPI_SETUP_DIVIDE: "clock divide", // untranslated
+  ARD_SPI_SETUP_LSBFIRST: "LSBFIRST", // untranslated
+  ARD_SPI_SETUP_MODE: "SPI mode (idle - edge)", // untranslated
+  ARD_SPI_SETUP_MODE0: "0 (LOW - Fallend)",
+  ARD_SPI_SETUP_MODE1: "1 (LOW - Steigend)",
+  ARD_SPI_SETUP_MODE2: "2 (HIGH - Fallend)",
+  ARD_SPI_SETUP_MODE3: "3 (HIGH - Steigend)",
+  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_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_WARN2: "Old pin value %1 is no longer available.", // untranslated
+  ARD_STEPPER_COMPONENT: "stepper", // untranslated
+  ARD_STEPPER_DEFAULT_NAME: "MyStepper", // untranslated
+  ARD_STEPPER_FOUR_PINS: "4", // untranslated
+  ARD_STEPPER_MOTOR: "stepper motor:", // untranslated
+  ARD_STEPPER_NUMBER_OF_PINS: "Number of pins", // untranslated
+  ARD_STEPPER_PIN1: "pin1#", // untranslated
+  ARD_STEPPER_PIN2: "pin2#", // untranslated
+  ARD_STEPPER_PIN3: "pin3#", // untranslated
+  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_SPEED: "set speed (rpm) to", // untranslated
+  ARD_STEPPER_STEP: "move stepper", // untranslated
+  ARD_STEPPER_STEPS: "steps", // untranslated
+  ARD_STEPPER_STEP_TIP: "Turns the stepper motor a specific number of steps.", // untranslated
+  ARD_STEPPER_TWO_PINS: "2", // untranslated
+  ARD_TYPE_ARRAY: "Array",
+  ARD_TYPE_BOOL: "Boolean",
+  ARD_TYPE_CHAR: "Zeichen",
+  ARD_TYPE_CHILDBLOCKMISSING: "ChildBlockMissing", // untranslated
+  ARD_TYPE_DECIMAL: "Dezimalzahl",
+  ARD_TYPE_LONG: "große Zahl",
+  ARD_TYPE_NULL: "Null",
+  ARD_TYPE_NUMBER: "Zahl",
+  ARD_TYPE_SHORT: "kurze Zahl",
+  ARD_TYPE_TEXT: "Text",
+  ARD_TYPE_UNDEF: "Undefiniert",
+  ARD_VAR_AS: "als",
+  ARD_VAR_AS_TIP: "Wert einem spezififischen Datentyp zuordnen",
+  ARD_WRITE_TO: "zu",
+  NEW_INSTANCE: "Neue Instanz...",
+  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

@@ -0,0 +1,64 @@
+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_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.",
+  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_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_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_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_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',
+
+  /**
+   * Cases
+   */
+  cases_do: "Führe aus",
+  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.",
+};

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

@@ -0,0 +1,25 @@
+
+export const LOOPS = {
+    CONTROLS_FLOW_STATEMENTS_HELPURL: "https://de.wikipedia.org/wiki/Kontrollstruktur",
+    CONTROLS_FLOW_STATEMENTS_OPERATOR_BREAK: "Die Schleife abbrechen",
+    CONTROLS_FLOW_STATEMENTS_OPERATOR_CONTINUE: "mit der nächsten Iteration der Schleife fortfahren",
+    CONTROLS_FLOW_STATEMENTS_TOOLTIP_BREAK: "Die umgebende Schleife beenden.",
+    CONTROLS_FLOW_STATEMENTS_TOOLTIP_CONTINUE: "Diese Anweisung abbrechen und mit dem nächsten Schleifendurchlauf fortfahren.",
+    CONTROLS_FLOW_STATEMENTS_WARNING: "Warnung: Dieser Block sollte nur in einer Schleife verwendet werden.",
+    CONTROLS_FOREACH_HELPURL: "https://de.wikipedia.org/wiki/For-Schleife",
+    CONTROLS_FOREACH_TITLE: "Für Wert %1 aus der Liste %2",
+    CONTROLS_FOREACH_TOOLTIP: "Führe eine Anweisung für jeden Wert in der Liste aus und setzte dabei die Variable \"%1\" auf den aktuellen Listenwert.",
+    CONTROLS_FOR_HELPURL: "https://de.wikipedia.org/wiki/For-Schleife",
+    CONTROLS_FOR_TITLE: "Zähle %1 von %2 bis %3 mit %4",
+    CONTROLS_FOR_TOOLTIP: "Zähle die Variable \"%1\" von einem Startwert bis zu einem Zielwert und führe für jeden Wert eine Anweisung aus.",
+
+    CONTROLS_REPEAT_HELPURL: "https://de.wikipedia.org/wiki/For-Schleife",
+    CONTROLS_REPEAT_INPUT_DO: "mache",
+    CONTROLS_REPEAT_TITLE: "Wiederhole %1 mal",
+    CONTROLS_REPEAT_TOOLTIP: "Eine Anweisung mehrfach ausführen.",
+    CONTROLS_WHILEUNTIL_HELPURL: "https://de.wikipedia.org/wiki/Schleife_%28Programmierung%29",
+    CONTROLS_WHILEUNTIL_OPERATOR_UNTIL: "Wiederhole bis",
+    CONTROLS_WHILEUNTIL_OPERATOR_WHILE: "Wiederhole solange",
+    CONTROLS_WHILEUNTIL_TOOLTIP_UNTIL: "Führe die Anweisung solange aus wie die Bedingung falsch (false) ist.",
+    CONTROLS_WHILEUNTIL_TOOLTIP_WHILE: "Führe die Anweisung solange aus wie die Bedingung wahr (true) ist.",
+}

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

@@ -0,0 +1,86 @@
+
+export const MATH = {
+    MATH_ADDITION_SYMBOL: "+",  // untranslated
+    MATH_ARITHMETIC_HELPURL: "https://de.wikipedia.org/wiki/Grundrechenart",
+    MATH_ARITHMETIC_TOOLTIP_ADD: "Ist die Summe zweier Werte.",
+    MATH_ARITHMETIC_TOOLTIP_DIVIDE: "Ist der Quotient zweier Werte.",
+    MATH_ARITHMETIC_TOOLTIP_MINUS: "Ist die Differenz zweier Werte.",
+    MATH_ARITHMETIC_TOOLTIP_MULTIPLY: "Ist das Produkt zweier Werte.",
+    MATH_ARITHMETIC_TOOLTIP_POWER: "Ist der erste Wert potenziert mit dem zweiten Wert.",
+    MATH_CHANGE_HELPURL: "https://de.wikipedia.org/wiki/Inkrement_und_Dekrement",
+    MATH_CHANGE_TITLE: "erhöhe %1 um %2",
+    MATH_CHANGE_TOOLTIP: "Addiert einen Wert zur Variable \"%1\" hinzu.",
+    MATH_CONSTANT_HELPURL: "https://de.wikipedia.org/wiki/Mathematische_Konstante",
+    MATH_CONSTANT_TOOLTIP: "Mathematische Konstanten wie: π (3.141…), e (2.718…), φ (1.618…), sqrt(2) (1.414…), sqrt(½) (0.707…) oder ∞ (unendlich).",
+    MATH_CONSTRAIN_HELPURL: "https://en.wikipedia.org/wiki/Clamping_%28graphics%29",  // untranslated
+    MATH_CONSTRAIN_TITLE: "begrenze %1 von %2 bis %3",
+    MATH_CONSTRAIN_TOOLTIP: "Begrenzt den Wertebereich auf den \"von\"-Wert bis einschließlich zum \"bis\"-Wert. (inklusiv)",
+    MATH_DIVISION_SYMBOL: "÷",  // untranslated
+    MATH_IS_DIVISIBLE_BY: "ist teilbar durch",
+    MATH_IS_EVEN: "ist gerade",
+    MATH_IS_NEGATIVE: "ist negativ",
+    MATH_IS_ODD: "ist ungerade",
+    MATH_IS_POSITIVE: "ist positiv",
+    MATH_IS_PRIME: "ist eine Primzahl",
+    MATH_IS_TOOLTIP: "Überprüft ob eine Zahl gerade, ungerade, eine Primzahl, ganzzahlig, positiv, negativ oder durch eine zweite Zahl teilbar ist.  Gibt wahr (true) oder falsch (false) zurück.",
+    MATH_IS_WHOLE: "ist eine ganze Zahl",
+    MATH_MODULO_HELPURL: "https://de.wikipedia.org/wiki/Modulo",
+    MATH_MODULO_TITLE: "Rest von %1 ÷ %2",
+    MATH_MODULO_TOOLTIP: "Der Rest nach einer Division.",
+    MATH_MULTIPLICATION_SYMBOL: "×",
+    MATH_NUMBER_HELPURL: "https://de.wikipedia.org/wiki/Zahl",
+    MATH_NUMBER_TOOLTIP: "Eine Zahl.",
+    MATH_ONLIST_HELPURL: "http://www.sysplus.ch/einstieg.php?links:menu&seite:4125&grad:Crash&prog:Excel",
+    MATH_ONLIST_OPERATOR_AVERAGE: "Mittelwert einer Liste",
+    MATH_ONLIST_OPERATOR_MAX: "Maximalwert einer Liste",
+    MATH_ONLIST_OPERATOR_MEDIAN: "Median einer Liste",
+    MATH_ONLIST_OPERATOR_MIN: "Minimalwert einer Liste",
+    MATH_ONLIST_OPERATOR_MODE: "am häufigsten in Liste",
+    MATH_ONLIST_OPERATOR_RANDOM: "Zufallswert einer Liste",
+    MATH_ONLIST_OPERATOR_STD_DEV: "Standardabweichung einer Liste",
+    MATH_ONLIST_OPERATOR_SUM: "Summe einer Liste",
+    MATH_ONLIST_TOOLTIP_AVERAGE: "Ist der Durchschnittswert aller Werte in einer Liste.",
+    MATH_ONLIST_TOOLTIP_MAX: "Ist der größte Wert in einer Liste.",
+    MATH_ONLIST_TOOLTIP_MEDIAN: "Ist der Median aller Werte in einer Liste.",
+    MATH_ONLIST_TOOLTIP_MIN: "Ist der kleinste Wert in einer Liste.",
+    MATH_ONLIST_TOOLTIP_MODE: "Findet den am häufigsten vorkommenden Wert in einer Liste.  Falls kein Wert öfter vorkommt als alle anderen, wird die originale Liste zurückgeben",
+    MATH_ONLIST_TOOLTIP_RANDOM: "Gebe einen zufälligen Wert aus der Liste zurück.",
+    MATH_ONLIST_TOOLTIP_STD_DEV: "Ist die standardisierte Standardabweichung aller Werte in der Liste",
+    MATH_ONLIST_TOOLTIP_SUM: "Ist die Summe aller Werte in einer Liste.",
+    MATH_POWER_SYMBOL: "^",
+    MATH_RANDOM_FLOAT_HELPURL: "https://de.wikipedia.org/wiki/Zufallszahlen",
+    MATH_RANDOM_FLOAT_TITLE_RANDOM: "Zufallszahl (0.0 -1.0)",
+    MATH_RANDOM_FLOAT_TOOLTIP: "Erzeuge eine Zufallszahl zwischen 0.0 (inklusiv) und 1.0 (exklusiv).",
+    MATH_RANDOM_INT_HELPURL: "https://de.wikipedia.org/wiki/Zufallszahlen",
+    MATH_RANDOM_INT_TITLE: "ganzzahliger Zufallswert zwischen %1 bis %2",
+    MATH_RANDOM_INT_TOOLTIP: "Erzeuge einen ganzzahligen Zufallswert zwischen zwei Werten (inklusiv).",
+    MATH_ROUND_HELPURL: "https://de.wikipedia.org/wiki/Runden",
+    MATH_ROUND_OPERATOR_ROUND: "runden",
+    MATH_ROUND_OPERATOR_ROUNDDOWN: "abrunden",
+    MATH_ROUND_OPERATOR_ROUNDUP: "aufrunden",
+    MATH_ROUND_TOOLTIP: "Eine Zahl auf- oder abrunden.",
+    MATH_SINGLE_HELPURL: "https://de.wikipedia.org/wiki/Quadratwurzel",
+    MATH_SINGLE_OP_ABSOLUTE: "Absolutwert",
+    MATH_SINGLE_OP_ROOT: "Quadratwurzel",
+    MATH_SINGLE_TOOLTIP_ABS: "Ist der Absolutwert eines Wertes.",
+    MATH_SINGLE_TOOLTIP_EXP: "Ist Wert der Exponentialfunktion eines Wertes.",
+    MATH_SINGLE_TOOLTIP_LN: "Ist der natürliche Logarithmus eines Wertes.",
+    MATH_SINGLE_TOOLTIP_LOG10: "Ist der dekadische Logarithmus eines Wertes.",
+    MATH_SINGLE_TOOLTIP_NEG: "Negiert einen Wert.",
+    MATH_SINGLE_TOOLTIP_POW10: "Rechnet 10 hoch Eingabewert.",
+    MATH_SINGLE_TOOLTIP_ROOT: "Ist die Quadratwurzel eines Wertes.",
+    MATH_SUBTRACTION_SYMBOL: "-",
+    MATH_TRIG_ACOS: "acos",
+    MATH_TRIG_ASIN: "asin",
+    MATH_TRIG_ATAN: "atan",
+    MATH_TRIG_COS: "cos",
+    MATH_TRIG_HELPURL: "https://de.wikipedia.org/wiki/Trigonometrie",
+    MATH_TRIG_SIN: "sin",
+    MATH_TRIG_TAN: "tan",
+    MATH_TRIG_TOOLTIP_ACOS: "Ist der Arkuskosinus des Eingabewertes.",
+    MATH_TRIG_TOOLTIP_ASIN: "Ist der Arkussinus des Eingabewertes.",
+    MATH_TRIG_TOOLTIP_ATAN: "Ist der Arkustangens des Eingabewertes.",
+    MATH_TRIG_TOOLTIP_COS: "Ist der Kosinus des Winkels.",
+    MATH_TRIG_TOOLTIP_SIN: "Ist der Sinus des Winkels.",
+    MATH_TRIG_TOOLTIP_TAN: "Ist der Tangens des Winkels.",
+}

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

@@ -0,0 +1,15 @@
+
+export const MQTT = {
+    /**
+     * MQTT
+     */
+    senseBox_mqtt_init: "Verbinde mit MQTT Broker",
+    senseBox_mqtt_server: "Server",
+    senseBox_mqtt_port: "Port",
+    senseBox_mqtt_username: "Benutzername",
+    senseBox_mqtt_password: "Passwort",
+    sensebox_mqtt_subscribe: "Subscribe to Feed",
+    senseBox_mqtt_publish: "Sende an Feed/Topic",
+    senseBox_mqtt_init_tooltip: "Initialisiere die Verbindung zu dem MQTT Broker. Verwende diesen Block innerhalb der setup()-Funktion und stelle zuerst eine Verbindung mit dem Wlan Netzwerk her.",
+    senseBox_mqtt_publish_tooltip: "Sende etwas an ein 'Topic' deines MQTT Brokers.",
+}

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

@@ -0,0 +1,41 @@
+export const BLE = {
+  /**
+   * Phyphox Blöcke
+   */
+  sensebox_phyphox_init: "Initialisiere Phyphox Gerät mit Namen:",
+  sensebox_phyphox_createExperiment: "Erstelle Experiment",
+  sensebox_phyphox_experimentName: "Name des Experiments",
+  sensebox_phyphox_experimentTitle: "Titel",
+  sensebox_phyphox_experimentCategory: "Kategorie",
+  sensebox_phyphox_experimentDescription: "Beschreibung",
+  sensebox_phyphox_experiment_description: "Kurze Beschreibung des Experiments",
+  sensebox_phyphox_writeValues: "Sende Werte",
+  sensebox_phyphox_createView: "Mit Graphen:",
+  sensebox_phyphox_createGraph: "Erstelle Graph",
+  sensebox_phyphox_graphLabel: "",
+  sensebox_phyphox_unitx: "Einheit x-Achse",
+  sensebox_phyphox_unity: "Einheit y-Achse",
+  sensebox_phyphox_labelx: "Beschriftung x-Achse",
+  sensebox_phyphox_labely: "Beschriftung y-Achse",
+  sensebox_phyphox_channel0: "Wert x-Achse",
+  sensebox_phyphox_channel1: "Wert y-Achse",
+  sensebox_phyphox_style_dots: "Punkte",
+  sensebox_phyphox_style_line: "Linie",
+  sensebox_phyphox_timestamp: "Zeitstempel",
+  sensebox_phyphox_channel: "Kanal",
+  sensebox_phyphox_sendchannel: "sende an Kanal:",
+  sensebox_phyphox_graphStyle: "Stil",
+
+  sensebox_phyphox_init_tooltip:
+    "Initialisere das Bluetooth Bee. Stecke diese auf dem Steckplatz **XBEE1**. Gib dem 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:
+    "Erstellt einen neuen Graph für das Experiment. Gibt die Einheit und Beschriftung für die Achsen an und wähle den Stil der Visualisuerng der Messwerte. Füge an die Schnittstellen für die Werte der X- und Y-Achse den Kanal an auf dem die Messwerte später gesendet werden. Möchtest du einen Zeitstempel über die Phyphox App erstellen lassen verbinde den Block *Zeitstempel*",
+  sensebox_phyphox_timestamp_tooltip:
+    "Verwende diesen Block, um einen Zeitstempel über die Phyphox App erstellen zu lassen",
+  sensebox_phyphox_sendchannel_tooltip:
+    "Sendet einen Messwert an den ausgewählten Kanal",
+  sensebox_phyphox_experiment_send_tooltip:
+    "Sendet die Messwerte an die Phyphox App",
+};

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

@@ -0,0 +1,51 @@
+
+export const DISPLAY = {
+    /**
+     * Display
+     */
+
+    senseBox_display_beginDisplay: "Display initialisieren",
+    senseBox_display_beginDisplay_tooltip: `Initialisiert das Display. Dieser Block muss im Setup() verwendet werden. 
+
+**Anschluss:** I2C
+`,
+    senseBox_display_clearDisplay_tooltip: "Löscht die Anzeige auf dem Display. Sollte immer zu Begin oder am Ende der Endlosschleife aufgerufen werden.",
+    senseBox_display_clearDisplay: "Display löschen",
+    senseBox_display_printDisplay: "Schreibe Text/Zahl",
+    senseBox_display_printDisplay_tooltip: "Zeigt eine Zahl/Text auf dem Display an. Über die X- und Y-Koordinaten kann die Position auf dem Display bestimmt werden. Die Schriftgröße lässt sich in ganzzahligen Werten zwischen 1 und 4 einstellen. Das Display hat eine Auflösung von 128x64 Pixeln (X- und Y-Achse)",
+    senseBox_display_printDisplay_x: "x-Koordinate",
+    senseBox_display_printDisplay_y: "y-Koordinate",
+    senseBox_display_printDisplay_value: "Wert",
+    senseBox_display_setSize: "Schriftgröße",
+    senseBox_display_setSize_tip: "Ändere die Schriftgröße auf einen Wert zwischen 1 und 10.",
+    senseBox_display_color: "Schriftfarbe",
+    senseBox_display_white: "Weiß",
+    senseBox_display_black: "Schwarz",
+    sensebox_display_show: "Zeige auf dem Display",
+    sensebox_display_show_tip: "Zeigt den Nachfolgenden Inhalt auf dem Bildschirm",
+    senseBox_dipslay_plotTitle: "Titel",
+    senseBox_display_plotDisplay: "Zeichne Diagramm",
+    senseBox_display_plotXLabel: "X-Achsen Beschriftung",
+    senseBox_display_plotYLabel: "Y-Achsen Beschriftung",
+    senseBox_display_plotXRange1: "X-Wertebereich Anfang",
+    senseBox_display_plotXRange2: "X-Wertebereich Ende",
+    senseBox_display_plotYRange1: "Y-Wertebereich Anfang",
+    senseBox_display_plotYRange2: "Y-Wertebereich Ende",
+    senseBox_display_plotXTick: "X-Linienabstand",
+    senseBox_display_plotYTick: "Y-Linienabstand",
+    senseBox_display_plotTimeFrame: "Zeitabschnitt",
+    sensebox_display_fillCircle: "Zeichne Punkt",
+    sensebox_display_fillCircle_radius: "Radius",
+    senseBox_display_fillCircle_tooltip: "Mit diesem Block kann ein Punkt auf dem Display angezeigt werden. Über die Koordinaten kannst du den Punkt auf dem Display platzieren und mithilfe des Radius die Größe bestimmen.",
+    sensebox_display_drawRectangle: "Zeichne Rechteck",
+    sensebox_display_drawRectangle_width: "Breite",
+    sensebox_display_drawRectangle_height: "Höhe",
+    senseBox_display_drawRectangle_tooltip: "Dieser Block zeichnet ein Rechteck auf das Display. Mit den X- und Y-Koordinaten wird die Position der oberen linken Ecke des Rechtecks auf dem Display bestimmt. Die Höhe und Breite wird in Pixeln angegeben und mit der Checkbox 'Ausgefüllt' kann ausgewählt werden ob das Rechteck ausgefüllt oder nur als Rahmen angezeigt wird.",
+    senseBox_display_filled: "Ausgefüllt",
+    senseBox_display_fastPrint_show: "Zeige Messwerte",
+    senseBox_display_fastPrint_title: "Titel",
+    senseBox_display_fastPrint_value: "Messwert",
+    senseBox_display_fastPrint_dimension: "Einheit",
+    sensebox_display_fastPrint_tooltip: "Zeigt zwei Messwerte auf dem Display an. Wähle eine Überschrift für jeden Messwert und gib die Einheit an.",
+    senseBox_display_helpurl: "https://docs.sensebox.de/blockly/blockly-display/"
+}

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

@@ -0,0 +1,40 @@
+export const LED = {
+  /**
+   * WS2818 RGB LED
+   */
+  senseBox_ws2818_rgb_led: "Setze RGB-LED an",
+  senseBox_ws2818_rgb_led_init: "RGB LED (WS2818) initialisieren",
+  senseBox_ws2818_rgb_led_position: "Position",
+  senseBox_ws2818_rgb_led_brightness: "Helligkeit",
+  senseBox_ws2818_rgb_led_tooltip:
+    "Verändere mit diesem Block die Farbe deiner RGB-LED. Verbinde einen Block für die Farbe. Wenn mehrere RGB-LEDs miteinander verkettet werden kannst du über die Position bestimmen welche LED angesteuert wird. ",
+  senseBox_ws2818_rgb_led_init_tooltip:
+    "Schließe die RGB-LED an einen der drei **digital/analog Ports** an. Wenn mehrere RGB-LEDs miteinander verkettet werden kannst du über die Position bestimmen welche LED angesteuert wird. ",
+  senseBox_ws2818_rgb_led_color: "Farbe",
+  senseBox_ws2818_rgb_led_number: "Anzahl",
+
+  /**
+   * Color
+   */
+
+  COLOUR_BLEND_COLOUR1: "Farbe 1",
+  COLOUR_BLEND_COLOUR2: "mit Farbe 2",
+  COLOUR_BLEND_HELPURL: "http://meyerweb.com/eric/tools/color-blend/",
+  COLOUR_BLEND_RATIO: "im Verhältnis",
+  COLOUR_BLEND_TITLE: "mische",
+  COLOUR_BLEND_TOOLTIP:
+    "Vermische 2 Farben mit konfigurierbaren Farbverhältnis (0.0 - 1.0).",
+  COLOUR_PICKER_HELPURL: "https://de.wikipedia.org/wiki/Farbe",
+  COLOUR_PICKER_TOOLTIP:
+    "Wähle eine Farbe aus der Palette. Die Farbe wird automatisch in RGB-Werte konvertiert.",
+  COLOUR_RANDOM_HELPURL: "http://randomcolour.com", // untranslated
+  COLOUR_RANDOM_TITLE: "zufällige Farbe",
+  COLOUR_RANDOM_TOOLTIP: "Erstelle eine Farbe nach dem Zufallsprinzip.",
+  COLOUR_RGB_BLUE: "blau",
+  COLOUR_RGB_GREEN: "grün",
+  COLOUR_RGB_HELPURL: "https://de.wikipedia.org/wiki/RGB-Farbraum",
+  COLOUR_RGB_RED: "rot",
+  COLOUR_RGB_TITLE: "Farbe mit",
+  COLOUR_RGB_TOOLTIP:
+    "Erstelle eine Farbe mit selbst definierten Rot-, Grün- und Blauwerten. Alle Werte müssen zwischen 0 und 255 liegen. 0 ist hierbei die geringte Intensität der Farbe 255 die höchste.",
+};

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

@@ -0,0 +1,59 @@
+export const LORA = {
+  /*
+   * LoRa Blöcke
+   */
+
+  senseBox_LoRa_connect: "Zu TTN senden",
+  senseBox_LoRa_device_id: "Device EUI (lsb)",
+  senseBox_LoRa_app_id: "Application EUI (lsb)",
+  senseBox_LoRa_app_key: "App Key (msb)",
+  senseBox_LoRa_nwskey_id: "Network Session Key (msb)",
+  senseBox_LoRa_appskey_id: "App Session Key (msb)",
+  senseBox_LoRa_devaddr_id: "Device Adress",
+  senseBox_LoRa_interval: "Intervall in Minuten",
+  senseBox_measurement: "Messung",
+  senseBox_measurements: "Messungen",
+
+  senseBox_LoRa_send_message: "Sende als Lora Nachricht",
+  senseBox_LoRa_send_cayenne: "Sende als Cayenne Nachricht",
+  senseBox_LoRa_cayenne_temperature: "Temperatur",
+  senseBox_LoRa_cayenne_channel: "Kanal",
+  senseBox_LoRa_cayenne_humidity: "Luftfeuchtigkeit",
+  senseBox_LoRa_cayenne_pressure: "Luftdruck",
+  senseBox_LoRa_cayenne_luminosity: "Helligkeit",
+  senseBox_LoRa_cayenne_analog: "Analoger Wert",
+  senseBox_LoRa_cayenne_x: "X Wert",
+  senseBox_LoRa_cayenne_y: "Y Wert",
+  senseBox_LoRa_cayenne_z: "Z Wert",
+  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_luminosity_tip: "Sendet Helligkeitswert",
+  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_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-motors.js

@@ -0,0 +1,48 @@
+export const MOTORS = {
+
+    /**
+     * Motors
+     */
+
+    sensebox_motors_beginServoMotor: "Initialisiere Servomotor",
+    sensebox_motors_beginServoMotor_pin: "Pin:",
+    sensebox_motors_beginServoMotor_tooltip: "Verbinde einen digitalen Pin mit dem orangen Kabel des Servomotrors. Verbinde zusätzlich GND mit GND (schwarzes und braunes Kabel) und 5V mit 5V (rotes Kabel).",
+    sensebox_motors_beginServoMotor_helpurl: "https://de.wikipedia.org/wiki/Servomotor",
+
+    sensebox_motors_moveServoMotor: "Bewege Servomotor",
+    sensebox_motors_moveServoMotor_pin: "Pin:",
+    sensebox_motors_moveServoMotor_degrees: "Winkel in Grad:",
+    sensebox_motors_moveServoMotor_tooltip: "Der Servomotor kann zwischen 0 und 180 Grad bewegt werden.",
+    sensebox_motors_moveServoMotor_helpurl: "https://de.wikipedia.org/wiki/Servomotor",
+
+    sensebox_motors_I2CMotorBoard_begin: "Initialize I2C Motor Board",
+    sensebox_motors_I2CMotorBoard_begin_tooltip: "Connect the I2C Moztor Board with the two DC Motors to one of the five I2C-Ports. Use this Block inside the setup()-function.",
+    sensebox_motors_I2CMotorBoard_begin_helpurl: "TODO",
+
+    sensebox_motors_I2CMotorBoard_moveDCMotor: "Move",
+    sensebox_motors_I2CMotorBoard_moveDCMotor_left: "left",
+    sensebox_motors_I2CMotorBoard_moveDCMotor_right: "right",
+    sensebox_motors_I2CMotorBoard_moveDCMotor_motor: "DC Motor at I2C Motor Board",
+    sensebox_motors_I2CMotorBoard_moveDCMotor_speed: "Speed:",
+    sensebox_motors_I2CMotorBoard_moveDCMotor_tooltip: "You can set the Speed between -100 and 100.",
+    sensebox_motors_I2CMotorBoard_moveDCMotor_helpurl: "TODO",
+
+    sensebox_motors_I2CMotorBoard_stopDCMotor: "Stop ",
+    sensebox_motors_I2CMotorBoard_stopDCMotor_left: "left",
+    sensebox_motors_I2CMotorBoard_stopDCMotor_right: "right",
+    sensebox_motors_I2CMotorBoard_stopDCMotor_motor: "DC Motor at I2C Motor Board",
+    sensebox_motors_I2CMotorBoard_stopDCMotor_tooltip: "TODO",
+    sensebox_motors_I2CMotorBoard_stopDCMotor_helpurl: "TODO",
+
+    sensebox_motors_beginStepperMotor: "Initialize Stepper Motor (28BYJ-48)",
+    sensebox_motors_beginStepperMotor_rpm: "Rotations per Minute:",
+    sensebox_motors_beginStepperMotor_pins: "Input Pins (IN1-IN4):",
+    sensebox_motors_beginStepperMotor_tooltip: "Connect four of the the digital pins in the right order to the inputs IN1-IN4 on the stepper motor board. Connect a GND pin (black wire) to the minus pin and a 5V pin (red wire) to the plus pin on the board. Also connect the stepper motor to this Board. Use this Block inside the setup()-function.",
+    sensebox_motors_beginStepperMotor_helpurl: "TODO",
+
+    sensebox_motors_moveStepperMotor: "Move Stepper Motor (28BYJ-48)",
+    sensebox_motors_moveStepperMotor_step: "Steps:",
+    sensebox_motors_moveStepperMotor_tooltip: "Move stepper motor. 2048 steps equal a full rotation.",
+    sensebox_motors_moveStepperMotor_helpurl: "TODO",
+};
+

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

@@ -0,0 +1,23 @@
+export const OSEM = {
+  /**
+   * openSenseMap
+   */
+  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",
+  senseBox_osem_host_workshop: "workshop.opensensemap.org",
+  senseBox_osem_exposure: "Typ",
+  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_osem_restart: "Bei Verbindungsverlust Gerät neustarten?",
+};

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

@@ -0,0 +1,19 @@
+export const RTC = {
+  sensebox_rtc_init: "Initialisiere RTC",
+  sensebox_rtc_init_tooltip:
+    "Initialisiere die RTC. Schließe diese an einen der 5 I2C/Wire Anschlüsse an und lege die Batterie ein. Bevor du die Uhrzeit auslesen kannst muss diese zunächst einmal gesetzt werden. Dieser Schritt muss normalerweise nur einmalig durchgeführt werden.",
+  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 (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: ",
+  sensebox_rtc_get_tooltip: "Gibt dir den ausgewählten Wert zurück.",
+  sensebox_rtc_second: "Sekunden",
+  sensebox_rtc_minutes: "Minuten",
+  sensebox_rtc_hour: "Stunden",
+  sensebox_rtc_day: "Tag",
+  sensebox_rtc_month: "Monat",
+  sensebox_rtc_year: "Jahr",
+};

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

@@ -0,0 +1,25 @@
+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_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

@@ -0,0 +1,203 @@
+export const SENSORS = {
+  /**
+   * Sensors
+   * ---------------------------------------------------
+   *
+   */
+
+  /**
+   * BMP280
+   */
+  senseBox_pressure_sensor: "Luftdruck-/Temperatursensor (BMP280)",
+  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:
+    "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_helpurl: "https://docs.sensebox.de/hardware/sensoren-mikro/",
+
+  /**
+   * Temperature and Humidity Sensor (HDC1080)
+   */
+  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/",
+
+  /**
+   * Ultraschalldistanzsensor
+   */
+
+  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
+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: "UV-Intensität in µW/cm²",
+  senseBox_light: "Beleuchtungsstärke in Lux",
+  senseBox_uv_light_helpurl:
+    "https://docs.sensebox.de/hardware/sensoren-helligkeit-uv/",
+
+  /**
+   * BMX055
+   */
+
+  senseBox_bmx055_compass: "Lage Sensor",
+  senseBox_bmx055_accelerometer: "Beschleunigungssensor",
+  senseBox_bmx055_accelerometer_range: "Messbereich",
+  senseBox_bmx055_accelerometer_range_2g: "2g",
+  senseBox_bmx055_accelerometer_range_4g: "4g",
+  senseBox_bmx055_accelerometer_range_8g: "8g",
+  senseBox_bmx055_accelerometer_range_16g: "16g",
+  senseBox_bmx055_accelerometer_direction: "Richtung",
+  senseBox_bmx055_accelerometer_direction_x: "X-Achse",
+  senseBox_bmx055_accelerometer_direction_y: "Y-Achse",
+  senseBox_bmx055_accelerometer_direction_z: "Z-Achse",
+  senseBox_bmx055_accelerometer_direction_total: "Gesamt",
+  senseBox_bmx055_gyroscope: "Lage Sensor",
+  senseBox_bmx055_accelerometer_tip: "Lage Sensor",
+  senseBox_bmx055_compass_tip: "Lage Sensor",
+  senseBox_bmx055_gyroscope_tip: "Lage Sensor",
+  senseBox_bmx055_x: "X-Richtung",
+  senseBox_bmx055_y: "Y-Richtung",
+  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
+   */
+  senseBox_gps_getValues: "GPS Modul",
+  senseBox_gps_lat: "Breitengrad",
+  senseBox_gps_lng: "Längengrad",
+  senseBox_gps_alt: "Höhe über NN in m",
+  senseBox_gps_speed: "Geschwindigkeit in km/h",
+  senseBox_gps_date: "Datum",
+  senseBox_gps_time: "Uhrzeit",
+  senseBox_gps_timeStamp: "Zeitstempel (RFC 3339)",
+  senseBox_gps_tooltip: `Liest das GPS Modul aus und gibt dir die Standortinformationen. Längen- und Breitengrad werden als Kommazahl mit 6 Nachkommastellen ausgegeben. 
+**Anschluss: I2C**
+
+**Beachte:** Das GPS Modul benöigt beim ersten Verwenden relativ lange (ca. 5-10 Minuten) bis es deinen Standort gefunden hat!
+`,
+  senseBox_gps_helpurl: "https://docs.sensebox.de/hardware/sensoren-gps/",
+
+  /**
+   * Windspeed
+   */
+  senseBox_windspeed: "Windgeschwindigkeitssensor",
+  senseBox_windspeed_tooltip: "",
+
+  /*
+   * 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/",
+  /*
+   * BME680
+   */
+
+  senseBox_bme680: "Umweltsensor (BME680)",
+  senseBox_bme_iaq: "Innenraumluftqualität (IAQ)",
+  senseBox_bme_iaq_accuracy: "Kalibrierungswert",
+  senseBox_bme_co2: "CO2 Äquivalent",
+  senseBox_bme_breatheVocEquivalent: "Atemluft VOC Äquivalent",
+  senseBox_bme_tooltip: `Schließe den Umweltsensor an einen der 5 **I2C-Anschlüsse** an. **Beachte:** Der Sensor benöigt eine gewisse Zeit zum kalibrieren. 
+Den Status der Kalibrierung kann über den Kalibrierungswert abgelesen werden. Er ist entweder 0, 1, 2 oder 3 und sagt folgendes aus:
+
+- IAQ Accuracy : 0 heißt Sensor wird stabilisiert (dauert ca. 25 Minuten) oder dass es eine Zeitüberschreitung gab,
+- IAQ Accuracy : 1 heißt Wert ist ungenau,
+- IAQ Accuracy : 2 heißt Sensor wird kalibriert,
+- 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/",
+
+  /**
+   * 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.",
+
+  /**
+   * 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_co2: "CO2 in ppm",
+  senseBox_scd_helpurl: "https://docs.sensebox.de/hardware/sensoren-co2/",
+
+  /**
+   * Feinstaubsensor (SDS011)
+   */
+
+  senseBox_sds011: "Feinstaubsensor",
+  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_serial1: "Serial1",
+  senseBox_sds011_serial2: "Serial2",
+  senseBox_sds011_helpurl:
+    "https://docs.sensebox.de/hardware/sensoren-feinstaub/",
+
+  /**
+   * Button
+   */
+  senseBox_button: "Button",
+  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-telegram.js

@@ -0,0 +1,16 @@
+export const TELEGRAM = {
+    /*
+    * Telegram
+    */
+    senseBox_telegram_init: "Telegram Bot initialisieren",
+    senseBox_telegram_token: "Token",
+    senseBox_telegram_do: "Telegram mache",
+    senseBox_telegram_do_tooltip: "Füge in diese Schleife die Blöcke ein, die dein Telegram Bot ausführen soll. Beachte hierbei, dass du Aktionen bei einer bestimmten Nachricht ausführen lassen kannst oder auch selbst eine Nachricht versenden werden kann.",
+    senseBox_telegram_do_on_message: "bei Nachricht",
+    senseBox_telegram_message: "Nachricht",
+    senseBox_telegram_message_tooltip: "Führe eine Aktion aus, wenn der Telegram eine *Nachricht* empfangen hat.",
+    senseBox_telegram_send: "Sende Nachricht",
+    senseBox_telegram_send_tooltip: "Dein Telgram Bot sendet dir eine Nachricht auf dein Handy. Die Nachricht kann zum Beispiel ein Alarm oder auch ein Messwert sein",
+    senseBox_telegram_init_tooltip: "Initialisiere den Telegram Bot. Verwende diesen Block in der **Setup()-Schleife**. Den Token kannst du dir über den Telegram erstellen.",
+    senseBox_telegram_helpurl: "https://sensebox.de/projects/de/2019-12-15-telegram-blockly",
+}

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

@@ -0,0 +1,29 @@
+export const WEB = {
+  /**
+   * WiFi
+   */
+  senseBox_wifi_connect: "Verbinde mit WLAN",
+  senseBox_wifi_ssid: "Netzwerkname",
+  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_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/sensebox.js

@@ -0,0 +1,16 @@
+export const SENSEBOX = {
+  /**
+   * Multiplexer
+   */
+  senseBox_multiplexer_init: "Initialisiere Multiplexer mit ",
+  senseBox_multiplexer_init_tooltip:
+    "Schließe den Multiplexer mit einem JST-JST Kabel an einen der 5 I2C-Ports an. Nun kannst du bis zu 8 gleiche Sensoren verwenden über die entsprechenden Kanäle ansprechen. Gib im Block die Anzahl der verwendeten Kanäle an",
+  senseBox_multiplexer_init_helpurl:
+    "https://docs.sensebox.de/hardware/zubehoer-multiplexer/",
+  senseBox_multplexer_nchannels: "Kanälen",
+  senseBox_multiplexer_changeChannel: "Wechsel Kanal auf:",
+  sensebox_multiplexer_changeChannel_tooltip:
+    "Wähle den entsprechenden Kanal aus",
+  sensebox_multiplexer_changeChannel_helpurl:
+    "https://docs.sensebox.de/hardware/zubehoer-multiplexer/",
+};

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

@@ -0,0 +1,65 @@
+export const TEXT = {
+
+    TEXT_APPEND_APPENDTEXT: "Text anhängen",
+    TEXT_APPEND_HELPURL: "https://github.com/google/blockly/wiki/Text#text-modification",  // untranslated
+    TEXT_APPEND_TO: "An",
+    TEXT_APPEND_TOOLTIP: "Text an die Variable \"%1\" anhängen.",
+    TEXT_CHANGECASE_HELPURL: "https://github.com/google/blockly/wiki/Text#adjusting-text-case",  // untranslated
+    TEXT_CHANGECASE_OPERATOR_LOWERCASE: "umwandeln in kleinbuchstaben",
+    TEXT_CHANGECASE_OPERATOR_TITLECASE: "umwandeln in Substantive",
+    TEXT_CHANGECASE_OPERATOR_UPPERCASE: "umwandeln in GROSSBUCHSTABEN",
+    TEXT_CHANGECASE_TOOLTIP: "Wandelt Schreibweise von Texten um, in Großbuchstaben, Kleinbuchstaben oder den ersten Buchstaben jedes Wortes groß und die anderen klein.",
+    TEXT_CHARAT_FIRST: "Nehme ersten Buchstaben",
+    TEXT_CHARAT_FROM_END: "Nehme #ten Buchstaben von hinten",
+    TEXT_CHARAT_FROM_START: "Nehme #ten Buchstaben",
+    TEXT_CHARAT_HELPURL: "http://publib.boulder.ibm.com/infocenter/lnxpcomp/v8v101/index.jsp?topic:%2Fcom.ibm.xlcpp8l.doc%2Flanguage%2Fref%2Farsubex.htm",
+    TEXT_CHARAT_INPUT_INTEXT: "vom Text",
+    TEXT_CHARAT_LAST: "Nehme letzten Buchstaben",
+    TEXT_CHARAT_RANDOM: "Nehme zufälligen Buchstaben",
+    TEXT_CHARAT_TAIL: "",
+    TEXT_CHARAT_TOOLTIP: "Extrahiere einen Buchstaben von einer spezifizierten Position.",
+    TEXT_CREATE_JOIN_ITEM_TOOLTIP: "Ein Element zum Text hinzufügen.",
+    TEXT_CREATE_JOIN_TITLE_JOIN: "verbinden",
+    TEXT_CREATE_JOIN_TOOLTIP: "Hinzufügen, entfernen und sortieren von Elementen.",
+    TEXT_GET_SUBSTRING_END_FROM_END: "bis zum #ten Buchstaben von hinten",
+    TEXT_GET_SUBSTRING_END_FROM_START: "bis zum #ten Buchstaben",
+    TEXT_GET_SUBSTRING_END_LAST: "bis zum letzten Buchstaben",
+    TEXT_GET_SUBSTRING_HELPURL: "http://publib.boulder.ibm.com/infocenter/lnxpcomp/v8v101/index.jsp?topic:%2Fcom.ibm.xlcpp8l.doc%2Flanguage%2Fref%2Farsubex.htm",
+    TEXT_GET_SUBSTRING_INPUT_IN_TEXT: "in Text",
+    TEXT_GET_SUBSTRING_START_FIRST: "vom ersten Buchstaben",
+    TEXT_GET_SUBSTRING_START_FROM_END: "vom #ten Buchstaben von hinten",
+    TEXT_GET_SUBSTRING_START_FROM_START: "vom #ten Buchstaben",
+    TEXT_GET_SUBSTRING_TAIL: "",
+    TEXT_GET_SUBSTRING_TOOLTIP: "Gibt den angegebenen Textabschnitt zurück.",
+    TEXT_INDEXOF_HELPURL: "http://publib.boulder.ibm.com/infocenter/lnxpcomp/v8v101/index.jsp?topic:%2Fcom.ibm.xlcpp8l.doc%2Flanguage%2Fref%2Farsubex.htm",
+    TEXT_INDEXOF_INPUT_INTEXT: "im Text",
+    TEXT_INDEXOF_OPERATOR_FIRST: "Suche erstes Auftreten des Begriffs",
+    TEXT_INDEXOF_OPERATOR_LAST: "Suche letztes Auftreten des Begriffs",
+    TEXT_INDEXOF_TAIL: "",
+    TEXT_INDEXOF_TOOLTIP: "Findet das erste / letzte Auftreten eines Suchbegriffs in einem Text.  Gibt die Position des Begriffs oder 0 zurück.",
+    TEXT_ISEMPTY_HELPURL: "https://github.com/google/blockly/wiki/Text#checking-for-empty-text",  // untranslated
+    TEXT_ISEMPTY_TITLE: "%1 ist leer?",
+    TEXT_ISEMPTY_TOOLTIP: "Ist wahr (true), wenn der Text keine Zeichen enthält ist.",
+    TEXT_JOIN_HELPURL: "",
+    TEXT_JOIN_TITLE_CREATEWITH: "Erstelle Text aus",
+    TEXT_JOIN_TOOLTIP: "Erstellt einen Text durch das Verbinden von mehreren Textelementen.",
+    TEXT_LENGTH_HELPURL: "https://github.com/google/blockly/wiki/Text#text-modification",  // untranslated
+    TEXT_LENGTH_TITLE: "Länge %1",
+    TEXT_LENGTH_TOOLTIP: "Die Anzahl von Zeichen in einem Text. (inkl. Leerzeichen)",
+    TEXT_PRINT_HELPURL: "https://github.com/google/blockly/wiki/Text#printing-text",  // untranslated
+    TEXT_PRINT_TITLE: "Ausgabe %1",
+    TEXT_PRINT_TOOLTIP: "Gib den Inhalt einer Variable aus.",
+    TEXT_PROMPT_HELPURL: "https://github.com/google/blockly/wiki/Text#getting-input-from-the-user",  // untranslated
+    TEXT_PROMPT_TOOLTIP_NUMBER: "Fragt den Benutzer nach einer Zahl.",
+    TEXT_PROMPT_TOOLTIP_TEXT: "Fragt den Benutzer nach einem Text.",
+    TEXT_PROMPT_TYPE_NUMBER: "Fragt nach Zahl mit Hinweis",
+    TEXT_PROMPT_TYPE_TEXT: "Fragt nach Text mit Hinweis",
+    TEXT_TEXT_HELPURL: "https://de.wikipedia.org/wiki/Zeichenkette",
+    TEXT_TEXT_TOOLTIP: "Ein Buchstabe, Text oder Satz.",
+    TEXT_TRIM_HELPURL: "https://github.com/google/blockly/wiki/Text#trimming-removing-spaces",  // untranslated
+    TEXT_TRIM_OPERATOR_BOTH: "entferne Leerzeichen vom Anfang und vom Ende (links und rechts)",
+    TEXT_TRIM_OPERATOR_LEFT: "entferne Leerzeichen vom Anfang (links)",
+    TEXT_TRIM_OPERATOR_RIGHT: "entferne Leerzeichen vom Ende (rechts)",
+    TEXT_TRIM_TOOLTIP: "Entfernt Leerzeichen vom Anfang und / oder Ende eines Textes.",
+
+}

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

@@ -0,0 +1,22 @@
+export const TIME = {
+  /**
+   * Interval Block
+   */
+  senseBox_interval_timer: "Intervall: ",
+  senseBox_interval: "ms",
+  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",
+  ARD_TIME_DELAY_TIP: "Warte spezifische Zeit in Millisekunden",
+  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_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_MS: "Millisekunden",
+};