18069996051/mixly3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TVOC传感器修改

Browse Source
This commit is contained in:
Irene-Maxine
2025-09-06 15:45:45 +08:00
parent 44113b436e
commit 3d8bcb254d
9 changed files with 55 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
boards/default_src/micropython/blocks/sensor_extern.js
View File

@@ -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);
}

6
boards/default_src/micropython/generators/sensor_extern.js
View File

@@ -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];
}

7
boards/default_src/micropython_esp32/template.xml
View File

@@ -4298,6 +4298,13 @@
</shadow>
</value>
</block>
<block type="tvoc_get_data">
<value name="SUB">
<shadow type="variables_get">
<field name="VAR">zsensor</field>
</shadow>
</value>
</block>
<block type="sensor_weigh_init">
<value name="SUB">
<shadow type="variables_get">

7
boards/default_src/micropython_esp32c2/template.xml
View File

@@ -4208,6 +4208,13 @@
</shadow>
</value>
</block>
<block type="tvoc_get_data">
<value name="SUB">
<shadow type="variables_get">
<field name="VAR">zsensor</field>
</shadow>
</value>
</block>
<block type="sensor_weigh_init">
<value name="SUB">
<shadow type="variables_get">

7
boards/default_src/micropython_esp32c3/template.xml
View File

@@ -4093,6 +4093,13 @@
</shadow>
</value>
</block>
<block type="tvoc_get_data">
<value name="SUB">
<shadow type="variables_get">
<field name="VAR">zsensor</field>
</shadow>
</value>
</block>
<block type="sensor_weigh_init">
<value name="SUB">
<shadow type="variables_get">

7
boards/default_src/micropython_esp32s2/template.xml
View File

@@ -3836,6 +3836,13 @@
</shadow>
</value>
</block>
<block type="tvoc_get_data">
<value name="SUB">
<shadow type="variables_get">
<field name="VAR">zsensor</field>
</shadow>
</value>
</block>
<block type="sensor_weigh_init">
<value name="SUB">
<shadow type="variables_get">

6
common/msg/blockly/en.js
View File

@@ -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';

6
common/msg/blockly/zh-hans.js
View File

@@ -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 = '图像文件编码数据';

6
common/msg/blockly/zh-hant.js
View File

@@ -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 = '圖像文件編碼數據';