18069996051/mixly3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(boards): 规范化micropython板卡代码

Browse Source
This commit is contained in:
王立帮
2025-03-24 23:42:26 +08:00
parent 94c0d41ac7
commit 79bcd05ad1
42 changed files with 1845 additions and 1593 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
boards/default_src/micropython/blocks/actuator_extern.js
View File

@@ -512,17 +512,17 @@ export const actuator_use_uart_init = {
this.appendDummyInput("")
.appendField(Blockly.Msg.MIXLY_SETUP + Blockly.Msg.LISTS_SET_INDEX_INPUT_TO)
.appendField(new Blockly.FieldDropdown([
['SYN6288' + Blockly.Msg.MIXLY_AipSpeech_synthesis,'SYN6288'],
['NS9300' + Blockly.Msg.MIXLY_MUSIC_PLAYER,'NS9300']
]),'key2');
['SYN6288' + Blockly.Msg.MIXLY_AipSpeech_synthesis, 'SYN6288'],
['NS9300' + Blockly.Msg.MIXLY_MUSIC_PLAYER, 'NS9300']
]), 'key2');
this.setInputsInline(true);
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
}
};
export const player_whether_stop ={
init:function(){
export const player_whether_stop = {
init: function () {
this.setColour(ACTUATOR_EXTERN_HUE);
this.appendValueInput('SUB')
.appendField(Blockly.Msg.MIXLY_GET + Blockly.Msg.MIXLY_MUSIC_PLAYER)
@@ -540,7 +540,7 @@ export const player_whether_stop ={
};
export const player_set_play = {
init:function(){
init: function () {
this.setColour(ACTUATOR_EXTERN_HUE);
this.appendValueInput('SUB')
.appendField(Blockly.Msg.MIXLY_MUSIC_PLAYER)
@@ -561,13 +561,13 @@ export const player_set_play = {
};
export const player_set_volume = {
init:function(){
init: function () {
this.setColour(ACTUATOR_EXTERN_HUE);
this.appendValueInput('SUB')
.appendField(Blockly.Msg.MIXLY_MUSIC_PLAYER)
.setCheck("var");
this.appendValueInput('volume')
.appendField(Blockly.Msg.MIXLY_MP3_VOL +Blockly.Msg.MIXLY_STAT);
.appendField(Blockly.Msg.MIXLY_MP3_VOL + Blockly.Msg.MIXLY_STAT);
this.setInputsInline(true);
this.setPreviousStatement(true);
this.setNextStatement(true);
@@ -576,13 +576,13 @@ export const player_set_volume = {
}
export const player_set_mode = {
init:function(){
init: function () {
this.setColour(ACTUATOR_EXTERN_HUE);
this.appendValueInput('SUB')
.appendField(Blockly.Msg.MIXLY_MUSIC_PLAYER)
.setCheck("var");
this.appendDummyInput("")
.appendField(Blockly.Msg.MIXLY_MODE+Blockly.Msg.MIXLY_STAT)
.appendField(Blockly.Msg.MIXLY_MODE + Blockly.Msg.MIXLY_STAT)
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_MP3_LOOP_ALL, "0"],
[Blockly.Msg.MIXLY_MP3_LOOP_ONE, "1"],
@@ -598,14 +598,14 @@ export const player_set_mode = {
};
export const player_play_music = {
init:function(){
init: function () {
this.setColour(ACTUATOR_EXTERN_HUE);
this.appendValueInput('SUB')
.appendField(Blockly.Msg.MIXLY_MUSIC_PLAYER)
.setCheck("var");
this.appendDummyInput("")
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_MICROBIT_JS_START_MELODY,"play"],
[Blockly.Msg.MIXLY_MICROBIT_JS_START_MELODY, "play"],
[Blockly.Msg.MIXLY_PLAYER_INSERT_MUSIC, "insert"]
]), "key");
this.appendValueInput('song');
@@ -616,7 +616,7 @@ export const player_play_music = {
}
}
export const player_insert_music ={
export const player_insert_music = {
}
@@ -1127,7 +1127,7 @@ export const parrot_move_speed = {
this.appendValueInput("speed")
.setCheck(Number)
.setAlign(Blockly.inputs.Align.RIGHT)
.appendField(Blockly.Msg.MIXLY_DISPLAY_MATRIX_ROTATE +Blockly.Msg.MIXLY_SPEED);
.appendField(Blockly.Msg.MIXLY_DISPLAY_MATRIX_ROTATE + Blockly.Msg.MIXLY_SPEED);
this.setInputsInline(true);
this.setPreviousStatement(true);
this.setNextStatement(true);

6
boards/default_src/micropython/blocks/actuator_onboard.js
View File

@@ -1522,7 +1522,7 @@ export const analog_ble_keyboard_mouse_init = {
init: function () {
this.setColour(ACTUATOR_ONBOARD_HUE);
this.appendDummyInput()
.appendField(Blockly.Msg.LISTS_SET_INDEX_SET + Blockly.Msg.MIXLY_BLUETOOTH + Blockly.Msg.MIXLY_KEYBOARD_AND_MOUSE);
.appendField(Blockly.Msg.LISTS_SET_INDEX_SET + Blockly.Msg.MIXLY_BLUETOOTH + Blockly.Msg.MIXLY_KEYBOARD_AND_MOUSE);
this.appendValueInput('kname')
.appendField(Blockly.Msg.MIXLY_MICROBIT_JS_SYSTEM_DEVICE_NAME);
this.setPreviousStatement(true);
@@ -1754,7 +1754,7 @@ export const educore_ble_sensor_init = {
init: function () {
this.setColour(ACTUATOR_ONBOARD_HUE);
this.appendValueInput("name")
.appendField(Blockly.Msg.LISTS_SET_INDEX_SET + Blockly.Msg.MIXLY_BLUETOOTH+ Blockly.Msg.MIXLY_MICROBIT_JS_SYSTEM_DEVICE_NAME + Blockly.Msg.MIXLY_MICROBIT_PY_STORAGE_AS);
.appendField(Blockly.Msg.LISTS_SET_INDEX_SET + Blockly.Msg.MIXLY_BLUETOOTH + Blockly.Msg.MIXLY_MICROBIT_JS_SYSTEM_DEVICE_NAME + Blockly.Msg.MIXLY_MICROBIT_PY_STORAGE_AS);
this.setOutput(true);
this.setInputsInline(true);
}
@@ -1802,7 +1802,7 @@ export const get_keyboard_light = {
[Blockly.Msg.MIXLY_NumLock, "0"],
[Blockly.Msg.MIXLY_CapsLock, "1"],
[Blockly.Msg.MIXLY_ScorllLock, "2"]
]),'key');
]), 'key');
this.setOutput(true);
this.setInputsInline(true);
}

2
boards/default_src/micropython/blocks/ce_go.js
View File

@@ -388,7 +388,7 @@ export const educore_car_pin_near = {
this.setColour(MEGO_HUE);
this.appendValueInput('car');
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_MICROBIT_PY_STORAGE_GET+Blockly.Msg.MIXGO_PROXIMITY_SENSOR);
.appendField(Blockly.Msg.MIXLY_MICROBIT_PY_STORAGE_GET + Blockly.Msg.MIXGO_PROXIMITY_SENSOR);
this.setOutput(true, Number);
this.setInputsInline(true);
}

30
boards/default_src/micropython/blocks/control.js
View File

@@ -19,7 +19,11 @@ export const controls_delay = {
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_DELAY)
this.appendDummyInput("")
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.MIXLY_SECOND, "s"], [Blockly.Msg.MIXLY_mSecond, "ms"], [Blockly.Msg.MIXLY_uSecond, "us"]]), 'Time');
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_SECOND, "s"],
[Blockly.Msg.MIXLY_mSecond, "ms"],
[Blockly.Msg.MIXLY_uSecond, "us"]
]), 'Time');
this.appendValueInput("DELAY_TIME", Number)
.setCheck(Number);
this.setFieldValue('ms', 'Time')
@@ -113,14 +117,13 @@ export const controls_whileUntil = {
};
return TOOLTIPS[op];
});
}
},
OPERATORS: [
[Blockly.Msg.LANG_CONTROLS_WHILEUNTIL_OPERATOR_WHILE, 'WHILE'],
[Blockly.Msg.LANG_CONTROLS_WHILEUNTIL_OPERATOR_UNTIL, 'UNTIL']
]
};
controls_whileUntil.OPERATORS = [
[Blockly.Msg.LANG_CONTROLS_WHILEUNTIL_OPERATOR_WHILE, 'WHILE'],
[Blockly.Msg.LANG_CONTROLS_WHILEUNTIL_OPERATOR_UNTIL, 'UNTIL']
];
export const controls_flow_statements = {
init: function () {
this.setColour(LOOPS_HUE);
@@ -163,14 +166,13 @@ export const controls_flow_statements = {
} else {
this.setWarningText(Blockly.Msg.LANG_CONTROLS_FLOW_STATEMENTS_WARNING);
}
}
},
OPERATORS: [
[Blockly.Msg.LANG_CONTROLS_FLOW_STATEMENTS_OPERATOR_BREAK, 'BREAK'],
[Blockly.Msg.LANG_CONTROLS_FLOW_STATEMENTS_OPERATOR_CONTINUE, 'CONTINUE']
]
};
controls_flow_statements.OPERATORS = [
[Blockly.Msg.LANG_CONTROLS_FLOW_STATEMENTS_OPERATOR_BREAK, 'BREAK'],
[Blockly.Msg.LANG_CONTROLS_FLOW_STATEMENTS_OPERATOR_CONTINUE, 'CONTINUE']
];
export const controls_millis = {
init: function () {
this.setColour(LOOPS_HUE);
@@ -618,4 +620,4 @@ export const controls_uname = {
this.setOutput(true);
this.setTooltip(Blockly.Msg.PROCEDURES_DEFRETURN_RETURN + Blockly.Msg.MIXLY_MICROBIT_PY_CONTORL_UNAME);
}
};
};

1532
boards/default_src/micropython/blocks/display.js
View File

File diff suppressed because it is too large Load Diff

395
boards/default_src/micropython/blocks/display_extern.js
View File

@@ -5,10 +5,6 @@ const DISPLAY_EXTERN_HUE = '5BA5A5';
//var IMG = [["HEART", "HEART"],["HEART_SMALL", "HEART_SMALL"],["HAPPY", "HAPPY"],["SAD", "SAD"],["SMILE", "SMILE"],["SILLY", "SILLY"],["FABULOUS", "FABULOUS"],["SURPRISED", "SURPRISED"],["ASLEEP", "ASLEEP"],["ANGRY", "ANGRY"],["CONFUSED", "CONFUSED"],["NO", "NO"],["YES", "YES"],["LEFT_ARROW", "LEFT_ARROW"],["RIGHT_ARROW", "RIGHT_ARROW"],["DRESS", "DRESS"],["TRANSFORMERS", "TRANSFORMERS"],["SCISSORS", "SCISSORS"],["EXIT", "EXIT"],["TREE", "TREE"],["PACMAN", "PACMAN"],["TARGET", "TARGET"],["TSHIRT", "TSHIRT"],["ROLLERSKATE", "ROLLERSKATE"],["DUCK", "DUCK"],["HOUSE", "HOUSE"],["TORTOISE", "TORTOISE"],["BUTTERFLY", "BUTTERFLY"],["STICKFIGURE", "STICKFIGURE"],["GHOST", "GHOST"],["PITCHFORK", "PITCHFORK"],["MUSIC_QUAVERS", "MUSIC_QUAVERS"],["MUSIC_QUAVER", "MUSIC_QUAVER"],["MUSIC_CROTCHET", "MUSIC_CROTCHET"],["COW", "COW"],["RABBIT", "RABBIT"],["SQUARE_SMALL", "SQUARE_SMALL"],["SQUARE", "SQUARE"],["DIAMOND_SMALL", "DIAMOND_SMALL"],["DIAMOND", "DIAMOND"],["CHESSBOARD", "CHESSBOARD"],["TRIANGLE_LEFT", "TRIANGLE_LEFT"],["TRIANGLE", "TRIANGLE"],["SNAKE", "SNAKE"],["UMBRELLA", "UMBRELLA"],["SKULL", "SKULL"],["GIRAFFE", "GIRAFFE"],["SWORD", "SWORD"]];
// var IMG = [["HEART", "HEART"], ["HEART_SMALL", "HEART_SMALL"], ["HAPPY", "HAPPY"], ["SAD", "SAD"], ["SMILE", "SMILE"], ["SILLY", "SILLY"], ["FABULOUS", "FABULOUS"], ["SURPRISED", "SURPRISED"], ["ASLEEP", "ASLEEP"], ["ANGRY", "ANGRY"], ["CONFUSED", "CONFUSED"], ["NO", "NO"], ["YES", "YES"]];
export const display_matrix_use_i2c_init = {
init: function () {
this.setColour(DISPLAY_EXTERN_HUE);
@@ -27,8 +23,6 @@ export const display_matrix_use_i2c_init = {
this.setInputsInline(true);
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
}
};
@@ -139,12 +133,6 @@ export const display_matrix_extern_show_frame_string_delay = {
export const display_matrix_extern_shift = {
init: function () {
var OPERATORS = [
[Blockly.Msg.MIXLY_UP, 'shift_up'],
[Blockly.Msg.MIXLY_DOWN, 'shift_down'],
[Blockly.Msg.MIXLY_LEFT, 'shift_left'],
[Blockly.Msg.MIXLY_RIGHT, 'shift_right'],
];
//this.setHelpUrl(Blockly.Msg.MATH_TRIG_HELPURL);
this.appendValueInput('SUB')
.setCheck("var");
@@ -157,7 +145,7 @@ export const display_matrix_extern_shift = {
.appendField(Blockly.Msg.DISPLAY_IMAGE_LET)
this.appendDummyInput('')
.appendField(Blockly.Msg.DISPLAY_IMAGE_LET2)
.appendField(new Blockly.FieldDropdown(OPERATORS), 'OP');
.appendField(new Blockly.FieldDropdown(this.OPERATORS), 'OP');
this.appendValueInput('val')
.appendField(Blockly.Msg.DISPLAY_IMAGE_SHIFT)
.setCheck(Number);
@@ -177,7 +165,13 @@ export const display_matrix_extern_shift = {
};
return mode0 + mode1 + TOOLTIPS[mode] + mode2;
});
}
},
OPERATORS: [
[Blockly.Msg.MIXLY_UP, 'shift_up'],
[Blockly.Msg.MIXLY_DOWN, 'shift_down'],
[Blockly.Msg.MIXLY_LEFT, 'shift_left'],
[Blockly.Msg.MIXLY_RIGHT, 'shift_right'],
]
};
export const display_matrix_extern_get_pixel = {
@@ -265,29 +259,35 @@ export const display_matrix_extern_clear = {
export const display_matrix_extern_image_builtins = {
init: function () {
var OPERATORS =
[["HEART", "HEART"], ["HEART_SMALL", "HEART_SMALL"], ["HAPPY", "HAPPY"], ["SAD", "SAD"], ["SMILE", "SMILE"], ["SILLY", "SILLY"], ["FABULOUS", "FABULOUS"], ["SURPRISED", "SURPRISED"], ["ASLEEP", "ASLEEP"], ["ANGRY", "ANGRY"], ["CONFUSED", "CONFUSED"], ["NO", "NO"], ["YES", "YES"]
// ,["LEFT_ARROW", "LEFT_ARROW"],["RIGHT_ARROW", "RIGHT_ARROW"],["DRESS", "DRESS"],["TRANSFORMERS", "TRANSFORMERS"],["SCISSORS", "SCISSORS"],["EXIT", "EXIT"],["TREE", "TREE"],["PACMAN", "PACMAN"],["TARGET", "TARGET"],["TSHIRT", "TSHIRT"],["ROLLERSKATE", "ROLLERSKATE"],["DUCK", "DUCK"],["HOUSE", "HOUSE"],["TORTOISE", "TORTOISE"],["BUTTERFLY", "BUTTERFLY"],["STICKFIGURE", "STICKFIGURE"],["GHOST", "GHOST"],["PITCHFORK", "PITCHFORK"],["MUSIC_QUAVERS", "MUSIC_QUAVERS"],["MUSIC_QUAVER", "MUSIC_QUAVER"],["MUSIC_CROTCHET", "MUSIC_CROTCHET"],["COW", "COW"],["RABBIT", "RABBIT"],["SQUARE_SMALL", "SQUARE_SMALL"],["SQUARE", "SQUARE"],["DIAMOND_SMALL", "DIAMOND_SMALL"],["DIAMOND", "DIAMOND"],["CHESSBOARD", "CHESSBOARD"],["TRIANGLE_LEFT", "TRIANGLE_LEFT"],["TRIANGLE", "TRIANGLE"],["SNAKE", "SNAKE"],["UMBRELLA", "UMBRELLA"],["SKULL", "SKULL"],["GIRAFFE", "GIRAFFE"],["SWORD", "SWORD"]
];
this.appendValueInput('SUB')
.setCheck("var");
this.setColour(DISPLAY_EXTERN_HUE);
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_MICROBIT_Built_in_image1)
.appendField(new Blockly.FieldDropdown(OPERATORS), 'image');
.appendField(new Blockly.FieldDropdown(this.OPERATORS), 'image');
this.setOutput(true, "esp32_image");
this.setInputsInline(true);
this.setTooltip(Blockly.Msg.MIXLY_MICROBIT_Clear_display);
}
},
OPERATORS: [
["HEART", "HEART"],
["HEART_SMALL", "HEART_SMALL"],
["HAPPY", "HAPPY"],
["SAD", "SAD"],
["SMILE", "SMILE"],
["SILLY", "SILLY"],
["FABULOUS", "FABULOUS"],
["SURPRISED", "SURPRISED"],
["ASLEEP", "ASLEEP"],
["ANGRY", "ANGRY"],
["CONFUSED", "CONFUSED"],
["NO", "NO"],
["YES", "YES"]
]
};
export const matrix_extern_image_arithmetic = {
init: function () {
var OPERATORS = [
[Blockly.Msg.MICROBIT_DISPLAY_UNION, 'add'],
[Blockly.Msg.MICROBIT_DISPLAY_MINUS, 'sub']
];
this.appendValueInput('SUB')
.setCheck("var");
this.setColour(DISPLAY_EXTERN_HUE);
@@ -297,7 +297,7 @@ export const matrix_extern_image_arithmetic = {
.appendField(Blockly.Msg.MICROBIT_DISPLAY_MERGE_SHAPE);
this.appendValueInput('B')
// .setCheck(["esp32_image", "List", String])
.appendField(new Blockly.FieldDropdown(OPERATORS), 'OP');
.appendField(new Blockly.FieldDropdown(this.OPERATORS), 'OP');
this.setInputsInline(true);
var thisBlock = this;
this.setTooltip(function () {
@@ -308,7 +308,11 @@ export const matrix_extern_image_arithmetic = {
};
return TOOLTIPS[mode];
});
}
},
OPERATORS: [
[Blockly.Msg.MICROBIT_DISPLAY_UNION, 'add'],
[Blockly.Msg.MICROBIT_DISPLAY_MINUS, 'sub']
]
};
export const matrix_extern_image_invert = {
@@ -385,10 +389,6 @@ export const display_draw_4strings = {
export const display_image_size = {
init: function () {
var OPERATORS = [
[Blockly.Msg.MIXLY_HEIGHT, 'height'],
[Blockly.Msg.MIXLY_WIDTH, 'width']
];
this.setColour(DISPLAY_EXTERN_HUE);
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_MICROBIT_PY_STORAGE_GET + Blockly.Msg.MIXLY_MICROBIT_IMAGE);
@@ -396,7 +396,7 @@ export const display_image_size = {
.setCheck("esp32_image")
// .appendField(Blockly.Msg.blockpy_USE_LIST);
this.appendDummyInput("")
.appendField(new Blockly.FieldDropdown(OPERATORS), 'OP');
.appendField(new Blockly.FieldDropdown(this.OPERATORS), 'OP');
this.setInputsInline(true);
this.setOutput(true);
var thisBlock = this;
@@ -410,15 +410,15 @@ export const display_image_size = {
};
return mode0 + mode1 + TOOLTIPS[mode];
});
}
},
OPERATORS: [
[Blockly.Msg.MIXLY_HEIGHT, 'height'],
[Blockly.Msg.MIXLY_WIDTH, 'width']
]
};
export const display_rect = {
init: function () {
var brightness_or_not = [
[Blockly.Msg.MIXLY_4DIGITDISPLAY_ON, '1'],
[Blockly.Msg.MIXLY_4DIGITDISPLAY_OFF, '0']
];
this.setColour(DISPLAY_EXTERN_HUE);
// this.appendDummyInput()
// .appendField(Blockly.Msg.OLED)
@@ -428,37 +428,37 @@ export const display_rect = {
.setCheck("var");
this.appendDummyInput("")
.appendField(Blockly.Msg.MIXLY_RECT)
.appendField(new Blockly.FieldDropdown(brightness_or_not), 'OP')
.appendField(new Blockly.FieldDropdown(this.STATUS), 'OP')
// this.appendValueInput("PIN", Number)
// .setCheck(Number)
// .setAlign(Blockly.inputs.Align.RIGHT)
// .appendField(Blockly.Msg.MIXLY_PIN);
this.jsonInit({
"message0": Blockly.Msg.MIXLY_MICROBIT_SHOW_RECT,
"args0": [{
"check": Number,
"type": "input_value",
"name": "x"
}, {
"check": Number,
"type": "input_value",
"name": "y"
}, {
"check": Number,
"type": "input_value",
"name": "width"
}, {
"check": Number,
"type": "input_value",
"name": "height"
}, {
"type": "input_dummy"
}, {
"checked": false,
"type": "field_checkbox",
"name": "fill"
}
"args0": [
{
"check": Number,
"type": "input_value",
"name": "x"
}, {
"check": Number,
"type": "input_value",
"name": "y"
}, {
"check": Number,
"type": "input_value",
"name": "width"
}, {
"check": Number,
"type": "input_value",
"name": "height"
}, {
"type": "input_dummy"
}, {
"checked": false,
"type": "field_checkbox",
"name": "fill"
}
]
});
this.setInputsInline(true);
@@ -466,7 +466,11 @@ export const display_rect = {
this.setNextStatement(true, null);
this.setTooltip('');
this.setTooltip(Blockly.Msg.MIXLY_OLED_RECT);
}
},
STATUS: [
[Blockly.Msg.MIXLY_4DIGITDISPLAY_ON, '1'],
[Blockly.Msg.MIXLY_4DIGITDISPLAY_OFF, '0']
]
};
export const display_line = {
@@ -484,22 +488,26 @@ export const display_line = {
// .appendField(Blockly.Msg.MIXLY_PIN);
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_DISPLAY_DRAW)
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.MIXLY_DISPLAY_RLINE, "hline"], [Blockly.Msg.MIXLY_DISPLAY_VLINE, "vline"]]), "direction");
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_DISPLAY_RLINE, "hline"],
[Blockly.Msg.MIXLY_DISPLAY_VLINE, "vline"]
]), "direction");
this.jsonInit({
"message0": Blockly.Msg.MIXLY_MICROBIT_SHOW_LINE,
"args0": [{
"check": Number,
"type": "input_value",
"name": "x"
}, {
"check": Number,
"type": "input_value",
"name": "y"
}, {
"check": Number,
"type": "input_value",
"name": "length"
}
"args0": [
{
"check": Number,
"type": "input_value",
"name": "x"
}, {
"check": Number,
"type": "input_value",
"name": "y"
}, {
"check": Number,
"type": "input_value",
"name": "length"
}
]
});
this.setInputsInline(true);
@@ -524,23 +532,24 @@ export const display_line_arbitrarily = {
// .appendField(Blockly.Msg.MIXLY_PIN);
this.jsonInit({
"message0": Blockly.Msg.MIXLY_MICROBIT_SHOW_LINE_ARBITRARILY,
"args0": [{
"check": Number,
"type": "input_value",
"name": "x1"
}, {
"check": Number,
"type": "input_value",
"name": "y1"
}, {
"check": Number,
"type": "input_value",
"name": "x2"
}, {
"check": Number,
"type": "input_value",
"name": "y2"
},
"args0": [
{
"check": Number,
"type": "input_value",
"name": "x1"
}, {
"check": Number,
"type": "input_value",
"name": "y1"
}, {
"check": Number,
"type": "input_value",
"name": "x2"
}, {
"check": Number,
"type": "input_value",
"name": "y2"
},
]
});
this.setInputsInline(true);
@@ -601,7 +610,10 @@ export const display_onoff = {
init: function () {
this.setColour(DISPLAY_EXTERN_HUE);
this.appendDummyInput("")
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.MIXLY_ESP32_ON, "ON"], [Blockly.Msg.MIXLY_ESP32_OFF, "OFF"]]), 'ONOFF')
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_ESP32_ON, "ON"],
[Blockly.Msg.MIXLY_ESP32_OFF, "OFF"]
]), 'ONOFF')
this.setOutput(true, Boolean);
this.setTooltip(Blockly.Msg.MIXLY_TOOLTIP_INOUT_HIGHLOW);
}
@@ -648,53 +660,50 @@ export const display_fill = {
export const display_animate = {
init: function () {
var ANIMATE = [
["ALL_CLOCKS", 'ALL_CLOCKS'],
["ALL_ARROWS", 'ALL_ARROWS']
];
this.setColour(DISPLAY_EXTERN_HUE);
this.setOutput(true, 'Tuple');
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_ESP32_DISPLAY_ANIMATE)
.appendField(new Blockly.FieldDropdown(ANIMATE), 'ANIMATION')
.appendField(new Blockly.FieldDropdown(this.ANIMATE), 'ANIMATION')
//this.setTooltip(Blockly.Msg.LOGIC_BOOLEAN_TOOLTIP);
}
},
ANIMATE: [
["ALL_CLOCKS", 'ALL_CLOCKS'],
["ALL_ARROWS", 'ALL_ARROWS']
]
};
export const display_circle = {
init: function () {
var brightness_or_not = [
[Blockly.Msg.MIXLY_4DIGITDISPLAY_ON, '1'],
[Blockly.Msg.MIXLY_4DIGITDISPLAY_OFF, '0']
];
this.setColour(DISPLAY_EXTERN_HUE);
this.appendValueInput('VAR')
.appendField(Blockly.Msg.OLED)
.setCheck("var");
this.appendDummyInput("")
.appendField(Blockly.Msg.MIXLY_MIXPY_TURTLE_DRAW_CIRCLE)
.appendField(new Blockly.FieldDropdown(brightness_or_not), 'OP')
.appendField(new Blockly.FieldDropdown(this.STATUS), 'OP')
this.jsonInit({
"message0": Blockly.Msg.MIXLY_HANBIT_SHOW_CIRCLE,
"args0": [{
"check": Number,
"type": "input_value",
"name": "x"
}, {
"check": Number,
"type": "input_value",
"name": "y"
}, {
"check": Number,
"type": "input_value",
"name": "r"
}, {
"type": "input_dummy"
}, {
"checked": false,
"type": "field_checkbox",
"name": "fill"
}
"args0": [
{
"check": Number,
"type": "input_value",
"name": "x"
}, {
"check": Number,
"type": "input_value",
"name": "y"
}, {
"check": Number,
"type": "input_value",
"name": "r"
}, {
"type": "input_dummy"
}, {
"checked": false,
"type": "field_checkbox",
"name": "fill"
}
]
});
this.setInputsInline(true);
@@ -702,7 +711,11 @@ export const display_circle = {
this.setNextStatement(true, null);
this.setTooltip('');
this.setTooltip(Blockly.Msg.MIXLY_MIXPY_TURTLE_DRAW_CIRCLE);
}
},
STATUS: [
[Blockly.Msg.MIXLY_4DIGITDISPLAY_ON, '1'],
[Blockly.Msg.MIXLY_4DIGITDISPLAY_OFF, '0']
]
};
export const display_triangle = {
@@ -720,37 +733,38 @@ export const display_triangle = {
.appendField(new Blockly.FieldDropdown(brightness_or_not), 'OP')
this.jsonInit({
"message0": Blockly.Msg.MIXLY_HANBIT_SHOW_triangle,
"args0": [{
"check": Number,
"type": "input_value",
"name": "x0"
}, {
"check": Number,
"type": "input_value",
"name": "y0"
}, {
"check": Number,
"type": "input_value",
"name": "x1"
}, {
"check": Number,
"type": "input_value",
"name": "y1"
}, {
"check": Number,
"type": "input_value",
"name": "x2"
}, {
"check": Number,
"type": "input_value",
"name": "y2"
}, {
"type": "input_dummy"
}, {
"checked": false,
"type": "field_checkbox",
"name": "fill"
}
"args0": [
{
"check": Number,
"type": "input_value",
"name": "x0"
}, {
"check": Number,
"type": "input_value",
"name": "y0"
}, {
"check": Number,
"type": "input_value",
"name": "x1"
}, {
"check": Number,
"type": "input_value",
"name": "y1"
}, {
"check": Number,
"type": "input_value",
"name": "x2"
}, {
"check": Number,
"type": "input_value",
"name": "y2"
}, {
"type": "input_dummy"
}, {
"checked": false,
"type": "field_checkbox",
"name": "fill"
}
]
});
this.setInputsInline(true);
@@ -861,7 +875,11 @@ export const display_tm1650_power = {
.appendField(new Blockly.FieldDropdown([["TM1650", "tm1650"]]), "TYPE");
this.appendValueInput("VAR")
this.appendDummyInput()
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.MIXLY_ON, "on"], [Blockly.Msg.MIXLY_OFF, "off"], [Blockly.Msg.MIXLY_LCD_STAT_CLEAR, "clear"]]), "STAT");
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_ON, "on"],
[Blockly.Msg.MIXLY_OFF, "off"],
[Blockly.Msg.MIXLY_LCD_STAT_CLEAR, "clear"]
]), "STAT");
this.setInputsInline(true);
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
@@ -1016,7 +1034,6 @@ export const display_color_seclet = {
}
};
export const tft_show_image_or_string_delay = {
init: function () {
this.setColour(DISPLAY_EXTERN_HUE);
@@ -1104,8 +1121,6 @@ export const tft_show_frame_string_delay = {
}
};
export const tft_fill = {
init: function () {
this.setColour(DISPLAY_EXTERN_HUE);
@@ -1148,23 +1163,24 @@ export const tft_line_arbitrarily = {
// .appendField(Blockly.Msg.MIXLY_PIN);
this.jsonInit({
"message0": Blockly.Msg.MIXLY_MICROBIT_SHOW_LINE_ARBITRARILY,
"args0": [{
"check": Number,
"type": "input_value",
"name": "x1"
}, {
"check": Number,
"type": "input_value",
"name": "y1"
}, {
"check": Number,
"type": "input_value",
"name": "x2"
}, {
"check": Number,
"type": "input_value",
"name": "y2"
},
"args0": [
{
"check": Number,
"type": "input_value",
"name": "x1"
}, {
"check": Number,
"type": "input_value",
"name": "y1"
}, {
"check": Number,
"type": "input_value",
"name": "x2"
}, {
"check": Number,
"type": "input_value",
"name": "y2"
},
]
});
this.appendValueInput('VAR')
@@ -1511,12 +1527,6 @@ export const extern_oled_show_frame_string_delay = {
export const extern_oled_shift = {
init: function () {
var OPERATORS = [
[Blockly.Msg.MIXLY_UP, 'shift_up'],
[Blockly.Msg.MIXLY_DOWN, 'shift_down'],
[Blockly.Msg.MIXLY_LEFT, 'shift_left'],
[Blockly.Msg.MIXLY_RIGHT, 'shift_right'],
];
//this.setHelpUrl(Blockly.Msg.MATH_TRIG_HELPURL);
this.setColour(DISPLAY_EXTERN_HUE);
this.appendValueInput('SUB')
@@ -1530,7 +1540,7 @@ export const extern_oled_shift = {
.appendField(Blockly.Msg.DISPLAY_IMAGE_LET)
this.appendDummyInput('')
.appendField(Blockly.Msg.DISPLAY_IMAGE_LET2)
.appendField(new Blockly.FieldDropdown(OPERATORS), 'OP');
.appendField(new Blockly.FieldDropdown(this.OPERATORS), 'OP');
this.appendValueInput('val')
.appendField(Blockly.Msg.DISPLAY_IMAGE_SHIFT)
.setCheck(Number);
@@ -1550,7 +1560,13 @@ export const extern_oled_shift = {
};
return mode0 + mode1 + TOOLTIPS[mode] + mode2;
});
}
},
OPERATORS: [
[Blockly.Msg.MIXLY_UP, 'shift_up'],
[Blockly.Msg.MIXLY_DOWN, 'shift_down'],
[Blockly.Msg.MIXLY_LEFT, 'shift_left'],
[Blockly.Msg.MIXLY_RIGHT, 'shift_right'],
]
};
export const extern_oled_get_pixel = {
@@ -1595,8 +1611,6 @@ export const extern_oled_bright_point = {
}
};
export const extern_oled_clear = {
init: function () {
this.setColour(DISPLAY_EXTERN_HUE);
@@ -1619,7 +1633,6 @@ export const extern_oled_shape_rect = {
"args0": [
{
"name": "SUB",
"type": "input_value"
},
{
@@ -1661,7 +1674,6 @@ export const extern_oled_shape_rect = {
"type": "input_value",
//"check": "Number"
}
],
"inputsInline": true,
"helpUrl": Blockly.Msg.mpython_HELPURL,
@@ -1680,7 +1692,6 @@ export const extern_oled_hvline = {
"args0": [
{
"name": "SUB",
"type": "input_value"
},
{
@@ -1717,7 +1728,6 @@ export const extern_oled_hvline = {
"type": "input_value",
//"check": "Number"
}
],
"inputsInline": true,
"helpUrl": Blockly.Msg.mpython_HELPURL,
@@ -1736,7 +1746,6 @@ export const extern_oled_line = {
"args0": [
{
"name": "SUB",
"type": "input_value"
},
{

111
boards/default_src/micropython/blocks/display_onboard.js
View File

@@ -82,7 +82,6 @@ export const display_scroll_string_delay = {
this.setNextStatement(true, null);
this.setInputsInline(true);
this.setTooltip(Blockly.Msg.MIXLY_ESP32_SCROLL_IMAGE_OR_STRING_DELAY);
}
};
@@ -163,13 +162,27 @@ export const display_image_builtins = {
init: function () {
this.jsonInit({
"colour": DISPLAY_ONBOARD_HUE,
"args0": [{
"name": "image",
"options": [["HEART", "HEART"], ["HEART_SMALL", "HEART_SMALL"], ["HAPPY", "HAPPY"], ["SAD", "SAD"], ["SMILE", "SMILE"], ["SILLY", "SILLY"], ["FABULOUS", "FABULOUS"], ["SURPRISED", "SURPRISED"], ["ASLEEP", "ASLEEP"], ["ANGRY", "ANGRY"], ["CONFUSED", "CONFUSED"], ["NO", "NO"], ["YES", "YES"]
// ,["LEFT_ARROW", "LEFT_ARROW"],["RIGHT_ARROW", "RIGHT_ARROW"],["DRESS", "DRESS"],["TRANSFORMERS", "TRANSFORMERS"],["SCISSORS", "SCISSORS"],["EXIT", "EXIT"],["TREE", "TREE"],["PACMAN", "PACMAN"],["TARGET", "TARGET"],["TSHIRT", "TSHIRT"],["ROLLERSKATE", "ROLLERSKATE"],["DUCK", "DUCK"],["HOUSE", "HOUSE"],["TORTOISE", "TORTOISE"],["BUTTERFLY", "BUTTERFLY"],["STICKFIGURE", "STICKFIGURE"],["GHOST", "GHOST"],["PITCHFORK", "PITCHFORK"],["MUSIC_QUAVERS", "MUSIC_QUAVERS"],["MUSIC_QUAVER", "MUSIC_QUAVER"],["MUSIC_CROTCHET", "MUSIC_CROTCHET"],["COW", "COW"],["RABBIT", "RABBIT"],["SQUARE_SMALL", "SQUARE_SMALL"],["SQUARE", "SQUARE"],["DIAMOND_SMALL", "DIAMOND_SMALL"],["DIAMOND", "DIAMOND"],["CHESSBOARD", "CHESSBOARD"],["TRIANGLE_LEFT", "TRIANGLE_LEFT"],["TRIANGLE", "TRIANGLE"],["SNAKE", "SNAKE"],["UMBRELLA", "UMBRELLA"],["SKULL", "SKULL"],["GIRAFFE", "GIRAFFE"],["SWORD", "SWORD"]
],
"type": "field_dropdown"
}],
"args0": [
{
"name": "image",
"options": [
["HEART", "HEART"],
["HEART_SMALL", "HEART_SMALL"],
["HAPPY", "HAPPY"],
["SAD", "SAD"],
["SMILE", "SMILE"],
["SILLY", "SILLY"],
["FABULOUS", "FABULOUS"],
["SURPRISED", "SURPRISED"],
["ASLEEP", "ASLEEP"],
["ANGRY", "ANGRY"],
["CONFUSED", "CONFUSED"],
["NO", "NO"],
["YES", "YES"]
],
"type": "field_dropdown"
}
],
"output": ["esp32_image", "List"],
"helpUrl": "https://microbit-micropython.readthedocs.io/en/latest/image.html#attributes",
"tooltip": Blockly.Msg.MIXLY_MICROBIT_Built_in_image1,
@@ -190,10 +203,6 @@ export const display_image_builtins_all = {
export const image_arithmetic = {
init: function () {
var OPERATORS = [
[Blockly.Msg.MICROBIT_DISPLAY_UNION, 'add'],
[Blockly.Msg.MICROBIT_DISPLAY_MINUS, 'sub']
];
this.setColour(DISPLAY_ONBOARD_HUE);
this.setOutput(true, "esp32_image");
this.appendValueInput('A')
@@ -201,7 +210,7 @@ export const image_arithmetic = {
.appendField(Blockly.Msg.MICROBIT_DISPLAY_MERGE_SHAPE);
this.appendValueInput('B')
// .setCheck(["esp32_image", "List", String])
.appendField(new Blockly.FieldDropdown(OPERATORS), 'OP');
.appendField(new Blockly.FieldDropdown(this.OPERATORS), 'OP');
this.setInputsInline(true);
var thisBlock = this;
this.setTooltip(function () {
@@ -212,7 +221,11 @@ export const image_arithmetic = {
};
return TOOLTIPS[mode];
});
}
},
OPERATORS: [
[Blockly.Msg.MICROBIT_DISPLAY_UNION, 'add'],
[Blockly.Msg.MICROBIT_DISPLAY_MINUS, 'sub']
]
};
export const image_invert = {
@@ -228,12 +241,6 @@ export const image_invert = {
export const display_shift = {
init: function () {
var OPERATORS = [
[Blockly.Msg.MIXLY_UP, 'shift_up'],
[Blockly.Msg.MIXLY_DOWN, 'shift_down'],
[Blockly.Msg.MIXLY_LEFT, 'shift_left'],
[Blockly.Msg.MIXLY_RIGHT, 'shift_right'],
];
//this.setHelpUrl(Blockly.Msg.MATH_TRIG_HELPURL);
this.setColour(DISPLAY_ONBOARD_HUE);
// this.setOutput(true);
@@ -244,7 +251,7 @@ export const display_shift = {
.appendField(Blockly.Msg.DISPLAY_IMAGE_LET)
this.appendDummyInput('')
.appendField(Blockly.Msg.DISPLAY_IMAGE_LET2)
.appendField(new Blockly.FieldDropdown(OPERATORS), 'OP');
.appendField(new Blockly.FieldDropdown(this.OPERATORS), 'OP');
this.appendValueInput('val')
.appendField(Blockly.Msg.DISPLAY_IMAGE_SHIFT)
.setCheck(Number);
@@ -264,7 +271,13 @@ export const display_shift = {
};
return mode0 + mode1 + TOOLTIPS[mode] + mode2;
});
}
},
OPERATORS: [
[Blockly.Msg.MIXLY_UP, 'shift_up'],
[Blockly.Msg.MIXLY_DOWN, 'shift_down'],
[Blockly.Msg.MIXLY_LEFT, 'shift_left'],
[Blockly.Msg.MIXLY_RIGHT, 'shift_right'],
]
};
export const display_get_pixel = {
@@ -339,16 +352,8 @@ export const display_clear = {
}
};
//mixgo_me onboard_matrix below:
export const mixgome_display_image_create = {
init: function () {
this.appendDummyInput('')
@@ -406,28 +411,23 @@ export const mixgo_display_image_create_new = {
}
};
export const mixgome_display_font = {
init: function () {
var OPERATORS = [
['4x5' + Blockly.Msg.MIXGO_ME_DISPLAY_HORIZONTAL, "'4x5'"],
['5x5' + Blockly.Msg.MIXGO_ME_DISPLAY_HORIZONTAL, "'5x5'"],
['5x8' + Blockly.Msg.MIXGO_ME_DISPLAY_VERTICAL, "'5x8'"]
];
this.setColour(DISPLAY_ONBOARD_HUE);
this.appendDummyInput()
.appendField(Blockly.Msg.OLED_SET_FONT)
.appendField(new Blockly.FieldDropdown(OPERATORS), 'OP');
.appendField(new Blockly.FieldDropdown(this.OPERATORS), 'OP');
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
this.setInputsInline(true);
}
},
OPERATORS: [
['4x5' + Blockly.Msg.MIXGO_ME_DISPLAY_HORIZONTAL, "'4x5'"],
['5x5' + Blockly.Msg.MIXGO_ME_DISPLAY_HORIZONTAL, "'5x5'"],
['5x8' + Blockly.Msg.MIXGO_ME_DISPLAY_VERTICAL, "'5x8'"]
]
};
//mpython
export const onboard_oled_show_image = {
@@ -532,7 +532,6 @@ export const onboard_oled_scroll_string_delay = {
}
};
export const onboard_oled_show_frame_string_delay = {
init: function () {
this.setColour(DISPLAY_ONBOARD_HUE);
@@ -614,7 +613,6 @@ export const mpython_display_shape_rect = {
"type": "input_value",
//"check": "Number"
}
],
"inputsInline": true,
"helpUrl": Blockly.Msg.mpython_HELPURL,
@@ -665,7 +663,6 @@ export const mpython_display_hvline = {
"type": "input_value",
//"check": "Number"
}
],
"inputsInline": true,
"helpUrl": Blockly.Msg.mpython_HELPURL,
@@ -709,7 +706,6 @@ export const mpython_display_line = {
"type": "input_value",
//"check": "Number"
}
],
"inputsInline": true,
"helpUrl": Blockly.Msg.mpython_HELPURL,
@@ -832,8 +828,6 @@ export const mpython_pbm_image = {
//mixbot onboard_matrix below:
export const mixbot_display_image_create = {
init: function () {
this.appendDummyInput('')
@@ -889,21 +883,20 @@ export const mixbot_display_bright_screen = {
export const mixbot_display_rotate = {
init: function () {
var OPERATORS = [
[Blockly.Msg.mixpy_PL_PIE_SHADOW_N, '0'],
[Blockly.Msg.CLOCKWISE + '90' + Blockly.Msg.blockpy_setheading_degree, '1'],
[Blockly.Msg.CLOCKWISE + '180' + Blockly.Msg.blockpy_setheading_degree, '2'],
[Blockly.Msg.CLOCKWISE + '270' + Blockly.Msg.blockpy_setheading_degree, '3']
];
this.setColour(DISPLAY_ONBOARD_HUE);
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_MIXBOT_SCREEN_ROTATE)
.appendField(new Blockly.FieldDropdown(OPERATORS), 'OP');
.appendField(new Blockly.FieldDropdown(this.OPERATORS), 'OP');
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
this.setInputsInline(true);
}
},
OPERATORS: [
[Blockly.Msg.mixpy_PL_PIE_SHADOW_N, '0'],
[Blockly.Msg.CLOCKWISE + '90' + Blockly.Msg.blockpy_setheading_degree, '1'],
[Blockly.Msg.CLOCKWISE + '180' + Blockly.Msg.blockpy_setheading_degree, '2'],
[Blockly.Msg.CLOCKWISE + '270' + Blockly.Msg.blockpy_setheading_degree, '3']
]
};
export const bitbot_display_image_create = {
@@ -1042,7 +1035,6 @@ export const onboard_tft_display_shape_rect = {
"type": "input_value",
//"check": "Number"
}
],
"inputsInline": true,
"helpUrl": Blockly.Msg.mpython_HELPURL,
@@ -1090,7 +1082,6 @@ export const onboard_tft_display_hvline = {
"type": "input_value",
//"check": "Number"
}
],
"inputsInline": true,
"helpUrl": Blockly.Msg.mpython_HELPURL,
@@ -1134,7 +1125,6 @@ export const onboard_tft_display_line = {
"type": "input_value",
//"check": "Number"
}
],
"inputsInline": true,
"helpUrl": Blockly.Msg.mpython_HELPURL,
@@ -1314,7 +1304,6 @@ export const onboard_tft_display_shape_circle = {
"type": "input_value",
//"check": "Number"
}
],
"inputsInline": true,
"helpUrl": Blockly.Msg.mpython_HELPURL,

3
boards/default_src/micropython/blocks/factory.js
View File

@@ -188,8 +188,7 @@ export const factory_declare = {
this.setPreviousStatement(true);
this.setNextStatement(true);
}
}
};
export const factory_callMethod_noreturn = {
init: function () {

7
boards/default_src/micropython/blocks/inout.js
View File

@@ -149,7 +149,6 @@ export const inout_analog_atten = {
}
};
export const inout_pin_pressed = {
init: function () {
this.setColour(BASE_HUE);
@@ -174,7 +173,11 @@ export const inout_pin_attachInterrupt = {
.setCheck(Number);
this.appendDummyInput("")
.appendField(Blockly.Msg.MIXLY_MODE)
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.MIXLY_RISING, "machine.Pin.IRQ_RISING"], [Blockly.Msg.MIXLY_FALLING, "machine.Pin.IRQ_FALLING"], [Blockly.Msg.MIXLY_CHANGE, "(machine.Pin.IRQ_RISING | machine.Pin.IRQ_FALLING)"]]), "mode");
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_RISING, "machine.Pin.IRQ_RISING"],
[Blockly.Msg.MIXLY_FALLING, "machine.Pin.IRQ_FALLING"],
[Blockly.Msg.MIXLY_CHANGE, "(machine.Pin.IRQ_RISING | machine.Pin.IRQ_FALLING)"]
]), "mode");
this.appendValueInput('DO')
.appendField(Blockly.Msg.MIXLY_DO)
this.setPreviousStatement(true);

7
boards/default_src/micropython/blocks/iot.js
View File

@@ -264,7 +264,6 @@ export const iot_publish_container = {
}
};
export const iot_publish_item = {
/**
* Mutator bolck for adding items.
@@ -297,7 +296,6 @@ export const iot_create_with_item = {
}
};
export const iot_mixio_connect = {
init: function () {
this.setColour(IOT_HUE);
@@ -489,7 +487,6 @@ export const IOT_EMQX_INIT_AND_CONNECT_BY_SHARE_CODE = {
}
};
export const IOT_EMQX_INIT_AND_CONNECT_BY_MIXLY_CODE = {
init: function () {
this.setColour(IOT_HUE);
@@ -507,7 +504,6 @@ export const IOT_EMQX_INIT_AND_CONNECT_BY_MIXLY_CODE = {
}
};
export const iot_mixly_key = {
init: function () {
this.VISITOR_ID = Mixly.Config.BOARD.visitorId.str32.substring(0, 8).toUpperCase();
@@ -735,5 +731,4 @@ export const ollama_empty_history = {
this.setPreviousStatement(true);
this.setNextStatement(true);
}
}
};

76
boards/default_src/micropython/blocks/network.js
View File

@@ -22,7 +22,6 @@ export const network_init = {
}
};
export const network_open = {
init: function () {
this.setColour(NETWORK_HUE);
@@ -395,10 +394,8 @@ export const requests_get = {
.appendField(Blockly.Msg.DISPLAY_IMAGE_LET2)
.setCheck(String);
this.appendDummyInput("")
.appendField(Blockly.Msg.blockpy_REQUESTS_GET)
.appendField(new Blockly.FieldTextInput('response'), 'VAR')
this.setPreviousStatement(true);
this.setNextStatement(true);
this.setTooltip(Blockly.Msg.blockpy_REQUESTS_GET_TOOLTIP);
@@ -411,23 +408,15 @@ export const requests_get = {
this.setTitleValue(newName, 'VAR');
}
}
}
};
export const requests_attribute = {
init: function () {
this.appendValueInput('VAL')
var attr =
[[Blockly.Msg.blockpy_REQUESTS_GET_ATTR_STATUS_CODE, 'status_code'], [Blockly.Msg.blockpy_REQUESTS_GET_ATTR_TEXT, 'text']
, [Blockly.Msg.blockpy_REQUESTS_GET_ATTR_COOKIES, 'cookies'], [Blockly.Msg.blockpy_REQUESTS_GET_ATTR_CONTENT, 'content']];
this.setColour(NETWORK_HUE);
this.appendDummyInput("")
.appendField(Blockly.Msg.MIXLY_MICROBIT_JS_GET)
.appendField(new Blockly.FieldDropdown(attr), 'ATTR')
.appendField(new Blockly.FieldDropdown(this.ATTR), 'ATTR')
this.setInputsInline(true);
this.setOutput(true, String);
var thisBlock = this;
@@ -440,29 +429,26 @@ export const requests_attribute = {
};
return TOOLTIPS[mode];
});
}
},
ATTR: [
[Blockly.Msg.blockpy_REQUESTS_GET_ATTR_STATUS_CODE, 'status_code'],
[Blockly.Msg.blockpy_REQUESTS_GET_ATTR_TEXT, 'text'],
[Blockly.Msg.blockpy_REQUESTS_GET_ATTR_COOKIES, 'cookies'],
[Blockly.Msg.blockpy_REQUESTS_GET_ATTR_CONTENT, 'content']
]
};
export const requests_method = {
init: function () {
this.appendValueInput("VAR")
.appendField(Blockly.Msg.DISPLAY_IMAGE_LET2)
.setCheck(String);
var method = [
['post', 'post'], ['put', 'put'],
['delete', 'delete'], ['head', 'head'],
['option', 'option']
];
this.setColour(NETWORK_HUE);
this.appendDummyInput("")
.appendField(Blockly.Msg.blockpy_CONDUCT)
.appendField(new Blockly.FieldDropdown(method), 'DIR')
.appendField(new Blockly.FieldDropdown(this.METHOD), 'DIR')
this.appendDummyInput("")
.appendField(Blockly.Msg.blockpy_REQUESTS)
this.setInputsInline(true);
this.setPreviousStatement(true);
this.setNextStatement(true);
@@ -475,7 +461,12 @@ export const requests_method = {
};
return TOOLTIPS[mode];
});
}
},
METHOD: [
['post', 'post'], ['put', 'put'],
['delete', 'delete'], ['head', 'head'],
['option', 'option']
]
};
export const ntptime_time = {
@@ -523,7 +514,11 @@ export const requests_get2 = {
.setCheck(String);
this.appendDummyInput("")
.appendField(Blockly.Msg.blockpy_CONDUCT)
.appendField(new Blockly.FieldDropdown([["get", "get"], ["head", "head"], ["delete", "delete"]]), 'TYPE')
.appendField(new Blockly.FieldDropdown([
["get", "get"],
["head", "head"],
["delete", "delete"]
]), 'TYPE')
.appendField(Blockly.Msg.blockpy_REQUESTS)
.appendField(Blockly.Msg.MIXPY_REQUESTS_GET_RESULT)
this.setInputsInline(true);
@@ -540,7 +535,11 @@ export const requests_post = {
.setCheck(String);
this.appendDummyInput("")
.appendField(Blockly.Msg.blockpy_CONDUCT)
.appendField(new Blockly.FieldDropdown([["post", "post"], ["put", "put"], ["patch", "patch"]]), 'TYPE')
.appendField(new Blockly.FieldDropdown([
["post", "post"],
["put", "put"],
["patch", "patch"]
]), 'TYPE')
.appendField(Blockly.Msg.blockpy_REQUESTS)
this.appendValueInput("data")
.appendField(Blockly.Msg.blockpy_REQUESTS + Blockly.Msg.OLED_STRING)
@@ -555,21 +554,20 @@ export const requests_post = {
export const requests_attribute2 = {
init: function () {
this.appendValueInput('VAL')
var attr = [
[Blockly.Msg.blockpy_REQUESTS_GET_ATTR_TEXT, 'text'],
[Blockly.Msg.blockpy_REQUESTS_GET_ATTR_JSON, 'json()'],
[Blockly.Msg.blockpy_REQUESTS_GET_ATTR_STATUS_CODE, 'status_code'],
[Blockly.Msg.blockpy_REQUESTS_GET_ATTR_CONTENT, 'content'],
[Blockly.Msg.MIXPY_TEXT_ENCODE, 'encoding']
];
this.setColour(COMMUNICATE_HUE);
this.appendDummyInput("")
.appendField(Blockly.Msg.MIXLY_MICROBIT_JS_GET)
.appendField(new Blockly.FieldDropdown(attr), 'ATTR')
.appendField(new Blockly.FieldDropdown(this.ATTR), 'ATTR')
this.setInputsInline(true);
this.setOutput(true, String);
}
},
ATTR: [
[Blockly.Msg.blockpy_REQUESTS_GET_ATTR_TEXT, 'text'],
[Blockly.Msg.blockpy_REQUESTS_GET_ATTR_JSON, 'json()'],
[Blockly.Msg.blockpy_REQUESTS_GET_ATTR_STATUS_CODE, 'status_code'],
[Blockly.Msg.blockpy_REQUESTS_GET_ATTR_CONTENT, 'content'],
[Blockly.Msg.MIXPY_TEXT_ENCODE, 'encoding']
]
};
//educore_networke
@@ -596,8 +594,6 @@ export const educore_wifi_connect = {
}
};
export const educore_mqtt_connect = {
init: function () {
this.setColour(COMMUNICATE_HUE);
@@ -677,7 +673,7 @@ export const educore_mqtt_connect_success = {
init: function () {
this.setColour(COMMUNICATE_HUE);
this.appendDummyInput()
.appendField("mqtt"+Blockly.Msg.MIXLY_EMQX_IS_CONNECT)
.appendField("mqtt" + Blockly.Msg.MIXLY_EMQX_IS_CONNECT)
this.setInputsInline(true);
this.setOutput(true);
}

16
boards/default_src/micropython/blocks/nova_g1.js
View File

@@ -5,7 +5,7 @@ const NOVAG1_HUE = 100;
export const get_potential_num = {
init: function () {
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2]
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2];
if (version == "mixgo_nova") { var name = 'Nova G1' }
this.setColour(NOVAG1_HUE);
this.appendDummyInput()
@@ -14,11 +14,11 @@ export const get_potential_num = {
this.setOutput(true, Number);
this.setInputsInline(true);
}
}
};
export const nova_g1_motor = {
init: function () {
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2]
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2];
if (version == "mixgo_nova") { var name = 'Nova G1' }
this.setColour(NOVAG1_HUE);
this.appendValueInput('PIN')
@@ -43,11 +43,11 @@ export const nova_g1_motor = {
this.setNextStatement(true, null);
this.setInputsInline(true);
}
}
};
export const nova_g1_usb = {
init: function () {
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2]
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2];
if (version == "mixgo_nova") { var name = 'Nova G1' }
this.setColour(NOVAG1_HUE);
this.appendValueInput('PIN')
@@ -63,11 +63,11 @@ export const nova_g1_usb = {
this.setNextStatement(true, null);
this.setInputsInline(true);
}
}
};
export const nova_g1_spk_en = {
init: function () {
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2]
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2];
if (version == "mixgo_nova") { var name = 'Nova G1' }
this.setColour(NOVAG1_HUE);
this.appendDummyInput()
@@ -81,4 +81,4 @@ export const nova_g1_spk_en = {
this.setNextStatement(true, null);
this.setInputsInline(true);
}
}
};

21
boards/default_src/micropython/blocks/pe_g1.js
View File

@@ -5,7 +5,7 @@ const PEG1_HUE = 100;
export const pe_g1_use_i2c_init = {
init: function () {
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2]
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2];
if (version == "mixgo_ce") { var name = 'CE G6' }
else if (version == "mixgo_pe") { var name = 'PE G1' }
this.setColour(PEG1_HUE);
@@ -26,7 +26,7 @@ export const pe_g1_use_i2c_init = {
export const pe_g1_battery_left = {
init: function () {
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2]
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2];
if (version == "mixgo_ce") { var name = 'CE G6' }
else if (version == "mixgo_pe") { var name = 'PE G1' }
this.setColour(PEG1_HUE);
@@ -42,7 +42,7 @@ export const pe_g1_battery_left = {
export const pe_g1_dc_motor = {
init: function () {
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2]
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2];
if (version == "mixgo_ce") { var name = 'CE G6' }
else if (version == "mixgo_pe") { var name = 'PE G1' }
this.setColour(PEG1_HUE);
@@ -70,11 +70,11 @@ export const pe_g1_dc_motor = {
this.setNextStatement(true, null);
this.setInputsInline(true);
}
}
};
export const pe_g1_dc_motor_speed = {
init: function () {
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2]
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2];
if (version == "mixgo_ce") { var name = 'CE G6' }
else if (version == "mixgo_pe") { var name = 'PE G1' }
this.setColour(PEG1_HUE);
@@ -90,11 +90,11 @@ export const pe_g1_dc_motor_speed = {
this.setOutput(true, Number);
this.setInputsInline(true);
}
}
};
export const pe_g1_servo_set_angle = {
init: function () {
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2]
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2];
if (version == "mixgo_ce") { var name = 'CE G6' }
else if (version == "mixgo_pe") { var name = 'PE G1' }
this.setColour(PEG1_HUE);
@@ -118,7 +118,7 @@ export const pe_g1_servo_set_angle = {
export const pe_g1_servo_set_speed = {
init: function () {
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2]
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2];
if (version == "mixgo_ce") { var name = 'CE G6' }
else if (version == "mixgo_pe") { var name = 'PE G1' }
this.setColour(PEG1_HUE);
@@ -144,7 +144,7 @@ export const pe_g1_servo_set_speed = {
export const pe_g1_servo_get_angle = {
init: function () {
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2]
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2];
if (version == "mixgo_ce") { var name = 'CE G6' }
else if (version == "mixgo_pe") { var name = 'PE G1' }
this.setColour(PEG1_HUE);
@@ -163,7 +163,7 @@ export const pe_g1_servo_get_angle = {
export const pe_g1_servo_get_speed = {
init: function () {
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2]
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2];
if (version == "mixgo_ce") { var name = 'CE G6' }
else if (version == "mixgo_pe") { var name = 'PE G1' }
this.setColour(PEG1_HUE);
@@ -173,7 +173,6 @@ export const pe_g1_servo_get_speed = {
this.appendValueInput('PIN')
.appendField('360°' + Blockly.Msg.MIXLY_SERVO)
.appendField(Blockly.Msg.LCD_NUMBERING)
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_GET + Blockly.Msg.MIXLY_SPEED);
this.setOutput(true, Number);

1
boards/default_src/micropython/blocks/pins.js
View File

@@ -103,7 +103,6 @@ export const i2c_B_pin = {
}
};
export const spi_A_pin = {
init: function () {
this.setColour(PINS_HUE);

72
boards/default_src/micropython/blocks/sensor.js
View File

@@ -57,7 +57,11 @@ export const sensor_mixgo_button_attachInterrupt = {
.setCheck(Number);
this.appendDummyInput("")
.appendField(Blockly.Msg.MIXLY_MODE)
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.MIXLY_RISING, "machine.Pin.IRQ_RISING"], [Blockly.Msg.MIXLY_FALLING, "machine.Pin.IRQ_FALLING"], [Blockly.Msg.MIXLY_CHANGE, "(machine.Pin.IRQ_RISING or machine.Pin.IRQ_FALLING)"]]), "mode");
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_RISING, "machine.Pin.IRQ_RISING"],
[Blockly.Msg.MIXLY_FALLING, "machine.Pin.IRQ_FALLING"],
[Blockly.Msg.MIXLY_CHANGE, "(machine.Pin.IRQ_RISING or machine.Pin.IRQ_FALLING)"]
]), "mode");
this.appendValueInput('DO')
.appendField(Blockly.Msg.MIXLY_DO)
this.setPreviousStatement(true);
@@ -66,7 +70,6 @@ export const sensor_mixgo_button_attachInterrupt = {
}
};
export const sensor_mixgo_extern_button_is_pressed = {
init: function () {
this.setColour(SENSOR_HUE);
@@ -128,7 +131,11 @@ export const sensor_mixgo_extern_button_attachInterrupt = {
.setCheck(Number);
this.appendDummyInput("")
.appendField(Blockly.Msg.MIXLY_MODE)
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.MIXLY_RISING, "machine.Pin.IRQ_RISING"], [Blockly.Msg.MIXLY_FALLING, "machine.Pin.IRQ_FALLING"], [Blockly.Msg.MIXLY_CHANGE, "(machine.Pin.IRQ_RISING or machine.Pin.IRQ_FALLING)"]]), "mode");
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_RISING, "machine.Pin.IRQ_RISING"],
[Blockly.Msg.MIXLY_FALLING, "machine.Pin.IRQ_FALLING"],
[Blockly.Msg.MIXLY_CHANGE, "(machine.Pin.IRQ_RISING or machine.Pin.IRQ_FALLING)"]
]), "mode");
this.appendValueInput('DO')
.appendField(Blockly.Msg.MIXLY_DO)
this.setPreviousStatement(true);
@@ -145,7 +152,19 @@ export const sensor_mpu9250_attachGestureInterrupt = {
.setCheck("var");
this.appendDummyInput("")
.appendField(Blockly.Msg.MIXLY_MICROBIT_JS_CURRENT_GESTURE)
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.MIXLY_MICROBIT_shake, "shake"], [Blockly.Msg.MIXLY_UP, "up"], [Blockly.Msg.MIXLY_DOWN, "down"], [Blockly.Msg.MIXLY_LEFT, "left"], [Blockly.Msg.MIXLY_RIGHT, "right"], [Blockly.Msg.MIXLY_MICROBIT_face_up, "face up"], [Blockly.Msg.MIXLY_MICROBIT_face_down, "face down"], [Blockly.Msg.MIXLY_MICROBIT_freefall, "freefall"], ["3g", "3g"], ["6g", "6g"], ["8g", "8g"]]), "gesture");
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_MICROBIT_shake, "shake"],
[Blockly.Msg.MIXLY_UP, "up"],
[Blockly.Msg.MIXLY_DOWN, "down"],
[Blockly.Msg.MIXLY_LEFT, "left"],
[Blockly.Msg.MIXLY_RIGHT, "right"],
[Blockly.Msg.MIXLY_MICROBIT_face_up, "face up"],
[Blockly.Msg.MIXLY_MICROBIT_face_down, "face down"],
[Blockly.Msg.MIXLY_MICROBIT_freefall, "freefall"],
["3g", "3g"],
["6g", "6g"],
["8g", "8g"]
]), "gesture");
this.appendStatementInput('DO')
.appendField(Blockly.Msg.MIXLY_DO);
this.setPreviousStatement(true);
@@ -183,7 +202,15 @@ export const sensor_mpu9250_gesture = {
.setCheck("var");
this.appendDummyInput("")
.appendField(Blockly.Msg.MIXLY_MICROBIT_JS_CURRENT_GESTURE)
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.MIXLY_MICROBIT_shake, "shake"], [Blockly.Msg.MIXLY_UP, "up"], [Blockly.Msg.MIXLY_DOWN, "down"], [Blockly.Msg.MIXLY_LEFT, "left"], [Blockly.Msg.MIXLY_RIGHT, "right"], [Blockly.Msg.MIXLY_MICROBIT_face_up, "face up"], [Blockly.Msg.MIXLY_MICROBIT_face_down, "face down"]]), "gesture");
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_MICROBIT_shake, "shake"],
[Blockly.Msg.MIXLY_UP, "up"],
[Blockly.Msg.MIXLY_DOWN, "down"],
[Blockly.Msg.MIXLY_LEFT, "left"],
[Blockly.Msg.MIXLY_RIGHT, "right"],
[Blockly.Msg.MIXLY_MICROBIT_face_up, "face up"],
[Blockly.Msg.MIXLY_MICROBIT_face_down, "face down"]
]), "gesture");
this.setOutput(true);
var thisBlock = this;
this.setTooltip(function () {
@@ -244,7 +271,6 @@ export const sensor_mpu9250_get_acceleration = {
}
};
export const sensor_adxl345_get_acceleration = {
init: function () {
this.setColour(SENSOR_HUE);
@@ -279,7 +305,6 @@ export const sensor_adxl345_get_acceleration = {
}
};
export const sensor_light_level = {
init: function () {
this.setColour(SENSOR_HUE);
@@ -305,6 +330,7 @@ export const sensor_mpu9250_calibrate_compass = {
this.setTooltip(Blockly.Msg.MIXLY_MICROBIT_JS_CALIBRATE_COMPASS);
}
};
// export const sensor_mpu9250_is_compass_calibrated = {
// init: function(){
// this.setColour(SENSOR_HUE);
@@ -352,7 +378,10 @@ export const sensor_mpu9250_field_strength = {
.setCheck("var");
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_MICROBIT_JS_GET_COMPASS)
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.MIXLY_MICROBIT_JS_FIELD_STRENGTH, 'strength'], [Blockly.Msg.MIXLY_MICROBIT_JS_BY_ANGLE, 'heading']]), 'compass');
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_MICROBIT_JS_FIELD_STRENGTH, 'strength'],
[Blockly.Msg.MIXLY_MICROBIT_JS_BY_ANGLE, 'heading']
]), 'compass');
this.setOutput(true, Number);
this.setInputsInline(true);
var thisBlock = this;
@@ -500,16 +529,17 @@ export const HCSR04 = {
export const sensor_dht11 = {
init: function () {
var WHAT = [[Blockly.Msg.MIXLY_GETTEMPERATUE, 'temperature'], [Blockly.Msg.MIXLY_GETHUMIDITY, 'relative_humidity'], [Blockly.Msg.MIXLY_DHT11_T_H, 'tempandhum']];
this.setColour(SENSOR_HUE);
this.appendValueInput("PIN", Number)
.appendField(new Blockly.FieldDropdown([['DHT11', 'dht11']
, ['DHT22', 'dht22']//, ['DHT21', '21'], ['DHT33', '33'], ['DHT44', '44']
.appendField(new Blockly.FieldDropdown([
['DHT11', 'dht11'],
['DHT22', 'dht22']
//, ['DHT21', '21'], ['DHT33', '33'], ['DHT44', '44']
]), 'TYPE')
.appendField(Blockly.Msg.MIXLY_PIN)
.setCheck(Number);
this.appendDummyInput("")
.appendField(new Blockly.FieldDropdown(WHAT), "WHAT");
.appendField(new Blockly.FieldDropdown(this.METHOD), "WHAT");
this.setOutput(true, Number);
var thisBlock = this;
this.setTooltip(function () {
@@ -521,7 +551,12 @@ export const sensor_dht11 = {
};
return TOOLTIPS[op];
});
}
},
METHOD: [
[Blockly.Msg.MIXLY_GETTEMPERATUE, 'temperature'],
[Blockly.Msg.MIXLY_GETHUMIDITY, 'relative_humidity'],
[Blockly.Msg.MIXLY_DHT11_T_H, 'tempandhum']
]
};
@@ -561,7 +596,10 @@ export const number1 = {
init: function () {
this.setColour(SENSOR_HUE);
this.appendDummyInput("")
.appendField(new Blockly.FieldDropdown([["1", "touch1"], ["2", "touch2"]]), 'op')
.appendField(new Blockly.FieldDropdown([
["1", "touch1"],
["2", "touch2"]
]), 'op')
this.setOutput(true);
this.setTooltip(Blockly.Msg.MIXLY_TOOLTIP_INOUT_HIGHLOW);
}
@@ -596,13 +634,15 @@ export const sensor_mixgo_extern_pin_near = {
}
};
export const sensor_mixgo_pin_near = {
init: function () {
this.setColour(SENSOR_HUE);
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_MICROBIT_PY_STORAGE_GET)
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.TEXT_TRIM_LEFT, "left"], [Blockly.Msg.TEXT_TRIM_RIGHT, "right"]]), "direction")
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.TEXT_TRIM_LEFT, "left"],
[Blockly.Msg.TEXT_TRIM_RIGHT, "right"]
]), "direction")
.appendField(Blockly.Msg.MIXLY_ESP32_NEAR);
this.setOutput(true, Number);
this.setInputsInline(true);

175
boards/default_src/micropython/blocks/sensor_extern.js
View File

@@ -65,7 +65,11 @@ export const sensor_mixgo_extern_button_attachInterrupt = {
.setCheck(Number);
this.appendDummyInput("")
.appendField(Blockly.Msg.MIXLY_MODE)
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.MIXLY_RISING, "machine.Pin.IRQ_RISING"], [Blockly.Msg.MIXLY_FALLING, "machine.Pin.IRQ_FALLING"], [Blockly.Msg.MIXLY_CHANGE, "(machine.Pin.IRQ_RISING | machine.Pin.IRQ_FALLING)"]]), "mode");
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_RISING, "machine.Pin.IRQ_RISING"],
[Blockly.Msg.MIXLY_FALLING, "machine.Pin.IRQ_FALLING"],
[Blockly.Msg.MIXLY_CHANGE, "(machine.Pin.IRQ_RISING | machine.Pin.IRQ_FALLING)"]
]), "mode");
this.appendValueInput('DO')
.appendField(Blockly.Msg.MIXLY_DO)
this.setPreviousStatement(true);
@@ -74,7 +78,6 @@ export const sensor_mixgo_extern_button_attachInterrupt = {
}
};
export const sensor_mpu9250_attachGestureInterrupt = {
init: function () {
this.setColour(SENSOR_EXTERN_HUE);
@@ -83,7 +86,17 @@ export const sensor_mpu9250_attachGestureInterrupt = {
.setCheck("var");
this.appendDummyInput("")
.appendField(Blockly.Msg.MIXLY_MICROBIT_JS_CURRENT_GESTURE)
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.MIXLY_MICROBIT_shake, "shake"], [Blockly.Msg.MIXLY_UP, "up"], [Blockly.Msg.MIXLY_DOWN, "down"], [Blockly.Msg.MIXLY_LEFT, "left"], [Blockly.Msg.MIXLY_RIGHT, "right"], [Blockly.Msg.MIXLY_MICROBIT_face_up, "face up"], [Blockly.Msg.MIXLY_MICROBIT_face_down, "face down"], [Blockly.Msg.MIXLY_MICROBIT_freefall, "freefall"], ["3g", "3g"], ["6g", "6g"], ["8g", "8g"]]), "gesture");
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_MICROBIT_shake, "shake"],
[Blockly.Msg.MIXLY_UP, "up"],
[Blockly.Msg.MIXLY_DOWN, "down"],
[Blockly.Msg.MIXLY_LEFT, "left"],
[Blockly.Msg.MIXLY_RIGHT, "right"],
[Blockly.Msg.MIXLY_MICROBIT_face_up, "face up"],
[Blockly.Msg.MIXLY_MICROBIT_face_down, "face down"],
[Blockly.Msg.MIXLY_MICROBIT_freefall, "freefall"],
["3g", "3g"], ["6g", "6g"], ["8g", "8g"]
]), "gesture");
this.appendStatementInput('DO')
.appendField(Blockly.Msg.MIXLY_DO);
this.setPreviousStatement(true);
@@ -113,7 +126,6 @@ export const sensor_mpu9250_attachGestureInterrupt = {
}
};
export const sensor_adxl345_get_acceleration = {
init: function () {
this.setColour(SENSOR_EXTERN_HUE);
@@ -148,8 +160,6 @@ export const sensor_adxl345_get_acceleration = {
}
};
export const sensor_light_level = {
init: function () {
this.setColour(SENSOR_EXTERN_HUE);
@@ -161,20 +171,18 @@ export const sensor_light_level = {
}
};
export const sensor_dht11 = {
init: function () {
var WHAT = [[Blockly.Msg.MIXLY_GETTEMPERATUE, 'temperature'], [Blockly.Msg.MIXLY_GETHUMIDITY, 'humidity']];
this.setColour(SENSOR_EXTERN_HUE);
this.appendValueInput("PIN", Number)
.appendField(new Blockly.FieldDropdown([['DHT11', 'DHT11']
, ['DHT22', 'DHT22']//, ['DHT21', '21'], ['DHT33', '33'], ['DHT44', '44']
.appendField(new Blockly.FieldDropdown([
['DHT11', 'DHT11'],
['DHT22', 'DHT22']//, ['DHT21', '21'], ['DHT33', '33'], ['DHT44', '44']
]), 'TYPE')
.appendField(Blockly.Msg.MIXLY_PIN)
.setCheck(Number);
this.appendDummyInput("")
.appendField(new Blockly.FieldDropdown(WHAT), "WHAT");
.appendField(new Blockly.FieldDropdown(this.METHOD), "WHAT");
this.setOutput(true, Number);
var thisBlock = this;
this.setTooltip(function () {
@@ -186,10 +194,13 @@ export const sensor_dht11 = {
};
return TOOLTIPS[op];
});
}
},
METHOD: [
[Blockly.Msg.MIXLY_GETTEMPERATUE, 'temperature'],
[Blockly.Msg.MIXLY_GETHUMIDITY, 'humidity']
]
};
export const sensor_mixgo_extern_light = {
init: function () {
this.setColour(SENSOR_EXTERN_HUE);
@@ -222,14 +233,15 @@ export const sensor_mixgo_extern_sound = {
}
};
export const sensor_mixgo_extern_pin_near = {
init: function () {
this.setColour(SENSOR_EXTERN_HUE);
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_MICROBIT_PY_STORAGE_GET)
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.TEXT_TRIM_LEFT, "left"], [Blockly.Msg.TEXT_TRIM_RIGHT, "right"]]), "direction")
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.TEXT_TRIM_LEFT, "left"],
[Blockly.Msg.TEXT_TRIM_RIGHT, "right"]
]), "direction")
.appendField(Blockly.Msg.MIXLY_ESP32_NEAR);
this.setOutput(true, Number);
this.setInputsInline(true);
@@ -327,7 +339,6 @@ export const sensor_lm35 = {
}
};
//pe
export const sensor_use_i2c_init = {
init: function () {
@@ -637,7 +648,7 @@ export const CI130X_BROADCAST = {
this.setNextStatement(true);
this.setInputsInline(true);
}
}
};
export const CI130X_SET_SYSTEM_CMD = {
init: function () {
@@ -910,7 +921,15 @@ export const sensor_mpu9250_gesture = {
.setCheck("var");
this.appendDummyInput("")
.appendField(Blockly.Msg.MIXLY_MICROBIT_JS_CURRENT_GESTURE)
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.MIXLY_MICROBIT_shake, "shake"], [Blockly.Msg.MIXLY_UP, "up"], [Blockly.Msg.MIXLY_DOWN, "down"], [Blockly.Msg.MIXLY_LEFT, "left"], [Blockly.Msg.MIXLY_RIGHT, "right"], [Blockly.Msg.MIXLY_MICROBIT_face_up, "face up"], [Blockly.Msg.MIXLY_MICROBIT_face_down, "face down"]]), "gesture");
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_MICROBIT_shake, "shake"],
[Blockly.Msg.MIXLY_UP, "up"],
[Blockly.Msg.MIXLY_DOWN, "down"],
[Blockly.Msg.MIXLY_LEFT, "left"],
[Blockly.Msg.MIXLY_RIGHT, "right"],
[Blockly.Msg.MIXLY_MICROBIT_face_up, "face up"],
[Blockly.Msg.MIXLY_MICROBIT_face_down, "face down"]
]), "gesture");
this.setOutput(true);
var thisBlock = this;
this.setTooltip(function () {
@@ -1052,7 +1071,6 @@ export const sensor_mpu9250_calibrate_compass = {
}
};
export const sensor_mpu9250_temperature = {
init: function () {
this.setColour(SENSOR_EXTERN_HUE);
@@ -1068,7 +1086,6 @@ export const sensor_mpu9250_temperature = {
}
};
export const sensor_mpu9250_field_strength = {
init: function () {
this.setColour(SENSOR_EXTERN_HUE);
@@ -1077,7 +1094,10 @@ export const sensor_mpu9250_field_strength = {
.setCheck("var");
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_MICROBIT_JS_GET_COMPASS)
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.MIXLY_MICROBIT_JS_FIELD_STRENGTH, 'strength'], [Blockly.Msg.MIXLY_MICROBIT_JS_BY_ANGLE, 'heading']]), 'compass');
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_MICROBIT_JS_FIELD_STRENGTH, 'strength'],
[Blockly.Msg.MIXLY_MICROBIT_JS_BY_ANGLE, 'heading']
]), 'compass');
this.setOutput(true, Number);
this.setInputsInline(true);
var thisBlock = this;
@@ -1298,7 +1318,6 @@ export const weather_uart_mixio = {
};
export const weather_set_label = {
init: function () {
this.setColour(SENSOR_EXTERN_HUE);
this.appendValueInput('SUB')
@@ -1314,18 +1333,15 @@ export const weather_set_label = {
this.setNextStatement(true);
this.setTooltip();
},
mutationToDom: function () {
var container = document.createElement('mutation');
container.setAttribute('items', this.itemCount_);
return container;
},
domToMutation: function (xmlElement) {
this.itemCount_ = parseInt(xmlElement.getAttribute('items'), 10);
this.updateShape_();
},
decompose: function (workspace) {
var containerBlock =
workspace.newBlock('weather_set_label_container');
@@ -1339,7 +1355,6 @@ export const weather_set_label = {
}
return containerBlock;
},
compose: function (containerBlock) {
var itemBlock = containerBlock.getInputTargetBlock('STACK');
// Count number of inputs.
@@ -1361,7 +1376,6 @@ export const weather_set_label = {
}
}
},
saveConnections: function (containerBlock) {
var itemBlock = containerBlock.getInputTargetBlock('STACK');
var i = 0;
@@ -1373,7 +1387,6 @@ export const weather_set_label = {
itemBlock.nextConnection.targetBlock();
}
},
updateShape_: function () {
// Delete everything.
if (this.getInput('EMPTY')) {
@@ -1399,6 +1412,7 @@ export const weather_set_label = {
}
}
};
export const weather_set_label_container = {
init: function () {
this.setColour(SENSOR_EXTERN_HUE);
@@ -1562,8 +1576,7 @@ export const PS2_init = {
}
};
var PSBUTTON = [
const PSBUTTON = [
[Blockly.Msg.PS2_TRIANGLE, "PSB_GREEN"],
[Blockly.Msg.PS2_CIRCLE, "PSB_RED"],
[Blockly.Msg.PS2_CROSS, "PSB_BLUE"],
@@ -1650,18 +1663,18 @@ export const PS2_Buttons = {
export const PS2_stk = {
init: function () {
this.setColour(SENSOR_EXTERN_HUE);
var PSSTK = [
[Blockly.Msg.PS2_RX, "0"],
[Blockly.Msg.PS2_RY, "1"],
[Blockly.Msg.PS2_LX, "2"],
[Blockly.Msg.PS2_LY, "3"],
];
this.appendDummyInput("")
.appendField(Blockly.Msg.PS2_stick)
.appendField(new Blockly.FieldDropdown(PSSTK), "psstk");
.appendField(new Blockly.FieldDropdown(this.PSSTK), "psstk");
this.setOutput(true, Number);
this.setTooltip('');
}
},
PSSTK: [
[Blockly.Msg.PS2_RX, "0"],
[Blockly.Msg.PS2_RY, "1"],
[Blockly.Msg.PS2_LX, "2"],
[Blockly.Msg.PS2_LY, "3"],
]
};
export const PS2_init_new = {
@@ -1722,20 +1735,20 @@ export const PS2_Buttons_new = {
export const PS2_stk_new = {
init: function () {
this.setColour(SENSOR_EXTERN_HUE);
var PSSTK = [
[Blockly.Msg.PS2_RX, "RX"],
[Blockly.Msg.PS2_RY, "RY"],
[Blockly.Msg.PS2_LX, "LX"],
[Blockly.Msg.PS2_LY, "LY"],
];
this.appendValueInput('SUB')
.appendField(Blockly.Msg.PS2);
this.appendDummyInput("")
.appendField(Blockly.Msg.MIXLY_JOYSTICK)
.appendField(new Blockly.FieldDropdown(PSSTK), "psstk");
.appendField(new Blockly.FieldDropdown(this.PSSTK), "psstk");
this.setOutput(true, Number);
this.setTooltip('');
}
},
PSSTK: [
[Blockly.Msg.PS2_RX, "RX"],
[Blockly.Msg.PS2_RY, "RY"],
[Blockly.Msg.PS2_LX, "LX"],
[Blockly.Msg.PS2_LY, "LY"],
]
};
export const sensor_use_uart_init = {
@@ -1756,8 +1769,6 @@ export const sensor_use_uart_init = {
[Blockly.Msg.MIXLY_PM25_SENSOR, "PM"],
[Blockly.Msg.MIXLY_GNSS_SENSOR, "GNSS"]
]), "sensor");
this.setInputsInline(true);
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
@@ -1782,7 +1793,7 @@ export const pm25_get_data = {
this.setInputsInline(true);
this.setTooltip(Blockly.Msg.MIXLY_PM_CONCENTRATION_TOOLTIP);
}
}
};
export const gnss_have_data = {
init: function () {
@@ -1832,7 +1843,10 @@ export const robot_button_extern_get_value = {
this.appendDummyInput()
.appendField(Blockly.Msg.ME_GO_MOTOR_EXTERN + Blockly.Msg.MIXLY_BUTTON)
.appendField(Blockly.Msg.PIN_NUMBERING)
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.MIXLY_LEFT, "0"], [Blockly.Msg.MIXLY_RIGHT, "1"]]), "mode");
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_LEFT, "0"],
[Blockly.Msg.MIXLY_RIGHT, "1"]
]), "mode");
this.appendDummyInput()
.appendField(Blockly.Msg.TURTLE_POS)
.appendField(new Blockly.FieldDropdown([
@@ -1847,7 +1861,7 @@ export const robot_button_extern_get_value = {
this.setOutput(true, Number);
this.setInputsInline(true);
}
}
};
export const robot_touch_extern_get_value = {
init: function () {
@@ -1855,13 +1869,16 @@ export const robot_touch_extern_get_value = {
this.appendDummyInput()
.appendField(Blockly.Msg.ME_GO_MOTOR_EXTERN + Blockly.Msg.MIXLY_MICROBIT_JS_INOUT_EVENT_TOUCH + Blockly.Msg.MSG.catSensor)
.appendField(Blockly.Msg.PIN_NUMBERING)
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.MIXLY_LEFT, "0"], [Blockly.Msg.MIXLY_RIGHT, "1"]]), "mode");
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_LEFT, "0"],
[Blockly.Msg.MIXLY_RIGHT, "1"]
]), "mode");
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_MIXBOT_EXTERN_TOUCHED + "?")
this.setOutput(true, Boolean);
this.setInputsInline(true);
}
}
};
export const robot_infrared_extern_get_value = {
init: function () {
@@ -1869,13 +1886,16 @@ export const robot_infrared_extern_get_value = {
this.appendDummyInput()
.appendField(Blockly.Msg.ME_GO_MOTOR_EXTERN + Blockly.Msg.MIXLY_ESP32_EXTERN_NEAR)
.appendField(Blockly.Msg.PIN_NUMBERING)
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.MIXLY_LEFT, "0"], [Blockly.Msg.MIXLY_RIGHT, "1"]]), "mode");
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_LEFT, "0"],
[Blockly.Msg.MIXLY_RIGHT, "1"]
]), "mode");
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_GET + Blockly.Msg.MIXLY_DATA)
this.setOutput(true, Number);
this.setInputsInline(true);
}
}
};
export const robot_infrared_extern_grey_get_value = {
init: function () {
@@ -1883,13 +1903,16 @@ export const robot_infrared_extern_grey_get_value = {
this.appendDummyInput()
.appendField(Blockly.Msg.ME_GO_MOTOR_EXTERN + Blockly.Msg.MIXLY_ESP32_EXTERN_GRAY_NEAR)
.appendField(Blockly.Msg.PIN_NUMBERING)
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.MIXLY_LEFT, "0"], [Blockly.Msg.MIXLY_RIGHT, "1"]]), "mode");
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_LEFT, "0"],
[Blockly.Msg.MIXLY_RIGHT, "1"]
]), "mode");
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_GET + Blockly.Msg.MIXLY_DATA)
this.setOutput(true, Number);
this.setInputsInline(true);
}
}
};
export const robot_potentiometer_extern_get_value = {
init: function () {
@@ -1897,13 +1920,16 @@ export const robot_potentiometer_extern_get_value = {
this.appendDummyInput()
.appendField(Blockly.Msg.ME_GO_MOTOR_EXTERN + Blockly.Msg.MIXLY_KNOB_POTENTIOMETER)
.appendField(Blockly.Msg.PIN_NUMBERING)
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.MIXLY_LEFT, "0"], [Blockly.Msg.MIXLY_RIGHT, "1"]]), "mode");
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_LEFT, "0"],
[Blockly.Msg.MIXLY_RIGHT, "1"]
]), "mode");
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_GET + Blockly.Msg.MIXLY_DATA)
this.setOutput(true, Number);
this.setInputsInline(true);
}
}
};
export const robot_color_extern_get_value = {
init: function () {
@@ -1911,7 +1937,10 @@ export const robot_color_extern_get_value = {
this.appendDummyInput()
.appendField(Blockly.Msg.ME_GO_MOTOR_EXTERN + Blockly.Msg.HTML_COLOUR + Blockly.Msg.MSG.catSensor)
.appendField(Blockly.Msg.PIN_NUMBERING)
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.MIXLY_LEFT, "0"], [Blockly.Msg.MIXLY_RIGHT, "1"]]), "mode");
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_LEFT, "0"],
[Blockly.Msg.MIXLY_RIGHT, "1"]
]), "mode");
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_GET)
.appendField(new Blockly.FieldDropdown([
@@ -1924,7 +1953,7 @@ export const robot_color_extern_get_value = {
this.setOutput(true, Boolean);
this.setInputsInline(true);
}
}
};
export const mixbot_sensor_extern_get_addr = {
init: function () {
@@ -1945,7 +1974,7 @@ export const mixbot_sensor_extern_get_addr = {
this.setOutput(true);
this.setInputsInline(true);
}
}
};
export const mixbot_sensor_extern_set_addr = {
init: function () {
@@ -1975,7 +2004,7 @@ export const mixbot_sensor_extern_set_addr = {
this.setNextStatement(true, null);
this.setInputsInline(true);
}
}
};
export const robot_sonar_extern_get_value = {
init: function () {
@@ -1983,13 +2012,16 @@ export const robot_sonar_extern_get_value = {
this.appendDummyInput()
.appendField(Blockly.Msg.ME_GO_MOTOR_EXTERN + Blockly.Msg.MIXLY_EXTERN_SONAR)
.appendField(Blockly.Msg.PIN_NUMBERING)
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.MIXLY_LEFT, "0"], [Blockly.Msg.MIXLY_RIGHT, "1"]]), "mode");
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_LEFT, "0"],
[Blockly.Msg.MIXLY_RIGHT, "1"]
]), "mode");
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_GET + Blockly.Msg.MIXLY_DATA + '(cm)')
this.setOutput(true, Number);
this.setInputsInline(true);
}
}
};
export const robot_sonar_extern_led = {
init: function () {
@@ -1997,7 +2029,10 @@ export const robot_sonar_extern_led = {
this.appendDummyInput()
.appendField(Blockly.Msg.ME_GO_MOTOR_EXTERN + Blockly.Msg.MIXLY_EXTERN_SONAR)
.appendField(Blockly.Msg.PIN_NUMBERING)
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.MIXLY_LEFT, "0"], [Blockly.Msg.MIXLY_RIGHT, "1"]]), "mode");
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_LEFT, "0"],
[Blockly.Msg.MIXLY_RIGHT, "1"]
]), "mode");
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_EXTERN_INDICATOR_LIGHT)
this.appendValueInput('light')
@@ -2010,7 +2045,7 @@ export const robot_sonar_extern_led = {
this.setNextStatement(true, null);
this.setInputsInline(true);
}
}
};
export const sensor_weather_solo_init = {
init: function () {
@@ -2249,4 +2284,4 @@ export const weigh_sensor_get_weight = {
this.setOutput(true);
this.setInputsInline(true);
}
}
};

118
boards/default_src/micropython/blocks/sensor_onboard.js
View File

@@ -62,7 +62,11 @@ export const sensor_mixgo_button_attachInterrupt = {
.setCheck(Number);
this.appendDummyInput("")
.appendField(Blockly.Msg.MIXLY_MODE)
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.MIXLY_RISING, "machine.Pin.IRQ_RISING"], [Blockly.Msg.MIXLY_FALLING, "machine.Pin.IRQ_FALLING"], [Blockly.Msg.MIXLY_CHANGE, "(machine.Pin.IRQ_RISING | machine.Pin.IRQ_FALLING)"]]), "mode");
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_RISING, "machine.Pin.IRQ_RISING"],
[Blockly.Msg.MIXLY_FALLING, "machine.Pin.IRQ_FALLING"],
[Blockly.Msg.MIXLY_CHANGE, "(machine.Pin.IRQ_RISING | machine.Pin.IRQ_FALLING)"]
]), "mode");
this.appendValueInput('DO')
.appendField(Blockly.Msg.MIXLY_DO)
this.setPreviousStatement(true);
@@ -121,7 +125,11 @@ export const sensor_mixgocar42_button_attachInterrupt = {
.appendField(Blockly.Msg.MIXLY_BUTTON)
this.appendDummyInput("")
.appendField(Blockly.Msg.MIXLY_MODE)
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.MIXLY_RISING, "machine.Pin.IRQ_RISING"], [Blockly.Msg.MIXLY_FALLING, "machine.Pin.IRQ_FALLING"], [Blockly.Msg.MIXLY_CHANGE, "(machine.Pin.IRQ_RISING | machine.Pin.IRQ_FALLING)"]]), "mode");
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_RISING, "machine.Pin.IRQ_RISING"],
[Blockly.Msg.MIXLY_FALLING, "machine.Pin.IRQ_FALLING"],
[Blockly.Msg.MIXLY_CHANGE, "(machine.Pin.IRQ_RISING | machine.Pin.IRQ_FALLING)"]
]), "mode");
this.appendValueInput('DO')
.appendField(Blockly.Msg.MIXLY_DO)
this.setPreviousStatement(true);
@@ -183,7 +191,6 @@ export const sensor_mixgo_touch_slide = {
}
};
export const sensor_distance_hrsc04 = {
init: function () {
this.setColour(SENSOR_ONBOARD_HUE);
@@ -258,8 +265,6 @@ export const RTC_set_date = {
}
};
export const HCSR04 = {
init: function () {
this.setColour(SENSOR_ONBOARD_HUE);
@@ -275,7 +280,6 @@ export const HCSR04 = {
this.setOutput(true, Number);
this.setTooltip(Blockly.Msg.MIXLY_TOOLTIP_BLOCKGROUP_CHAOSHENGBO);
}
};
export const sensor_mixgo_light = {
@@ -289,12 +293,14 @@ export const sensor_mixgo_light = {
}
};
export const number1 = {
init: function () {
this.setColour(SENSOR_ONBOARD_HUE);
this.appendDummyInput("")
.appendField(new Blockly.FieldDropdown([["1", "touch1"], ["2", "touch2"]]), 'op')
.appendField(new Blockly.FieldDropdown([
["1", "touch1"],
["2", "touch2"]
]), 'op')
this.setOutput(true);
this.setTooltip(Blockly.Msg.MIXLY_TOOLTIP_INOUT_HIGHLOW);
}
@@ -304,7 +310,12 @@ export const number2 = {
init: function () {
this.setColour(SENSOR_ONBOARD_HUE);
this.appendDummyInput("")
.appendField(new Blockly.FieldDropdown([["0", "0"], ["1", "1"], ["2", "2"], ["3", "3"]]), 'op')
.appendField(new Blockly.FieldDropdown([
["0", "0"],
["1", "1"],
["2", "2"],
["3", "3"]
]), 'op')
this.setOutput(true);
this.setTooltip(Blockly.Msg.MIXLY_TOOLTIP_INOUT_HIGHLOW);
}
@@ -314,7 +325,13 @@ export const number3 = {
init: function () {
this.setColour(SENSOR_ONBOARD_HUE);
this.appendDummyInput("")
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.MIXLY_UP, "12"], [Blockly.Msg.MIXLY_DOWN, "14"], [Blockly.Msg.MIXLY_LEFT, "13"], [Blockly.Msg.MIXLY_RIGHT, "15"], ["A", "32"], ["B", "33"]]), 'op')
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_UP, "12"],
[Blockly.Msg.MIXLY_DOWN, "14"],
[Blockly.Msg.MIXLY_LEFT, "13"],
[Blockly.Msg.MIXLY_RIGHT, "15"],
["A", "32"], ["B", "33"]
]), 'op')
this.setOutput(true);
this.setTooltip(Blockly.Msg.MIXLY_TOOLTIP_INOUT_HIGHLOW);
}
@@ -324,7 +341,13 @@ export const number4 = {
init: function () {
this.setColour(SENSOR_ONBOARD_HUE);
this.appendDummyInput("")
.appendField(new Blockly.FieldDropdown([["0", "0"], ["1", "1"], ["2", "2"], ["3", "3"], ["4", "4"]]), 'op')
.appendField(new Blockly.FieldDropdown([
["0", "0"],
["1", "1"],
["2", "2"],
["3", "3"],
["4", "4"]
]), 'op')
this.setOutput(true);
this.setTooltip(Blockly.Msg.MIXLY_TOOLTIP_INOUT_HIGHLOW);
}
@@ -334,7 +357,12 @@ export const number5 = {
init: function () {
this.setColour(SENSOR_ONBOARD_HUE);
this.appendDummyInput("")
.appendField(new Blockly.FieldDropdown([["0", "0"], ["1", "1"], ["2", "2"], ["3", "3"]]), 'op')
.appendField(new Blockly.FieldDropdown([
["0", "0"],
["1", "1"],
["2", "2"],
["3", "3"]
]), 'op')
this.setOutput(true);
this.setTooltip(Blockly.Msg.MIXLY_TOOLTIP_INOUT_HIGHLOW);
}
@@ -344,7 +372,10 @@ export const number6 = {
init: function () {
this.setColour(SENSOR_ONBOARD_HUE);
this.appendDummyInput("")
.appendField(new Blockly.FieldDropdown([["3", "3"], ["4", "4"]]), 'op')
.appendField(new Blockly.FieldDropdown([
["3", "3"],
["4", "4"]
]), 'op')
this.setOutput(true);
this.setTooltip(Blockly.Msg.MIXLY_TOOLTIP_INOUT_HIGHLOW);
}
@@ -354,7 +385,10 @@ export const number7 = {
init: function () {
this.setColour(SENSOR_ONBOARD_HUE);
this.appendDummyInput("")
.appendField(new Blockly.FieldDropdown([["0", "0"], ["1", "1"]]), 'op')
.appendField(new Blockly.FieldDropdown([
["0", "0"],
["1", "1"]
]), 'op')
this.setOutput(true);
this.setTooltip(Blockly.Msg.MIXLY_TOOLTIP_INOUT_HIGHLOW);
}
@@ -378,7 +412,10 @@ export const sensor_mixgo_pin_near_double = {
this.setColour(SENSOR_ONBOARD_HUE);
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_MICROBIT_PY_STORAGE_GET)
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.TEXT_TRIM_LEFT, "left"], [Blockly.Msg.TEXT_TRIM_RIGHT, "right"]]), "direction")
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.TEXT_TRIM_LEFT, "left"],
[Blockly.Msg.TEXT_TRIM_RIGHT, "right"]
]), "direction")
.appendField(Blockly.Msg.MIXLY_ESP32_NEAR);
this.setOutput(true, Number);
this.setInputsInline(true);
@@ -418,13 +455,15 @@ export const sensor_mixgo_pin_near = {
}
};
export const sensor_mixgo_nova_pin_near = {
init: function () {
this.setColour(SENSOR_ONBOARD_HUE);
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_MICROBIT_PY_STORAGE_GET)
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.TEXT_TRIM_LEFT, "l"], [Blockly.Msg.TEXT_TRIM_RIGHT, "r"]]), "direction")
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.TEXT_TRIM_LEFT, "l"],
[Blockly.Msg.TEXT_TRIM_RIGHT, "r"]
]), "direction")
.appendField(Blockly.Msg.MIXLY_ESP32_NEAR);
this.setOutput(true, Number);
this.setInputsInline(true);
@@ -447,7 +486,10 @@ export const sensor_mixgo_nova_LTR308 = {
this.setColour(SENSOR_ONBOARD_HUE);
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_MICROBIT_PY_STORAGE_GET)
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.TEXT_TRIM_LEFT, "l"], [Blockly.Msg.TEXT_TRIM_RIGHT, "r"]]), "direction")
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.TEXT_TRIM_LEFT, "l"],
[Blockly.Msg.TEXT_TRIM_RIGHT, "r"]
]), "direction")
.appendField(Blockly.Msg.MIXLY_ESP32_EXTERN_LIGHT + Blockly.Msg.MIXLY_DATA);
this.setOutput(true, Number);
this.setInputsInline(true);
@@ -671,7 +713,6 @@ export const sensor_aht11 = {
}
};
export const sensor_get_temperature = {
init: function () {
this.setColour(SENSOR_ONBOARD_HUE);
@@ -682,10 +723,6 @@ export const sensor_get_temperature = {
}
};
export const sensor_hp203 = {
init: function () {
this.setColour(SENSOR_ONBOARD_HUE);
@@ -815,7 +852,15 @@ export const sensor_onboard_mpu9250_gesture = {
.appendField("MPU9250")
this.appendDummyInput("")
.appendField(Blockly.Msg.MIXLY_MICROBIT_JS_CURRENT_GESTURE)
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.MIXLY_MICROBIT_shake, "shake"], [Blockly.Msg.MIXLY_UP, "up"], [Blockly.Msg.MIXLY_DOWN, "down"], [Blockly.Msg.MIXLY_LEFT, "left"], [Blockly.Msg.MIXLY_RIGHT, "right"], [Blockly.Msg.MIXLY_MICROBIT_face_up, "face up"], [Blockly.Msg.MIXLY_MICROBIT_face_down, "face down"]]), "gesture");
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_MICROBIT_shake, "shake"],
[Blockly.Msg.MIXLY_UP, "up"],
[Blockly.Msg.MIXLY_DOWN, "down"],
[Blockly.Msg.MIXLY_LEFT, "left"],
[Blockly.Msg.MIXLY_RIGHT, "right"],
[Blockly.Msg.MIXLY_MICROBIT_face_up, "face up"],
[Blockly.Msg.MIXLY_MICROBIT_face_down, "face down"]
]), "gesture");
this.setOutput(true);
this.setInputsInline(true);
var thisBlock = this;
@@ -954,7 +999,6 @@ export const sensor_onboard_mpu9250_calibrate_compass = {
}
};
export const sensor_onboard_mpu9250_temperature = {
init: function () {
this.setColour(SENSOR_ONBOARD_HUE);
@@ -969,7 +1013,6 @@ export const sensor_onboard_mpu9250_temperature = {
}
};
export const sensor_onboard_mpu9250_field_strength = {
init: function () {
this.setColour(SENSOR_ONBOARD_HUE);
@@ -977,7 +1020,10 @@ export const sensor_onboard_mpu9250_field_strength = {
.appendField("MPU9250")
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_MICROBIT_JS_GET_COMPASS)
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.MIXLY_MICROBIT_JS_FIELD_STRENGTH, 'strength'], [Blockly.Msg.MIXLY_MICROBIT_JS_BY_ANGLE, 'heading']]), 'compass');
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_MICROBIT_JS_FIELD_STRENGTH, 'strength'],
[Blockly.Msg.MIXLY_MICROBIT_JS_BY_ANGLE, 'heading']
]), 'compass');
this.setOutput(true, Number);
this.setInputsInline(true);
var thisBlock = this;
@@ -1061,10 +1107,8 @@ export const sensor_mixgo_cc_mmc5603_calibrate_compass = {
}
};
//mixgo_me onboard_sensor blocks:
export const sensor_mixgome_temperature = {
init: function () {
this.setColour(SENSOR_ONBOARD_HUE);
@@ -1079,7 +1123,6 @@ export const sensor_mixgome_temperature = {
//mixgo_ce onboard_sensor blocks:
export const sensor_mixgoce_temperature = {
init: function () {
this.setColour(SENSOR_ONBOARD_HUE);
@@ -1092,9 +1135,6 @@ export const sensor_mixgoce_temperature = {
}
};
export const sensor_mpython_qmi8658_get_gyro = {
init: function () {
this.setColour(SENSOR_ONBOARD_HUE);
@@ -1137,15 +1177,15 @@ export const sensor_mpython_qmi8658_temperature = {
}
};
export const sensor_rm_pin_near_double = {
init: function () {
this.setColour(SENSOR_ONBOARD_HUE);
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_MICROBIT_PY_STORAGE_GET)
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.TEXT_TRIM_LEFT, "1"], [Blockly.Msg.TEXT_TRIM_RIGHT, "2"]]), "direction")
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.TEXT_TRIM_LEFT, "1"],
[Blockly.Msg.TEXT_TRIM_RIGHT, "2"]
]), "direction")
.appendField(Blockly.Msg.MIXLY_ESP32_NEAR);
this.setOutput(true, Number);
this.setInputsInline(true);
@@ -1254,7 +1294,6 @@ export const sensor_mixgocar_pin_near_state_change = {
}
};
export const sensor_mixgocar_battery_left = {
init: function () {
this.setColour(SENSOR_ONBOARD_HUE);
@@ -1267,7 +1306,6 @@ export const sensor_mixgocar_battery_left = {
//mixbot onboard_sensor below:
export const sensor_mixbot_patrol_calibrate = {
init: function () {
this.setColour(SENSOR_ONBOARD_HUE);
@@ -1319,8 +1357,6 @@ export const sensor_mixbot_temperature = {
}
};
export const sensor_mixbot_get_gyro = {
init: function () {
this.setColour(SENSOR_ONBOARD_HUE);

73
boards/default_src/micropython/blocks/serial.js
View File

@@ -53,7 +53,12 @@ export const serial_print_hex = {
.appendField(new Blockly.FieldDropdown([['uart1', '1']]), 'mode')
.appendField(Blockly.Msg.MIXLY_SERIAL_PRINTLN);
this.appendValueInput("CONTENT", Number)
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.MATH_BIN, "bin"], [Blockly.Msg.MATH_OCT, "oct"], [Blockly.Msg.MATH_DEC, "int"], [Blockly.Msg.MATH_HEX, "hex"]]), "STAT")
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MATH_BIN, "bin"],
[Blockly.Msg.MATH_OCT, "oct"],
[Blockly.Msg.MATH_DEC, "int"],
[Blockly.Msg.MATH_HEX, "hex"]
]), "STAT")
.setCheck(Number);
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
@@ -147,7 +152,20 @@ export const serial_softserial_new = {
.setAlign(Blockly.inputs.Align.RIGHT);
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_SERIAL_BEGIN)
.appendField(new Blockly.FieldDropdown([['115200', '115200'], ['57600', '57600'], ['37400', '38400'], ['31250', '31250'], ['28800', '28800'], ['19200', '19200'], ['14400', '14400'], ['9600', '9600'], ['4800', '4800'], ['2400', '2400'], ['1200', '1200'], ['300', '300']]), 'baudrate');
.appendField(new Blockly.FieldDropdown([
['115200', '115200'],
['57600', '57600'],
['37400', '38400'],
['31250', '31250'],
['28800', '28800'],
['19200', '19200'],
['14400', '14400'],
['9600', '9600'],
['4800', '4800'],
['2400', '2400'],
['1200', '1200'],
['300', '300']
]), 'baudrate');
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
this.setInputsInline(true);
@@ -160,11 +178,27 @@ export const serial_softserial = {
this.setColour(SERIAL_HUE);
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_SETUP)
.appendField(new Blockly.FieldDropdown([['uart1 (RX=23,TX=19)', '1'], ['uart2 (RX=5,TX=18)', '2']]), 'mode');
.appendField(new Blockly.FieldDropdown([
['uart1 (RX=23,TX=19)', '1'],
['uart2 (RX=5,TX=18)', '2']
]), 'mode');
//this.setFieldValue('1','mode')
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_SERIAL_BEGIN)
.appendField(new Blockly.FieldDropdown([['115200', '115200'], ['57600', '57600'], ['37400', '38400'], ['31250', '31250'], ['28800', '28800'], ['19200', '19200'], ['14400', '14400'], ['9600', '9600'], ['4800', '4800'], ['2400', '2400'], ['1200', '1200'], ['300', '300']]), 'baudrate');
.appendField(new Blockly.FieldDropdown([
['115200', '115200'],
['57600', '57600'],
['37400', '38400'],
['31250', '31250'],
['28800', '28800'],
['19200', '19200'],
['14400', '14400'],
['9600', '9600'],
['4800', '4800'],
['2400', '2400'],
['1200', '1200'],
['300', '300']
]), 'baudrate');
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
this.setInputsInline(true);
@@ -177,7 +211,20 @@ export const serial_begin = {
this.setColour(SERIAL_HUE);
this.appendDummyInput()
.appendField("Serial " + Blockly.Msg.MIXLY_SERIAL_BEGIN)
.appendField(new Blockly.FieldDropdown([['115200', '115200'], ['57600', '57600'], ['37400', '38400'], ['31250', '31250'], ['28800', '28800'], ['19200', '19200'], ['14400', '14400'], ['9600', '9600'], ['4800', '4800'], ['2400', '2400'], ['1200', '1200'], ['300', '300']]), 'baudrate');
.appendField(new Blockly.FieldDropdown([
['115200', '115200'],
['57600', '57600'],
['37400', '38400'],
['31250', '31250'],
['28800', '28800'],
['19200', '19200'],
['14400', '14400'],
['9600', '9600'],
['4800', '4800'],
['2400', '2400'],
['1200', '1200'],
['300', '300']
]), 'baudrate');
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
this.setInputsInline(true);
@@ -194,7 +241,7 @@ export const system_input = {
this.setOutput(true);
this.setTooltip(Blockly.Msg.INOUT_input_TOOLTIP);
}
}
};
export const system_print = {
init: function () {
@@ -233,10 +280,8 @@ export const system_print_end = {
};
export const system_print_many = {
init: function () {
this.setColour(SERIAL_HUE);
this.itemCount_ = 2;
this.updateShape_();
this.setPreviousStatement(false);
@@ -247,18 +292,15 @@ export const system_print_many = {
this.setNextStatement(true);
this.setTooltip(Blockly.Msg.MIXLY_MIXPY_INOUT_PRINT_MANY_TOOLTIP);
},
mutationToDom: function () {
var container = document.createElement('mutation');
container.setAttribute('items', this.itemCount_);
return container;
},
domToMutation: function (xmlElement) {
this.itemCount_ = parseInt(xmlElement.getAttribute('items'), 10);
this.updateShape_();
},
decompose: function (workspace) {
var containerBlock =
workspace.newBlock('system_print_container');
@@ -272,7 +314,6 @@ export const system_print_many = {
}
return containerBlock;
},
compose: function (containerBlock) {
var itemBlock = containerBlock.getInputTargetBlock('STACK');
// Count number of inputs.
@@ -294,7 +335,6 @@ export const system_print_many = {
}
}
},
saveConnections: function (containerBlock) {
var itemBlock = containerBlock.getInputTargetBlock('STACK');
var i = 0;
@@ -306,7 +346,6 @@ export const system_print_many = {
itemBlock.nextConnection.targetBlock();
}
},
updateShape_: function () {
// Delete everything.
if (this.getInput('EMPTY')) {
@@ -332,6 +371,7 @@ export const system_print_many = {
}
}
};
export const system_print_container = {
init: function () {
this.setColour(SERIAL_HUE);
@@ -365,7 +405,10 @@ export const serial_send_to_ai = {
this.appendDummyInput()
.appendField(Blockly.Msg.LANG_CONTROLS_FOR_INPUT_TO + Blockly.Msg.MIXLY_OTHER + 'MP' + Blockly.Msg.MIXLY_DEVICE)
.appendField(Blockly.Msg.LANG_CONTROLS_WHILEUNTIL_TITLE_REPEAT)
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.MIXLY_TURTLE_WRITE_MOVE_TRUE, 'True'], [Blockly.Msg.MIXLY_TURTLE_WRITE_MOVE_FALSE, 'False']]), 'STAT')
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_TURTLE_WRITE_MOVE_TRUE, 'True'],
[Blockly.Msg.MIXLY_TURTLE_WRITE_MOVE_FALSE, 'False']
]), 'STAT')
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
}

23
boards/default_src/micropython/blocks/system.js
View File

@@ -11,7 +11,11 @@ export const controls_delay_new = {
this.appendValueInput("DELAY_TIME", Number)
.setCheck(Number);
this.appendDummyInput("")
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.MIXLY_SECOND, "s"], [Blockly.Msg.MIXLY_mSecond, "ms"], [Blockly.Msg.MIXLY_uSecond, "us"]]), 'Time');
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_SECOND, "s"],
[Blockly.Msg.MIXLY_mSecond, "ms"],
[Blockly.Msg.MIXLY_uSecond, "us"]
]), 'Time');
this.setFieldValue('s', 'Time')
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
@@ -26,7 +30,11 @@ export const controls_delay = {
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_DELAY)
this.appendDummyInput("")
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.MIXLY_SECOND, "s"], [Blockly.Msg.MIXLY_mSecond, "ms"], [Blockly.Msg.MIXLY_uSecond, "us"]]), 'Time');
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_SECOND, "s"],
[Blockly.Msg.MIXLY_mSecond, "ms"],
[Blockly.Msg.MIXLY_uSecond, "us"]
]), 'Time');
this.appendValueInput("DELAY_TIME", Number)
.setCheck(Number);
this.setFieldValue('ms', 'Time')
@@ -67,7 +75,10 @@ export const controls_millis = {
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_RUNTIME);
this.appendDummyInput("")
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.MIXLY_mSecond, "ms"], [Blockly.Msg.MIXLY_uSecond, "us"]]), 'Time');
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_mSecond, "ms"],
[Blockly.Msg.MIXLY_uSecond, "us"]
]), 'Time');
this.setOutput(true, Number);
this.setInputsInline(true);
this.setTooltip(Blockly.Msg.MIXLY_ESP32_CONTROLS_MILLIS_TOOLTIP);
@@ -92,7 +103,6 @@ export const controls_uname = {
this.setColour(SYSTEM_HUE);
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_MICROBIT_PY_CONTORL_UNAME);
this.setInputsInline(true);
this.setOutput(true);
this.setTooltip(Blockly.Msg.PROCEDURES_DEFRETURN_RETURN + Blockly.Msg.MIXLY_MICROBIT_PY_CONTORL_UNAME);
@@ -137,7 +147,10 @@ export const system_timer = {
this.appendDummyInput("")
.appendField(Blockly.Msg.MIXLY_mSecond)
.appendField(Blockly.Msg.MIXLY_MODE)
.appendField(new Blockly.FieldDropdown([[Blockly.Msg.MIXLY_PYTHON_ONE_SHOT, "ONE_SHOT"], [Blockly.Msg.MIXLY_PYTHON_PERIODIC, "PERIODIC"]]), "mode");
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_PYTHON_ONE_SHOT, "ONE_SHOT"],
[Blockly.Msg.MIXLY_PYTHON_PERIODIC, "PERIODIC"]
]), "mode");
this.appendValueInput('callback')
.appendField(Blockly.Msg.MIXLY_DO)
this.setPreviousStatement(true);

4
boards/default_src/micropython/generators/actuator.js
View File

@@ -92,7 +92,7 @@ export const servo_move = function (_, generator) {
generator.definitions_['import_machine'] = 'import machine';
var dropdown_pin = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC);
var value_degree = generator.valueToCode(this, 'DEGREE', generator.ORDER_ATOMIC);
var code = 'servo.servo_write_angle(' + dropdown_pin + ',' + value_degree + ')\n';
var code = 'servo.servo_write_angle(' + dropdown_pin + ', ' + value_degree + ')\n';
return code;
}
@@ -160,7 +160,7 @@ export const actuator_neopixel_init = function (_, generator) {
var value_ledcount = generator.valueToCode(this, 'LEDCOUNT', generator.ORDER_ATOMIC);
generator.definitions_['import_machine'] = 'import machine';
generator.definitions_['import_neopixel'] = 'import neopixel';
var code = v + ' = neopixel.NeoPixel(machine.Pin(' + dropdown_rgbpin + '), ' + value_ledcount + ', timing = True)\n';
var code = v + ' = neopixel.NeoPixel(machine.Pin(' + dropdown_rgbpin + '), ' + value_ledcount + ', timing=True)\n';
return code;
}

101
boards/default_src/micropython/generators/actuator_extern.js
View File

@@ -20,7 +20,7 @@ export const servo_set_angle = function (_, generator) {
generator.definitions_['import_servo'] = 'import servo';
var dropdown_pin = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC);
var num = generator.valueToCode(this, 'NUM', generator.ORDER_ATOMIC);
var code = 'servo.servo180_angle(' + dropdown_pin + ',' + num + ')\n';
var code = 'servo.servo180_angle(' + dropdown_pin + ', ' + num + ')\n';
return code;
}
@@ -28,7 +28,7 @@ export const servo_set_speed = function (_, generator) {
generator.definitions_['import_servo'] = 'import servo';
var dropdown_pin = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC);
var num = generator.valueToCode(this, 'NUM', generator.ORDER_ATOMIC);
var code = 'servo.servo360_speed(' + dropdown_pin + ',' + num + ')\n';
var code = 'servo.servo360_speed(' + dropdown_pin + ', ' + num + ')\n';
return code;
}
@@ -51,7 +51,7 @@ export const actuator_ms32006_init = function (_, generator) {
var address = this.getFieldValue('mode')
var sub = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
var sub1 = generator.valueToCode(this, 'SUB1', generator.ORDER_ATOMIC);
var code = sub + '=ms32006.MS32006(' + sub1 + ',addr=' + address + ')\n';
var code = sub + '=ms32006.MS32006(' + sub1 + ', addr=' + address + ')\n';
return code;
}
@@ -60,7 +60,7 @@ export const actuator_ms32006_dcmotor = function (_, generator) {
var direction = this.getFieldValue('direction')
var sub = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
var speed = generator.valueToCode(this, 'speed', generator.ORDER_ATOMIC);
var code = sub + '.dc_motor(' + direction + ',' + speed + ')\n';
var code = sub + '.dc_motor(' + direction + ', ' + speed + ')\n';
return code;
}
@@ -71,7 +71,7 @@ export const actuator_ms32006_stepper = function (_, generator) {
var sub = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
var speed = generator.valueToCode(this, 'speed', generator.ORDER_ATOMIC);
var steps = generator.valueToCode(this, 'steps', generator.ORDER_ATOMIC);
var code = sub + '.move(' + mode + ',' + direction + ',' + speed + ',' + steps + ')\n';
var code = sub + '.move(' + mode + ', ' + direction + ', ' + speed + ', ' + steps + ')\n';
return code;
}
@@ -142,7 +142,7 @@ export const servo_move = function (_, generator) {
generator.definitions_['import_machine'] = 'import machine';
var dropdown_pin = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC);
var value_degree = generator.valueToCode(this, 'DEGREE', generator.ORDER_ATOMIC);
var code = 'servo.servo_write_angle(' + dropdown_pin + ',' + value_degree + ')\n';
var code = 'servo.servo_write_angle(' + dropdown_pin + ', ' + value_degree + ')\n';
return code;
}
@@ -229,7 +229,6 @@ export const actuator_use_uart_init = function (_, generator) {
var code = v + '=ns9300.NS9300(' + key + ')\n';
return code;
}
}
export const player_whether_stop = function (_, generator) {
@@ -288,7 +287,7 @@ export const syn6288_builtin_voice = function (_, generator) {
var v = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
var mode = this.getFieldValue('mode');
var voice = generator.valueToCode(this, 'VOICE', generator.ORDER_ASSIGNMENT);
var code = v + ".hint_tones(" + voice + ',blocking=' + mode + ")\n";
var code = v + ".hint_tones(" + voice + ', blocking=' + mode + ")\n";
return code;
}
@@ -298,7 +297,7 @@ export const syn6288_tts_play = function (_, generator) {
var mode = this.getFieldValue('mode');
var voice = generator.valueToCode(this, 'VOICE', generator.ORDER_ASSIGNMENT);
var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT);
var code = v + ".synthesis(" + data + ',music=' + voice + ',blocking=' + mode + ")\n";
var code = v + ".synthesis(" + data + ', music=' + voice + ', blocking=' + mode + ")\n";
return code;
}
@@ -320,11 +319,11 @@ export const robot_motor_extern = function (_, generator) {
generator.definitions_['import_machine'] = 'import machine';
generator.definitions_['import_i2cdevice'] = 'import i2cdevice';
if (mode == "0") {
generator.definitions_['import_left_ext_i2c'] = 'ext_i2c_left = i2cdevice.I2C_device(scl = machine.Pin(0), sda = machine.Pin(1), freq = 10000)';
generator.definitions_['import_left_ext_i2c'] = 'ext_i2c_left = i2cdevice.I2C_device(scl=machine.Pin(0), sda=machine.Pin(1), freq=10000)';
generator.definitions_['import_left_motor'] = 'ext_motor_left = i2cdevice.Motor(ext_i2c_left)';
var code = 'ext_motor_left.run(0,' + speed + ')\n';
} else if (mode == "1") {
generator.definitions_['import_right_ext_i2c'] = 'ext_i2c_right = i2cdevice.I2C_device(scl = machine.Pin(2), sda = machine.Pin(3), freq = 10000)';
generator.definitions_['import_right_ext_i2c'] = 'ext_i2c_right = i2cdevice.I2C_device(scl=machine.Pin(2), sda=machine.Pin(3), freq=10000)';
generator.definitions_['import_right_motor'] = 'ext_motor_right = i2cdevice.Motor(ext_i2c_right)';
var code = 'ext_motor_right.run(0,' + speed + ')\n';
}
@@ -342,11 +341,11 @@ export const robot_motor_extern_get_speed = function (_, generator) {
generator.definitions_['import_machine'] = 'import machine';
generator.definitions_['import_i2cdevice'] = 'import i2cdevice';
if (mode == "0") {
generator.definitions_['import_left_ext_i2c'] = 'ext_i2c_left = i2cdevice.I2C_device(scl = machine.Pin(0), sda = machine.Pin(1), freq = 10000)';
generator.definitions_['import_left_ext_i2c'] = 'ext_i2c_left = i2cdevice.I2C_device(scl=machine.Pin(0), sda=machine.Pin(1), freq=10000)';
generator.definitions_['import_left_motor'] = 'ext_motor_left = i2cdevice.Motor(ext_i2c_left)';
var code = 'ext_motor_left.run()';
} else if (mode == "1") {
generator.definitions_['import_right_ext_i2c'] = 'ext_i2c_right = i2cdevice.I2C_device(scl = machine.Pin(2), sda = machine.Pin(3), freq = 10000)';
generator.definitions_['import_right_ext_i2c'] = 'ext_i2c_right = i2cdevice.I2C_device(scl=machine.Pin(2), sda=machine.Pin(3), freq=10000)';
generator.definitions_['import_right_motor'] = 'ext_motor_right = i2cdevice.Motor(ext_i2c_right)';
var code = 'ext_motor_right.run()';
}
@@ -362,8 +361,8 @@ export const robot_traffic_light_extern = function (_, generator) {
generator.definitions_['import_mixbot_ext_ext_traffic'] = 'from mixbot_ext import ext_traffic';
var mode = this.getFieldValue('mode');
var light = this.getFieldValue('light');
var code = 'ext_traffic.led(' + mode + ',';
if (light == '0' || light == '1' || light == '2') { code += '0' + ',' }
var code = 'ext_traffic.led(' + mode + ', ';
if (light == '0' || light == '1' || light == '2') { code += '0' + ', ' }
else if (light == '3' || light == '4') { code += '1' + ',' }
else if (light == '5' || light == '6') { code += '2' + ',' }
if (light == '0') { code += '0' }
@@ -375,11 +374,11 @@ export const robot_traffic_light_extern = function (_, generator) {
generator.definitions_['import_machine'] = 'import machine';
generator.definitions_['import_i2cdevice'] = 'import i2cdevice';
if (mode == "0") {
generator.definitions_['import_left_ext_i2c'] = 'ext_i2c_left = i2cdevice.I2C_device(scl = machine.Pin(0), sda = machine.Pin(1), freq = 10000)';
generator.definitions_['import_left_ext_i2c'] = 'ext_i2c_left = i2cdevice.I2C_device(scl=machine.Pin(0), sda=machine.Pin(1), freq=10000)';
generator.definitions_['import_left_traffic'] = 'ext_traffic_left = i2cdevice.Traffic_LED(ext_i2c_left)';
var code = 'ext_traffic_left.led(0,';
} else if (mode == "1") {
generator.definitions_['import_right_ext_i2c'] = 'ext_i2c_right = i2cdevice.I2C_device(scl = machine.Pin(2), sda = machine.Pin(3), freq = 10000)';
generator.definitions_['import_right_ext_i2c'] = 'ext_i2c_right = i2cdevice.I2C_device(scl=machine.Pin(2), sda=machine.Pin(3), freq=10000)';
generator.definitions_['import_right_traffic'] = 'ext_traffic_right = i2cdevice.Traffic_LED(ext_i2c_right)';
var code = 'ext_traffic_right.led(0,';
}
@@ -401,19 +400,19 @@ export const robot_led_extern = function (_, generator) {
var value = generator.valueToCode(this, 'value', generator.ORDER_ATOMIC);
if (version == 'mixbot') {
generator.definitions_['import_mixbot_ext_' + color + '_LED'] = 'from mixbot_ext import ' + color + '_LED';
var code = color + '_LED.brightness(' + mode + ',' + value + ")\n";
var code = color + '_LED.brightness(' + mode + ', ' + value + ")\n";
return code;
} else if (version == 'feiyi') {
generator.definitions_['import_machine'] = 'import machine';
generator.definitions_['import_i2cdevice'] = 'import i2cdevice';
if (mode == "0") {
generator.definitions_['import_left_ext_i2c'] = 'ext_i2c_left = i2cdevice.I2C_device(scl = machine.Pin(0), sda = machine.Pin(1), freq = 10000)';
generator.definitions_['import_left_ext_i2c'] = 'ext_i2c_left = i2cdevice.I2C_device(scl=machine.Pin(0), sda=machine.Pin(1), freq=10000)';
generator.definitions_['import_left_' + color + '_LED'] = 'ext_' + color + '_LED_left = i2cdevice.' + color + '_LED(ext_i2c_left)';
var code = 'ext_' + color + '_LED_left.brightness(' + '0,' + value + ")\n";
var code = 'ext_' + color + '_LED_left.brightness(' + '0, ' + value + ")\n";
} else if (mode == "1") {
generator.definitions_['import_right_ext_i2c'] = 'ext_i2c_right = i2cdevice.I2C_device(scl = machine.Pin(2), sda = machine.Pin(3), freq = 10000)';
generator.definitions_['import_right_ext_i2c'] = 'ext_i2c_right = i2cdevice.I2C_device(scl=machine.Pin(2), sda=machine.Pin(3), freq=10000)';
generator.definitions_['import_right_' + color + '_LED'] = 'ext_' + color + '_LED_right = i2cdevice.' + color + '_LED(ext_i2c_right)';
var code = 'ext_' + color + '_LED_right.brightness(' + '0,' + value + ")\n";
var code = 'ext_' + color + '_LED_right.brightness(' + '0, ' + value + ")\n";
}
return code;
}
@@ -431,11 +430,11 @@ export const robot_led_extern_get_value = function (_, generator) {
generator.definitions_['import_machine'] = 'import machine';
generator.definitions_['import_i2cdevice'] = 'import i2cdevice';
if (mode == "0") {
generator.definitions_['import_left_ext_i2c'] = 'ext_i2c_left = i2cdevice.I2C_device(scl = machine.Pin(0), sda = machine.Pin(1), freq = 10000)';
generator.definitions_['import_left_ext_i2c'] = 'ext_i2c_left = i2cdevice.I2C_device(scl=machine.Pin(0), sda=machine.Pin(1), freq=10000)';
generator.definitions_['import_left_' + color + '_LED'] = 'ext_' + color + '_LED_left = i2cdevice.' + color + '_LED(ext_i2c_left)';
var code = 'ext_' + color + '_LED_left.brightness(0)';
} else if (mode == "1") {
generator.definitions_['import_right_ext_i2c'] = 'ext_i2c_right = i2cdevice.I2C_device(scl = machine.Pin(2), sda = machine.Pin(3), freq = 10000)';
generator.definitions_['import_right_ext_i2c'] = 'ext_i2c_right = i2cdevice.I2C_device(scl=machine.Pin(2), sda=machine.Pin(3), freq=10000)';
generator.definitions_['import_right_' + color + '_LED'] = 'ext_' + color + '_LED_right = i2cdevice.' + color + '_LED(ext_i2c_right)';
var code = 'ext_' + color + '_LED_right.brightness(0)';
}
@@ -455,11 +454,11 @@ export const robot_servo_extern_get_status = function (_, generator) {
generator.definitions_['import_machine'] = 'import machine';
generator.definitions_['import_i2cdevice'] = 'import i2cdevice';
if (mode == "0") {
generator.definitions_['import_left_ext_i2c'] = 'ext_i2c_left = i2cdevice.I2C_device(scl = machine.Pin(0), sda = machine.Pin(1), freq = 10000)';
generator.definitions_['import_left_ext_i2c'] = 'ext_i2c_left = i2cdevice.I2C_device(scl=machine.Pin(0), sda=machine.Pin(1), freq=10000)';
generator.definitions_['import_left_servo'] = 'ext_servo_left = i2cdevice.Motor_servo(ext_i2c_left)';
var code = 'ext_servo_left.state(0)' + status;
} else if (mode == "1") {
generator.definitions_['import_right_ext_i2c'] = 'ext_i2c_right = i2cdevice.I2C_device(scl = machine.Pin(2), sda = machine.Pin(3), freq = 10000)';
generator.definitions_['import_right_ext_i2c'] = 'ext_i2c_right = i2cdevice.I2C_device(scl=machine.Pin(2), sda=machine.Pin(3), freq=10000)';
generator.definitions_['import_right_servo'] = 'ext_servo_right = i2cdevice.Motor_servo(ext_i2c_right)';
var code = 'ext_servo_right.state(0)' + status;
}
@@ -473,19 +472,19 @@ export const robot_servo_extern_stop_mode = function (_, generator) {
var status = this.getFieldValue('status');
if (version == 'mixbot') {
generator.definitions_['import_mixbot_ext_ext_servo'] = 'from mixbot_ext import ext_servo';
var code = 'ext_servo.stop_mode(' + mode + "," + status + ")\n";
var code = 'ext_servo.stop_mode(' + mode + ", " + status + ")\n";
return code;
} else if (version == 'feiyi') {
generator.definitions_['import_machine'] = 'import machine';
generator.definitions_['import_i2cdevice'] = 'import i2cdevice';
if (mode == "0") {
generator.definitions_['import_left_ext_i2c'] = 'ext_i2c_left = i2cdevice.I2C_device(scl = machine.Pin(0), sda = machine.Pin(1), freq = 10000)';
generator.definitions_['import_left_ext_i2c'] = 'ext_i2c_left=i2cdevice.I2C_device(scl=machine.Pin(0), sda=machine.Pin(1), freq=10000)';
generator.definitions_['import_left_servo'] = 'ext_servo_left = i2cdevice.Motor_servo(ext_i2c_left)';
var code = 'ext_servo_left.stop_mode(' + "0," + status + ")\n";
var code = 'ext_servo_left.stop_mode(' + "0, " + status + ")\n";
} else if (mode == "1") {
generator.definitions_['import_right_ext_i2c'] = 'ext_i2c_right = i2cdevice.I2C_device(scl = machine.Pin(2), sda = machine.Pin(3), freq = 10000)';
generator.definitions_['import_right_ext_i2c'] = 'ext_i2c_right = i2cdevice.I2C_device(scl=machine.Pin(2), sda=machine.Pin(3), freq=10000)';
generator.definitions_['import_right_servo'] = 'ext_servo_right = i2cdevice.Motor_servo(ext_i2c_right)';
var code = 'ext_servo_right.stop_mode(' + "0," + status + ")\n";
var code = 'ext_servo_right.stop_mode(' + "0, " + status + ")\n";
}
return code;
}
@@ -502,11 +501,11 @@ export const robot_servo_extern_stop = function (_, generator) {
generator.definitions_['import_machine'] = 'import machine';
generator.definitions_['import_i2cdevice'] = 'import i2cdevice';
if (mode == "0") {
generator.definitions_['import_left_ext_i2c'] = 'ext_i2c_left = i2cdevice.I2C_device(scl = machine.Pin(0), sda = machine.Pin(1), freq = 10000)';
generator.definitions_['import_left_ext_i2c'] = 'ext_i2c_left = i2cdevice.I2C_device(scl=machine.Pin(0), sda=machine.Pin(1), freq=10000)';
generator.definitions_['import_left_servo'] = 'ext_servo_left = i2cdevice.Motor_servo(ext_i2c_left)';
var code = 'ext_servo_left.stop(0)\n';
} else if (mode == "1") {
generator.definitions_['import_right_ext_i2c'] = 'ext_i2c_right = i2cdevice.I2C_device(scl = machine.Pin(2), sda = machine.Pin(3), freq = 10000)';
generator.definitions_['import_right_ext_i2c'] = 'ext_i2c_right = i2cdevice.I2C_device(scl=machine.Pin(2), sda=machine.Pin(3), freq=10000)';
generator.definitions_['import_right_servo'] = 'ext_servo_right = i2cdevice.Motor_servo(ext_i2c_right)';
var code = 'ext_servo_right.stop(0)\n';
}
@@ -523,19 +522,19 @@ export const robot_servo_extern_absolute_run = function (_, generator) {
var angle = generator.valueToCode(this, 'angle', generator.ORDER_ATOMIC);
if (version == 'mixbot') {
generator.definitions_['import_mixbot_ext_ext_servo'] = 'from mixbot_ext import ext_servo';
var code = 'ext_servo.absolute_run(' + mode + "," + status + "," + speed + "," + direction + "," + angle + ")\n";
var code = 'ext_servo.absolute_run(' + mode + ", " + status + ", " + speed + ", " + direction + ", " + angle + ")\n";
return code;
} else if (version == 'feiyi') {
generator.definitions_['import_machine'] = 'import machine';
generator.definitions_['import_i2cdevice'] = 'import i2cdevice';
if (mode == "0") {
generator.definitions_['import_left_ext_i2c'] = 'ext_i2c_left = i2cdevice.I2C_device(scl = machine.Pin(0), sda = machine.Pin(1), freq = 10000)';
generator.definitions_['import_left_ext_i2c'] = 'ext_i2c_left = i2cdevice.I2C_device(scl=machine.Pin(0), sda=machine.Pin(1), freq=10000)';
generator.definitions_['import_left_servo'] = 'ext_servo_left = i2cdevice.Motor_servo(ext_i2c_left)';
var code = 'ext_servo_left.absolute_run(' + "0," + status + "," + speed + "," + direction + "," + angle + ")\n";
var code = 'ext_servo_left.absolute_run(' + "0, " + status + ", " + speed + ", " + direction + ", " + angle + ")\n";
} else if (mode == "1") {
generator.definitions_['import_right_ext_i2c'] = 'ext_i2c_right = i2cdevice.I2C_device(scl = machine.Pin(2), sda = machine.Pin(3), freq = 10000)';
generator.definitions_['import_right_ext_i2c'] = 'ext_i2c_right = i2cdevice.I2C_device(scl=machine.Pin(2), sda=machine.Pin(3), freq=10000)';
generator.definitions_['import_right_servo'] = 'ext_servo_right = i2cdevice.Motor_servo(ext_i2c_right)';
var code = 'ext_servo_right.absolute_run(' + "0," + status + "," + speed + "," + direction + "," + angle + ")\n";
var code = 'ext_servo_right.absolute_run(' + "0, " + status + ", " + speed + ", " + direction + ", " + angle + ")\n";
}
return code;
}
@@ -552,11 +551,11 @@ export const robot_servo_extern_relative_origin = function (_, generator) {
generator.definitions_['import_machine'] = 'import machine';
generator.definitions_['import_i2cdevice'] = 'import i2cdevice';
if (mode == "0") {
generator.definitions_['import_left_ext_i2c'] = 'ext_i2c_left = i2cdevice.I2C_device(scl = machine.Pin(0), sda = machine.Pin(1), freq = 10000)';
generator.definitions_['import_left_ext_i2c'] = 'ext_i2c_left = i2cdevice.I2C_device(scl=machine.Pin(0), sda=machine.Pin(1), freq=10000)';
generator.definitions_['import_left_servo'] = 'ext_servo_left = i2cdevice.Motor_servo(ext_i2c_left)';
var code = 'ext_servo_left.relative_origin(0)\n';
} else if (mode == "1") {
generator.definitions_['import_right_ext_i2c'] = 'ext_i2c_right = i2cdevice.I2C_device(scl = machine.Pin(2), sda = machine.Pin(3), freq = 10000)';
generator.definitions_['import_right_ext_i2c'] = 'ext_i2c_right = i2cdevice.I2C_device(scl=machine.Pin(2), sda=machine.Pin(3), freq=10000)';
generator.definitions_['import_right_servo'] = 'ext_servo_right = i2cdevice.Motor_servo(ext_i2c_right)';
var code = 'ext_servo_right.relative_origin(0)\n';
}
@@ -572,19 +571,19 @@ export const robot_servo_extern_relative_run = function (_, generator) {
var angle = generator.valueToCode(this, 'angle', generator.ORDER_ATOMIC);
if (version == 'mixbot') {
generator.definitions_['import_mixbot_ext_ext_servo'] = 'from mixbot_ext import ext_servo';
var code = 'ext_servo.relative_run(' + mode + "," + status + "," + speed + "," + angle + ")\n";
var code = 'ext_servo.relative_run(' + mode + ", " + status + ", " + speed + ", " + angle + ")\n";
return code;
} else if (version == 'feiyi') {
generator.definitions_['import_machine'] = 'import machine';
generator.definitions_['import_i2cdevice'] = 'import i2cdevice';
if (mode == "0") {
generator.definitions_['import_left_ext_i2c'] = 'ext_i2c_left = i2cdevice.I2C_device(scl = machine.Pin(0), sda = machine.Pin(1), freq = 10000)';
generator.definitions_['import_left_ext_i2c'] = 'ext_i2c_left = i2cdevice.I2C_device(scl=machine.Pin(0), sda=machine.Pin(1), freq=10000)';
generator.definitions_['import_left_servo'] = 'ext_servo_left = i2cdevice.Motor_servo(ext_i2c_left)';
var code = 'ext_servo_left.relative_run(' + "0," + status + "," + speed + "," + angle + ")\n";
var code = 'ext_servo_left.relative_run(' + "0, " + status + ", " + speed + ", " + angle + ")\n";
} else if (mode == "1") {
generator.definitions_['import_right_ext_i2c'] = 'ext_i2c_right = i2cdevice.I2C_device(scl = machine.Pin(2), sda = machine.Pin(3), freq = 10000)';
generator.definitions_['import_right_ext_i2c'] = 'ext_i2c_right = i2cdevice.I2C_device(scl=machine.Pin(2), sda=machine.Pin(3), freq=10000)';
generator.definitions_['import_right_servo'] = 'ext_servo_right = i2cdevice.Motor_servo(ext_i2c_right)';
var code = 'ext_servo_right.relative_run(' + "0," + status + "," + speed + "," + angle + ")\n";
var code = 'ext_servo_right.relative_run(' + "0, " + status + ", " + speed + ", " + angle + ")\n";
}
return code;
}
@@ -598,19 +597,19 @@ export const robot_servo_extern_relative_continue = function (_, generator) {
var direction = this.getFieldValue('direction');
if (version == 'mixbot') {
generator.definitions_['import_mixbot_ext_ext_servo'] = 'from mixbot_ext import ext_servo';
var code = 'ext_servo.relative_continue(' + mode + "," + status + "," + speed + "," + direction + ")\n";
var code = 'ext_servo.relative_continue(' + mode + ", " + status + ", " + speed + ", " + direction + ")\n";
return code;
} else if (version == 'feiyi') {
generator.definitions_['import_machine'] = 'import machine';
generator.definitions_['import_i2cdevice'] = 'import i2cdevice';
if (mode == "0") {
generator.definitions_['import_left_ext_i2c'] = 'ext_i2c_left = i2cdevice.I2C_device(scl = machine.Pin(0), sda = machine.Pin(1), freq = 10000)';
generator.definitions_['import_left_ext_i2c'] = 'ext_i2c_left = i2cdevice.I2C_device(scl=machine.Pin(0), sda=machine.Pin(1), freq=10000)';
generator.definitions_['import_left_servo'] = 'ext_servo_left = i2cdevice.Motor_servo(ext_i2c_left)';
var code = 'ext_servo_left.relative_continue(' + "0," + status + "," + speed + "," + direction + ")\n";
var code = 'ext_servo_left.relative_continue(' + "0, " + status + ", " + speed + ", " + direction + ")\n";
} else if (mode == "1") {
generator.definitions_['import_right_ext_i2c'] = 'ext_i2c_right = i2cdevice.I2C_device(scl = machine.Pin(2), sda = machine.Pin(3), freq = 10000)';
generator.definitions_['import_right_ext_i2c'] = 'ext_i2c_right = i2cdevice.I2C_device(scl=machine.Pin(2), sda=machine.Pin(3), freq=10000)';
generator.definitions_['import_right_servo'] = 'ext_servo_right = i2cdevice.Motor_servo(ext_i2c_right)';
var code = 'ext_servo_right.relative_continue(' + "0," + status + "," + speed + "," + direction + ")\n";
var code = 'ext_servo_right.relative_continue(' + "0, " + status + ", " + speed + ", " + direction + ")\n";
}
return code;
}
@@ -628,7 +627,7 @@ export const mixbot_actuator_extern_set_addr = function (_, generator) {
generator.definitions_['import_mixbot_ext_' + name] = 'from mixbot_ext import ' + name;
var oldaddr = generator.valueToCode(this, 'old', generator.ORDER_ATOMIC);
var newaddr = generator.valueToCode(this, 'new', generator.ORDER_ATOMIC);
var code = name + '.addr_set(' + oldaddr + ',' + newaddr + ')\n';
var code = name + '.addr_set(' + oldaddr + ', ' + newaddr + ')\n';
return code;
}

43
boards/default_src/micropython/generators/actuator_onboard.js
View File

@@ -149,7 +149,7 @@ export const actuator_led_brightness = function (_, generator) {
}
}else{
generator.definitions_['import_' + version + '_onboard_led'] = 'from ' + version + ' import onboard_led';
var code = "onboard_led.setbrightness(" + op + "," + flag + ")\n";
var code = "onboard_led.setbrightness(" + op + ", " + flag + ")\n";
}
return code;
}
@@ -159,7 +159,7 @@ export const actuator_mixgo_zero_led_color = function (_, generator) {
var op = generator.valueToCode(this, 'led', generator.ORDER_ATOMIC);
generator.definitions_['import_' + version + '_onboard_led'] = 'from ' + version + ' import onboard_led';
var color = this.getFieldValue('colorvalue');
var code = "onboard_led.setcolor(" + op + "," + color + ")\n";
var code = "onboard_led.setcolor(" + op + ", " + color + ")\n";
return code;
}
@@ -279,7 +279,7 @@ export const actuator_dc_motor = function (_, generator) {
generator.definitions_['import_mixgocar_c3_car'] = 'from mixgocar_c3 import car';
var v = this.getFieldValue('direction');
var speed = generator.valueToCode(this, 'speed', generator.ORDER_ATOMIC);
var code = "car.motor(car.MOTO_" + wheel + ',"' + v + '",' + speed + ")\n";
var code = "car.motor(car.MOTO_" + wheel + ', "' + v + '", ' + speed + ")\n";
return code;
}
@@ -287,7 +287,7 @@ export const actuator_dc_motor_stop = function (_, generator) {
var wheel = this.getFieldValue('wheel');
generator.definitions_['import_mixgocar_c3_car'] = 'from mixgocar_c3 import car';
var v = this.getFieldValue('direction');
var code = "car.motor(car.MOTO_" + wheel + ',"' + v + '"' + ")\n";
var code = "car.motor(car.MOTO_" + wheel + ', "' + v + '"' + ")\n";
return code;
}
@@ -304,7 +304,7 @@ export const mixbot_move = function (_, generator) {
var mode = this.getFieldValue('mode');
generator.definitions_['import_mixbot_motor'] = 'from mixbot import motor';
var speed = generator.valueToCode(this, 'speed', generator.ORDER_ASSIGNMENT);
var code = 'motor.move("' + v + '",motor.' + mode + '_MODE,' + speed + ")\n";
var code = 'motor.move("' + v + '", motor.' + mode + '_MODE,' + speed + ")\n";
return code;
}
@@ -312,9 +312,9 @@ export const mixbot_stop = function (_, generator) {
var v = this.getFieldValue('VAR');
generator.definitions_['import_mixbot_motor'] = 'from mixbot import motor';
if (v == 'N') {
var code = 'motor.move("N",motor.STOP_MODE)\n'
var code = 'motor.move("N", motor.STOP_MODE)\n'
} else if (v == 'P') {
var code = 'motor.move("P",motor.BRAKE_MODE)\n'
var code = 'motor.move("P", motor.BRAKE_MODE)\n'
}
return code;
}
@@ -324,7 +324,7 @@ export const mixbot_motor = function (_, generator) {
generator.definitions_['import_mixbot_motor'] = 'from mixbot import motor';
var mode = this.getFieldValue('mode');
var speed = generator.valueToCode(this, 'speed', generator.ORDER_ATOMIC);
var code = 'motor.run(' + wheel + ',motor.' + mode + '_MODE,' + speed + ")\n";
var code = 'motor.run(' + wheel + ', motor.' + mode + '_MODE, ' + speed + ")\n";
return code;
}
@@ -341,7 +341,7 @@ export const bitbot_move = function (_, generator) {
var v = this.getFieldValue('VAR');
generator.definitions_['import_feiyi_onboard_bot51'] = 'from feiyi import onboard_bot51';
var speed = generator.valueToCode(this, 'speed', generator.ORDER_ASSIGNMENT);
var code = 'onboard_bot51.move("' + v + '",' + speed + ")\n";
var code = 'onboard_bot51.move("' + v + '", ' + speed + ")\n";
return code;
}
@@ -357,7 +357,7 @@ export const bitbot_motor = function (_, generator) {
var direction = this.getFieldValue('direction');
generator.definitions_['import_feiyi_onboard_bot51'] = 'from feiyi import onboard_bot51';
var speed = generator.valueToCode(this, 'speed', generator.ORDER_ATOMIC);
var code = 'onboard_bot51.motor(' + wheel + ',"' + direction + '",' + speed + ")\n";
var code = 'onboard_bot51.motor(' + wheel + ', "' + direction + '", ' + speed + ")\n";
return code;
}
@@ -464,7 +464,7 @@ export const set_power_output = function (_, generator) {
var index = this.getFieldValue('index');
var duty = generator.valueToCode(this, 'duty', generator.ORDER_ATOMIC);
generator.definitions_['import_' + version + '_onboard_bot'] = 'from ' + version + ' import onboard_bot';
var code = 'onboard_bot.usben(' + index + ',' + duty + ')\n';
var code = 'onboard_bot.usben(' + index + ', ' + duty + ')\n';
return code;
}
@@ -480,7 +480,7 @@ export const set_all_power_output = function (_, generator) {
var version = Boards.getSelectedBoardKey().split(':')[2];
var duty = generator.valueToCode(this, 'duty', generator.ORDER_ATOMIC);
generator.definitions_['import_' + version + '_onboard_bot'] = 'from ' + version + ' import onboard_bot';
var code = 'onboard_bot.usben(freq = ' + duty + ')\n';
var code = 'onboard_bot.usben(freq=' + duty + ')\n';
return code;
}
@@ -490,7 +490,7 @@ export const analog_keyboard_input = function (_, generator) {
var ge = generator.valueToCode(this, 'general', generator.ORDER_ATOMIC);
var re = this.getFieldValue('release');
generator.definitions_['import_' + version + '_onboard_bot'] = 'from ' + version + ' import onboard_bot';
var code = "onboard_bot.hid_keyboard(" + sp + "," + ge + "," + re + ")\n";
var code = "onboard_bot.hid_keyboard(" + sp + ", " + ge + ", " + re + ")\n";
return code;
}
@@ -512,7 +512,7 @@ export const analog_mouse_input = function (_, generator) {
var wheel = generator.valueToCode(this, 'wheel', generator.ORDER_ATOMIC);
var re = this.getFieldValue('release');
generator.definitions_['import_' + version + '_onboard_bot'] = 'from ' + version + ' import onboard_bot';
var code = "onboard_bot.hid_mouse(keys=" + key + ",move=(" + x + "," + y + "),wheel=" + wheel + ",release=" + re + ")\n";
var code = "onboard_bot.hid_mouse(keys=" + key + ", move=(" + x + ", " + y + "), wheel=" + wheel + ", release=" + re + ")\n";
return code;
}
@@ -526,7 +526,7 @@ export const analog_keyboard_str = function (_, generator) {
var str = generator.valueToCode(this, 'str', generator.ORDER_ATOMIC);
var t = generator.valueToCode(this, 'time', generator.ORDER_ATOMIC);
generator.definitions_['import_' + version + '_onboard_bot'] = 'from ' + version + ' import onboard_bot';
var code = "onboard_bot.hid_keyboard_str(" + str + ",delay=" + t + ")\n";
var code = "onboard_bot.hid_keyboard_str(" + str + ", delay=" + t + ")\n";
return code;
}
@@ -571,7 +571,7 @@ export const analog_ble_keyboard_input = function (_, generator) {
var ge = generator.valueToCode(this, 'general', generator.ORDER_ATOMIC);
var re = this.getFieldValue('release');
generator.definitions_['import_ble_keyboard'] = 'from ble_hid_keyboard import Keyboard';
var code = "ble_keyboard.notify_hid(" + sp + "," + ge + "," + re + ")\n";
var code = "ble_keyboard.notify_hid(" + sp + ", " + ge + ", " + re + ")\n";
return code;
}
@@ -579,7 +579,7 @@ export const analog_ble_keyboard_str = function (_, generator) {
var str = generator.valueToCode(this, 'str', generator.ORDER_ATOMIC);
var t = generator.valueToCode(this, 'time', generator.ORDER_ATOMIC);
generator.definitions_['import_ble_keyboard'] = 'from ble_hid_keyboard import Keyboard';
var code = "ble_keyboard.notify_str(" + str + ",delay=" + t + ")\n";
var code = "ble_keyboard.notify_str(" + str + ", delay=" + t + ")\n";
return code;
}
@@ -616,7 +616,7 @@ export const analog_ble_mouse_input = function (_, generator) {
var wheel = generator.valueToCode(this, 'wheel', generator.ORDER_ATOMIC);
var re = this.getFieldValue('release');
generator.definitions_['import_ble_mouse'] = 'from ble_hid_mouse import Mouse';
var code = "ble_mouse.notify_hid(" + key + ",(" + x + "," + y + ")," + wheel + "," + re + ")\n";
var code = "ble_mouse.notify_hid(" + key + ", (" + x + ", " + y + "), " + wheel + ", " + re + ")\n";
return code;
}
@@ -658,7 +658,7 @@ export const analog_ble_keyboard_mouse_input = function (_, generator) {
var ge = generator.valueToCode(this, 'general', generator.ORDER_ATOMIC);
var re = this.getFieldValue('release');
generator.definitions_['import_HID_ble_hid'] = 'from ble_hid import HID';
var code = "ble_hid.keyboard_notify(" + sp + "," + ge + "," + re + ")\n";
var code = "ble_hid.keyboard_notify(" + sp + ", " + ge + ", " + re + ")\n";
return code;
}
@@ -666,7 +666,7 @@ export const analog_ble_keyboard_mouse_str = function (_, generator) {
var str = generator.valueToCode(this, 'str', generator.ORDER_ATOMIC);
var t = generator.valueToCode(this, 'time', generator.ORDER_ATOMIC);
generator.definitions_['import_HID_ble_hid'] = 'from ble_hid import HID';
var code = "ble_hid.keyboard_str(" + str + ",delay=" + t + ")\n";
var code = "ble_hid.keyboard_str(" + str + ", delay=" + t + ")\n";
return code;
}
@@ -677,7 +677,7 @@ export const analog_ble_mouse_keyboard_input = function (_, generator) {
var wheel = generator.valueToCode(this, 'wheel', generator.ORDER_ATOMIC);
var re = this.getFieldValue('release');
generator.definitions_['import_HID_ble_hid'] = 'from ble_hid import HID';
var code = "ble_hid.mouse_notify(" + key + ",(" + x + "," + y + ")," + wheel + "," + re + ")\n";
var code = "ble_hid.mouse_notify(" + key + ", (" + x + ", " + y + ") ," + wheel + ", " + re + ")\n";
return code;
}
//educore actuator
@@ -773,5 +773,4 @@ export const get_keyboard_light = function (_,generator){
var key = this.getFieldValue('key');
var code = "onboard_bot.hid_keyboard_state()["+ key +']';
return [code,generator.ORDER_ATOMIC]
}

2
boards/default_src/micropython/generators/ai.js
View File

@@ -30,7 +30,7 @@ export const MICROPYTHON_AI_Speech_asr = function (_, generator) {
generator.definitions_['import_baidu_speech'] = 'import baidu_speech';
var v = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
var fn = generator.valueToCode(this, 'FILE', generator.ORDER_ATOMIC) || '""';
var code = v + '.recognize(record_time=' + fn + ',dev_pid=' + language + ')';
var code = v + '.recognize(record_time=' + fn + ', dev_pid=' + language + ')';
return [code, generator.ORDER_ATOMIC];
}

24
boards/default_src/micropython/generators/ai_sensor.js
View File

@@ -2,7 +2,7 @@ export const ai_sensor_use_uart_init = function (_, generator) {
generator.definitions_['import_mixgo_ai'] = 'import mixgo_ai';
var v = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
var key = this.getFieldValue('key');
var code = v + '=mixgo_ai.AI(' + key + ',quick=1)\n';
var code = v + '=mixgo_ai.AI(' + key + ', quick=1)\n';
return code;
}
@@ -20,7 +20,7 @@ export const ai_sensor_config = function (_, generator) {
var rx = generator.valueToCode(this, 'RX', generator.ORDER_ATOMIC);
var tx = generator.valueToCode(this, 'TX', generator.ORDER_ATOMIC);
var dropdown_uart = this.getFieldValue('mode');
var code = v + '.configure(' + tx + ',' + rx + ',restart=' + dropdown_uart + ')\n';
var code = v + '.configure(' + tx + ', ' + rx + ', restart=' + dropdown_uart + ')\n';
return code;
}
@@ -29,7 +29,7 @@ export const ai_sensor_rgb = function (_, generator) {
var v = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
var led1 = generator.valueToCode(this, 'led1', generator.ORDER_ATOMIC);
var led2 = generator.valueToCode(this, 'led2', generator.ORDER_ATOMIC);
var code = v + '.led_rgb(' + led1 + ',' + led2 + ')\n';
var code = v + '.led_rgb(' + led1 + ', ' + led2 + ')\n';
return code;
}
@@ -92,7 +92,7 @@ export const ai_sensor_find_lines = function (_, generator) {
var v1 = generator.valueToCode(this, 'VAR1', generator.ORDER_ATOMIC);
var v2 = generator.valueToCode(this, 'VAR2', generator.ORDER_ATOMIC);
var v3 = generator.valueToCode(this, 'VAR3', generator.ORDER_ATOMIC);
var code = v + '.find_lines(' + v1 + ',' + v2 + ',' + v3 + ')';
var code = v + '.find_lines(' + v1 + ', ' + v2 + ', ' + v3 + ')';
return [code, generator.ORDER_ATOMIC];
}
@@ -110,7 +110,7 @@ export const ai_sensor_find_circles = function (_, generator) {
var v1 = generator.valueToCode(this, 'VAR1', generator.ORDER_ATOMIC);
var v2 = generator.valueToCode(this, 'VAR2', generator.ORDER_ATOMIC);
var v3 = generator.valueToCode(this, 'VAR3', generator.ORDER_ATOMIC);
var code = v + '.find_circles(' + v1 + ',' + v2 + ',' + v3 + ')';
var code = v + '.find_circles(' + v1 + ', ' + v2 + ', ' + v3 + ')';
return [code, generator.ORDER_ATOMIC];
}
@@ -159,7 +159,7 @@ export const ai_sensor_color_chases = function (_, generator) {
var v1 = generator.valueToCode(this, 'VAR1', generator.ORDER_ATOMIC);
var v2 = generator.valueToCode(this, 'VAR2', generator.ORDER_ATOMIC);
var v3 = generator.valueToCode(this, 'VAR3', generator.ORDER_ATOMIC);
var code = v + '.color_track(' + v1 + ',' + v2 + ',' + v3 + ')';
var code = v + '.color_track(' + v1 + ', ' + v2 + ', ' + v3 + ')';
return [code, generator.ORDER_ATOMIC];
}
@@ -170,7 +170,7 @@ export const ai_sensor_ailocal_train = function (_, generator) {
var v2 = generator.valueToCode(this, 'VAR2', generator.ORDER_ATOMIC);
var v3 = generator.valueToCode(this, 'VAR3', generator.ORDER_ATOMIC);
var v4 = generator.valueToCode(this, 'VAR4', generator.ORDER_ATOMIC);
var code = v + '.ailocal_train(' + v1 + ',' + v2 + ',' + v3 + ',' + v4 + ')\n';
var code = v + '.ailocal_train(' + v1 + ', ' + v2 + ', ' + v3 + ', ' + v4 + ')\n';
return code;
}
@@ -180,7 +180,7 @@ export const ai_sensor_ailocal_class = function (_, generator) {
var v1 = generator.valueToCode(this, 'VAR1', generator.ORDER_ATOMIC);
var v2 = generator.valueToCode(this, 'VAR2', generator.ORDER_ATOMIC);
var v4 = generator.valueToCode(this, 'VAR4', generator.ORDER_ATOMIC);
var code = v + '.ailocal_class(' + v1 + ',' + v2 + ',' + v4 + ')';
var code = v + '.ailocal_class(' + v1 + ', ' + v2 + ', ' + v4 + ')';
return [code, generator.ORDER_ATOMIC];
}
@@ -197,7 +197,7 @@ export const ai_sensor_audio_record = function (_, generator) {
var v = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
var v1 = generator.valueToCode(this, 'VAR1', generator.ORDER_ATOMIC);
var v2 = generator.valueToCode(this, 'VAR2', generator.ORDER_ATOMIC);
var code = v + '.audio_record(path=' + v1 + ',times=' + v2 + ')\n';
var code = v + '.audio_record(path=' + v1 + ', times=' + v2 + ')\n';
return code;
}
@@ -206,7 +206,7 @@ export const ai_sensor_audio_play = function (_, generator) {
var v = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
var v1 = generator.valueToCode(this, 'VAR1', generator.ORDER_ATOMIC);
var v2 = generator.valueToCode(this, 'VAR2', generator.ORDER_ATOMIC);
var code = v + '.audio_play(path=' + v1 + ',volume=' + v2 + ')\n';
var code = v + '.audio_play(path=' + v1 + ', volume=' + v2 + ')\n';
return code;
}
@@ -216,7 +216,7 @@ export const ai_sensor_yolo_recognize = function (_, generator) {
var v1 = generator.valueToCode(this, 'VAR1', generator.ORDER_ATOMIC);
var v2 = generator.valueToCode(this, 'VAR2', generator.ORDER_ATOMIC);
var v4 = generator.valueToCode(this, 'VAR4', generator.ORDER_ATOMIC);
var code = v + '.yolo_recognize(' + v1 + ',' + v2 + ',' + v4 + ')';
var code = v + '.yolo_recognize(' + v1 + ', ' + v2 + ', ' + v4 + ')';
return [code, generator.ORDER_ATOMIC];
}
@@ -233,7 +233,7 @@ export const ai_sensor_asr_recognize = function (_, generator) {
var v = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
var v1 = generator.valueToCode(this, 'VAR1', generator.ORDER_ATOMIC);
var v2 = generator.valueToCode(this, 'VAR2', generator.ORDER_ATOMIC);
var code = v + '.asr_recognize(' + v1 + ',threshold=' + v2 + ')';
var code = v + '.asr_recognize(' + v1 + ', threshold=' + v2 + ')';
return [code, generator.ORDER_ATOMIC];
}

3
boards/default_src/micropython/generators/blynk.js
View File

@@ -143,7 +143,6 @@ export const mpython_blynktimer = function (_, generator) {
def blynk_timer${Num}():
`
+ branch;
return '';
}
@@ -191,9 +190,7 @@ export const mpython_blynk_email = function (_, generator) {
export const mpython_blynk_set_property = function (_, generator) {
var attribute_value = generator.valueToCode(this, 'attribute_value', generator.ORDER_ATOMIC);
var attribute_name = generator.valueToCode(this, 'attribute_name', generator.ORDER_ATOMIC);
var code = `blynk.set_property(pin, ${attribute_name}, ${attribute_value})` + '\n';
return code;
}

111
boards/default_src/micropython/generators/ce_go.js
View File

@@ -6,7 +6,7 @@ export const ce_go_light_number = function (_, generator) {
generator.definitions_['import_me_go_car'] = 'from me_go import car';
} else if (version == "mixgo_ce") {
generator.definitions_['import_ce_go_car'] = 'from ce_go import car';
}else if (version == "mixgo_mini"){
} else if (version == "mixgo_mini") {
generator.definitions_['import_mini_go_car'] = 'from mini_go import car';
}
var code = 'car.' + this.getFieldValue('op');
@@ -17,15 +17,14 @@ export const ce_go_led_bright = function (_, generator) {
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2]
if (version == "mixgo_me" || version == "mixgo_cc") {
generator.definitions_['import_me_go_car'] = 'from me_go import car';
}else if (version == "mixgo_mini"){
} else if (version == "mixgo_mini") {
generator.definitions_['import_mini_go_car'] = 'from mini_go import car';
}
else if (version == "mixgo_ce") {
} else if (version == "mixgo_ce") {
generator.definitions_['import_ce_go_car'] = 'from ce_go import car';
}
var op = generator.valueToCode(this, 'led', generator.ORDER_ATOMIC);
var bright = generator.valueToCode(this, 'bright', generator.ORDER_ATOMIC);
var code = "car.setonoff(" + op + "," + bright + ")\n";
var code = "car.setonoff(" + op + ", " + bright + ")\n";
return code;
}
@@ -33,10 +32,9 @@ export const ce_go_get_led_bright = function (_, generator) {
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2]
if (version == "mixgo_me" || version == "mixgo_cc") {
generator.definitions_['import_me_go_car'] = 'from me_go import car';
}
else if (version == "mixgo_ce") {
} else if (version == "mixgo_ce") {
generator.definitions_['import_ce_go_car'] = 'from ce_go import car';
}else if (version == "mixgo_mini"){
} else if (version == "mixgo_mini") {
generator.definitions_['import_mini_go_car'] = 'from mini_go import car';
}
var op = generator.valueToCode(this, 'led', generator.ORDER_ATOMIC);
@@ -48,10 +46,9 @@ export const ce_go_get_led_state = function (_, generator) {
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2]
if (version == "mixgo_me" || version == "mixgo_cc") {
generator.definitions_['import_me_go_car'] = 'from me_go import car';
}
else if (version == "mixgo_ce") {
} else if (version == "mixgo_ce") {
generator.definitions_['import_ce_go_car'] = 'from ce_go import car';
}else if (version == "mixgo_mini"){
} else if (version == "mixgo_mini") {
generator.definitions_['import_mini_go_car'] = 'from mini_go import car';
}
var op = generator.valueToCode(this, 'led', generator.ORDER_ATOMIC);
@@ -63,15 +60,14 @@ export const ce_go_led_brightness = function (_, generator) {
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2]
if (version == "mixgo_me" || version == "mixgo_cc") {
generator.definitions_['import_me_go_car'] = 'from me_go import car';
}
else if (version == "mixgo_ce") {
} else if (version == "mixgo_ce") {
generator.definitions_['import_ce_go_car'] = 'from ce_go import car';
}else if (version == "mixgo_mini"){
} else if (version == "mixgo_mini") {
generator.definitions_['import_mini_go_car'] = 'from mini_go import car';
}
var op = generator.valueToCode(this, 'led', generator.ORDER_ATOMIC);
var flag = generator.valueToCode(this, 'bright', generator.ORDER_ATOMIC);
var code = "car.setbrightness(" + op + "," + flag + ")\n";
var code = "car.setbrightness(" + op + ", " + flag + ")\n";
return code;
}
@@ -79,15 +75,14 @@ export const ce_go_stepper_keep = function (_, generator) {
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2]
if (version == "mixgo_me" || version == "mixgo_cc") {
generator.definitions_['import_me_go_car'] = 'from me_go import car';
}
else if (version == "mixgo_ce") {
} else if (version == "mixgo_ce") {
generator.definitions_['import_ce_go_car'] = 'from ce_go import car';
}else if (version == "mixgo_mini"){
} else if (version == "mixgo_mini") {
generator.definitions_['import_mini_go_car'] = 'from mini_go import car';
}
var v = this.getFieldValue('VAR');
var speed = generator.valueToCode(this, 'speed', generator.ORDER_ASSIGNMENT);
var code = 'car.move("' + v + '",' + speed + ")\n";
var code = 'car.move("' + v + '", ' + speed + ")\n";
return code;
}
@@ -95,10 +90,9 @@ export const ce_go_stepper_stop = function (_, generator) {
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2]
if (version == "mixgo_me" || version == "mixgo_cc") {
generator.definitions_['import_me_go_car'] = 'from me_go import car';
}
else if (version == "mixgo_ce") {
} else if (version == "mixgo_ce") {
generator.definitions_['import_ce_go_car'] = 'from ce_go import car';
}else if (version == "mixgo_mini"){
} else if (version == "mixgo_mini") {
generator.definitions_['import_mini_go_car'] = 'from mini_go import car';
}
var v = this.getFieldValue('VAR');
@@ -110,10 +104,9 @@ export const ce_go_dc_motor = function (_, generator) {
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2]
if (version == "mixgo_me" || version == "mixgo_cc") {
generator.definitions_['import_me_go_car'] = 'from me_go import car';
}
else if (version == "mixgo_ce") {
} else if (version == "mixgo_ce") {
generator.definitions_['import_ce_go_car'] = 'from ce_go import car';
}else if (version == "mixgo_mini"){
} else if (version == "mixgo_mini") {
generator.definitions_['import_mini_go_car'] = 'from mini_go import car';
}
var wheel = this.getFieldValue('wheel');
@@ -123,7 +116,7 @@ export const ce_go_dc_motor = function (_, generator) {
else if (v == 'CCW') { v = 'CW' }
}
var speed = generator.valueToCode(this, 'speed', generator.ORDER_ATOMIC);
var code = "car.motor(car.MOTO[" + wheel + '],"' + v + '",' + speed + ")\n";
var code = "car.motor(car.MOTO[" + wheel + '], "' + v + '", ' + speed + ")\n";
return code;
}
@@ -132,11 +125,10 @@ export const ce_go_hall_attachInterrupt = function (_, generator) {
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2]
if (version == "mixgo_me" || version == "mixgo_cc") {
generator.definitions_['import_me_go_hall_' + dropdown_mode] = 'from me_go import hall_' + dropdown_mode;
}
else if (version == "mixgo_ce") {
} else if (version == "mixgo_ce") {
generator.definitions_['import_ce_go_hall_' + dropdown_mode] = 'from ce_go import hall_' + dropdown_mode;
}else if (version == "mixgo_mini"){
generator.definitions_['import_mini_go_hall' + dropdown_mode] = 'from mini_go import hall_'+ dropdown_mode;
} else if (version == "mixgo_mini") {
generator.definitions_['import_mini_go_hall' + dropdown_mode] = 'from mini_go import hall_' + dropdown_mode;
}
var atta = generator.valueToCode(this, 'DO', generator.ORDER_ATOMIC);
var code = 'hall_' + dropdown_mode + '.irq_cb(' + atta + ')\n'
@@ -149,15 +141,14 @@ export const ce_go_hall_initialize = function (_, generator) {
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2]
if (version == "mixgo_me" || version == "mixgo_cc") {
generator.definitions_['import_me_go_hall_' + dropdown_mode] = 'from me_go import hall_' + dropdown_mode;
}
else if (version == "mixgo_ce") {
} else if (version == "mixgo_ce") {
generator.definitions_['import_ce_go_hall_' + dropdown_mode] = 'from ce_go import hall_' + dropdown_mode;
}else if (version == "mixgo_mini"){
generator.definitions_['import_mini_go_hall' + dropdown_mode] = 'from mini_go import hall_'+ dropdown_mode;
} else if (version == "mixgo_mini") {
generator.definitions_['import_mini_go_hall' + dropdown_mode] = 'from mini_go import hall_' + dropdown_mode;
}
var num = generator.valueToCode(this, 'num', generator.ORDER_ATOMIC);
if (args == 'all') {
var code = 'hall_' + dropdown_mode + '.initial(' + 'turns' + '=' + num + ',distance=' + num + ')\n'
var code = 'hall_' + dropdown_mode + '.initial(' + 'turns' + '=' + num + ', distance=' + num + ')\n'
return code;
}
var code = 'hall_' + dropdown_mode + '.initial(' + args + '=' + num + ')\n'
@@ -170,11 +161,10 @@ export const ce_go_hall_data = function (_, generator) {
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2]
if (version == "mixgo_me" || version == "mixgo_cc") {
generator.definitions_['import_me_go_hall_' + dropdown_mode] = 'from me_go import hall_' + dropdown_mode;
}
else if (version == "mixgo_ce") {
} else if (version == "mixgo_ce") {
generator.definitions_['import_ce_go_hall_' + dropdown_mode] = 'from ce_go import hall_' + dropdown_mode;
}else if (version == "mixgo_mini"){
generator.definitions_['import_mini_go_hall' + dropdown_mode] = 'from mini_go import hall_'+ dropdown_mode;
} else if (version == "mixgo_mini") {
generator.definitions_['import_mini_go_hall' + dropdown_mode] = 'from mini_go import hall_' + dropdown_mode;
}
var code = 'hall_' + dropdown_mode + '.' + args + '';
return [code, generator.ORDER_ATOMIC];
@@ -185,10 +175,9 @@ export const ce_go_pin_near_line = function (_, generator) {
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2]
if (version == "mixgo_me" || version == "mixgo_cc") {
generator.definitions_['import_me_go_hall'] = 'from me_go import car';
}
else if (version == "mixgo_ce") {
} else if (version == "mixgo_ce") {
generator.definitions_['import_ce_go_hall'] = 'from ce_go import car';
}else if (version == "mixgo_mini"){
} else if (version == "mixgo_mini") {
generator.definitions_['import_mini_go_hall'] = 'from mini_go import car';
}
var code = 'car.patrol()' + key + '';
@@ -200,10 +189,9 @@ export const ce_go_pin_near = function (_, generator) {
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2]
if (version == "mixgo_me" || version == "mixgo_cc") {
generator.definitions_['import_me_go_hall'] = 'from me_go import car';
}
else if (version == "mixgo_ce") {
} else if (version == "mixgo_ce") {
generator.definitions_['import_ce_go_hall'] = 'from ce_go import car';
}else if (version == "mixgo_mini"){
} else if (version == "mixgo_mini") {
generator.definitions_['import_mini_go_hall'] = 'from mini_go import car';
}
var code = 'car.obstacle()' + key + '';
@@ -215,10 +203,9 @@ export const ce_go_pin_near_state_change = function (_, generator) {
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2]
if (version == "mixgo_me" || version == "mixgo_cc") {
generator.definitions_['import_me_go_hall'] = 'from me_go import car';
}
else if (version == "mixgo_ce") {
} else if (version == "mixgo_ce") {
generator.definitions_['import_ce_go_hall'] = 'from ce_go import car';
}else if (version == "mixgo_mini"){
} else if (version == "mixgo_mini") {
generator.definitions_['import_mini_go_hall'] = 'from mini_go import car';
}
var code = 'car.ir_mode(car.' + key + ')\n';
@@ -229,10 +216,9 @@ export const sensor_mixgome_eulerangles = function (_, generator) {
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2]
if (version == "mixgo_me" || version == "mixgo_cc") {
generator.definitions_['import_mixgo_me_onboard_mxc6655xa'] = "from mixgo_me import onboard_mxc6655xa";
}
else if (version == "mixgo_ce") {
} else if (version == "mixgo_ce") {
generator.definitions_['import_mixgo_ce_onboard_mxc6655xa'] = "from mixgo_ce import onboard_mxc6655xa";
}else if (version == "mixgo_mini"){
} else if (version == "mixgo_mini") {
generator.definitions_['import_mini_onboard_mxc6655xa'] = 'from mini_go import onboard_mxc6655xa';
}
var angle = this.getFieldValue('angle');
@@ -245,10 +231,9 @@ export const ce_go_pin_light = function (_, generator) {
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2]
if (version == "mixgo_me" || version == "mixgo_cc") {
generator.definitions_['import_me_go_hall'] = 'from me_go import car';
}
else if (version == "mixgo_ce") {
} else if (version == "mixgo_ce") {
generator.definitions_['import_ce_go_hall'] = 'from ce_go import car';
}else if (version == "mixgo_mini"){
} else if (version == "mixgo_mini") {
generator.definitions_['import_mini_go_hall'] = 'from mini_go import car';
}
var code = 'car.light()' + key + '';
@@ -259,43 +244,43 @@ export const ce_go_pin_light = function (_, generator) {
export const educore_car = function (_, generator) {
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2]
generator.definitions_['import_'+version+'_car'] = 'from '+version+' import car';
generator.definitions_['import_' + version + '_car'] = 'from ' + version + ' import car';
var code = 'car()';
return [code, generator.ORDER_ATOMIC];
}
export const educore_car_stepper_keep = function (_, generator) {
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2]
generator.definitions_['import_'+version+'_car'] = 'from '+version+' import car';
generator.definitions_['import_' + version + '_car'] = 'from ' + version + ' import car';
var car = generator.valueToCode(this, 'car', generator.ORDER_ASSIGNMENT);
var v = this.getFieldValue('VAR');
var speed = generator.valueToCode(this, 'speed', generator.ORDER_ASSIGNMENT);
var code = car+'.'+ v +'('+speed+")\n";
var code = car + '.' + v + '(' + speed + ")\n";
return code;
}
export const educore_car_stepper_stop = function (_, generator) {
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2]
generator.definitions_['import_'+version+'_car'] = 'from '+version+' import car';
generator.definitions_['import_' + version + '_car'] = 'from ' + version + ' import car';
var car = generator.valueToCode(this, 'car', generator.ORDER_ASSIGNMENT);
var v = this.getFieldValue('VAR');
var code = car+'.'+ v +"()\n";
var code = car + '.' + v + "()\n";
return code;
}
export const educore_car_pin_near_line = function (_, generator) {
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2]
generator.definitions_['import_'+version+'_car'] = 'from '+version+' import car';
generator.definitions_['import_' + version + '_car'] = 'from ' + version + ' import car';
var car = generator.valueToCode(this, 'car', generator.ORDER_ASSIGNMENT);
var key = this.getFieldValue('key');
var code = car+'.get_itr_dnum(' + key + ')';
var code = car + '.get_itr_dnum(' + key + ')';
return [code, generator.ORDER_ATOMIC];
}
export const educore_car_pin_near = function (_, generator) {
var version = Mixly.Boards.getSelectedBoardKey().split(':')[2]
generator.definitions_['import_'+version+'_car'] = 'from '+version+' import car';
generator.definitions_['import_' + version + '_car'] = 'from ' + version + ' import car';
var car = generator.valueToCode(this, 'car', generator.ORDER_ASSIGNMENT);
var code = car+'.get_distance()';
var code = car + '.get_distance()';
return [code, generator.ORDER_ATOMIC];
}

49
boards/default_src/micropython/generators/communicate.js
View File

@@ -21,7 +21,7 @@ export const communicate_i2c_init = function (block, generator) {
var dropdown_pin2 = generator.valueToCode(this, 'TX', generator.ORDER_ATOMIC);
var freq = generator.valueToCode(this, 'freq', generator.ORDER_ATOMIC);
var sub = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
return "" + sub + " = machine.SoftI2C(scl = machine.Pin(" + dropdown_pin2 + "), sda = machine.Pin(" + dropdown_pin1 + "), freq = " + freq + ")\n";
return "" + sub + " = machine.SoftI2C(scl = machine.Pin(" + dropdown_pin2 + "), sda=machine.Pin(" + dropdown_pin1 + "), freq=" + freq + ")\n";
}
export const communicate_i2c_read = function (block, generator) {
@@ -50,7 +50,6 @@ export const communicate_i2c_master_read = function (block, generator) {
}
export const communicate_i2c_available = function (block, generator) {
var name = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC);
var code = "" + name + ".available()";
return [code, generator.ORDER_ATOMIC];
@@ -98,7 +97,7 @@ export const communicate_spi_read_output = function (block, generator) {
var varname = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC);
var data = generator.valueToCode(this, 'data', generator.ORDER_ATOMIC);
var val = generator.valueToCode(this, 'val', generator.ORDER_ATOMIC);
return ["" + varname + ".read(" + data + "," + val + ")", generator.ORDER_ATOMIC];
return ["" + varname + ".read(" + data + ", " + val + ")", generator.ORDER_ATOMIC];
}
export const communicate_spi_readinto = function (block, generator) {
@@ -111,7 +110,7 @@ export const communicate_spi_readinto_output = function (block, generator) {
var varname = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC);
var data = generator.valueToCode(this, 'data', generator.ORDER_ATOMIC);
var val = generator.valueToCode(this, 'val', generator.ORDER_ATOMIC);
return ["" + varname + ".readinto(" + data + "," + val + ")", generator.ORDER_ATOMIC];
return ["" + varname + ".readinto(" + data + ", " + val + ")", generator.ORDER_ATOMIC];
}
export const communicate_spi_write = function (block, generator) {
@@ -126,7 +125,7 @@ export const communicate_spi_write_readinto = function (block, generator) {
var val = generator.valueToCode(this, 'val', generator.ORDER_ATOMIC);
// var op=this.getFieldValue('op');
// if(op=="byte"){
return ["" + varname + ".write_readinto(" + data + ".encode('utf-8')," + val + ")", generator.ORDER_ATOMIC];
return ["" + varname + ".write_readinto(" + data + ".encode('utf-8'), " + val + ")", generator.ORDER_ATOMIC];
// }else{
// return [""+varname+".write_readinto(" + data + ","+val+")", generator.ORDER_ATOMIC];
// }
@@ -183,10 +182,10 @@ export const communicate_ir_recv_init = function (block, generator) {
var code = "ir_rx = irremote.RC5_RX(" + pin + ")\n";
}
else if (sub == "") {
var code = "ir_rx = irremote.NEC_RX(" + pin + "," + bit + ")\n";
var code = "ir_rx = irremote.NEC_RX(" + pin + ", " + bit + ")\n";
}
else {
var code = "ir_rx = irremote.NEC_RX(" + pin + "," + bit + "," + sub + ")\n";
var code = "ir_rx = irremote.NEC_RX(" + pin + ", " + bit + ", " + sub + ")\n";
}
return code;
}
@@ -224,10 +223,10 @@ export const communicate_ir_send_init = function (block, generator) {
var sam = this.getFieldValue('type');
var power = generator.valueToCode(this, 'power', generator.ORDER_ATOMIC);
if (sam == "RC5") {
var code = "ir_tx = irremote.RC5_TX(" + pin + "," + power + ")\n";
var code = "ir_tx = irremote.RC5_TX(" + pin + ", " + power + ")\n";
}
else {
var code = "ir_tx = irremote.NEC_TX(" + pin + "," + sam + "," + power + ")\n";
var code = "ir_tx = irremote.NEC_TX(" + pin + ", " + sam + ", " + power + ")\n";
}
return code;
}
@@ -237,7 +236,7 @@ export const ir_transmit_conventional_data = function (block, generator) {
var cmd = generator.valueToCode(this, 'cmd', generator.ORDER_ATOMIC);
var addr = generator.valueToCode(this, 'addr', generator.ORDER_ATOMIC);
var toggle = generator.valueToCode(this, 'toggle', generator.ORDER_ATOMIC);
var code = "ir_tx.transmit(" + cmd + "," + addr + "," + toggle + ")\n";
var code = "ir_tx.transmit(" + cmd + ", " + addr + ", " + toggle + ")\n";
return code;
}
@@ -341,7 +340,7 @@ export const communicate_espnow_init = function (block, generator) {
var name = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC);
var varName = generator.valueToCode(this, 'CHNL', generator.ORDER_ATOMIC);
var power = this.getFieldValue('op');
var code = "" + name + "=radio.ESPNow(channel=" + varName + ",txpower=" + power + ")\n";
var code = "" + name + "=radio.ESPNow(channel=" + varName + ", txpower=" + power + ")\n";
return code;
}
@@ -350,7 +349,7 @@ export const communicate_espnow_init_new = function (block, generator) {
var name = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC);
var varName = generator.valueToCode(this, 'CHNL', generator.ORDER_ATOMIC);
var varName2 = generator.valueToCode(this, 'DB', generator.ORDER_ATOMIC);
var code = "" + name + "=radio.ESPNow(channel=" + varName + ',txpower=' + varName2 + ")\n";
var code = "" + name + "=radio.ESPNow(channel=" + varName + ', txpower=' + varName2 + ")\n";
return code;
}
@@ -379,7 +378,7 @@ export const network_espnow_send = function (block, generator) {
var name = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC);
var mac = generator.valueToCode(this, 'mac', generator.ORDER_ATOMIC);
var content = generator.valueToCode(this, 'content', generator.ORDER_ATOMIC);
var code = name + ".send(" + mac + "," + content + ")\n";
var code = name + ".send(" + mac + ", " + content + ")\n";
return code;
}
@@ -411,7 +410,7 @@ export const espnow_radio_txpower = function (block, generator) {
export const espnow_radio_channel_new = function (block, generator) {
generator.definitions_['import_radio'] = "import radio";
var varName2 = generator.valueToCode(this, 'DB', generator.ORDER_ATOMIC);
generator.definitions_['var_declare_ESPNow_radio'] = "ESPNow_radio=radio.ESPNow(channel=1,txpower=" + varName2 + ")";
generator.definitions_['var_declare_ESPNow_radio'] = "ESPNow_radio=radio.ESPNow(channel=1, txpower=" + varName2 + ")";
var varName = generator.valueToCode(this, 'CHNL', generator.ORDER_ATOMIC);
var code = "ESPNow_radio.set_channel(" + varName + ")\n";
return code;
@@ -451,7 +450,15 @@ export const espnow_radio_recv = function (block, generator) {
generator.definitions_['var_declare_ESPNow_radio'] = 'ESPNow_radio = radio.ESPNow()';
var doCode = generator.statementToCode(block, 'DO') || generator.PASS;
generator.definitions_['def_ESPNow_radio_recv'] = 'def ESPNow_radio_recv(mac,ESPNow_radio_msg):\n' + doCode;
generator.definitions_['def_ESPNow_radio_recv_all'] = '_radio_msg_list = []\n' + 'def ESPNow_radio_recv_callback(mac,ESPNow_radio_msg):\n' + ' global _radio_msg_list\n' + ' try: ESPNow_radio_recv(mac,ESPNow_radio_msg)\n' + ' except: pass\n' + ' if str(ESPNow_radio_msg) in _radio_msg_list:\n' + " eval('radio_recv_' + bytes.decode(ubinascii.hexlify(ESPNow_radio_msg)) + '()')\n";
generator.definitions_['def_ESPNow_radio_recv_all'] = '_radio_msg_list = []\n'
+ 'def ESPNow_radio_recv_callback(mac,ESPNow_radio_msg):\n'
+ ' global _radio_msg_list\n'
+ ' try:\n'
+ ' ESPNow_radio_recv(mac,ESPNow_radio_msg)\n'
+ ' except:\n'
+ ' pass\n'
+ ' if str(ESPNow_radio_msg) in _radio_msg_list:\n'
+ " eval('radio_recv_' + bytes.decode(ubinascii.hexlify(ESPNow_radio_msg)) + '()')\n";
generator.definitions_['ESPNow_radio_recv_callback'] = "ESPNow_radio.recv_cb(ESPNow_radio_recv_callback)\n";
return '';
@@ -506,7 +513,15 @@ export const espnow_radio_recv_certain_msg = function (block, generator) {
generator.definitions_['import_ubinascii'] = 'import ubinascii';
generator.definitions_['var_declare_ESPNow_radio'] = 'ESPNow_radio = radio.ESPNow()';
var doCode = generator.statementToCode(block, 'DO') || generator.PASS;
generator.definitions_['def_ESPNow_radio_recv_all'] = '_radio_msg_list = []\n' + 'def ESPNow_radio_recv_callback(mac,ESPNow_radio_msg):\n' + ' global _radio_msg_list\n' + ' try: ESPNow_radio_recv(mac,ESPNow_radio_msg)\n' + ' except: pass\n' + ' if str(ESPNow_radio_msg) in _radio_msg_list:\n' + " eval('radio_recv_' + bytes.decode(ubinascii.hexlify(ESPNow_radio_msg)) + '()')\n";
generator.definitions_['def_ESPNow_radio_recv_all'] = '_radio_msg_list = []\n'
+ 'def ESPNow_radio_recv_callback(mac,ESPNow_radio_msg):\n'
+ ' global _radio_msg_list\n'
+ ' try:\n'
+ ' ESPNow_radio_recv(mac,ESPNow_radio_msg)\n'
+ ' except:\n'
+ ' pass\n'
+ ' if str(ESPNow_radio_msg) in _radio_msg_list:\n'
+ " eval('radio_recv_' + bytes.decode(ubinascii.hexlify(ESPNow_radio_msg)) + '()')\n";
generator.definitions_['ESPNow_radio_recv_callback'] = "ESPNow_radio.recv_cb(ESPNow_radio_recv_callback)\n";
var message = block.getFieldValue('msg');
var message_utf8 = toUTF8Hex(message);
@@ -546,7 +561,7 @@ export const lora_init = function (block, generator) {
var bandwidth = this.getFieldValue('bandwidth');
var code;
generator.definitions_['import_rfm98'] = 'import rfm98';
var code = v + ' = rfm98.RFM98(' + sv + ',cs_pin=' + pv + ',frequency_mhz=' + fr + ',signal_bandwidth=' + bandwidth + ',coding_rate=' + r + ',spreading_factor=' + f + ',tx_power=' + p + ')\n';
var code = v + ' = rfm98.RFM98(' + sv + ', cs_pin=' + pv + ', frequency_mhz=' + fr + ', signal_bandwidth=' + bandwidth + ', coding_rate=' + r + ', spreading_factor=' + f + ', tx_power=' + p + ')\n';
return code;
}

2
boards/default_src/micropython/generators/control.js
View File

@@ -116,4 +116,4 @@ export const controls_typeLists = function (_, generator) {
var type = this.getFieldValue('type');
// generator.definitions_['func_type' + type] = code;
return [type, generator.ORDER_ATOMIC];
}
}

17
boards/default_src/micropython/generators/display.js
View File

@@ -23,7 +23,7 @@ export const display_show_image_or_string_delay = function (_, generator) {
generator.definitions_['import_matrix'] = 'import matrix';
var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT);
var time = generator.valueToCode(this, 'time', generator.ORDER_ASSIGNMENT);
var code = "matrix.show(" + data + ',' + time + ")\n";
var code = "matrix.show(" + data + ', ' + time + ")\n";
return code;
}
@@ -31,7 +31,7 @@ export const display_scroll_string_delay = function (_, generator) {
generator.definitions_['import_matrix'] = 'import matrix';
var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT);
var time = generator.valueToCode(this, 'time', generator.ORDER_ASSIGNMENT);
var code = "matrix.scroll(" + data + ',' + time + ")\n";
var code = "matrix.scroll(" + data + ', ' + time + ")\n";
return code;
}
@@ -244,7 +244,7 @@ export const display_use_i2c_init = function (_, generator) {
var sub = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
var row = generator.valueToCode(this, 'row', generator.ORDER_ATOMIC);
var column = generator.valueToCode(this, 'column', generator.ORDER_ATOMIC);
var code = sub + " = ssd1306.SSD1306_I2C(" + row + "," + column + "," + i2csub + ")\n";
var code = sub + " = ssd1306.SSD1306_I2C(" + row + ", " + column + ", " + i2csub + ")\n";
return code;
}
@@ -256,7 +256,7 @@ export const display_draw_4strings = function (_, generator) {
var value_text_line2 = generator.valueToCode(this, 'Text_line2', generator.ORDER_ASSIGNMENT) || '\'\'';
var value_text_line3 = generator.valueToCode(this, 'Text_line3', generator.ORDER_ASSIGNMENT) || '\'\'';
var value_text_line4 = generator.valueToCode(this, 'Text_line4', generator.ORDER_ASSIGNMENT) || '\'\'';
var code = varName + '.show_str(' + value_text_line1 + ',' + value_text_line2 + ',' + value_text_line3 + ',' + value_text_line4 + ')\n'
var code = varName + '.show_str(' + value_text_line1 + ', ' + value_text_line2 + ', ' + value_text_line3 + ', ' + value_text_line4 + ')\n'
return code;
}
@@ -285,10 +285,10 @@ export const display_rect = function (_, generator) {
var code = '';
switch (checkbox_fill) {
case "True":
code = varName + '.show_fill_rect(' + location_x + ', ' + location_y + ', ' + value_width + ', ' + value_height + ',' + size + ')\n';
code = varName + '.show_fill_rect(' + location_x + ', ' + location_y + ', ' + value_width + ', ' + value_height + ', ' + size + ')\n';
break;
case "False":
code = varName + '.show_rect(' + location_x + ', ' + location_y + ', ' + value_width + ', ' + value_height + ',' + size + ')\n';
code = varName + '.show_rect(' + location_x + ', ' + location_y + ', ' + value_width + ', ' + value_height + ', ' + size + ')\n';
break;
}
return code;
@@ -302,8 +302,7 @@ export const image_arithmetic = function (block, generator) {
var code = '';
if (op == 'INTERSECTION') {
code = imga + '-(' + imga + '-' + imgb + ')';
}
else {
} else {
code = imga + op + imgb;
}
return [code, generator.ORDER_ATOMIC];
@@ -450,7 +449,7 @@ export const display_oled_showBitmap = function (_, generator) {
var bmp = generator.valueToCode(this, 'bitmap_name', generator.ORDER_ATOMIC);
var w = generator.valueToCode(this, 'WIDTH', generator.ORDER_ATOMIC);
var h = generator.valueToCode(this, 'HEIGHT', generator.ORDER_ATOMIC);
var code = varName + '.show_bitmap(' + location_x + ', ' + location_y + ', ' + bmp + ',' + w + ',' + h + ')\n';
var code = varName + '.show_bitmap(' + location_x + ', ' + location_y + ', ' + bmp + ', ' + w + ', ' + h + ')\n';
return code;
}

54
boards/default_src/micropython/generators/display_extern.js
View File

@@ -16,7 +16,7 @@ export const display_matrix_use_i2c_init = function (_, generator) {
var code;
if (key == '32x12 Matrix') {
generator.definitions_['import_matrix32x12'] = 'import matrix32x12';
code = v + ' = matrix32x12.Matrix(' + iv + ',font_address=' + font + ')\n';
code = v + ' = matrix32x12.Matrix(' + iv + ', font_address=' + font + ')\n';
} else if (key == '16x8 Matrix') {
generator.definitions_['import_matrix16x8'] = 'import matrix16x8';
code = v + ' = matrix16x8.Matrix(' + iv + ')\n';
@@ -36,7 +36,7 @@ export const display_matrix_extern_show_image_or_string_delay = function (_, gen
var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT);
var space = generator.valueToCode(this, 'space', generator.ORDER_ASSIGNMENT);
var op = this.getFieldValue('center');
var code = v + ".shows(" + data + ',space = ' + space + ',center = ' + op + ")\n";
var code = v + ".shows(" + data + ', space=' + space + ', center=' + op + ")\n";
return code;
}
@@ -51,7 +51,7 @@ export const display_matrix_extern_show_frame_string_delay = function (_, genera
var v = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT);
var time = generator.valueToCode(this, 'time', generator.ORDER_ASSIGNMENT);
var code = v + ".frame(" + data + ',delay = ' + time + ")\n";
var code = v + ".frame(" + data + ', delay=' + time + ")\n";
return code;
}
@@ -67,7 +67,7 @@ export const display_matrix_extern_scroll_string_delay = function (_, generator)
var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT);
var time = generator.valueToCode(this, 'time', generator.ORDER_ASSIGNMENT);
var space = generator.valueToCode(this, 'space', generator.ORDER_ASSIGNMENT);
var code = v + ".scroll(" + data + ',speed =' + time + ',space = ' + space + ")\n";
var code = v + ".scroll(" + data + ', speed=' + time + ', space=' + space + ")\n";
return code;
}
@@ -127,7 +127,7 @@ export const matrix_extern_image_arithmetic = function (a, generator) {
var op = a.getFieldValue("OP");
var imga = generator.valueToCode(a, 'A', generator.ORDER_ATOMIC);
var imgb = generator.valueToCode(a, 'B', generator.ORDER_ATOMIC);
var code = v + '.map_' + op + '(' + imga + ',' + imgb + ')';
var code = v + '.map_' + op + '(' + imga + ', ' + imgb + ')';
return [code, generator.ORDER_ATOMIC];
}
@@ -146,7 +146,7 @@ export const display_use_i2c_init = function (_, generator) {
var sub = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
var row = generator.valueToCode(this, 'row', generator.ORDER_ATOMIC);
var column = generator.valueToCode(this, 'column', generator.ORDER_ATOMIC);
var code = sub + " = ssd1306.SSD1306_I2C(" + row + "," + column + "," + i2csub + ")\n";
var code = sub + " = ssd1306.SSD1306_I2C(" + row + ", " + column + ", " + i2csub + ")\n";
return code;
}
@@ -158,7 +158,7 @@ export const display_draw_4strings = function (_, generator) {
var value_text_line2 = generator.valueToCode(this, 'Text_line2', generator.ORDER_ASSIGNMENT) || '\'\'';
var value_text_line3 = generator.valueToCode(this, 'Text_line3', generator.ORDER_ASSIGNMENT) || '\'\'';
var value_text_line4 = generator.valueToCode(this, 'Text_line4', generator.ORDER_ASSIGNMENT) || '\'\'';
var code = varName + '.show_str(' + value_text_line1 + ',' + value_text_line2 + ',' + value_text_line3 + ',' + value_text_line4 + ')\n'
var code = varName + '.show_str(' + value_text_line1 + ', ' + value_text_line2 + ', ' + value_text_line3 + ', ' + value_text_line4 + ')\n'
return code;
}
@@ -186,10 +186,10 @@ export const display_rect = function (_, generator) {
var size = this.getFieldValue('OP');
switch (checkbox_fill) {
case "True":
var code = varName + '.show_fill_rect(' + location_x + ', ' + location_y + ', ' + value_width + ', ' + value_height + ',' + size + ')\n';
var code = varName + '.show_fill_rect(' + location_x + ', ' + location_y + ', ' + value_width + ', ' + value_height + ', ' + size + ')\n';
return code;
case "False":
var code = varName + '.show_rect(' + location_x + ', ' + location_y + ', ' + value_width + ', ' + value_height + ',' + size + ')\n';
var code = varName + '.show_rect(' + location_x + ', ' + location_y + ', ' + value_width + ', ' + value_height + ', ' + size + ')\n';
return code;
}
}
@@ -373,7 +373,7 @@ export const tft_use_spi_init = function (_, generator) {
var w = generator.valueToCode(this, 'WIDTH', generator.ORDER_ATOMIC);
var h = generator.valueToCode(this, 'HEIGHT', generator.ORDER_ATOMIC);
var op = this.getFieldValue('rotate');
var code = v + ' = st7789.ST7789(' + sv + ',' + w + ',' + h + ',dc_pin=' + dv + ',cs_pin=' + pv + ',rotation=' + op + ',font_address=' + font + ')\n';
var code = v + ' = st7789.ST7789(' + sv + ', ' + w + ', ' + h + ', dc_pin=' + dv + ', cs_pin=' + pv + ', rotation=' + op + ', font_address=' + font + ')\n';
return code;
}
@@ -386,7 +386,7 @@ export const tft_show_image_xy = function (_, generator) {
var size = generator.valueToCode(this, 'size', generator.ORDER_ASSIGNMENT);
var color = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC);
if (color.slice(0, 2) == "0x") {
var code = v + ".image(" + data + ',x = ' + x + ',y = ' + y + ',size = ' + size + ',color=' + color + ")\n";
var code = v + ".image(" + data + ', x=' + x + ', y=' + y + ', size=' + size + ', color=' + color + ")\n";
} else {
const rgbValues = color.match(/\d+/g);
const r = parseInt(rgbValues[0]);
@@ -394,7 +394,7 @@ export const tft_show_image_xy = function (_, generator) {
const b = parseInt(rgbValues[2]);
var rgb = "0x" + ((r << 16) + (g << 8) + b).toString(16).padStart(4, "0");
var rgb565 = (rgb & 0xf80000) >> 8 | (rgb & 0xfc00) >> 5 | (rgb & 0xff) >> 3;
var code = v + ".image(" + data + ',x = ' + x + ',y = ' + y + ',size = ' + size + ',color=0x' + rgb565.toString(16) + ")\n";
var code = v + ".image(" + data + ', x= ' + x + ',y=' + y + ', size=' + size + ', color=0x' + rgb565.toString(16) + ")\n";
}
return code;
}
@@ -417,7 +417,7 @@ export const tft_show_image_or_string_delay = function (_, generator) {
var color = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC);
var op = this.getFieldValue('center');
if (color.slice(0, 2) == "0x") {
var code = v + ".shows(" + data + ',x = ' + x + ',y = ' + y + ',size = ' + size + ',space = ' + space + ',center = ' + op + ',color=' + color + ")\n";
var code = v + ".shows(" + data + ', x=' + x + ', y=' + y + ', size=' + size + ', space=' + space + ', center=' + op + ', color=' + color + ")\n";
} else {
const rgbValues = color.match(/\d+/g);
const r = parseInt(rgbValues[0]);
@@ -425,7 +425,7 @@ export const tft_show_image_or_string_delay = function (_, generator) {
const b = parseInt(rgbValues[2]);
var rgb = "0x" + ((r << 16) + (g << 8) + b).toString(16).padStart(4, "0");
var rgb565 = (rgb & 0xf80000) >> 8 | (rgb & 0xfc00) >> 5 | (rgb & 0xff) >> 3;
var code = v + ".shows(" + data + ',x = ' + x + ',y = ' + y + ',size = ' + size + ',space = ' + space + ',center = ' + op + ',color=0x' + rgb565.toString(16) + ")\n";
var code = v + ".shows(" + data + ', x=' + x + ', y=' + y + ', size=' + size + ', space=' + space + ', center=' + op + ', color=0x' + rgb565.toString(16) + ")\n";
}
return code;
}
@@ -438,7 +438,7 @@ export const tft_show_frame_string_delay = function (_, generator) {
var time = generator.valueToCode(this, 'time', generator.ORDER_ASSIGNMENT);
var color = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC);
if (color.slice(0, 2) == "0x") {
var code = v + ".frame(" + data + ',size = ' + size + ',delay = ' + time + ',color=' + color + ")\n";
var code = v + ".frame(" + data + ', size=' + size + ', delay=' + time + ', color=' + color + ")\n";
} else {
const rgbValues = color.match(/\d+/g);
const r = parseInt(rgbValues[0]);
@@ -446,7 +446,7 @@ export const tft_show_frame_string_delay = function (_, generator) {
const b = parseInt(rgbValues[2]);
var rgb = "0x" + ((r << 16) + (g << 8) + b).toString(16).padStart(4, "0");
var rgb565 = (rgb & 0xf80000) >> 8 | (rgb & 0xfc00) >> 5 | (rgb & 0xff) >> 3;
var code = v + ".frame(" + data + ',size = ' + size + ',delay = ' + time + ',color=0x' + rgb565.toString(16) + ")\n";
var code = v + ".frame(" + data + ', size=' + size + ', delay=' + time + ', color=0x' + rgb565.toString(16) + ")\n";
}
return code;
}
@@ -461,7 +461,7 @@ export const tft_scroll_string_delay = function (_, generator) {
var space = generator.valueToCode(this, 'space', generator.ORDER_ASSIGNMENT);
var color = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC);
if (color.slice(0, 2) == "0x") {
var code = v + ".scroll(" + data + ',y = ' + y + ',size = ' + size + ',speed =' + time + ',space = ' + space + ',color=' + color + ")\n";
var code = v + ".scroll(" + data + ', y=' + y + ', size=' + size + ', speed=' + time + ', space=' + space + ', color=' + color + ")\n";
} else {
const rgbValues = color.match(/\d+/g);
const r = parseInt(rgbValues[0]);
@@ -469,7 +469,7 @@ export const tft_scroll_string_delay = function (_, generator) {
const b = parseInt(rgbValues[2]);
var rgb = "0x" + ((r << 16) + (g << 8) + b).toString(16).padStart(4, "0");
var rgb565 = (rgb & 0xf80000) >> 8 | (rgb & 0xfc00) >> 5 | (rgb & 0xff) >> 3;
var code = v + ".scroll(" + data + ',y = ' + y + ',size = ' + size + ',speed =' + time + ',space = ' + space + ',color=0x' + rgb565.toString(16) + ")\n";
var code = v + ".scroll(" + data + ', y=' + y + ', size=' + size + ', speed=' + time + ', space=' + space + ', color=0x' + rgb565.toString(16) + ")\n";
}
return code;
}
@@ -511,7 +511,7 @@ export const display_lcd_use_i2c_init = function (_, generator) {
var addr = generator.valueToCode(this, 'ADDR', generator.ORDER_ATOMIC);
var code;
generator.definitions_['import_i2clcd'] = 'import i2clcd';
code = v + ' = i2clcd.LCD' + "(" + iv + ',lcd_width=' + key + ',i2c_addr=' + addr +')\n';
code = v + ' = i2clcd.LCD' + "(" + iv + ', lcd_width=' + key + ', i2c_addr=' + addr + ')\n';
return code;
}
@@ -522,7 +522,7 @@ export const lcd_show_image_or_string_delay = function (_, generator) {
var x = generator.valueToCode(this, 'x', generator.ORDER_ASSIGNMENT);
var y = generator.valueToCode(this, 'y', generator.ORDER_ASSIGNMENT);
var op = this.getFieldValue('center');
var code = v + ".shows(" + data + ',column = ' + x + ',line = ' + y + ',center = ' + op + ")\n";
var code = v + ".shows(" + data + ', column=' + x + ', line=' + y + ',center = ' + op + ")\n";
return code;
}
@@ -533,7 +533,7 @@ export const lcd_print_string = function (_, generator) {
var x = generator.valueToCode(this, 'x', generator.ORDER_ASSIGNMENT);
var y = generator.valueToCode(this, 'y', generator.ORDER_ASSIGNMENT);
var delay = generator.valueToCode(this, 'time', generator.ORDER_ASSIGNMENT);
var code = v + ".print(" + data + ',column = ' + x + ',line = ' + y + ',delay=' + delay + ")\n";
var code = v + ".print(" + data + ', column=' + x + ', line=' + y + ', delay=' + delay + ")\n";
return code;
}
@@ -556,7 +556,7 @@ export const display_oled_use_i2c_init = function (_, generator) {
var v = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
var iv = generator.valueToCode(this, 'I2CSUB', generator.ORDER_ATOMIC);
var addr = generator.valueToCode(this, 'ADDR', generator.ORDER_ATOMIC);
var m =this.getFieldValue("driver");
var m = this.getFieldValue("driver");
var version = Boards.getSelectedBoardKey().split(':')[2]
var font = '';
if (['mpython', 'mixgo_pe', 'mixgo_nova'].indexOf(version) >= 0) {
@@ -568,7 +568,7 @@ export const display_oled_use_i2c_init = function (_, generator) {
}
var code;
generator.definitions_['import_oled128x64'] = 'import oled128x64';
code = v + ' = oled128x64.OLED' + "(" + iv + ',address=' + addr + ',font_address=' + font + ',types='+m+')\n';
code = v + ' = oled128x64.OLED' + "(" + iv + ', address=' + addr + ', font_address=' + font + ', types=' + m + ')\n';
return code;
}
@@ -588,7 +588,7 @@ export const extern_oled_show_image_xy = function (_, generator) {
var x = generator.valueToCode(this, 'x', generator.ORDER_ASSIGNMENT);
var y = generator.valueToCode(this, 'y', generator.ORDER_ASSIGNMENT);
var size = generator.valueToCode(this, 'size', generator.ORDER_ASSIGNMENT);
var code = v + ".image(" + data + ',x = ' + x + ',y = ' + y + ',size = ' + size + ")\n";
var code = v + ".image(" + data + ', x=' + x + ', y=' + y + ', size=' + size + ")\n";
return code;
}
@@ -609,7 +609,7 @@ export const extern_oled_show_image_or_string_delay = function (_, generator) {
var size = generator.valueToCode(this, 'size', generator.ORDER_ASSIGNMENT);
var space = generator.valueToCode(this, 'space', generator.ORDER_ASSIGNMENT);
var op = this.getFieldValue('center');
var code = v + ".shows(" + data + ',x = ' + x + ',y = ' + y + ',size = ' + size + ',space = ' + space + ',center = ' + op + ")\n";
var code = v + ".shows(" + data + ', x=' + x + ', y=' + y + ', size=' + size + ', space=' + space + ', center=' + op + ")\n";
return code;
}
@@ -627,7 +627,7 @@ export const extern_oled_show_frame_string_delay = function (_, generator) {
var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT);
var size = generator.valueToCode(this, 'size', generator.ORDER_ASSIGNMENT);
var time = generator.valueToCode(this, 'time', generator.ORDER_ASSIGNMENT);
var code = v + ".frame(" + data + ',size = ' + size + ',delay = ' + time + ")\n";
var code = v + ".frame(" + data + ', size=' + size + ', delay=' + time + ")\n";
return code;
}
@@ -647,7 +647,7 @@ export const extern_oled_scroll_string_delay = function (_, generator) {
var size = generator.valueToCode(this, 'size', generator.ORDER_ASSIGNMENT);
var time = generator.valueToCode(this, 'time', generator.ORDER_ASSIGNMENT);
var space = generator.valueToCode(this, 'space', generator.ORDER_ASSIGNMENT);
var code = v + ".scroll(" + data + ',y = ' + y + ',size = ' + size + ',speed =' + time + ',space = ' + space + ")\n";
var code = v + ".scroll(" + data + ', y=' + y + ', size=' + size + ', speed=' + time + ', space=' + space + ")\n";
return code;
}

117
boards/default_src/micropython/generators/display_onboard.js
View File

@@ -26,14 +26,14 @@ export const display_show_image_or_string_delay = function (_, generator) {
var op = this.getFieldValue('center');
if (version == "mixgo_sant" || version == "mixgo_nova") {
generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft";
var code = "onboard_tft.shows(" + data + ",space = " + space + ',center = ' + op + ")\n";
var code = "onboard_tft.shows(" + data + ", space=" + space + ', center=' + op + ")\n";
return code;
}else if (version == "educore"){
generator.definitions_['import_' + version + 'oled'] = "from " + version + " import oled";
var code = "oled.print(" + data + ',space = ' + space + ',center = ' + op + ")\n";
} else if (version == "educore") {
generator.definitions_['import_' + version + '_oled'] = "from " + version + " import oled";
var code = "oled.print(" + data + ', space=' + space + ', center=' + op + ")\n";
}
generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix";
var code = "onboard_matrix.shows(" + data + ',space = ' + space + ',center = ' + op + ")\n";
var code = "onboard_matrix.shows(" + data + ', space=' + space + ', center=' + op + ")\n";
return code;
}
@@ -43,18 +43,17 @@ export const display_show_frame_string = function (_, generator) {
if (version == 'mpython' || version == 'educore') {
generator.definitions_['import_' + version + '_onboard_oled'] = "from " + version + " import onboard_oled";
var code = "onboard_oled.frame(" + data + ")\n";
} else if(version == 'mixgo_nova'){
} else if (version == 'mixgo_nova') {
generator.definitions_['import_' + version + '_onboard_oled'] = "from " + version + " import onboard_tft";
var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT);
var code = "onboard_tft.frame(" + data + ",color=0xffff)\n";
}else {
var code = "onboard_tft.frame(" + data + ", color=0xffff)\n";
} else {
generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix";
var code = "onboard_matrix.frame(" + data + ")\n";
}
return code;
}
export const display_show_frame_string_delay = function (_, generator) {
var version = Boards.getSelectedBoardKey().split(':')[2];
var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT);
@@ -62,28 +61,28 @@ export const display_show_frame_string_delay = function (_, generator) {
if (version == 'mpython' || version == 'educore') {
generator.definitions_['import_' + version + '_onboard_oled'] = "from " + version + " import onboard_oled";
var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT);
var code = "onboard_oled.frame(" + data + ',delay = ' + time + ")\n";
} else if(version == 'mixgo_nova'){
var code = "onboard_oled.frame(" + data + ', delay=' + time + ")\n";
} else if (version == 'mixgo_nova') {
generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft";
var code = "onboard_tft.frame(" + data + ',size = 5 ,delay = ' + time + ',color=0xffff)\n';
var code = "onboard_tft.frame(" + data + ', size=5 , delay=' + time + ', color=0xffff)\n';
} else {
generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix";
var code = "onboard_matrix.frame(" + data + ',delay = ' + time + ")\n";
var code = "onboard_matrix.frame(" + data + ', delay=' + time + ")\n";
}
return code;
}
export const display_scroll_string = function (_, generator) {
var version = Boards.getSelectedBoardKey().split(':')[2];
if (version == 'mpython'|| version == 'educore') {
if (version == 'mpython' || version == 'educore') {
generator.definitions_['import_' + version + '_onboard_oled'] = "from " + version + " import onboard_oled";
var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT);
var code = "onboard_oled.scroll(" + data + ")\n";
} else if(version == 'mixgo_nova'){
} else if (version == 'mixgo_nova') {
generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft";
var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT);
var code = "onboard_tft.scroll(" + data + ",color=0xffff)\n";
}else {
var code = "onboard_tft.scroll(" + data + ", color=0xffff)\n";
} else {
generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix";
var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT);
var code = "onboard_matrix.scroll(" + data + ")\n";
@@ -96,16 +95,15 @@ export const display_scroll_string_delay = function (_, generator) {
var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT);
var time = generator.valueToCode(this, 'time', generator.ORDER_ASSIGNMENT);
var space = generator.valueToCode(this, 'space', generator.ORDER_ASSIGNMENT);
if (version == 'mpython'|| version == 'educore') {
if (version == 'mpython' || version == 'educore') {
generator.definitions_['import_' + version + '_onboard_oled'] = "from " + version + " import onboard_oled";
var code = "onboard_oled.scroll(" + data + ',speed =' + time + ',space = ' + space + ")\n";
}else if(version == 'mixgo_nova'){
var code = "onboard_oled.scroll(" + data + ', speed=' + time + ', space=' + space + ")\n";
} else if (version == 'mixgo_nova') {
generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft";
var color = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC);
var code = "onboard_tft.scroll(" + data + ',y = 0, size = 5,speed =' + time + ',space = ' + space + ',color= 0xffff )\n';
}else{
var code = "onboard_tft.scroll(" + data + ', y=0, size=5, speed=' + time + ', space=' + space + ', color=0xffff)\n';
} else {
generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix";
var code = "onboard_matrix.scroll(" + data + ',speed =' + time + ',space = ' + space + ")\n";
var code = "onboard_matrix.scroll(" + data + ', speed=' + time + ', space=' + space + ")\n";
}
return code;
}
@@ -120,7 +118,7 @@ export const onboard_tft_scroll_string_delay = function (_, generator) {
var space = generator.valueToCode(this, 'space', generator.ORDER_ASSIGNMENT);
var color = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC);
if (color.slice(0, 2) == "0x") {
var code = "onboard_tft.scroll(" + data + ',y = ' + y + ',size = ' + size + ',speed =' + time + ',space = ' + space + ',color=' + color + ")\n";
var code = "onboard_tft.scroll(" + data + ', y=' + y + ', size=' + size + ', speed=' + time + ', space=' + space + ', color=' + color + ")\n";
} else {
const rgbValues = color.match(/\d+/g);
const r = parseInt(rgbValues[0]);
@@ -128,7 +126,7 @@ export const onboard_tft_scroll_string_delay = function (_, generator) {
const b = parseInt(rgbValues[2]);
var rgb = "0x" + ((r << 16) + (g << 8) + b).toString(16).padStart(4, "0");
var rgb565 = (rgb & 0xf80000) >> 8 | (rgb & 0xfc00) >> 5 | (rgb & 0xff) >> 3;
var code = "onboard_tft.scroll(" + data + ',y = ' + y + ',size = ' + size + ',speed =' + time + ',space = ' + space + ',color=0x' + rgb565.toString(16) + ")\n";
var code = "onboard_tft.scroll(" + data + ', y=' + y + ', size=' + size + ', speed=' + time + ', space=' + space + ', color=0x' + rgb565.toString(16) + ")\n";
}
return code;
}
@@ -143,15 +141,15 @@ export const display_image_builtins = function (block, generator) {
export const display_image_builtins_all = function (block, generator) {
var version = Boards.getSelectedBoardKey().split(':')[2];
if (version == 'mixgo_nova'){
if (version == 'mixgo_nova') {
const PIN_VALUE = block.getFieldValue('image');
const data = PIN_VALUE.split('.');
if (data.length !== 2) {
throw Error('pin value error');
throw Error('pin value error');
}
generator.definitions_[`import_${data[0]}_${data[1]}`] = `from ${data[0]} import ${data[1]}`;
var code = data[1];
}else{
} else {
generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix";
var dropdown_image = block.getFieldValue('image');
var code = 'onboard_matrix.' + dropdown_image;
@@ -211,7 +209,6 @@ export const display_image_create = function (block, generator) {
correct = 55 - j
}
colorNum += Number(colours[block.getFieldValue(i + '-' + j)]) * Math.pow(2, 31 - correct);
}
colorRow += pad(colorNum.toString(16));
colorList.unshift(colorRow);
@@ -230,10 +227,10 @@ export const display_clear = function (block, generator) {
if (version == 'mpython') {
generator.definitions_['import_' + version + '_onboard_oled'] = "from " + version + " import onboard_oled";
var code = 'onboard_oled.fill(0)\n' + 'onboard_oled.show()\n';
}else if(version == 'mixgo_nova'){
} else if (version == 'mixgo_nova') {
generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft";
var code = 'onboard_tft.fill(0)\n' + 'onboard_tft.show()\n';
}else {
} else {
generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix";
var code = 'onboard_matrix.fill(0)\n' + 'onboard_matrix.show()\n';
}
@@ -246,7 +243,7 @@ export const image_arithmetic = function (a, generator) {
var op = a.getFieldValue("OP");
var imga = generator.valueToCode(a, 'A', generator.ORDER_ATOMIC);
var imgb = generator.valueToCode(a, 'B', generator.ORDER_ATOMIC);
var code = 'onboard_matrix.map_' + op + '(' + imga + ',' + imgb + ')';
var code = 'onboard_matrix.map_' + op + '(' + imga + ', ' + imgb + ')';
return [code, generator.ORDER_ATOMIC];
}
@@ -265,12 +262,12 @@ export const display_shift = function (a, generator) {
var op = a.getFieldValue("OP");
var value = generator.valueToCode(a, 'val', generator.ORDER_ATOMIC);
var code = 'onboard_oled.' + op + '(' + value + ')\n';
} else if(version == 'mixgo_nova'){
} else if (version == 'mixgo_nova') {
generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft";
var op = a.getFieldValue("OP");
var value = generator.valueToCode(a, 'val', generator.ORDER_ATOMIC);
var code = 'onboard_tft.' + op + '(' + value + ')\n';
}else {
} else {
generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix";
var op = a.getFieldValue("OP");
var value = generator.valueToCode(a, 'val', generator.ORDER_ATOMIC);
@@ -292,7 +289,7 @@ export const display_get_pixel = function (block, generator) {
var value_x = generator.valueToCode(block, 'x', generator.ORDER_ATOMIC);
var value_y = generator.valueToCode(block, 'y', generator.ORDER_ATOMIC);
var code = 'onboard_oled.pixel(int(' + value_x + '), int(' + value_y + '))';
}else if (version == 'mixgo_nova') {
} else if (version == 'mixgo_nova') {
generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft";
var value_x = generator.valueToCode(block, 'x', generator.ORDER_ATOMIC);
var value_y = generator.valueToCode(block, 'y', generator.ORDER_ATOMIC);
@@ -309,12 +306,12 @@ export const display_get_pixel = function (block, generator) {
export const display_bright_point = function (_, generator) {
var version = Boards.getSelectedBoardKey().split(':')[2];
if (version == 'mixgo_nova'){
if (version == 'mixgo_nova') {
generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft";
var x = generator.valueToCode(this, 'x', generator.ORDER_ASSIGNMENT);
var y = generator.valueToCode(this, 'y', generator.ORDER_ASSIGNMENT);
var y = generator.valueToCode(this, 'y', generator.ORDER_ASSIGNMENT);
var code = 'onboard_tft.pixel(int(' + x + '), int(' + y + '), 0xffff)\n' + 'onboard_tft.show()\n';
}else {
} else {
generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix";
var x = generator.valueToCode(this, 'x', generator.ORDER_ASSIGNMENT);
var y = generator.valueToCode(this, 'y', generator.ORDER_ASSIGNMENT);
@@ -326,10 +323,10 @@ export const display_bright_point = function (_, generator) {
export const display_get_screen_pixel = function (_, generator) {
var version = Boards.getSelectedBoardKey().split(':')[2];
if (version == 'mixgo_nova'){
if (version == 'mixgo_nova') {
generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft";
var code = 'onboard_tft.get_brightness()';
}else {
} else {
generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix";
var code = 'onboard_matrix.get_brightness()';
}
@@ -338,11 +335,11 @@ export const display_get_screen_pixel = function (_, generator) {
export const display_bright_screen = function (_, generator) {
var version = Boards.getSelectedBoardKey().split(':')[2];
if (version == 'mixgo_nova'){
if (version == 'mixgo_nova') {
generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft";
var x = generator.valueToCode(this, 'x', generator.ORDER_ASSIGNMENT);
var code = 'onboard_tft.set_brightness(' + x + ')\n';
}else{
} else {
generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix";
var x = generator.valueToCode(this, 'x', generator.ORDER_ASSIGNMENT);
var code = 'onboard_matrix.set_brightness(' + x + ')\n';
@@ -473,7 +470,7 @@ export const onboard_oled_show_image_xy = function (_, generator) {
var x = generator.valueToCode(this, 'x', generator.ORDER_ASSIGNMENT);
var y = generator.valueToCode(this, 'y', generator.ORDER_ASSIGNMENT);
var size = generator.valueToCode(this, 'size', generator.ORDER_ASSIGNMENT);
var code = "onboard_oled.image(" + data + ',x = ' + x + ',y = ' + y + ',size = ' + size + ")\n";
var code = "onboard_oled.image(" + data + ', x=' + x + ', y=' + y + ', size=' + size + ")\n";
return code;
}
@@ -494,7 +491,7 @@ export const onboard_oled_show_image_or_string_delay = function (_, generator) {
var size = generator.valueToCode(this, 'size', generator.ORDER_ASSIGNMENT);
var space = generator.valueToCode(this, 'space', generator.ORDER_ASSIGNMENT);
var op = this.getFieldValue('center');
var code = "onboard_oled.shows(" + data + ',x = ' + x + ',y = ' + y + ',size = ' + size + ',space = ' + space + ',center = ' + op + ")\n";
var code = "onboard_oled.shows(" + data + ', x=' + x + ', y=' + y + ', size=' + size + ', space=' + space + ', center=' + op + ")\n";
return code;
}
@@ -504,7 +501,7 @@ export const onboard_oled_show_frame_string_delay = function (_, generator) {
var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT);
var size = generator.valueToCode(this, 'size', generator.ORDER_ASSIGNMENT);
var time = generator.valueToCode(this, 'time', generator.ORDER_ASSIGNMENT);
var code = "onboard_oled.frame(" + data + ',size = ' + size + ',delay = ' + time + ")\n";
var code = "onboard_oled.frame(" + data + ', size=' + size + ', delay=' + time + ")\n";
return code;
}
@@ -516,7 +513,7 @@ export const onboard_oled_scroll_string_delay = function (_, generator) {
var size = generator.valueToCode(this, 'size', generator.ORDER_ASSIGNMENT);
var time = generator.valueToCode(this, 'time', generator.ORDER_ASSIGNMENT);
var space = generator.valueToCode(this, 'space', generator.ORDER_ASSIGNMENT);
var code = "onboard_oled.scroll(" + data + ',y = ' + y + ',size = ' + size + ',speed =' + time + ',space = ' + space + ")\n";
var code = "onboard_oled.scroll(" + data + ', y=' + y + ', size=' + size + ', speed=' + time + ', space=' + space + ")\n";
return code;
}
@@ -673,7 +670,7 @@ export const onboard_tft_show_image_xy = function (_, generator) {
var size = generator.valueToCode(this, 'size', generator.ORDER_ASSIGNMENT);
var color = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC);
if (color.slice(0, 2) == "0x") {
var code = "onboard_tft.image(" + data + ',x = ' + x + ',y = ' + y + ',size = ' + size + ',color=' + color + ")\n";
var code = "onboard_tft.image(" + data + ', x=' + x + ', y=' + y + ', size=' + size + ', color=' + color + ")\n";
} else {
const rgbValues = color.match(/\d+/g);
const r = parseInt(rgbValues[0]);
@@ -681,7 +678,7 @@ export const onboard_tft_show_image_xy = function (_, generator) {
const b = parseInt(rgbValues[2]);
var rgb = "0x" + ((r << 16) + (g << 8) + b).toString(16).padStart(4, "0");
var rgb565 = (rgb & 0xf80000) >> 8 | (rgb & 0xfc00) >> 5 | (rgb & 0xff) >> 3;
var code = "onboard_tft.image(" + data + ',x = ' + x + ',y = ' + y + ',size = ' + size + ',color=0x' + rgb565.toString(16) + ")\n";
var code = "onboard_tft.image(" + data + ', x=' + x + ', y=' + y + ', size=' + size + ', color=0x' + rgb565.toString(16) + ")\n";
}
return code;
}
@@ -697,7 +694,7 @@ export const onboard_tft_show_image_or_string_delay = function (_, generator) {
var op = this.getFieldValue('center');
var color = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC);
if (color.slice(0, 2) == "0x") {
var code = "onboard_tft.shows(" + data + ',x = ' + x + ',y = ' + y + ',size = ' + size + ',space = ' + space + ',center = ' + op + ',color=' + color + ")\n";
var code = "onboard_tft.shows(" + data + ', x=' + x + ', y=' + y + ', size=' + size + ', space=' + space + ', center=' + op + ', color=' + color + ")\n";
} else {
const rgbValues = color.match(/\d+/g);
const r = parseInt(rgbValues[0]);
@@ -705,7 +702,7 @@ export const onboard_tft_show_image_or_string_delay = function (_, generator) {
const b = parseInt(rgbValues[2]);
var rgb = "0x" + ((r << 16) + (g << 8) + b).toString(16).padStart(4, "0");
var rgb565 = (rgb & 0xf80000) >> 8 | (rgb & 0xfc00) >> 5 | (rgb & 0xff) >> 3;
var code = "onboard_tft.shows(" + data + ',x = ' + x + ',y = ' + y + ',size = ' + size + ',space = ' + space + ',center = ' + op + ',color=0x' + rgb565.toString(16) + ")\n";
var code = "onboard_tft.shows(" + data + ', x=' + x + ', y=' + y + ', size=' + size + ', space=' + space + ', center=' + op + ', color=0x' + rgb565.toString(16) + ")\n";
}
return code;
}
@@ -718,7 +715,7 @@ export const onboard_tft_show_frame_string_delay = function (_, generator) {
var time = generator.valueToCode(this, 'time', generator.ORDER_ASSIGNMENT);
var color = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC);
if (color.slice(0, 2) == "0x") {
var code = "onboard_tft.frame(" + data + ',size = ' + size + ',delay = ' + time + ',color=' + color + ")\n";
var code = "onboard_tft.frame(" + data + ', size=' + size + ', delay=' + time + ', color=' + color + ")\n";
} else {
const rgbValues = color.match(/\d+/g);
const r = parseInt(rgbValues[0]);
@@ -726,7 +723,7 @@ export const onboard_tft_show_frame_string_delay = function (_, generator) {
const b = parseInt(rgbValues[2]);
var rgb = "0x" + ((r << 16) + (g << 8) + b).toString(16).padStart(4, "0");
var rgb565 = (rgb & 0xf80000) >> 8 | (rgb & 0xfc00) >> 5 | (rgb & 0xff) >> 3;
var code = "onboard_tft.frame(" + data + ',size = ' + size + ',delay = ' + time + ',color=0x' + rgb565.toString(16) + ")\n";
var code = "onboard_tft.frame(" + data + ', size=' + size + ', delay=' + time + ', color=0x' + rgb565.toString(16) + ")\n";
}
return code;
}
@@ -854,7 +851,7 @@ export const onboard_tft_clock_init = function (_, generator) {
var sub = generator.valueToCode(this, 'SUB', generator.ORDER_ASSIGNMENT);
var color = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC);
if (color.slice(0, 2) == "0x") {
var code = sub + "=Clock(" + x + ',' + y + ',' + size + ',' + color + ")\n";
var code = sub + "=Clock(" + x + ', ' + y + ', ' + size + ', ' + color + ")\n";
} else {
const rgbValues = color.match(/\d+/g);
const r = parseInt(rgbValues[0]);
@@ -862,7 +859,7 @@ export const onboard_tft_clock_init = function (_, generator) {
const b = parseInt(rgbValues[2]);
var rgb = "0x" + ((r << 16) + (g << 8) + b).toString(16).padStart(4, "0");
var rgb565 = (rgb & 0xf80000) >> 8 | (rgb & 0xfc00) >> 5 | (rgb & 0xff) >> 3;
var code = sub + "=Clock(" + x + ',' + y + ',' + size + ',0x' + rgb565.toString(16) + ")\n";
var code = sub + "=Clock(" + x + ', ' + y + ', ' + size + ', 0x' + rgb565.toString(16) + ")\n";
}
return code;
}
@@ -882,7 +879,7 @@ export const onboard_tft_clock_set_time = function (_, generator) {
var h = generator.valueToCode(this, 'h', generator.ORDER_ASSIGNMENT);
var m = generator.valueToCode(this, 'm', generator.ORDER_ASSIGNMENT);
var s = generator.valueToCode(this, 's', generator.ORDER_ASSIGNMENT);
var code = sub + ".set_time(" + h + ',' + m + ',' + s + ")\n";
var code = sub + ".set_time(" + h + ', ' + m + ', ' + s + ")\n";
return code;
}
@@ -922,7 +919,7 @@ export const onboard_tft_display_shape_circle = function (block, generator) {
var color = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC);
var shape = block.getFieldValue('shape');
if (color.slice(0, 2) == "0x") {
var code = 'onboard_tft.ellipse(' + x + ', ' + y + ', ' + R + ', ' + R + ', ' + color + ',' + shape + ')\n' + 'onboard_tft.show()\n';
var code = 'onboard_tft.ellipse(' + x + ', ' + y + ', ' + R + ', ' + R + ', ' + color + ', ' + shape + ')\n' + 'onboard_tft.show()\n';
} else {
const rgbValues = color.match(/\d+/g);
const r = parseInt(rgbValues[0]);
@@ -930,14 +927,14 @@ export const onboard_tft_display_shape_circle = function (block, generator) {
const b = parseInt(rgbValues[2]);
var rgb = "0x" + ((r << 16) + (g << 8) + b).toString(16).padStart(4, "0");
var rgb565 = (rgb & 0xf80000) >> 8 | (rgb & 0xfc00) >> 5 | (rgb & 0xff) >> 3;
var code = 'onboard_tft.ellipse(' + x + ', ' + y + ', ' + R + ', ' + R + ', 0x' + rgb565.toString(16) + ',' + shape + ')\n' + 'onboard_tft.show()\n';
var code = 'onboard_tft.ellipse(' + x + ', ' + y + ', ' + R + ', ' + R + ', 0x' + rgb565.toString(16) + ', ' + shape + ')\n' + 'onboard_tft.show()\n';
}
return code;
}
export const draw_pointer = function(_, generator) {
export const draw_pointer = function (_, generator) {
var version = Boards.getSelectedBoardKey().split(':')[2]
generator.definitions_['import_'+version+'_onboard_matrix'] = "from "+version+" import onboard_matrix";
generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix";
var angle = generator.valueToCode(this, 'angle', generator.ORDER_ASSIGNMENT);
var code = "onboard_matrix.pointern(angle=" + angle + ")\n";
return code;

2
boards/default_src/micropython/generators/inout.js
View File

@@ -92,7 +92,7 @@ export const inout_pin_attachInterrupt = function (_, generator) {
var dropdown_pin = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC);
var dropdown_mode = this.getFieldValue('mode');
var atta = generator.valueToCode(this, 'DO', generator.ORDER_ATOMIC);
var code = 'machine.Pin(' + dropdown_pin + ').irq' + '(handler = ' + atta + ', trigger = ' + dropdown_mode + ')\n'
var code = 'machine.Pin(' + dropdown_pin + ').irq' + '(handler=' + atta + ', trigger=' + dropdown_mode + ')\n'
//var funcName = 'attachInterrupt_func_' + dropdown_pin;
//var branch = generator.statementToCode(this, 'DO') || generator.PASS;
//var code2 = 'def' + ' ' + funcName + '(p):\n' + branch + '\n';

10
boards/default_src/micropython/generators/iot.js
View File

@@ -2,7 +2,7 @@ export const iot_wifi_connect = function (_, generator) {
generator.definitions_['import_mixiot'] = "import mixiot";
var username = generator.valueToCode(this, 'WIFINAME', generator.ORDER_ATOMIC);
var password = generator.valueToCode(this, 'PASSWORD', generator.ORDER_ATOMIC);
var code = 'mixiot.wlan_connect(' + username + ',' + password + ')\n';
var code = 'mixiot.wlan_connect(' + username + ', ' + password + ')\n';
return code;
}
@@ -31,7 +31,7 @@ export const iot_onenet_publish_dict = function (_, generator) {
var d = generator.valueToCode(this, 'DICT', generator.ORDER_ATOMIC);
var check = this.getFieldValue("is_print") == 'TRUE' ? 'True' : 'False';
generator.definitions_['import_onenet'] = "import onenet";
var code = v + '.publish(' + d + ', is_print = ' + check + ')\n';
var code = v + '.publish(' + d + ', is_print=' + check + ')\n';
return code;
}
@@ -208,7 +208,7 @@ export const iot_http_client = function (_, generator) {
generator.definitions_['import_debugnet'] = "import debugnet";
var addr = generator.valueToCode(this, 'addr', generator.ORDER_ATOMIC);
var key = this.getFieldValue('key');
var code = 'HTTP_client = debugnet.request("GET",' + addr + ',debug=' + key + ')\n';
var code = 'HTTP_client = debugnet.request("GET", ' + addr + ', debug=' + key + ')\n';
return code;
}
@@ -240,7 +240,7 @@ export const IOT_CONNECT_OLLAMA = function(_,generator) {
var ser = generator.valueToCode(this, 'SERVER', generator.ORDER_ATOMIC);
var name = generator.valueToCode(this, 'NAME', generator.ORDER_ATOMIC);
var num = generator.valueToCode(this, 'NUMBER', generator.ORDER_ATOMIC);
var code = 'llm = Ollama(' + ser + ', ' + name + ','+ num +')\n';
var code = 'llm = Ollama(' + ser + ', ' + name + ', '+ num +')\n';
return code;
}
@@ -249,7 +249,7 @@ export const use_ollama_llm_to_chat = function (_, generator) {
generator.definitions_['import_Ollama'] = "from ollama import Ollama";
var topic = generator.valueToCode(this, 'TOPIC', generator.ORDER_ATOMIC);
var method = generator.valueToCode(this, 'METHOD', generator.ORDER_ATOMIC);
var code = 'llm.chat(' + topic + ',' + method + ')\n';
var code = 'llm.chat(' + topic + ', ' + method + ')\n';
return code;
}

16
boards/default_src/micropython/generators/network.js
View File

@@ -25,7 +25,7 @@ export const network_connect = function (_, generator) {
var varName = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC);
var id = generator.valueToCode(this, 'id', generator.ORDER_ATOMIC);
var password = generator.valueToCode(this, 'password', generator.ORDER_ATOMIC);
return "" + varName + ".connect(" + id + "," + password + ")\n"
return "" + varName + ".connect(" + id + ", " + password + ")\n"
}
export const network_wifi_connect = function (_, generator) {
@@ -78,7 +78,7 @@ export const network_ap_connect = function (_, generator) {
var varName = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC);
var essid = generator.valueToCode(this, 'essid', generator.ORDER_ATOMIC);
var channel = generator.valueToCode(this, 'channel', generator.ORDER_ATOMIC);
return "" + varName + ".config(essid = " + essid + ", channel = " + channel + ")\n";
return "" + varName + ".config(essid = " + essid + ", channel=" + channel + ")\n";
}
export const network_scan = function (_, generator) {
@@ -112,7 +112,7 @@ export const network_socket_init = function (_, generator) {
else if (mode == 'TCP') {
mode = 'socket.SOCK_STREAM'
}
return "" + varName + " = socket.socket(socket.AF_INET," + mode + ")\n";
return "" + varName + " = socket.socket(socket.AF_INET, " + mode + ")\n";
}
export const network_socket_bind = function (_, generator) {
@@ -180,7 +180,7 @@ export const network_socket_send_to = function (_, generator) {
var varName = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC);
var content = generator.valueToCode(this, 'content', generator.ORDER_ATOMIC);
var address = generator.valueToCode(this, 'address', generator.ORDER_ATOMIC);
var code = "" + varName + ".sendto(" + content + "," + address + ")\n";
var code = "" + varName + ".sendto(" + content + ", " + address + ")\n";
return code;
}
@@ -198,7 +198,6 @@ export const requests_get = function (_, generator) {
Blockly.Variables.NAME_TYPE);
var str = generator.valueToCode(this, 'DOMAIN', generator.ORDER_ATOMIC);
var code = varName + '= ' + 'requests.get(' + str + ')\n';
return code;
}
@@ -236,7 +235,6 @@ export const requests_get2 = function (_, generator) {
var str = generator.valueToCode(this, 'URL', generator.ORDER_ATOMIC);
var code = 'urequests.' + dropdown_type + '(' + str + ')';
return [code, generator.ORDER_ATOMIC];
};
export const requests_attribute2 = function (_, generator) {
@@ -252,7 +250,7 @@ export const requests_post = function (_, generator) {
var dropdown_type = this.getFieldValue('TYPE');
var str = generator.valueToCode(this, 'URL', generator.ORDER_ATOMIC);
var data = generator.valueToCode(this, 'data', generator.ORDER_ATOMIC);
var code = 'urequests.' + dropdown_type + '(' + str + ',data=' + data + ')';
var code = 'urequests.' + dropdown_type + '(' + str + ', data=' + data + ')';
return [code, generator.ORDER_ATOMIC];
};
@@ -275,7 +273,7 @@ export const educore_mqtt_connect = function (_, generator) {
var password = generator.valueToCode(this, 'PASSWORD', generator.ORDER_ATOMIC);
// var a = "'" + username.replace("'", "").replace("'", "") + "/" + project.replace("'", "").replace("'", "") + "/'"
// var code = 'MQTT_USR_PRJ = ' + a + '\n' + 'mqtt_client = mixiot.init_MQTT_client(' + server + ', ' + username + ', ' + password + ', MQTT_USR_PRJ)\n';
var code = 'mqttclient.connect(server='+server+', port='+port+',client_id='+client_id+',user='+username+',psd='+password+')\n'
var code = 'mqttclient.connect(server='+server+', port='+port+', client_id='+client_id+', user='+username+', psd='+password+')\n'
return code;
}
@@ -301,7 +299,7 @@ export const educore_mqtt_topic_publish = function (_, generator) {
generator.definitions_['import_educore_mqttclient'] = "from educore import mqttclient";
var topic = generator.valueToCode(this, 'TOPIC', generator.ORDER_ATOMIC);
var msg = generator.valueToCode(this, 'MSG', generator.ORDER_ATOMIC);
var code = 'mqtt_client.publish(topic=' + topic + ',content=' + msg + ')\n';
var code = 'mqtt_client.publish(topic=' + topic + ', content=' + msg + ')\n';
return code;
}

4
boards/default_src/micropython/generators/nova_g1.js
View File

@@ -9,7 +9,7 @@ export const nova_g1_motor = function (_, generator) {
var wheel = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC);
var v = this.getFieldValue('direction');
var speed = generator.valueToCode(this, 'speed', generator.ORDER_ATOMIC);
var code = "ext_g1.motor(" + wheel + ',"' + v + '",' + speed + ")\n";
var code = "ext_g1.motor(" + wheel + ', "' + v + '", ' + speed + ")\n";
return code;
}
@@ -17,7 +17,7 @@ export const nova_g1_usb = function (_, generator) {
generator.definitions_['from_nova_g1_import_ext_g1'] = 'from nova_g1 import ext_g1';
var p = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC);
var percent = generator.valueToCode(this, 'percent', generator.ORDER_ATOMIC);
var code = "ext_g1.usb_pwm(" + p + ',' + percent + ")\n";
var code = "ext_g1.usb_pwm(" + p + ', ' + percent + ")\n";
return code;
}

8
boards/default_src/micropython/generators/pe_g1.js
View File

@@ -19,7 +19,7 @@ export const pe_g1_dc_motor = function (_, generator) {
var wheel = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC);
var v = this.getFieldValue('direction');
var speed = generator.valueToCode(this, 'speed', generator.ORDER_ATOMIC);
var code = s + ".motor(" + wheel + ',"' + v + '",' + speed + ")\n";
var code = s + ".motor(" + wheel + ', "' + v + '", ' + speed + ")\n";
return code;
}
@@ -28,7 +28,7 @@ export const pe_g1_dc_motor_speed = function (_, generator) {
var s = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
var wheel = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC);
var v = 'NC';
var code = s + ".motor(" + wheel + ',"' + v + '"' + ")\n";
var code = s + ".motor(" + wheel + ', "' + v + '"' + ")\n";
return [code, generator.ORDER_ATOMIC];
}
@@ -37,7 +37,7 @@ export const pe_g1_servo_set_angle = function (_, generator) {
var v = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
var dropdown_pin = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC);
var num = generator.valueToCode(this, 'NUM', generator.ORDER_ATOMIC);
var code = v + '.servo180(' + dropdown_pin + ',' + num + ')\n';
var code = v + '.servo180(' + dropdown_pin + ', ' + num + ')\n';
return code;
}
@@ -46,7 +46,7 @@ export const pe_g1_servo_set_speed = function (_, generator) {
var v = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
var dropdown_pin = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC);
var num = generator.valueToCode(this, 'NUM', generator.ORDER_ATOMIC);
var code = v + '.servo360(' + dropdown_pin + ',' + num + ')\n';
var code = v + '.servo360(' + dropdown_pin + ', ' + num + ')\n';
return code;
}

12
boards/default_src/micropython/generators/sensor.js
View File

@@ -29,7 +29,7 @@ export const sensor_mixgo_button_attachInterrupt = function (_, generator) {
var dropdown_btn = generator.valueToCode(this, 'btn', generator.ORDER_ATOMIC);
var dropdown_mode = this.getFieldValue('mode');
var atta = generator.valueToCode(this, 'DO', generator.ORDER_ATOMIC);
var code = 'mixgo.' + dropdown_btn + '.irq' + '(handler = ' + atta + ', trigger = ' + dropdown_mode + ')\n'
var code = 'mixgo.' + dropdown_btn + '.irq' + '(handler=' + atta + ', trigger=' + dropdown_mode + ')\n'
return code;
}
@@ -65,7 +65,7 @@ export const sensor_mixgo_extern_button_attachInterrupt = function (_, generator
var pin = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC);
var dropdown_mode = this.getFieldValue('mode');
var atta = generator.valueToCode(this, 'DO', generator.ORDER_ATOMIC);
var code = 'mixgo.Button(' + pin + ').irq' + '(handler = ' + atta + ', trigger = ' + dropdown_mode + ')\n'
var code = 'mixgo.Button(' + pin + ').irq' + '(handler=' + atta + ', trigger=' + dropdown_mode + ')\n'
return code;
}
@@ -218,7 +218,7 @@ export const sensor_distance_hrsc04 = function (_, generator) {
' return dist\n' +
'\n' +
'sonar=HCSR04()\n'
return ['sonar.distance_mm()/10.0', generator.ORDER_ATOMIC];
return ['sonar.distance_mm() / 10.0', generator.ORDER_ATOMIC];
}
export const RTC_get_time = function (_, generator) {
@@ -236,7 +236,7 @@ export const RTC_set_time = function (_, generator) {
var minute = generator.valueToCode(this, "minute", generator.ORDER_ASSIGNMENT);
var second = generator.valueToCode(this, "second", generator.ORDER_ASSIGNMENT);
generator.setups_['class_DS1307'] = generator.CLASS_DS1307_INIT;
var code = 'str(ds.Hour(' + hour + '))+ str(ds.Minute(' + minute + ')) +str(ds.Second(' + second + '))\n';
var code = 'str(ds.Hour(' + hour + ')) + str(ds.Minute(' + minute + ')) + str(ds.Second(' + second + '))\n';
return code;
}
@@ -246,7 +246,7 @@ export const RTC_set_date = function (_, generator) {
var month = generator.valueToCode(this, "month", generator.ORDER_ASSIGNMENT);
var day = generator.valueToCode(this, "day", generator.ORDER_ASSIGNMENT);
generator.setups_['class_DS1307'] = generator.CLASS_DS1307_INIT;
var code = 'str(ds.Year(' + year + '))+ str(ds.Month(' + month + ')) +str(ds.Day(' + day + '))\n';
var code = 'str(ds.Year(' + year + ')) + str(ds.Month(' + month + ')) + str(ds.Day(' + day + '))\n';
return code;
}
@@ -329,7 +329,7 @@ export const RTC_set_datetime = function (_, generator) {
var v = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
if (v == "rtc")
generator.definitions_['import_mixgo_rtc'] = 'from mixgo import rtc';
var code = v + '.datetime((' + year + ',' + month + ',' + day + ',' + week + ',' + hour + ',' + minute + ',' + second + ',' + millisecond + '))\n';
var code = v + '.datetime((' + year + ', ' + month + ', ' + day + ', ' + week + ', ' + hour + ', ' + minute + ', ' + second + ', ' + millisecond + '))\n';
return code;
}

84
boards/default_src/micropython/generators/sensor_extern.js
View File

@@ -31,7 +31,7 @@ export const sensor_mixgo_extern_button_attachInterrupt = function (_, generator
var pin = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC);
var dropdown_mode = this.getFieldValue('mode');
var atta = generator.valueToCode(this, 'DO', generator.ORDER_ATOMIC);
var code = 'mixgo.Button(' + pin + ').irq' + '(handler = ' + atta + ', trigger = ' + dropdown_mode + ')\n'
var code = 'mixgo.Button(' + pin + ').irq' + '(handler=' + atta + ', trigger=' + dropdown_mode + ')\n'
return code;
}
@@ -86,7 +86,7 @@ export const sensor_distance_hrsc04 = function (_, generator) {
' return dist\n' +
'\n' +
'sonar=HCSR04()\n'
return ['sonar.distance_mm()/10.0', generator.ORDER_ATOMIC];
return ['sonar.distance_mm() / 10.0', generator.ORDER_ATOMIC];
}
export const RTC_set_time = function (_, generator) {
@@ -105,7 +105,7 @@ export const RTC_set_date = function (_, generator) {
var month = generator.valueToCode(this, "month", generator.ORDER_ASSIGNMENT);
var day = generator.valueToCode(this, "day", generator.ORDER_ASSIGNMENT);
generator.setups_['class_DS1307'] = generator.CLASS_DS1307_INIT;
var code = 'str(ds.Year(' + year + '))+ str(ds.Month(' + month + ')) +str(ds.Day(' + day + '))\n';
var code = 'str(ds.Year(' + year + ')) + str(ds.Month(' + month + ')) + str(ds.Day(' + day + '))\n';
return code;
}
@@ -218,7 +218,7 @@ export const sensor_use_i2c_init = function (_, generator) {
} else if (key == 'CI130X') {
generator.definitions_['import_ci130x'] = 'import ci130x';
code = v + ' = ci130x.' + key + "(" + iv + ')\n';
} else if (key == 'MS5611'){
} else if (key == 'MS5611') {
generator.definitions_['import_ms5611'] = 'import ms5611';
code = v + ' = ms5611.MS5611(' + iv + ')\n';
}
@@ -290,7 +290,7 @@ export const CI130X_BROADCAST = function (_, generator) {
var num = generator.valueToCode(this, 'NUM', generator.ORDER_ATOMIC);
var star = this.getFieldValue('star');
var end = this.getFieldValue('end');
var code = sub + '.play(' + star + ',' + num + ',' + end + ')\n';
var code = sub + '.play(' + star + ', ' + num + ', ' + end + ')\n';
return code;
}
@@ -363,14 +363,11 @@ export const sensor_ucs12071_extern = function (_, generator) {
generator.definitions_['import_ucs12071'] = 'import ucs12071';
if (key == '0') {
var code = sub + '.color()';
}
else if (key == '1') {
} else if (key == '1') {
var code = sub + '.color_raw()';
}
else if (key == '2') {
} else if (key == '2') {
var code = sub + '.als()';
}
else {
} else {
var code = sub + '.ir()';
}
return [code, generator.ORDER_ATOMIC];
@@ -435,11 +432,11 @@ export const sensor_use_spi_init = function (_, generator) {
generator.definitions_['import_' + version] = 'import ' + version;
generator.definitions_['import_ws_lora'] = 'import ws_lora';
if (version == 'mixgo_pe') {
var code = v + ' = ws_lora.Weather(' + sv + ',' + pv + ')\n';
var code = v + ' = ws_lora.Weather(' + sv + ', ' + pv + ')\n';
} else if (version == 'mixgo_nova') {
var code = v + ' = ws_lora.Weather(' + sv + ',' + pv + ',' + version + '.onboard_i2c_soft' + ')\n';
var code = v + ' = ws_lora.Weather(' + sv + ', ' + pv + ', ' + version + '.onboard_i2c_soft' + ')\n';
} else {
var code = v + ' = ws_lora.Weather(' + sv + ',' + pv + ',' + version + '.onboard_i2c' + ')\n';
var code = v + ' = ws_lora.Weather(' + sv + ', ' + pv + ', ' + version + '.onboard_i2c' + ')\n';
}
}
return code;
@@ -450,7 +447,7 @@ export const extern_rfid_read = function (_, generator) {
var sector = generator.valueToCode(this, 'SECTOR', generator.ORDER_ATOMIC);
var key = this.getFieldValue('key');
generator.definitions_['import_rc522'] = 'import rc522';
var code = sub + '.read_card(' + sector + ',"' + key + '")';
var code = sub + '.read_card(' + sector + ', "' + key + '")';
return [code, generator.ORDER_ATOMIC];
}
@@ -474,7 +471,7 @@ export const extern_rfid_write = function (_, generator) {
var sector = generator.valueToCode(this, 'SECTOR', generator.ORDER_ATOMIC);
var cnt = generator.valueToCode(this, 'CONTENT', generator.ORDER_ATOMIC);
generator.definitions_['import_rc522'] = 'import rc522';
var code = sub + '.write_card(' + cnt + ',' + sector + ')\n';
var code = sub + '.write_card(' + cnt + ', ' + sector + ')\n';
return code;
}
@@ -483,7 +480,7 @@ export const extern_rfid_write_return = function (_, generator) {
var sector = generator.valueToCode(this, 'SECTOR', generator.ORDER_ATOMIC);
var cnt = generator.valueToCode(this, 'CONTENT', generator.ORDER_ATOMIC);
generator.definitions_['import_rc522'] = 'import rc522';
var code = sub + '.write_card(' + cnt + ',' + sector + ')';
var code = sub + '.write_card(' + cnt + ', ' + sector + ')';
return [code, generator.ORDER_ATOMIC];
}
@@ -491,7 +488,7 @@ export const extern_rfid_status = function (_, generator) {
var sub = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
var key = this.getFieldValue('key');
generator.definitions_['import_rc522'] = 'import rc522';
var code = sub + '.scan_card()==' + key;
var code = sub + '.scan_card() == ' + key;
return [code, generator.ORDER_ATOMIC];
}
@@ -524,8 +521,7 @@ export const weather_set_label = function (_, generator) {
var code = new Array(this.itemCount_);
var default_value = '0';
for (var n = 0; n < this.itemCount_; n++) {
code[n] = generator.valueToCode(this, 'ADD' + n,
generator.ORDER_NONE) || default_value;
code[n] = generator.valueToCode(this, 'ADD' + n, generator.ORDER_NONE) || default_value;
}
var code = sub + '.label(' + code.join(', ') + ')\n';
return code;
@@ -585,7 +581,7 @@ export const HCSR04 = function (_, generator) {
generator.definitions_['import_sonar'] = 'import sonar';
var dropdown_pin1 = generator.valueToCode(this, "PIN1", generator.ORDER_ASSIGNMENT);
var dropdown_pin2 = generator.valueToCode(this, "PIN2", generator.ORDER_ASSIGNMENT);
var code = 'sonar.Sonar(' + dropdown_pin1 + ',' + dropdown_pin2 + ').checkdist()';
var code = 'sonar.Sonar(' + dropdown_pin1 + ', ' + dropdown_pin2 + ').checkdist()';
return [code, generator.ORDER_ATOMIC];
}
@@ -596,7 +592,7 @@ export const PS2_init = function (_, generator) {
var PS2_DOU = this.getFieldValue('PS2_DOU');
var PS2_DIN = this.getFieldValue('PS2_DIN');
var PS2_CS = this.getFieldValue('PS2_CS');
var code = 'mixgope_ps = ps2.PS2Controller(' + PS2_CLK + ',' + PS2_DOU + ',' + PS2_DIN + ',' + PS2_CS + ')\n';
var code = 'mixgope_ps = ps2.PS2Controller(' + PS2_CLK + ', ' + PS2_DOU + ', ' + PS2_DIN + ', ' + PS2_CS + ')\n';
return code;
}
@@ -604,7 +600,7 @@ export const PS2_vibration = function (_, generator) {
generator.definitions_['import_ps2'] = 'import ps2';
var ss = this.getFieldValue('smotorstate');
var amp = generator.valueToCode(this, 'AMP', generator.ORDER_ATOMIC);
var code = "mixgope_ps.PS2_vibration(" + ss + ',' + amp + ")\n";
var code = "mixgope_ps.PS2_vibration(" + ss + ', ' + amp + ")\n";
return code;
}
@@ -649,7 +645,7 @@ export const RTC_set_datetime = function (_, generator) {
var v = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
if (v == "rtc")
generator.definitions_['import_mixgo_rtc'] = 'from mixgo import rtc';
var code = v + '.datetime((' + year + ',' + month + ',' + day + ',' + week + ',' + hour + ',' + minute + ',' + second + ',' + millisecond + '))\n';
var code = v + '.datetime((' + year + ', ' + month + ', ' + day + ', ' + week + ', ' + hour + ', ' + minute + ', ' + second + ', ' + millisecond + '))\n';
return code;
}
@@ -679,7 +675,7 @@ export const PS2_init_new = function (_, generator) {
var PS2_DIN = generator.valueToCode(this, 'DIN', generator.ORDER_ATOMIC);
var PS2_CS = generator.valueToCode(this, 'CS', generator.ORDER_ATOMIC);
var sub = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
var code = sub + ' = ps2.PS2Controller(' + PS2_CLK + ',' + PS2_DOU + ',' + PS2_DIN + ',' + PS2_CS + ')\n';
var code = sub + ' = ps2.PS2Controller(' + PS2_CLK + ', ' + PS2_DOU + ', ' + PS2_DIN + ', ' + PS2_CS + ')\n';
return code;
}
@@ -688,7 +684,7 @@ export const PS2_vibration_new = function (_, generator) {
var sub = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
var ss = this.getFieldValue('smotorstate');
var amp = generator.valueToCode(this, 'AMP', generator.ORDER_ATOMIC);
var code = sub + ".vibration(" + ss + ',' + amp + ")\n";
var code = sub + ".vibration(" + ss + ', ' + amp + ")\n";
return code;
}
@@ -759,11 +755,11 @@ export const robot_button_extern_get_value = function (_, generator) {
generator.definitions_['import_machine'] = 'import machine';
generator.definitions_['import_i2cdevice'] = 'import i2cdevice';
if (mode == "0") {
generator.definitions_['import_left_ext_i2c'] = 'ext_i2c_left = i2cdevice.I2C_device(scl = machine.Pin(0), sda = machine.Pin(1), freq = 10000)';
generator.definitions_['import_left_ext_i2c'] = 'ext_i2c_left = i2cdevice.I2C_device(scl=machine.Pin(0), sda=machine.Pin(1), freq=10000)';
generator.definitions_['import_left_button'] = 'ext_button_left = i2cdevice.Buttonx5(ext_i2c_left)';
var code = 'ext_button_left.value()' + num;
} else if (mode == "1") {
generator.definitions_['import_right_ext_i2c'] = 'ext_i2c_right = i2cdevice.I2C_device(scl = machine.Pin(2), sda = machine.Pin(3), freq = 10000)';
generator.definitions_['import_right_ext_i2c'] = 'ext_i2c_right = i2cdevice.I2C_device(scl=machine.Pin(2), sda=machine.Pin(3), freq=10000)';
generator.definitions_['import_right_button'] = 'ext_button_right = i2cdevice.Buttonx5(ext_i2c_right)';
var code = 'ext_button_right.value()' + num;
}
@@ -782,11 +778,11 @@ export const robot_touch_extern_get_value = function (_, generator) {
generator.definitions_['import_machine'] = 'import machine';
generator.definitions_['import_i2cdevice'] = 'import i2cdevice';
if (mode == "0") {
generator.definitions_['import_left_ext_i2c'] = 'ext_i2c_left = i2cdevice.I2C_device(scl = machine.Pin(0), sda = machine.Pin(1), freq = 10000)';
generator.definitions_['import_left_ext_i2c'] = 'ext_i2c_left = i2cdevice.I2C_device(scl=machine.Pin(0), sda=machine.Pin(1), freq=10000)';
generator.definitions_['import_left_collision'] = 'ext_collision_left = i2cdevice.Button(ext_i2c_left)';
var code = 'ext_collision_left.value()';
} else if (mode == "1") {
generator.definitions_['import_right_ext_i2c'] = 'ext_i2c_right = i2cdevice.I2C_device(scl = machine.Pin(2), sda = machine.Pin(3), freq = 10000)';
generator.definitions_['import_right_ext_i2c'] = 'ext_i2c_right = i2cdevice.I2C_device(scl=machine.Pin(2), sda=machine.Pin(3), freq=10000)';
generator.definitions_['import_right_collision'] = 'ext_collision_right = i2cdevice.Button(ext_i2c_right)';
var code = 'ext_collision_right.value()';
}
@@ -816,11 +812,11 @@ export const robot_infrared_extern_grey_get_value = function (_, generator) {
generator.definitions_['import_machine'] = 'import machine';
generator.definitions_['import_i2cdevice'] = 'import i2cdevice';
if (mode == "0") {
generator.definitions_['import_left_ext_i2c'] = 'ext_i2c_left = i2cdevice.I2C_device(scl = machine.Pin(0), sda = machine.Pin(1), freq = 10000)';
generator.definitions_['import_left_ext_i2c'] = 'ext_i2c_left = i2cdevice.I2C_device(scl=machine.Pin(0), sda=machine.Pin(1), freq=10000)';
generator.definitions_['import_left_grey_near'] = 'ext_grey_near_left = i2cdevice.Infrared(ext_i2c_left)';
var code = 'ext_grey_near_left.value()';
} else if (mode == "1") {
generator.definitions_['import_right_ext_i2c'] = 'ext_i2c_right = i2cdevice.I2C_device(scl = machine.Pin(2), sda = machine.Pin(3), freq = 10000)';
generator.definitions_['import_right_ext_i2c'] = 'ext_i2c_right=i2cdevice.I2C_device(scl=machine.Pin(2), sda=machine.Pin(3), freq=10000)';
generator.definitions_['import_right_grey_near'] = 'ext_grey_near_right = i2cdevice.Infrared(ext_i2c_right)';
var code = 'ext_grey_near_right.value()';
}
@@ -839,11 +835,11 @@ export const robot_potentiometer_extern_get_value = function (_, generator) {
generator.definitions_['import_machine'] = 'import machine';
generator.definitions_['import_i2cdevice'] = 'import i2cdevice';
if (mode == "0") {
generator.definitions_['import_left_ext_i2c'] = 'ext_i2c_left = i2cdevice.I2C_device(scl = machine.Pin(0), sda = machine.Pin(1), freq = 10000)';
generator.definitions_['import_left_ext_i2c'] = 'ext_i2c_left = i2cdevice.I2C_device(scl=machine.Pin(0), sda=machine.Pin(1), freq=10000)';
generator.definitions_['import_left_potentiometer'] = 'ext_potentiometer_left = i2cdevice.Dimmer(ext_i2c_left)';
var code = 'ext_potentiometer_left.value()';
} else if (mode == "1") {
generator.definitions_['import_right_ext_i2c'] = 'ext_i2c_right = i2cdevice.I2C_device(scl = machine.Pin(2), sda = machine.Pin(3), freq = 10000)';
generator.definitions_['import_right_ext_i2c'] = 'ext_i2c_right = i2cdevice.I2C_device(scl=machine.Pin(2), sda=machine.Pin(3), freq=10000)';
generator.definitions_['import_right_potentiometer'] = 'ext_potentiometer_right = i2cdevice.Dimmer(ext_i2c_right)';
var code = 'ext_potentiometer_right.value()';
}
@@ -863,11 +859,11 @@ export const robot_color_extern_get_value = function (_, generator) {
generator.definitions_['import_machine'] = 'import machine';
generator.definitions_['import_i2cdevice'] = 'import i2cdevice';
if (mode == "0") {
generator.definitions_['import_left_ext_i2c'] = 'ext_i2c_left = i2cdevice.I2C_device(scl = machine.Pin(0), sda = machine.Pin(1), freq = 10000)';
generator.definitions_['import_left_ext_i2c'] = 'ext_i2c_left = i2cdevice.I2C_device(scl=machine.Pin(0), sda=machine.Pin(1), freq=10000)';
generator.definitions_['import_left_color'] = 'ext_color_left = i2cdevice.Color_ID(ext_i2c_left)';
var code = 'ext_color_left.recognition()' + color;
} else if (mode == "1") {
generator.definitions_['import_right_ext_i2c'] = 'ext_i2c_right = i2cdevice.I2C_device(scl = machine.Pin(2), sda = machine.Pin(3), freq = 10000)';
generator.definitions_['import_right_ext_i2c'] = 'ext_i2c_right = i2cdevice.I2C_device(scl=machine.Pin(2), sda=machine.Pin(3), freq=10000)';
generator.definitions_['import_right_color'] = 'ext_color_right = i2cdevice.Color_ID(ext_i2c_right)';
var code = 'ext_color_right.recognition()' + color;
}
@@ -886,11 +882,11 @@ export const robot_sonar_extern_get_value = function (_, generator) {
generator.definitions_['import_machine'] = 'import machine';
generator.definitions_['import_i2cdevice'] = 'import i2cdevice';
if (mode == "0") {
generator.definitions_['import_left_ext_i2c'] = 'ext_i2c_left = i2cdevice.I2C_device(scl = machine.Pin(0), sda = machine.Pin(1), freq = 10000)';
generator.definitions_['import_left_ext_i2c'] = 'ext_i2c_left = i2cdevice.I2C_device(scl=machine.Pin(0), sda=machine.Pin(1), freq=10000)';
generator.definitions_['import_left_sonar'] = 'ext_sonar_left = i2cdevice.Sonar(ext_i2c_left)';
var code = 'ext_sonar_left.value()';
} else if (mode == "1") {
generator.definitions_['import_right_ext_i2c'] = 'ext_i2c_right = i2cdevice.I2C_device(scl = machine.Pin(2), sda = machine.Pin(3), freq = 10000)';
generator.definitions_['import_right_ext_i2c'] = 'ext_i2c_right = i2cdevice.I2C_device(scl=machine.Pin(2), sda=machine.Pin(3), freq=10000)';
generator.definitions_['import_right_sonar'] = 'ext_sonar_right = i2cdevice.Sonar(ext_i2c_right)';
var code = 'ext_sonar_right.value()';
}
@@ -905,19 +901,19 @@ export const robot_sonar_extern_led = function (_, generator) {
var op = generator.valueToCode(this, 'bright', generator.ORDER_ATOMIC);
if (version == 'mixbot') {
generator.definitions_['import_mixbot_ext_ext_sonar'] = 'from mixbot_ext import ext_sonar';
var code = 'ext_sonar.led(' + mode + ',' + light + ',' + op + ")\n";
var code = 'ext_sonar.led(' + mode + ', ' + light + ', ' + op + ")\n";
return code;
} else if (version == 'feiyi') {
generator.definitions_['import_machine'] = 'import machine';
generator.definitions_['import_i2cdevice'] = 'import i2cdevice';
if (mode == "0") {
generator.definitions_['import_left_ext_i2c'] = 'ext_i2c_left = i2cdevice.I2C_device(scl = machine.Pin(0), sda = machine.Pin(1), freq = 10000)';
generator.definitions_['import_left_ext_i2c'] = 'ext_i2c_left = i2cdevice.I2C_device(scl=machine.Pin(0), sda=machine.Pin(1), freq=10000)';
generator.definitions_['import_left_sonar'] = 'ext_sonar_left = i2cdevice.Sonar(ext_i2c_left)';
var code = 'ext_sonar_left.led(0,' + light + ',' + op + ')\n';
var code = 'ext_sonar_left.led(0, ' + light + ', ' + op + ')\n';
} else if (mode == "1") {
generator.definitions_['import_right_ext_i2c'] = 'ext_i2c_right = i2cdevice.I2C_device(scl = machine.Pin(2), sda = machine.Pin(3), freq = 10000)';
generator.definitions_['import_right_ext_i2c'] = 'ext_i2c_right = i2cdevice.I2C_device(scl=machine.Pin(2), sda=machine.Pin(3), freq=10000)';
generator.definitions_['import_right_sonar'] = 'ext_sonar_right = i2cdevice.Sonar(ext_i2c_right)';
var code = 'ext_sonar_right.led(0,' + light + ',' + op + ')\n';
var code = 'ext_sonar_right.led(0, ' + light + ', ' + op + ')\n';
}
return code;
}
@@ -935,7 +931,7 @@ export const mixbot_sensor_extern_set_addr = function (_, generator) {
generator.definitions_['import_mixbot_ext_' + name] = 'from mixbot_ext import ' + name;
var oldaddr = generator.valueToCode(this, 'old', generator.ORDER_ATOMIC);
var newaddr = generator.valueToCode(this, 'new', generator.ORDER_ATOMIC);
var code = name + '.addr_set(' + oldaddr + ',' + newaddr + ')\n';
var code = name + '.addr_set(' + oldaddr + ', ' + newaddr + ')\n';
return code;
}

16
boards/default_src/micropython/generators/sensor_onboard.js
View File

@@ -34,7 +34,7 @@ export const sensor_mixgo_button_attachInterrupt = function (_, generator) {
var dropdown_btn = generator.valueToCode(this, 'btn', generator.ORDER_ATOMIC);
var dropdown_mode = this.getFieldValue('mode');
var atta = generator.valueToCode(this, 'DO', generator.ORDER_ATOMIC);
var code = version + '.' + dropdown_btn + '.irq' + '(handler = ' + atta + ', trigger = ' + dropdown_mode + ')\n'
var code = version + '.' + dropdown_btn + '.irq' + '(handler=' + atta + ', trigger=' + dropdown_mode + ')\n'
return code;
}
@@ -68,7 +68,7 @@ export const sensor_mixgocar42_button_attachInterrupt = function (_, generator)
generator.definitions_['import_' + version] = 'import ' + version;
var dropdown_mode = this.getFieldValue('mode');
var atta = generator.valueToCode(this, 'DO', generator.ORDER_ATOMIC);
var code = version + '.' + 'button.irq' + '(handler = ' + atta + ', trigger = ' + dropdown_mode + ')\n'
var code = version + '.' + 'button.irq' + '(handler=' + atta + ', trigger=' + dropdown_mode + ')\n'
return code;
}
@@ -286,7 +286,7 @@ export const rfid_write = function (_, generator) {
var sector = generator.valueToCode(this, 'SECTOR', generator.ORDER_ATOMIC);
var cnt = generator.valueToCode(this, 'CONTENT', generator.ORDER_ATOMIC);
generator.definitions_['import_' + version + '_onboard_rfid'] = "from " + version + " import onboard_rfid";
var code = 'onboard_rfid.write_card(' + cnt + ',' + sector + ')\n';
var code = 'onboard_rfid.write_card(' + cnt + ', ' + sector + ')\n';
return code;
}
@@ -295,7 +295,7 @@ export const rfid_write_return = function (_, generator) {
var sector = generator.valueToCode(this, 'SECTOR', generator.ORDER_ATOMIC);
var cnt = generator.valueToCode(this, 'CONTENT', generator.ORDER_ATOMIC);
generator.definitions_['import_' + version + '_onboard_rfid'] = "from " + version + " import onboard_rfid";
var code = 'onboard_rfid.write_card(' + cnt + ',' + sector + ')';
var code = 'onboard_rfid.write_card(' + cnt + ', ' + sector + ')';
return [code, generator.ORDER_ATOMIC];
}
@@ -376,7 +376,7 @@ export const sensor_mixgo_touch_slide = function (_, generator) {
var code = 'onboard_bot.touch_slide()';
} else {
generator.definitions_['import_' + version] = 'import ' + version;
var code = version + '.touch_slide(3,4)';
var code = version + '.touch_slide(3, 4)';
}
return [code, generator.ORDER_ATOMIC];
}
@@ -548,7 +548,7 @@ export const onboard_RTC_set_datetime = function (_, generator) {
var hour = generator.valueToCode(this, "hour", generator.ORDER_ASSIGNMENT);
var minute = generator.valueToCode(this, "minute", generator.ORDER_ASSIGNMENT);
var second = generator.valueToCode(this, "second", generator.ORDER_ASSIGNMENT);
var code = 'rtctime.settime((' + year + ',' + month + ',' + day + ',' + hour + ',' + minute + ',' + second + ',0,0))\n';
var code = 'rtctime.settime((' + year + ', ' + month + ', ' + day + ', ' + hour + ', ' + minute + ', ' + second + ', 0, 0))\n';
return code;
}
@@ -914,7 +914,7 @@ export const CI130X_BROADCAST_SANT = function (_, generator) {
var num = generator.valueToCode(this, 'NUM', generator.ORDER_ATOMIC);
var star = this.getFieldValue('star');
var end = this.getFieldValue('end');
var code = 'onboard_asr.play(' + star + ',' + num + ',' + end + ')\n';
var code = 'onboard_asr.play(' + star + ', ' + num + ', ' + end + ')\n';
return code;
}
@@ -926,7 +926,7 @@ export const CI130X_SET_SYSTEM_CMD_SANT = function (_, generator) {
return code;
}
export const sensor_get_the_coprocessor_version = function(_,generator){
export const sensor_get_the_coprocessor_version = function (_, generator) {
var version = Boards.getSelectedBoardKey().split(':')[2];
generator.definitions_['import_' + version + '_onboard_bot'] = 'from ' + version + ' import onboard_bot';
var code = 'onboard_bot.version()';

3
boards/default_src/micropython/generators/serial.js
View File

@@ -98,13 +98,10 @@ export const system_print_end = function (_, generator) {
export const system_print_many = function (_, generator) {
var code = new Array(this.itemCount_);
var default_value = '0';
for (var n = 0; n < this.itemCount_; n++) {
code[n] = generator.valueToCode(this, 'ADD' + n,
generator.ORDER_NONE) || default_value;
}
var code = 'print(' + code.join(', ') + ')\n';
return code;
}

4
boards/default_src/micropython/generators/system.js
View File

@@ -131,7 +131,7 @@ export const timer = function (_, generator) {
var mode = generator.valueToCode(this, "mode", generator.ORDER_NONE) || "None";
var callback = generator.valueToCode(this, "callback", generator.ORDER_NONE) || "None";
// var callback = generator.valueToCode(this, "callback", generator.ORDER_NONE) || "None";
var code = v + ".init(period = " + period + ", mode = Timer." + mode + ", callback = " + callback + ")\n";
var code = v + ".init(period=" + period + ", mode=Timer." + mode + ", callback=" + callback + ")\n";
return code;
}
@@ -144,7 +144,7 @@ export const system_timer = function (_, generator) {
var callback = generator.valueToCode(this, "callback", generator.ORDER_NONE) || "None";
//var code = v + ".init(period = " + period + ", mode = machine.Timer." + mode + ", callback = " + v + "_callback_func)\n";
//generator.setups_['timer_callback_func'] = 'def ' + v + '_callback_func(t):\n' + branch + '\n';
var code = v + ".init(period = " + period + ", mode = machine.Timer." + mode + ", callback = " + callback + ")\n";
var code = v + ".init(period = " + period + ", mode=machine.Timer." + mode + ", callback=" + callback + ")\n";
return code;
}

56
boards/default_src/micropython/generators/weather.js
View File

@@ -3,7 +3,7 @@ export const WEATHER_NOW = function (_, generator) {
var dropdown_mode = this.getFieldValue('mode');
var key = generator.valueToCode(this, 'key', generator.ORDER_ATOMIC);
var addr = generator.valueToCode(this, 'addr', generator.ORDER_ATOMIC);
var code = 'seniverse_api.' + dropdown_mode + '(' + key + ',' + addr + ')';
var code = 'seniverse_api.' + dropdown_mode + '(' + key + ', ' + addr + ')';
return [code, generator.ORDER_ATOMIC];
}
@@ -13,7 +13,7 @@ export const WEATHER_DAILY = function (_, generator) {
var key = generator.valueToCode(this, 'key', generator.ORDER_ATOMIC);
var addr = generator.valueToCode(this, 'addr', generator.ORDER_ATOMIC);
var day = generator.valueToCode(this, 'day', generator.ORDER_ATOMIC);
var code = 'seniverse_api.' + dropdown_mode + '(' + key + ',' + addr + ',' + day + ')';
var code = 'seniverse_api.' + dropdown_mode + '(' + key + ', ' + addr + ', ' + day + ')';
return [code, generator.ORDER_ATOMIC];
}
@@ -22,7 +22,7 @@ export const WEATHER_HOUR = function (_, generator) {
var key = generator.valueToCode(this, 'key', generator.ORDER_ATOMIC);
var addr = generator.valueToCode(this, 'addr', generator.ORDER_ATOMIC);
var hour = generator.valueToCode(this, 'hour', generator.ORDER_ATOMIC);
var code = 'seniverse_api.weather_hourly(' + key + ',' + addr + ',' + hour + ')';
var code = 'seniverse_api.weather_hourly(' + key + ', ' + addr + ', ' + hour + ')';
return [code, generator.ORDER_ATOMIC];
}
@@ -31,7 +31,7 @@ export const Weather_now = function (_, generator) {
var dropdown_mode = this.getFieldValue('mode');
var key = generator.valueToCode(this, 'key', generator.ORDER_ATOMIC);
var addr = generator.valueToCode(this, 'addr', generator.ORDER_ATOMIC);
var code = dropdown_mode + '.request(' + key + ',' + addr + ')\n';
var code = dropdown_mode + '.request(' + key + ', ' + addr + ')\n';
return code;
};
@@ -40,8 +40,7 @@ export const Weather_now_content = function (_, generator) {
var content = this.getFieldValue('content');
if (content == 'none') {
var code = 'Weather_now.analysis()';
}
else {
} else {
var code = 'Weather_now.analysis("' + content + '")';
}
return [code, generator.ORDER_ATOMIC];
@@ -52,8 +51,7 @@ export const Air_now_content = function (_, generator) {
var content = this.getFieldValue('content');
if (content == 'none') {
var code = 'Air_now.analysis()';
}
else {
} else {
var code = 'Air_now.analysis("' + content + '")';
}
return [code, generator.ORDER_ATOMIC];
@@ -64,8 +62,7 @@ export const Weather_alarm_content = function (_, generator) {
var content = this.getFieldValue('content');
if (content == 'none') {
var code = 'Weather_alarm.analysis()';
}
else {
} else {
var code = 'Weather_alarm.analysis("' + content + '")';
}
return [code, generator.ORDER_ATOMIC];
@@ -76,8 +73,7 @@ export const Life_suggestion_content = function (_, generator) {
var content = this.getFieldValue('content');
if (content == 'none') {
var code = 'Life_suggestion.analysis()';
}
else {
} else {
var code = 'Life_suggestion.analysis("' + content + '")';
}
return [code, generator.ORDER_ATOMIC];
@@ -88,8 +84,7 @@ export const Tide_daily_content = function (_, generator) {
var content = this.getFieldValue('content');
if (content == 'none') {
var code = 'Tide_daily.analysis()';
}
else {
} else {
var code = 'Tide_daily.analysis("' + content + '")';
}
return [code, generator.ORDER_ATOMIC];
@@ -100,8 +95,7 @@ export const Location_search_content = function (_, generator) {
var content = this.getFieldValue('content');
if (content == 'none') {
var code = 'Location_search.analysis()';
}
else {
} else {
var code = 'Location_search.analysis("' + content + '")';
}
return [code, generator.ORDER_ATOMIC];
@@ -113,7 +107,7 @@ export const Weather_daily = function (_, generator) {
var key = generator.valueToCode(this, 'key', generator.ORDER_ATOMIC);
var addr = generator.valueToCode(this, 'addr', generator.ORDER_ATOMIC);
var day = generator.valueToCode(this, 'day', generator.ORDER_ATOMIC);
var code = dropdown_mode + '.request(' + key + ',' + addr + ',' + day + ')\n';
var code = dropdown_mode + '.request(' + key + ', ' + addr + ', ' + day + ')\n';
return code;
};
@@ -122,10 +116,9 @@ export const Weather_daily_content = function (_, generator) {
var content = this.getFieldValue('content');
var day = generator.valueToCode(this, 'day', generator.ORDER_ATOMIC);
if (content == 'none') {
var code = 'Weather_daily.analysis('+day+')';
}
else {
var code = 'Weather_daily.analysis(' + day + ',"' + content + '")';
var code = 'Weather_daily.analysis(' + day + ')';
} else {
var code = 'Weather_daily.analysis(' + day + ', "' + content + '")';
}
return [code, generator.ORDER_ATOMIC];
};
@@ -135,10 +128,9 @@ export const Air_daily_content = function (_, generator) {
var content = this.getFieldValue('content');
var day = generator.valueToCode(this, 'day', generator.ORDER_ATOMIC);
if (content == 'none') {
var code = 'Air_daily.analysis('+day+')';
}
else {
var code = 'Air_daily.analysis(' + day + ',"' + content + '")';
var code = 'Air_daily.analysis(' + day + ')';
} else {
var code = 'Air_daily.analysis(' + day + ', "' + content + '")';
}
return [code, generator.ORDER_ATOMIC];
};
@@ -148,10 +140,9 @@ export const Geo_sun_content = function (_, generator) {
var content = this.getFieldValue('content');
var day = generator.valueToCode(this, 'day', generator.ORDER_ATOMIC);
if (content == 'none') {
var code = 'Geo_sun.analysis('+day+')';
}
else {
var code = 'Geo_sun.analysis(' + day + ',"' + content + '")';
var code = 'Geo_sun.analysis(' + day + ')';
} else {
var code = 'Geo_sun.analysis(' + day + ', "' + content + '")';
}
return [code, generator.ORDER_ATOMIC];
};
@@ -161,10 +152,9 @@ export const Geo_moon_content = function (_, generator) {
var content = this.getFieldValue('content');
var day = generator.valueToCode(this, 'day', generator.ORDER_ATOMIC);
if (content == 'none') {
var code = 'Geo_moon.analysis('+day+')';
}
else {
var code = 'Geo_moon.analysis(' + day + ',"' + content + '")';
var code = 'Geo_moon.analysis(' + day + ')';
} else {
var code = 'Geo_moon.analysis(' + day + ', "' + content + '")';
}
return [code, generator.ORDER_ATOMIC];
};