From 18a908b249ad405dd7d18259b7b0c6bbcddfe7c4 Mon Sep 17 00:00:00 2001 From: Jim Ewald Date: Thu, 20 Oct 2016 08:16:19 -0700 Subject: [PATCH] Updates from MMatz --- .../generators/propc/hackable_electronic_badge.js | 13 +++++++++---- .../webapp/cdn/blockly/generators/propc/rfid.js | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/cdn/blockly/generators/propc/hackable_electronic_badge.js b/src/main/webapp/cdn/blockly/generators/propc/hackable_electronic_badge.js index 162fe14e..62e1f399 100644 --- a/src/main/webapp/cdn/blockly/generators/propc/hackable_electronic_badge.js +++ b/src/main/webapp/cdn/blockly/generators/propc/hackable_electronic_badge.js @@ -463,7 +463,7 @@ Blockly.Blocks.heb_badge_was_shaken = { this.appendDummyInput() .appendField("Accelerometer was shaken?"); - this.setOutput(true, 'Boolean'); + this.setOutput(true, 'Number'); this.setPreviousStatement(false, null); this.setNextStatement(false, null); } @@ -482,11 +482,11 @@ Blockly.Blocks.heb_touchpad_status = { this.setColour(colorPalette.getColor('heb')); this.appendDummyInput() .appendField("Touchpad is") - .appendField(new Blockly.FieldDropdown([["0 - P27", "0"], ["1 - P26", "1"], ["2 - P25", "2"], ["3 - P15", "3"], ["4 - P16", "4"], ["5 - P17", "5"], ["6 - Center Button", "6"]]), "TOUCHPAD") + .appendField(new Blockly.FieldDropdown([["0 - P27", "0"], ["1 - P26", "1"], ["2 - P25", "2"], ["3 - P15", "3"], ["4 - P16", "4"], ["5 - P17", "5"], ["6 - Center Button", "6"], ["Any button", "-1"]]), "TOUCHPAD") .appendField("pressed?"); this.setPreviousStatement(false, null); this.setNextStatement(false, null); - this.setOutput(true, 'Boolean'); + this.setOutput(true, 'Number'); } }; @@ -496,6 +496,11 @@ Blockly.propc.heb_touchpad_status = function () { Blockly.propc.definitions_["badgetools"] = '#include "badgetools.h"'; Blockly.propc.setups_["badgetools"] = 'badge_setup();'; - var code = 'button(' + touchpad + ')'; + var code = ''; + if(touchpad === "-1") { + code += 'buttons()'; + } else { + code += 'button(' + touchpad + ')'; + } return [code, Blockly.propc.ORDER_NONE]; }; diff --git a/src/main/webapp/cdn/blockly/generators/propc/rfid.js b/src/main/webapp/cdn/blockly/generators/propc/rfid.js index c1dcc1d4..68ac5cde 100644 --- a/src/main/webapp/cdn/blockly/generators/propc/rfid.js +++ b/src/main/webapp/cdn/blockly/generators/propc/rfid.js @@ -107,7 +107,7 @@ Blockly.propc.rfid_get = function() { }; Blockly.propc.rfid_disable = function() { - var data = Blockly.propc.valueToCode(this, 'ACTION', Blockly.propc.ORDER_ATOMIC) || ''; + var data = this.getFieldValue('ACTION'); Blockly.propc.definitions_["rfidser"] = '#include "rfidser.h"'; if(data === "ENABLE") {