From 01533d3fb8b47f3f3bf8d1b635a76efda3286f05 Mon Sep 17 00:00:00 2001
From: Irene-Maxine <114802521+Irene-Maxine@users.noreply.github.com>
Date: Tue, 30 Sep 2025 21:27:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=A3=9E=E7=BF=94=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

捉虫小修
---
 .../micropython/blocks/actuator_onboard.js    | 15 --------
 .../generators/actuator_onboard.js            | 36 +++++++++---------
 .../micropython/generators/display_onboard.js |  2 +-
 .../micropython/generators/sensor_onboard.js  |  4 +-
 .../micropython_esp32/template.xml            | 12 ------
 .../micropython_esp32c2/template.xml          |  2 +-
 .../micropython_esp32c3/template.xml          |  2 +-
 .../micropython_esp32s2/template.xml          |  6 ---
 .../micropython_esp32s3/template.xml          | 38 +++++++++++++++----
 9 files changed, 53 insertions(+), 64 deletions(-)

diff --git a/boards/default_src/micropython/blocks/actuator_onboard.js b/boards/default_src/micropython/blocks/actuator_onboard.js
index bab24e23..8ff64710 100644
--- a/boards/default_src/micropython/blocks/actuator_onboard.js
+++ b/boards/default_src/micropython/blocks/actuator_onboard.js
@@ -61,21 +61,6 @@ export const actuator_get_led_bright = {
     }
 };
 
-export const actuator_get_led_onoff = {
-    init: function () {
-        this.setColour(ACTUATOR_ONBOARD_HUE);
-        this.appendDummyInput()
-            .appendField(Blockly.Msg.MIXLY_MICROBIT_PY_STORAGE_GET);
-        this.appendValueInput('led')
-            .appendField(Blockly.Msg.MIXLY_BUILDIN_LED)
-        this.appendDummyInput()
-            .appendField(Blockly.Msg.MIXLY_PULSEIN_STAT)
-        this.setOutput(true);
-        this.setInputsInline(true);
-        this.setTooltip(Blockly.Msg.MIXLY_ESP32_LED_GETONOFF);
-    }
-};
-
 export const actuator_get_led_state = {
     init: function () {
         this.setColour(ACTUATOR_ONBOARD_HUE);
diff --git a/boards/default_src/micropython/generators/actuator_onboard.js b/boards/default_src/micropython/generators/actuator_onboard.js
index e325388c..7346adf3 100644
--- a/boards/default_src/micropython/generators/actuator_onboard.js
+++ b/boards/default_src/micropython/generators/actuator_onboard.js
@@ -34,6 +34,9 @@ export const esp32_onboard_music_pitch_with_time = function (block, 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.pitch_time(' + number_pitch + ', ' + number_time + ')\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.pitch_time(' + number_pitch + ', ' + number_time + ')\n';
     } else {
         generator.definitions_['import_' + version + '_onboard_music'] = 'from ' + version + ' import onboard_music';
         var code = 'onboard_music.pitch_time(' + number_pitch + ', ' + number_time + ')\n';
@@ -120,24 +123,6 @@ export const actuator_get_led_bright = function (_, generator) {
     return [code, generator.ORDER_ATOMIC];
 }
 
-export const actuator_get_led_onoff = function (_, generator) {
-    var version = Boards.getSelectedBoardKey().split(':')[2]
-    var op = generator.valueToCode(this, 'led', generator.ORDER_ATOMIC);
-    if (version == 'mixgo'){
-        if(op == 1){
-            generator.definitions_['import_' + version + 'led1'] = 'from ' + version + ' import led1';
-            var code = "led1.getonoff()";
-        }else if (op == 2){
-            generator.definitions_['import_' + version + 'led2'] = 'from ' + version + ' import led2';
-            var code = "led2.getonff()";
-        }
-    }else{
-        generator.definitions_['import_' + version + '_onboard_led'] = 'from ' + version + ' import onboard_led';
-        var code = "onboard_led.getonoff(" + op + ")";
-    }
-    return [code, generator.ORDER_ATOMIC];
-}
-
 export const actuator_get_led_state = function (_, generator) {
     var version = Boards.getSelectedBoardKey().split(':')[2]
     var op = generator.valueToCode(this, 'led', generator.ORDER_ATOMIC);
@@ -386,10 +371,11 @@ export const actuator_mixgo_nova_mic_set = function (_, generator) {
     var version = Boards.getSelectedBoardKey().split(':')[2]
     if (version == 'mixgo_zero') {
         generator.definitions_['import_mixgo_zero_voice_ob_code'] = "from mixgo_zero_voice import ob_code";
+    } else if (version == 'mixgo_soar') {
+        generator.definitions_['import_mixgo_soar_voice_ob_code'] = "from mixgo_soar_voice import ob_code";
     } else {
         generator.definitions_['import_mixgo_nova_voice_ob_code'] = "from mixgo_nova_voice import ob_code";
     }
-
     var bright = generator.valueToCode(this, 'bright', generator.ORDER_ATOMIC);
     var code = "ob_code.mic_volume(" + bright + ")\n";
     return code;
@@ -399,6 +385,8 @@ export const actuator_mixgo_nova_mic_get = function (_, generator) {
     var version = Boards.getSelectedBoardKey().split(':')[2]
     if (version == 'mixgo_zero') {
         generator.definitions_['import_mixgo_zero_voice_ob_code'] = "from mixgo_zero_voice import ob_code";
+    } else if (version == 'mixgo_soar') {
+        generator.definitions_['import_mixgo_soar_voice_ob_code'] = "from mixgo_soar_voice import ob_code";
     } else {
         generator.definitions_['import_mixgo_nova_voice_ob_code'] = "from mixgo_nova_voice import ob_code";
     }
@@ -411,6 +399,8 @@ export const actuator_mixgo_nova_voice_set = function (_, generator) {
     var version = Boards.getSelectedBoardKey().split(':')[2]
     if (version == 'mixgo_zero') {
         generator.definitions_['import_mixgo_zero_voice_ob_code'] = "from mixgo_zero_voice import ob_code";
+    } else if (version == 'mixgo_soar') {
+        generator.definitions_['import_mixgo_soar_voice_ob_code'] = "from mixgo_soar_voice import ob_code";
     } else {
         generator.definitions_['import_mixgo_nova_voice_ob_code'] = "from mixgo_nova_voice import ob_code";
     }
@@ -423,6 +413,8 @@ export const actuator_mixgo_nova_voice_get = function (_, generator) {
     var version = Boards.getSelectedBoardKey().split(':')[2]
     if (version == 'mixgo_zero') {
         generator.definitions_['import_mixgo_zero_voice_ob_code'] = "from mixgo_zero_voice import ob_code";
+    } else if (version == 'mixgo_soar') {
+        generator.definitions_['import_mixgo_soar_voice_ob_code'] = "from mixgo_soar_voice import ob_code";
     } else {
         generator.definitions_['import_mixgo_nova_voice_ob_code'] = "from mixgo_nova_voice import ob_code";
     }
@@ -434,6 +426,8 @@ export const actuator_mixgo_nova_record_audio = function (_, generator) {
     var version = Boards.getSelectedBoardKey().split(':')[2]
     if (version == 'mixgo_zero') {
         generator.definitions_['import_mixgo_zero_voice_record_audio'] = "from mixgo_zero_voice import record_audio";
+    } else if (version == 'mixgo_soar') {
+        generator.definitions_['import_mixgo_soar_voice_record_audio'] = "from mixgo_soar_voice import record_audio";
     } else {
         generator.definitions_['import_mixgo_nova_voice_record_audio'] = "from mixgo_nova_voice import record_audio";
     }
@@ -447,6 +441,8 @@ export const actuator_mixgo_nova_play_audio = function (_, generator) {
     var version = Boards.getSelectedBoardKey().split(':')[2]
     if (version == 'mixgo_zero') {
         generator.definitions_['import_mixgo_zero_voice_play_audio'] = "from mixgo_zero_voice import play_audio";
+    } else if (version == 'mixgo_soar') {
+        generator.definitions_['import_mixgo_soar_voice_play_audio'] = "from mixgo_soar_voice import play_audio";
     } else {
         generator.definitions_['import_mixgo_nova_voice_play_audio'] = "from mixgo_nova_voice import play_audio";
     }
@@ -459,6 +455,8 @@ export const actuator_mixgo_nova_play_online_audio = function (_, generator) {
     var version = Boards.getSelectedBoardKey().split(':')[2];
     if (version == 'mixgo_zero') {
         generator.definitions_['import_mixgo_zero_voice_play_audio_url'] = "from mixgo_zero_voice import play_audio_url";
+    } else if (version == 'mixgo_soar') {
+        generator.definitions_['import_mixgo_soar_voice_play_audio_url'] = "from mixgo_soar_voice import play_audio_url";
     } else {
         generator.definitions_['import_mixgo_nova_voice_play_audio_url'] = "from mixgo_nova_voice import play_audio_url";
     }
diff --git a/boards/default_src/micropython/generators/display_onboard.js b/boards/default_src/micropython/generators/display_onboard.js
index 080a0ba7..34c220a9 100644
--- a/boards/default_src/micropython/generators/display_onboard.js
+++ b/boards/default_src/micropython/generators/display_onboard.js
@@ -25,7 +25,7 @@ export const display_show_image_or_string_delay = function (_, generator) {
     var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT);
     var space = generator.valueToCode(this, 'space', generator.ORDER_ASSIGNMENT);
     var op = this.getFieldValue('center');
-    if (version == "mixgo_sant" || version == "mixgo_nova") {
+    if (version == "mixgo_sant" || version == "mixgo_nova" || version == "mixgo_soar") {
         generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft";
         var s = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC) || 'True';
         var code = "onboard_tft.shows(" + data + ", space=" + space + ', center=' + op + ",sync="+ s +")\n";
diff --git a/boards/default_src/micropython/generators/sensor_onboard.js b/boards/default_src/micropython/generators/sensor_onboard.js
index 6a7d6182..9457ab3d 100644
--- a/boards/default_src/micropython/generators/sensor_onboard.js
+++ b/boards/default_src/micropython/generators/sensor_onboard.js
@@ -436,7 +436,7 @@ export const sensor_mpu9250_get_acceleration = function (_, generator) {
 export const sensor_mixgoce_pin_pressed = function (_, generator) {
     var version = Boards.getSelectedBoardKey().split(':')[2];
     var pin = generator.valueToCode(this, 'button', generator.ORDER_ATOMIC);
-    if (version === 'mixgo_mini' || version === 'mixgo_sant') {
+    if (version === 'mixgo_mini' || version === 'mixgo_sant' || version === 'mixgo_soar') {
         generator.definitions_['import_' + version + '_onboard_bot'] = 'from ' + version + ' import onboard_bot';
         var code = 'onboard_bot.touched(' + pin + ')';
     } else {
@@ -448,7 +448,7 @@ export const sensor_mixgoce_pin_pressed = function (_, generator) {
 
 export const sensor_mixgo_touch_slide = function (_, generator) {
     var version = Boards.getSelectedBoardKey().split(':')[2];
-    if (version === 'mixgo_mini' || version === 'mixgo_sant') {
+    if (version === 'mixgo_mini' || version === 'mixgo_sant' || version === 'mixgo_soar') {
         generator.definitions_['import_' + version + '_onboard_bot'] = 'from ' + version + ' import onboard_bot';
         var code = 'onboard_bot.touch_slide()';
     } else {
diff --git a/boards/default_src/micropython_esp32/template.xml b/boards/default_src/micropython_esp32/template.xml
index 2079e6a5..d3bf8f29 100644
--- a/boards/default_src/micropython_esp32/template.xml
+++ b/boards/default_src/micropython_esp32/template.xml
@@ -1569,18 +1569,6 @@
         </shadow>
       </value>
     </block>
-    <block type="actuator_get_led_bright" m-show='micropython:esp32:mixgo'>
-      <value name="led">
-        <shadow type="number">
-        </shadow>
-      </value>
-    </block>
-    <block type="actuator_get_led_onoff" m-show='micropython:esp32:mixgo'>
-      <value name="led">
-        <shadow type="number">
-        </shadow>
-      </value>
-    </block>
     <block type="esp32_onboard_music_pitch" m-hide='micropython:esp32:rm_e1'>
       <value name="pitch">
         <shadow type="pins_tone_notes">
diff --git a/boards/default_src/micropython_esp32c2/template.xml b/boards/default_src/micropython_esp32c2/template.xml
index 154537c2..64950e97 100644
--- a/boards/default_src/micropython_esp32c2/template.xml
+++ b/boards/default_src/micropython_esp32c2/template.xml
@@ -1585,7 +1585,7 @@
         </shadow>
       </value>
     </block>
-    <block type="actuator_get_led_onoff" m-show='micropython:esp32c2:mixgo_mini'>
+    <block type="actuator_get_led_state" m-show='micropython:esp32c2:mixgo_mini'>
       <value name="led">
         <shadow type="number">
         </shadow>
diff --git a/boards/default_src/micropython_esp32c3/template.xml b/boards/default_src/micropython_esp32c3/template.xml
index 8be7eb76..f9edb7b2 100644
--- a/boards/default_src/micropython_esp32c3/template.xml
+++ b/boards/default_src/micropython_esp32c3/template.xml
@@ -1569,7 +1569,7 @@
         </shadow>
       </value>
     </block>
-    <block type="actuator_get_led_onoff" m-show='micropython:esp32c3:mixgo_cc micropython:esp32c3:mixgo_me'>
+    <block type="actuator_get_led_state" m-show='micropython:esp32c3:mixgo_cc micropython:esp32c3:mixgo_me'>
       <value name="led">
         <shadow type="number">
         </shadow>
diff --git a/boards/default_src/micropython_esp32s2/template.xml b/boards/default_src/micropython_esp32s2/template.xml
index 1f24abe6..1db2e03b 100644
--- a/boards/default_src/micropython_esp32s2/template.xml
+++ b/boards/default_src/micropython_esp32s2/template.xml
@@ -1536,12 +1536,6 @@
         </shadow>
       </value>
     </block>
-    <block type="actuator_get_led_onoff" m-show='micropython:esp32s2:mixgo_ce'>
-      <value name="led">
-        <shadow type="number">
-        </shadow>
-      </value>
-    </block>
     <block type="esp32_onboard_music_pitch">
       <value name="pitch">
         <shadow type="pins_tone_notes">
diff --git a/boards/default_src/micropython_esp32s3/template.xml b/boards/default_src/micropython_esp32s3/template.xml
index 2a92d149..93fe5284 100644
--- a/boards/default_src/micropython_esp32s3/template.xml
+++ b/boards/default_src/micropython_esp32s3/template.xml
@@ -1577,12 +1577,6 @@
         </shadow>
       </value>
     </block>
-    <block type="actuator_get_led_onoff">
-      <value name="led">
-        <shadow type="number">
-        </shadow>
-      </value>
-    </block>
     <block type="actuator_mixgo_nova_mic_set" m-hide='micropython:esp32s3:mixgo_sant'>
       <value name="bright">
         <shadow type="math_number">
@@ -1683,7 +1677,7 @@
         </shadow>
       </value>
     </block>
-    <block type="set_music_volume">
+    <block type="set_music_volume" m-show='micropython:esp32s3:mixgo_sant'>
       <value name="percent">
         <shadow type="math_number">
           <field name="NUM">100</field>
@@ -2328,6 +2322,36 @@
         </shadow>
       </value>
     </block>
+    <block type="onboard_tft_clock_init" m-show="micropython:esp32s3:mixgo_soar">
+      <value name="SUB">
+        <shadow type="variables_get">
+          <field name="VAR">new_clock</field>
+        </shadow>
+      </value>
+      <value name="x">
+        <shadow type="math_number">
+          <field name="NUM">120</field>
+        </shadow>
+      </value>
+      <value name="y">
+        <shadow type="math_number">
+          <field name="NUM">120</field>
+        </shadow>
+      </value>
+      <value name="size">
+        <shadow type="math_number">
+          <field name="NUM">40</field>
+        </shadow>
+      </value>
+      <value name="VAR">
+        <block type="display_color_seclet">
+          <field name="COLOR">#ffffff</field>
+        </block>
+        <shadow type="tuple_create_with_text_return">
+          <field name="TEXT">255,255,0</field>
+        </shadow>
+      </value>
+    </block>
     <block type="onboard_tft_clock_get_rtctime">
       <value name="SUB">
         <shadow type="variables_get">