Merge pull request #640 from zfi/demo

Changes from MattM

Author: zfi

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

@@ -46,7 +46,7 @@ Blockly.Blocks.ab_volt_out = {
         this.setColour(colorPalette.getColor('io'));
         this.appendDummyInput()
                 .appendField("DAC channel")
-                .appendField(new Blockly.FieldDropdown([["0", "0"], ["1", "1"]]), "CHANNEL");
+                .appendField(new Blockly.FieldDropdown([["0", "0"], ["1", "1"]]), "CHANNEL")
                 .appendField("output (0-3.3V)");
                 this.appendValueInput("VALUE")
                 .setCheck('Number')

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

@@ -34,9 +34,9 @@ Blockly.Blocks.i2c_new_bus = {
         this.appendDummyInput()
                 .appendField("SDA")
                 .appendField(new Blockly.FieldDropdown(profile.default.digital), "SDA_PIN");
-        this.appendDummyInput()
-                .appendField("SCL Drive mode")
-                .appendField(new Blockly.FieldDropdown(profile.default.digital), "SCL_DRIVE");
+ //       this.appendDummyInput()
+ //               .appendField("SCL Drive mode")
+ //               .appendField(new Blockly.FieldDropdown(profile.default.digital), "SCL_DRIVE");
 
         this.setInputsInline(true);
         this.setPreviousStatement(true, null);
@@ -82,7 +82,7 @@ Blockly.Blocks.i2c_out = {
 Blockly.propc.i2c_new_bus = function () {
     var scl_pin = this.getFieldValue('SCL_PIN');
     var sda_pin = this.getFieldValue('SDA_PIN');
-    var scl_drive = this.getFieldValue('SCL_DRIVE') || '0';
+    var scl_drive = '0';
 
     Blockly.propc.setups_["i2c_newbus"] = 'i2cBusUD = i2c_newbus(' + scl_pin + ', ' + sda_pin + ', ' + scl_drive + ');\n';