18069996051/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

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

@@ -217,7 +217,13 @@ export const sensor_sound = function (_, generator) {
export const sensor_hp203 = function (_, generator) {
var version = Boards.getSelectedBoardKey().split(':')[2]
var key = this.getFieldValue('key');
generator.definitions_['import_' + version + '_onboard_bps'] = "from " + version + " import onboard_bps";
if (version == "mixgo_mini") {
generator.definitions_['import_mixgo_mini_onboard_i2c'] = 'from mixgo_mini import onboard_i2c';
generator.definitions_['import_spl06_001'] = 'import spl06_001';
generator.definitions_['import_onboard_bps'] = 'onboard_bps = spl06_001.SPL06(onboard_i2c)';
} else{
generator.definitions_['import_' + version + '_onboard_bps'] = "from " + version + " import onboard_bps";
}
var code = 'onboard_bps.' + key;
return [code, generator.ORDER_ATOMIC];
}
@@ -228,6 +234,10 @@ export const sensor_aht11 = function (_, generator) {
if (version == 'mixgo_nova' || version == 'mixgo_zero') {
generator.definitions_['import_' + version + '_onboard_ths'] = "from " + version + " import onboard_ths";
var code = 'onboard_ths.' + key + '()';
} else if(version == 'mixgo_mini') {
generator.definitions_['import_mixgo_mini_onboard_i2c'] = 'from mixgo_mini import onboard_i2c';
generator.definitions_['import_shtc3'] = 'import shtc3';
generator.definitions_['import_onboard_ths'] = 'onboard_ths = shtc3.SHTC3(onboard_i2c)';
} else {
generator.definitions_['import_' + version + '_onboard_ths'] = "from " + version + " import onboard_ths";
var code = 'onboard_ths.' + key + '()';
@@ -566,6 +576,11 @@ export const sensor_mixgo_cc_mmc5603_get_magnetic = function (_, generator) {
if (version == 'mpython') {
generator.definitions_['import_mpython_magnetic'] = 'from mpython import magnetic';
var code = 'magnetic.getdata()' + key;
} else if(version == 'mixgo_mini') {
generator.definitions_['import_mixgo_mini_onboard_i2c'] = 'from mixgo_mini import onboard_i2c';
generator.definitions_['import_mmc5603'] = 'import mmc5603';
generator.definitions_['import_onboard_mgs']= 'onboard_mgs = mmc5603.MMC5603(onboard_i2c)';
var code = 'onboard_mgs.getdata()' + key;
} else {
generator.definitions_['import_' + version + '_onboard_mgs'] = "from " + version + " import onboard_mgs";
var code = 'onboard_mgs.getdata()' + key;
@@ -578,16 +593,26 @@ export const sensor_mixgo_cc_mmc5603_get_angle = function (_, generator) {
if (version == 'mpython') {
generator.definitions_['import_mpython_magnetic'] = 'from mpython import magnetic';
var code = 'magnetic.getangle()';
} else if(version == 'mixgo_mini') {
generator.definitions_['import_mixgo_mini_onboard_i2c'] = 'from mixgo_mini import onboard_i2c';
generator.definitions_['import_mmc5603'] = 'import mmc5603';
generator.definitions_['import_onboard_mgs']= 'onboard_mgs = mmc5603.MMC5603(onboard_i2c)';
} else {
generator.definitions_['import_' + version + '_onboard_mgs'] = "from " + version + " import onboard_mgs";
var code = 'onboard_mgs.getangle()';
}
var code = 'onboard_mgs.getangle()';
return [code, generator.ORDER_ATOMIC];
}
export const sensor_mixgo_cc_mmc5603_calibrate_compass = function (_, generator) {
var version = Boards.getSelectedBoardKey().split(':')[2]
generator.definitions_['import_' + version + '_onboard_mgs'] = "from " + version + " import onboard_mgs";
if(version == 'mixgo_mini') {
generator.definitions_['import_mixgo_mini_onboard_i2c'] = 'from mixgo_mini import onboard_i2c';
generator.definitions_['import_mmc5603'] = 'import mmc5603';
generator.definitions_['import_onboard_mgs']= 'onboard_mgs = mmc5603.MMC5603(onboard_i2c)';
} else{
generator.definitions_['import_' + version + '_onboard_mgs'] = "from " + version + " import onboard_mgs";
}
var code = 'onboard_mgs.calibrate()\n';
return code;
}

3
boards/default_src/micropython_esp32/template.xml
View File

@@ -303,6 +303,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>

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>

3
boards/default_src/micropython_esp32c3/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>

3
boards/default_src/micropython_esp32s2/template.xml
View File

@@ -303,6 +303,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>

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

@@ -303,6 +303,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>

4
boards/default_src/micropython_k210_mixgoai/template.xml
View File

@@ -269,6 +269,10 @@
</value>
</block>
<block type="garbage_collection"></block>
<block type="get_mem_alloc"></block>
<block type="get_mem_free"></block>
</category>
<category id="catMath" colour="230">

3
boards/default_src/micropython_nrf51822_microbit/template.xml
View File

@@ -126,6 +126,9 @@
</block>
<block type="reset"></block>
<block type="controls_uname"></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>

3
boards/default_src/micropython_nrf51822_mithoncc/template.xml
View File

@@ -52,6 +52,9 @@
</block>
<block type="controls_flow_statements"></block>
<block type="controls_millis"></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>

3
boards/default_src/micropython_robot/template.xml
View File

@@ -290,6 +290,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>

29
boards/default_src/python/blocks/control.js
View File

@@ -989,5 +989,34 @@ export const do_while = {
}
};
export const garbage_collection = {
init: function () {
this.setColour(LOOPS_HUE);
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_OP_GARBAGE_COLLECT);
this.setPreviousStatement(true);
this.setNextStatement(true);
}
};
export const get_mem_alloc = {
init: function () {
this.setColour(LOOPS_HUE);
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_GET_MEM_ALLOC);
this.setOutput(true)
}
};
export const get_mem_free = {
init: function () {
this.setColour(LOOPS_HUE);
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_GET_MEM_FREE);
this.setOutput(true)
}
};
// export const base_type = controls_type;
// export const controls_TypeLists = controls_typeLists;

19
boards/default_src/python/generators/control.js
View File

@@ -252,5 +252,24 @@ export const controls_repeat_ext = function (a, generator) {
return 'for _my_variable in range(' + times + '):\n' + d;
}
export const garbage_collection = function (_, generator) {
generator.definitions_['import_gc'] = 'import gc';
var code = 'gc.collect()\n'
return code;
}
export const get_mem_alloc = function (_, generator) {
generator.definitions_['import_gc'] = 'import gc';
var code = 'gc.mem_alloc()\n';
return [code, generator.ORDER_ATOMIC];
}
export const get_mem_free = function (_, generator) {
generator.definitions_['import_gc'] = 'import gc';
var code = 'gc.mem_free()\n';
return [code, generator.ORDER_ATOMIC]
}
// ok
export const controls_repeat = controls_repeat_ext;

3
boards/default_src/python_mixpy/template.xml
View File

@@ -214,6 +214,9 @@
</block>
<block type="controls_millis"></block>
<block type="time_localtime"></block>
<block type="garbage_collection"></block>
<block type="get_mem_alloc"></block>
<block type="get_mem_free"></block>
<!--
<block type="Panic_with_status_code">

3
boards/default_src/python_skulpt/template.xml
View File

@@ -169,6 +169,9 @@
</block>-->
<block type="controls_millis"></block>
<block type="time_localtime"></block>
<block type="garbage_collection"></block>
<block type="get_mem_alloc"></block>
<block type="get_mem_free"></block>
<!-- <block type="Panic_with_status_code">
<value name="STATUS_CODE">
<shadow type="math_number">

3
boards/default_src/python_skulpt_car/template.xml
View File

@@ -141,6 +141,9 @@ type="application/javascript"></script> -->
<block type="controls_millis"></block>
<block type="time_localtime"></block>
<block type="controls_end_program"></block>
<block type="garbage_collection"></block>
<block type="get_mem_alloc"></block>
<block type="get_mem_free"></block>
<!-- <block type="Panic_with_status_code">
<value name="STATUS_CODE">
<shadow type="math_number">

3
boards/default_src/python_skulpt_mixtoy/template.xml
View File

@@ -127,6 +127,9 @@ type="application/javascript"></script> -->
</block>-->
<block type="controls_millis"></block>
<block type="time_localtime"></block>
<block type="garbage_collection"></block>
<block type="get_mem_alloc"></block>
<block type="get_mem_free"></block>
<!-- <block type="Panic_with_status_code">
<value name="STATUS_CODE">
<shadow type="math_number">