diff --git a/blockly_compressed.js b/blockly_compressed.js index 26d17b3b07c..a129c3f022a 100644 --- a/blockly_compressed.js +++ b/blockly_compressed.js @@ -1939,15 +1939,15 @@ Blockly.Msg.XSTART="start of X axis";Blockly.Msg.XTICK="distance between X ticks Blockly.Msg.ACTION_LEDBAR=Blockly.Msg.LEDBAR;Blockly.Msg.KEY_GETSAMPLE_TOOLTIP=Blockly.Msg.KEY_ISPRESSED_TOOLTIP;Blockly.Msg.SENSOR_INFRARED_GETSAMPLE_TOOLTIP=Blockly.Msg.INFRARED_GETSAMPLE_TOOLTIP;Blockly.Msg.SENSOR_PINTOUCH_PRESSED_GETSAMPLE_TOOLTIP=Blockly.Msg.PIN_ISTOUCHED_TOOLTIP;Blockly.Msg.HTCOLOUR_GETSAMPLE_TOOLTIP=Blockly.Msg.COLOUR_GETSAMPLE_TOOLTIP;Blockly.Msg.SENSOR_HUMIDITY_TEMPERATURE_GETSAMPLE_TOOLTIP=Blockly.Msg.TEMPERATURE_GETSAMPLE_TOOLTIP;Blockly.Msg.MODE_DOWN=Blockly.Msg.SENSOR_GESTURE_DOWN; Blockly.Msg.SENSOR_COLOUR_RGB_GETSAMPLE_TOOLTIP=Blockly.Msg.COLOUR_RGB_GETSAMPLE_TOOLTIP;Blockly.Msg.SENSOR_ULTRASONIC_GETSAMPLE_TOOLTIP=Blockly.Msg.ULTRASONIC_GETSAMPLE_TOOLTIP;Blockly.Msg.MODE_UP=Blockly.Msg.SENSOR_GESTURE_UP;Blockly.Msg.LISTS_CREATE_WITH_ITEM_TITLE=Blockly.Msg.VARIABLES_DEFAULT_NAME;Blockly.Msg.SENSOR_HTCOLOUR_COLOUR_GETSAMPLE_TOOLTIP=Blockly.Msg.SENSOR_COLOUR_COLOUR_GETSAMPLE_TOOLTIP;Blockly.Msg.SENSOR_ENCODER_GETSAMPLE_TOOLTIP=Blockly.Msg.ENCODER_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FACE_UP=Blockly.Msg.SENSOR_GESTURE_FACE_UP;Blockly.Msg.SENSOR_COLOUR_LIGHT_GETSAMPLE_TOOLTIP=Blockly.Msg.COLOUR_LIGHT_GETSAMPLE_TOOLTIP;Blockly.Msg.MATH_CHANGE_TITLE_ITEM=Blockly.Msg.VARIABLES_DEFAULT_NAME;Blockly.Msg.TOUCH_GETSAMPLE_TOOLTIP=Blockly.Msg.TOUCH_ISPRESSED_TOOLTIP;Blockly.Msg.CONTROLS_FOR_INPUT_DO=Blockly.Msg.CONTROLS_REPEAT_INPUT_DO;Blockly.Msg.SENSOR_COLOUR_GETSAMPLE_TOOLTIP=Blockly.Msg.COLOUR_GETSAMPLE_TOOLTIP;Blockly.Msg.CONTROLS_IF_ELSE_TITLE_ELSE=Blockly.Msg.CONTROLS_IF_MSG_ELSE; -Blockly.Msg.SENSOR_COLOUR_COLOUR_GETSAMPLE_TOOLTIP=Blockly.Msg.COLOUR_COLOUR_GETSAMPLE_TOOLTIP;Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP=Blockly.Msg.JOYSTICK_GETSAMPLE_TOOLTIP_MBOT2;Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE=Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP;Blockly.Msg.MODE_FREEFALL=Blockly.Msg.SENSOR_GESTURE_FREEFALL;Blockly.Msg.PROCEDURES_DEFRETURN_DO=Blockly.Msg.PROCEDURES_DEFNORETURN_DO;Blockly.Msg.LISTS_GET_INDEX_HELPURL=Blockly.Msg.LISTS_INDEX_OF_HELPURL; -Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP=Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP;Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST=Blockly.Msg.LISTS_INLIST;Blockly.Msg.SENSOR_HTCOLOUR_LIGHT_GETSAMPLE_TOOLTIP=Blockly.Msg.SENSOR_COLOUR_LIGHT_GETSAMPLE_TOOLTIP;Blockly.Msg.ORA_ROBOT_PUSH_RUN=Blockly.Msg.MESSAGE_EDIT_START;Blockly.Msg.LISTS_SET_INDEX_INPUT_IN_LIST=Blockly.Msg.LISTS_INLIST;Blockly.Msg.PROCEDURES_DEFRETURN_COMMENT=Blockly.Msg.PROCEDURES_DEFNORETURN_COMMENT;Blockly.Msg.MODE_FACE_DOWN=Blockly.Msg.SENSOR_GESTURE_FACE_DOWN; -Blockly.Msg.TEXT_CREATE_JOIN_ITEM_TITLE_ITEM=Blockly.Msg.VARIABLES_DEFAULT_NAME;Blockly.Msg.SENSOR_HUMIDITY_HUMIDITY_GETSAMPLE_TOOLTIP=Blockly.Msg.SENSOR_HUMIDITY_GETSAMPLE_TOOLTIP;Blockly.Msg.MODE_SHAKE=Blockly.Msg.SENSOR_GESTURE_SHAKE;Blockly.Msg.SENSOR_TEMPERATURE_TEMPERATURE_GETSAMPLE_TOOLTIP=Blockly.Msg.TEMPERATURE_GETSAMPLE_TOOLTIP;Blockly.Msg.CONTROLS_IF_MSG_THEN=Blockly.Msg.CONTROLS_REPEAT_INPUT_DO;Blockly.Msg.PROCEDURES_DEFRETURN_PROCEDURE=Blockly.Msg.PROCEDURES_DEFNORETURN_PROCEDURE; -Blockly.Msg.SENSOR_GYRO_GETSAMPLE_TOOLTIP=Blockly.Msg.GYRO_GETSAMPLE_TOOLTIP;Blockly.Msg.SENSOR_BATTERY_GETSAMPLE_TOOLTIP=Blockly.Msg.BATTERY_GETSAMPLE_TOOLTIP;Blockly.Msg.SENSOR_LIGHT_GETSAMPLE_TOOLTIP=Blockly.Msg.LIGHT_GETSAMPLE_TOOLTIP;Blockly.Msg.HTCOLOUR_AMBIENTLIGHT_GETSAMPLE_TOOLTIP=Blockly.Msg.COLOUR_AMBIENTLIGHT_GETSAMPLE_TOOLTIP;Blockly.Msg.SENSOR_COLOUR_AMBIENTLIGHT_GETSAMPLE_TOOLTIP=Blockly.Msg.COLOUR_AMBIENTLIGHT_GETSAMPLE_TOOLTIP;Blockly.Msg.CONTROLS_IF_ELSEIF_TITLE_ELSEIF=Blockly.Msg.CONTROLS_IF_MSG_ELSEIF; -Blockly.Msg.LISTS_GET_INDEX_INPUT_IN_LIST=Blockly.Msg.LISTS_INLIST;Blockly.Msg.SENSOR_QUADRGB_GETSAMPLE_TOOLTIP=Blockly.Msg.COLOUR_GETSAMPLE_TOOLTIP;Blockly.Msg.CONTROLS_FOREACH_INPUT_DO=Blockly.Msg.CONTROLS_REPEAT_INPUT_DO;Blockly.Msg.SENSOR_INFRARED_PRESENCE_GETSAMPLE_TOOLTIP=Blockly.Msg.INFRARED_PRESENCE_GETSAMPLE_TOOLTIP;Blockly.Msg.SENSOR_COMPASS_GETSAMPLE_TOOLTIP=Blockly.Msg.COMPASS_GETSAMPLE_TOOLTIP;Blockly.Msg.SENSOR_HTCOLOUR_GETSAMPLE_TOOLTIP=Blockly.Msg.SENSOR_COLOUR_GETSAMPLE_TOOLTIP; -Blockly.Msg.ACTION_LCD_MBOT2=Blockly.Msg.TOOLBOX_DISPLAY;Blockly.Msg.CONTROLS_IF_IF_TITLE_IF=Blockly.Msg.CONTROLS_IF_MSG_IF;Blockly.Msg.CONTROLS_WHILEUNTIL_INPUT_DO=Blockly.Msg.CONTROLS_REPEAT_INPUT_DO;Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP=Blockly.Msg.SOUND_GETSAMPLE_TOOLTIP;Blockly.Msg.SENSOR_FLAME_GETSAMPLE_TOOLTIP=Blockly.Msg.FLAME_GETSAMPLE_TOOLTIP;Blockly.Msg.ACTION_FOURDIGITDISPLAY=Blockly.Msg.FOURDIGITDISPLAY;Blockly.Msg.SENSOR_COLOURTCS3472_COLOUR_GETSAMPLE_TOOLTIP=Blockly.Msg.COLOUR_COLOUR_GETSAMPLE_TOOLTIP; -Blockly.Msg.SENSOR_HTCOLOUR_AMBIENTLIGHT_GETSAMPLE_TOOLTIP=Blockly.Msg.SENSOR_COLOUR_AMBIENTLIGHT_GETSAMPLE_TOOLTIP;Blockly.Msg.HTCOLOUR_COLOUR_GETSAMPLE_TOOLTIP=Blockly.Msg.COLOUR_COLOUR_GETSAMPLE_TOOLTIP;Blockly.Msg.HTCOLOUR_LIGHT_GETSAMPLE_TOOLTIP=Blockly.Msg.COLOUR_LIGHT_GETSAMPLE_TOOLTIP;Blockly.Msg.SENSOR_INFRARED_DISTANCE_GETSAMPLE_TOOLTIP=Blockly.Msg.INFRARED_DISTANCE_GETSAMPLE_TOOLTIP;Blockly.Msg.SENSOR_HTCOLOUR_RGB_GETSAMPLE_TOOLTIP=Blockly.Msg.SENSOR_COLOUR_RGB_GETSAMPLE_TOOLTIP; -Blockly.Msg.TEXT_APPEND_VARIABLE=Blockly.Msg.VARIABLES_DEFAULT_NAME;Blockly.Msg.SENSOR_KEY_GETSAMPLE_TOOLTIP=Blockly.Msg.KEY_GETSAMPLE_TOOLTIP;Blockly.Msg.SENSOR_TEMPERATURE_GETSAMPLE_TOOLTIP=Blockly.Msg.TEMPERATURE_GETSAMPLE_TOOLTIP;Blockly.Msg.SENSOR_TOUCH_GETSAMPLE_TOOLTIP=Blockly.Msg.TOUCH_GETSAMPLE_TOOLTIP;Blockly.Msg.SENSOR_COLOURTCS3472_RGB_GETSAMPLE_TOOLTIP=Blockly.Msg.COLOUR_RGB_GETSAMPLE_TOOLTIP;Blockly.Msg.SENSOR_COLOURTCS3472_LIGHT_GETSAMPLE_TOOLTIP=Blockly.Msg.COLOUR_LIGHT_GETSAMPLE_TOOLTIP; -Blockly.Msg.HTCOLOUR_RGB_GETSAMPLE_TOOLTIP=Blockly.Msg.COLOUR_RGB_GETSAMPLE_TOOLTIP;Blockly.Names=function(a,b){this.variablePrefix_=b||"";this.reservedDict_=Object.create(null);if(a)for(a=a.split(","),b=0;b invalid - if (name === '') { - block.updateSendData_(0); - return name; - } - if (!name.match(/^[a-zA-Z][a-zA-Z_$0-9]*$/)) - return null; - block.updateSendData_(0); - return name; - }, - idValidator : function(id) { - if (id === '') - return id; - if (!id.match(/^[a-fA-F0-9]{24}$/)) - return null; - return id; - }, - mutationToDom : function() { - var container = document.createElement('mutation'); - container.setAttribute('items', this.idCount_); - return container; - }, - domToMutation : function(xmlElement) { - this.idCount_ = parseInt(xmlElement.getAttribute('items'), 10); - for (var x = 2; x <= this.idCount_; x++) { - this.appendDummyInput('ADD' + x).appendField(Blockly.Msg.BRICK_PHENOMENON).appendField(new Blockly.FieldTextInput("", this.nameValidator), 'NAME' - + x).appendField(Blockly.Msg.ID).appendField(new Blockly.FieldTextInput("", this.idValidator), 'ID' + x).setAlign(Blockly.ALIGN_RIGHT); - } - if (this.idCount_ >= 2) { - this.setMutatorMinus(new Blockly.MutatorMinus(this)); - } - }, - updateShape_ : function(num) { - if (num == 1) { - if (this.idCount_ == 1) { - this.setMutatorMinus(new Blockly.MutatorMinus(this)); - } - this.idCount_++; - this.appendDummyInput('ADD' + this.idCount_).appendField(Blockly.Msg.BRICK_PHENOMENON).appendField(new Blockly.FieldTextInput( - this.findLegalName_("ID" + this.idCount_), this.nameValidator), 'NAME' + this.idCount_).appendField(Blockly.Msg.ID).appendField(new Blockly.FieldTextInput( - "", this.idValidator), 'ID' + this.idCount_).setAlign(Blockly.ALIGN_RIGHT); - } else if (num == -1) { - this.removeInput('ADD' + this.idCount_); - this.idCount_--; - } - if (this.idCount_ == 1) { - this.mutatorMinus.dispose(); - this.mutatorMinus = null; - } - this.render(); - this.updateSendData_(num); - }, - updateSendData_ : function(num) { - var container = Blockly.Workspace.getByContainer("blocklyDiv"); - if (container) { - var blocks = Blockly.Workspace.getByContainer("blocklyDiv").getAllBlocks(); - for (var x = 0; x < blocks.length; x++) { - var func = blocks[x].setPhenomena; - if (func) { - func.call(blocks[x], num, this.getPhenomena()); - } - } - } - }, - findLegalName_ : function(name) { - var that = this; - var isLegalName = function(name) { - for (var x = 0; x <= that.idCount_; x++) { - if (that.getField('NAME' + x) && that.getField('NAME' + x).getValue() === name) { - return false; - } - } - return true; - } - while (!isLegalName(name)) { - // Collision with another variable. - var r = name.match(/^(.*?)(\d+)$/); - if (!r) { - name += '2'; - } else { - name = r[1] + (parseInt(r[2], 10) + 1); - } +Blockly.Blocks["robBrick_senseBox-Brick"] = { + /** + * SenseBox brick. + * + * @constructs robBrick_senseBox-Brick' + * @memberof Block + */ + + init: function () { + this.setColour("#BBBBBB"); + this.setInputsInline(false); + this.appendDummyInput().appendField( + new Blockly.FieldLabel("senseBox", "brick_label") + ); + this.appendDummyInput() + .appendField(Blockly.Msg.BOX_ID) + .appendField(new Blockly.FieldTextInput("", this.idValidator), "BOX_ID") + .setAlign(Blockly.ALIGN_RIGHT); + this.appendDummyInput("ADD1") + .appendField(Blockly.Msg.BRICK_PHENOMENON) + .appendField( + new Blockly.FieldTextInput( + this.findLegalName_("ID1"), + this.nameValidator + ), + "NAME1" + ) + .appendField(Blockly.Msg.ID) + .appendField(new Blockly.FieldTextInput("", this.idValidator), "ID1") + .setAlign(Blockly.ALIGN_RIGHT); + this.idCount_ = 1; + this.setMutatorPlus(new Blockly.MutatorPlus(this)); + this.setTooltip(Blockly.Msg.SENSEBOXBRICK_TOOLTIP); + this.setDeletable(false); + }, + getPhenomena: function () { + var phenomena = []; + for (var x = 1; x <= this.idCount_; x++) { + phenomena.push(this.getField("NAME" + x).getValue()); + } + return phenomena; + }, + nameValidator: function (name) { + var block = this.sourceBlock_; + name = name.replace(/[\s\xa0]+/g, "").replace(/^ | $/g, ""); + // no name set -> invalid + if (name === "") { + block.updateSendData_(0); + return name; + } + if (!name.match(/^[a-zA-Z][a-zA-Z_$0-9]*$/)) return null; + block.updateSendData_(0); + return name; + }, + idValidator: function (id) { + if (id === "") return id; + if (!id.match(/^[a-fA-F0-9]{24}$/)) return null; + return id; + }, + mutationToDom: function () { + var container = document.createElement("mutation"); + container.setAttribute("items", this.idCount_); + return container; + }, + domToMutation: function (xmlElement) { + this.idCount_ = parseInt(xmlElement.getAttribute("items"), 10); + for (var x = 2; x <= this.idCount_; x++) { + this.appendDummyInput("ADD" + x) + .appendField(Blockly.Msg.BRICK_PHENOMENON) + .appendField( + new Blockly.FieldTextInput("", this.nameValidator), + "NAME" + x + ) + .appendField(Blockly.Msg.ID) + .appendField(new Blockly.FieldTextInput("", this.idValidator), "ID" + x) + .setAlign(Blockly.ALIGN_RIGHT); + } + if (this.idCount_ >= 2) { + this.setMutatorMinus(new Blockly.MutatorMinus(this)); + } + }, + updateShape_: function (num) { + if (num == 1) { + if (this.idCount_ == 1) { + this.setMutatorMinus(new Blockly.MutatorMinus(this)); + } + this.idCount_++; + this.appendDummyInput("ADD" + this.idCount_) + .appendField(Blockly.Msg.BRICK_PHENOMENON) + .appendField( + new Blockly.FieldTextInput( + this.findLegalName_("ID" + this.idCount_), + this.nameValidator + ), + "NAME" + this.idCount_ + ) + .appendField(Blockly.Msg.ID) + .appendField( + new Blockly.FieldTextInput("", this.idValidator), + "ID" + this.idCount_ + ) + .setAlign(Blockly.ALIGN_RIGHT); + } else if (num == -1) { + this.removeInput("ADD" + this.idCount_); + this.idCount_--; + } + if (this.idCount_ == 1) { + this.mutatorMinus.dispose(); + this.mutatorMinus = null; + } + this.render(); + this.updateSendData_(num); + }, + updateSendData_: function (num) { + var container = Blockly.Workspace.getByContainer("blocklyDiv"); + if (container) { + var blocks = + Blockly.Workspace.getByContainer("blocklyDiv").getAllBlocks(); + for (var x = 0; x < blocks.length; x++) { + var func = blocks[x].setPhenomena; + if (func) { + func.call(blocks[x], num, this.getPhenomena()); } - return name; - }, - onchange : function(what) { - if (what.name) { - if (!what.name.startsWith("NAME") || (what.oldValue == what.newValue)) { - return; - } - } else { - return; + } + } + }, + findLegalName_: function (name) { + var that = this; + var isLegalName = function (name) { + for (var x = 0; x <= that.idCount_; x++) { + if ( + that.getField("NAME" + x) && + that.getField("NAME" + x).getValue() === name + ) { + return false; } - this.updateSendData_(0); + } + return true; + }; + while (!isLegalName(name)) { + // Collision with another variable. + var r = name.match(/^(.*?)(\d+)$/); + if (!r) { + name += "2"; + } else { + name = r[1] + (parseInt(r[2], 10) + 1); + } } + return name; + }, + onchange: function (what) { + if (what.name) { + if (!what.name.startsWith("NAME") || what.oldValue == what.newValue) { + return; + } + } else { + return; + } + this.updateSendData_(0); + }, }; -Blockly.Blocks['robBrick_mBot-Brick'] = { - /** - * Mbot brick. - * - * @constructs robBrick_mBot-Brick' - * @memberof Block - */ - - init : function() { - this.setColour('#BBBBBB'); - this.setInputsInline(false); - var wheelDiameter = new Blockly.FieldTextInput('0', Blockly.FieldTextInput.nonnegativeNumberValidator) - var trackWidth = new Blockly.FieldTextInput('0', Blockly.FieldTextInput.nonnegativeNumberValidator) - this.appendDummyInput().appendField(new Blockly.FieldLabel(this.workspace.device.toUpperCase(), 'brick_label')); - this.appendValueInput('PORT_1').appendField('Port 1').setAlign(Blockly.ALIGN_RIGHT); - this.appendValueInput('PORT_2').appendField('Port 2').setAlign(Blockly.ALIGN_RIGHT); - this.appendValueInput('PORT_3').appendField('Port 3').setAlign(Blockly.ALIGN_RIGHT); - this.appendValueInput('PORT_4').appendField('Port 4').setAlign(Blockly.ALIGN_RIGHT); - this.appendValueInput('M1').appendField('Motor M1').setAlign(Blockly.ALIGN_RIGHT).setCheck('Actor'); - this.appendValueInput('M2').appendField('Motor M2').setAlign(Blockly.ALIGN_RIGHT).setCheck('Actor'); - this.setTooltip(Blockly.Msg.MAKEBLOCKBRICK_TOOLTIP); - this.setDeletable(false); - } +Blockly.Blocks["robBrick_mBot-Brick"] = { + /** + * Mbot brick. + * + * @constructs robBrick_mBot-Brick' + * @memberof Block + */ + + init: function () { + this.setColour("#BBBBBB"); + this.setInputsInline(false); + var wheelDiameter = new Blockly.FieldTextInput( + "0", + Blockly.FieldTextInput.nonnegativeNumberValidator + ); + var trackWidth = new Blockly.FieldTextInput( + "0", + Blockly.FieldTextInput.nonnegativeNumberValidator + ); + this.appendDummyInput().appendField( + new Blockly.FieldLabel(this.workspace.device.toUpperCase(), "brick_label") + ); + this.appendValueInput("PORT_1") + .appendField("Port 1") + .setAlign(Blockly.ALIGN_RIGHT); + this.appendValueInput("PORT_2") + .appendField("Port 2") + .setAlign(Blockly.ALIGN_RIGHT); + this.appendValueInput("PORT_3") + .appendField("Port 3") + .setAlign(Blockly.ALIGN_RIGHT); + this.appendValueInput("PORT_4") + .appendField("Port 4") + .setAlign(Blockly.ALIGN_RIGHT); + this.appendValueInput("M1") + .appendField("Motor M1") + .setAlign(Blockly.ALIGN_RIGHT) + .setCheck("Actor"); + this.appendValueInput("M2") + .appendField("Motor M2") + .setAlign(Blockly.ALIGN_RIGHT) + .setCheck("Actor"); + this.setTooltip(Blockly.Msg.MAKEBLOCKBRICK_TOOLTIP); + this.setDeletable(false); + }, }; /** * @lends Block */ -Blockly.Blocks['robBrick_ardu-Brick'] = { - /** - * botnroll brick - * - * @constructs robBrick_ardu_brick - * @memberof Block - */ - - init : function() { - this.setColour('#BBBBBB'); - this.setInputsInline(false); - this.appendDummyInput().appendField(new Blockly.FieldLabel('Bot\'n Roll', 'brick_label')); - this.appendValueInput('S1').appendField(Blockly.Msg.MOTOR_LEFT).setAlign(Blockly.ALIGN_RIGHT).setCheck('Sensor'); - this.appendValueInput('S2').appendField(Blockly.Msg.MOTOR_RIGHT).setAlign(Blockly.ALIGN_RIGHT).setCheck('Sensor'); - this.appendValueInput('MB').appendField(Blockly.Msg.MOTOR_LEFT).setAlign(Blockly.ALIGN_RIGHT).setCheck('Actor'); - this.appendValueInput('MA').appendField(Blockly.Msg.MOTOR_RIGHT).setAlign(Blockly.ALIGN_RIGHT).setCheck('Actor'); - this.appendDummyInput().appendField("Line Follower").setAlign(Blockly.ALIGN_CENTER); - this.appendValueInput('S3').appendField('0 - 7').setAlign(Blockly.ALIGN_RIGHT).setCheck('Sensor'); - this.appendValueInput('S4').setAlign(Blockly.ALIGN_RIGHT).setCheck('Sensor'); - this.appendDummyInput().appendField('Rescue Module').setAlign(Blockly.ALIGN_CENTER); - this.appendValueInput('S5').appendField(Blockly.Msg.MOTOR_LEFT).setAlign(Blockly.ALIGN_RIGHT).setCheck('Sensor'); - this.appendValueInput('S6').appendField(Blockly.Msg.CENTER).setAlign(Blockly.ALIGN_RIGHT).setCheck('Sensor'); - this.appendValueInput('S7').appendField(Blockly.Msg.MOTOR_RIGHT).setAlign(Blockly.ALIGN_RIGHT).setCheck('Sensor'); - this.appendValueInput('S8').appendField(Blockly.Msg.MOTOR_LEFT).setAlign(Blockly.ALIGN_RIGHT).setCheck('Sensor'); - this.appendValueInput('S9').appendField(Blockly.Msg.MOTOR_RIGHT).setAlign(Blockly.ALIGN_RIGHT).setCheck('Sensor'); - this.appendDummyInput().appendField("Extra 'B' Search Rescue").setAlign(Blockly.ALIGN_CENTER); - this.appendValueInput('S10').appendField(Blockly.Msg.SENSOR_SONAR).setAlign(Blockly.ALIGN_RIGHT).setCheck('Sensor'); - this.appendValueInput('MC').appendField(Blockly.Msg.MOTOR_PAN).setAlign(Blockly.ALIGN_RIGHT).setCheck('Actor'); - this.appendValueInput('MD').appendField(Blockly.Msg.MOTOR_TILT).setAlign(Blockly.ALIGN_RIGHT).setCheck('Actor'); - this.setTooltip(Blockly.Msg.ARDUBRICK_TOOLTIP); - this.setDeletable(false); - } +Blockly.Blocks["robBrick_ardu-Brick"] = { + /** + * botnroll brick + * + * @constructs robBrick_ardu_brick + * @memberof Block + */ + + init: function () { + this.setColour("#BBBBBB"); + this.setInputsInline(false); + this.appendDummyInput().appendField( + new Blockly.FieldLabel("Bot'n Roll", "brick_label") + ); + this.appendValueInput("S1") + .appendField(Blockly.Msg.MOTOR_LEFT) + .setAlign(Blockly.ALIGN_RIGHT) + .setCheck("Sensor"); + this.appendValueInput("S2") + .appendField(Blockly.Msg.MOTOR_RIGHT) + .setAlign(Blockly.ALIGN_RIGHT) + .setCheck("Sensor"); + this.appendValueInput("MB") + .appendField(Blockly.Msg.MOTOR_LEFT) + .setAlign(Blockly.ALIGN_RIGHT) + .setCheck("Actor"); + this.appendValueInput("MA") + .appendField(Blockly.Msg.MOTOR_RIGHT) + .setAlign(Blockly.ALIGN_RIGHT) + .setCheck("Actor"); + this.appendDummyInput() + .appendField("Line Follower") + .setAlign(Blockly.ALIGN_CENTER); + this.appendValueInput("S3") + .appendField("0 - 7") + .setAlign(Blockly.ALIGN_RIGHT) + .setCheck("Sensor"); + this.appendValueInput("S4") + .setAlign(Blockly.ALIGN_RIGHT) + .setCheck("Sensor"); + this.appendDummyInput() + .appendField("Rescue Module") + .setAlign(Blockly.ALIGN_CENTER); + this.appendValueInput("S5") + .appendField(Blockly.Msg.MOTOR_LEFT) + .setAlign(Blockly.ALIGN_RIGHT) + .setCheck("Sensor"); + this.appendValueInput("S6") + .appendField(Blockly.Msg.CENTER) + .setAlign(Blockly.ALIGN_RIGHT) + .setCheck("Sensor"); + this.appendValueInput("S7") + .appendField(Blockly.Msg.MOTOR_RIGHT) + .setAlign(Blockly.ALIGN_RIGHT) + .setCheck("Sensor"); + this.appendValueInput("S8") + .appendField(Blockly.Msg.MOTOR_LEFT) + .setAlign(Blockly.ALIGN_RIGHT) + .setCheck("Sensor"); + this.appendValueInput("S9") + .appendField(Blockly.Msg.MOTOR_RIGHT) + .setAlign(Blockly.ALIGN_RIGHT) + .setCheck("Sensor"); + this.appendDummyInput() + .appendField("Extra 'B' Search Rescue") + .setAlign(Blockly.ALIGN_CENTER); + this.appendValueInput("S10") + .appendField(Blockly.Msg.SENSOR_SONAR) + .setAlign(Blockly.ALIGN_RIGHT) + .setCheck("Sensor"); + this.appendValueInput("MC") + .appendField(Blockly.Msg.MOTOR_PAN) + .setAlign(Blockly.ALIGN_RIGHT) + .setCheck("Actor"); + this.appendValueInput("MD") + .appendField(Blockly.Msg.MOTOR_TILT) + .setAlign(Blockly.ALIGN_RIGHT) + .setCheck("Actor"); + this.setTooltip(Blockly.Msg.ARDUBRICK_TOOLTIP); + this.setDeletable(false); + }, }; -Blockly.Blocks['robBrick_vorwerk-Brick'] = { - /** - * vorwerk brick. - * - * @constructs robBrick_vorwerk-Brick - * @memberof Block - */ - - init : function() { - this.setColour('#BBBBBB'); - this.setInputsInline(false); - var ipAddress = new Blockly.FieldTextInput('0.0.0.0') - var port = new Blockly.FieldTextInput('22', Blockly.FieldTextInput.nonnegativeNumberValidator) - var username = new Blockly.FieldTextInput('pi') - var password = new Blockly.FieldTextInput('raspberry') - this.appendDummyInput().appendField(new Blockly.FieldLabel('Vorwerk', 'brick_label')); - this.appendDummyInput().appendField(Blockly.Msg.BRICK_IPADDRESS).appendField(ipAddress, 'IP_ADDRESS'); - this.appendDummyInput().appendField(Blockly.Msg.BRICK_PORT).appendField(port, 'PORT'); - this.appendDummyInput().appendField(Blockly.Msg.BRICK_USERNAME).appendField(username, 'USERNAME'); - this.appendDummyInput().appendField(Blockly.Msg.BRICK_PASSWORD).appendField(password, 'PASSWORD'); - this.setTooltip(Blockly.Msg.NAOBRICK_TOOLTIP); - this.setDeletable(false); - } +Blockly.Blocks["robBrick_vorwerk-Brick"] = { + /** + * vorwerk brick. + * + * @constructs robBrick_vorwerk-Brick + * @memberof Block + */ + + init: function () { + this.setColour("#BBBBBB"); + this.setInputsInline(false); + var ipAddress = new Blockly.FieldTextInput("0.0.0.0"); + var port = new Blockly.FieldTextInput( + "22", + Blockly.FieldTextInput.nonnegativeNumberValidator + ); + var username = new Blockly.FieldTextInput("pi"); + var password = new Blockly.FieldTextInput("raspberry"); + this.appendDummyInput().appendField( + new Blockly.FieldLabel("Vorwerk", "brick_label") + ); + this.appendDummyInput() + .appendField(Blockly.Msg.BRICK_IPADDRESS) + .appendField(ipAddress, "IP_ADDRESS"); + this.appendDummyInput() + .appendField(Blockly.Msg.BRICK_PORT) + .appendField(port, "PORT"); + this.appendDummyInput() + .appendField(Blockly.Msg.BRICK_USERNAME) + .appendField(username, "USERNAME"); + this.appendDummyInput() + .appendField(Blockly.Msg.BRICK_PASSWORD) + .appendField(password, "PASSWORD"); + this.setTooltip(Blockly.Msg.NAOBRICK_TOOLTIP); + this.setDeletable(false); + }, }; -Blockly.Blocks['robBrick_voltage'] = { - /** - * Represent a voltage sensor. - * - * @constructs robBrick_voltage - * @memberof Block - */ - - init : function() { - this.setColour(Blockly.CAT_SENSOR_RGB); - this.appendDummyInput().appendField(Blockly.Msg.SENSOR_BATTERY); - this.setOutput(true, 'Sensor'); - this.setTooltip(Blockly.Msg.BATTERY_GETSAMPLE_TOOLTIP); - } +Blockly.Blocks["robBrick_voltage"] = { + /** + * Represent a voltage sensor. + * + * @constructs robBrick_voltage + * @memberof Block + */ + + init: function () { + this.setColour(Blockly.CAT_SENSOR_RGB); + this.appendDummyInput().appendField(Blockly.Msg.SENSOR_BATTERY); + this.setOutput(true, "Sensor"); + this.setTooltip(Blockly.Msg.BATTERY_GETSAMPLE_TOOLTIP); + }, }; -Blockly.Blocks['robBrick_ultrasonic'] = { - /** - * Represent an ultrasonic sensor. - * - * @constructs robBrick_ultrasonic - * @memberof Block - */ - - init : function() { - this.setColour(Blockly.CAT_SENSOR_RGB); - this.appendDummyInput().appendField(Blockly.Msg.SENSOR_ULTRASONIC); - this.setOutput(true, 'Sensor'); - this.setTooltip(Blockly.Msg.ULTRASONIC_TOOLTIP); - } +Blockly.Blocks["robBrick_ultrasonic"] = { + /** + * Represent an ultrasonic sensor. + * + * @constructs robBrick_ultrasonic + * @memberof Block + */ + + init: function () { + this.setColour(Blockly.CAT_SENSOR_RGB); + this.appendDummyInput().appendField(Blockly.Msg.SENSOR_ULTRASONIC); + this.setOutput(true, "Sensor"); + this.setTooltip(Blockly.Msg.ULTRASONIC_TOOLTIP); + }, }; -Blockly.Blocks['robBrick_temperature'] = { - /** - * Represent an temperature sensor. - * - * @constructs robBrick_temperature - * @memberof Block - */ - - init : function() { - this.setColour(Blockly.CAT_SENSOR_RGB); - this.appendDummyInput().appendField(Blockly.Msg.SENSOR_TEMPERATURE); - this.setOutput(true, 'Sensor'); - this.setTooltip(Blockly.Msg.TEMPERATURE_TOOLTIP); - } +Blockly.Blocks["robBrick_temperature"] = { + /** + * Represent an temperature sensor. + * + * @constructs robBrick_temperature + * @memberof Block + */ + + init: function () { + this.setColour(Blockly.CAT_SENSOR_RGB); + this.appendDummyInput().appendField(Blockly.Msg.SENSOR_TEMPERATURE); + this.setOutput(true, "Sensor"); + this.setTooltip(Blockly.Msg.TEMPERATURE_TOOLTIP); + }, }; -Blockly.Blocks['robBrick_ultrasonic_ardu'] = { - /** - * Represent an ardu ultrasonic sensor. - * - * @constructs robBrick_ultrasonic_ardu - * @memberof Block - */ - - init : function() { - this.setColour(Blockly.CAT_SENSOR_RGB); - this.appendDummyInput().appendField(Blockly.Msg.SENSOR_ULTRASONIC).appendField(Blockly.Msg.MOTOR_LEFT + ' | ' + Blockly.Msg.CENTER + ' | ' - + Blockly.Msg.MOTOR_RIGHT); - this.setOutput(true, 'Sensor'); - this.setTooltip(Blockly.Msg.ULTRASONIC_TOOLTIP); - } +Blockly.Blocks["robBrick_ultrasonic_ardu"] = { + /** + * Represent an ardu ultrasonic sensor. + * + * @constructs robBrick_ultrasonic_ardu + * @memberof Block + */ + + init: function () { + this.setColour(Blockly.CAT_SENSOR_RGB); + this.appendDummyInput() + .appendField(Blockly.Msg.SENSOR_ULTRASONIC) + .appendField( + Blockly.Msg.MOTOR_LEFT + + " | " + + Blockly.Msg.CENTER + + " | " + + Blockly.Msg.MOTOR_RIGHT + ); + this.setOutput(true, "Sensor"); + this.setTooltip(Blockly.Msg.ULTRASONIC_TOOLTIP); + }, }; -Blockly.Blocks['robBrick_colour'] = { - /** - * Represent EV3 colour sensor. - * - * @constructs robBrick_colour - * @memberof Block - */ - init : function() { - this.setColour(Blockly.CAT_SENSOR_RGB); - this.appendDummyInput().appendField(Blockly.Msg.SENSOR_COLOUR); - this.setOutput(true, 'Sensor'); - this.setTooltip(Blockly.Msg.COLOUR_TOOLTIP); - } +Blockly.Blocks["robBrick_colour"] = { + /** + * Represent EV3 colour sensor. + * + * @constructs robBrick_colour + * @memberof Block + */ + init: function () { + this.setColour(Blockly.CAT_SENSOR_RGB); + this.appendDummyInput().appendField(Blockly.Msg.SENSOR_COLOUR); + this.setOutput(true, "Sensor"); + this.setTooltip(Blockly.Msg.COLOUR_TOOLTIP); + }, }; -Blockly.Blocks['robBrick_HiTechnic_colour'] = { - /** - * @deprecated - * Represent HiTechnic NXT Color Sensor V2. - * This is legacy code only needed for NXT. - * - * @constructs robBrick_HiTechnic_colour - * @memberof Block - */ - init : function() { - this.setColour(Blockly.CAT_SENSOR_RGB); - this.appendDummyInput().appendField('HiTechnic' + Blockly.Msg.SENSOR_COLOUR); - this.setOutput(true, 'Sensor'); - this.setTooltip(Blockly.Msg.HTCOLOUR_TOOLTIP); - } +Blockly.Blocks["robBrick_HiTechnic_colour"] = { + /** + * @deprecated + * Represent HiTechnic NXT Color Sensor V2. + * This is legacy code only needed for NXT. + * + * @constructs robBrick_HiTechnic_colour + * @memberof Block + */ + init: function () { + this.setColour(Blockly.CAT_SENSOR_RGB); + this.appendDummyInput().appendField( + "HiTechnic" + Blockly.Msg.SENSOR_COLOUR + ); + this.setOutput(true, "Sensor"); + this.setTooltip(Blockly.Msg.HTCOLOUR_TOOLTIP); + }, }; -Blockly.Blocks['robBrick_htcolour'] = { - /** - * Represent HiTechnic NXT Color Sensor V2. - * - * @constructs robBrick_htcolour - * @memberof Block - */ - init : function() { - this.setColour(Blockly.CAT_SENSOR_RGB); - this.appendDummyInput().appendField(Blockly.Msg.SENSOR_HTCOLOUR); - this.setOutput(true, 'Sensor'); - this.setTooltip(Blockly.Msg.HTCOLOUR_TOOLTIP); - } +Blockly.Blocks["robBrick_htcolour"] = { + /** + * Represent HiTechnic NXT Color Sensor V2. + * + * @constructs robBrick_htcolour + * @memberof Block + */ + init: function () { + this.setColour(Blockly.CAT_SENSOR_RGB); + this.appendDummyInput().appendField(Blockly.Msg.SENSOR_HTCOLOUR); + this.setOutput(true, "Sensor"); + this.setTooltip(Blockly.Msg.HTCOLOUR_TOOLTIP); + }, }; -Blockly.Blocks['robBrick_light'] = { - /** - * Represent a light sensor. - * - * @constructs robBrick_light - * @memberof Block - */ - init : function() { - this.setColour(Blockly.CAT_SENSOR_RGB); - this.setOutput(true, 'Sensor'); - this.appendDummyInput().appendField(Blockly.Msg.SENSOR_LIGHT); - if (this.workspace.device === 'botnroll') { - this.setTooltip(Blockly.Msg.LIGHT_ARDU_TOOLTIP); - } else { - this.setTooltip(Blockly.Msg.LIGHT_TOOLTIP); - } +Blockly.Blocks["robBrick_light"] = { + /** + * Represent a light sensor. + * + * @constructs robBrick_light + * @memberof Block + */ + init: function () { + this.setColour(Blockly.CAT_SENSOR_RGB); + this.setOutput(true, "Sensor"); + this.appendDummyInput().appendField(Blockly.Msg.SENSOR_LIGHT); + if (this.workspace.device === "botnroll") { + this.setTooltip(Blockly.Msg.LIGHT_ARDU_TOOLTIP); + } else { + this.setTooltip(Blockly.Msg.LIGHT_TOOLTIP); } + }, }; -Blockly.Blocks['robBrick_infrared'] = { - /** - * Represent an infrared sensor. - * - * @constructs robBrick_infrared - * @memberof Block - */ - - init : function() { - this.setColour(Blockly.CAT_SENSOR_RGB); - this.appendDummyInput().appendField(Blockly.Msg.SENSOR_INFRARED); - this.setOutput(true, 'Sensor'); - this.setTooltip(Blockly.Msg.INFRARED_TOOLTIP); - } +Blockly.Blocks["robBrick_infrared"] = { + /** + * Represent an infrared sensor. + * + * @constructs robBrick_infrared + * @memberof Block + */ + + init: function () { + this.setColour(Blockly.CAT_SENSOR_RGB); + this.appendDummyInput().appendField(Blockly.Msg.SENSOR_INFRARED); + this.setOutput(true, "Sensor"); + this.setTooltip(Blockly.Msg.INFRARED_TOOLTIP); + }, }; -Blockly.Blocks['robBrick_irseeker'] = { - /** - * Represent an HiTechnic IRSeeker V2 sensor. - * - * @constructs robBrick_irseeker - * @memberof Block - */ - - init : function() { - this.setColour(Blockly.CAT_SENSOR_RGB); - this.appendDummyInput().appendField(Blockly.Msg.SENSOR_IRSEEKER); - this.setOutput(true, 'Sensor'); - this.setTooltip(Blockly.Msg.IRSEEKER_TOOLTIP); - } +Blockly.Blocks["robBrick_irseeker"] = { + /** + * Represent an HiTechnic IRSeeker V2 sensor. + * + * @constructs robBrick_irseeker + * @memberof Block + */ + + init: function () { + this.setColour(Blockly.CAT_SENSOR_RGB); + this.appendDummyInput().appendField(Blockly.Msg.SENSOR_IRSEEKER); + this.setOutput(true, "Sensor"); + this.setTooltip(Blockly.Msg.IRSEEKER_TOOLTIP); + }, }; -Blockly.Blocks['robBrick_touch'] = { - /** - * Represent a touch sensor. - * - * @constructs robBrick_touch - * @this.Blockly.Block - * @returns immediately - * @returns {Boolean} - * @memberof Block - */ - - init : function() { - this.setColour(Blockly.CAT_SENSOR_RGB); - this.appendDummyInput().appendField(Blockly.Msg.SENSOR_TOUCH); - this.setOutput(true, 'Sensor'); - this.setTooltip(Blockly.Msg.TOUCH_TOOLTIP); - } +Blockly.Blocks["robBrick_touch"] = { + /** + * Represent a touch sensor. + * + * @constructs robBrick_touch + * @this.Blockly.Block + * @returns immediately + * @returns {Boolean} + * @memberof Block + */ + + init: function () { + this.setColour(Blockly.CAT_SENSOR_RGB); + this.appendDummyInput().appendField(Blockly.Msg.SENSOR_TOUCH); + this.setOutput(true, "Sensor"); + this.setTooltip(Blockly.Msg.TOUCH_TOOLTIP); + }, }; -Blockly.Blocks['robBrick_compass'] = { - /** - * Represents a compass sensor - * - * @constructs robBrick_compass - * @this.Blockly.Block - * @memberof Block - */ +Blockly.Blocks["robBrick_compass"] = { + /** + * Represents a compass sensor + * + * @constructs robBrick_compass + * @this.Blockly.Block + * @memberof Block + */ init : function() { this.setColour(Blockly.CAT_SENSOR_RGB); @@ -520,181 +654,201 @@ Blockly.Blocks['robBrick_compass'] = { } }; -Blockly.Blocks['robBrick_gyro'] = { - /** - * Represent a gyro sensor. - * - * @constructs robBrick_gyro - * @memberof Block - */ - - init : function() { - this.setColour(Blockly.CAT_SENSOR_RGB); - this.appendDummyInput().appendField(Blockly.Msg.SENSOR_GYRO); - this.setOutput(true, 'Sensor'); - this.setTooltip(Blockly.Msg.GYRO_TOOLTIP); - } +Blockly.Blocks["robBrick_gyro"] = { + /** + * Represent a gyro sensor. + * + * @constructs robBrick_gyro + * @memberof Block + */ + + init: function () { + this.setColour(Blockly.CAT_SENSOR_RGB); + this.appendDummyInput().appendField(Blockly.Msg.SENSOR_GYRO); + this.setOutput(true, "Sensor"); + this.setTooltip(Blockly.Msg.GYRO_TOOLTIP); + }, }; -Blockly.Blocks['robBrick_sound'] = { - /** - * Represent a sound sensor. - * - * @constructs robBrick_sound - * @memberof Block - */ - - init : function() { - this.setColour(Blockly.CAT_SENSOR_RGB); - this.appendDummyInput().appendField(Blockly.Msg.SENSOR_SOUND); - this.setOutput(true, 'Sensor'); - this.setTooltip(Blockly.Msg.SOUND_TOOLTIP); - this.data = 'nxt'; - } +Blockly.Blocks["robBrick_sound"] = { + /** + * Represent a sound sensor. + * + * @constructs robBrick_sound + * @memberof Block + */ + + init: function () { + this.setColour(Blockly.CAT_SENSOR_RGB); + this.appendDummyInput().appendField(Blockly.Msg.SENSOR_SOUND); + this.setOutput(true, "Sensor"); + this.setTooltip(Blockly.Msg.SOUND_TOOLTIP); + this.data = "nxt"; + }, }; -Blockly.Blocks['robBrick_joystick'] = { - /** - * Represent a joystick sensor. - * - * @constructs robBrick_joystick - * @memberof Block - */ - - init : function() { - this.setColour(Blockly.CAT_SENSOR_RGB); - this.appendDummyInput().appendField(Blockly.Msg.SENSOR_JOYSTICK); - this.setOutput(true, 'Sensor'); - this.setTooltip(Blockly.Msg.JOYSTICK_TOOLTIP); - } +Blockly.Blocks["robBrick_joystick"] = { + /** + * Represent a joystick sensor. + * + * @constructs robBrick_joystick + * @memberof Block + */ + + init: function () { + this.setColour(Blockly.CAT_SENSOR_RGB); + this.appendDummyInput().appendField(Blockly.Msg.SENSOR_JOYSTICK); + this.setOutput(true, "Sensor"); + this.setTooltip(Blockly.Msg.JOYSTICK_TOOLTIP); + }, }; -Blockly.Blocks['robBrick_accelerometer'] = { - /** - * Represent an accelerometer sensor. - * - * @constructs robBrick_accelerometer - * @memberof Block - */ - - init : function() { - this.setColour(Blockly.CAT_SENSOR_RGB); - this.appendDummyInput().appendField(Blockly.Msg.NAO_ACCELEROMETER); - this.setOutput(true, 'Sensor'); - this.setTooltip(Blockly.Msg.ACCELEROMETER_TOOLTIP); - } +Blockly.Blocks["robBrick_accelerometer"] = { + /** + * Represent an accelerometer sensor. + * + * @constructs robBrick_accelerometer + * @memberof Block + */ + + init: function () { + this.setColour(Blockly.CAT_SENSOR_RGB); + this.appendDummyInput().appendField(Blockly.Msg.NAO_ACCELEROMETER); + this.setOutput(true, "Sensor"); + this.setTooltip(Blockly.Msg.ACCELEROMETER_TOOLTIP); + }, }; -Blockly.Blocks['robBrick_flame'] = { - /** - * Represent a flame sensor. - * - * @constructs robBrick_flame - * @memberof Block - */ - - init : function() { - this.setColour(Blockly.CAT_SENSOR_RGB); - this.appendDummyInput().appendField(Blockly.Msg.SENSOR_FLAME); - this.setOutput(true, 'Sensor'); - this.setTooltip(Blockly.Msg.FLAME_TOOLTIP); - } +Blockly.Blocks["robBrick_flame"] = { + /** + * Represent a flame sensor. + * + * @constructs robBrick_flame + * @memberof Block + */ + + init: function () { + this.setColour(Blockly.CAT_SENSOR_RGB); + this.appendDummyInput().appendField(Blockly.Msg.SENSOR_FLAME); + this.setOutput(true, "Sensor"); + this.setTooltip(Blockly.Msg.FLAME_TOOLTIP); + }, }; -Blockly.Blocks['robBrick_ambientlight'] = { - /** - * Represent an ambientlight sensor. - * - * @constructs robBrick_ambientlight - * @memberof Block - */ - - init : function() { - this.setColour(Blockly.CAT_SENSOR_RGB); - this.appendDummyInput().appendField(Blockly.Msg.SENSOR_AMBIENTLIGHT); - this.setOutput(true, 'Sensor'); - this.setTooltip(Blockly.Msg.FLAME_TOOLTIP); - } +Blockly.Blocks["robBrick_ambientlight"] = { + /** + * Represent an ambientlight sensor. + * + * @constructs robBrick_ambientlight + * @memberof Block + */ + + init: function () { + this.setColour(Blockly.CAT_SENSOR_RGB); + this.appendDummyInput().appendField(Blockly.Msg.SENSOR_AMBIENTLIGHT); + this.setOutput(true, "Sensor"); + this.setTooltip(Blockly.Msg.FLAME_TOOLTIP); + }, }; -Blockly.Blocks['robBrick_motion'] = { - /** - * Represent an motion sensor. - * - * @constructs robBrick_motion - * @memberof Block - */ - - init : function() { - this.setColour(Blockly.CAT_SENSOR_RGB); - this.appendDummyInput().appendField(Blockly.Msg.SENSOR_MOTION); - this.setOutput(true, 'Sensor'); - this.setTooltip(Blockly.Msg.MOTION_TOOLTIP); - } +Blockly.Blocks["robBrick_motion"] = { + /** + * Represent an motion sensor. + * + * @constructs robBrick_motion + * @memberof Block + */ + + init: function () { + this.setColour(Blockly.CAT_SENSOR_RGB); + this.appendDummyInput().appendField(Blockly.Msg.SENSOR_MOTION); + this.setOutput(true, "Sensor"); + this.setTooltip(Blockly.Msg.MOTION_TOOLTIP); + }, }; -Blockly.Blocks['robBrick_led'] = { - /** - * Represent an external LED. - * - * @constructs robBrick_led - * @memberof Block - */ - - init : function() { - this.setColour(Blockly.CAT_ACTION_RGB); - this.appendDummyInput().appendField(Blockly.Msg.LED); - this.setOutput(true, 'Actor'); - this.setTooltip(Blockly.Msg.LED_TOOLTIP); - } +Blockly.Blocks["robBrick_led"] = { + /** + * Represent an external LED. + * + * @constructs robBrick_led + * @memberof Block + */ + + init: function () { + this.setColour(Blockly.CAT_ACTION_RGB); + this.appendDummyInput().appendField(Blockly.Msg.LED); + this.setOutput(true, "Actor"); + this.setTooltip(Blockly.Msg.LED_TOOLTIP); + }, }; -Blockly.Blocks['robBrick_led_matrix'] = { - /** - * Represent an external LED matrix. - * - * @constructs robBrick_led_matrix - * @memberof Block - */ - - init : function() { - this.setColour(Blockly.CAT_ACTION_RGB); - this.appendDummyInput().appendField(Blockly.Msg.LED_MATRIX); - this.setOutput(true, 'Actor'); - this.setTooltip(Blockly.Msg.LED_MATRIX_TOOLTIP); - } +Blockly.Blocks["robBrick_led_matrix"] = { + /** + * Represent an external LED matrix. + * + * @constructs robBrick_led_matrix + * @memberof Block + */ + + init: function () { + this.setColour(Blockly.CAT_ACTION_RGB); + this.appendDummyInput().appendField(Blockly.Msg.LED_MATRIX); + this.setOutput(true, "Actor"); + this.setTooltip(Blockly.Msg.LED_MATRIX_TOOLTIP); + }, }; -Blockly.Blocks['robBrick_motor_big'] = { - /** - * Represent a big motor. - * - * @constructs robActions_motor_big - * @memberof Block - */ - - init : function() { - this.setColour(Blockly.CAT_ACTION_RGB); - var motorRegulation = new Blockly.FieldDropdown([ [ Blockly.Msg.YES, 'TRUE' ], [ Blockly.Msg.NO, 'FALSE' ] ]); - var motorReverse = new Blockly.FieldDropdown([ [ Blockly.Msg.MOTOR_FOREWARD, 'OFF' ], [ Blockly.Msg.MOTOR_BACKWARD, 'ON' ] ]); - var motorSide = new Blockly.FieldDropdown([ [ Blockly.Msg.MOTOR_NONE, 'NONE' ], [ Blockly.Msg.MOTOR_RIGHT, 'RIGHT' ], - [ Blockly.Msg.MOTOR_LEFT, 'LEFT' ] ]); - this.appendDummyInput().appendField(Blockly.Msg.MOTOR_BIG + ' ' + Blockly.Msg.MOTOR); - this.appendDummyInput().appendField(Blockly.Msg.MOTOR_REGULATION).appendField(motorRegulation, 'MOTOR_REGULATION').setAlign(Blockly.ALIGN_RIGHT); - this.appendDummyInput().appendField(Blockly.Msg.MOTOR_ROTATION_REVERSE).appendField(motorReverse, 'MOTOR_REVERSE').setAlign(Blockly.ALIGN_RIGHT); - this.appendDummyInput().appendField(Blockly.Msg.MOTOR_SIDE).appendField(motorSide, 'MOTOR_DRIVE').setAlign(Blockly.ALIGN_RIGHT); - this.setOutput(true, 'Actor'); - this.setTooltip(Blockly.Msg.MOTOR_BIG_TOOLTIP); - } +Blockly.Blocks["robBrick_motor_big"] = { + /** + * Represent a big motor. + * + * @constructs robActions_motor_big + * @memberof Block + */ + + init: function () { + this.setColour(Blockly.CAT_ACTION_RGB); + var motorRegulation = new Blockly.FieldDropdown([ + [Blockly.Msg.YES, "TRUE"], + [Blockly.Msg.NO, "FALSE"], + ]); + var motorReverse = new Blockly.FieldDropdown([ + [Blockly.Msg.MOTOR_FOREWARD, "OFF"], + [Blockly.Msg.MOTOR_BACKWARD, "ON"], + ]); + var motorSide = new Blockly.FieldDropdown([ + [Blockly.Msg.MOTOR_NONE, "NONE"], + [Blockly.Msg.MOTOR_RIGHT, "RIGHT"], + [Blockly.Msg.MOTOR_LEFT, "LEFT"], + ]); + this.appendDummyInput().appendField( + Blockly.Msg.MOTOR_BIG + " " + Blockly.Msg.MOTOR + ); + this.appendDummyInput() + .appendField(Blockly.Msg.MOTOR_REGULATION) + .appendField(motorRegulation, "MOTOR_REGULATION") + .setAlign(Blockly.ALIGN_RIGHT); + this.appendDummyInput() + .appendField(Blockly.Msg.MOTOR_ROTATION_REVERSE) + .appendField(motorReverse, "MOTOR_REVERSE") + .setAlign(Blockly.ALIGN_RIGHT); + this.appendDummyInput() + .appendField(Blockly.Msg.MOTOR_SIDE) + .appendField(motorSide, "MOTOR_DRIVE") + .setAlign(Blockly.ALIGN_RIGHT); + this.setOutput(true, "Actor"); + this.setTooltip(Blockly.Msg.MOTOR_BIG_TOOLTIP); + }, }; -Blockly.Blocks['robBrick_motor_geared'] = { - /** - * Represent a geared motor. - * - * @constructs robBrick_motor_geared - * @memberof Block - */ +Blockly.Blocks["robBrick_motor_geared"] = { + /** + * Represent a geared motor. + * + * @constructs robBrick_motor_geared + * @memberof Block + */ init : function() { this.setColour(Blockly.CAT_ACTION_RGB); @@ -702,8 +856,10 @@ Blockly.Blocks['robBrick_motor_geared'] = { this.appendDummyInput().appendField(Blockly.Msg.GEARED_MOTOR); this.appendDummyInput().appendField(Blockly.Msg.MOTOR_SIDE).appendField(motorSide, 'MOTOR_DRIVE').setAlign(Blockly.ALIGN_RIGHT); this.setOutput(true, 'Actor'); + this.setTooltip(Blockly.Msg.MOTOR_GEARED_TOOLTIP); } }; + Blockly.Blocks['robBrick_led_matrix'] = { /** * Represent an led matrix. @@ -712,77 +868,91 @@ Blockly.Blocks['robBrick_led_matrix'] = { * @memberof Block */ - init : function() { - this.setColour(Blockly.CAT_ACTION_RGB); - this.appendDummyInput().appendField(Blockly.Msg.LED_MATRIX || "LED_MATRIX"); - this.setOutput(true, 'Actor'); - this.setTooltip(Blockly.Msg.LED_MATRIX_TOOLTIP || "LED_MATRIX_TOOLTIP"); - } + init: function () { + this.setColour(Blockly.CAT_ACTION_RGB); + this.appendDummyInput().appendField(Blockly.Msg.LED_MATRIX || "LED_MATRIX"); + this.setOutput(true, "Actor"); + this.setTooltip(Blockly.Msg.LED_MATRIX_TOOLTIP || "LED_MATRIX_TOOLTIP"); + }, }; -Blockly.Blocks['robBrick_motor_middle'] = { - /** - * Represents a middle motor. - * - * @constructs robActions_motor_middle - * @memberof Block - */ - - init : function() { - this.setColour(Blockly.CAT_ACTION_RGB); - var motorRegulation = new Blockly.FieldDropdown([ [ Blockly.Msg.YES, 'TRUE' ], [ Blockly.Msg.NO, 'FALSE' ] ]); - var motorReverse = new Blockly.FieldDropdown([ [ Blockly.Msg.MOTOR_FOREWARD, 'OFF' ], [ Blockly.Msg.MOTOR_BACKWARD, 'ON' ] ]); - if (this.workspace.device === 'botnroll') { - this.appendDummyInput().appendField(Blockly.Msg.MOTOR); - } else { - this.appendDummyInput().appendField(Blockly.Msg.MOTOR_MIDDLE + ' ' + Blockly.Msg.MOTOR); - } - this.appendDummyInput().appendField(Blockly.Msg.MOTOR_REGULATION).appendField(motorRegulation, 'MOTOR_REGULATION').setAlign(Blockly.ALIGN_RIGHT); - this.appendDummyInput().appendField(Blockly.Msg.MOTOR_ROTATION_REVERSE).appendField(motorReverse, 'MOTOR_REVERSE').setAlign(Blockly.ALIGN_RIGHT); - this.setOutput(true, 'Actor'); - this.setTooltip(Blockly.Msg.MOTOR_MIDDLE_TOOLTIP); +Blockly.Blocks["robBrick_motor_middle"] = { + /** + * Represents a middle motor. + * + * @constructs robActions_motor_middle + * @memberof Block + */ + + init: function () { + this.setColour(Blockly.CAT_ACTION_RGB); + var motorRegulation = new Blockly.FieldDropdown([ + [Blockly.Msg.YES, "TRUE"], + [Blockly.Msg.NO, "FALSE"], + ]); + var motorReverse = new Blockly.FieldDropdown([ + [Blockly.Msg.MOTOR_FOREWARD, "OFF"], + [Blockly.Msg.MOTOR_BACKWARD, "ON"], + ]); + if (this.workspace.device === "botnroll") { + this.appendDummyInput().appendField(Blockly.Msg.MOTOR); + } else { + this.appendDummyInput().appendField( + Blockly.Msg.MOTOR_MIDDLE + " " + Blockly.Msg.MOTOR + ); } + this.appendDummyInput() + .appendField(Blockly.Msg.MOTOR_REGULATION) + .appendField(motorRegulation, "MOTOR_REGULATION") + .setAlign(Blockly.ALIGN_RIGHT); + this.appendDummyInput() + .appendField(Blockly.Msg.MOTOR_ROTATION_REVERSE) + .appendField(motorReverse, "MOTOR_REVERSE") + .setAlign(Blockly.ALIGN_RIGHT); + this.setOutput(true, "Actor"); + this.setTooltip(Blockly.Msg.MOTOR_MIDDLE_TOOLTIP); + }, }; -Blockly.Blocks['robBrick_motor_ardu'] = { - /** - * Represents a middle motor. - * - * @constructs robActions_motor_middle - * @memberof Block - */ - - init : function() { - this.setColour(Blockly.CAT_ACTION_RGB); - this.appendDummyInput().appendField(Blockly.Msg.MOTOR); - this.setOutput(true, 'Actor'); - this.setTooltip(Blockly.Msg.MOTOR_ARDU_TOOLTIP); - } +Blockly.Blocks["robBrick_motor_ardu"] = { + /** + * Represents a middle motor. + * + * @constructs robActions_motor_middle + * @memberof Block + */ + + init: function () { + this.setColour(Blockly.CAT_ACTION_RGB); + this.appendDummyInput().appendField(Blockly.Msg.MOTOR); + this.setOutput(true, "Actor"); + this.setTooltip(Blockly.Msg.MOTOR_ARDU_TOOLTIP); + }, }; -Blockly.Blocks['robBrick_actor'] = { - /** - * Represent any actor. - * - * @constructs robActions_motor_on - * @this.Blockly.Block - * @returns immediately - * @memberof Block - */ - - init : function() { - this.setColour(Blockly.CAT_ACTION_RGB); - this.appendDummyInput('ACTOR').appendField(Blockly.Msg.MOTOR_OTHER); - this.setOutput(true, 'Actor'); - this.setTooltip(Blockly.Msg.ACTOR_TOOLTIP); - } +Blockly.Blocks["robBrick_actor"] = { + /** + * Represent any actor. + * + * @constructs robActions_motor_on + * @this.Blockly.Block + * @returns immediately + * @memberof Block + */ + + init: function () { + this.setColour(Blockly.CAT_ACTION_RGB); + this.appendDummyInput("ACTOR").appendField(Blockly.Msg.MOTOR_OTHER); + this.setOutput(true, "Actor"); + this.setTooltip(Blockly.Msg.ACTOR_TOOLTIP); + }, }; Blockly.Blocks['robConf_mbuild_port'] = { init: function () { this.setColour(Blockly.CAT_SENSOR_RGB); this.title = 'MBUILD'; - var nameField = new Blockly.FieldTextInput(Blockly.RobConfig.findLegalName("_M", this),validateName); + var nameField = new Blockly.FieldTextInput(Blockly.RobConfig.findLegalName("_M", this),validateName); nameField.setVisible(false); this.appendDummyInput().appendField("mBuild "+ Blockly.Msg.BRICK_PORT, 'MBuild').appendField(nameField, 'NAME'); this.appendStatementInput('MBUILDSENSOR'); diff --git a/blocks/robColour.js b/blocks/robColour.js index c793e6904e6..d9054981cd4 100644 --- a/blocks/robColour.js +++ b/blocks/robColour.js @@ -45,6 +45,7 @@ Blockly.Blocks['robColour_picker'] = { case 'botnroll': case 'ev3': case 'xNN': + case 'orb': colorField.setColours([ '#000000', '#0057A6', '#00642E', '#532115', '#585858', '#B30006', '#F7D117', '#FFFFFF' ]).setColumns(8); break; case 'wedo': diff --git a/blocks/robConfig.js b/blocks/robConfig.js index f5672e2d4b5..43e44958736 100644 --- a/blocks/robConfig.js +++ b/blocks/robConfig.js @@ -111,7 +111,7 @@ Blockly.Blocks['robConf_generic'] = { for (var i = 0; i < confBlock.inputs.length; i++) { var textFieldName = confBlock.inputs[i][0]; var textField = new Blockly.FieldTextInput(confBlock.inputs[i][1]); - this.appendDummyInput().setAlign(Blockly.ALIGN_RIGHT).appendField(Blockly.Msg[confBlock.inputs[i][0]]).appendField(textField, textFieldName); + this.appendDummyInput().setAlign(Blockly.ALIGN_RIGHT).appendField(Blockly.Msg[textFieldName]).appendField(textField, textFieldName); } } if (confBlock.dropdowns) { diff --git a/blocks/robConfigDefinitions.js b/blocks/robConfigDefinitions.js index 2c81eef53e0..8ac25b2c85c 100644 --- a/blocks/robConfigDefinitions.js +++ b/blocks/robConfigDefinitions.js @@ -254,6 +254,25 @@ Blockly.Blocks.robConfigDefinitions['pinsRaspberrypi'] = function() { return array; }; +Blockly.Blocks.robConfigDefinitions['pinsOrbMotor'] = function() { + var array = createPins(1, 4, 'M'); + return array; +}; + +Blockly.Blocks.robConfigDefinitions['pinsOrbSensor'] = function() { + var array = createPins(1, 4, 'S'); + return array; +}; + +confBlocks.colour = {}; +confBlocks.colour.orb = { + title: 'COLOUR', + ports: [['CONNECTOR', 'CONNECTOR']], + pins: Blockly.Blocks.robConfigDefinitions['pinsOrbSensor'], + action: false, + sensor: true, + standardPins: ['S4'] +}; confBlocks.ultrasonic = {}; confBlocks.ultrasonic.arduino = { @@ -284,6 +303,15 @@ confBlocks.ultrasonic.calliope = { }, sensor: true }; + +confBlocks.ultrasonic.orb = { + title: 'ULTRASONIC', + ports: [['CONNECTOR', 'CONNECTOR']], + pins: Blockly.Blocks.robConfigDefinitions['pinsOrbSensor'], + sensor: true, + standardPins: ['S3'] +}; + confBlocks.ultrasonic.sensebox = { title: 'ULTRASONIC', ports: [ @@ -512,6 +540,15 @@ confBlocks.infrared.wedo = { pins: Blockly.Blocks.robConfigDefinitions['pins_wedo'], sensor: true }; + +confBlocks.infrared.orb = { + title: 'INFRARED', + ports: [['CONNECTOR', 'CONNECTOR']], + pins: Blockly.Blocks.robConfigDefinitions['pinsOrbSensor'], + sensor: true, + standardPins: ['S1'] +}; + confBlocks.infrared.arduino = { title: 'INFRARED', ports: [ @@ -728,6 +765,13 @@ confBlocks.touch.robotino = { }; +confBlocks.touch.orb = { + title: 'TOUCH', + ports: [['CONNECTOR', 'CONNECTOR']], + pins: Blockly.Blocks.robConfigDefinitions['pinsOrbSensor'], + sensor: true +}; + confBlocks.drop = {}; confBlocks.drop.arduino = { title: 'DROP', @@ -1278,6 +1322,15 @@ confBlocks.gyro.calliope = { sensor: true, inbuilt: true }; + +confBlocks.gyro.orb = { + title: 'GYRO', + ports: [['CONNECTOR', 'CONNECTOR']], + pins: Blockly.Blocks.robConfigDefinitions['pinsOrbSensor'], + sensor: true, + standardPins: ['S2'] +}; + confBlocks.gyro.sensebox = { title: 'GYRO', sensor: true @@ -1350,6 +1403,31 @@ confBlocks.motor.raspberrypi = { ] }; +confBlocks.motor.orb = { + title: 'MOTOR', + ports: [['MOTOR', 'MOTOR']], + pins: Blockly.Blocks.robConfigDefinitions['pinsOrbMotor'], + action: true +}; + +confBlocks.differentialdrive = {}; +confBlocks.differentialdrive.orb = { + title: 'DIFFERENTIALDRIVE', + inputs: [ + ['BRICK_WHEEL_DIAMETER', '5.6'], + ['BRICK_TRACK_WIDTH', '22.8'] + ], + ports: [ + ['MOTOR_LEFT', 'MOTOR_L'], + ['MOTOR_RIGHT', 'MOTOR_R'] + ], + pins: Blockly.Blocks.robConfigDefinitions['pinsOrbMotor'], + sensor: false, + inbuilt: true, + action: true, + standardPins: ['M2', 'M3'] +}; + confBlocks.encoder = {}; confBlocks.encoder.mbot2 = { title: 'ENCODER', @@ -1397,6 +1475,7 @@ confBlocks.digitalout.sensebox = { sensor: true }; confBlocks.digitalout.robotino = confBlocks.digitalout.sensebox; +confBlocks.digitalout.sensebox = confBlocks.digitalout.arduino; confBlocks.digitalout.calliope = { title: 'DIGITALOUT', ports: [ diff --git a/blocks/robSensorDefinitions.js b/blocks/robSensorDefinitions.js index 6d6e82e940b..1bbd8258a3b 100644 --- a/blocks/robSensorDefinitions.js +++ b/blocks/robSensorDefinitions.js @@ -148,6 +148,34 @@ sensors.colour.nxt = { }], standardPort: '3' }; +sensors.colour.orb = { + title: 'COLOUR', + ports: 'CONFIGURATION', + modes: [ + { + name: 'COLOUR', + type: 'Colour', + value: '#b30006' + }, + { + name: 'LIGHT', + type: 'Number', + unit: 'PERCENT', + value: 50 + }, + { + name: 'AMBIENTLIGHT', + type: 'Number', + unit: 'PERCENT', + value: 50 + }, + { + name: 'RGB', + type: 'Array_Number' + } + ] +}; + sensors.compass = {}; sensors.compass.botnroll = { title: 'COMPASS', modes: [{ @@ -268,6 +296,32 @@ sensors.encoder.nxt = { }], ports: [['A', 'A'], ['B', 'B'], ['C', 'C']], standardPort: 'B' }; +sensors.encoder.orb = { + title: 'MOTOR', //soll "ENCODER" + modes: [ + { + name: 'DEGREE', + type: 'Number', + unit: 'DEGREE', + op: 'NUM_REV', + value: 180 + }, + { + name: 'ROTATION', + type: 'Number', + unit: '', + op: 'NUM_REV', + value: 2 + }, + { + name: 'DISTANCE', + type: 'Number', + unit: 'CM' + } + ], + ports: 'CONFIGURATION' +}; + sensors.electriccurrent = {}; sensors.electriccurrent.nao = { title: 'ELECTRICCURRENT', modes: [{ @@ -367,6 +421,26 @@ sensors.gyro.wedo = { ports: 'CONFIGURATION' }; +sensors.gyro.orb = { + title: 'GYRO', + ports: 'CONFIGURATION', + modes: [ + { + name: 'ANGLE', + type: 'Number', + unit: 'DEGREE', + op: 'NUM_REV', + value: 90 + }, + { + name: 'RATE', + type: 'Number', + unit: 'OMEGA', + op: 'NUM_REV', + value: 90 + } + ] +}; sensors.gyro.sensebox = { title: 'GYRO', modes: [{ name: 'X', type: 'Number', unit: 'DEGREE' @@ -491,6 +565,22 @@ sensors.infrared.edison = { }] }; +sensors.infrared.orb = { + title: 'INFRARED', + ports: 'CONFIGURATION', + modes: [ + { + name: 'DISTANCE', + type: 'Number', + unit: 'CM' + }, + { + name: 'PRESENCE', + type: 'Array_Number' + } + ] +}; + sensors.infrared.thymio = { title: 'INFRARED', modes: [{ name: 'LINE', type: 'Number', op: 'NUM_EQ', value: 1 @@ -602,7 +692,7 @@ sensors.key.wedo = { name: 'PRESSED', type: 'Boolean', question: true }], ports: 'CONFIGURATION' }; - +sensors.key.orb = sensors.key.wedo; sensors.key.edison = { title: 'KEY', modes: [{ name: 'PRESSED', type: 'Boolean', question: true @@ -902,6 +992,7 @@ sensors.timer.festobionic = sensors.timer.ev3; sensors.timer.festobionicflower = sensors.timer.ev3; sensors.timer.mbot = sensors.timer.ev3; sensors.timer.mbot2 = sensors.timer.ev3; +sensors.timer.orb = sensors.timer.ev3; sensors.timer.sensebox = sensors.timer.ev3; sensors.timer.robotino = sensors.timer.ev3; @@ -926,6 +1017,17 @@ sensors.touch.nao = { }] }; +sensors.touch.orb = { + title: 'TOUCH', + ports: 'CONFIGURATION', + modes: [ + { + name: 'PRESSED', + type: 'Boolean', + question: true + } + ] +}; sensors.touch.vorwerk = { title: 'TOUCH', modes: [{ name: 'PRESSED', type: 'Boolean', question: true @@ -985,6 +1087,22 @@ sensors.ultrasonic.nxt = { name: 'DISTANCE', type: 'Number', unit: 'CM' }], standardPort: '4' }; + +sensors.ultrasonic.orb = { + title: 'ULTRASONIC', + ports: 'CONFIGURATION', + modes: [ + { + name: 'DISTANCE', + type: 'Number', + unit: 'CM' + }, + { + name: 'PRESENCE', + type: 'Boolean' + } + ] +}; sensors.ultrasonic.vorwerk = { title: 'ULTRASONIC', modes: [{ @@ -1092,6 +1210,7 @@ sensorsAll.nano33ble = [sensors.out.nano33ble, sensors.key.nano33ble, sensors.ti sensorsAll.rob3rta = [sensors.pintouch.rob3rta, sensors.infrared.rob3rta, sensors.temperature.rob3rta, sensors.timer.rob3rta]; sensorsAll.thymio = [sensors.key.thymio, sensors.infrared.thymio, sensors.irhorizontal.thymio, sensors.tap.thymio, sensors.sound.thymio, sensors.timer.thymio, sensors.accelerometer.thymio, sensors.temperature.thymio]; sensorsAll.robotino = [sensors.touch.robotino, sensors.infrared.robotino, sensors.odometry.robotino, sensors.timer.robotino, sensors.detectmark.robotino, sensors.out.robotino, sensors.camera.robotino]; +sensorsAll.orb = [sensors.touch.orb, sensors.ultrasonic.orb, sensors.colour.orb, sensors.infrared.orb, sensors.encoder.orb, sensors.key.orb, sensors.gyro.orb, sensors.timer.orb]; function initSensors() { for (var sensor in sensors) { diff --git a/blocks/robSensors.js b/blocks/robSensors.js index 2bb62ac8b67..6b8a711f2db 100644 --- a/blocks/robSensors.js +++ b/blocks/robSensors.js @@ -28,6 +28,9 @@ Blockly.Blocks['robSensors_encoder_reset'] = { init: function() { this.setColour(Blockly.CAT_SENSOR_RGB); var motorport = new Blockly.FieldDropdown([['A', 'A'], ['B', 'B'], ['C', 'C'], ['D', 'D']]); + if (this.workspace.device === "orb") { + motorport = getConfigPorts("motor"); + } if (this.workspace.device === 'botnroll') { motorport = new Blockly.FieldDropdown([[Blockly.Msg.MOTOR_LEFT, 'B'], [Blockly.Msg.MOTOR_RIGHT, 'C']]); } else if (this.workspace.device === 'mbot2') { @@ -145,7 +148,7 @@ Blockly.Blocks['robSensors_timer_reset'] = { init: function() { this.setColour(Blockly.CAT_SENSOR_RGB); var sensorNum; - if (this.workspace.device === 'nxt' || this.workspace.device === 'botnroll' || this.workspace.device === 'bob3' || this.workspace.device === 'wedo' || this.workspace.device === 'rob3rta' || this.workspace.device === 'thymio') { + if (this.workspace.device === 'nxt' || this.workspace.device === 'botnroll' || this.workspace.device === 'bob3' || this.workspace.device === 'wedo' || this.workspace.device === 'rob3rta' || this.workspace.device === 'thymio' || this.workspace.device === 'orb') { sensorNum = new Blockly.FieldDropdown([[Blockly.Msg.SENSOR_TIMER + ' 1', '1']]); } else { sensorNum = new Blockly.FieldDropdown([[Blockly.Msg.SENSOR_TIMER + ' 1', '1'], [Blockly.Msg.SENSOR_TIMER + ' 2', '2'], diff --git a/core/constants.js b/core/constants.js index f95b878852d..e73a8b85c88 100644 --- a/core/constants.js +++ b/core/constants.js @@ -356,6 +356,7 @@ Blockly.TYPE_DROPDOWN = function(device, opt_handler) { case 'ev3': case 'nxt': case 'xNN': + case 'orb': return new Blockly.FieldDropdown([[Blockly.Msg.VARIABLES_TYPE_NUMBER, 'Number'], [Blockly.Msg.VARIABLES_TYPE_BOOLEAN, 'Boolean'], [Blockly.Msg.VARIABLES_TYPE_STRING, 'String'], [Blockly.Msg.VARIABLES_TYPE_COLOUR, 'Colour'], [Blockly.Msg.VARIABLES_TYPE_CONNECTION, 'Connection'], [Blockly.Msg.VARIABLES_TYPE_ARRAY_NUMBER, 'Array_Number'], @@ -445,6 +446,7 @@ Blockly.LIST_TYPE_DROPDOWN = function(device) { case 'ev3': case 'nxt': case 'xNN': + case 'orb': return new Blockly.FieldDropdown([[Blockly.Msg.VARIABLES_TYPE_NUMBER, 'Number'], [Blockly.Msg.VARIABLES_TYPE_BOOLEAN, 'Boolean'], [Blockly.Msg.VARIABLES_TYPE_STRING, 'String'], [Blockly.Msg.VARIABLES_TYPE_COLOUR, 'Colour'], [Blockly.Msg.VARIABLES_TYPE_CONNECTION, 'Connection']], function(option) { diff --git a/msg/js/ar.js b/msg/js/ar.js index 418ff0471e1..1fc887b4db9 100644 --- a/msg/js/ar.js +++ b/msg/js/ar.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/az.js b/msg/js/az.js index 9d03bb6e687..151c41abf0d 100644 --- a/msg/js/az.js +++ b/msg/js/az.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/ba.js b/msg/js/ba.js index 694c23db17a..04e83427f22 100644 --- a/msg/js/ba.js +++ b/msg/js/ba.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/bcc.js b/msg/js/bcc.js index ca63f3a6ccf..7a53901bb8b 100644 --- a/msg/js/bcc.js +++ b/msg/js/bcc.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/be-tarask.js b/msg/js/be-tarask.js index 4be693caabd..a645b5728d2 100644 --- a/msg/js/be-tarask.js +++ b/msg/js/be-tarask.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/be.js b/msg/js/be.js index 3fb083dfc68..d3f5f862404 100644 --- a/msg/js/be.js +++ b/msg/js/be.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/bg.js b/msg/js/bg.js index 563451622fe..bf788aea3b5 100644 --- a/msg/js/bg.js +++ b/msg/js/bg.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/bn.js b/msg/js/bn.js index 2a59abd3a62..f785f12678e 100644 --- a/msg/js/bn.js +++ b/msg/js/bn.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/br.js b/msg/js/br.js index cf77c5ec83e..21e137ee968 100644 --- a/msg/js/br.js +++ b/msg/js/br.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/ca.js b/msg/js/ca.js index 318b6323e5a..1ebb639e57b 100644 --- a/msg/js/ca.js +++ b/msg/js/ca.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/cs.js b/msg/js/cs.js index 9b643a9a391..c46e5d98b87 100644 --- a/msg/js/cs.js +++ b/msg/js/cs.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/da.js b/msg/js/da.js index 0c461a208c7..b782f999cc7 100644 --- a/msg/js/da.js +++ b/msg/js/da.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/de.js b/msg/js/de.js index 3909935bb3b..0e4aadd5460 100644 --- a/msg/js/de.js +++ b/msg/js/de.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/el.js b/msg/js/el.js index 28919329fba..43786a30b61 100644 --- a/msg/js/el.js +++ b/msg/js/el.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/en.js b/msg/js/en.js index 2ca7af6567c..384202d51d9 100644 --- a/msg/js/en.js +++ b/msg/js/en.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/es.js b/msg/js/es.js index 9c515916930..4182361d653 100644 --- a/msg/js/es.js +++ b/msg/js/es.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/eu.js b/msg/js/eu.js index 99b97a66f16..ef4105602e5 100644 --- a/msg/js/eu.js +++ b/msg/js/eu.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/fa.js b/msg/js/fa.js index b7d316d023e..c0fa4fd598d 100644 --- a/msg/js/fa.js +++ b/msg/js/fa.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/fi.js b/msg/js/fi.js index fba70f78cf0..9ba8e32aae1 100644 --- a/msg/js/fi.js +++ b/msg/js/fi.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/fr.js b/msg/js/fr.js index dc7ce317d6c..c53863667dd 100644 --- a/msg/js/fr.js +++ b/msg/js/fr.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/he.js b/msg/js/he.js index de1d7bc6b76..e40aed4615a 100644 --- a/msg/js/he.js +++ b/msg/js/he.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/hi.js b/msg/js/hi.js index 8859ebfe578..1653274e09c 100644 --- a/msg/js/hi.js +++ b/msg/js/hi.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/hrx.js b/msg/js/hrx.js index eb58abef9d1..b22faff8bb9 100644 --- a/msg/js/hrx.js +++ b/msg/js/hrx.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/hu.js b/msg/js/hu.js index ee860601d62..859e53fe5ba 100644 --- a/msg/js/hu.js +++ b/msg/js/hu.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/ia.js b/msg/js/ia.js index e048bdb376d..a4ba175f8d2 100644 --- a/msg/js/ia.js +++ b/msg/js/ia.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/id.js b/msg/js/id.js index 79b0efc9fd2..34de529a8e8 100644 --- a/msg/js/id.js +++ b/msg/js/id.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/is.js b/msg/js/is.js index af31a865dab..7066c107e1d 100644 --- a/msg/js/is.js +++ b/msg/js/is.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/it.js b/msg/js/it.js index 16fd7618e81..1978345553e 100644 --- a/msg/js/it.js +++ b/msg/js/it.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/ja.js b/msg/js/ja.js index 72f124e9afc..c1b9bec745c 100644 --- a/msg/js/ja.js +++ b/msg/js/ja.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/ko.js b/msg/js/ko.js index 42bbb45993d..b97682dfc2a 100644 --- a/msg/js/ko.js +++ b/msg/js/ko.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/lb.js b/msg/js/lb.js index 4c74d201153..9a81d72618f 100644 --- a/msg/js/lb.js +++ b/msg/js/lb.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/lki.js b/msg/js/lki.js index fb8b6cea487..1211c152ccc 100644 --- a/msg/js/lki.js +++ b/msg/js/lki.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/lrc.js b/msg/js/lrc.js index 35ff8506b1f..1f0d675a7f0 100644 --- a/msg/js/lrc.js +++ b/msg/js/lrc.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/lt.js b/msg/js/lt.js index 815abd8e5f2..a371d719ad5 100644 --- a/msg/js/lt.js +++ b/msg/js/lt.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/mk.js b/msg/js/mk.js index d7970a019b0..a07c488632b 100644 --- a/msg/js/mk.js +++ b/msg/js/mk.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/ms.js b/msg/js/ms.js index 0c752b7c21d..5fcdc72988c 100644 --- a/msg/js/ms.js +++ b/msg/js/ms.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/nb.js b/msg/js/nb.js index 83d3bde9e29..05a2884579f 100644 --- a/msg/js/nb.js +++ b/msg/js/nb.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/nl.js b/msg/js/nl.js index 352cde933b1..ce1c06fe7b8 100644 --- a/msg/js/nl.js +++ b/msg/js/nl.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/oc.js b/msg/js/oc.js index 1541b7cb5b1..88813fc27fa 100644 --- a/msg/js/oc.js +++ b/msg/js/oc.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/pl.js b/msg/js/pl.js index 7fb365c5479..31bcfcdf98d 100644 --- a/msg/js/pl.js +++ b/msg/js/pl.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/pms.js b/msg/js/pms.js index e6e273a61c3..3abfc60b3f1 100644 --- a/msg/js/pms.js +++ b/msg/js/pms.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/pt-br.js b/msg/js/pt-br.js index 8528bc1af8d..46f15dd8248 100644 --- a/msg/js/pt-br.js +++ b/msg/js/pt-br.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/pt.js b/msg/js/pt.js index 51ed27ed3c7..2ec642767ca 100644 --- a/msg/js/pt.js +++ b/msg/js/pt.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/ro.js b/msg/js/ro.js index 0fb81d68c1c..d66f72ad8b0 100644 --- a/msg/js/ro.js +++ b/msg/js/ro.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/ru.js b/msg/js/ru.js index 37643c738d2..80292c76299 100644 --- a/msg/js/ru.js +++ b/msg/js/ru.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/sc.js b/msg/js/sc.js index edc8eb90f45..aa92e55162a 100644 --- a/msg/js/sc.js +++ b/msg/js/sc.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/sd.js b/msg/js/sd.js index ada90199399..b754a5dc299 100644 --- a/msg/js/sd.js +++ b/msg/js/sd.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/shn.js b/msg/js/shn.js index a96a088bb90..174ffaed1e9 100644 --- a/msg/js/shn.js +++ b/msg/js/shn.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/sk.js b/msg/js/sk.js index a4e39e36cf6..6db6bfd744a 100644 --- a/msg/js/sk.js +++ b/msg/js/sk.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/sl.js b/msg/js/sl.js index 35b0355dd5c..0a56dd25327 100644 --- a/msg/js/sl.js +++ b/msg/js/sl.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/sq.js b/msg/js/sq.js index de54ba61a09..87315663864 100644 --- a/msg/js/sq.js +++ b/msg/js/sq.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/sr.js b/msg/js/sr.js index 980995a40da..5f976c470b6 100644 --- a/msg/js/sr.js +++ b/msg/js/sr.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/sv.js b/msg/js/sv.js index ab11895d07e..0d50710cf61 100644 --- a/msg/js/sv.js +++ b/msg/js/sv.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/ta.js b/msg/js/ta.js index b7c77cf381d..50d8a85f1dc 100644 --- a/msg/js/ta.js +++ b/msg/js/ta.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/tcy.js b/msg/js/tcy.js index 5502ec138e8..3b94f1440d5 100644 --- a/msg/js/tcy.js +++ b/msg/js/tcy.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/th.js b/msg/js/th.js index 77c1d637c7f..e8a40fbf955 100644 --- a/msg/js/th.js +++ b/msg/js/th.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/tl.js b/msg/js/tl.js index d5b863d59ef..7c911528098 100644 --- a/msg/js/tl.js +++ b/msg/js/tl.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/tlh.js b/msg/js/tlh.js index fa1b4d8fe84..3f2f666cb6d 100644 --- a/msg/js/tlh.js +++ b/msg/js/tlh.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/tr.js b/msg/js/tr.js index ebd44a213d0..3e0fed40064 100644 --- a/msg/js/tr.js +++ b/msg/js/tr.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/uk.js b/msg/js/uk.js index 9b5da06cbe1..de5a6440cd9 100644 --- a/msg/js/uk.js +++ b/msg/js/uk.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/vi.js b/msg/js/vi.js index 36415d8c2dc..06f4eeea77e 100644 --- a/msg/js/vi.js +++ b/msg/js/vi.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/zh-hans.js b/msg/js/zh-hans.js index aa5c2bd958d..05f2554f6cb 100644 --- a/msg/js/zh-hans.js +++ b/msg/js/zh-hans.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/js/zh-hant.js b/msg/js/zh-hant.js index 781e9f3133e..5b60ca2aeba 100644 --- a/msg/js/zh-hant.js +++ b/msg/js/zh-hant.js @@ -1933,6 +1933,7 @@ Blockly.Msg.SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP = Blockly.Msg.JOYSTICK_GETSAMPLE_T Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE = Blockly.Msg.MICROPHONE_GETSAMPLE_TOOLTIP; Blockly.Msg.MODE_FREEFALL = Blockly.Msg.SENSOR_GESTURE_FREEFALL; Blockly.Msg.PROCEDURES_DEFRETURN_DO = Blockly.Msg.PROCEDURES_DEFNORETURN_DO; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL; Blockly.Msg.SENSOR_TIMER_GETSAMPLE_TOOLTIP = Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP; Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST; diff --git a/msg/json/en.json b/msg/json/en.json index 182950cacff..8f12a20a29b 100644 --- a/msg/json/en.json +++ b/msg/json/en.json @@ -1,7 +1,7 @@ { "@metadata": { "author": "Ellen Spertus ", - "lastupdated": "2022-10-26 14:00:53.777932", + "lastupdated": "2022-10-27 12:53:32.014993", "locale": "en", "messagedocumentation" : "qqq" }, diff --git a/msg/json/synonyms.json b/msg/json/synonyms.json index 920b9bec958..176a06d9f59 100644 --- a/msg/json/synonyms.json +++ b/msg/json/synonyms.json @@ -1 +1 @@ -{"PROCEDURES_DEFRETURN_TITLE": "PROCEDURES_DEFNORETURN_TITLE", "LISTS_GET_SUBLIST_INPUT_IN_LIST": "LISTS_INLIST", "ACTION_LEDBAR": "LEDBAR", "SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP": "JOYSTICK_GETSAMPLE_TOOLTIP_MBOT2", "LISTS_SET_INDEX_INPUT_IN_LIST": "LISTS_INLIST", "KEY_GETSAMPLE_TOOLTIP": "KEY_ISPRESSED_TOOLTIP", "PROCEDURES_DEFRETURN_PROCEDURE": "PROCEDURES_DEFNORETURN_PROCEDURE", "SENSOR_PINTOUCH_PRESSED_GETSAMPLE_TOOLTIP": "PIN_ISTOUCHED_TOOLTIP", "SENSOR_INFRARED_GETSAMPLE_TOOLTIP": "INFRARED_GETSAMPLE_TOOLTIP", "HTCOLOUR_GETSAMPLE_TOOLTIP": "COLOUR_GETSAMPLE_TOOLTIP", "SENSOR_HUMIDITY_TEMPERATURE_GETSAMPLE_TOOLTIP": "TEMPERATURE_GETSAMPLE_TOOLTIP", "SENSOR_COLOUR_RGB_GETSAMPLE_TOOLTIP": "COLOUR_RGB_GETSAMPLE_TOOLTIP", "SENSOR_ULTRASONIC_GETSAMPLE_TOOLTIP": "ULTRASONIC_GETSAMPLE_TOOLTIP", "SENSOR_TOUCH_GETSAMPLE_TOOLTIP": "TOUCH_GETSAMPLE_TOOLTIP", "MODE_UP": "SENSOR_GESTURE_UP", "LISTS_CREATE_WITH_ITEM_TITLE": "VARIABLES_DEFAULT_NAME", "SENSOR_HTCOLOUR_COLOUR_GETSAMPLE_TOOLTIP": "SENSOR_COLOUR_COLOUR_GETSAMPLE_TOOLTIP", "SENSOR_ENCODER_GETSAMPLE_TOOLTIP": "ENCODER_GETSAMPLE_TOOLTIP", "MODE_FACE_UP": "SENSOR_GESTURE_FACE_UP", "MODE_SHAKE": "SENSOR_GESTURE_SHAKE", "SENSOR_COLOUR_LIGHT_GETSAMPLE_TOOLTIP": "COLOUR_LIGHT_GETSAMPLE_TOOLTIP", "HTCOLOUR_COLOUR_GETSAMPLE_TOOLTIP": "COLOUR_COLOUR_GETSAMPLE_TOOLTIP", "SENSOR_COMPASS_GETSAMPLE_TOOLTIP": "COMPASS_GETSAMPLE_TOOLTIP", "CONTROLS_IF_ELSE_TITLE_ELSE": "CONTROLS_IF_MSG_ELSE", "SENSOR_COLOUR_GETSAMPLE_TOOLTIP": "COLOUR_GETSAMPLE_TOOLTIP", "PROCEDURES_DEFRETURN_DO": "PROCEDURES_DEFNORETURN_DO", "LISTS_GET_INDEX_HELPURL": "LISTS_INDEX_OF_HELPURL", "SENSOR_TIMER_GETSAMPLE_TOOLTIP": "TIMER_GETSAMPLE_TOOLTIP", "SENSOR_LIGHT_GETSAMPLE_TOOLTIP": "LIGHT_GETSAMPLE_TOOLTIP", "ORA_ROBOT_PUSH_RUN": "MESSAGE_EDIT_START", "SENSOR_GYRO_GETSAMPLE_TOOLTIP": "GYRO_GETSAMPLE_TOOLTIP", "PROCEDURES_DEFRETURN_COMMENT": "PROCEDURES_DEFNORETURN_COMMENT", "SENSOR_INFRARED_DISTANCE_GETSAMPLE_TOOLTIP": "INFRARED_DISTANCE_GETSAMPLE_TOOLTIP", "TOUCH_GETSAMPLE_TOOLTIP": "TOUCH_ISPRESSED_TOOLTIP", "TEXT_CREATE_JOIN_ITEM_TITLE_ITEM": "VARIABLES_DEFAULT_NAME", "SENSOR_HUMIDITY_HUMIDITY_GETSAMPLE_TOOLTIP": "SENSOR_HUMIDITY_GETSAMPLE_TOOLTIP", "CONTROLS_IF_MSG_THEN": "CONTROLS_REPEAT_INPUT_DO", "SENSOR_TEMPERATURE_TEMPERATURE_GETSAMPLE_TOOLTIP": "TEMPERATURE_GETSAMPLE_TOOLTIP", "MODE_FREEFALL": "SENSOR_GESTURE_FREEFALL", "MODE_DOWN": "SENSOR_GESTURE_DOWN", "LISTS_INDEX_OF_INPUT_IN_LIST": "LISTS_INLIST", "SENSOR_BATTERY_GETSAMPLE_TOOLTIP": "BATTERY_GETSAMPLE_TOOLTIP", "LISTS_GET_INDEX_INPUT_IN_LIST": "LISTS_INLIST", "HTCOLOUR_AMBIENTLIGHT_GETSAMPLE_TOOLTIP": "COLOUR_AMBIENTLIGHT_GETSAMPLE_TOOLTIP", "SENSOR_COLOUR_AMBIENTLIGHT_GETSAMPLE_TOOLTIP": "COLOUR_AMBIENTLIGHT_GETSAMPLE_TOOLTIP", "CONTROLS_IF_ELSEIF_TITLE_ELSEIF": "CONTROLS_IF_MSG_ELSEIF", "HTCOLOUR_LIGHT_GETSAMPLE_TOOLTIP": "COLOUR_LIGHT_GETSAMPLE_TOOLTIP", "SENSOR_QUADRGB_GETSAMPLE_TOOLTIP": "COLOUR_GETSAMPLE_TOOLTIP", "SENSOR_KEY_GETSAMPLE_TOOLTIP": "KEY_GETSAMPLE_TOOLTIP", "CONTROLS_FOREACH_INPUT_DO": "CONTROLS_REPEAT_INPUT_DO", "SENSOR_INFRARED_PRESENCE_GETSAMPLE_TOOLTIP": "INFRARED_PRESENCE_GETSAMPLE_TOOLTIP", "MODE_FACE_DOWN": "SENSOR_GESTURE_FACE_DOWN", "SENSOR_HTCOLOUR_GETSAMPLE_TOOLTIP": "SENSOR_COLOUR_GETSAMPLE_TOOLTIP", "ACTION_LCD_MBOT2": "TOOLBOX_DISPLAY", "CONTROLS_IF_IF_TITLE_IF": "CONTROLS_IF_MSG_IF", "CONTROLS_WHILEUNTIL_INPUT_DO": "CONTROLS_REPEAT_INPUT_DO", "SENSOR_SOUND_GETSAMPLE_TOOLTIP": "SOUND_GETSAMPLE_TOOLTIP", "SENSOR_FLAME_GETSAMPLE_TOOLTIP": "FLAME_GETSAMPLE_TOOLTIP", "ACTION_FOURDIGITDISPLAY": "FOURDIGITDISPLAY", "SENSOR_COLOURTCS3472_COLOUR_GETSAMPLE_TOOLTIP": "COLOUR_COLOUR_GETSAMPLE_TOOLTIP", "SENSOR_HTCOLOUR_AMBIENTLIGHT_GETSAMPLE_TOOLTIP": "SENSOR_COLOUR_AMBIENTLIGHT_GETSAMPLE_TOOLTIP", "SENSOR_COLOURTCS3472_LIGHT_GETSAMPLE_TOOLTIP": "COLOUR_LIGHT_GETSAMPLE_TOOLTIP", "SENSOR_COLOUR_COLOUR_GETSAMPLE_TOOLTIP": "COLOUR_COLOUR_GETSAMPLE_TOOLTIP", "SENSOR_HTCOLOUR_LIGHT_GETSAMPLE_TOOLTIP": "SENSOR_COLOUR_LIGHT_GETSAMPLE_TOOLTIP", "SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE": "MICROPHONE_GETSAMPLE_TOOLTIP", "SENSOR_HTCOLOUR_RGB_GETSAMPLE_TOOLTIP": "SENSOR_COLOUR_RGB_GETSAMPLE_TOOLTIP", "CONTROLS_FOR_INPUT_DO": "CONTROLS_REPEAT_INPUT_DO", "SENSOR_TEMPERATURE_GETSAMPLE_TOOLTIP": "TEMPERATURE_GETSAMPLE_TOOLTIP", "TEXT_APPEND_VARIABLE": "VARIABLES_DEFAULT_NAME", "SENSOR_COLOURTCS3472_RGB_GETSAMPLE_TOOLTIP": "COLOUR_RGB_GETSAMPLE_TOOLTIP", "MATH_CHANGE_TITLE_ITEM": "VARIABLES_DEFAULT_NAME", "HTCOLOUR_RGB_GETSAMPLE_TOOLTIP": "COLOUR_RGB_GETSAMPLE_TOOLTIP"} \ No newline at end of file +{"PROCEDURES_DEFRETURN_TITLE": "PROCEDURES_DEFNORETURN_TITLE", "LISTS_GET_SUBLIST_INPUT_IN_LIST": "LISTS_INLIST", "ACTION_LEDBAR": "LEDBAR", "SENSOR_JOYSTICK_GETSAMPLE_TOOLTIP": "JOYSTICK_GETSAMPLE_TOOLTIP_MBOT2", "LISTS_SET_INDEX_INPUT_IN_LIST": "LISTS_INLIST", "KEY_GETSAMPLE_TOOLTIP": "KEY_ISPRESSED_TOOLTIP", "PROCEDURES_DEFRETURN_PROCEDURE": "PROCEDURES_DEFNORETURN_PROCEDURE", "SENSOR_PINTOUCH_PRESSED_GETSAMPLE_TOOLTIP": "PIN_ISTOUCHED_TOOLTIP", "SENSOR_INFRARED_GETSAMPLE_TOOLTIP": "INFRARED_GETSAMPLE_TOOLTIP", "HTCOLOUR_GETSAMPLE_TOOLTIP": "COLOUR_GETSAMPLE_TOOLTIP", "SENSOR_HUMIDITY_TEMPERATURE_GETSAMPLE_TOOLTIP": "TEMPERATURE_GETSAMPLE_TOOLTIP", "SENSOR_COLOUR_RGB_GETSAMPLE_TOOLTIP": "COLOUR_RGB_GETSAMPLE_TOOLTIP", "SENSOR_ULTRASONIC_GETSAMPLE_TOOLTIP": "ULTRASONIC_GETSAMPLE_TOOLTIP", "SENSOR_TOUCH_GETSAMPLE_TOOLTIP": "TOUCH_GETSAMPLE_TOOLTIP", "MODE_UP": "SENSOR_GESTURE_UP", "LISTS_CREATE_WITH_ITEM_TITLE": "VARIABLES_DEFAULT_NAME", "SENSOR_HTCOLOUR_COLOUR_GETSAMPLE_TOOLTIP": "SENSOR_COLOUR_COLOUR_GETSAMPLE_TOOLTIP", "SENSOR_ENCODER_GETSAMPLE_TOOLTIP": "ENCODER_GETSAMPLE_TOOLTIP", "MODE_FACE_UP": "SENSOR_GESTURE_FACE_UP", "MODE_SHAKE": "SENSOR_GESTURE_SHAKE", "SENSOR_COLOUR_LIGHT_GETSAMPLE_TOOLTIP": "COLOUR_LIGHT_GETSAMPLE_TOOLTIP", "HTCOLOUR_COLOUR_GETSAMPLE_TOOLTIP": "COLOUR_COLOUR_GETSAMPLE_TOOLTIP", "SENSOR_COMPASS_GETSAMPLE_TOOLTIP": "COMPASS_GETSAMPLE_TOOLTIP", "CONTROLS_IF_ELSE_TITLE_ELSE": "CONTROLS_IF_MSG_ELSE", "SENSOR_COLOUR_GETSAMPLE_TOOLTIP": "COLOUR_GETSAMPLE_TOOLTIP", "PROCEDURES_DEFRETURN_DO": "PROCEDURES_DEFNORETURN_DO", "SENSOR_MOTOR": "SENSOR_ENCODER", "LISTS_GET_INDEX_HELPURL": "LISTS_INDEX_OF_HELPURL", "SENSOR_TIMER_GETSAMPLE_TOOLTIP": "TIMER_GETSAMPLE_TOOLTIP", "SENSOR_LIGHT_GETSAMPLE_TOOLTIP": "LIGHT_GETSAMPLE_TOOLTIP", "ORA_ROBOT_PUSH_RUN": "MESSAGE_EDIT_START", "SENSOR_GYRO_GETSAMPLE_TOOLTIP": "GYRO_GETSAMPLE_TOOLTIP", "PROCEDURES_DEFRETURN_COMMENT": "PROCEDURES_DEFNORETURN_COMMENT", "SENSOR_INFRARED_DISTANCE_GETSAMPLE_TOOLTIP": "INFRARED_DISTANCE_GETSAMPLE_TOOLTIP", "TOUCH_GETSAMPLE_TOOLTIP": "TOUCH_ISPRESSED_TOOLTIP", "TEXT_CREATE_JOIN_ITEM_TITLE_ITEM": "VARIABLES_DEFAULT_NAME", "SENSOR_HUMIDITY_HUMIDITY_GETSAMPLE_TOOLTIP": "SENSOR_HUMIDITY_GETSAMPLE_TOOLTIP", "CONTROLS_IF_MSG_THEN": "CONTROLS_REPEAT_INPUT_DO", "SENSOR_TEMPERATURE_TEMPERATURE_GETSAMPLE_TOOLTIP": "TEMPERATURE_GETSAMPLE_TOOLTIP", "MODE_FREEFALL": "SENSOR_GESTURE_FREEFALL", "MODE_DOWN": "SENSOR_GESTURE_DOWN", "LISTS_INDEX_OF_INPUT_IN_LIST": "LISTS_INLIST", "SENSOR_BATTERY_GETSAMPLE_TOOLTIP": "BATTERY_GETSAMPLE_TOOLTIP", "LISTS_GET_INDEX_INPUT_IN_LIST": "LISTS_INLIST", "HTCOLOUR_AMBIENTLIGHT_GETSAMPLE_TOOLTIP": "COLOUR_AMBIENTLIGHT_GETSAMPLE_TOOLTIP", "SENSOR_COLOUR_AMBIENTLIGHT_GETSAMPLE_TOOLTIP": "COLOUR_AMBIENTLIGHT_GETSAMPLE_TOOLTIP", "CONTROLS_IF_ELSEIF_TITLE_ELSEIF": "CONTROLS_IF_MSG_ELSEIF", "HTCOLOUR_LIGHT_GETSAMPLE_TOOLTIP": "COLOUR_LIGHT_GETSAMPLE_TOOLTIP", "SENSOR_QUADRGB_GETSAMPLE_TOOLTIP": "COLOUR_GETSAMPLE_TOOLTIP", "SENSOR_KEY_GETSAMPLE_TOOLTIP": "KEY_GETSAMPLE_TOOLTIP", "CONTROLS_FOREACH_INPUT_DO": "CONTROLS_REPEAT_INPUT_DO", "SENSOR_INFRARED_PRESENCE_GETSAMPLE_TOOLTIP": "INFRARED_PRESENCE_GETSAMPLE_TOOLTIP", "MODE_FACE_DOWN": "SENSOR_GESTURE_FACE_DOWN", "SENSOR_HTCOLOUR_GETSAMPLE_TOOLTIP": "SENSOR_COLOUR_GETSAMPLE_TOOLTIP", "ACTION_LCD_MBOT2": "TOOLBOX_DISPLAY", "CONTROLS_IF_IF_TITLE_IF": "CONTROLS_IF_MSG_IF", "CONTROLS_WHILEUNTIL_INPUT_DO": "CONTROLS_REPEAT_INPUT_DO", "SENSOR_SOUND_GETSAMPLE_TOOLTIP": "SOUND_GETSAMPLE_TOOLTIP", "SENSOR_FLAME_GETSAMPLE_TOOLTIP": "FLAME_GETSAMPLE_TOOLTIP", "ACTION_FOURDIGITDISPLAY": "FOURDIGITDISPLAY", "SENSOR_COLOURTCS3472_COLOUR_GETSAMPLE_TOOLTIP": "COLOUR_COLOUR_GETSAMPLE_TOOLTIP", "SENSOR_HTCOLOUR_AMBIENTLIGHT_GETSAMPLE_TOOLTIP": "SENSOR_COLOUR_AMBIENTLIGHT_GETSAMPLE_TOOLTIP", "SENSOR_COLOURTCS3472_LIGHT_GETSAMPLE_TOOLTIP": "COLOUR_LIGHT_GETSAMPLE_TOOLTIP", "SENSOR_COLOUR_COLOUR_GETSAMPLE_TOOLTIP": "COLOUR_COLOUR_GETSAMPLE_TOOLTIP", "SENSOR_HTCOLOUR_LIGHT_GETSAMPLE_TOOLTIP": "SENSOR_COLOUR_LIGHT_GETSAMPLE_TOOLTIP", "SENSOR_SOUND_GETSAMPLE_TOOLTIP_CALLIOPE": "MICROPHONE_GETSAMPLE_TOOLTIP", "SENSOR_HTCOLOUR_RGB_GETSAMPLE_TOOLTIP": "SENSOR_COLOUR_RGB_GETSAMPLE_TOOLTIP", "CONTROLS_FOR_INPUT_DO": "CONTROLS_REPEAT_INPUT_DO", "SENSOR_TEMPERATURE_GETSAMPLE_TOOLTIP": "TEMPERATURE_GETSAMPLE_TOOLTIP", "TEXT_APPEND_VARIABLE": "VARIABLES_DEFAULT_NAME", "SENSOR_COLOURTCS3472_RGB_GETSAMPLE_TOOLTIP": "COLOUR_RGB_GETSAMPLE_TOOLTIP", "MATH_CHANGE_TITLE_ITEM": "VARIABLES_DEFAULT_NAME", "HTCOLOUR_RGB_GETSAMPLE_TOOLTIP": "COLOUR_RGB_GETSAMPLE_TOOLTIP"} \ No newline at end of file diff --git a/robMsg/robMessages.js b/robMsg/robMessages.js index 2f956dac33a..a600ca562fb 100644 --- a/robMsg/robMessages.js +++ b/robMsg/robMessages.js @@ -256,6 +256,7 @@ Blockly.Msg.SENSOR_INFRARED = 'infrared sensor'; Blockly.Msg.SENSOR_IRHORIZONTAL = 'horizontal infrared sensor'; Blockly.Msg.SENSOR_IRSEEKER = 'HT infrared sensor'; Blockly.Msg.SENSOR_ENCODER = 'encoder'; +Blockly.Msg.SENSOR_MOTOR = Blockly.Msg.SENSOR_ENCODER; Blockly.Msg.SENSOR_GYRO = 'gyroscope'; Blockly.Msg.SENSOR_GYRO_WEDO = 'tilt sensor'; Blockly.Msg.SENSOR_ODOMETRY = 'odometry'; diff --git a/tests/orbC&P_playground.html b/tests/orbC&P_playground.html new file mode 100644 index 00000000000..48bd119428d --- /dev/null +++ b/tests/orbC&P_playground.html @@ -0,0 +1,757 @@ + + + + +Program and Configuration Playground + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Blockly Multi Playground

+ + + + + + + + + + +
ProgramConfiguration
+
+ 		+
+
+

+ +

+
+
+ + + + + + + + +