Add block to support cursor moving

Author: osk2

blockly.json

@@ -1,5 +1,5 @@
 {
-  "types": ["lcd1602_new", "lcd1602_print","lcd1602_clear"],
+  "types": ["lcd1602_new", "lcd1602_print","lcd1602_clear", "lcd1602_row_column"],
   "category": "catMenu1",
   "scripts": [
     "blockly/blocks.js",

blockly/blocks.js

@@ -4,7 +4,7 @@ var utmUrl = '?utm_source=cloud-blockly&utm_medium=contextMenu&utm_campaign=tuto
 Blockly.Blocks['lcd1602_clear'] = {
   init: function() {
     this.appendDummyInput()
-        .appendField(new Blockly.FieldVariable("lcd1602"), "lcd1602")
+        .appendField(new Blockly.FieldVariable("lcd1602"), "name_")
         .appendField(Blockly.Msg.WEBDUINO_LCD1602_CLEAR);
     this.setPreviousStatement(true, null);
     this.setNextStatement(true, null);
@@ -14,7 +14,6 @@ Blockly.Blocks['lcd1602_clear'] = {
   }
 };
 
-
 Blockly.Blocks['lcd1602_new'] = {
   init: function () {
     this.appendDummyInput()
@@ -64,6 +63,40 @@ Blockly.Blocks['lcd1602_print'] = {
     this.setNextStatement(true);
     this.setTooltip('');
     this.setColour(65);
-    this.setHelpUrl(mainUrl + 'basic/index.html' + utmUrl); 
+    this.setHelpUrl(mainUrl + 'basic/index.html' + utmUrl);
   }
-};
+};
+
+Blockly.Blocks['lcd1602_row_column'] = {
+  init: function() {
+    this.appendDummyInput()
+      .appendField(new Blockly.FieldVariable("lcd1602"), "name_")
+      .appendField(Blockly.Msg.WEBDUINO_LCD1602_START, "文字起始位置")
+      .appendField(Blockly.Msg.WEBDUINO_LCD1602_COLUMN, "欄")
+      .appendField(new Blockly.FieldDropdown([["1","1"], ["2","2"]]), "row_")
+      .appendField(Blockly.Msg.WEBDUINO_LCD1602_ROW, "列")
+      .appendField(new Blockly.FieldDropdown([
+        ["1","1"],
+        ["2","2"],
+        ["3","3"],
+        ["4","4"],
+        ["5","5"],
+        ["6","6"],
+        ["7","7"],
+        ["8","8"],
+        ["9","9"],
+        ["10","10"],
+        ["11","11"],
+        ["12","12"],
+        ["13","13"],
+        ["14","14"],
+        ["15","15"],
+        ["16","16"]
+      ]), "column_");
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+    this.setColour(65);
+    this.setTooltip("");
+    this.setHelpUrl(mainUrl + 'basic/index.html' + utmUrl);
+  }
+};

blockly/javascript.js

@@ -1,15 +1,7 @@
-Blockly.JavaScript['lcd1602_clear'] = function(block) {
-  var variable_lcd1602 = Blockly.JavaScript.variableDB_.getName(block.getFieldValue('lcd1602'), Blockly.Variables.NAME_TYPE);
-  // TODO: Assemble JavaScript into code variable.
-  var code = variable_lcd1602+'.clear();\n';
-  return code;
-};
-
-
 Blockly.JavaScript['lcd1602_new'] = function (block) {
   var dropdown_sda_ = block.getFieldValue('sda_');
   var dropdown_scl_ = block.getFieldValue('scl_');
-  var code = 'getLCD1602(board,'+ dropdown_sda_ + ',' + dropdown_scl_ + ')';
+  var code = 'getLCD1602(board,' + dropdown_sda_ + ',' + dropdown_scl_ + ')';
   return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
 };
 
@@ -18,4 +10,19 @@ Blockly.JavaScript['lcd1602_print'] = function (block) {
   var value_value_ = Blockly.JavaScript.valueToCode(block, 'value_', Blockly.JavaScript.ORDER_ATOMIC);
   var code = variable_name_ + '.print(' + value_value_ + ');\n';
   return code;
-};
+};
+
+Blockly.JavaScript['lcd1602_clear'] = function (block) {
+  var variable_name_ = Blockly.JavaScript.variableDB_.getName(block.getFieldValue('name_'), Blockly.Variables.NAME_TYPE);
+  var code = variable_name_ + '.clear();\n';
+  return code;
+};
+
+Blockly.JavaScript['lcd1602_row_column'] = function (block) {
+  var variable_name_ = Blockly.JavaScript.variableDB_.getName(block.getFieldValue('name_'), Blockly.Variables.NAME_TYPE);
+  var number_column_ = parseInt(block.getFieldValue('column_'));
+  var number_row_ = parseInt(block.getFieldValue('row_'));
+  
+  var code = variable_name_ + '.cursor(' + (--number_column_) + ', ' + (--number_row_) + ');\n';
+  return code;
+};

blockly/msg/blocks/en.js

@@ -3,5 +3,6 @@ Blockly.Msg.WEBDUINO_LCD1602 = "LCD (1602)，SDA ";
 Blockly.Msg.WEBDUINO_LCD1602_SCL = " SCL";
 Blockly.Msg.WEBDUINO_LCD1602_PRINT = "Print:";
 Blockly.Msg.WEBDUINO_LCD1602_CLEAR = "Clear Screen";
-Blockly.Msg.WEBDUINO_LCD1602_LOCATE_X = "LCD Col:";
-Blockly.Msg.WEBDUINO_LCD1602_LOCATE_Y = "LCD Row:";
+Blockly.Msg.WEBDUINO_LCD1602_START = "Text start position:";
+Blockly.Msg.WEBDUINO_LCD1602_ROW = "Row";
+Blockly.Msg.WEBDUINO_LCD1602_COLUMN = "Column";

blockly/msg/blocks/zh-hans.js

@@ -3,5 +3,6 @@ Blockly.Msg.WEBDUINO_LCD1602 = "LCD (1602)，SDA ";
 Blockly.Msg.WEBDUINO_LCD1602_SCL = " SCL";
 Blockly.Msg.WEBDUINO_LCD1602_PRINT = "显示文字";
 Blockly.Msg.WEBDUINO_LCD1602_CLEAR = "清除屏幕内容";
-Blockly.Msg.WEBDUINO_LCD1602_LOCATE_X = "LCD 设定列:";
-Blockly.Msg.WEBDUINO_LCD1602_LOCATE_Y = "LCD 设定栏:";
+Blockly.Msg.WEBDUINO_LCD1602_START = "文字起始位置";
+Blockly.Msg.WEBDUINO_LCD1602_ROW = "栏";
+Blockly.Msg.WEBDUINO_LCD1602_COLUMN = "列";

blockly/msg/blocks/zh-hant.js

@@ -3,5 +3,6 @@ Blockly.Msg.WEBDUINO_LCD1602 = "LCD (1602)，SDA ";
 Blockly.Msg.WEBDUINO_LCD1602_SCL = " SCL";
 Blockly.Msg.WEBDUINO_LCD1602_PRINT = "顯示文字";
 Blockly.Msg.WEBDUINO_LCD1602_CLEAR = "清除螢幕內容";
-Blockly.Msg.WEBDUINO_LCD1602_LOCATE_X = "LCD 設定列:";
-Blockly.Msg.WEBDUINO_LCD1602_LOCATE_Y = "LCD 設定欄:";
+Blockly.Msg.WEBDUINO_LCD1602_START = "文字起始位置";
+Blockly.Msg.WEBDUINO_LCD1602_ROW = "欄";
+Blockly.Msg.WEBDUINO_LCD1602_COLUMN = "列";

blockly/toolbox.xml

@@ -15,5 +15,6 @@
       </block>
     </value>
   </block>
+  <block type="lcd1602_row_column"></block>
   <block type="lcd1602_clear"></block>
 </category>