Feat: add blocks for serial read (#41)

leaphy-robotics · Jan 28, 2024 · 71e24b7 · 71e24b7
1 parent dfa810c
commit 71e24b7
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 1 deletion.
diff --git a/blocks/leaphy_common.js b/blocks/leaphy_common.js
@@ -92,6 +92,22 @@ function getBlocks(board) {
       tooltip: "",
       helpUrl: "",
     },
+    {
+      type: "leaphy_serial_available",
+      message0: "%%{BKY_LEAPHY_SERIAL_AVAILABLE}",
+      style: "leaphy_blocks",
+      output: "Number",
+      tooltip: "",
+      helpUrl: "",
+    },
+    {
+      type: "leaphy_serial_read_line",
+      message0: "%%{BKY_LEAPHY_SERIAL_READ_LINE}",
+      style: "leaphy_blocks",
+      output: "String",
+      tooltip: "",
+      helpUrl: "",
+    },
     {
       type: "leaphy_rgb_color",
       message0: "%1",

diff --git a/generators/arduino/leaphy_common.js b/generators/arduino/leaphy_common.js
@@ -25,6 +25,18 @@ function getCodeGenerators(Arduino) {
     return null;
   };
 
+  Arduino.forBlock["leaphy_serial_available"] = function (block) {
+    Arduino.addSetup("serial", "Serial.begin(115200);", false);
+    var code = "Serial.available()";
+    return [code, Arduino.ORDER_ATOMIC];
+  };
+
+  Arduino.forBlock["leaphy_serial_read_line"] = function (block) {
+    Arduino.addSetup("serial", "Serial.begin(115200);", false);
+    var code = "Serial.readStringUntil('\\n')";
+    return [code, Arduino.ORDER_ATOMIC];
+  };
+
   Arduino.forBlock["leaphy_serial_print_line"] = function (block) {
     Arduino.addSetup("serial", "Serial.begin(115200);", false);
     var value = Arduino.valueToCode(this, "VALUE", Arduino.ORDER_ATOMIC) || "0";

diff --git a/msg/js/en.js b/msg/js/en.js
@@ -152,6 +152,8 @@ Blockly.Msg["LEAPHY_RGB_RAW_COLOR_GREEN"] = "RawColor Green";
 Blockly.Msg["LEAPHY_RGB_RAW_COLOR_RED"] = "RawColor Red";
 Blockly.Msg["LEAPHY_RGB_READ_SENSOR"] = "Read RGB sensor";
 Blockly.Msg["LEAPHY_SERIAL_PRINT"] = "Show on screen";
+Blockly.Msg["LEAPHY_SERIAL_AVAILABLE"] = "Available on screen";
+Blockly.Msg["LEAPHY_SERIAL_READ_LINE"] = "Read from screen";
 Blockly.Msg["LEAPHY_SITUATION_CATEGORY"] = "Thinkflow";
 Blockly.Msg["LEAPHY_SONAR_READ_ECHO"] = "Echo";
 Blockly.Msg["LEAPHY_SONAR_READ_TRIG"] = "Sonar Trig";

diff --git a/msg/js/nl.js b/msg/js/nl.js
@@ -150,6 +150,8 @@ Blockly.Msg["LEAPHY_RGB_RAW_COLOR_GREEN"] = "G-bron";
 Blockly.Msg["LEAPHY_RGB_RAW_COLOR_RED"] = "R-bron";
 Blockly.Msg["LEAPHY_RGB_READ_SENSOR"] = "Lees RGB Sensor";
 Blockly.Msg["LEAPHY_SERIAL_PRINT"] = "Toon op scherm";
+Blockly.Msg["LEAPHY_SERIAL_AVAILABLE"] = "Beschikbaar op scherm";
+Blockly.Msg["LEAPHY_SERIAL_READ_LINE"] = "Lees van scherm";
 Blockly.Msg["LEAPHY_SITUATION_CATEGORY"] = "Denk stappen";
 Blockly.Msg["LEAPHY_SONAR_READ_ECHO"] = "Echo";  // untranslated
 Blockly.Msg["LEAPHY_SONAR_READ_TRIG"] = "Sonar Trig";  // untranslated

diff --git a/msg/json/en.json b/msg/json/en.json
@@ -77,6 +77,8 @@
 	"LEAPHY_BUZZ_HERTZ": "Hertz",
 	"LEAPHY_BUZZ_MS": "ms",
 	"LEAPHY_SERIAL_PRINT": "Show on screen",
+	"LEAPHY_SERIAL_AVAILABLE": "Available on screen",
+	"LEAPHY_SERIAL_READ_LINE": "Read from screen",
 	"LEAPHY_DISPLAY_CLEAR": "Clear display",
 	"LEAPHY_DISPLAY_PRINT": "Display - Set Ln.",
 	"LEAPHY_DISPLAY_DISPLAY": "Show on display",

diff --git a/msg/json/nl.json b/msg/json/nl.json
@@ -69,6 +69,8 @@
 	"LEAPHY_VARIABLES_CATEGORY": "Variabelen",
 	"LEAPHY_FUNCTIONS_CATEGORY": "Eigen blokken",
 	"LEAPHY_SERIAL_PRINT": "Toon op scherm",
+	"LEAPHY_SERIAL_AVAILABLE": "Beschikbaar op scherm",
+	"LEAPHY_SERIAL_READ_LINE": "Lees van scherm",
 	"LEAPHY_DISPLAY_CLEAR": "Maak display leeg",
 	"LEAPHY_DISPLAY_PRINT": "Stel display in - Rg.",
 	"LEAPHY_DISPLAY_DISPLAY": "Toon op display",

diff --git a/msg/messages.js b/msg/messages.js
@@ -209,6 +209,12 @@ Blockly.Msg.LEAPHY_BUZZ_MS = 'ms';
 /// Print print
 Blockly.Msg.LEAPHY_SERIAL_PRINT = 'Show on screen';
 /** @type {string} */
+/// Serial available
+Blockly.Msg.LEAPHY_SERIAL_AVAILABLE = "Available on screen";
+/** @type {string} */
+/// Serial read
+Blockly.Msg.LEAPHY_SERIAL_READ_LINE = "Read from screen";
+/** @type {string} */
 /// Clear display
 Blockly.Msg.LEAPHY_DISPLAY_CLEAR = 'Clear display';
 /** @type {string} */

diff --git a/package.json b/package.json
@@ -24,7 +24,7 @@
     "msg",
     "theme"
   ],
-  "version": "1.7.1",
+  "version": "1.8.0",
   "description": "Leaphy custom Blockly blocks and arduino code generator",
   "name": "@leaphy-robotics/leaphy-blocks"
 }