Merge pull request #534 from parallaxinc/release-1.5.7

Release 1.5.7

Author: pjewald

package-lock.json

@@ -27,7 +27,7 @@
   },
   "homepage": "https://github.com/parallaxinc/solo#readme",
   "dependencies": {
-    "@sentry/browser": "^5.25.0",
+    "@sentry/browser": "^5.29.2",
     "ace-builds": "^1.4.8",
     "blockly": "^2.20190722.1",
     "bootbox": "^5.4.0",

package.json

@@ -399,6 +399,12 @@ Blockly.propc.addReservedWords(
     'ws2812_set,ws2812_start,ws2812_stop,ws2812_wheel,ws2812_wheel_dim,' +
     'ws2812b_open,ws2812b_start');
 
+/**
+ * SD File reserved words
+ */
+Blockly.propc.addReservedWords(
+    'fp,fclose,fopen,fread,fseek,ftell,fwrite,sd_init,sd_mount,');
+
 /**
  * Order of operation ENUMs.
  *

src/modules/blockly/generators/propc.js

@@ -836,23 +836,23 @@ Blockly.propc.console_print_multiple = function() {
       orIt = '0';
     }
 
+    // Get the resulting code from Blockly core
+    const result = Blockly.propc.valueToCode(
+        this, 'PRINT' + i, Blockly.propc.ORDER_NONE) || orIt;
+
     if (!this.getFieldValue('TYPE' + i).includes('float point  divide by')) {
-      varList += ', ' + (Blockly.propc.valueToCode(
-          this,
-          'PRINT' + i,
-          Blockly.propc.ORDER_NONE).replace(/%/g, '%%') || orIt);
+      varList += ', ' + result;
     } else {
-      varList += ', ((float) ' + (Blockly.propc.valueToCode(
-          this,
-          'PRINT' + i,
-          Blockly.propc.ORDER_NONE) || orIt) +
-                    ') / ' + this.getFieldValue('DIV' + i) + '.0';
+      varList += ', ((float) ' + result + ') / ' +
+          this.getFieldValue('DIV' + i) + '.0';
     }
     i++;
   }
+
   if (this.getFieldValue('ck_nl') === 'TRUE') {
     code += '\\r';
   }
+
   code += '"' + varList + ');\n';
 
   // TODO: Replace .getAllBlocks() with getAllBlocksByType()
@@ -1527,46 +1527,60 @@ Blockly.Blocks.serial_receive_text = {
   onchange: Blockly.Blocks['serial_send_text'].onchange,
 };
 
+
 /**
  * Serial Receive Text code generator
  * @return {string}
+ * @description Generate C source code to scan data from a serial port input.
  */
 Blockly.propc.serial_receive_text = function() {
   let p = '';
+
+  /* Is a serial pin defined? */
   if (this.ser_pins.length > 0) {
-    p = this.ser_pins[0].replace(',', '_').replace(/None/g, 'N');
+    p = this.ser_pins[0]
+        .replace(',', '_') // Replace commas with underscores
+        .replace(/None/g, 'N'); // Replace 'None' with 'N' in all occurrences.
   }
+
+  /* Get serial pins in use */
   if (this.getInput('SERPIN')) {
     p = this.getFieldValue('SER_PIN')
         .replace(',', '_')
         .replace(/None/g, 'N');
   }
-  const allBlocks = Blockly.getMainWorkspace().getAllBlocks().toString();
-  if (allBlocks.indexOf('Serial initialize') === -1) {
+
+  if (! Blockly.getMainWorkspace()
+      .getBlocksByType('Serial initialize', false)) {
     return '// ERROR: Serial is not initialized!\n';
   } else {
-    const data = Blockly.propc.variableDB_.getName(
-        this.getFieldValue('VALUE'),
-        Blockly.VARIABLE_CATEGORY_NAME);
+    const data = Blockly.propc.variableDB_
+        .getName(this.getFieldValue('VALUE'), Blockly.VARIABLE_CATEGORY_NAME);
 
-    const type = this.getFieldValue('TYPE');
+    switch (this.getFieldValue('TYPE')) {
+      case 'BYTE':
+        return data + ' = fdserial_rxChar(fdser' + p + ');\n';
 
-    if (type === 'BYTE') {
-      return data + ' = fdserial_rxChar(fdser' + p + ');\n';
-    } else if (type === 'INT') {
-      return 'dscan(fdser' + p + ', "%d", &' + data + ');\n';
-    } else if (type === 'BIN') {
-      return 'dscan(fdser' + p + ', "%b", &' + data + ');\n';
-    } else if (type === 'HEX') {
-      return 'dscan(fdser' + p + ', "%x", &' + data + ');\n';
-    } else {
-      Blockly.propc.vartype_[data] = 'char *';
+      case 'INT':
+        return 'dscan(fdser' + p + ', "%d", &' + data + ');\n';
+
+      case 'BIN':
+        return 'dscan(fdser' + p + ', "%b", &' + data + ');\n';
+
+      case 'HEX':
+        return 'dscan(fdser' + p + ', "%x", &' + data + ');\n';
 
-      return 'dscan(fdser' + p + ', "%s", ' + data + ');\n';
+      case 'TEXT':
+      default:
+        Blockly.propc.vartype_[data] = 'char *';
     }
+
+    // This will return a string up to the first whitespace character.
+    return 'dscan(fdser' + p + ', "%s", ' + data + ');\n';
   }
 };
 
+
 /**
  * Serial Status block definition
  * @type {{