增加元控飞翔板

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);
+    }
 };

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";

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];
 }

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": [

boards/default_src/micropython_esp32s3/template.xml

@@ -1432,18 +1432,20 @@
       </value>
     </block>
     <block type="sensor_mixgo_touch_slide"></block>
-    <!-- <block type="sensor_mixgo_pin_near" m-show='micropython:esp32s3:mixgo_sant'></block> -->
+    <block type="sensor_mixgo_pin_near_single" m-show='micropython:esp32s3:mixgo_soar'></block>
-    <block type="sensor_mixgo_nova_pin_near"></block>
+    <block type="sensor_mixgo_nova_pin_near" m-hide='micropython:esp32s3:mixgo_soar'></block>
-    <!-- <block type="sensor_mixgo_LTR308" m-show='micropython:esp32s3:mixgo_sant'></block> -->
+    <block type="sensor_LTR308" m-show='micropython:esp32s3:mixgo_soar'></block>
-    <block type="sensor_mixgo_nova_LTR308" ></block>
+    <block type="sensor_mixgo_nova_LTR308" m-hide='micropython:esp32s3:mixgo_soar'></block>
+    <block type="simulated_light_sensor" m-show='micropython:esp32s3:mixgo_soar'></block>
     <!-- <block type="sensor_mixgo_sant_color" m-show='micropython:esp32s3:mixgo_sant'></block> -->
     <block type="sensor_sound"></block>
-    <!-- <block type="sensor_hp203" m-show='micropython:esp32s3:mixgo_sant'></block> -->
+    <block type="sensor_hp203" m-show='micropython:esp32s3:mixgo_soar'></block>
-    <block type="sensor_aht11"></block>
+    <block type="sensor_aht11" m-hide='micropython:esp32s3:mixgo_soar'></block>
     <block type="sensor_get_acceleration"></block>
-    <block type="sensor_mixgo_cc_mmc5603_calibrate_compass"></block>
+    <block type="sensor_mixgo_cc_mmc5603_calibrate_compass" m-hide='micropython:esp32s3:mixgo_soar'></block>
-    <block type="sensor_mixgo_cc_mmc5603_get_magnetic"></block>
+    <block type="sensor_mixgo_cc_mmc5603_get_magnetic" m-hide='micropython:esp32s3:mixgo_soar'></block>
-    <block type="sensor_mixgo_cc_mmc5603_get_angle"></block>
+    <block type="sensor_mixgo_cc_mmc5603_get_angle" m-hide='micropython:esp32s3:mixgo_soar'></block>
+
     <block type="rfid_status" m-hide='micropython:esp32s3:mixgo_sant'></block>
     <block type="rfid_readid" m-hide='micropython:esp32s3:mixgo_sant'></block>
     <block type="rfid_readcontent" m-hide='micropython:esp32s3:mixgo_sant'>
@@ -1771,22 +1773,22 @@
     </block>
     <block type="actuator_onboard_neopixel_write">
     </block>
-    <block type="set_power_output" m-show="micropython:esp32s3:mixgo_sant">
+    <block type="set_power_output" m-show="micropython:esp32s3:mixgo_sant micropython:esp32s3:mixgo_soar">
       <value name="duty">
         <shadow type="math_number">
           <field name="NUM">100</field>
         </shadow>
       </value>
     </block>
-    <block type="set_all_power_output" m-show="micropython:esp32s3:mixgo_sant">
+    <block type="set_all_power_output" m-show="micropython:esp32s3:mixgo_sant micropython:esp32s3:mixgo_soar">
       <value name="duty">
         <shadow type="math_number">
           <field name="NUM">20000</field>
         </shadow>
       </value>
     </block>
-    <block type="get_keyboard_light" m-show="micropython:esp32s3:mixgo_sant"></block>
+    <block type="get_keyboard_light" m-show="micropython:esp32s3:mixgo_sant micropython:esp32s3:mixgo_soar"></block>
-    <block type="analog_keyboard_input" m-show="micropython:esp32s3:mixgo_sant">
+    <block type="analog_keyboard_input" m-show="micropython:esp32s3:mixgo_sant micropython:esp32s3:mixgo_soar">
       <value name="special">
         <block type="special_key">
         </block>
@@ -1796,14 +1798,14 @@
         </block>
       </value>
     </block>
-    <block type="general_key_tuple" m-show="micropython:esp32s3:mixgo_sant">
+    <block type="general_key_tuple" m-show="micropython:esp32s3:mixgo_sant micropython:esp32s3:mixgo_soar">
       <value name="general">
         <block type="general_key">
         </block>
       </value>
     </block>
 
-    <block type="analog_mouse_input" m-show="micropython:esp32s3:mixgo_sant">
+    <block type="analog_mouse_input" m-show="micropython:esp32s3:mixgo_sant micropython:esp32s3:mixgo_soar">
       <value name="key">
         <block type="mouse_key">
         </block>
@@ -1821,7 +1823,7 @@
         </shadow>
       </value>
     </block>
-    <block type="analog_keyboard_str" m-show="micropython:esp32s3:mixgo_sant">
+    <block type="analog_keyboard_str" m-show="micropython:esp32s3:mixgo_sant micropython:esp32s3:mixgo_soar">
       <value name="str">
         <shadow type="text">
           <field name="TEXT">Hello, Mixly!</field>

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';
 })();

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 = '光照传感器';
 })(); 

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 = '光照傳感器';
 })();