admin/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">