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

mini板卡增加MINI_G5

Browse Source
This commit is contained in:
Irene-Maxine
2025-04-17 11:03:05 +08:00
parent 9702a31053
commit f3b3f5e709
6 changed files with 121 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
}

9
boards/default_src/micropython_esp32c2/css/color_esp32c3_mixgocc.css
View File

@@ -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;

44
boards/default_src/micropython_esp32c2/template.xml
View File

@@ -2020,6 +2020,50 @@
</value>
</block>
</category>
<category id="catMINI_G5" colour="40" m-show='micropython:esp32c2:mixgo_mini'>
<block type="rfid_status"></block>
<block type="rfid_readid"></block>
<block type="rfid_readcontent">
<value name="SECTOR">
<shadow type="math_number">
<field name="NUM">0</field>
</shadow>
</value>
</block>
<block type="rfid_write">
<value name="SECTOR">
<shadow type="math_number">
<field name="NUM">0</field>
</shadow>
</value>
<value name="CONTENT">
<shadow type="text">
<field name="TEXT">Mixly</field>
</shadow>
</value>
</block>
<block type="rfid_write_return">
<value name="SECTOR">
<shadow type="math_number">
<field name="NUM">0</field>
</shadow>
</value>
<value name="CONTENT">
<shadow type="text">
<field name="TEXT">Mixly</field>
</shadow>
</value>
</block>
<block type="CI130X_IDENTIFY_AND_SAVE_SANT"></block>
<block type="CI130X_GET_WHETHER_IDENTIFY_SANT"></block>
<block type="CI130X_GET_THE_RECOGNIZED_CMD_SANT"></block>
<block type="CI130X_BROADCAST_SANT">
<value name="NUM">
<block type="logic_null"></block>
</value>
</block>
<block type = "CI130X_SET_SYSTEM_CMD_SANT"></block>
</category>
<category id="catIot" colour="#2FAD7A">
<category id="catBlynk" colour="#2FAD7A">
<block type="iot_wifi_connect">

1
common/msg/blockly/en.js
View File

@@ -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",

1
common/msg/blockly/zh-hans.js
View File

@@ -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:"智能物联",

1
common/msg/blockly/zh-hant.js
View File

@@ -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:"智能物聯",