From c41a2b2d2b3836eefafb63838c30197e421c1ac7 Mon Sep 17 00:00:00 2001
From: Irene-Maxine <114802521+Irene-Maxine@users.noreply.github.com>
Date: Thu, 21 Nov 2024 10:02:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=9A=E5=BE=AE=E6=B3=A2=E9=9B=B7=E8=BE=BECBR817?=
 =?UTF-8?q?=E3=80=81actuator?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../micropython/blocks/sensor_extern.js       |  4 ++--
 .../micropython_esp32/template.xml            | 20 +++++++++----------
 .../micropython_esp32c2/template.xml          | 20 +++++++++----------
 .../micropython_esp32c3/template.xml          | 20 +++++++++----------
 .../micropython_esp32s2/template.xml          | 20 +++++++++----------
 .../micropython_esp32s3/template.xml          | 20 +++++++++----------
 6 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/boards/default_src/micropython/blocks/sensor_extern.js b/boards/default_src/micropython/blocks/sensor_extern.js
index 5d91932b..c1106ddd 100644
--- a/boards/default_src/micropython/blocks/sensor_extern.js
+++ b/boards/default_src/micropython/blocks/sensor_extern.js
@@ -371,7 +371,7 @@ export const radar_set_DETECTION_THRESHOLD = {
     init: function () {
         this.setColour(SENSOR_EXTERN_HUE);
         this.appendValueInput('SUB')
-            .appendField(Blockly.Msg.MIXLY_RADAR)
+            .appendField(Blockly.Msg.MIXLY_RADAR+'CBR817')
             .setCheck("var");
         this.appendDummyInput("")
             .appendField(Blockly.Msg.LISTS_SET_INDEX_SET + Blockly.Msg.MIXlY_INTERACTION)
@@ -392,7 +392,7 @@ export const interaction_whether_to_interaction = {
     init:function(){
         this.setColour(SENSOR_EXTERN_HUE); 
         this.appendValueInput('SUB')
-            .appendField(Blockly.Msg.MIXLY_RADAR)
+            .appendField(Blockly.Msg.MIXLY_RADAR+'CBR817')
             .setCheck("var");
         this.appendDummyInput("")
             .appendField(Blockly.Msg.MIXLY_GET_TO_INTERACTION)
diff --git a/boards/default_src/micropython_esp32/template.xml b/boards/default_src/micropython_esp32/template.xml
index f917bd41..132e4b51 100644
--- a/boards/default_src/micropython_esp32/template.xml
+++ b/boards/default_src/micropython_esp32/template.xml
@@ -4439,7 +4439,7 @@
         <block type="actuator_use_uart_init">
           <value name="SUB">
             <shadow type="variables_get">
-              <field name="VAR">tts</field>
+              <field name="VAR">actuator</field>
             </shadow>
           </value>
         </block>
@@ -4448,7 +4448,7 @@
     <block type="syn6288_set_voice">
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">tts</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
       <value name="VOICE">
@@ -4458,14 +4458,14 @@
     <block type="syn6288_get_voice">
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">tts</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
     </block>
     <block type="syn6288_builtin_voice">
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">tts</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
       <value name="VOICE">
@@ -4475,7 +4475,7 @@
     <block type="syn6288_tts_play">
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">tts</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
       <value name="data">
@@ -4490,21 +4490,21 @@
     <block type="player_whether_stop">
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">player</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
     </block>
     <block type="player_set_play">
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">player</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
     </block>
     <block type="player_set_volume">
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">player</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
       <value name="volume">
@@ -4516,14 +4516,14 @@
     <block type="player_set_mode">
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">player</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
     </block>
     <block type="player_play_music">
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">player</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
       <value name="song">
diff --git a/boards/default_src/micropython_esp32c2/template.xml b/boards/default_src/micropython_esp32c2/template.xml
index 54635cea..825784e5 100644
--- a/boards/default_src/micropython_esp32c2/template.xml
+++ b/boards/default_src/micropython_esp32c2/template.xml
@@ -4296,7 +4296,7 @@
         <block type="actuator_use_uart_init">
           <value name="SUB">
             <shadow type="variables_get">
-              <field name="VAR">tts</field>
+              <field name="VAR">actuator</field>
             </shadow>
           </value>
         </block>
@@ -4305,7 +4305,7 @@
     <block type="syn6288_set_voice" m-hide='micropython:esp32c3:mixgocar_c3'>
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">tts</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
       <value name="VOICE">
@@ -4315,14 +4315,14 @@
     <block type="syn6288_get_voice" m-hide='micropython:esp32c3:mixgocar_c3'>
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">tts</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
     </block>
     <block type="syn6288_builtin_voice" m-hide='micropython:esp32c3:mixgocar_c3'>
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">tts</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
       <value name="VOICE">
@@ -4332,7 +4332,7 @@
     <block type="syn6288_tts_play" m-hide='micropython:esp32c3:mixgocar_c3'>
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">tts</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
       <value name="data">
@@ -4347,21 +4347,21 @@
     <block type="player_whether_stop">
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">player</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
     </block>
     <block type="player_set_play">
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">player</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
     </block>
     <block type="player_set_volume">
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">player</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
       <value name="volume">
@@ -4373,14 +4373,14 @@
     <block type="player_set_mode">
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">player</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
     </block>
     <block type="player_play_music">
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">player</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
       <value name="song">
diff --git a/boards/default_src/micropython_esp32c3/template.xml b/boards/default_src/micropython_esp32c3/template.xml
index a8ab1908..31e633ce 100644
--- a/boards/default_src/micropython_esp32c3/template.xml
+++ b/boards/default_src/micropython_esp32c3/template.xml
@@ -4248,7 +4248,7 @@
         <block type="actuator_use_uart_init">
           <value name="SUB">
             <shadow type="variables_get">
-              <field name="VAR">tts</field>
+              <field name="VAR">actuator</field>
             </shadow>
           </value>
         </block>
@@ -4257,7 +4257,7 @@
     <block type="syn6288_set_voice" m-hide='micropython:esp32c3:mixgocar_c3'>
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">tts</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
       <value name="VOICE">
@@ -4267,14 +4267,14 @@
     <block type="syn6288_get_voice" m-hide='micropython:esp32c3:mixgocar_c3'>
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">tts</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
     </block>
     <block type="syn6288_builtin_voice" m-hide='micropython:esp32c3:mixgocar_c3'>
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">tts</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
       <value name="VOICE">
@@ -4284,7 +4284,7 @@
     <block type="syn6288_tts_play" m-hide='micropython:esp32c3:mixgocar_c3'>
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">tts</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
       <value name="data">
@@ -4299,21 +4299,21 @@
     <block type="player_whether_stop">
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">player</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
     </block>
     <block type="player_set_play">
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">player</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
     </block>
     <block type="player_set_volume">
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">player</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
       <value name="volume">
@@ -4325,14 +4325,14 @@
     <block type="player_set_mode">
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">player</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
     </block>
     <block type="player_play_music">
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">player</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
       <value name="song">
diff --git a/boards/default_src/micropython_esp32s2/template.xml b/boards/default_src/micropython_esp32s2/template.xml
index 9605b28d..0d7cdab9 100644
--- a/boards/default_src/micropython_esp32s2/template.xml
+++ b/boards/default_src/micropython_esp32s2/template.xml
@@ -4031,7 +4031,7 @@
         <block type="actuator_use_uart_init">
           <value name="SUB">
             <shadow type="variables_get">
-              <field name="VAR">tts</field>
+              <field name="VAR">actuator</field>
             </shadow>
           </value>
         </block>
@@ -4040,7 +4040,7 @@
     <block type="syn6288_set_voice">
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">tts</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
       <value name="VOICE">
@@ -4050,14 +4050,14 @@
     <block type="syn6288_get_voice">
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">tts</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
     </block>
     <block type="syn6288_builtin_voice">
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">tts</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
       <value name="VOICE">
@@ -4067,7 +4067,7 @@
     <block type="syn6288_tts_play">
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">tts</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
       <value name="data">
@@ -4082,21 +4082,21 @@
     <block type="player_whether_stop">
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">player</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
     </block>
     <block type="player_set_play">
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">player</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
     </block>
     <block type="player_set_volume">
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">player</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
       <value name="volume">
@@ -4108,14 +4108,14 @@
     <block type="player_set_mode">
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">player</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
     </block>
     <block type="player_play_music">
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">player</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
       <value name="song">
diff --git a/boards/default_src/micropython_esp32s3/template.xml b/boards/default_src/micropython_esp32s3/template.xml
index a0debccf..7e20c310 100644
--- a/boards/default_src/micropython_esp32s3/template.xml
+++ b/boards/default_src/micropython_esp32s3/template.xml
@@ -4670,7 +4670,7 @@
         <block type="actuator_use_uart_init">
           <value name="SUB">
             <shadow type="variables_get">
-              <field name="VAR">tts</field>
+              <field name="VAR">actuator</field>
             </shadow>
           </value>
         </block>
@@ -4679,7 +4679,7 @@
     <block type="syn6288_set_voice">
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">tts</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
       <value name="VOICE">
@@ -4689,14 +4689,14 @@
     <block type="syn6288_get_voice">
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">tts</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
     </block>
     <block type="syn6288_builtin_voice">
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">tts</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
       <value name="VOICE">
@@ -4706,7 +4706,7 @@
     <block type="syn6288_tts_play">
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">tts</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
       <value name="data">
@@ -4721,21 +4721,21 @@
     <block type="player_whether_stop">
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">player</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
     </block>
     <block type="player_set_play">
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">player</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
     </block>
     <block type="player_set_volume">
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">player</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
       <value name="volume">
@@ -4747,14 +4747,14 @@
     <block type="player_set_mode">
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">player</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
     </block>
     <block type="player_play_music">
       <value name="SUB">
         <shadow type="variables_get">
-          <field name="VAR">player</field>
+          <field name="VAR">actuator</field>
         </shadow>
       </value>
       <value name="song">