调整S3_generic,增加外接TVOC传感器

boards/default_src/micropython/blocks/sensor_extern.js

@@ -1782,7 +1782,8 @@ export const sensor_use_uart_init = {
             .appendField(Blockly.Msg.MIXLY_SETUP + Blockly.Msg.LISTS_SET_INDEX_INPUT_TO)
             .appendField(new Blockly.FieldDropdown([
                 [Blockly.Msg.MIXLY_PM25_SENSOR, "PM"],
-                [Blockly.Msg.MIXLY_GNSS_SENSOR, "GNSS"]
+                [Blockly.Msg.MIXLY_GNSS_SENSOR, "GNSS"],
+                [Blockly.Msg.MIXLY_TVOC_CO2_SENSOR, "TVOC"]
             ]), "sensor");
         this.setInputsInline(true);
         this.setPreviousStatement(true, null);
@@ -1851,6 +1852,19 @@ export const gnss_get_data = {
     }
 };
 
+export const tvoc_get_data = {
+    init: function () {
+        this.setColour(SENSOR_EXTERN_HUE);
+        this.appendValueInput('SUB')
+            .appendField(Blockly.Msg.MIXLY_TVOC_CO2_SENSOR)
+            .setCheck("var");
+        this.appendDummyInput("")
+            .appendField(Blockly.Msg.MIXLY_TVOC_CO2_SENSOR_GRT_DATA)
+        this.setOutput(true, Number);
+        this.setInputsInline(true);
+    }
+};
+
 //mixbot/feiyi extern below:
 export const robot_button_extern_get_value = {
     init: function () {

boards/default_src/micropython/generators/sensor_extern.js

@@ -719,10 +719,13 @@ export const sensor_use_uart_init = function (_, generator) {
     var code = ''
     if (s == 'PM') {
         generator.definitions_['import_pm2_5'] = 'import pm2_5';
-        code = v + '=pm2_5.PM2_5(' + key + ')\n';
+        code = v + '= pm2_5.PM2_5(' + key + ')\n';
     } else if (s == 'GNSS') {
         generator.definitions_['import_gnss'] = 'import gnss';
-        code = v + '=gnss.NMEA0183(' + key + ')\n';
+        code = v + '= gnss.NMEA0183(' + key + ')\n';
+    } else if (s == 'TVOC'){
+        generator.definitions_['import_tvoc07s'] = 'import tvoc07s';
+        code = v + '= tvoc07s.TVOC(' + key + ')\n';
     }
     return code;
 }
@@ -750,6 +753,13 @@ export const gnss_have_data = function (_, generator) {
     return [code, generator.ORDER_ATOMIC];
 }
 
+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()';
+    return [code, generator.ORDER_ATOMIC];
+}
+
 //mixbot/feiyi extern below:
 export const robot_button_extern_get_value = function (_, generator) {
     var version = Boards.getSelectedBoardKey().split(':')[2]

boards/default_src/micropython_esp32s3/template.xml

@@ -2585,7 +2585,7 @@
     </block>
     <block type="interaction_whether_to_interaction_SANT"></block>
   </category>
-  <category id="catIot" colour="#2FAD7A" m-hide='micropython:esp32s3:generic'>
+  <category id="catIot" colour="#2FAD7A">
     <category id="catMixIO" colour="#526FC3">
       <block type="iot_wifi_connect">
         <value name="WIFINAME">
@@ -3102,7 +3102,7 @@
       </block>
     </category>
   </category>
-  <category id="catGroup" colour="140" m-hide='micropython:esp32s3:generic'>
+  <category id="catGroup" colour="140">
     <category id="catBLE" colour="140">
       <block type="communicate_bluetooth_central_init">
         <value name="VAR">
@@ -3893,7 +3893,7 @@
       </block>
     </category>
   </category>
-  <category id="catExternSensor" colour='#A58C5B' m-hide='micropython:esp32s3:generic'>
+  <category id="catExternSensor" colour='#A58C5B'>
     <block type="communicate_i2c_init">
       <value name="SUB">
         <shadow type="variables_get">
@@ -4462,6 +4462,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">
@@ -4559,7 +4566,7 @@
     </block>
 
   </category>
-  <category id="catExternActuator" colour='#74A55B' m-hide='micropython:esp32s3:generic'>
+  <category id="catExternActuator" colour='#74A55B'>
     <block type="esp32_music_pitch_init">
       <value name="SUB">
         <shadow type="variables_get">
@@ -4994,7 +5001,7 @@
     </block>
     <block type="nova_g1_spk_en"></block>
   </category>
-  <category id="catExternMonitor" colour='5BA5A5' m-hide='micropython:esp32s3:generic'>
+  <category id="catExternMonitor" colour='5BA5A5'>
     <category id="catMatrix" colour='5BA5A5'>
       <block type="communicate_i2c_init">
         <value name="SUB">
@@ -6003,7 +6010,7 @@
       </block>
     </category>
   </category>
-  <category id="catAIsensor" colour="#90A244" m-hide='micropython:esp32s3:generic'>
+  <category id="catAIsensor" colour="#90A244">
     <block type="serial_softserial_new">
       <value name="RX">
         <shadow type="pins_digital_pin">
@@ -6422,7 +6429,7 @@
       </value>
     </block>
   </category>
-  <category id="catAIsensor2" colour="#90A244" m-hide='micropython:esp32s3:generic'>
+  <category id="catAIsensor2" colour="#90A244">
     <block type="serial_softserial_new">
       <value name="RX">
         <shadow type="pins_digital_pin">
@@ -6788,7 +6795,7 @@
       </value>
     </block>
   </category>
-  <category id="catFile" colour="0" m-hide='micropython:esp32s3:generic'>
+  <category id="catFile" colour="0">
     <block type="sdcard_use_spi_init">
       <value name="SPISUB">
         <block type="communicate_spi_onboard"></block>
@@ -6954,7 +6961,7 @@
     </block>
   </category>
 
-  <category id="catNetwork" colour="225" m-hide='micropython:esp32s3:generic'>
+  <category id="catNetwork" colour="225">
     <block type="iot_wifi_connect">
       <value name="WIFINAME">
         <shadow type="text">
@@ -7328,7 +7335,7 @@
     </block>
     <block type="urequests_response"></block> -->
   </category>
-  <category id="catCommunicate" colour="#3288dd" m-hide='micropython:esp32s3:generic'>
+  <category id="catCommunicate" colour="#3288dd">
     <block type="variables_set">
       <field name="VAR">response</field>
       <value name="VALUE">

common/msg/blockly/en.js

@@ -3967,4 +3967,6 @@ 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)';
 })();

common/msg/blockly/zh-hans.js

@@ -4126,4 +4126,6 @@ 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)';
 })();

common/msg/blockly/zh-hant.js

@@ -4121,4 +4121,6 @@ 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)';
+})();