fixes for fingerprint and array blocks

Author: Matthew Matz

src/main/webapp/cdn/blockly/generators/propc/sensors.js

@@ -367,12 +367,12 @@ Blockly.Blocks.fp_scanner_add = {
         this.setColour(colorPalette.getColor('input'));
         this.appendDummyInput()
                 .appendField("Fingerprint Scanner")
-                .appendField(new Blockly.FieldDropdown([["add", "ADD"], ["delete", "DEL"], ["delete all users", "ALL"]], function (action) {
+                .appendField(new Blockly.FieldDropdown([["capture and save to", "ADD"], ["delete capture for", "DEL"], ["delete all captures", "ALL"]], function (action) {
                     this.sourceBlock_.setAction_({"ACTION": action});
                 }), "ACTION");
         this.appendValueInput("USER")
                 .setCheck("Number")
-                .appendField("user");
+                .appendField("ID");
         this.setInputsInline(true);
         this.setPreviousStatement(true, null);
         this.setNextStatement(true, null);
@@ -393,7 +393,7 @@ Blockly.Blocks.fp_scanner_add = {
             if (!inputIs) {
                 this.appendValueInput("USER")
                         .setCheck("Number")
-                        .appendField("user");
+                        .appendField("ID");
             }
         } else {
             if (inputIs)
@@ -431,7 +431,7 @@ Blockly.Blocks.fp_scanner_scan = {
         this.setColour(colorPalette.getColor('input'));
         this.appendDummyInput()
                 .appendField("Fingerprint Scanner")
-                .appendField(new Blockly.FieldDropdown([["scan", "SCAN"], ["scan and compare", "COMP"], ["count users", "COUNT"]], function (action) {
+                .appendField(new Blockly.FieldDropdown([["scan and identify", "SCAN"], ["scan and compare", "COMP"], ["count number of IDs", "COUNT"]], function (action) {
                     this.sourceBlock_.setAction_({"ACTION": action});
                 }), "ACTION");
         this.setInputsInline(true);
@@ -453,7 +453,7 @@ Blockly.Blocks.fp_scanner_scan = {
             if (!inputIs) {
                 this.appendValueInput("USER")
                         .setCheck("Number")
-                        .appendField("to user");
+                        .appendField("to ID");
             }
         } else {
             if (inputIs)
@@ -484,7 +484,7 @@ Blockly.propc.fp_scanner_scan = function () {
             code = 'fingerScanner(' + usr + ')';
         }
         if (act === 'COUNT')
-            code = 'fingerScanner(fpScan)';
+            code = 'fingerprint_countUsers(fpScan)';
     }
     //code = 'toast';
     return [code, Blockly.propc.ORDER_ATOMIC];

src/main/webapp/cdn/blockly/generators/propc/variables.js

@@ -255,12 +255,14 @@ Blockly.propc.array_fill = function () {
     varName = varName.replace(" ", "_");
     varName = varName.replace(/\W/g, "");
     var varVals = this.getFieldValue('NUM');
+    
     varVals = varVals.replace(/[^0-9,-\.]/g, "");
     varVals = varVals.replace(/,\./g, ",0.");
     varVals = varVals.replace(/\b\.[0-9-]+,\b/g, ",");
     varVals = varVals.replace(/\.[0-9],/g, ",");
     varVals = varVals.replace(/,,/g, ",0,");
     varVals = varVals.replace(/,\s*$/, "");
+    varVals = varVals.split(".")[0];
     var noCommas = varVals.replace(/,/g, "");
 
     var elements = varVals.length - noCommas.length + 1;

src/main/webapp/cdn/blockly/language/en/_messages.js

@@ -345,9 +345,9 @@ Blockly.MSG_XBEE_RECEIVE_TOOLTIP = "XBee receive: receives information from an X
 Blockly.MSG_WS2812B_INIT_TOOLTIP = "RGB-LED init: match to Propeller I/O pin connections and number of LEDs.";
 Blockly.MSG_WS2812B_SET_TOOLTIP = "RGB-LED set: specify color for a specific LED.";
 Blockly.MSG_WS2812B_UPDATE_TOOLTIP = "RGB-LED update: update colors of all connected RGB-LEDs.";
-Blockly.MSG_FPS_INIT_TOOLTIP = "Fingerprint scanner initialize: match to Propeller I/O pin connections and set to allow/prevent fingerprint overwriting.";
-Blockly.MSG_FPS_ADD_TOOLTIP = "Fingerprint scanner add: Add or delete a user or users and their fingerprint(s).";
-Blockly.MSG_FPS_SCAN_TOOLTIP = "Fingerprint scanner scan: Scan or scan and compare a fingerprint, or count the number of saved users.";
+Blockly.MSG_FPS_INIT_TOOLTIP = "Fingerprint scanner initialize: match to Propeller I/O pin connections.";
+Blockly.MSG_FPS_ADD_TOOLTIP = "Fingerprint scanner capture: capture and save or delete a capture or captures and their ID(s).";
+Blockly.MSG_FPS_SCAN_TOOLTIP = "Fingerprint scanner scan: scan and identify or scan and compare a fingerprint, or count the number of saved captures.";
 Blockly.MSG_HMC5883L_INIT_TOOLTIP = "Compass initialize: match to Propeller I/O pin connections.";
 Blockly.MSG_HMC5883L_READ_TOOLTIP = "Compass heading: get current heading in degrees.";
 Blockly.MSG_JOYSTICK_INPUT_XAXIS_TOOLTIP = "Joystick x-axis: gets horizontal position of Joystick, match to A/D socket.";