From 6a35dab4ccbb3e954d3ec6c546b900b49a833bee Mon Sep 17 00:00:00 2001 From: Irene-Maxine <114802521+Irene-Maxine@users.noreply.github.com> Date: Sat, 9 Aug 2025 23:36:33 +0800 Subject: [PATCH] =?UTF-8?q?S3=E6=9D=BF=E8=BD=BD=E6=98=BE=E7=A4=BA=E2=80=9C?= =?UTF-8?q?=20=E5=AE=9E=E6=97=B6=E5=88=B7=E6=96=B0=E2=80=9D=E5=AD=97?= =?UTF-8?q?=E5=BA=93=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- boards/default_src/micropython/blocks/display_onboard.js | 2 +- boards/default_src/micropython_esp32s3/template.xml | 6 +++--- common/msg/blockly/en.js | 8 ++++---- common/msg/blockly/zh-hans.js | 2 +- common/msg/blockly/zh-hant.js | 8 ++++---- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/boards/default_src/micropython/blocks/display_onboard.js b/boards/default_src/micropython/blocks/display_onboard.js index 19cadec0..3fce60d0 100644 --- a/boards/default_src/micropython/blocks/display_onboard.js +++ b/boards/default_src/micropython/blocks/display_onboard.js @@ -1338,7 +1338,7 @@ export const onboard_tft_display_line = { "inputsInline": true, "helpUrl": Blockly.Msg.mpython_HELPURL, "tooltip": Blockly.Msg.mpython_display_line_TOOLTIP, - "message0": Blockly.Msg.mpython_display_line_MESSAGE0, + "message0": Blockly.Msg.onboard_mpython_display_line_MESSAGE0, "nextStatement": null, "previousStatement": null }); diff --git a/boards/default_src/micropython_esp32s3/template.xml b/boards/default_src/micropython_esp32s3/template.xml index 2547d3d6..46ec212d 100644 --- a/boards/default_src/micropython_esp32s3/template.xml +++ b/boards/default_src/micropython_esp32s3/template.xml @@ -2113,9 +2113,9 @@ - - - + + + diff --git a/common/msg/blockly/en.js b/common/msg/blockly/en.js index 7bbec795..c12133c9 100644 --- a/common/msg/blockly/en.js +++ b/common/msg/blockly/en.js @@ -3539,9 +3539,9 @@ En.ANALOG = 'analog'; En.BITBOT = 'Feiyi'; En.MIXBOT = 'MixBot'; En.MICROPYTHON_BITBOT_SHUTDOWN_TOOLTIP = 'Shut down and disconnected under battery power. Only the motor output is turned off under USB power supply.'; -En.ONBOARD_TFT_DISPLAY_SHAPE_RECT_MESSAGE0 = 'draw %1 rectangle %2 x %3 y %4 width %5 height %6 color %7'; -En.ONBOARD_TFT_DISPLAY_HVLINE_MESSAGE0 = 'draw %1 line %2 x %3 y %4 length %5 color %6'; -En.mpython_display_line_MESSAGE0 ='draw line %1 x1 %2 y1 %3 to x2 %4 y2 %5 color %6'; +En.ONBOARD_TFT_DISPLAY_SHAPE_RECT_MESSAGE0 = 'draw %1 rectangle %2 x %3 y %4 width %5 height %6 color %7 real time refresh: %8'; +En.ONBOARD_TFT_DISPLAY_HVLINE_MESSAGE0 = 'draw %1 line %2 x %3 y %4 length %5 color %6 real time refresh: %7'; +En.onboard_mpython_display_line_MESSAGE0 ='draw line %1 x1 %2 y1 %3 to x2 %4 y2 %5 color %6 real time refresh: %7'; En.MIXLY_TOUCH_SLIDE = "slide touch"; En.MIXLY_TOUCH_SLIDE_TOOLTIP = "The touch value is close to 0 by default, increases when touching in the direction of IO3, and decreases when touching in the direction of IO4."; En.MIXLY_EXTERN_SONAR = "ultrasonic sensor"; @@ -3555,7 +3555,7 @@ En.GET_RTCTIME = "Read RTC Time"; En.SET_TIME = "Set Time"; En.DRAW_CLOCK = "Draw Clock"; En.CLEAR_CLOCK = "Clear pointer"; -En.ONBOARD_TFT_DISPLAY_SHAPE_CIRCLE_MESSAGE0 = 'draw %1 circle %2 x %3 y %4 radius %5 color %6'; +En.ONBOARD_TFT_DISPLAY_SHAPE_CIRCLE_MESSAGE0 = 'draw %1 circle %2 x %3 y %4 radius %5 color %6 real time refresh: %7'; En.RETURN_SUCCESS_OR_NOT = "return success or not"; En.MIXLY_MIXBOT_SOUND_SET_LOUDNESS = 'Set microphone volume'; En.MIXLY_RECORD_AUDIO = 'Recorde audio'; diff --git a/common/msg/blockly/zh-hans.js b/common/msg/blockly/zh-hans.js index c5176fa0..5528a0be 100644 --- a/common/msg/blockly/zh-hans.js +++ b/common/msg/blockly/zh-hans.js @@ -3691,7 +3691,7 @@ ZhHans.MIXBOT = '超霸大师'; ZhHans.MICROPYTHON_BITBOT_SHUTDOWN_TOOLTIP = '仅电池供电下，将关机断电。USB供电下，只是关闭电机输出。'; ZhHans.ONBOARD_TFT_DISPLAY_SHAPE_RECT_MESSAGE0 = '绘制 %1 矩形 %2 x %3 y %4 宽 %5 高 %6 颜色 %7 实时刷新: %8'; ZhHans.ONBOARD_TFT_DISPLAY_HVLINE_MESSAGE0 = '绘制 %1 线 %2 x %3 y %4 长度%5 颜色 %6 实时刷新: %7'; -ZhHans.mpython_display_line_MESSAGE0 ='绘制 线条%1 x1%2 y1 %3 到 x2 %4 y2 %5 颜色 %6'; +ZhHans.onboard_mpython_display_line_MESSAGE0 ='绘制 线条%1 x1%2 y1 %3 到 x2 %4 y2 %5 颜色 %6 实时刷新: %7'; ZhHans.MIXLY_TOUCH_SLIDE = "滑动触摸"; ZhHans.MIXLY_TOUCH_SLIDE_TOOLTIP = "触摸值，默认接近0，往IO3方向触摸滑动值变大，往IO4方向触摸滑动值变小。"; ZhHans.MIXLY_EXTERN_SONAR = "超声波传感器"; diff --git a/common/msg/blockly/zh-hant.js b/common/msg/blockly/zh-hant.js index a8634fe3..21cde038 100644 --- a/common/msg/blockly/zh-hant.js +++ b/common/msg/blockly/zh-hant.js @@ -3689,9 +3689,9 @@ ZhHant.ANALOG = '模擬'; ZhHant.BITBOT = '飛乙'; ZhHant.MIXBOT = '超霸大師'; ZhHant.MICROPYTHON_BITBOT_SHUTDOWN_TOOLTIP = '僅電池供電下，將關機斷電。USB供電下，只是關閉電機輸出。'; -ZhHant.ONBOARD_TFT_DISPLAY_SHAPE_RECT_MESSAGE0 = '繪製 %1 矩形 %2 x %3 y %4 寬 %5 高 %6 顏色 %7'; -ZhHant.ONBOARD_TFT_DISPLAY_HVLINE_MESSAGE0 = '繪製 %1 線 %2 x %3 y %4 長度%5 顏色 %6'; -ZhHant.mpython_display_line_MESSAGE0 ='繪製 線條%1 x1%2 y1 %3 到 x2 %4 y2 %5 顏色 %6'; +ZhHant.ONBOARD_TFT_DISPLAY_SHAPE_RECT_MESSAGE0 = '繪製 %1 矩形 %2 x %3 y %4 寬 %5 高 %6 顏色 %7 實時刷新: %8'; +ZhHant.ONBOARD_TFT_DISPLAY_HVLINE_MESSAGE0 = '繪製 %1 線 %2 x %3 y %4 長度%5 顏色 %6 實時刷新: %7'; +ZhHant.onboard_mpython_display_line_MESSAGE0 ='繪製 線條%1 x1%2 y1 %3 到 x2 %4 y2 %5 顏色 %6 實時刷新: %7'; ZhHant.MIXLY_TOUCH_SLIDE = "滑動觸摸"; ZhHant.MIXLY_TOUCH_SLIDE_TOOLTIP = "觸摸值，默認接近0，往IO3方向觸摸滑動值變大，往IO4方向觸摸滑動值變小。"; ZhHant.MIXLY_EXTERN_SONAR = "超聲波感測器"; @@ -3705,7 +3705,7 @@ ZhHant.GET_RTCTIME = "讀取RTC時間"; ZhHant.SET_TIME = "設置時間"; ZhHant.DRAW_CLOCK = "繪製時鐘"; ZhHant.CLEAR_CLOCK = "清除指針"; -ZhHant.ONBOARD_TFT_DISPLAY_SHAPE_CIRCLE_MESSAGE0 = '繪製 %1 圓形 %2 x %3 y %4 半徑 %5 顏色 %6'; +ZhHant.ONBOARD_TFT_DISPLAY_SHAPE_CIRCLE_MESSAGE0 = '繪製 %1 圓形 %2 x %3 y %4 半徑 %5 顏色 %6 實時刷新: %7'; ZhHant.RETURN_SUCCESS_OR_NOT = "返回是否成功"; ZhHant.MIXLY_MIXBOT_SOUND_SET_LOUDNESS = '設置麥克風音量'; ZhHant.MIXLY_RECORD_AUDIO = '錄製音頻';