From b4e15e68b2012ea60f2bbd3393bc4353c197d7d0 Mon Sep 17 00:00:00 2001 From: Irene-Maxine <114802521+Irene-Maxine@users.noreply.github.com> Date: Tue, 28 Oct 2025 17:10:34 +0800 Subject: [PATCH] =?UTF-8?q?sant=E6=99=BA=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../micropython/blocks/ai_local.js | 27 +++++++------------ .../micropython/generators/ai_local.js | 8 +++--- .../micropython_esp32s3/template.xml | 18 ++++++++++--- common/msg/blockly/zh-hans.js | 2 +- 4 files changed, 29 insertions(+), 26 deletions(-) diff --git a/boards/default_src/micropython/blocks/ai_local.js b/boards/default_src/micropython/blocks/ai_local.js index 7e9bdce8..8bb3f7f1 100644 --- a/boards/default_src/micropython/blocks/ai_local.js +++ b/boards/default_src/micropython/blocks/ai_local.js @@ -306,8 +306,7 @@ export const SHOOT_AND_SAVE_PICTURE = { init: function () { this.setColour(AI_LOCAL_GRAPH_HUE); this.appendValueInput('direct') - .appendField(Blockly.Msg.MIXLY_SHOOT_AND_SAVE_PICTURE) - .appendField(Blockly.Msg.LISTS_SET_INDEX_SET + Blockly.Msg.MICROPYTHON_HUSKYLENS_SAVE_AS + Blockly.Msg.MIXLY_MICROBIT_PY_STORAGE_THE_PATH); + .appendField(Blockly.Msg.MIXLY_SHOOT_AND_SAVE_PICTURE); this.setPreviousStatement(true); this.setNextStatement(true); this.setInputsInline(true); @@ -419,12 +418,8 @@ export const SCREEN_SHOW_CAM_GRAPH_SHOOT = { this.setColour(DISPLAY_ONBOARD_HUE); this.appendValueInput("SUB") .appendField(Blockly.Msg.OLEDDISPLAY + Blockly.Msg.MIXLY_MICROBIT_IMAGE) - this.appendDummyInput('') - .appendField(Blockly.Msg.MIXLY_SYNC_DISPLAY) - .appendField(new Blockly.FieldDropdown([ - [Blockly.Msg.MIXLY_TURTLE_WRITE_MOVE_FALSE, "0"], - [Blockly.Msg.MIXLY_TURTLE_WRITE_MOVE_TRUE, "1"] - ]),"sync"); + this.appendValueInput('boolean') + .appendField( Blockly.Msg.MIXLY_synchronize + ':'); this.setPreviousStatement(true); this.setNextStatement(true); this.setInputsInline(true); @@ -445,12 +440,8 @@ export const SCREEN_DISPLAY_IMAGE = { ['180','180'], ['270','270'] ]),'angle'); - this.appendDummyInput('') - .appendField(Blockly.Msg.MIXLY_SYNC_DISPLAY) - .appendField(new Blockly.FieldDropdown([ - [Blockly.Msg.MIXLY_TURTLE_WRITE_MOVE_FALSE, "0"], - [Blockly.Msg.MIXLY_TURTLE_WRITE_MOVE_TRUE, "1"] - ]),"sync"); + this.appendValueInput('boolean') + .appendField( Blockly.Msg.MIXLY_synchronize + ':'); this.setPreviousStatement(true); this.setNextStatement(true); this.setInputsInline(true); @@ -702,10 +693,10 @@ export const GET_NO_XY_RECOGNITION_FACE = { .appendField(new Blockly.FieldDropdown([ [Blockly.Msg.MIXLY_LEFT_EYE + "x","[0]"], [Blockly.Msg.MIXLY_LEFT_EYE + "y","[1]"], - [Blockly.Msg.MIXLY_RIGHT_EYE + "x","[2"], - [Blockly.Msg.MIXLY_RIGHT_EYE + "y","[3"], - [Blockly.Msg.MIXLY_NOSE + "x","[4"], - [Blockly.Msg.MIXLY_NOSE + "y","[5"], + [Blockly.Msg.MIXLY_RIGHT_EYE + "x","[2]"], + [Blockly.Msg.MIXLY_RIGHT_EYE + "y","[3]"], + [Blockly.Msg.MIXLY_NOSE + "x","[4]"], + [Blockly.Msg.MIXLY_NOSE + "y","[5]"], [Blockly.Msg.MIXLY_LEFT_MOUSE_CORNER + "x","[6]"], [Blockly.Msg.MIXLY_LEFT_MOUSE_CORNER + "y","[7]"], [Blockly.Msg.MIXLY_RIGHT_MOUSE_CORNER + "x","[8"], diff --git a/boards/default_src/micropython/generators/ai_local.js b/boards/default_src/micropython/generators/ai_local.js index 720a1e86..ba646a56 100644 --- a/boards/default_src/micropython/generators/ai_local.js +++ b/boards/default_src/micropython/generators/ai_local.js @@ -193,8 +193,8 @@ export const SCREEN_SHOW_CAM_GRAPH_SHOOT = function (_, generator) { var version = Boards.getSelectedBoardKey().split(':')[2]; generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft"; var sub = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC); - var s = this.getFieldValue('sync'); - var code = 'onboard_tft.display(' + sub +', sync='+ s +')\n'; + var bool = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC); + var code = 'onboard_tft.display(' + sub +', sync='+ bool +')\n'; return code; } @@ -203,8 +203,8 @@ export const SCREEN_DISPLAY_IMAGE = function (_, generator) { generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft"; var direct = generator.valueToCode(this, 'direct', generator.ORDER_ATOMIC); var a = this.getFieldValue('angle'); - var s = this.getFieldValue('sync'); - var code = 'onboard_tft.display(' + direct + ',rotation=' + a + ',sync='+ s + ')\n'; + var bool = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC); + var code = 'onboard_tft.display(' + direct + ',rotation=' + a + ',sync='+ bool + ')\n'; return code; } diff --git a/boards/default_src/micropython_esp32s3/template.xml b/boards/default_src/micropython_esp32s3/template.xml index e772a800..d29bb9b5 100644 --- a/boards/default_src/micropython_esp32s3/template.xml +++ b/boards/default_src/micropython_esp32s3/template.xml @@ -1845,9 +1845,9 @@ - - - + + + @@ -1976,6 +1976,10 @@ mixly.jpg + + + + @@ -2485,6 +2489,10 @@ mixly.jpg + + + + image @@ -2498,6 +2506,10 @@ image + + + + diff --git a/common/msg/blockly/zh-hans.js b/common/msg/blockly/zh-hans.js index 9caf3609..4ff9e959 100644 --- a/common/msg/blockly/zh-hans.js +++ b/common/msg/blockly/zh-hans.js @@ -4095,7 +4095,7 @@ ZhHans.MIXLY_TRANS_TO_RADIAN = '转换为弧度'; ZhHans.MIXLY_REF_TO_PRESSURE = '参考气压'; ZhHans.MIXLY_CAL_TO_ALTITUDE = '计算获取海拔'; ZhHans.MIXLY_SHOOTING_SIZE = '图像尺寸'; -ZhHans.MIXLY_SHOOT_AND_SAVE_PICTURE = '拍摄照片并保存'; +ZhHans.MIXLY_SHOOT_AND_SAVE_PICTURE = '拍摄保存'; ZhHans.MIXLY_GET_PICTURE_DATA = '获取摄像头图像'; ZhHans.MIXlY_SCREEN_SHOW_CAM_SHOOT = '屏幕显示摄像头数据'; ZhHans.MIXLY_RECOGNITION = '检测';