From 6d9f2f1ca6ccbc4a871ef45e8c6e9def379f3fb7 Mon Sep 17 00:00:00 2001
From: Irene-Maxine <114802521+Irene-Maxine@users.noreply.github.com>
Date: Tue, 27 May 2025 09:02:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E5=BC=BA=20?=
 =?UTF-8?q?=E5=85=89=E5=BC=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../micropython_esp32s3/template.xml          | 236 +-----------------
 common/msg/blockly/en.js                      |   2 +-
 common/msg/blockly/zh-hans.js                 |   2 +-
 common/msg/blockly/zh-hant.js                 |   2 +-
 4 files changed, 7 insertions(+), 235 deletions(-)

diff --git a/boards/default_src/micropython_esp32s3/template.xml b/boards/default_src/micropython_esp32s3/template.xml
index 6cdd7d82..55a89db3 100644
--- a/boards/default_src/micropython_esp32s3/template.xml
+++ b/boards/default_src/micropython_esp32s3/template.xml
@@ -1436,9 +1436,9 @@
     <block type="sensor_mixgo_touch_slide"></block>
     <!-- <block type="sensor_mixgo_pin_near" m-show='micropython:esp32s3:mixgo_sant'></block> -->
     <block type="sensor_mixgo_nova_pin_near"></block>
-    <block type="sensor_mixgo_LTR308" m-show='micropython:esp32s3:mixgo_sant'></block>
-    <block type="sensor_mixgo_nova_LTR308" m-show='micropython:esp32s3:mixgo_nova'></block>
-    <block type="sensor_mixgo_sant_color" m-show='micropython:esp32s3:mixgo_sant'></block>
+    <!-- <block type="sensor_mixgo_LTR308" m-show='micropython:esp32s3:mixgo_sant'></block> -->
+    <block type="sensor_mixgo_nova_LTR308" ></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_aht11"></block>
@@ -2346,7 +2346,7 @@
       <block type="CI130X_SET_SYSTEM_CMD_SANT" m-show='micropython:esp32s3:mixgo_sant'></block>
     </category>
   </category> 
-  <category id="catSANT_G2" colour="40" m-show='micropython:esp32s3:mixgo_sant'>
+  <category id="catSANT_G3" colour="40" m-show='micropython:esp32s3:mixgo_sant'>
     <block type="rfid_status"></block>
     <block type="rfid_readid"></block>
     <block type="rfid_readcontent">
@@ -2383,132 +2383,6 @@
     <block type="interaction_whether_to_interaction_SANT"></block>
   </category>
   <category id="catIot" colour="#2FAD7A">
-    <category id="catBlynk" colour="#2FAD7A">
-      <block type="iot_wifi_connect">
-        <value name="WIFINAME">
-          <shadow type="text">
-            <field name="TEXT">wifiname</field>
-          </shadow>
-        </value>
-        <value name="PASSWORD">
-          <shadow type="text">
-            <field name="TEXT">wifipassword</field>
-          </shadow>
-        </value>
-      </block>
-      <block type="mpython_blynk_setup">
-        <value name="server">
-          <shadow type="text">
-            <field name="TEXT"></field>
-          </shadow>
-        </value>
-        <value name="port">
-          <shadow type="math_number">
-            <field name="NUM">8080</field>
-          </shadow>
-        </value>
-        <value name="auth">
-          <shadow type="text">
-            <field name="TEXT">AUTH TOKEN</field>
-          </shadow>
-        </value>
-      </block>
-      <block type="mpython_blynk_app_data">
-        <value name="virtual_pin">
-          <shadow type="math_number">
-            <field name="NUM">0</field>
-          </shadow>
-        </value>
-        <value name="virtual_pin_val">
-          <block type="variables_get">
-            <field name="VAR">_value</field>
-          </block>
-        </value>
-        <statement name="DO">
-        </statement>
-      </block>
-      <block type="mpython_blynktimer">
-        <value name="Num">
-          <shadow type="math_number">
-            <field name="NUM">0</field>
-          </shadow>
-        </value>
-        <value name="period">
-          <shadow type="math_number">
-            <field name="NUM">2</field>
-          </shadow>
-        </value>
-      </block>
-      <block type="mpython_blynk_get_timers"></block>
-      <block type="mpython_blynk_stop_timers">
-        <value name="timer_num">
-          <shadow type="math_number">
-            <field name="NUM">0</field>
-          </shadow>
-        </value>
-      </block>
-      <block type="mpython_blynk_run"></block>
-      <block type="mpython_blynktimer_run"></block>
-      <block type="mpython_blynk_sensor_data_to_app">
-        <value name="sensor_data">
-          <shadow type="math_number">
-            <field name="NUM">0</field>
-          </shadow>
-        </value>
-        <value name="virtual_pin">
-          <shadow type="math_number">
-            <field name="NUM">0</field>
-          </shadow>
-        </value>
-      </block>
-      <block type="mpython_blynk_app_notify">
-        <value name="notification">
-          <shadow type="text">
-            <field name="TEXT">notify</field>
-          </shadow>
-        </value>
-      </block>
-      <block type="mpython_blynk_on_connected">
-      </block>
-      <block type="mpython_blynk_on_disconnected">
-      </block>
-      <block type="mpython_blynk_sync_virtual">
-        <value name="virtual_pin">
-          <shadow type="math_number">
-            <field name="NUM">0</field>
-          </shadow>
-        </value>
-      </block>
-      <block type="mpython_blynk_email">
-        <value name="TargetEmail">
-          <shadow type="text">
-            <field name="TEXT">Your Target Email</field>
-          </shadow>
-        </value>
-        <value name="subject">
-          <shadow type="text">
-            <field name="TEXT">subject</field>
-          </shadow>
-        </value>
-        <value name="body">
-          <shadow type="text">
-            <field name="TEXT">body</field>
-          </shadow>
-        </value>
-      </block>
-      <block type="mpython_blynk_set_property">
-        <value name="attribute_name">
-          <shadow type="text">
-            <field name="TEXT">color</field>
-          </shadow>
-        </value>
-        <value name="attribute_value">
-          <shadow type="text">
-            <field name="TEXT">#FF0000</field>
-          </shadow>
-        </value>
-      </block>
-    </category>
     <category id="catMixIO" colour="#526FC3">
       <block type="iot_wifi_connect">
         <value name="WIFINAME">
@@ -3321,108 +3195,6 @@
         </value>
       </block>
     </category>
-    <category id="catIR" colour="140">
-      <block type="communicate_ir_recv_init">
-        <value name="PIN">
-          <shadow type="pins_digital_pin">
-            <field name="PIN">16</field>
-          </shadow>
-        </value>
-        <value name="SUB">
-          <shadow type="factory_block_return">
-            <field name="VALUE"></field>
-          </shadow>
-        </value>
-      </block>
-      <block type="internal_variable"></block>
-      <block type="recv_fun"></block>
-      <block type="ir_whether_recv"></block>
-      <block type="ir_recv_timeout">
-        <value name="time">
-          <shadow type="math_number">
-            <field name="NUM">20000</field>
-          </shadow>
-        </value>
-      </block>
-      <block type="communicate_ir_send_init">
-        <value name="PIN">
-          <shadow type="pins_digital_pin">
-            <field name="PIN">21</field>
-          </shadow>
-        </value>
-        <value name="power">
-          <shadow type="math_number">
-            <field name="NUM">100</field>
-          </shadow>
-        </value>
-      </block>
-      <block type="ir_transmit_conventional_data">
-        <value name="cmd">
-          <shadow type="math_number">
-            <field name="NUM">0</field>
-          </shadow>
-        </value>
-        <value name="addr">
-          <shadow type="math_number">
-            <field name="NUM">0</field>
-          </shadow>
-        </value>
-        <value name="toggle">
-          <shadow type="math_number">
-            <field name="NUM">0</field>
-          </shadow>
-        </value>
-      </block>
-      <block type="ir_transmit_study_code">
-        <value name="LIST">
-          <shadow type="list_many_input">
-            <field name="CONTENT">9000,4500,563,563</field>
-          </shadow>
-        </value>
-      </block>
-      <block type="ir_transmit_raw_code">
-        <value name="raw">
-          <shadow type="math_number">
-            <field name="NUM">0x1234</field>
-          </shadow>
-        </value>
-      </block>
-      <block type="ir_transmit_busy"></block>
-      <block type="procedures_defnoreturn">
-        <mutation>
-          <arg name="cmd"></arg>
-          <arg name="addr"></arg>
-          <arg name="raw"></arg>
-          <arg name="pulses"></arg>
-        </mutation>
-        <field name="NAME">callback</field>
-        <statement name="STACK">
-          <block type="system_print_many">
-            <mutation items="4"></mutation>
-            <value name="ADD0">
-              <block type="variables_get">
-                <field name="VAR">cmd</field>
-              </block>
-            </value>
-            <value name="ADD1">
-              <block type="variables_get">
-                <field name="VAR">addr</field>
-              </block>
-            </value>
-            <value name="ADD2">
-              <block type="variables_get">
-                <field name="VAR">raw</field>
-              </block>
-            </value>
-            <value name="ADD3">
-              <block type="variables_get">
-                <field name="VAR">pulses</field>
-              </block>
-            </value>
-          </block>
-        </statement>
-      </block>
-    </category>
     <category id="catI2C" colour="140">
       <block type="communicate_i2c_onboard"></block>
       <block type="communicate_i2c_init">
diff --git a/common/msg/blockly/en.js b/common/msg/blockly/en.js
index ea1995ce..893c30be 100644
--- a/common/msg/blockly/en.js
+++ b/common/msg/blockly/en.js
@@ -35,7 +35,7 @@ En.MSG = {
     catCC_G1:"CC G1",
     catMINI_G2:"MINI G2",
     catMINI_G5:"MINI G5",
-    catSANT_G2:"SANT G2",
+    catSANT_G3:"SANT G3",
     catNova_G1:"Nova G1",
     catAIOT:"Intelligent IOT",
     catAIsensor:"MixGoAI Sensor",
diff --git a/common/msg/blockly/zh-hans.js b/common/msg/blockly/zh-hans.js
index 064fc412..21c6ca43 100644
--- a/common/msg/blockly/zh-hans.js
+++ b/common/msg/blockly/zh-hans.js
@@ -34,7 +34,7 @@ ZhHans.MSG = {
     catCC_G1:"CC G1",
     catMINI_G2:"MINI G2",
     catMINI_G5:"MINI G5",
-    catSANT_G2:"SANT G2",
+    catSANT_G3:"SANT G3",
     catNova_G1:"Nova G1",
     catAIOT:"智能物联",
     catAIsensor:"MixGoAI智能传感",
diff --git a/common/msg/blockly/zh-hant.js b/common/msg/blockly/zh-hant.js
index d15aa2dc..ee495693 100644
--- a/common/msg/blockly/zh-hant.js
+++ b/common/msg/blockly/zh-hant.js
@@ -34,7 +34,7 @@ ZhHant.MSG = {
     catCC_G1:"CC G1",
     catMINI_G2:"MINI G2",
     catMINI_G5:"MINI G5",
-    catSANT_G2:"SANT G2",
+    catSANT_G3:"SANT G3",
     catNova_G1:"Nova G1",
     catAIOT:"智能物聯",
     catAIsensor:"MixGoAI智能感測",