From 3d8bcb254d78bebd8f05ca3bb934ed0916f2b1ef Mon Sep 17 00:00:00 2001
From: Irene-Maxine <114802521+Irene-Maxine@users.noreply.github.com>
Date: Sat, 6 Sep 2025 15:45:45 +0800
Subject: [PATCH] =?UTF-8?q?TVOC=E4=BC=A0=E6=84=9F=E5=99=A8=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../default_src/micropython/blocks/sensor_extern.js | 13 ++++++++++---
.../micropython/generators/sensor_extern.js | 6 +++++-
boards/default_src/micropython_esp32/template.xml | 7 +++++++
boards/default_src/micropython_esp32c2/template.xml | 7 +++++++
boards/default_src/micropython_esp32c3/template.xml | 7 +++++++
boards/default_src/micropython_esp32s2/template.xml | 7 +++++++
common/msg/blockly/en.js | 6 ++++--
common/msg/blockly/zh-hans.js | 6 ++++--
common/msg/blockly/zh-hant.js | 6 ++++--
9 files changed, 55 insertions(+), 10 deletions(-)
diff --git a/boards/default_src/micropython/blocks/sensor_extern.js b/boards/default_src/micropython/blocks/sensor_extern.js
index 8eac321a..ad8f8cd6 100644
--- a/boards/default_src/micropython/blocks/sensor_extern.js
+++ b/boards/default_src/micropython/blocks/sensor_extern.js
@@ -371,12 +371,13 @@ export const sensor_use_i2c_init = {
[Blockly.Msg.MixGo_MPU9250 + "(ADXL345)", "ADXL345"],
["RFID", "RFID"],
[Blockly.Msg.MIXLY_RADAR_SENSOR + "(CBR817)", "CBR817"],
- [Blockly.Msg.MIXLY_AipSpeech_asr + "(CI130X)", "CI130X"]
+ [Blockly.Msg.MIXLY_AipSpeech_asr + "(CI130X)", "CI130X"],
+ [Blockly.Msg.MIXLY_TVOC_CO2_SENSOR + "(AGS10)","AGS10" ]
]), "key");
this.setInputsInline(true);
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
- this.setFieldValue("LTR308", "key");
+
}
};
@@ -1859,7 +1860,13 @@ export const tvoc_get_data = {
.appendField(Blockly.Msg.MIXLY_TVOC_CO2_SENSOR)
.setCheck("var");
this.appendDummyInput("")
- .appendField(Blockly.Msg.MIXLY_TVOC_CO2_SENSOR_GRT_DATA)
+ .appendField(Blockly.Msg.MIXLY_GET)
+ .appendField(new Blockly.FieldDropdown([
+ [Blockly.Msg.MIXLY_TVOC_CO2_SENSOR_GRT_DATA1,"[0]"],
+ [Blockly.Msg.MIXLY_TVOC_CO2_SENSOR_GRT_DATA2,"[1]"],
+ [Blockly.Msg.MIXLY_TVOC_CO2_SENSOR_GRT_DATA3,"[2]"],
+ [Blockly.Msg.MIXLY_TVOC_CO2_SENSOR_GRT_DATA1+"、"+Blockly.Msg.MIXLY_TVOC_CO2_SENSOR_GRT_DATA2+"、"+Blockly.Msg.MIXLY_TVOC_CO2_SENSOR_GRT_DATA3 , ""]
+ ]),"key")
this.setOutput(true, Number);
this.setInputsInline(true);
}
diff --git a/boards/default_src/micropython/generators/sensor_extern.js b/boards/default_src/micropython/generators/sensor_extern.js
index c05d6fc1..5b0f9040 100644
--- a/boards/default_src/micropython/generators/sensor_extern.js
+++ b/boards/default_src/micropython/generators/sensor_extern.js
@@ -221,6 +221,9 @@ export const sensor_use_i2c_init = function (_, generator) {
} else if (key == 'MS5611') {
generator.definitions_['import_ms5611'] = 'import ms5611';
code = v + ' = ms5611.MS5611(' + iv + ')\n';
+ }else if (key == 'AGS10'){
+ generator.definitions_['import_ags10'] = 'import ags10';
+ code = v + ' = ags10.AGS10(' + iv + ')\n';
}
return code;
}
@@ -756,7 +759,8 @@ export const gnss_have_data = function (_, generator) {
export const tvoc_get_data = function (_, generator) {
var sub = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
generator.definitions_['import_tvoc07s'] = 'import tvoc07s';
- var code = sub + '.read()';
+ var key = this.getFieldValue('key');
+ var code = sub + '.read()'+key;
return [code, generator.ORDER_ATOMIC];
}
diff --git a/boards/default_src/micropython_esp32/template.xml b/boards/default_src/micropython_esp32/template.xml
index e56c986a..36b15f0d 100644
--- a/boards/default_src/micropython_esp32/template.xml
+++ b/boards/default_src/micropython_esp32/template.xml
@@ -4298,6 +4298,13 @@
+
+
+
+ zsensor
+
+
+
diff --git a/boards/default_src/micropython_esp32c2/template.xml b/boards/default_src/micropython_esp32c2/template.xml
index 2bccf846..c3132a87 100644
--- a/boards/default_src/micropython_esp32c2/template.xml
+++ b/boards/default_src/micropython_esp32c2/template.xml
@@ -4208,6 +4208,13 @@
+
+
+
+ zsensor
+
+
+
diff --git a/boards/default_src/micropython_esp32c3/template.xml b/boards/default_src/micropython_esp32c3/template.xml
index 5de24548..66dbd688 100644
--- a/boards/default_src/micropython_esp32c3/template.xml
+++ b/boards/default_src/micropython_esp32c3/template.xml
@@ -4093,6 +4093,13 @@
+
+
+
+ zsensor
+
+
+
diff --git a/boards/default_src/micropython_esp32s2/template.xml b/boards/default_src/micropython_esp32s2/template.xml
index 85e83232..91157fce 100644
--- a/boards/default_src/micropython_esp32s2/template.xml
+++ b/boards/default_src/micropython_esp32s2/template.xml
@@ -3836,6 +3836,13 @@
+
+
+
+ zsensor
+
+
+
diff --git a/common/msg/blockly/en.js b/common/msg/blockly/en.js
index 41a02e65..cdcdac05 100644
--- a/common/msg/blockly/en.js
+++ b/common/msg/blockly/en.js
@@ -3966,8 +3966,10 @@ En.MIXLY_DETAILED = 'Detailed';
En.MIXLY_line_tube_foot = 'line tube foot';
En.MIXLY_column_tube_foot = 'column tube foot';
En.MIXLY_DEFINE_KEYBOARDS= 'define the keyboard';
-En.MIXLY_TVOC_CO2_SENSOR = 'TVOC,formaldehyde and carbon dioxide sensors';
-En.MIXLY_TVOC_CO2_SENSOR_GRT_DATA = 'Obtain the concentrations of TVOC(mg/m³), formaldehyde (mg/m³), and carbon dioxide (ppm)';
+En.MIXLY_TVOC_CO2_SENSOR = 'TVOC sensor';
+En.MIXLY_TVOC_CO2_SENSOR_GRT_DATA1 = 'TVOC(mg/m³)';
+En.MIXLY_TVOC_CO2_SENSOR_GRT_DATA2 = 'formaldehyde (mg/m³)';
+En.MIXLY_TVOC_CO2_SENSOR_GRT_DATA3 = 'carbon dioxide (ppm)';
En.MIXLY_IMAGE_ACQUISITION = 'image acquisition';
En.MIXLY_JPG_base64_CODE= "JPG's base64 code";
En.MIXLY_IMAGE_OF_FILE = 'code data of image file';
diff --git a/common/msg/blockly/zh-hans.js b/common/msg/blockly/zh-hans.js
index 9ec8bfe0..d15f443c 100644
--- a/common/msg/blockly/zh-hans.js
+++ b/common/msg/blockly/zh-hans.js
@@ -4125,8 +4125,10 @@ ZhHans.MIXLY_DETAILED = '详细地';
ZhHans.MIXLY_line_tube_foot = '行管脚';
ZhHans.MIXLY_column_tube_foot = '列管脚';
ZhHans.MIXLY_DEFINE_KEYBOARDS= '定义键盘';
-ZhHans.MIXLY_TVOC_CO2_SENSOR = 'TVOC、甲醛、二氧化碳传感器';
-ZhHans.MIXLY_TVOC_CO2_SENSOR_GRT_DATA = '获取TVOC(mg/m3) 、甲醛(mg/m3)、二氧化碳的浓度(ppm)';
+ZhHans.MIXLY_TVOC_CO2_SENSOR = 'TVOC传感器';
+ZhHans.MIXLY_TVOC_CO2_SENSOR_GRT_DATA1 = 'TVOC浓度(mg/m3)';
+ZhHans.MIXLY_TVOC_CO2_SENSOR_GRT_DATA2 = '甲醛浓度(mg/m3)';
+ZhHans.MIXLY_TVOC_CO2_SENSOR_GRT_DATA3 = '二氧化碳浓度(ppm)';
ZhHans.MIXLY_IMAGE_ACQUISITION = '图像采集';
ZhHans.MIXLY_JPG_base64_CODE= 'JPG的base64编码';
ZhHans.MIXLY_IMAGE_OF_FILE = '图像文件编码数据';
diff --git a/common/msg/blockly/zh-hant.js b/common/msg/blockly/zh-hant.js
index bc5af6c8..846b81e5 100644
--- a/common/msg/blockly/zh-hant.js
+++ b/common/msg/blockly/zh-hant.js
@@ -4120,8 +4120,10 @@ ZhHant.MIXLY_DETAILED = '詳細地';
ZhHant.MIXLY_line_tube_foot = '行管腳';
ZhHant.MIXLY_column_tube_foot = '列管腳';
ZhHant.MIXLY_DEFINE_KEYBOARDS= '定義鍵盤';
-ZhHant.MIXLY_TVOC_CO2_SENSOR = 'TVOC、甲醛、二氧化碳傳感器';
-ZhHant.MIXLY_TVOC_CO2_SENSOR_GRT_DATA = '獲取TVOC(mg/m3) 、甲醛(mg/m3)、二氧化碳的濃度(ppm)';
+ZhHant.MIXLY_TVOC_CO2_SENSOR = 'TVOC傳感器';
+ZhHant.MIXLY_TVOC_CO2_SENSOR_GRT_DATA1 = 'TVOC濃度(mg/m3)';
+ZhHant.MIXLY_TVOC_CO2_SENSOR_GRT_DATA2 = '甲醛濃度(mg/m3)';
+ZhHant.MIXLY_TVOC_CO2_SENSOR_GRT_DATA3 = '二氧化碳濃度(ppm)';
ZhHant.MIXLY_IMAGE_ACQUISITION = '圖像採集';
ZhHant.MIXLY_JPG_base64_CODE= 'JPG的base64編碼';
ZhHant.MIXLY_IMAGE_OF_FILE = '圖像文件編碼數據';