Added additional Sphero SPRK+ Blocks

Added general message display blocks to show an countdown or any other user specific text on the screen.

Author: MarkusBordihn

package-lock.json

@@ -15,7 +15,7 @@
     "eslint": "^4.19.1",
     "eslint-config-google": "^0.9.1",
     "http-server": "latest",
-    "jasmine-core": "latest",
+    "jasmine-core": "^3.2.0",
     "jsdoc": "^3.5.5",
     "karma": "^2.0.5",
     "karma-chrome-launcher": "latest",

package.json

@@ -81,9 +81,18 @@
 /**
  * Blockly default display blocks.
  */
-{template .defaultDisplayBlocks}
-  <category name="{msg desc="Display Blocks"}Display{/msg}" colour="120">
+{template .defaultMessengerBlocks}
+  <category name="{msg desc="Display Blocks"}Control{/msg}" colour="120">
+    <block type="general_messenger_delay">
+      <value name="time">
+        <block type="math_number">
+          <field name="NUM">5</field>
+        </block>
+      </value>
+    </block>
+  </category>
 
+  <category name="{msg desc="Display Blocks"}Display{/msg}" colour="120">
     <block type="general_messenger_display_text">
       <value name="text">
         <block type="text">
@@ -129,6 +138,9 @@
       </next>
     </block>
 
+    <block type="general_messenger_display_clear">
+    </block>
+
   </category>
 {/template}
 

src/blocks/blocks.soy

@@ -19,6 +19,25 @@
  */
 
 
+/**
+ * Delay actions.
+ */
+Blockly.Blocks['general_messenger_delay'] = {
+  init: function() {
+    this.setHelpUrl('');
+    this.setColour(260);
+    this.appendDummyInput()
+      .appendField(Blockly.BlocksTemplate.point())
+      .appendField(i18t('wait ('))
+      .appendField(new Blockly.FieldTextInput('2'), 'time')
+      .appendField('sec)');
+    this.setPreviousStatement(true);
+    this.setNextStatement(true);
+    this.setTooltip(i18t('Delay actions for the given seconds'));
+  },
+};
+
+
 /**
  * Display text on local screen.
  */
@@ -35,3 +54,20 @@ Blockly.Blocks['general_messenger_display_text'] = {
     this.setHelpUrl('');
   },
 };
+
+
+/**
+ * Clear displayed text on local screen.
+ */
+Blockly.Blocks['general_messenger_display_clear'] = {
+  init: function() {
+    this.setColour(150);
+    this.appendDummyInput()
+      .appendField(Blockly.BlocksTemplate.addCircle())
+      .appendField(i18t('clear display'));
+    this.setPreviousStatement(true);
+    this.setNextStatement(true);
+    this.setTooltip('');
+    this.setHelpUrl('');
+  },
+};

src/blocks/general/messenger/blocks.js

@@ -19,6 +19,17 @@
  */
 
 
+/**
+ * Delay actions.
+ * @param {!Blockly.block} block
+ * @return {string}
+ */
+Blockly.JavaScript['general_messenger_delay'] = function(block) {
+  let time = block.getFieldValue('time') * 1000;
+  return 'cwcMessengerCommand.delay(' + time + ');\n';
+};
+
+
 /**
  * Display text on local screen.
  * @param {!Blockly.block} block
@@ -29,3 +40,12 @@ Blockly.JavaScript['general_messenger_display_text'] = function(block) {
     block, 'text', Blockly.JavaScript.ORDER_ATOMIC) || '';
   return 'cwcMessengerDisplay.displayText(String(' + value_text + '));\n';
 };
+
+
+/**
+ * Clear displayed text on local screen.
+ * @return {string}
+ */
+Blockly.JavaScript['general_messenger_display_clear'] = function() {
+  return 'cwcMessengerDisplay.clear();\n';
+};

src/blocks/general/messenger/javascript.js

@@ -45,7 +45,7 @@
 
     <sep></sep>
 
-    {call cwc.soy.Blocks.defaultDisplayBlocks /}
+    {call cwc.soy.Blocks.defaultMessengerBlocks /}
 
     <sep></sep>
 

src/blocks/lego/wedo2/toolbox.soy

@@ -24,6 +24,7 @@
  */
 Blockly.Blocks['sphero_start'] = {
   init: function() {
+    this.setDeletable(false);
     this.setHelpUrl('');
     this.setColour(65);
     this.appendDummyInput()