From ee20f4db50de354d1fc99887f97059aeb13ba1bc Mon Sep 17 00:00:00 2001
From: Irene-Maxine <114802521+Irene-Maxine@users.noreply.github.com>
Date: Thu, 9 Jan 2025 14:03:26 +0800
Subject: [PATCH] =?UTF-8?q?mixgo=5Fsant=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 boards/default_src/micropython/blocks/sensor_extern.js    | 4 ++--
 .../default_src/micropython/generators/sensor_extern.js   | 8 +++++---
 boards/default_src/micropython_esp32s3/template.xml       | 4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/boards/default_src/micropython/blocks/sensor_extern.js b/boards/default_src/micropython/blocks/sensor_extern.js
index 68a7da67..aaf690df 100644
--- a/boards/default_src/micropython/blocks/sensor_extern.js
+++ b/boards/default_src/micropython/blocks/sensor_extern.js
@@ -393,7 +393,7 @@ export const radar_set_DETECTION_THRESHOLD_SANT = {
     init: function () {
         this.setColour(SENSOR_EXTERN_HUE);
         this.appendDummyInput("")
-            .appendField(Blockly.Msg.MIXLY_RADAR+'CBR817')
+            .appendField(Blockly.Msg.MIXLY_RADAR)
             .appendField(Blockly.Msg.LISTS_SET_INDEX_SET + Blockly.Msg.MIXlY_INTERACTION)
         this.appendValueInput('VAR')
             .appendField(Blockly.Msg.MIXLY_DETECTION_THRESHOLD);
@@ -425,7 +425,7 @@ export const interaction_whether_to_interaction_SANT = {
     init:function(){
         this.setColour(SENSOR_EXTERN_HUE); 
         this.appendDummyInput("")
-            .appendField(Blockly.Msg.MIXLY_RADAR+'CBR817')
+            .appendField(Blockly.Msg.MIXLY_RADAR)
             .appendField(Blockly.Msg.MIXLY_GET_TO_INTERACTION)
         this.setOutput(true);
         this.setInputsInline(true);
diff --git a/boards/default_src/micropython/generators/sensor_extern.js b/boards/default_src/micropython/generators/sensor_extern.js
index c18850bc..d454733a 100644
--- a/boards/default_src/micropython/generators/sensor_extern.js
+++ b/boards/default_src/micropython/generators/sensor_extern.js
@@ -233,10 +233,10 @@ export const radar_set_DETECTION_THRESHOLD = function (_, generator) {
 
 export const radar_set_DETECTION_THRESHOLD_SANT = function (_, generator) {
     var version = Boards.getSelectedBoardKey().split(':')[2];
-    generator.definitions_['import_'+version +'_ext.mmw'] = 'from '+ version +' import ext.mmw';
+    generator.definitions_['import_'+version +'_ext_mmw'] = 'from '+ version +' import ext_mmw';
     var value = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC);
     var value2 = generator.valueToCode(this, 'VAR2', generator.ORDER_ATOMIC);
-    var code = 'ext.mmw.threshold(' + value +')\n'+ 'ext.mmw.delay_ms(' + value2 +')\n';
+    var code = 'ext_mmw.threshold(' + value +')\n'+ 'ext.mmw.delay_ms(' + value2 +')\n';
     return code;
 }
 
@@ -248,7 +248,9 @@ export const interaction_whether_to_interaction = function(_,generator){
 }
 
 export const interaction_whether_to_interaction_SANT = function(_,generator){
-    var code = 'ext.mmw.result()';
+    var version = Boards.getSelectedBoardKey().split(':')[2];
+    generator.definitions_['import_'+version +'_ext_mmw'] = 'from '+ version +' import ext_mmw';
+    var code = 'ext_mmw.result()';
     return [code,generator.ORDER_ATOMIC];
 }
 
diff --git a/boards/default_src/micropython_esp32s3/template.xml b/boards/default_src/micropython_esp32s3/template.xml
index 78225027..896b8cc1 100644
--- a/boards/default_src/micropython_esp32s3/template.xml
+++ b/boards/default_src/micropython_esp32s3/template.xml
@@ -1415,7 +1415,7 @@
     </block>
     <block type="sensor_mixgoce_pin_pressed">
       <value name="button">
-        <shadow type="number6">
+        <shadow type="number7">
         </shadow>
       </value>
     </block>
@@ -1569,7 +1569,7 @@
         </shadow>
       </value>
     </block>
-    <block type="actuator_mixgo_zero_led_color" m-show='micropython:esp32s3:mixgo_sant'>
+    <block type="actuator_mixgo_zero_led_color" m-hide='micropython:esp32s3:mixgo_sant'>
       <value name="led">
         <shadow type="number">
         </shadow>