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

修改

Browse Source
This commit is contained in:
Irene-Maxine
2025-06-05 21:34:15 +08:00
parent 0f2b243b20
commit c39998508a
7 changed files with 71 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
boards/default_src/micropython/blocks/ai_local.js
View File

@@ -544,3 +544,17 @@ export const DELETE_PEOPLE_FACE_ID= {
this.setInputsInline(true);
}
};
export const AI_STOP_ACQUISITION = {
init: function () {
this.setColour(AI_LOCAL_GRAPH_HUE);
this.appendValueInput('SUB')
.appendField(Blockly.Msg.MIXLY_STOP)
.setCheck("var");
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_IMAGE_ACQUISITION);
this.setOutput(true);
this.setInputsInline(true);
}
};

6
boards/default_src/micropython/generators/ai_local.js
View File

@@ -225,3 +225,9 @@ export const DELETE_PEOPLE_FACE_ID = function (_, generator) {
var code = sub + '.face_delete('+ id +')\n';
return code;
}
export const AI_STOP_ACQUISITION = function (_, generator) {
var sub = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
var code = sub + '.stop()';
return [code, generator.ORDER_ATOMIC];
}

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

@@ -276,6 +276,9 @@ export const rfid_readid = function (_, generator) {
} else if (version === 'mixgo_me') {
moduleName = 'me_g1';
objName = 'ext_rc522';
}else if (version === 'mixgo_sant'){
moduleName = 'sant_gx';
objName = 'ext_rfid';
}
generator.definitions_[`import_${moduleName}_${objName}`] = `from ${moduleName} import ${objName}`;
var code = `${objName}.read_card(0, x="id")`;
@@ -293,6 +296,9 @@ export const rfid_readcontent = function (_, generator) {
} else if (version === 'mixgo_me') {
moduleName = 'me_g1';
objName = 'ext_rc522';
}else if (version === 'mixgo_sant'){
moduleName = 'sant_gx';
objName = 'ext_rfid';
}
generator.definitions_[`import_${moduleName}_${objName}`] = `from ${moduleName} import ${objName}`;
var code = `${objName}.read_card(${sector}, x="content")`;
@@ -311,6 +317,9 @@ export const rfid_write = function (_, generator) {
} else if (version === 'mixgo_me') {
moduleName = 'me_g1';
objName = 'ext_rc522';
}else if (version === 'mixgo_sant'){
moduleName = 'sant_gx';
objName = 'ext_rfid';
}
generator.definitions_[`import_${moduleName}_${objName}`] = `from ${moduleName} import ${objName}`;
var code = `${objName}.write_card(${cnt}, ${sector})\n`;
@@ -329,6 +338,9 @@ export const rfid_write_return = function (_, generator) {
} else if (version === 'mixgo_me') {
moduleName = 'me_g1';
objName = 'ext_rc522';
}else if (version === 'mixgo_sant'){
moduleName = 'sant_gx';
objName = 'ext_rfid';
}
generator.definitions_[`import_${moduleName}_${objName}`] = `from ${moduleName} import ${objName}`;
var code = `${objName}.write_card(${cnt}, ${sector})`;
@@ -346,6 +358,9 @@ export const rfid_status = function (_, generator) {
} else if (version === 'mixgo_me') {
moduleName = 'me_g1';
objName = 'ext_rc522';
} else if (version === 'mixgo_sant'){
moduleName = 'sant_gx';
objName = 'ext_rfid';
}
generator.definitions_[`import_${moduleName}_${objName}`] = `from ${moduleName} import ${objName}`;
var code = `${objName}.scan_card() == ${key}`;

35
boards/default_src/micropython_esp32s3/template.xml
View File

@@ -2529,6 +2529,13 @@
</shadow>
</value>
</block>
<block type="AI_STOP_ACQUISITION">
<value name="SUB">
<shadow type="variables_get">
<field name="VAR">ai</field>
</shadow>
</value>
</block>
</category>
<category id="catAIvoicesensor" colour="#2FAD7A">
<block type="VOICE_RECOGNITION_CONTROL"></block>
@@ -2584,6 +2591,30 @@
</value>
</block>
<block type="interaction_whether_to_interaction_SANT"></block>
<block type="radar_set_DETECTION_THRESHOLD" >
<value name="SUB">
<shadow type="variables_get">
<field name="VAR">xsensor</field>
</shadow>
</value>
<value name="VAR">
<shadow type="math_number">
<field name="NUM">5000</field>
</shadow>
</value>
<value name="VAR2">
<shadow type="math_number">
<field name="NUM">500</field>
</shadow>
</value>
</block>
<block type="interaction_whether_to_interaction" >
<value name="SUB">
<shadow type="variables_get">
<field name="VAR">xsensor</field>
</shadow>
</value>
</block>
</category>
<category id="catIot" colour="#2FAD7A">
<category id="catMixIO" colour="#526FC3">
@@ -4082,7 +4113,7 @@
</shadow>
</value>
</block>
<block type="radar_set_DETECTION_THRESHOLD" m-hide='micropython:esp32s3:mixgo_sant'>
<block type="radar_set_DETECTION_THRESHOLD" >
<value name="SUB">
<shadow type="variables_get">
<field name="VAR">xsensor</field>
@@ -4099,7 +4130,7 @@
</shadow>
</value>
</block>
<block type="interaction_whether_to_interaction" m-hide='micropython:esp32s3:mixgo_sant'>
<block type="interaction_whether_to_interaction" >
<value name="SUB">
<shadow type="variables_get">
<field name="VAR">xsensor</field>

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

@@ -3969,4 +3969,5 @@ En.MIXLY_column_tube_foot = 'column tube foot';
En.MIXLY_DEFINE_KEYBOARDS= 'define the keyboard';
En.MIXLY_TVOC_CO2_SENSOR = 'TVOC,formaldehyde and carbon dioxide sensors';
En.MIXLY_TVOC_CO2_SENSOR_GRT_DATA = 'Obtain the concentrations of TVOC(mg/m³), formaldehyde (mg/m³), and carbon dioxide (ppm)';
En.MIXLY_IMAGE_ACQUISITION = 'image acquisition';
})();

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

@@ -4128,4 +4128,5 @@ ZhHans.MIXLY_column_tube_foot = '列管脚';
ZhHans.MIXLY_DEFINE_KEYBOARDS= '定义键盘';
ZhHans.MIXLY_TVOC_CO2_SENSOR = 'TVOC、甲醛、二氧化碳传感器';
ZhHans.MIXLY_TVOC_CO2_SENSOR_GRT_DATA = '获取TVOC(mg/m3) 、甲醛(mg/m3)、二氧化碳的浓度(ppm)';
ZhHans.MIXLY_IMAGE_ACQUISITION = '图像采集';
})();

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

@@ -4123,4 +4123,5 @@ ZhHant.MIXLY_column_tube_foot = '列管腳';
ZhHant.MIXLY_DEFINE_KEYBOARDS= '定義鍵盤';
ZhHant.MIXLY_TVOC_CO2_SENSOR = 'TVOC、甲醛、二氧化碳傳感器';
ZhHant.MIXLY_TVOC_CO2_SENSOR_GRT_DATA = '獲取TVOC(mg/m3) 、甲醛(mg/m3)、二氧化碳的濃度(ppm)';
ZhHant.MIXLY_IMAGE_ACQUISITION = '圖像採集';
})();