From cab3df0d171428eb550b01698a124c61edc97f35 Mon Sep 17 00:00:00 2001
From: Irene-Maxine <114802521+Irene-Maxine@users.noreply.github.com>
Date: Tue, 19 Nov 2024 16:51:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=BF=E5=8D=A1=E8=A1=A5=E5=85=85=E9=A2=9C?=
=?UTF-8?q?=E8=89=B2=E5=92=8C=E6=B0=94=E5=8E=8B=E4=BC=A0=E6=84=9F=E5=99=A8?=
=?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9radar=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../micropython/blocks/sensor_extern.js | 11 ++++++----
.../micropython/generators/sensor_extern.js | 15 +++++--------
.../micropython_esp32/template.xml | 22 ++++++++++++++++++-
.../micropython_esp32c2/template.xml | 8 ++++++-
.../micropython_esp32c3/template.xml | 22 ++++++++++++++++++-
.../micropython_esp32s2/template.xml | 22 ++++++++++++++++++-
.../micropython_esp32s3/template.xml | 22 ++++++++++++++++++-
common/msg/blockly/en.js | 2 +-
common/msg/blockly/zh-hans.js | 2 +-
common/msg/blockly/zh-hant.js | 2 +-
10 files changed, 106 insertions(+), 22 deletions(-)
diff --git a/boards/default_src/micropython/blocks/sensor_extern.js b/boards/default_src/micropython/blocks/sensor_extern.js
index 09d5b6d3..5d91932b 100644
--- a/boards/default_src/micropython/blocks/sensor_extern.js
+++ b/boards/default_src/micropython/blocks/sensor_extern.js
@@ -341,8 +341,8 @@ export const sensor_use_i2c_init = {
this.appendDummyInput("")
.appendField(Blockly.Msg.MIXLY_SETUP + Blockly.Msg.LISTS_SET_INDEX_INPUT_TO)
.appendField(new Blockly.FieldDropdown([
- [Blockly.Msg.MIXLY_ESP32_EXTERN_LIGHT+"(LTR-308-ALS)", "LTR308"],
- [Blockly.Msg.MIXLY_COLOR_SENSOR+"(LTR-381-RGB)", "LTR381RGB"],
+ [Blockly.Msg.MIXLY_ESP32_EXTERN_LIGHT+"(LTR308ALS)", "LTR308"],
+ [Blockly.Msg.MIXLY_COLOR_SENSOR+"(LTR381RGB)", "LTR381RGB"],
[Blockly.Msg.MIXLY_COLOR_SENSOR+"(UCS12071)","UCS12071"],
[Blockly.Msg.MIXLY_EXTERN_LIGHTUV +"(LTR390UV)","LTR390UV"],
[Blockly.Msg.MIXLY_ALTITUDE_SENSOR+"(HP203X)", "HP203X"],
@@ -391,8 +391,11 @@ export const radar_set_DETECTION_THRESHOLD = {
export const interaction_whether_to_interaction = {
init:function(){
this.setColour(SENSOR_EXTERN_HUE);
+ this.appendValueInput('SUB')
+ .appendField(Blockly.Msg.MIXLY_RADAR)
+ .setCheck("var");
this.appendDummyInput("")
- .appendField(Blockly.Msg.MIXLY_RADAR + Blockly.Msg.MIXLY_GET_TO_INTERACTION)
+ .appendField(Blockly.Msg.MIXLY_GET_TO_INTERACTION)
this.setOutput(true);
this.setInputsInline(true);
}
@@ -442,7 +445,7 @@ export const sensor_LTR308_extern = {
init: function () {
this.setColour(SENSOR_EXTERN_HUE);
this.appendDummyInput()
- .appendField(Blockly.Msg.MIXLY_ESP32_EXTERN_LIGHT + " LTR308");
+ .appendField(Blockly.Msg.MIXLY_ESP32_EXTERN_LIGHT + " LTR308ALS");
this.appendValueInput('SUB')
//.appendField("BMP280")
.setCheck("var");
diff --git a/boards/default_src/micropython/generators/sensor_extern.js b/boards/default_src/micropython/generators/sensor_extern.js
index 95978eba..426cf758 100644
--- a/boards/default_src/micropython/generators/sensor_extern.js
+++ b/boards/default_src/micropython/generators/sensor_extern.js
@@ -222,19 +222,14 @@ export const sensor_use_i2c_init = function (_, generator) {
export const radar_set_DETECTION_THRESHOLD = function (_, generator) {
var sub = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
var value = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC);
- var key = this.getFieldValue('key');
- if(key=='threshold'){
- var code = sub + '.threshold(' + value +')\n';
- return code;
- }else if(key=='delay_ms'){
- var code = sub + '.delay_ms(' + value +')\n';
- return code;
- }
-
+ var value2 = generator.valueToCode(this, 'VAR2', generator.ORDER_ATOMIC);
+ var code = sub + '.threshold(' + value +')\n'+sub + '.delay_ms(' + value2 +')\n';
+ return code;
}
export const interaction_whether_to_interaction = function(_,generator){
- var code = 'radar.result()';
+ var sub = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
+ var code = sub+'.result()';
return [code,generator.ORDER_ATOMIC];
}
diff --git a/boards/default_src/micropython_esp32/template.xml b/boards/default_src/micropython_esp32/template.xml
index 6de15468..f917bd41 100644
--- a/boards/default_src/micropython_esp32/template.xml
+++ b/boards/default_src/micropython_esp32/template.xml
@@ -3759,6 +3759,13 @@
+
+
+
+ xsensor
+
+
+
@@ -3780,6 +3787,13 @@
+
+
+
+ xsensor
+
+
+
@@ -3825,7 +3839,13 @@
-
+
+
+
+ xsensor
+
+
+
diff --git a/boards/default_src/micropython_esp32c2/template.xml b/boards/default_src/micropython_esp32c2/template.xml
index 0f9b21ba..54635cea 100644
--- a/boards/default_src/micropython_esp32c2/template.xml
+++ b/boards/default_src/micropython_esp32c2/template.xml
@@ -3684,7 +3684,13 @@
-
+
+
+
+ xsensor
+
+
+
diff --git a/boards/default_src/micropython_esp32c3/template.xml b/boards/default_src/micropython_esp32c3/template.xml
index 5935d658..a8ab1908 100644
--- a/boards/default_src/micropython_esp32c3/template.xml
+++ b/boards/default_src/micropython_esp32c3/template.xml
@@ -3556,6 +3556,13 @@
+
+
+
+ xsensor
+
+
+
@@ -3577,6 +3584,13 @@
+
+
+
+ xsensor
+
+
+
@@ -3622,7 +3636,13 @@
-
+
+
+
+ xsensor
+
+
+
diff --git a/boards/default_src/micropython_esp32s2/template.xml b/boards/default_src/micropython_esp32s2/template.xml
index c65bf385..9605b28d 100644
--- a/boards/default_src/micropython_esp32s2/template.xml
+++ b/boards/default_src/micropython_esp32s2/template.xml
@@ -3352,6 +3352,13 @@
+
+
+
+ xsensor
+
+
+
@@ -3373,6 +3380,13 @@
+
+
+
+ xsensor
+
+
+
@@ -3418,7 +3432,13 @@
-
+
+
+
+ xsensor
+
+
+
diff --git a/boards/default_src/micropython_esp32s3/template.xml b/boards/default_src/micropython_esp32s3/template.xml
index 67c72b55..a0debccf 100644
--- a/boards/default_src/micropython_esp32s3/template.xml
+++ b/boards/default_src/micropython_esp32s3/template.xml
@@ -3991,6 +3991,13 @@
+
+
+
+ xsensor
+
+
+
@@ -4012,6 +4019,13 @@
+
+
+
+ xsensor
+
+
+
@@ -4057,7 +4071,13 @@
-
+
+
+
+ xsensor
+
+
+
diff --git a/common/msg/blockly/en.js b/common/msg/blockly/en.js
index b5ac29ff..7ab1cfa2 100644
--- a/common/msg/blockly/en.js
+++ b/common/msg/blockly/en.js
@@ -1120,7 +1120,7 @@ En.MIXLY_RTCSETTIME = 'Set time';
En.MIXLY_RTCSETDATE = 'Set date ';
En.MIXLY_GET = 'get';
En.MIXLY_SYSTEM = 'system';
-En.MIXLY_ADXL345 = 'Acceleration_ADXL345';
+En.MIXLY_ADXL345 = 'Acceleration sensor ADXL345';
En.MIXLY_ADXL345_XA = 'X-axis angle';
En.MIXLY_ADXL345_YA = 'Y-axis angle';
En.MIXLY_ADXL345_ZA = 'Z-axis angle';
diff --git a/common/msg/blockly/zh-hans.js b/common/msg/blockly/zh-hans.js
index fe631ac0..3f768015 100644
--- a/common/msg/blockly/zh-hans.js
+++ b/common/msg/blockly/zh-hans.js
@@ -1133,7 +1133,7 @@ ZhHans.MIXLY_RTCSETTIME = '设置时间';
ZhHans.MIXLY_RTCSETDATE = '设置日期';
ZhHans.MIXLY_GET = '获取';
ZhHans.MIXLY_SYSTEM = '系统';
-ZhHans.MIXLY_ADXL345 = 'ADXL345重力传感器';
+ZhHans.MIXLY_ADXL345 = '加速度传感器 ADXL345';
ZhHans.MIXLY_ADXL345_X = 'X轴加速度';
ZhHans.MIXLY_ADXL345_Y = 'Y轴加速度';
ZhHans.MIXLY_ADXL345_Z = 'Z轴加速度';
diff --git a/common/msg/blockly/zh-hant.js b/common/msg/blockly/zh-hant.js
index ff45bcc7..e5c2aa13 100644
--- a/common/msg/blockly/zh-hant.js
+++ b/common/msg/blockly/zh-hant.js
@@ -1120,7 +1120,7 @@ ZhHant.MIXLY_RTCSETTIME = '設置時間：';
ZhHant.MIXLY_RTCSETDATE = '設置日期：';
ZhHant.MIXLY_GET = '獲取';
ZhHant.MIXLY_SYSTEM = '系統';
-ZhHant.MIXLY_ADXL345 = 'ADXL345重力感測器';
+ZhHant.MIXLY_ADXL345 = '加速度傳感器 ADXL345';
ZhHant.MIXLY_ADXL345_X = 'X軸加速度';
ZhHant.MIXLY_ADXL345_Y = 'Y軸加速度';
ZhHant.MIXLY_ADXL345_Z = 'Z軸加速度';