From 8d1f7ab19652ab5fda2b277628de42e1dcde740e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=AB=8B=E5=B8=AE?= <3294713004@qq.com> Date: Thu, 29 May 2025 23:32:23 +0800 Subject: [PATCH] =?UTF-8?q?feat(boards):=20mp=E4=B8=8B=E6=9D=BF=E8=BD=BD?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=9B=BE=E5=BD=A2=E5=9D=97=E5=AE=9E=E6=97=B6?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../micropython/generators/display_onboard.js | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/boards/default_src/micropython/generators/display_onboard.js b/boards/default_src/micropython/generators/display_onboard.js index d43aed2c..09795ec8 100644 --- a/boards/default_src/micropython/generators/display_onboard.js +++ b/boards/default_src/micropython/generators/display_onboard.js @@ -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 = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC); + var s = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC) || 'True'; var code = "onboard_tft.image(" + data + ", color=0xffff,sync="+ s +")\n"; } else { if (version == "educore") { @@ -27,7 +27,7 @@ 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 s = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC); + var s = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC) || 'True'; var code = "onboard_tft.shows(" + data + ", space=" + space + ', center=' + op + ",sync="+ s +")\n"; return code; } else if (version == "educore") { @@ -257,7 +257,7 @@ export const display_clear = function (block, generator) { var code = 'onboard_oled.fill(0)\n' + 'onboard_oled.show()\n'; } else if (JSFuncs.getPlatform() === 'Python ESP32-S3') { generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft"; - var s = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC); + var s = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC) || 'True'; var code = 'onboard_tft.fill(0,sync='+s+')\n'; } else { generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix"; @@ -302,7 +302,7 @@ export const display_shift = function (a, generator) { 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 = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC); + var s = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC) || 'True'; var code = 'onboard_tft.' + op + '(' + value + ',sync='+ s +')\n'; } else { generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix"; @@ -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 = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC); + var s = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC) || 'True'; 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 = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC); + var s = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC) || 'True'; 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 = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC); + var s = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC) || 'True'; 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 = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC); + var s = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC) || 'True'; 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 = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC); + var s = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC) || 'True'; 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 = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC); + var s = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC) || 'True'; 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 = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC); + var s = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC) || 'True'; 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 = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC); + var s = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC) || 'True'; if (color.slice(0, 2) == "0x") { var code = 'onboard_tft.ellipse(' + x + ', ' + y + ', ' + R + ', ' + R + ', ' + color + ', ' + shape + ',sync=' + s +')\n'; } else { @@ -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 = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC); + var s = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC) || 'True'; if (color.slice(0, 2) == "0x") { var code = "onboard_tft.texts(" + data + ', x=' + x + ', y=' + y + ', size=' + size + ', color='+ color +",sync=" + s +")\n"; } else {