From f3b3f5e7099f57ec47280880504f53e3c55e29c3 Mon Sep 17 00:00:00 2001 From: Irene-Maxine <114802521+Irene-Maxine@users.noreply.github.com> Date: Thu, 17 Apr 2025 11:03:05 +0800 Subject: [PATCH] =?UTF-8?q?mini=E6=9D=BF=E5=8D=A1=E5=A2=9E=E5=8A=A0MINI=5F?= =?UTF-8?q?G5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../micropython/generators/sensor_onboard.js | 91 +++++++++++++------ .../css/color_esp32c3_mixgocc.css | 9 ++ .../micropython_esp32c2/template.xml | 44 +++++++++ common/msg/blockly/en.js | 1 + common/msg/blockly/zh-hans.js | 1 + common/msg/blockly/zh-hant.js | 1 + 6 files changed, 121 insertions(+), 26 deletions(-) diff --git a/boards/default_src/micropython/generators/sensor_onboard.js b/boards/default_src/micropython/generators/sensor_onboard.js index d1ae142a..a4a945bd 100644 --- a/boards/default_src/micropython/generators/sensor_onboard.js +++ b/boards/default_src/micropython/generators/sensor_onboard.js @@ -271,7 +271,7 @@ export const rfid_readid = function (_, generator) { var moduleName = version; var objName = 'onboard_rfid'; if (version === 'mixgo_mini') { - moduleName = 'mini_g2'; + moduleName = 'mini_gx'; objName = 'ext_rfid'; } else if (version === 'mixgo_me') { moduleName = 'me_g1'; @@ -288,7 +288,7 @@ export const rfid_readcontent = function (_, generator) { var moduleName = version; var objName = 'onboard_rfid'; if (version === 'mixgo_mini') { - moduleName = 'mini_g2'; + moduleName = 'mini_gx'; objName = 'ext_rfid'; } else if (version === 'mixgo_me') { moduleName = 'me_g1'; @@ -306,7 +306,7 @@ export const rfid_write = function (_, generator) { var moduleName = version; var objName = 'onboard_rfid'; if (version === 'mixgo_mini') { - moduleName = 'mini_g2'; + moduleName = 'mini_gx'; objName = 'ext_rfid'; } else if (version === 'mixgo_me') { moduleName = 'me_g1'; @@ -324,7 +324,7 @@ export const rfid_write_return = function (_, generator) { var moduleName = version; var objName = 'onboard_rfid'; if (version === 'mixgo_mini') { - moduleName = 'mini_g2'; + moduleName = 'mini_gx'; objName = 'ext_rfid'; } else if (version === 'mixgo_me') { moduleName = 'me_g1'; @@ -341,7 +341,7 @@ export const rfid_status = function (_, generator) { var moduleName = version; var objName = 'onboard_rfid'; if (version === 'mixgo_mini') { - moduleName = 'mini_g2'; + moduleName = 'mini_gx'; objName = 'ext_rfid'; } else if (version === 'mixgo_me') { moduleName = 'me_g1'; @@ -934,48 +934,87 @@ export const educore_rfid_sensor_scan_data = function (_, generator) { export const CI130X_IDENTIFY_AND_SAVE_SANT = function (_, generator) { var version = Boards.getSelectedBoardKey().split(':')[2]; - generator.definitions_['import_' + version + '_onboard_asr'] = 'from ' + version + ' import onboard_asr'; - var code = 'onboard_asr.cmd_id()\n'; + if(version == 'mini_sant'){ + generator.definitions_['import_' + version + '_onboard_asr'] = 'from ' + version + ' import onboard_asr'; + var code = 'onboard_asr.cmd_id()\n'; + } + else if(version == 'mixgo_mini'){ + generator.definitions_['import_mini_g5_ext_asr'] = 'from mini_g5 import ext_asr'; + var code = 'ext_asr.cmd_id()\n'; + } return code; } export const CI130X_GET_WHETHER_IDENTIFY_SANT = 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.result(' + cmd + ')'; + if(version == 'mini_sant'){ + generator.definitions_['import_' + version + '_onboard_asr'] = 'from ' + version + ' import onboard_asr'; + var cmd = this.getFieldValue('cmd'); + var code = 'onboard_asr.result(' + cmd + ')'; + } + else if(version == 'mixgo_mini'){ + generator.definitions_['import_mini_g5_ext_asr'] = 'from mini_g5 import ext_asr'; + var cmd = this.getFieldValue('cmd'); + var code = 'ext_asr.result(' + cmd + ')'; + } return [code, generator.ORDER_ATOMIC]; } export const CI130X_GET_THE_RECOGNIZED_CMD_SANT = function (_, generator) { var version = Boards.getSelectedBoardKey().split(':')[2]; - generator.definitions_['import_' + version + '_onboard_asr'] = 'from ' + version + ' import onboard_asr'; - var key = this.getFieldValue('key'); - if (key == 'status1') { - var code = 'onboard_asr.status()[0]'; - } else if (key == 'status2') { - var code = 'onboard_asr.status()[1]'; - } else { - var code = 'onboard_asr.' + key + '()'; + if(version == 'mini_sant'){ + generator.definitions_['import_' + version + '_onboard_asr'] = 'from ' + version + ' import onboard_asr'; + var key = this.getFieldValue('key'); + if (key == 'status1') { + var code = 'onboard_asr.status()[0]'; + } else if (key == 'status2') { + var code = 'onboard_asr.status()[1]'; + } else { + var code = 'onboard_asr.' + key + '()'; + } + }else if(version == 'mixgo_mini'){ + generator.definitions_['import_mini_g5_ext_asr'] = 'from mini_g5 import ext_asr'; + var key = this.getFieldValue('key'); + if (key == 'status1') { + var code = 'ext_asr.status()[0]'; + } else if (key == 'status2') { + var code = 'ext_asr.status()[1]'; + } else { + var code = 'ext_asr.' + key + '()'; + } } return [code, generator.ORDER_ATOMIC]; } export const CI130X_BROADCAST_SANT = function (_, generator) { var version = Boards.getSelectedBoardKey().split(':')[2]; - generator.definitions_['import_' + version + '_onboard_asr'] = 'from ' + version + ' import onboard_asr'; - var num = generator.valueToCode(this, 'NUM', generator.ORDER_ATOMIC); - var star = this.getFieldValue('star'); - var end = this.getFieldValue('end'); - var code = 'onboard_asr.play(' + star + ', ' + num + ', ' + end + ')\n'; + if(version == 'mini_sant'){ + generator.definitions_['import_' + version + '_onboard_asr'] = 'from ' + version + ' import onboard_asr'; + var num = generator.valueToCode(this, 'NUM', generator.ORDER_ATOMIC); + var star = this.getFieldValue('star'); + var end = this.getFieldValue('end'); + var code = 'onboard_asr.play(' + star + ', ' + num + ', ' + end + ')\n'; + }else if(version == 'mixgo_mini'){ + generator.definitions_['import_mini_g5_ext_asr'] = 'from mini_g5 import ext_asr'; + var num = generator.valueToCode(this, 'NUM', generator.ORDER_ATOMIC); + var star = this.getFieldValue('star'); + var end = this.getFieldValue('end'); + var code = 'ext_asr.play(' + star + ', ' + num + ', ' + end + ')\n'; + } return code; } export const CI130X_SET_SYSTEM_CMD_SANT = 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.sys_cmd(' + cmd + ')\n'; + if(version == 'mini_sant'){ + generator.definitions_['import_' + version + '_onboard_asr'] = 'from ' + version + ' import onboard_asr'; + var cmd = this.getFieldValue('cmd'); + var code = 'onboard_asr.sys_cmd(' + cmd + ')\n'; + }else if(version == 'mixgo_mini'){ + generator.definitions_['import_mini_g5_ext_asr'] = 'from mini_g5 import ext_asr'; + var cmd = this.getFieldValue('cmd'); + var code = 'ext_asr.sys_cmd(' + cmd + ')\n'; + } return code; } diff --git a/boards/default_src/micropython_esp32c2/css/color_esp32c3_mixgocc.css b/boards/default_src/micropython_esp32c2/css/color_esp32c3_mixgocc.css index 002cf8a0..7a67282a 100644 --- a/boards/default_src/micropython_esp32c2/css/color_esp32c3_mixgocc.css +++ b/boards/default_src/micropython_esp32c2/css/color_esp32c3_mixgocc.css @@ -187,6 +187,15 @@ div.blocklyToolboxDiv>div.blocklyToolboxContents>div:nth-child(12)>div.blocklyTr background: url('../../../../common/media/mark/sensor2.png') no-repeat; background-size: 100% auto; } +#catMINI_G5.blocklyTreeRow>div.blocklyTreeRowContentContainer>span.blocklyTreeIcon { + background: url('../../../../common/media/mark/sensor.png') no-repeat; + background-size: 100% auto; +} + +#catMINI_G5.blocklyTreeRow.blocklyTreeSelected>div.blocklyTreeRowContentContainer>span.blocklyTreeIcon { + background: url('../../../../common/media/mark/sensor2.png') no-repeat; + background-size: 100% auto; +} #catExternSensor.blocklyTreeRow>div.blocklyTreeRowContentContainer>span.blocklyTreeIcon { background: url('../../../../common/media/mark/sensor_extern.png') no-repeat; diff --git a/boards/default_src/micropython_esp32c2/template.xml b/boards/default_src/micropython_esp32c2/template.xml index 894f4dc8..0e162111 100644 --- a/boards/default_src/micropython_esp32c2/template.xml +++ b/boards/default_src/micropython_esp32c2/template.xml @@ -2020,6 +2020,50 @@ + + + + + + + 0 + + + + + + + 0 + + + + + Mixly + + + + + + + 0 + + + + + Mixly + + + + + + + + + + + + + diff --git a/common/msg/blockly/en.js b/common/msg/blockly/en.js index c4cf9525..7e55ff2d 100644 --- a/common/msg/blockly/en.js +++ b/common/msg/blockly/en.js @@ -34,6 +34,7 @@ En.MSG = { catCE_G6:"CE G6", catCC_G1:"CC G1", catMINI_G2:"MINI G2", + catMINI_G5:"MINI G5", catSANT_G2:"SANT G2", catNova_G1:"Nova G1", catAIOT:"Intelligent IOT", diff --git a/common/msg/blockly/zh-hans.js b/common/msg/blockly/zh-hans.js index bd7a1c3c..eabe2cb2 100644 --- a/common/msg/blockly/zh-hans.js +++ b/common/msg/blockly/zh-hans.js @@ -33,6 +33,7 @@ ZhHans.MSG = { catCE_G6:"CE G6", catCC_G1:"CC G1", catMINI_G2:"MINI G2", + catMINI_G5:"MINI G5", catSANT_G2:"SANT G2", catNova_G1:"Nova G1", catAIOT:"智能物联", diff --git a/common/msg/blockly/zh-hant.js b/common/msg/blockly/zh-hant.js index 8b9cf42f..5e86893a 100644 --- a/common/msg/blockly/zh-hant.js +++ b/common/msg/blockly/zh-hant.js @@ -33,6 +33,7 @@ ZhHant.MSG = { catCE_G6:"CE G6", catCC_G1:"CC G1", catMINI_G2:"MINI G2", + catMINI_G5:"MINI G5", catSANT_G2:"SANT G2", catNova_G1:"Nova G1", catAIOT:"智能物聯",