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

fix(boards): 修复micropython mixgo_sowl下板载块转代码异常

Browse Source
This commit is contained in:
王立帮
2026-01-16 21:14:19 +08:00
parent 2683846d8b
commit 4ff24922d1
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,7 @@ import { Boards, JSFuncs } from 'mixly';
export const display_show_image = function (_, generator) { export const display_show_image = function (_, generator) {
var version = Boards.getSelectedBoardKey().split(':')[2]; var version = Boards.getSelectedBoardKey().split(':')[2];
var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT); var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT);
if (JSFuncs.getPlatform() === 'Python ESP32-S3') { if (['Python ESP32-S3', 'Python ESP32-C5'].includes(JSFuncs.getPlatform())) {
generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft"; generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft";
var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT); var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT);
var s = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC) || 'True'; var s = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC) || 'True';
@@ -25,7 +25,7 @@ export const display_show_image_or_string_delay = function (_, generator) {
var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT); var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT);
var space = generator.valueToCode(this, 'space', generator.ORDER_ASSIGNMENT); var space = generator.valueToCode(this, 'space', generator.ORDER_ASSIGNMENT);
var op = this.getFieldValue('center'); var op = this.getFieldValue('center');
if (version == "mixgo_sant" || version == "mixgo_nova" || version == "mixgo_soar") { if (['Python ESP32-S3', 'Python ESP32-C5'].includes(JSFuncs.getPlatform())) {
generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft"; generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft";
var s = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC) || 'True'; var s = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC) || 'True';
var code = "onboard_tft.shows(" + data + ", space=" + space + ', center=' + op + ",sync="+ s +")\n"; var code = "onboard_tft.shows(" + data + ", space=" + space + ', center=' + op + ",sync="+ s +")\n";
@@ -45,7 +45,7 @@ export const display_show_frame_string = function (_, generator) {
if (version == 'mpython' || version == 'educore') { if (version == 'mpython' || version == 'educore') {
generator.definitions_['import_' + version + '_onboard_oled'] = "from " + version + " import onboard_oled"; generator.definitions_['import_' + version + '_onboard_oled'] = "from " + version + " import onboard_oled";
var code = "onboard_oled.frame(" + data + ")\n"; var code = "onboard_oled.frame(" + data + ")\n";
} else if (JSFuncs.getPlatform() === 'Python ESP32-S3') { } else if (['Python ESP32-S3', 'Python ESP32-C5'].includes(JSFuncs.getPlatform())) {
generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft"; generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft";
var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT); var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT);
var code = "onboard_tft.frame(" + data + ", color=0xffff)\n"; 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"; generator.definitions_['import_' + version + '_onboard_oled'] = "from " + version + " import onboard_oled";
var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT); var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT);
var code = "onboard_oled.frame(" + data + ', delay=' + time + ")\n"; var code = "onboard_oled.frame(" + data + ', delay=' + time + ")\n";
} else if (JSFuncs.getPlatform() === 'Python ESP32-S3') { } else if (['Python ESP32-S3', 'Python ESP32-C5'].includes(JSFuncs.getPlatform())) {
generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft"; 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 { } else {
@@ -80,7 +80,7 @@ export const display_scroll_string = function (_, generator) {
generator.definitions_['import_' + version + '_onboard_oled'] = "from " + version + " import onboard_oled"; generator.definitions_['import_' + version + '_onboard_oled'] = "from " + version + " import onboard_oled";
var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT); var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT);
var code = "onboard_oled.scroll(" + data + ")\n"; var code = "onboard_oled.scroll(" + data + ")\n";
} else if (JSFuncs.getPlatform() === 'Python ESP32-S3') { } else if (['Python ESP32-S3', 'Python ESP32-C5'].includes(JSFuncs.getPlatform())) {
generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft"; generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft";
var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT); var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT);
var code = "onboard_tft.scroll(" + data + ", color=0xffff)\n"; 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') { if (version == 'mpython' || version == 'educore') {
generator.definitions_['import_' + version + '_onboard_oled'] = "from " + version + " import onboard_oled"; generator.definitions_['import_' + version + '_onboard_oled'] = "from " + version + " import onboard_oled";
var code = "onboard_oled.scroll(" + data + ', speed=' + time + ', space=' + space + ")\n"; var code = "onboard_oled.scroll(" + data + ', speed=' + time + ', space=' + space + ")\n";
} else if (JSFuncs.getPlatform() === 'Python ESP32-S3') { } else if (['Python ESP32-S3', 'Python ESP32-C5'].includes(JSFuncs.getPlatform())) {
generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft"; 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'; var code = "onboard_tft.scroll(" + data + ', y=0, size=5, speed=' + time + ', space=' + space + ', color=0xffff)\n';
} else { } else {
@@ -151,7 +151,7 @@ export const display_image_builtins = function (block, generator) {
export const display_image_builtins_all = function (block, generator) { export const display_image_builtins_all = function (block, generator) {
var version = Boards.getSelectedBoardKey().split(':')[2]; var version = Boards.getSelectedBoardKey().split(':')[2];
if (JSFuncs.getPlatform() === 'Python ESP32-S3') { if (['Python ESP32-S3', 'Python ESP32-C5'].includes(JSFuncs.getPlatform())) {
const PIN_VALUE = block.getFieldValue('image'); const PIN_VALUE = block.getFieldValue('image');
const data = PIN_VALUE.split('.'); const data = PIN_VALUE.split('.');
if (data.length !== 2) { if (data.length !== 2) {
@@ -263,7 +263,7 @@ export const display_clear = function (block, generator) {
if (version == 'mpython') { if (version == 'mpython') {
generator.definitions_['import_' + version + '_onboard_oled'] = "from " + version + " import onboard_oled"; generator.definitions_['import_' + version + '_onboard_oled'] = "from " + version + " import onboard_oled";
var code = 'onboard_oled.fill(0)\n' + 'onboard_oled.show()\n'; var code = 'onboard_oled.fill(0)\n' + 'onboard_oled.show()\n';
} else if (JSFuncs.getPlatform() === 'Python ESP32-S3') { } else if (['Python ESP32-S3', 'Python ESP32-C5'].includes(JSFuncs.getPlatform())) {
generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft"; generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft";
var s = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC) || 'True'; var s = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC) || 'True';
var code = 'onboard_tft.fill(0,sync='+s+')\n'; var code = 'onboard_tft.fill(0,sync='+s+')\n';
@@ -306,7 +306,7 @@ export const display_shift = function (a, generator) {
var op = a.getFieldValue("OP"); var op = a.getFieldValue("OP");
var value = generator.valueToCode(a, 'val', generator.ORDER_ATOMIC); var value = generator.valueToCode(a, 'val', generator.ORDER_ATOMIC);
var code = 'onboard_oled.' + op + '(' + value + ')\n'; var code = 'onboard_oled.' + op + '(' + value + ')\n';
} else if (JSFuncs.getPlatform() === 'Python ESP32-S3') { } else if (['Python ESP32-S3', 'Python ESP32-C5'].includes(JSFuncs.getPlatform())) {
generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft"; generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft";
var op = a.getFieldValue("OP"); var op = a.getFieldValue("OP");
var value = generator.valueToCode(a, 'val', generator.ORDER_ATOMIC); var value = generator.valueToCode(a, 'val', generator.ORDER_ATOMIC);
@@ -334,7 +334,7 @@ export const display_get_pixel = function (block, generator) {
var value_x = generator.valueToCode(block, 'x', generator.ORDER_ATOMIC); var value_x = generator.valueToCode(block, 'x', generator.ORDER_ATOMIC);
var value_y = generator.valueToCode(block, 'y', generator.ORDER_ATOMIC); var value_y = generator.valueToCode(block, 'y', generator.ORDER_ATOMIC);
var code = 'onboard_oled.pixel(int(' + value_x + '), int(' + value_y + '))'; var code = 'onboard_oled.pixel(int(' + value_x + '), int(' + value_y + '))';
} else if (JSFuncs.getPlatform() === 'Python ESP32-S3') { } else if (['Python ESP32-S3', 'Python ESP32-C5'].includes(JSFuncs.getPlatform())) {
generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft"; generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft";
var value_x = generator.valueToCode(block, 'x', generator.ORDER_ATOMIC); var value_x = generator.valueToCode(block, 'x', generator.ORDER_ATOMIC);
var value_y = generator.valueToCode(block, 'y', generator.ORDER_ATOMIC); var value_y = generator.valueToCode(block, 'y', generator.ORDER_ATOMIC);
@@ -351,7 +351,7 @@ export const display_get_pixel = function (block, generator) {
export const display_bright_point = function (_, generator) { export const display_bright_point = function (_, generator) {
var version = Boards.getSelectedBoardKey().split(':')[2]; var version = Boards.getSelectedBoardKey().split(':')[2];
if (JSFuncs.getPlatform() === 'Python ESP32-S3') { if (['Python ESP32-S3', 'Python ESP32-C5'].includes(JSFuncs.getPlatform())) {
generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft"; generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft";
var x = generator.valueToCode(this, 'x', generator.ORDER_ASSIGNMENT); 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);
@@ -368,7 +368,7 @@ export const display_bright_point = function (_, generator) {
export const display_get_screen_pixel = function (_, generator) { export const display_get_screen_pixel = function (_, generator) {
var version = Boards.getSelectedBoardKey().split(':')[2]; var version = Boards.getSelectedBoardKey().split(':')[2];
if (JSFuncs.getPlatform() === 'Python ESP32-S3') { if (['Python ESP32-S3', 'Python ESP32-C5'].includes(JSFuncs.getPlatform())) {
generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft"; generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft";
var code = 'onboard_tft.get_brightness()'; var code = 'onboard_tft.get_brightness()';
} else { } else {
@@ -380,7 +380,7 @@ export const display_get_screen_pixel = function (_, generator) {
export const display_bright_screen = function (_, generator) { export const display_bright_screen = function (_, generator) {
var version = Boards.getSelectedBoardKey().split(':')[2]; var version = Boards.getSelectedBoardKey().split(':')[2];
if (JSFuncs.getPlatform() === 'Python ESP32-S3') { if (['Python ESP32-S3', 'Python ESP32-C5'].includes(JSFuncs.getPlatform())) {
generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft"; generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft";
var x = generator.valueToCode(this, 'x', generator.ORDER_ASSIGNMENT); var x = generator.valueToCode(this, 'x', generator.ORDER_ASSIGNMENT);
var code = 'onboard_tft.set_brightness(' + x + ')\n'; var code = 'onboard_tft.set_brightness(' + x + ')\n';
@@ -1128,7 +1128,7 @@ export const onboard_tft_display_shape_circle = function (block, generator) {
export const draw_pointer = function (_, generator) { export const draw_pointer = function (_, generator) {
var version = Boards.getSelectedBoardKey().split(':')[2] var version = Boards.getSelectedBoardKey().split(':')[2]
if (JSFuncs.getPlatform() === 'Python ESP32-S3'){ if (['Python ESP32-S3', 'Python ESP32-C5'].includes(JSFuncs.getPlatform())){
generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft"; generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft";
var angle = generator.valueToCode(this, 'angle', generator.ORDER_ASSIGNMENT); var angle = generator.valueToCode(this, 'angle', generator.ORDER_ASSIGNMENT);
var code = "onboard_tft.pointern(angle=" + angle + ")\n"; var code = "onboard_tft.pointern(angle=" + angle + ")\n";

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

@@ -448,7 +448,7 @@ export const sensor_mixgoce_pin_pressed = function (_, generator) {
export const sensor_mixgo_touch_slide = function (_, generator) { export const sensor_mixgo_touch_slide = function (_, generator) {
var version = Boards.getSelectedBoardKey().split(':')[2]; var version = Boards.getSelectedBoardKey().split(':')[2];
if (version === 'mixgo_mini' || version === 'mixgo_sant' || version === 'mixgo_soar') { if (version === 'mixgo_mini' || version === 'mixgo_sant' || version === 'mixgo_soar' || version === 'mixgo_sowl') {
generator.definitions_['import_' + version + '_onboard_bot'] = 'from ' + version + ' import onboard_bot'; generator.definitions_['import_' + version + '_onboard_bot'] = 'from ' + version + ' import onboard_bot';
var code = 'onboard_bot.touch_slide()'; var code = 'onboard_bot.touch_slide()';
} else { } else {