sensebox · mariopesch · Apr 9, 2024 · Jul 28, 2023 · Nov 10, 2023 · Nov 23, 2023
diff --git a/package.json b/package.json
@@ -72,7 +72,7 @@
     "not dead",
     "not op_mini all"
   ],
-  "bundleDependencies": [
-    "@babel/plugin-proposal-private-property-in-object"
-  ]
+  "devDependencies": {
+    "@babel/plugin-proposal-private-property-in-object": "^7.21.11"
+  }
 }
diff --git a/public/index.html b/public/index.html
@@ -24,13 +24,6 @@
   </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.

diff --git a/public/media/hardware/blockly_esp.png b/public/media/hardware/blockly_esp.png
diff --git a/public/media/hardware/blockly_mcu.png b/public/media/hardware/blockly_mcu.png
diff --git a/public/media/hardware/blockly_mini.png b/public/media/hardware/blockly_mini.png
diff --git a/public/media/hardware/senseboxmcuesp32.png b/public/media/hardware/senseboxmcuesp32.png
diff --git a/src/actions/boardAction.js b/src/actions/boardAction.js
@@ -3,13 +3,26 @@ import {
 } from "./types";
 import mini_opacity from "../data/mini_opacity.png"
 import mcu_opacity from "../data/mcu_opacity.png"
+import esp_opacity from "../data/esp_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})`);
+  switch (board) {
+    case "mcu":
+      root.style.setProperty('--url', `url(${mcu_opacity})`);
+      break;
+    case "mini":
+      root.style.setProperty('--url', `url(${mini_opacity})`);
+      break;
+    case "esp32":
+      root.style.setProperty('--url', `url(${esp_opacity})`);
+      break;
+    default:
+      break;
+  } 
   dispatch({
     type: BOARD,
     payload: board,
   });
-};
+};
diff --git a/src/actions/generalActions.js b/src/actions/generalActions.js
@@ -5,6 +5,7 @@ import {
   SOUNDS,
   STATISTICS,
   PLATFORM,
+  COMPILER
 } from "./types";
 
 export const visitPage = () => (dispatch) => {
@@ -50,3 +51,10 @@ export const setStatistics = (showStatistics) => (dispatch) => {
     payload: showStatistics,
   });
 };
+
+export const setCompiler = (compiler) => (dispatch) => {
+    dispatch({
+      type: COMPILER,
+      payload: compiler,
+    });
+  };  
diff --git a/src/actions/tutorialBuilderActions.js b/src/actions/tutorialBuilderActions.js
@@ -59,7 +59,7 @@ export const tutorialReview = (review) => (dispatch) => {
     type: BUILDER_REVIEW,
     payload: review,
   });
-  dispatch(changeTutorialBuilder());
+  dispatch(changeTutorialBuilder()); 
 };
 
 export const tutorialSteps = (steps) => (dispatch) => {

diff --git a/src/actions/types.js b/src/actions/types.js
@@ -51,6 +51,7 @@ export const PLATFORM = "PLATFORM";
 export const RENDERER = "RENDERER";
 export const SOUNDS = "SOUNDS";
 export const STATISTICS = "STATISTICS";
+export const COMPILER = "COMPILER";
 
 // messages
 export const GET_ERRORS = "GET_ERRORS";

diff --git a/src/actions/workspaceActions.js b/src/actions/workspaceActions.js
@@ -15,6 +15,8 @@ export const onChangeCode = () => (dispatch, getState) => {
   var code = getState().workspace.code;
   code.arduino = Blockly.Arduino.workspaceToCode(workspace);
   var xmlDom = Blockly.Xml.workspaceToDom(workspace);
+  var board = getState().board.board
+  xmlDom.setAttribute('board', board)
   code.xml = Blockly.Xml.domToPrettyText(xmlDom);
   var selectedBlock = Blockly.getSelected();
   if (selectedBlock !== null) {

diff --git a/src/components/Blockly/BlocklyWindow.js b/src/components/Blockly/BlocklyWindow.js
@@ -50,8 +50,7 @@ class BlocklyWindow extends Component {
       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

diff --git a/src/components/Blockly/blocks/index.js b/src/components/Blockly/blocks/index.js
@@ -5,6 +5,7 @@ import "./sensebox-sensors";
 import "./sensebox-telegram";
 import "./sensebox-osem";
 import "./sensebox-web";
+import "./sensebox-esp-now";
 import "./sensebox-display";
 import "./sensebox-motors";
 import "./sensebox-lora";

diff --git a/src/components/Blockly/blocks/procedures.js b/src/components/Blockly/blocks/procedures.js
@@ -13,12 +13,15 @@ import * as Blockly from 'blockly/core';
 import { getColour } from '../helpers/colour';
 import * as Types from '../helpers/types';
 
+
+
 Blockly.Blocks['arduino_functions'] = {
     /**
      * Block for defining the Arduino setup() and loop() functions.
      * @this Blockly.Block
      */
     init: function () {
+        var board = window.sessionStorage.getItem("board");
         this.appendDummyInput()
             .appendField(Blockly.Msg.ARD_FUN_RUN_SETUP);
         this.appendStatementInput('SETUP_FUNC');
@@ -30,6 +33,7 @@ Blockly.Blocks['arduino_functions'] = {
         this.setTooltip(Blockly.Msg.ARD_FUN_RUN_TIP);
         this.setHelpUrl('https://arduino.cc/en/Reference/Loop');
         this.contextMenu = false;
+        this.data = board;
     },
     /** @return {!boolean} True if the block instance is in the workspace. */
     getArduinoLoopsInstance: function () {

diff --git a/src/components/Blockly/blocks/sensebox-ble.js b/src/components/Blockly/blocks/sensebox-ble.js
@@ -1,6 +1,26 @@
 import * as Blockly from "blockly";
 import { getColour } from "../helpers/colour";
 
+
+var checkUnitLength = function (unit) {
+  var length = unit.length;
+  if (length > 5) {
+    alert("Die Einheit muss kleiner als 6 Zeichen sein");
+    return unit.slice(0, 5);
+  }
+  return unit;
+};
+
+var checkLabelLength = function (label) {
+  var length = label.length;
+  if (length > 20) {
+    alert("Das Label muss kleiner als 20 Zeichen sein");
+    return label.slice(0, 20);
+  }
+  return label;
+};
+
+
 Blockly.Blocks["sensebox_phyphox_init"] = {
   init: function () {
     this.setColour(getColour().phyphox);
@@ -51,16 +71,16 @@ Blockly.Blocks["sensebox_phyphox_graph"] = {
       .appendField(new Blockly.FieldTextInput("Label"), "label");
     this.appendDummyInput()
       .appendField(Blockly.Msg.sensebox_phyphox_unitx)
-      .appendField(new Blockly.FieldTextInput("Unit X"), "unitx");
+      .appendField(new Blockly.FieldTextInput("Unit", checkUnitLength), "unitx");
     this.appendDummyInput()
       .appendField(Blockly.Msg.sensebox_phyphox_unity)
-      .appendField(new Blockly.FieldTextInput("Unit Y"), "unity");
+      .appendField(new Blockly.FieldTextInput("Unit", checkUnitLength), "unity");
     this.appendDummyInput()
       .appendField(Blockly.Msg.sensebox_phyphox_labelx)
-      .appendField(new Blockly.FieldTextInput("Label X"), "labelx");
+      .appendField(new Blockly.FieldTextInput("Label X", checkLabelLength), "labelx");
     this.appendDummyInput()
       .appendField(Blockly.Msg.sensebox_phyphox_labely)
-      .appendField(new Blockly.FieldTextInput("Label Y"), "labely");
+      .appendField(new Blockly.FieldTextInput("Label Y", checkLabelLength), "labely");
     this.appendDummyInput()
       .appendField(Blockly.Msg.sensebox_phyphox_graphStyle)
       .appendField(
@@ -150,3 +170,44 @@ Blockly.Blocks["sensebox_phyphox_experiment_send"] = {
     this.setHelpUrl(Blockly.Msg.sensebox_phyphox_helpurl);
   },
 };
+
+/**
+ * senseBox BLE
+ * 
+ * 
+ */
+
+Blockly.Blocks["sensebox_ble_init"] = {
+  init: function () {
+    this.setColour(getColour().senseboxble);
+    this.setHelpUrl(Blockly.Msg.sensebox_ble_helpurl);
+    this.appendDummyInput()
+      .appendField(Blockly.Msg.sensebox_ble_init)
+      .appendField(new Blockly.FieldTextInput("Geräte Name"), "devicename");
+
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+    this.setTooltip(Blockly.Msg.sensebox_ble_init_tooltip);
+  },
+};
+
+Blockly.Blocks["sensebox_ble_send"] = {
+  init: function () {
+    this.setColour(getColour().senseboxble);
+    this.appendValueInput("value")
+      .appendField(Blockly.Msg.sensebox_ble_send)
+      .appendField(
+        new Blockly.FieldDropdown([
+          ["1", "1"],
+          ["2", "2"],
+          ["3", "3"],
+        ]),
+        "channel"
+      );
+
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+    this.setTooltip(Blockly.Msg.sensebox_ble_send_tooltip);
+    this.setHelpUrl(Blockly.Msg.sensebox_ble_helpurl);
+  },
+};
diff --git a/src/components/Blockly/blocks/sensebox-esp-now.js b/src/components/Blockly/blocks/sensebox-esp-now.js
@@ -0,0 +1,91 @@
+import Blockly from "blockly";
+import { getColour } from "../helpers/colour";
+import * as Types from "../helpers/types";
+
+Blockly.Blocks["sensebox_esp_now"] = {
+  init: function () {
+    this.appendDummyInput().appendField(
+      Blockly.Msg.senseBox_esp_now_tooltip
+    );
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+    this.setColour(getColour().sensebox);
+    this.setTooltip(Blockly.Msg.senseBox_esp_now_init_tooltip);
+    this.setHelpUrl("");
+  },
+};
+
+Blockly.Blocks["sensebox_esp_now_sender"] = {
+  init: function () {
+    this.setTooltip(Blockly.Msg.senseBox_esp_now_sender_tooltip);
+    this.setHelpUrl("");
+    this.setColour(getColour().sensebox);
+    this.appendDummyInput().appendField(Blockly.Msg.senseBox_esp_now_sender);
+    this.appendDummyInput()
+      .setAlign(Blockly.ALIGN_LEFT)
+      .appendField(Blockly.Msg.senseBox_esp_now_send_mac)
+      .appendField(new Blockly.FieldTextInput("00:00:00:00:00:00"), "mac-address");
+    this.setHelpUrl("");
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+  },
+};
+
+Blockly.Blocks["sensebox_get_mac"] = {
+  init: function () {
+    this.setTooltip(Blockly.Msg.senseBox_wifi_mac_tooltip);
+    this.setColour(getColour().sensebox);
+    this.appendDummyInput().appendField(Blockly.Msg.senseBox_wifi_mac);
+    this.setOutput(true, Types.TEXT.typeName);
+    this.setHelpUrl(Blockly.Msg.senseBox_wifi_ip_helpurl);
+  },
+};
+
+Blockly.Blocks["sensebox_esp_now_receive"] = {
+  init: function () {
+    this.jsonInit({
+      "message0": Blockly.Msg.senseBox_esp_now_receive,
+      "args0": [
+        {
+          "type": "field_variable",
+          "name": "VAR",
+          "defaultType": Types.TEXT.typeName,
+          "variable": "message"
+          // TODO check type?
+        },
+        {
+          "type": "field_variable",
+          "name": "MAC",
+          "defaultType": Types.TEXT.typeName,
+          "variable": "mac_address"
+          // TODO check type?
+        },
+      ],
+    });
+    this.appendStatementInput('DO')
+      .appendField(Blockly.Msg.CONTROLS_REPEAT_INPUT_DO);
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+    this.setTooltip(Blockly.Msg.senseBox_esp_now_receive_tooltip);
+    this.setColour(getColour().sensebox);
+    this.setHelpUrl(Blockly.Msg.senseBox_wifi_ip_helpurl);
+  },
+};
+
+Blockly.Blocks["sensebox_esp_now_send"] = {
+  init: function () {
+    this.appendDummyInput()
+      .appendField(Blockly.Msg.senseBox_esp_now_send);
+    this.appendDummyInput()
+      .appendField(Blockly.Msg.senseBox_esp_now_send_mac)
+      .appendField(Blockly.Msg.senseBox_mac_address)
+      .appendField(new Blockly.FieldTextInput("00:00:00:00:00:00"), "mac-address");
+    this.appendValueInput("value")
+      .appendField(Blockly.Msg.senseBox_esp_now_send_message);
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+    this.setTooltip(Blockly.Msg.senseBox_esp_now_send_tooltip);
+    this.setColour(getColour().sensebox);
+    this.setHelpUrl(Blockly.Msg.senseBox_wifi_ip_helpurl);
+  },
+};