Merge pull request #316 from parallaxinc/patch-develop-311

Patch develop 311

Author: pjewald

index.html

@@ -156,7 +156,7 @@ <h4 class="modal-title w-100" id="licenseLabel">BlocklyProp Solo License</h4>
                             <li><a onclick="showLicense()">License</a></li>
                             <li>
                                 <a href="http://www.parallax.com" target="_blank">
-                                v1.4.2.3 Parallax &copy; 2015 - <span id="footer_copyright"></span></a>
+                                v1.4.2.4 Parallax &copy; 2015 - <span id="footer_copyright"></span></a>
                             </li>
                         </ul>
                     </div>

src/blockly/generators/propc/sensors.js

@@ -1082,21 +1082,21 @@ Blockly.Blocks.lis3dh_init = {
                 .appendField(
                     new Blockly.FieldNumber(
                         '0',
-                        -500,
-                        500,
+                        null,
+                        null,
                         1
                     ),"VSS_VOLTAGE")
                 .appendField(' 3.3V ')
                 .appendField(
                     new Blockly.FieldNumber(
                         '0',
-                        2700,
-                        3800,
+                        null,
+                        null,
                         1
                     ), "VDD_VOLTAGE");
 
             this.setFieldValue(vssVoltField || '0', 'VSS_VOLTAGE');
-            this.setFieldValue(vddVoltField || '3300', 'VDD_VOLTAGE');
+            this.setFieldValue(vddVoltField || '0', 'VDD_VOLTAGE');
 
             // Move this input field to the bottom of the init block
             this.moveInputBefore('VOLT_CALIBRATE', null);
@@ -1176,7 +1176,14 @@ Blockly.propc.lis3dh_init = function () {
             var vddVoltField = this.getFieldValue('VDD_VOLTAGE');
 
             if ((vssVoltField !== undefined) && (vddVoltField !== undefined)) {
-                setupCode += 'lis3dh_adcCal_mV(lis3dh_sensor, 0, 3300, ' + vssVoltField + ', ' + vddVoltField + ');';
+                setupCode += 'lis3dh_adcCal_mV(lis3dh_sensor, ';
+
+                if (vssVoltField === 0 && vddVoltField === 0) {
+                    setupCode += '0, 0, 0, 0 );';
+                }
+                else {
+                    setupCode += '0, 3300, ' + vssVoltField + ', ' + vddVoltField + ');';
+                }
             }
         }