Added the following blocks

ardublockly/ardublockly_blockly.js

@@ -214,7 +214,7 @@ Ardublockly.changeBlocklyArduinoBoard = function(newBoard) {
 Ardublockly.updateToolboxLanguage = function() {
   var categories = ['catLogic', 'catLoops', 'catMath', 'catText',
                     'catVariables', 'catFunctions', 'catInputOutput',
-                    'catTime', 'catAudio', 'catMotors', 'catComms'];
+                    'catTime', 'catAudio', 'catMotors', 'catComms', 'catDisplay'];
   var categoryNodes = Ardublockly.xmlTree.getElementsByTagName('category');
   for (var i = 0, cat; cat = categoryNodes[i]; i++) {
     var catId = cat.getAttribute('id');

ardublockly/ardublockly_toolbox.js

@@ -123,6 +123,7 @@ Ardublockly.TOOLBOX_XML =
 '  <category id="catFunctions" name="Functions" custom="PROCEDURE"></category>' +
 '  <sep></sep>' +
 '  <category id="catInputOutput" name="Input/Output">' +
+'    <block type="io_input_pullup"></block>' +
 '    <block type="io_digitalwrite">' +
 '      <value name="STATE">' +
 '        <block type="io_highlow"></block>' +
@@ -231,4 +232,51 @@ Ardublockly.TOOLBOX_XML =
 '    <block type="spi_transfer"></block>' +
 '    <block type="spi_transfer_return"></block>' +
 '  </category>' +
+'  <sep></sep>' +
+'  <category id="catDisplay" name="Display">' +
+'    <block type="liquidcrystal_config">' +
+'      <field name="LCD_RS">12</field>' +
+'      <field name="LCD_EN">11</field>' +
+'      <field name="LCD_D4">5</field>' +
+'      <field name="LCD_D5">4</field>' +
+'      <field name="LCD_D6">3</field>' +
+'      <field name="LCD_D7">2</field>' +
+'      <value name="LCD_COLUMN">' +
+'        <block type="math_number">' +
+'          <field name="NUM">16</field>' +
+'        </block>' +
+'      </value>' +
+'      <value name="LCD_ROW">' +
+'        <block type="math_number">' +
+'          <field name="NUM">2</field>' +
+'        </block>' +
+'      </value>' +
+'    </block>' +
+'    <block type="liquidcrystal_variable"></block>' +
+'    <block type="liquidcrystal_clear">' +
+'      <value name="LCD_NAME">' +
+'        <block type="liquidcrystal_variable"></block>' +
+'      </value>' +
+'    </block>' +
+'    <block type="liquidcrystal_print">' +
+'      <value name="LCD_NAME">' +
+'        <block type="liquidcrystal_variable"></block>' +
+'      </value>' +
+'    </block>' +
+'    <block type="liquidcrystal_set_cursor">' +
+'      <value name="LCD_NAME">' +
+'        <block type="liquidcrystal_variable"></block>' +
+'      </value>' +
+'      <value name="LCD_COLUMN">' +
+'        <block type="math_number">' +
+'          <field name="NUM">0</field>' +
+'        </block>' +
+'      </value>' +
+'      <value name="LCD_ROW">' +
+'        <block type="math_number">' +
+'          <field name="NUM">0</field>' +
+'        </block>' +
+'      </value>' +
+'    </block>' +
+'  </category>' +
 '</xml>';

ardublockly/index.html

@@ -27,6 +27,7 @@
   <script src="../blockly/blocks/variables.js"></script>
   <script src="../blockly/blocks/procedures.js"></script>
   <script src="../blockly/blocks/arduino/io.js"></script>
+  <script src="../blockly/blocks/arduino/liquidcrystal.js"></script>
   <script src="../blockly/blocks/arduino/map.js"></script>
   <script src="../blockly/blocks/arduino/procedures.js"></script>
   <script src="../blockly/blocks/arduino/serial.js"></script>
@@ -39,6 +40,7 @@
   <script src="../blockly/generators/arduino.js"></script>
   <script src="../blockly/generators/arduino/boards.js"></script>
   <script src="../blockly/generators/arduino/io.js"></script>
+  <script src="../blockly/generators/arduino/liquidcrystal.js"></script>
   <script src="../blockly/generators/arduino/lists.js"></script>
   <script src="../blockly/generators/arduino/logic.js"></script>
   <script src="../blockly/generators/arduino/loops.js"></script>

ardublockly/msg/en.js

@@ -102,4 +102,5 @@ Ardublockly.LOCALISED_TEXT = {
   catAudio: "Audio",
   catMotors: "Motors",
   catComms: "Comms",
+  catDisplay: "Display",
 };

blockly/blocks/arduino/io.js

@@ -260,3 +260,20 @@ Blockly.Blocks['io_pulsetimeout'] = {
     return Blockly.Types.NUMBER;
   }
 };
+
+Blockly.Blocks['io_input_pullup'] = {
+  init: function() {
+    this.appendDummyInput()
+        .appendField(Blockly.Msg.ARD_SET_PIN)
+        .appendField(new Blockly.FieldDropdown(
+            Blockly.Arduino.Boards.selected.digitalPins), 'PIN')
+        .appendField(Blockly.Msg.ARD_MODE_TO)
+        .appendField(new Blockly.FieldDropdown([[Blockly.Msg.ARD_PULLUP,"INPUT_PULLUP"],[Blockly.Msg.ARD_INPUT,"INPUT"], [Blockly.Msg.ARD_OUTPUT,"OUTPUT"]]), "STATE");
+    this.setColour(Blockly.Blocks.io.HUE);
+    this.setTooltip(Blockly.Msg.ARD_PULLUP_TIP);
+    this.setHelpUrl('https://www.arduino.cc/en/Reference/Constants');
+  },
+  getBlockType: function() {
+    return Blockly.Types.SHORT_NUMBER;
+  }
+};

blockly/blocks/arduino/liquidcrystal.js

@@ -0,0 +1,129 @@
+/**
+ * @license Licensed under the Apache License, Version 2.0 (the "License"):
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ */
+
+/**
+ * @fileoverview Blocks for Arduino Liquid Crystal  library.
+ *     The Arduino Liquid Crystal functions syntax can be found in the following URL:
+ *     https://www.arduino.cc/en/Reference/LiquidCrystal
+ *     Note that this block uses the Blockly.FieldInstance instead of
+ *     Blockly.FieldDropdown which generates a unique instance per setup block
+ *     in the workspace.
+ */
+
+'use strict';
+
+goog.provide('Blockly.Blocks.LiquidCrystal');
+
+goog.require('Blockly.Blocks');
+goog.require('Blockly.Types');
+
+/** Common HSV hue for all blocks in this category. */
+Blockly.Blocks.LiquidCrystal.HUE = 300;
+
+Blockly.Blocks['liquidcrystal_config'] = {
+  init: function() {
+    this.appendDummyInput()
+        .appendField(Blockly.Msg.ARD_LIQUIDCRYSTAL_CONFIG)
+        .appendField(new Blockly.FieldInstance('LCD',Blockly.Msg.ARD_LIQUIDCRYSTAL_DEFAULT_NAME,true,true,false), "liquidcrystal_name");
+    this.appendDummyInput()
+        .setAlign(Blockly.ALIGN_RIGHT)
+        .appendField("RS:")
+        .appendField(new Blockly.FieldDropdown(Blockly.Arduino.Boards.selected.digitalPins), "LCD_RS")
+        .appendField("EN:")
+        .appendField(new Blockly.FieldDropdown(Blockly.Arduino.Boards.selected.digitalPins), "LCD_EN")
+        .appendField("D4:")
+        .appendField(new Blockly.FieldDropdown(Blockly.Arduino.Boards.selected.digitalPins), "LCD_D4");
+    this.appendDummyInput()
+        .setAlign(Blockly.ALIGN_RIGHT)
+        .appendField("D5:")
+        .appendField(new Blockly.FieldDropdown(Blockly.Arduino.Boards.selected.digitalPins), "LCD_D5")
+        .appendField("D6:")
+        .appendField(new Blockly.FieldDropdown(Blockly.Arduino.Boards.selected.digitalPins), "LCD_D6")
+        .appendField("D7:")
+        .appendField(new Blockly.FieldDropdown(Blockly.Arduino.Boards.selected.digitalPins), "LCD_D7");
+    this.appendValueInput("LCD_COLUMN")
+        .setCheck("Number")
+        .setAlign(Blockly.ALIGN_RIGHT)
+        .appendField("No. of Columns:");
+    this.appendValueInput("LCD_ROW")
+        .setCheck("Number")
+        .setAlign(Blockly.ALIGN_RIGHT)
+        .appendField("No. of Rows:");
+    this.setColour(Blockly.Blocks.LiquidCrystal.HUE);
+    this.setTooltip(Blockly.Msg.ARD_LIQUIDCRYSTAL_DEFAULT_TIP);
+    this.setHelpUrl('https://www.arduino.cc/en/Reference/LiquidCrystal');
+  }
+};
+
+Blockly.Blocks['liquidcrystal_variable'] = {
+  init: function() {
+    this.appendDummyInput()
+        .appendField(new Blockly.FieldInstance('LCD',Blockly.Msg.ARD_LIQUIDCRYSTAL_DEFAULT_NAME,false,true,false), "liquidcrystal_name");
+    this.setOutput(true, null);
+    this.setColour(Blockly.Blocks.LiquidCrystal.HUE);
+    this.setTooltip('');
+    this.setHelpUrl('https://www.arduino.cc/en/Reference/LiquidCrystal');
+  }
+};
+
+Blockly.Blocks['liquidcrystal_clear'] = {
+  init: function() {
+    this.appendValueInput("LCD_NAME")
+        .setCheck("String")
+        .appendField(Blockly.Msg.ARD_LIQUIDCRYSTAL_CLEAR_DISPLAY);
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+    this.setColour(Blockly.Blocks.LiquidCrystal.HUE);
+    this.setTooltip(Blockly.Msg.ARD_LIQUIDCRYSTAL_CLEAR_DISPLAY_TIP);
+    this.setHelpUrl('https://www.arduino.cc/en/Reference/LiquidCrystal');
+  }
+};
+
+Blockly.Blocks['liquidcrystal_print'] = {
+  /**
+   * Block for creating a write to serial com function.
+   * @this Blockly.Block
+   */
+  init: function() {
+    this.setHelpUrl('http://www.arduino.cc/en/Serial/Print');
+    this.setColour(Blockly.Blocks.LiquidCrystal.HUE);
+    this.appendDummyInput()
+        .appendField(Blockly.Msg.ARD_SERIAL_PRINT);
+    this.appendValueInput('CONTENT')
+        .setCheck(Blockly.Types.TEXT.checkList);
+    this.appendValueInput('LCD_NAME')
+        .appendField(Blockly.Msg.ARD_LIQUIDCRYSTAL_PRINT_ON_DISPLAY);
+    this.appendDummyInput()
+        .appendField(new Blockly.FieldCheckbox('TRUE'), 'NEW_LINE')
+        .appendField(Blockly.Msg.ARD_SERIAL_PRINT_NEWLINE);
+    this.setInputsInline(true);
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+    this.setTooltip(Blockly.Msg.ARD_LIQUIDCRYSTAL_PRINT_TIP);
+    this.setHelpUrl('https://www.arduino.cc/en/Reference/LiquidCrystal');
+  }
+};
+
+Blockly.Blocks['liquidcrystal_set_cursor'] = {
+  init: function() {
+    this.appendValueInput("LCD_NAME")
+        .setCheck("String")
+        .appendField(Blockly.Msg.ARD_LIQUIDCRYSTAL_SET_CURSOR);
+    this.appendValueInput("LCD_COLUMN")
+        .setCheck("Number")
+        .setAlign(Blockly.ALIGN_RIGHT)
+        .appendField("Column:");
+    this.appendValueInput("LCD_ROW")
+        .setCheck("Number")
+        .setAlign(Blockly.ALIGN_RIGHT)
+        .appendField("Rows:");
+    this.setInputsInline(false);
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+    this.setColour(Blockly.Blocks.LiquidCrystal.HUE);
+    this.setTooltip(Blockly.Msg.ARD_LIQUIDCRYSTAL_SET_CURSOR_TIP);
+    this.setHelpUrl('https://www.arduino.cc/en/Reference/LiquidCrystal');
+  }
+};

blockly/generators/arduino.js

@@ -73,7 +73,8 @@ Blockly.Arduino.PinTypes = {
   STEPPER: 'STEPPER',
   SERIAL: 'SERIAL',
   I2C: 'I2C/TWI',
-  SPI: 'SPI'
+  SPI: 'SPI',
+  LCD: 'LCD'
 };
 
 /**

blockly/generators/arduino/io.js

@@ -13,6 +13,32 @@ goog.provide('Blockly.Arduino.IO');
 
 goog.require('Blockly.Arduino');
 
+Blockly.Arduino['io_input_pullup'] = function(block) {
+  var pin = block.getFieldValue('PIN');
+  var stateOutput = block.getFieldValue('STATE');
+
+  if(stateOutput =='OUTPUT')
+  {
+    Blockly.Arduino.reservePin(
+      block, pin, Blockly.Arduino.PinTypes.OUTPUT, 'Digital Write');
+  }
+
+  else if(stateOutput =='INPUT')
+  {
+    Blockly.Arduino.reservePin(
+      block, pin, Blockly.Arduino.PinTypes.INPUT, 'Digital Read');
+  }
+  else if(stateOutput == 'INPUT_PULLUP')
+  {
+    Blockly.Arduino.reservePin(
+      block, pin, Blockly.Arduino.PinTypes.INPUT, 'Digital Read');
+  }
+
+    var pinSetupCode = 'pinMode(' + pin + ','+stateOutput+');';
+    Blockly.Arduino.addSetup('io_' + pin, pinSetupCode, false);
+
+  return '';
+};
 
 /**
  * Function for 'set pin' (X) to a state (Y).

blockly/generators/arduino/liquidcrystal.js

@@ -0,0 +1,85 @@
+'use strict';
+
+goog.provide('Blockly.Arduino.LiquidCrystal');
+
+goog.require('Blockly.Arduino');
+
+Blockly.Arduino['liquidcrystal_config'] = function(block) {
+
+  var pinType = Blockly.Arduino.PinTypes.LCD;
+
+  var rs = block.getFieldValue('LCD_RS');
+  var en = block.getFieldValue('LCD_EN');
+  var d4 = block.getFieldValue('LCD_D4');
+  var d5 = block.getFieldValue('LCD_D5');
+  var d6 = block.getFieldValue('LCD_D6');
+  var d7 = block.getFieldValue('LCD_D7');
+
+  var lcdName = block.getFieldValue("liquidcrystal_name");
+
+  var lcdRows = Blockly.Arduino.valueToCode(block, 'LCD_ROW',
+      Blockly.Arduino.ORDER_ATOMIC) || '2';
+  var lcdColumns = Blockly.Arduino.valueToCode(block, 'LCD_COLUMN',
+      Blockly.Arduino.ORDER_ATOMIC) || '16';
+
+  Blockly.Arduino.reservePin(block, rs, pinType, 'LCD');
+  Blockly.Arduino.reservePin(block, en, pinType, 'LCD');
+  Blockly.Arduino.reservePin(block, d4, pinType, 'LCD');
+  Blockly.Arduino.reservePin(block, d5, pinType, 'LCD');
+  Blockly.Arduino.reservePin(block, d6, pinType, 'LCD');
+  Blockly.Arduino.reservePin(block, d7, pinType, 'LCD');
+
+  Blockly.Arduino.addInclude('lcd', '#include <LiquidCrystal.h>');
+
+  var globalCode = 'LiquidCrystal ' + lcdName + '(' + rs + ', ' + en + ', ' + d4 + ', '  + d5 + ', ' + d6 + ', '  + d7 + ');';
+  Blockly.Arduino.addDeclaration(lcdName, globalCode);
+
+  var setupCode = lcdName + '.begin(' + lcdColumns + ',' + lcdRows + ');';
+  Blockly.Arduino.addSetup(lcdName, setupCode, true);
+
+  return '';
+}
+
+Blockly.Arduino['liquidcrystal_variable'] = function(block) {
+  var code = block.getFieldValue("liquidcrystal_name");
+  return [code, Blockly.Arduino.ORDER_ATOMIC];
+}
+
+Blockly.Arduino['liquidcrystal_clear'] = function(block) {
+  var lcdName = Blockly.Arduino.valueToCode(
+      block, 'LCD_NAME', Blockly.Arduino.ORDER_ATOMIC) || Blockly.Msg.ARD_LIQUIDCRYSTAL_DEFAULT_NAME;
+  var code = lcdName+'.clear();\n';
+  return code;
+}
+
+Blockly.Arduino['liquidcrystal_print'] = function(block) {
+  var lcdName = Blockly.Arduino.valueToCode(
+      block, 'LCD_NAME', Blockly.Arduino.ORDER_ATOMIC) || Blockly.Msg.ARD_LIQUIDCRYSTAL_DEFAULT_NAME;
+  var content = Blockly.Arduino.valueToCode(
+      block, 'CONTENT', Blockly.Arduino.ORDER_ATOMIC) || '0';
+  var checkbox_name = (block.getFieldValue('NEW_LINE') == 'TRUE');
+
+  if (checkbox_name) {
+    var code = lcdName + '.println(' + content + ');\n';
+  } else {
+    var code = lcdName + '.print(' + content + ');\n';
+  }
+  return code;
+};
+
+Blockly.Arduino['liquidcrystal_set_cursor'] = function(block) {
+
+  var pinType = Blockly.Arduino.PinTypes.LCD;
+
+  var lcdName = Blockly.Arduino.valueToCode(
+      block, 'LCD_NAME', Blockly.Arduino.ORDER_ATOMIC) || Blockly.Msg.ARD_LIQUIDCRYSTAL_DEFAULT_NAME;
+
+  var lcdRows = Blockly.Arduino.valueToCode(block, 'LCD_ROW',
+      Blockly.Arduino.ORDER_ATOMIC) || '0';
+  var lcdColumns = Blockly.Arduino.valueToCode(block, 'LCD_COLUMN',
+      Blockly.Arduino.ORDER_ATOMIC) || '0';
+
+  var code = lcdName + '.setCursor(' + lcdColumns + ',' + lcdRows + ');\n';
+
+  return code;
+}

blockly/msg/js/en.js

@@ -510,3 +510,18 @@ Blockly.Msg.NEW_INSTANCE = "New instance...";
 Blockly.Msg.NEW_INSTANCE_TITLE = "New instance name:";
 Blockly.Msg.RENAME_INSTANCE = "Rename instance...";
 Blockly.Msg.RENAME_INSTANCE_TITLE = "Rename all '%1' instances to:";
+Blockly.Msg.ARD_LIQUIDCRYSTAL_CONFIG = 'Setup LCD';
+Blockly.Msg.ARD_LIQUIDCRYSTAL_DEFAULT_NAME = 'LCD';
+Blockly.Msg.ARD_LIQUIDCRYSTAL_DEFAULT_TIP = 'Configures the LCD pinout and other settings.';
+Blockly.Msg.ARD_PULLUP_TIP = 'Sets pin # into Pull Up mode';
+Blockly.Msg.ARD_PULLUP = 'INPUT_PULLUP';
+Blockly.Msg.ARD_LIQUIDCRYSTAL_PRINT_TIP = 'Prints data to display.';
+Blockly.Msg.ARD_LIQUIDCRYSTAL_PRINT_ON_DISPLAY = 'on display: ';
+Blockly.Msg.ARD_LIQUIDCRYSTAL_CLEAR_DISPLAY = 'Clear display: ';
+Blockly.Msg.ARD_LIQUIDCRYSTAL_CLEAR_DISPLAY_TIP = 'Clears the display';
+Blockly.Msg.ARD_LIQUIDCRYSTAL_SET_CURSOR = 'Set cursor on display: ';
+Blockly.Msg.ARD_LIQUIDCRYSTAL_SET_CURSOR_TIP = 'Sets the position of the cursor';
+Blockly.Msg.ARD_SET_PIN = 'Set pin#';
+Blockly.Msg.ARD_MODE_TO = 'mode to';
+Blockly.Msg.ARD_INPUT = 'INPUT';
+Blockly.Msg.ARD_OUTPUT = 'OUTPUT';