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

Update: 更新板卡

Browse Source
This commit is contained in:
王立帮
2024-07-21 09:30:11 +08:00
parent ab9db2b32a
commit 189de53fb0
1258 changed files with 1461 additions and 1260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -142,7 +142,14 @@ div.blocklyToolboxDiv > div.blocklyToolboxContents > div:nth-child(12) > div.blo
background:url('../../../../common/media/mark/sensor2.png') no-repeat;
background-size: 100% auto;
}
#catMINI_G2.blocklyTreeRow > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{
background:url('../../../../common/media/mark/sensor.png') no-repeat;
background-size: 100% auto;
}
#catMINI_G2.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;
background-size: 100% auto;

42
boards/default_src/micropython_esp32c2/generators/me_g1.js
View File

@@ -1,3 +1,5 @@
import { Boards } from 'mixly';
export const me_g1_aht11 = function (_, generator) {
var key = this.getFieldValue('key');
generator.definitions_['import_me_g1'] = 'import me_g1';
@@ -25,31 +27,55 @@ export const me_g1_rfid_readid = function (_, generator) {
}
export const me_g1_rfid_readcontent = function (_, generator) {
var version = Boards.getSelectedBoardKey().split(':')[2];
var sector = generator.valueToCode(this, 'SECTOR', generator.ORDER_ATOMIC);
generator.definitions_['import_me_g1'] = 'import me_g1';
var code = 'me_g1.ext_rc522.read_card(' + sector + ')';
if (version == "mixgo_mini") {
generator.definitions_['import_mini_g2_ext_rfid'] = 'from mini_g2 import ext_rfid';
var code = 'ext_rfid.read_card(' + sector + ')';
} else {
generator.definitions_['import_me_g1'] = 'import me_g1';
var code = 'me_g1.ext_rc522.read_card(' + sector + ')';
}
return [code, generator.ORDER_ATOMIC];
}
export const me_g1_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_me_g1'] = 'import me_g1';
var code = 'me_g1.ext_rc522.write_card(' + cnt + ',' + sector + ')\n';
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 + ')\n';
} else {
generator.definitions_['import_me_g1'] = 'import me_g1';
var code = 'me_g1.ext_rc522.write_card(' + cnt + ',' + sector + ')\n';
}
return code;
}
export const me_g1_rfid_write_outcome = 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_me_g1'] = 'import me_g1';
var code = 'me_g1.ext_rc522.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_me_g1'] = 'import me_g1';
var code = 'me_g1.ext_rc522.write_card(' + cnt + ',' + sector + ')';
}
return [code, generator.ORDER_ATOMIC];
}
export const me_g1_rfid_status = function (_, generator) {
var version = Boards.getSelectedBoardKey().split(':')[2];
var key = this.getFieldValue('key');
generator.definitions_['import_me_g1'] = 'import me_g1';
var code = 'me_g1.ext_rc522.scan_card()==' + key;
if (version == "mixgo_mini") {
generator.definitions_['import_mini_g2_ext_rfid'] = 'from mini_g2 import ext_rfid';
var code = 'ext_rfid.scan_card()==' + key;
} else{
generator.definitions_['import_me_g1'] = 'import me_g1';
var code = 'me_g1.ext_rc522.scan_card()==' + key;
}
return [code, generator.ORDER_ATOMIC];
}

2
boards/default_src/micropython_esp32c2/origin/build/lib/mini_g2.py
View File

@@ -15,7 +15,7 @@ ext_i2c = SoftI2C(scl=Pin(7), sda=Pin(8), freq=400000)
'''RFID_Sensor'''
try :
import rc522
onboard_rfid = rc522.RC522(ext_i2c)
ext_rfid = rc522.RC522(ext_i2c)
except Exception as e:
print("Warning: Failed to communicate with SI522A (RFID) or",e)

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

@@ -278,6 +278,9 @@
</block>
<block type="system_machine_reset">
</block>
<block type="garbage_collection"></block>
<block type="get_mem_alloc"></block>
<block type="get_mem_free"></block>
</category>
<category id="catMath" colour="230">
<block type="math_number"></block>
@@ -1948,8 +1951,7 @@
</block>
<block type="me_g1_rfid_status"></block>
</category>
<category id="catCC_G1" colour="40"
m-show='micropython:esp32c3:mixgo_cc micropython:esp32c3:mixgo_me'>
<category id="catCC_G1" colour="40" m-show="micropython:esp32c2:mixgo_mini">
<block type="cc_g1_read_bat"></block>
<block type="cc_g1_read_joystick"></block>
<block type="cc_g1_read_key"></block>