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

修改

Browse Source 
删除S3灯颜色
统一S3和mini_g2 的rfid
增加 角度弧度转换 所有板
增加 S3根据气压获取海拔
This commit is contained in:
Irene-Maxine
2025-03-26 19:24:36 +08:00
parent 3f41008f21
commit f835dd2f64
25 changed files with 379 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
boards/default_src/micropython_esp32c2/generators/mini_g2.js
View File

@@ -27,8 +27,10 @@ export const mini_g2_rfid_readid = function (_, generator) {
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_mini_g2'] = 'import mini_g2';
var code = 'mini_g2.ext_rc522.read_card(0, x="id")';
// generator.definitions_['import_mini_g2'] = 'import mini_g2';
// var code = 'mini_g2.ext_rc522.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];
}
@@ -40,8 +42,10 @@ export const mini_g2_rfid_readcontent = function (_, generator) {
generator.definitions_['import_mini_g2_ext_rfid'] = 'from mini_g2 import ext_rfid';
var code = 'ext_rfid.read_card(' + sector + ')';
} else {
generator.definitions_['import_mini_g2'] = 'import mini_g2';
var code = 'mini_g2.ext_rc522.read_card(' + sector + ')';
// generator.definitions_['import_mini_g2'] = 'import mini_g2';
// var code = 'mini_g2.ext_rc522.read_card(' + sector + ')';
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];
}
@@ -54,8 +58,10 @@ export const mini_g2_rfid_write = function (_, generator) {
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_mini_g2'] = 'import mini_g2';
var code = 'mini_g2.ext_rc522.write_card(' + cnt + ',' + sector + ')\n';
// generator.definitions_['import_mini_g2'] = 'import mini_g2';
// var code = 'mini_g2.ext_rc522.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;
}
@@ -68,8 +74,10 @@ export const mini_g2_rfid_write_outcome = function (_, generator) {
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_mini_g2'] = 'import mini_g2';
var code = 'mini_g2.ext_rc522.write_card(' + cnt + ',' + sector + ')';
// generator.definitions_['import_mini_g2'] = 'import mini_g2';
// var code = 'mini_g2.ext_rc522.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];
}
@@ -81,8 +89,10 @@ export const mini_g2_rfid_status = function (_, generator) {
generator.definitions_['import_mini_g2_ext_rfid'] = 'from mini_g2 import ext_rfid';
var code = 'ext_rfid.scan_card()==' + key;
} else {
generator.definitions_['import_mini_g2'] = 'import mini_g2';
var code = 'mini_g2.ext_rc522.scan_card()==' + key;
// generator.definitions_['import_mini_g2'] = 'import mini_g2';
// var code = 'mini_g2.ext_rc522.scan_card()==' + key;
generator.definitions_['import_' + version + '_onboard_rfid'] = "from " + version + " import onboard_rfid";
var code = 'onboard_rfid.scan_card()==' + key;
}
return [code, generator.ORDER_ATOMIC];
}

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

@@ -448,6 +448,20 @@
</shadow>
</value>
</block>
<block type="math_radian_to_degree">
<value name="VAR">
<shadow type="math_number">
<field name="NUM">1</field>
</shadow>
</value>
</block>
<block type="math_degree_to_radian">
<value name="VAR">
<shadow type="math_number">
<field name="NUM">1</field>
</shadow>
</value>
</block>
</category>
<category id="catLogic" colour="210">
<block type="logic_compare"></block>
@@ -1972,6 +1986,7 @@
<block type="cc_g1_turnoff"></block>
</category>
<category id="catMINI_G2" colour="40" m-show='micropython:esp32c2:mixgo_mini'>
<block type="mini_g2_rfid_readid"></block>
<block type="mini_g2_rfid_readcontent">
<value name="SECTOR">
<shadow type="math_number">
@@ -1979,7 +1994,6 @@
</shadow>
</value>
</block>
<block type="mini_g2_rfid_readid"></block>
<block type="mini_g2_rfid_write">
<value name="SECTOR">
<shadow type="math_number">