Added missing LCD blocks (setCursor and clear)

GIRA · Sep 2, 2023 · d94bcad · d94bcad
1 parent bc9d5b4
commit d94bcad
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 4 deletions.
diff --git a/gui/ide/ast2blocks.js b/gui/ide/ast2blocks.js
@@ -579,6 +579,14 @@ let ASTToBlocks = (function () {
 			node.setAttribute("type", "print_string");
 			appendField(node, "lcdName", alias);
 			appendValue(node, "string", findArg(args, "value", 0) || defaultArg, ctx);
+		} else if (selector == "setCursor") {
+			node.setAttribute("type", "lcd_set_cursor");
+			appendField(node, "lcdName", alias);
+			appendValue(node, "column", findArg(args, "column", 0) || defaultArg, ctx);
+			appendValue(node, "row", findArg(args, "row", 1) || defaultArg, ctx);
+		} else if (selector == "clear") {
+			node.setAttribute("type", "lcd_clear");
+			appendField(node, "lcdName", alias);
 		} else {
 			// NOTE(Richo): Fallback code...
 			initPrimitiveCall(node, json, ctx);

diff --git a/gui/ide/blocks.js b/gui/ide/blocks.js
@@ -611,6 +611,45 @@ let UziBlock = (function () {
           color: colors.LCD,
           supportsBreakpoints: true,
     },
+    lcd_set_cursor: {
+      text: "%name . setCursor ( %column, %row ) ;",
+      type: null,
+      inputs: {
+        "name": {
+          name: "lcdName",
+          types: null,
+          builder: (block, input, name) => input.appendField(new Blockly.FieldDropdown(currentLcdsForDropdown), name),
+        },
+        "column": {
+          name: "column",
+          types: [types.NUMBER],
+          builder: (block, input, name) => block.appendValueInput(name).setAlign(Blockly.ALIGN_RIGHT),
+        },
+        "row": {
+          name: "row",
+          types: [types.NUMBER],
+          builder: (block, input, name) => block.appendValueInput(name).setAlign(Blockly.ALIGN_RIGHT),
+        }
+      },
+      connections: { up: true, down: true, left: false },
+      color: colors.LCD,
+      supportsBreakpoints: true,
+    },
+    lcd_clear: {
+      text: "%name . clear () ;",
+      type: null,
+      inputs: {
+        "name": {
+          name: "lcdName",
+          types: null,
+          builder: (block, input, name) => input.appendField(new Blockly.FieldDropdown(currentLcdsForDropdown), name),
+        }
+      },
+      connections: { up: true, down: true, left: false },
+      color: colors.LCD,
+      supportsBreakpoints: true,
+    },
+
 
     // Sensors - Sonar
     get_sonar_distance: {

diff --git a/gui/ide/blocks2ast.js b/gui/ide/blocks2ast.js
@@ -770,6 +770,28 @@ let BlocksToAST = (function () {
 			let arg = {name: null, value: string};
 			stream.push(builder.scriptCall(id, selector, [arg]));
 		},
+		lcd_set_cursor: function (block, ctx, stream) {
+			let id = XML.getId(block);
+			let lcdName = asIdentifier(XML.getChildNode(block, "lcdName").innerText);
+			let column = generateCodeForValue(block, ctx, "column");
+			let row = generateCodeForValue(block, ctx, "row");
+
+			ctx.addLcdImport(lcdName);
+
+			let selector = lcdName + "." + "setCursor";
+			let args = [{name: "column", value: column},
+						{name: "row", value: row}];
+			stream.push(builder.scriptCall(id, selector, args));
+		},
+		lcd_clear: function (block, ctx, stream) {
+			let id = XML.getId(block);
+			let lcdName = asIdentifier(XML.getChildNode(block, "lcdName").innerText);
+
+			ctx.addLcdImport(lcdName);
+
+			let selector = lcdName + "." + "clear";
+			stream.push(builder.scriptCall(id, selector, []));
+		},
 		get_sonar_distance: function (block, ctx, stream) {
 			let id = XML.getId(block);
 			let sonarName = asIdentifier(XML.getChildNode(block, "sonarName").innerText);

diff --git a/gui/ide/toolbox-advanced.xml b/gui/ide/toolbox-advanced.xml
@@ -206,19 +206,22 @@
         </shadow>
       </value>
     </block>
-    <!-- <block type="set_cursor">
+    <block type="lcd_set_cursor">
       <field name="lcdName"></field>
-      <value name="valueLeft">
+      <value name="column">
         <shadow type="number">
           <field name="value">0</field>
         </shadow>
       </value>
-      <value name="valueRight">
+      <value name="row">
         <shadow type="number">
           <field name="value">0</field>
         </shadow>
       </value>
-    </block> -->
+    </block>
+    <block type="lcd_clear">
+      <field name="lcdName"></field>
+    </block>
   </category>
   <category name="Sonar" custom="SONAR">
     <button text="Configure sonars..." callbackKey="configureSonars"></button>

diff --git a/gui/ide/translations.js b/gui/ide/translations.js
@@ -150,6 +150,8 @@ var TRANSLATIONS = [
   ["%name .getSpeed( )", "get %name speed", "obtener la velocidad de %name", "mootori %name kiirus", "läs %name hastighet"],
   ["%name . printNumber ( %number ) ;", "show number %number in %name", "mostrar número %number en %name", null, null],
   ["%name . printString ( %string ) ;", "show text %string in %name", "mostrar texto %string en %name", null, null],
+  ["%name . setCursor ( %column, %row ) ;", "move cursor for %name to column %column row %row", "mover cursor de %name a columna %column fila %row", null, null],
+  ["%name . clear () ;", "clear %name", "limpiar pantalla de %name", null, null],
   ["%name . %unit ()", "read distance from %name in %unit", "leer distancia de %name en %unit", "mõõda kaugus kajaloost %name ühikutes %unit", "läs avståndet från ekolodet %name i %unit"],
   ["buttons. %state ( %pin )", "is button %state on pin %pin ?", "¿ está %state el botón en el pin %pin ?", "kas lüliti on %state viigus %pin", "är knapp %state på ben %pin"],
   ["buttons. %action ( %pin ) ;", "wait for button %action on pin %pin", "esperar hasta que %action el botón en el pin %pin", "oota lüliti %action viigus %pin", "vänta på knapp %action på ben %pin"],