修改
删除S3灯颜色 统一S3和mini_g2 的rfid 增加 角度弧度转换 所有板 增加 S3根据气压获取海拔
This commit is contained in:
@@ -268,16 +268,28 @@ export const sensor_get_temperature = function (_, generator) {
|
||||
|
||||
export const rfid_readid = function (_, generator) {
|
||||
var version = Boards.getSelectedBoardKey().split(':')[2];
|
||||
generator.definitions_['import_' + version + '_onboard_rfid'] = "from " + version + " import onboard_rfid";
|
||||
var code = 'onboard_rfid.read_card(0, x="id")';
|
||||
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")';
|
||||
}
|
||||
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);
|
||||
generator.definitions_['import_' + version + '_onboard_rfid'] = "from " + version + " import onboard_rfid";
|
||||
var code = 'onboard_rfid.read_card(' + sector + ', x="content")';
|
||||
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")';
|
||||
}
|
||||
return [code, generator.ORDER_ATOMIC];
|
||||
}
|
||||
|
||||
@@ -285,8 +297,14 @@ 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);
|
||||
generator.definitions_['import_' + version + '_onboard_rfid'] = "from " + version + " import onboard_rfid";
|
||||
var code = 'onboard_rfid.write_card(' + cnt + ', ' + sector + ')\n';
|
||||
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';
|
||||
}
|
||||
return code;
|
||||
}
|
||||
|
||||
@@ -294,8 +312,13 @@ 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);
|
||||
generator.definitions_['import_' + version + '_onboard_rfid'] = "from " + version + " import onboard_rfid";
|
||||
var code = 'onboard_rfid.write_card(' + cnt + ', ' + sector + ')';
|
||||
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 + ')';
|
||||
}
|
||||
return [code, generator.ORDER_ATOMIC];
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user