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

feat(boards): 调整micropython下板载RFID图形块

Browse Source
This commit is contained in:
王立帮
2025-03-27 01:32:40 +08:00
parent f17f2b85e1
commit 7af8bf127e
11 changed files with 313 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -796,6 +796,21 @@ export const rfid_write_return = {
}
};
export const rfid_status = {
init: function () {
this.setColour(SENSOR_ONBOARD_HUE);
this.appendDummyInput("")
.appendField("RFID")
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_RFID_SCAN_OK, "True"],
[Blockly.Msg.MIXLY_RFID_SCAN_NOTAGERR, "None"],
[Blockly.Msg.MIXLY_RFID_SCAN_ERROR, "False"]
]), "key");
this.setOutput(true, Number);
this.setInputsInline(true);
}
};
export const sensor_get_acceleration = {
init: function () {
this.setColour(SENSOR_ONBOARD_HUE);

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

@@ -268,28 +268,16 @@ export const sensor_get_temperature = function (_, generator) {
export const rfid_readid = function (_, generator) {
var version = Boards.getSelectedBoardKey().split(':')[2];
if(version == 'mixgo_mini'){
generator.definitions_['import_mini_g2'] = 'import mini_g2';
generator.definitions_['import_mini_g2_ext_rfid'] = 'from mini_g2 import ext_rfid';
var code = 'ext_rfid.read_card(0, x="id")';
}else{
generator.definitions_['import_' + version + '_onboard_rfid'] = "from " + version + " import onboard_rfid";
var code = 'onboard_rfid.read_card(0, x="id")';
}
generator.definitions_[`import_${version}_onboard_rfid`] = `from ${version} import onboard_rfid`;
var code = 'onboard_rfid.read_card(0, x="id")';
return [code, generator.ORDER_ATOMIC];
}
export const rfid_readcontent = function (_, generator) {
var version = Boards.getSelectedBoardKey().split(':')[2];
var sector = generator.valueToCode(this, 'SECTOR', generator.ORDER_ATOMIC);
if(version == 'mixgo_mini'){
generator.definitions_['import_mini_g2'] = 'import mini_g2';
generator.definitions_['import_mini_g2_ext_rfid'] = 'from mini_g2 import ext_rfid';
var code = 'ext_rfid.read_card(' + sector + ')';
}else{
generator.definitions_['import_' + version + '_onboard_rfid'] = "from " + version + " import onboard_rfid";
var code = 'onboard_rfid.read_card(' + sector + ', x="content")';
}
generator.definitions_[`import_${version}_onboard_rfid`] = `from ${version} import onboard_rfid`;
var code = `onboard_rfid.read_card(${sector}, x="content")`;
return [code, generator.ORDER_ATOMIC];
}
@@ -297,14 +285,8 @@ export const rfid_write = function (_, generator) {
var version = Boards.getSelectedBoardKey().split(':')[2];
var sector = generator.valueToCode(this, 'SECTOR', generator.ORDER_ATOMIC);
var cnt = generator.valueToCode(this, 'CONTENT', generator.ORDER_ATOMIC);
if(version == 'mixgo_mini'){
generator.definitions_['import_mini_g2'] = 'import mini_g2';
generator.definitions_['import_mini_g2_ext_rfid'] = 'from mini_g2 import ext_rfid';
var code = 'ext_rfid.write_card(' + cnt + ',' + sector + ')\n';
}else{
generator.definitions_['import_' + version + '_onboard_rfid'] = "from " + version + " import onboard_rfid";
var code = 'onboard_rfid.write_card(' + cnt + ', ' + sector + ')\n';
}
generator.definitions_[`import_${version}_onboard_rfid`] = `from ${version} import onboard_rfid`;
var code = `onboard_rfid.write_card(${cnt}, ${sector})\n`;
return code;
}
@@ -312,13 +294,16 @@ export const rfid_write_return = function (_, generator) {
var version = Boards.getSelectedBoardKey().split(':')[2];
var sector = generator.valueToCode(this, 'SECTOR', generator.ORDER_ATOMIC);
var cnt = generator.valueToCode(this, 'CONTENT', generator.ORDER_ATOMIC);
if (version == "mixgo_mini") {
generator.definitions_['import_mini_g2_ext_rfid'] = 'from mini_g2 import ext_rfid';
var code = 'ext_rfid.write_card(' + cnt + ',' + sector + ')';
} else {
generator.definitions_['import_' + version + '_onboard_rfid'] = "from " + version + " import onboard_rfid";
var code = 'onboard_rfid.write_card(' + cnt + ', ' + sector + ')';
}
generator.definitions_[`import_${version}_onboard_rfid`] = `from ${version} import onboard_rfid`;
var code = `onboard_rfid.write_card(${cnt}, ${sector})`;
return [code, generator.ORDER_ATOMIC];
}
export const rfid_status = function (_, generator) {
var version = Boards.getSelectedBoardKey().split(':')[2];
var key = this.getFieldValue('key');
generator.definitions_[`import_${version}_onboard_rfid`] = `from ${version} import onboard_rfid`;
var code = `onboard_rfid.scan_card() == ${key}`;
return [code, generator.ORDER_ATOMIC];
}