Add/basic

index.html

@@ -6,6 +6,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#4EAF47" />
     <link rel="apple-touch-icon" href="/logo192.png" />
+    <link
+      rel="stylesheet"
+      href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/7.0.1/css/all.min.css"
+    />
     <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/

src/App.css

@@ -63,10 +63,6 @@ td {
   align-items: center;
 }
 
-:root {
-  --url: url("./data/mcu_opacity.png");
-}
-
 .blocklySvg {
   background-image: var(--url);
   background-position: center;

src/actions/boardAction.js

@@ -8,6 +8,9 @@ export const setBoard = (board) => (dispatch) => {
   window.sessionStorage.setItem("board", board);
   setBoardHelper(board);
   const root = document.querySelector(":root");
+  if (window.location.pathname === "/basic") {
+    return;
+  }
   switch (board) {
     case "MCU":
       root.style.setProperty("--url", `url(${mcu_opacity})`);

src/actions/workspaceActions.js

@@ -23,6 +23,7 @@ export const onChangeCode = () => (dispatch, getState) => {
   const workspace = Blockly.getMainWorkspace();
   var code = getState().workspace.code;
   code.arduino = Blockly.Generator.Arduino.workspaceToCode(workspace);
+  code.basic = Blockly.Generator.Basic.workspaceToCode(workspace);
   var xmlDom = Blockly.Xml.workspaceToDom(workspace);
   var board = getState().board.board;
   xmlDom.setAttribute("board", board);

src/components/Blockly/BlocklyComponent.jsx

@@ -3,7 +3,8 @@ import PropTypes from "prop-types";
 
 import * as Blockly from "blockly/core";
 import "./blocks/index";
-import "@/components/Blockly/generator/index";
+import "@/components/Blockly/generator/arduino/index";
+import "@/components/Blockly/generator/basic/index";
 
 import Toolbox from "./toolbox/Toolbox";
 import { reservedWords } from "./helpers/reservedWords";

src/components/Blockly/BlocklyWindow.jsx

@@ -4,7 +4,9 @@ import PropTypes from "prop-types";
 
 import * as Blockly from "blockly/core";
 import "./blocks/index";
-import "@/components/Blockly/generator/index";
+import "@/components/Blockly/generator/basic/index";
+import "@/components/Blockly/generator/arduino/index";
+import "@/components/Blockly/generator/basic/index";
 
 import { onChangeWorkspace, clearStats } from "../../actions/workspaceActions";
 import { ZoomToFitControl } from "@blockly/zoom-to-fit";

src/components/Blockly/blocks/basic/index.js

@@ -0,0 +1,169 @@
+import * as Blockly from "blockly/core";
+import { getColour } from "../../helpers/colour";
+
+Blockly.defineBlocksWithJsonArray([
+  {
+    type: "basic_display",
+    message0: "Zeige auf dem Display %1",
+    args0: [{ type: "field_input", name: "value", text: "Text" }],
+    previousStatement: true,
+    nextStatement: null,
+    colour: 230,
+  },
+]);
+
+Blockly.defineBlocksWithJsonArray([
+  {
+    type: "basic_red",
+    message0: "%1",
+    args0: [
+      {
+        type: "field_image",
+        src: "./media/blockly/led_red.png",
+        width: 50,
+        height: 50,
+        alt: "*",
+      },
+    ],
+    previousStatement: null,
+    nextStatement: null,
+    colour: getColour().sensebox,
+  },
+  {
+    type: "basic_yellow",
+    message0: "%1",
+    args0: [
+      {
+        type: "field_image",
+        src: "./media/blockly/led_yellow.png",
+        width: 50,
+        height: 50,
+        alt: "*",
+      },
+    ],
+    previousStatement: null,
+    nextStatement: null,
+    colour: getColour().sensebox,
+  },
+  {
+    type: "basic_blue",
+    message0: "%1",
+    args0: [
+      {
+        type: "field_image",
+        src: "./media/blockly/led_blue.png",
+        width: 50,
+        height: 50,
+        alt: "*",
+      },
+    ],
+    previousStatement: null,
+    nextStatement: null,
+    colour: getColour().sensebox,
+  },
+  {
+    type: "basic_off",
+    message0: "%1",
+    args0: [
+      {
+        type: "field_image",
+        src: "./media/blockly/led_off.png",
+        width: 50,
+        height: 50,
+        alt: "*",
+      },
+    ],
+    previousStatement: null,
+    nextStatement: null,
+    colour: getColour().sensebox,
+  },
+]);
+
+Blockly.defineBlocksWithJsonArray([
+  {
+    type: "time_delay_1s",
+    message0: "%1 %2",
+    args0: [
+      {
+        type: "field_image",
+        src: "https://cdn-icons-png.flaticon.com/512/31/31048.png",
+        width: 30,
+        height: 30,
+      },
+      {
+        type: "field_label",
+        name: "DELAY_TIME_1S",
+        text: "1",
+      },
+    ],
+    previousStatement: null,
+    nextStatement: null,
+    colour: getColour().time,
+    helpUrl: "http://arduino.cc/en/Reference/Delay",
+  },
+  {
+    type: "time_delay_2s",
+    message0: "%1 %2",
+    args0: [
+      {
+        type: "field_image",
+        src: "https://cdn-icons-png.flaticon.com/512/31/31048.png",
+        width: 30,
+        height: 30,
+      },
+      {
+        type: "field_label",
+        name: "DELAY_TIME_2S",
+        text: "2",
+      },
+    ],
+    previousStatement: null,
+    nextStatement: null,
+    colour: getColour().time,
+    helpUrl: "http://arduino.cc/en/Reference/Delay",
+  },
+  {
+    type: "time_delay_5s",
+    message0: "%1 %2",
+    args0: [
+      {
+        type: "field_image",
+        src: "https://cdn-icons-png.flaticon.com/512/31/31048.png",
+        width: 30,
+        height: 30,
+      },
+      {
+        type: "field_label",
+        name: "DELAY_TIME_5S",
+        text: "5",
+      },
+    ],
+    previousStatement: null,
+    nextStatement: null,
+    colour: getColour().time,
+    helpUrl: "http://arduino.cc/en/Reference/Delay",
+  },
+]);
+
+Blockly.defineBlocksWithJsonArray([
+  {
+    type: "display_print_basic",
+    message0: "%1 %2",
+    args0: [
+      {
+        type: "field_image",
+        src: "https://cdn-icons-png.flaticon.com/512/833/833313.png",
+        width: 30,
+        height: 30,
+      },
+      {
+        type: "input_value",
+        name: "inside",
+        check: null,
+      },
+    ],
+    previousStatement: null,
+    nextStatement: null,
+    colour: getColour().sensebox,
+  },
+]);

src/components/Blockly/generator/arduino/basic_dummies.js

@@ -0,0 +1,64 @@
+import * as Blockly from "blockly/core";
+
+Blockly.Generator.Arduino.forBlock["basic_display"] = function (
+  _block,
+  _generator,
+) {
+  return ""; // nichts generieren
+};
+
+Blockly.Generator.Arduino.forBlock["basic_red"] = function (
+  _block,
+  _generator,
+) {
+  return ""; // nichts generieren
+};
+
+Blockly.Generator.Arduino.forBlock["basic_blue"] = function (
+  _block,
+  _generator,
+) {
+  return ""; // nichts generieren
+};
+
+Blockly.Generator.Arduino.forBlock["basic_yellow"] = function (
+  _block,
+  _generator,
+) {
+  return ""; // nichts generieren
+};
+
+Blockly.Generator.Arduino.forBlock["basic_off"] = function (
+  _block,
+  _generator,
+) {
+  return ""; // nichts generieren
+};
+
+Blockly.Generator.Arduino.forBlock["time_delay_1s"] = function (
+  _block,
+  _generator,
+) {
+  return ""; // nichts generieren
+};
+
+Blockly.Generator.Arduino.forBlock["time_delay_2s"] = function (
+  _block,
+  _generator,
+) {
+  return ""; // nichts generieren
+};
+
+Blockly.Generator.Arduino.forBlock["time_delay_5s"] = function (
+  _block,
+  _generator,
+) {
+  return ""; // nichts generieren
+};
+
+Blockly.Generator.Arduino.forBlock["display_print_basic"] = function (
+  _block,
+  _generator,
+) {
+  return ""; // nichts generieren
+};

src/components/Blockly/generator/generator.js → src/components/Blockly/generator/arduino/generator.js

@@ -25,9 +25,9 @@
 // https://developers.google.com/blockly/guides/create-custom-blocks/generating-code
 
 import * as Blockly from "blockly/core";
-import { reservedWords } from "../helpers/reservedWords";
+import { reservedWords } from "../../helpers/reservedWords";
 
-import store from "../../../store";
+import store from "@/store";
 
 var ota = store.getState().general.platform
   ? store.getState().general.platform
@@ -92,6 +92,7 @@ Blockly.Generator.Arduino.ORDER_NONE = 99; // (...)
  */
 Blockly.Generator.Arduino.init = function (workspace) {
   // Create a dictionary of definitions to be printed before the code.
+
   Blockly.Generator.Arduino.libraries_ = Object.create(null);
 
   Blockly.Generator.Arduino.definitions_ = Object.create(null);
@@ -369,6 +370,7 @@ Blockly.Generator.Arduino.quote_ = function (string) {
 
 Blockly.Generator.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.

src/components/Blockly/generator/index.js → src/components/Blockly/generator/arduino/index.js

@@ -30,3 +30,4 @@ import "./lists";
 import "./watchdog";
 import "./webserver";
 import "./fluoroASM";
+import "./basic_dummies";

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

@@ -1,5 +1,5 @@
 import * as Blockly from "blockly";
-import { selectedBoard } from "../helpers/board";
+import { selectedBoard } from "../../helpers/board";
 
 /**
  * HDC1080 Temperature and Humidity Sensor

src/components/Blockly/generator/sensebox-solar.js → src/components/Blockly/generator/arduino/sensebox-solar.js

@@ -1,5 +1,5 @@
 import * as Blockly from "blockly";
-import { selectedBoard } from "../helpers/board";
+import { selectedBoard } from "../../helpers/board";
 
 /**
  * Solar Charger (SB-041)