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

不同板卡不同生成的修改

Browse Source
This commit is contained in:
Irene-Maxine
2025-05-29 22:59:01 +08:00
parent 425ac60767
commit 85222ba9e9
8 changed files with 174 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
boards/default_src/micropython/blocks/ai_local.js
View File

@@ -237,11 +237,8 @@ export const CI130X_BROADCAST_SYSTEM_TIME = {
init: function () {
this.setColour(AI_LOCAL_VOICE_HUE);
this.appendDummyInput("")
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_DETAILED, "1"],
[Blockly.Msg.MIXLY_Concise, "0"]
]), "cmd")
.appendField(Blockly.Msg.MIXLY_BROADCAST_SYSTEM_TIME)
.appendField(Blockly.Msg.MIXLY_DETAILED + Blockly.Msg.MIXLY_BROADCAST_SYSTEM_TIME);
this.appendValueInput('boolean');
this.setPreviousStatement(true);
this.setNextStatement(true);
this.setInputsInline(true);
@@ -295,11 +292,8 @@ export const SCREEN_SHOW_CAM_GRAPH_SHOOT = {
init: function () {
this.setColour(AI_LOCAL_GRAPH_HUE);
this.appendDummyInput()
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_MICROBIT_Turn_on_display,"display"],
[Blockly.Msg.MIXLY_MICROBIT_Turn_off_display,"display_stop"]
]),"control")
.appendField(Blockly.Msg.MIXlY_SCREEN_SHOW_CAM_SHOOT);
this.appendValueInput('boolean');
this.setPreviousStatement(true);
this.setNextStatement(true);
this.setInputsInline(true);

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

@@ -1,5 +1,5 @@
import * as Blockly from 'blockly/core';
import { Boards, Profile } from 'mixly';
import { Boards, Profile, JSFuncs } from 'mixly';
const DISPLAY_ONBOARD_HUE = '#569A98';
@@ -10,13 +10,9 @@ export const display_show_image = {
.setCheck([String, "esp32_image", "List", 'Tuple'])
.appendField(Blockly.Msg.MIXLY_ESP32_SHOW_IMAGE_OR_STRING);
var version = Boards.getSelectedBoardKey()
if (version == 'micropython:esp32s3:mixgo_nova'||'micropython:esp32s3:mixgo_sant') {
this.appendDummyInput()
.appendField( Blockly.Msg.MIXLY_synchronize + ':')
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_TURTLE_WRITE_MOVE_TRUE,"1"],
[Blockly.Msg.MIXLY_TURTLE_WRITE_MOVE_FALSE,"0"]
]),"sync");
if (JSFuncs.getPlatform() === 'Python ESP32-S3') {
this.appendValueInput('boolean')
.appendField( Blockly.Msg.MIXLY_synchronize + ':');
}
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
@@ -43,14 +39,9 @@ export const display_show_image_or_string_delay = {
[Blockly.Msg.MICROPYTHON_DISPLAY_YES, "True"],
[Blockly.Msg.MICROPYTHON_DISPLAY_NO, "False"]
]), 'center')
var version = Boards.getSelectedBoardKey()
if (version == 'micropython:esp32s3:mixgo_nova'||'micropython:esp32s3:mixgo_sant') {
this.appendDummyInput()
.appendField( Blockly.Msg.MIXLY_synchronize + ':')
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_TURTLE_WRITE_MOVE_TRUE,"1"],
[Blockly.Msg.MIXLY_TURTLE_WRITE_MOVE_FALSE,"0"]
]),"sync");
if (JSFuncs.getPlatform() === 'Python ESP32-S3') {
this.appendValueInput('boolean')
.appendField( Blockly.Msg.MIXLY_synchronize + ':');
}
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
@@ -300,13 +291,9 @@ export const display_shift = {
this.appendDummyInput('')
.appendField(Blockly.Msg.DISPLAY_IMAGE_UNIT)
var version = Boards.getSelectedBoardKey()
if (version == 'micropython:esp32s3:mixgo_nova'||'micropython:esp32s3:mixgo_sant') {
this.appendDummyInput()
.appendField( Blockly.Msg.MIXLY_synchronize + ':')
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_TURTLE_WRITE_MOVE_TRUE,"1"],
[Blockly.Msg.MIXLY_TURTLE_WRITE_MOVE_FALSE,"0"]
]),"sync");
if (JSFuncs.getPlatform() === 'Python ESP32-S3') {
this.appendValueInput('boolean')
.appendField( Blockly.Msg.MIXLY_synchronize + ':');
}
var thisBlock = this;
this.setTooltip(function () {
@@ -397,13 +384,9 @@ export const display_clear = {
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_MICROBIT_Clear_display);
var version = Boards.getSelectedBoardKey()
if (version == 'micropython:esp32s3:mixgo_nova'||'micropython:esp32s3:mixgo_sant') {
this.appendDummyInput()
.appendField( Blockly.Msg.MIXLY_synchronize + ':')
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_TURTLE_WRITE_MOVE_TRUE,"1"],
[Blockly.Msg.MIXLY_TURTLE_WRITE_MOVE_FALSE,"0"]
]),"sync");
if (JSFuncs.getPlatform() === 'Python ESP32-S3') {
this.appendValueInput('boolean')
.appendField( Blockly.Msg.MIXLY_synchronize + ':');
}
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
@@ -1124,13 +1107,9 @@ export const onboard_tft_show_image_xy = {
this.appendValueInput('VAR')
.appendField(Blockly.Msg.HTML_COLOUR);
var version = Boards.getSelectedBoardKey()
if (version == 'micropython:esp32s3:mixgo_nova'||'micropython:esp32s3:mixgo_sant') {
this.appendDummyInput()
.appendField( Blockly.Msg.MIXLY_synchronize + ':')
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_TURTLE_WRITE_MOVE_TRUE,"1"],
[Blockly.Msg.MIXLY_TURTLE_WRITE_MOVE_FALSE,"0"]
]),"sync");
if (JSFuncs.getPlatform() === 'Python ESP32-S3') {
this.appendValueInput('boolean')
.appendField( Blockly.Msg.MIXLY_synchronize + ':');
}
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
@@ -1184,13 +1163,9 @@ export const onboard_tft_show_image_or_string_delay = {
this.appendValueInput('VAR')
.appendField(Blockly.Msg.HTML_COLOUR);
var version = Boards.getSelectedBoardKey()
if (version == 'micropython:esp32s3:mixgo_nova'||'micropython:esp32s3:mixgo_sant') {
this.appendDummyInput()
.appendField( Blockly.Msg.MIXLY_synchronize + ':')
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_TURTLE_WRITE_MOVE_TRUE,"1"],
[Blockly.Msg.MIXLY_TURTLE_WRITE_MOVE_FALSE,"0"]
]),"sync");
if (JSFuncs.getPlatform() === 'Python ESP32-S3') {
this.appendValueInput('boolean')
.appendField( Blockly.Msg.MIXLY_synchronize + ':');
}
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
@@ -1261,12 +1236,8 @@ export const onboard_tft_display_shape_rect = {
//"check": "Number"
},
{
"name": "sync",
"options": [
[Blockly.Msg.MIXLY_TURTLE_WRITE_MOVE_TRUE,"1"],
[Blockly.Msg.MIXLY_TURTLE_WRITE_MOVE_FALSE,"0"]
],
"type": "field_dropdown"
"name": "boolean",
"type": "input_value",
}
],
"inputsInline": true,
@@ -1316,12 +1287,8 @@ export const onboard_tft_display_hvline = {
//"check": "Number"
},
{
"name": "sync",
"options": [
[Blockly.Msg.MIXLY_TURTLE_WRITE_MOVE_TRUE,"1"],
[Blockly.Msg.MIXLY_TURTLE_WRITE_MOVE_FALSE,"0"]
],
"type": "field_dropdown"
"name": "boolean",
"type": "input_value",
}
],
"inputsInline": true,
@@ -1367,12 +1334,8 @@ export const onboard_tft_display_line = {
//"check": "Number"
},
{
"name": "sync",
"options": [
[Blockly.Msg.MIXLY_TURTLE_WRITE_MOVE_TRUE,"1"],
[Blockly.Msg.MIXLY_TURTLE_WRITE_MOVE_FALSE,"0"]
],
"type": "field_dropdown"
"name": "boolean",
"type": "input_value",
}
],
"inputsInline": true,
@@ -1417,13 +1380,9 @@ export const onboard_tft_bright_point = {
this.appendValueInput('VAR')
.appendField(Blockly.Msg.HTML_COLOUR);
var version = Boards.getSelectedBoardKey()
if (version == 'micropython:esp32s3:mixgo_nova'||'micropython:esp32s3:mixgo_sant') {
this.appendDummyInput()
.appendField( Blockly.Msg.MIXLY_synchronize + ':')
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_TURTLE_WRITE_MOVE_TRUE,"1"],
[Blockly.Msg.MIXLY_TURTLE_WRITE_MOVE_FALSE,"0"]
]),"sync");
if (JSFuncs.getPlatform() === 'Python ESP32-S3') {
this.appendValueInput('boolean')
.appendField( Blockly.Msg.MIXLY_synchronize + ':');
}
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
@@ -1438,13 +1397,9 @@ export const onboard_tft_fill = {
this.appendValueInput('VAR')
.appendField(Blockly.Msg.MIXLY_SCREEN_FILL);
var version = Boards.getSelectedBoardKey()
if (version == 'micropython:esp32s3:mixgo_nova'||'micropython:esp32s3:mixgo_sant') {
this.appendDummyInput()
.appendField( Blockly.Msg.MIXLY_synchronize + ':')
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_TURTLE_WRITE_MOVE_TRUE,"1"],
[Blockly.Msg.MIXLY_TURTLE_WRITE_MOVE_FALSE,"0"]
]),"sync");
if (JSFuncs.getPlatform() === 'Python ESP32-S3') {
this.appendValueInput('boolean')
.appendField( Blockly.Msg.MIXLY_synchronize + ':');
}
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
@@ -1572,12 +1527,8 @@ export const onboard_tft_display_shape_circle = {
//"check": "Number"
},
{
"name": "sync",
"options": [
[Blockly.Msg.MIXLY_TURTLE_WRITE_MOVE_TRUE,"1"],
[Blockly.Msg.MIXLY_TURTLE_WRITE_MOVE_FALSE,"0"]
],
"type": "field_dropdown"
"name": "boolean",
"type": "input_value",
}
],
"inputsInline": true,
@@ -1640,13 +1591,9 @@ export const onboard_tft_show_texts = {
this.appendValueInput('VAR')
.appendField(Blockly.Msg.HTML_COLOUR);
var version = Boards.getSelectedBoardKey()
if (version == 'micropython:esp32s3:mixgo_nova'||'micropython:esp32s3:mixgo_sant') {
this.appendDummyInput()
.appendField( Blockly.Msg.MIXLY_synchronize + ':')
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_TURTLE_WRITE_MOVE_TRUE,"1"],
[Blockly.Msg.MIXLY_TURTLE_WRITE_MOVE_FALSE,"0"]
]),"sync");
if (JSFuncs.getPlatform() === 'Python ESP32-S3') {
this.appendValueInput('boolean')
.appendField( Blockly.Msg.MIXLY_synchronize + ':');
}
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);

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

@@ -98,13 +98,11 @@ export const CI130X_SET_SYSTEM_CMD_SANT = function (_, generator) {
export const CI130X_BROADCAST_SYSTEM_TIME = function (_, generator) {
var version = Boards.getSelectedBoardKey().split(':')[2];
generator.definitions_['import_' + version + '_onboard_asr'] = 'from ' + version + ' import onboard_asr';
var cmd = this.getFieldValue('cmd');
var code = 'onboard_asr.play_time(' + cmd + ')\n';
var bool = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC);
var code = 'onboard_asr.play_time(' + bool + ')\n';
return code;
}
//graph part
export const CREATE_CAMERA = function (_, generator) {
var version = Boards.getSelectedBoardKey().split(':')[2];
@@ -126,8 +124,8 @@ export const GET_PICTURE_DATA = function (_, generator) {
}
export const SCREEN_SHOW_CAM_GRAPH_SHOOT = function (_, generator) {
var con = this.getFieldValue('control');
var code = 'cam.'+ con +'()\n';
var bool = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC);
var code = 'cam.display('+ bool +')\n';
return code;
}

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

@@ -6,7 +6,7 @@ export const display_show_image = function (_, generator) {
if (JSFuncs.getPlatform() === 'Python ESP32-S3') {
generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft";
var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT);
var s = this.getFieldValue('sync');
var s = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC);
var code = "onboard_tft.image(" + data + ", color=0xffff,sync="+ s +")\n";
} else {
if (version == "educore") {
@@ -25,9 +25,9 @@ export const display_show_image_or_string_delay = function (_, generator) {
var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT);
var space = generator.valueToCode(this, 'space', generator.ORDER_ASSIGNMENT);
var op = this.getFieldValue('center');
var s = this.getFieldValue('sync');
if (version == "mixgo_sant" || version == "mixgo_nova") {
generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft";
var s = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC);
var code = "onboard_tft.shows(" + data + ", space=" + space + ', center=' + op + ",sync="+ s +")\n";
return code;
} else if (version == "educore") {
@@ -45,7 +45,7 @@ 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'||'mixgo_sant') {
} else if (JSFuncs.getPlatform() === 'Python ESP32-S3') {
generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft";
var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT);
var code = "onboard_tft.frame(" + data + ", color=0xffff)\n";
@@ -64,7 +64,7 @@ export const display_show_frame_string_delay = function (_, generator) {
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'||'mixgo_sant') {
} else if (JSFuncs.getPlatform() === 'Python ESP32-S3') {
generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft";
var code = "onboard_tft.frame(" + data + ', size=5 , delay=' + time + ', color=0xffff)\n';
} else {
@@ -80,7 +80,7 @@ export const display_scroll_string = function (_, generator) {
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'||'mixgo_sant') {
} else if (JSFuncs.getPlatform() === 'Python ESP32-S3') {
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";
@@ -100,7 +100,7 @@ export const display_scroll_string_delay = function (_, generator) {
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'||'mixgo_sant') {
} else if (JSFuncs.getPlatform() === 'Python ESP32-S3') {
generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft";
var code = "onboard_tft.scroll(" + data + ', y=0, size=5, speed=' + time + ', space=' + space + ', color=0xffff)\n';
} else {
@@ -143,7 +143,7 @@ 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'||'mixgo_sant') {
if (JSFuncs.getPlatform() === 'Python ESP32-S3') {
const PIN_VALUE = block.getFieldValue('image');
const data = PIN_VALUE.split('.');
if (data.length !== 2) {
@@ -255,9 +255,9 @@ 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'||'mixgo_sant') {
} else if (JSFuncs.getPlatform() === 'Python ESP32-S3') {
generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft";
var s = this.getFieldValue('sync');
var s = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC);
var code = 'onboard_tft.fill(0,sync='+s+')\n';
} else {
generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix";
@@ -298,11 +298,11 @@ 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'||'mixgo_sant') {
} else if (JSFuncs.getPlatform() === 'Python ESP32-S3') {
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 s = this.getFieldValue('sync');
var s = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC);
var code = 'onboard_tft.' + op + '(' + value + ',sync='+ s +')\n';
} else {
generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix";
@@ -326,7 +326,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'||'mixgo_sant') {
} else if (JSFuncs.getPlatform() === 'Python ESP32-S3') {
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);
@@ -343,7 +343,7 @@ 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'||'mixgo_sant') {
if (JSFuncs.getPlatform() === 'Python ESP32-S3') {
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);
@@ -360,7 +360,7 @@ 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'||'mixgo_sant') {
if (JSFuncs.getPlatform() === 'Python ESP32-S3') {
generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft";
var code = 'onboard_tft.get_brightness()';
} else {
@@ -372,7 +372,7 @@ 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'||'mixgo_sant') {
if (JSFuncs.getPlatform() === 'Python ESP32-S3') {
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';
@@ -837,7 +837,7 @@ export const onboard_tft_show_image_xy = function (_, generator) {
var y = generator.valueToCode(this, 'y', generator.ORDER_ASSIGNMENT);
var size = generator.valueToCode(this, 'size', generator.ORDER_ASSIGNMENT);
var color = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC);
var s = this.getFieldValue('sync');
var s = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC);
if (color.slice(0, 2) == "0x") {
var code = "onboard_tft.image(" + data + ', x=' + x + ', y=' + y + ', size=' + size + ', color='+ color +",sync=" + s +")\n";
} else {
@@ -871,7 +871,7 @@ export const onboard_tft_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 s = this.getFieldValue('sync');
var s = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC);
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 + ",sync=" + s + ")\n";
@@ -917,7 +917,7 @@ export const onboard_tft_display_shape_rect = function (block, generator) {
var h = generator.valueToCode(block, 'h', generator.ORDER_ATOMIC);
var color = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC);
var shape = block.getFieldValue('shape');
var s = this.getFieldValue('sync');
var s = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC);
if (color.slice(0, 2) == "0x") {
var code = 'onboard_tft.' + shape + '(' + x + ', ' + y + ', ' + w + ', ' + h + ', ' + color + ',sync=' + s +')\n';
} else {
@@ -940,7 +940,7 @@ export const onboard_tft_display_hvline = function (block, generator) { //水平
var var_length = generator.valueToCode(block, 'length', generator.ORDER_ATOMIC);
var color = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC);
var hv = block.getFieldValue('dir_h_v');
var s = this.getFieldValue('sync');
var s = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC);
if (color.slice(0, 2) == "0x") {
var code = 'onboard_tft.' + (('0' == hv) ? 'v' : 'h') + 'line(' + x + ', ' + y + ', ' + var_length + ', ' + color + ',sync=' + s +')\n';
} else {
@@ -963,7 +963,7 @@ export const onboard_tft_display_line = function (block, generator) {
var x2 = generator.valueToCode(block, 'x2', generator.ORDER_ATOMIC);
var y2 = generator.valueToCode(block, 'y2', generator.ORDER_ATOMIC);
var color = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC);
var s = this.getFieldValue('sync');
var s = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC);
if (color.slice(0, 2) == "0x") {
var code = 'onboard_tft.line(' + x1 + ', ' + y1 + ', ' + x2 + ', ' + y2 + ', ' + color + ',sync=' + s +')\n';
} else {
@@ -993,7 +993,7 @@ export const onboard_tft_bright_point = function (_, generator) {
var x = generator.valueToCode(this, 'x', generator.ORDER_ASSIGNMENT);
var y = generator.valueToCode(this, 'y', generator.ORDER_ASSIGNMENT);
var color = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC);
var s = this.getFieldValue('sync');
var s = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC);
if (color.slice(0, 2) == "0x") {
var code = 'onboard_tft.pixel(int(' + x + '), int(' + y + '), ' + color + ',sync='+ s + ")\n";
} else {
@@ -1012,7 +1012,7 @@ export const onboard_tft_fill = function (_, generator) {
var version = Boards.getSelectedBoardKey().split(':')[2]
generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft";
var color = generator.valueToCode(this, 'VAR', generator.ORDER_ASSIGNMENT);
var s = this.getFieldValue('sync');
var s = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC);
if (color.slice(0, 2) == "0x") {
var code = 'onboard_tft.fill(' + color + ',sync=' + s +')\n';
} else {
@@ -1103,7 +1103,7 @@ export const onboard_tft_display_shape_circle = function (block, generator) {
var R = generator.valueToCode(block, 'r', generator.ORDER_ATOMIC);
var color = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC);
var shape = block.getFieldValue('shape');
var s = this.getFieldValue('sync');
var s = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC);
if (color.slice(0, 2) == "0x") {
var code = 'onboard_tft.ellipse(' + x + ', ' + y + ', ' + R + ', ' + R + ', ' + color + ', ' + shape + ',sync=' + s +')\n';
} else {
@@ -1120,7 +1120,7 @@ export const onboard_tft_display_shape_circle = function (block, generator) {
export const draw_pointer = function (_, generator) {
var version = Boards.getSelectedBoardKey().split(':')[2]
if (version == 'mixgo_nova'||'mixgo_sant'){
if (JSFuncs.getPlatform() === 'Python ESP32-S3'){
generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft";
var angle = generator.valueToCode(this, 'angle', generator.ORDER_ASSIGNMENT);
var code = "onboard_tft.pointern(angle=" + angle + ")\n";
@@ -1160,7 +1160,7 @@ export const onboard_tft_show_texts = function (_, generator) {
var y = generator.valueToCode(this, 'y', generator.ORDER_ASSIGNMENT);
var size = generator.valueToCode(this, 'size', generator.ORDER_ASSIGNMENT);
var color = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC);
var s = this.getFieldValue('sync');
var s = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC);
if (color.slice(0, 2) == "0x") {
var code = "onboard_tft.texts(" + data + ', x=' + x + ', y=' + y + ', size=' + size + ', color='+ color +",sync=" + s +")\n";
} else {
@@ -1180,11 +1180,6 @@ export const onboard_tft_show_texts = function (_, generator) {
*/
export const onboard_tft_show_image = display_show_image;
/**
* @deprecated To be removed in the future
*/
export const onboard_tft_scroll_string = display_scroll_string;
/**
* @deprecated To be removed in the future
*/

67
boards/default_src/micropython_esp32s3/template.xml
View File

@@ -1835,6 +1835,10 @@
<value name="data">
<shadow type="pins_builtinimg"></shadow>
</value>
<value name="boolean">
<shadow type="logic_boolean">
</shadow>
</value>
</block>
<block type="onboard_tft_show_image_xy">
<value name="data">
@@ -1863,6 +1867,10 @@
<field name="TEXT">255,255,0</field>
</shadow>
</value>
<value name="boolean">
<shadow type="logic_boolean">
</shadow>
</value>
</block>
<block type="display_show_image_or_string_delay">
<value name="data">
@@ -1875,6 +1883,10 @@
<field name="NUM">0</field>
</shadow>
</value>
<value name="boolean">
<shadow type="logic_boolean">
</shadow>
</value>
</block>
<block type="onboard_tft_show_image_or_string_delay">
<value name="data">
@@ -1910,6 +1922,10 @@
<field name="TEXT">255,255,0</field>
</shadow>
</value>
<value name="boolean">
<shadow type="logic_boolean">
</shadow>
</value>
</block>
<block type="onboard_tft_show_texts">
<value name="data">
@@ -1940,6 +1956,10 @@
<field name="TEXT">255,255,0</field>
</shadow>
</value>
<value name="boolean">
<shadow type="logic_boolean">
</shadow>
</value>
</block>
<block type="onboard_tft_show_image_xy_direct" m-show="micropython:esp32s3:mixgo_sant">
<value name="x">
@@ -2056,6 +2076,10 @@
<field name="TEXT">255,255,0</field>
</shadow>
</value>
<value name="boolean">
<shadow type="logic_boolean">
</shadow>
</value>
</block>
<block type="onboard_tft_display_line">
<value name="x1">
@@ -2086,6 +2110,10 @@
<field name="TEXT">255,255,0</field>
</shadow>
</value>
<value name="boolean">
<shadow type="logic_boolean">
</shadow>
</value>
</block>
<block type="onboard_tft_display_shape_rect">
<value name="x">
@@ -2116,6 +2144,10 @@
<field name="TEXT">255,255,0</field>
</shadow>
</value>
<value name="boolean">
<shadow type="logic_boolean">
</shadow>
</value>
</block>
<block type="onboard_tft_display_shape_circle">
<value name="x">
@@ -2141,6 +2173,10 @@
<field name="TEXT">255,255,0</field>
</shadow>
</value>
<value name="boolean">
<shadow type="logic_boolean">
</shadow>
</value>
</block>
<block type="display_shift">
<value name="val">
@@ -2148,6 +2184,10 @@
<field name="NUM">1</field>
</shadow>
</value>
<value name="boolean">
<shadow type="logic_boolean">
</shadow>
</value>
</block>
<block type="onboard_tft_get_pixel">
<value name="x">
@@ -2180,6 +2220,10 @@
<field name="TEXT">255,255,0</field>
</shadow>
</value>
<value name="boolean">
<shadow type="logic_boolean">
</shadow>
</value>
</block>
<block type="display_get_screen_pixel"></block>
<block type="display_bright_screen">
@@ -2198,8 +2242,17 @@
<field name="TEXT">255,255,0</field>
</shadow>
</value>
<value name="boolean">
<shadow type="logic_boolean">
</shadow>
</value>
</block>
<block type="display_clear">
<value name="boolean">
<shadow type="logic_boolean">
</shadow>
</value>
</block>
<block type="display_clear"></block>
<block type="display_available"></block>
<block type="onboard_tft_clock_init" m-show="micropython:esp32s3:mixgo_sant">
<value name="SUB">
@@ -2339,7 +2392,12 @@
</value>
</block>
<block type="GET_PICTURE_DATA"></block>
<block type="SCREEN_SHOW_CAM_GRAPH_SHOOT"></block>
<block type="SCREEN_SHOW_CAM_GRAPH_SHOOT">
<value name="boolean">
<shadow type="logic_boolean">
</shadow>
</value>
</block>
<block type="AI_CAMERA_INIT">
<value name="SUB">
<shadow type="variables_get">
@@ -2486,6 +2544,11 @@
</block>
<block type="CI130X_SET_SYSTEM_CMD_SANT" m-show='micropython:esp32s3:mixgo_sant'></block>
<block type="CI130X_BROADCAST_SYSTEM_TIME" m-show='micropython:esp32s3:mixgo_sant'>
<value name="boolean">
<shadow type="logic_boolean">
</shadow>
</value>
</block>
</category>
</category>
<category id="catSANT_G3" colour="40" m-show='micropython:esp32s3:mixgo_sant'>