diff --git a/boards/default_src/micropython/blocks/sensor_onboard.js b/boards/default_src/micropython/blocks/sensor_onboard.js
index ac84b7a6..68dc061f 100644
--- a/boards/default_src/micropython/blocks/sensor_onboard.js
+++ b/boards/default_src/micropython/blocks/sensor_onboard.js
@@ -1583,4 +1583,20 @@ export const sensor_get_the_coprocessor_version = {
this.setOutput(true);
this.setInputsInline(true);
}
+};
+
+export const simulated_light_sensor = {
+ init: function () {
+ this.setColour(SENSOR_ONBOARD_HUE);
+ this.appendDummyInput()
+ .appendField(Blockly.Msg.MIXLY_GET + Blockly.Msg.ANALOG + Blockly.Msg.MIXLY_LIGHT_SENSOR2)
+ .appendField(new Blockly.FieldDropdown([
+ [Blockly.Msg.TEXT_TRIM_LEFT, "0"],
+ [Blockly.Msg.TEXT_TRIM_RIGHT, "1"]
+ ]),"key");
+ this.appendDummyInput()
+ .appendField(Blockly.Msg.blockpy_set_of + Blockly.Msg.MIXLY_MICROBIT_JS_SYSTEM_RAISE_VALUE);
+ this.setOutput(true);
+ this.setInputsInline(true);
+ }
};
\ No newline at end of file
diff --git a/boards/default_src/micropython/generators/actuator_onboard.js b/boards/default_src/micropython/generators/actuator_onboard.js
index 12e8b614..f0fe2f0b 100644
--- a/boards/default_src/micropython/generators/actuator_onboard.js
+++ b/boards/default_src/micropython/generators/actuator_onboard.js
@@ -57,6 +57,9 @@ export const esp32_onboard_music_play_list = function (_, generator) {
} else if (version == 'mixgo_nova') {
generator.definitions_['import_mixgo_nova_voice_spk_midi'] = "from mixgo_nova_voice import spk_midi";
var code = "spk_midi.play(" + lst + ")\n";
+ } else if (version == 'mixgo_soar') {
+ generator.definitions_['import_mixgo_soar_voice_spk_midi'] = "from mixgo_soar_voice import spk_midi";
+ var code = "spk_midi.play(" + lst + ")\n";
} else {
generator.definitions_['import_' + version + '_onboard_music'] = 'from ' + version + ' import onboard_music';
var code = "onboard_music.play(" + lst + ")\n";
diff --git a/boards/default_src/micropython/generators/sensor_onboard.js b/boards/default_src/micropython/generators/sensor_onboard.js
index 2ac56d07..c3c13e93 100644
--- a/boards/default_src/micropython/generators/sensor_onboard.js
+++ b/boards/default_src/micropython/generators/sensor_onboard.js
@@ -210,7 +210,10 @@ export const sensor_sound = function (_, generator) {
} else if (version == 'mixgo_nova') {
generator.definitions_['import_mixgo_nova_voice_sound_level'] = "from mixgo_nova_voice import sound_level";
var code = 'sound_level()';
- } else if (version == "mixgo") {
+ } else if (version == 'mixgo_soar') {
+ generator.definitions_['import_mixgo_soar_voice_sound_level'] = "from mixgo_soar_voice import sound_level";
+ var code = 'sound_level()';
+ }else if (version == "mixgo") {
generator.definitions_['import_mixgo'] = 'import mixgo';
return ['mixgo.get_soundlevel()', generator.ORDER_ATOMIC];
} else if (version == "mpython") {
@@ -374,6 +377,9 @@ export const sensor_get_acceleration = function (_, generator) {
if (version == 'mixbot') {
generator.definitions_['import_' + version + '_acc_gyr'] = 'from ' + version + ' import acc_gyr';
var code = 'acc_gyr.strength()';
+ } else if(version == 'mixgo_soar'){
+ generator.definitions_['import_' + version + '_onboard_imu'] = "from " + version + " import onboard_imu";
+ var code = 'onboard_imu.strength()';
} else {
generator.definitions_['import_' + version + '_onboard_acc'] = "from " + version + " import onboard_acc";
var code = 'onboard_acc.strength()';
@@ -386,7 +392,10 @@ export const sensor_get_acceleration = function (_, generator) {
} else if (version == 'mpython') {
generator.definitions_['import_mpython_motion'] = 'from mpython import motion';
var code = 'motion.accelerometer()' + key;
- } else {
+ } else if (version == 'mixgo_soar') {
+ generator.definitions_['import_' + version + '_onboard_imu'] = "from " + version + " import onboard_imu";
+ var code = 'onboard_imu.acceleration()'+ key;
+ }else {
generator.definitions_['import_' + version + '_onboard_acc'] = "from " + version + " import onboard_acc";
var code = 'onboard_acc.acceleration()' + key;
}
@@ -952,4 +961,12 @@ export const sensor_get_the_coprocessor_version = function (_, generator) {
generator.definitions_['import_' + version + '_onboard_bot'] = 'from ' + version + ' import onboard_bot';
var code = 'onboard_bot.version()';
return [code, generator.ORDER_ATOMIC];
+}
+
+export const simulated_light_sensor = function (_, generator){
+ var version = Boards.getSelectedBoardKey().split(':')[2];
+ generator.definitions_['import_' + version + '_onboard_bot'] = 'from ' + version + ' import onboard_bot';
+ var key = this.getFieldValue('key');
+ var code = 'onboard_bot.brightness('+ key + ')';
+ return [code, generator.ORDER_ATOMIC];
}
\ No newline at end of file
diff --git a/boards/default_src/micropython_esp32s3/origin/config.json b/boards/default_src/micropython_esp32s3/origin/config.json
index e3c02c9c..bc13ec24 100644
--- a/boards/default_src/micropython_esp32s3/origin/config.json
+++ b/boards/default_src/micropython_esp32s3/origin/config.json
@@ -56,6 +56,34 @@
}
]
},
+ "元控飞翔": {
+ "key": "micropython:esp32s3:mixgo_soar",
+ "config": [
+ {
+ "key": "BurnSpeed",
+ "label": "Burn Speed",
+ "messageId": "MICROPYTHON_CONFIG_MESSAGE_BURN_SPEED",
+ "options": [
+ {
+ "key": "921600",
+ "label": "921600"
+ },
+ {
+ "key": "460800",
+ "label": "460800"
+ },
+ {
+ "key": "230400",
+ "label": "230400"
+ },
+ {
+ "key": "115200",
+ "label": "115200"
+ }
+ ]
+ }
+ ]
+ },
"S3_generic": {
"key": "micropython:esp32s3:generic",
"config": [
diff --git a/boards/default_src/micropython_esp32s3/template.xml b/boards/default_src/micropython_esp32s3/template.xml
index 860a1648..d3a3bfa8 100644
--- a/boards/default_src/micropython_esp32s3/template.xml
+++ b/boards/default_src/micropython_esp32s3/template.xml
@@ -1432,18 +1432,20 @@
-
-
-
-
+
+
+
+
+
-
-
+
+
-
-
-
+
+
+
+
@@ -1771,22 +1773,22 @@
-
+
100
-
+
20000
-
-
+
+
@@ -1796,14 +1798,14 @@
-
+
-
+
@@ -1821,7 +1823,7 @@
-
+
Hello, Mixly!
diff --git a/common/msg/blockly/en.js b/common/msg/blockly/en.js
index 38015eba..1774377a 100644
--- a/common/msg/blockly/en.js
+++ b/common/msg/blockly/en.js
@@ -3991,4 +3991,5 @@ En.MIXLY_TEXT_BYTE_ARRAY = 'bytearray';
En.MIXLY_MICROPYTHON_SOCKET_READLINE = 'Readline';
En.MIXLY_MICROPYTHON_SOCKET_READLINE_TOOLTIP = 'Read a line of data, ending with a newline character.';
En.MIXLY_DISPLAY_SCROLL_WAY = 'direction of scrolling';
+En.MIXLY_LIGHT_SENSOR2 = 'light sensor';
})();
diff --git a/common/msg/blockly/zh-hans.js b/common/msg/blockly/zh-hans.js
index 52e01ee1..d61c6a14 100644
--- a/common/msg/blockly/zh-hans.js
+++ b/common/msg/blockly/zh-hans.js
@@ -4150,4 +4150,5 @@ ZhHans.MIXLY_TEXT_BYTE_ARRAY = '字节数组';
ZhHans.MIXLY_MICROPYTHON_SOCKET_READLINE = '接收套接字的一行数据';
ZhHans.MIXLY_MICROPYTHON_SOCKET_READLINE_TOOLTIP = '读取一行数据，以换行符结尾。';
ZhHans.MIXLY_DISPLAY_SCROLL_WAY = '滚动显示方向';
+ZhHans.MIXLY_LIGHT_SENSOR2 = '光照传感器';
})();
\ No newline at end of file
diff --git a/common/msg/blockly/zh-hant.js b/common/msg/blockly/zh-hant.js
index 8f62333c..abce8e1c 100644
--- a/common/msg/blockly/zh-hant.js
+++ b/common/msg/blockly/zh-hant.js
@@ -4145,4 +4145,5 @@ ZhHant.MIXLY_TEXT_BYTE_ARRAY = '位元組數組';
ZhHant.MIXLY_MICROPYTHON_SOCKET_READLINE = '接收套接字的一行資料';
ZhHant.MIXLY_MICROPYTHON_SOCKET_READLINE_TOOLTIP = '讀取一行數據，以換行符號結尾。 ';
ZhHant.MIXLY_DISPLAY_SCROLL_WAY = '滾動顯示方向';
+ZhHant.MIXLY_LIGHT_SENSOR2 = '光照傳感器';
})();