Merge 97e3120fd4 into bc8e63833a

meshtastic/admin.proto

@@ -9,6 +9,7 @@ import "meshtastic/connection_status.proto";
 import "meshtastic/device_ui.proto";
 import "meshtastic/mesh.proto";
 import "meshtastic/module_config.proto";
+import "meshtastic/telemetry.proto";
 
 option csharp_namespace = "Meshtastic.Protobufs";
 option go_package = "github.com/meshtastic/go/generated";
@@ -666,6 +667,16 @@ message SensorConfig {
    * SCD30 CO2 Sensor configuration
    */
   SCD30_config scd30_config = 3;
+
+  /*
+   * SFA30 HCHO Sensor configuration
+   */
+  SFA30_config sfa30_config = 4;
+
+  /*
+   * PMSA003I HCHO Sensor configuration
+   */
+  PMSA003I_config pmsa003i_config = 5;
 }
 
 message SCD4X_config {
@@ -703,6 +714,11 @@ message SCD4X_config {
    * Power mode for sensor (true for low power, false for normal)
    */
   optional bool set_power_mode = 7;
+
+  /*
+   * Disables for SCD4X
+   */
+  optional SCD4XDisables scd4xdisables = 8;
 }
 
 message SEN5X_config {
@@ -715,6 +731,11 @@ message SEN5X_config {
    * One-shot mode (true for low power - one-shot mode, false for normal - continuous mode)
    */
   optional bool set_one_shot_mode = 2;
+
+  /*
+   * Disables for SEN5X
+   */
+  optional SEN5XDisables sen5xdisables = 3;
 }
 
 message SCD30_config {
@@ -747,4 +768,23 @@ message SCD30_config {
    * Perform a factory reset of the sensor
    */
   optional bool soft_reset = 6;
+
+  /*
+   * Disables for SCD30
+   */
+  optional SCD30Disables scd30disables = 7;
+}
+
+message SFA30_config {
+  /*
+   * Disables for SFA30
+   */
+  optional SFA30Disables sfa30disables = 1;
+}
+
+message PMSA003I_config {
+  /*
+   * Disables for PMSA003I
+   */
+  optional PMSA003IDisables pmsa003idisables = 3;
 }

meshtastic/module_config.proto

@@ -3,6 +3,7 @@ syntax = "proto3";
 package meshtastic;
 
 import "meshtastic/atak.proto";
+import "meshtastic/telemetry.proto";
 
 option csharp_namespace = "Meshtastic.Protobufs";
 option go_package = "github.com/meshtastic/go/generated";
@@ -707,6 +708,11 @@ message ModuleConfig {
      * Enable/Disable the air quality telemetry measurement module on-device display
      */
     bool air_quality_screen_enabled = 15;
+
+    /*
+     * Enable/Disable sensors to save airtime
+     */
+    SensorDisables sensordisables = 16;
   }
 
   /*

meshtastic/telemetry.proto

@@ -917,3 +917,123 @@ message SEN5XState {
    */
   optional fixed64 voc_state_array = 6;
 }
+
+/*
+ * Sensor disables
+ */
+message SensorDisables {
+  /*
+   * PMSA003I disables
+   */
+  optional PMSA003IDisables pmsa003i = 1;
+
+  /*
+   * SEN5X disables
+   */
+  optional SEN5XDisables sen5x = 2;
+
+  /*
+   * SCD30 disables
+   */
+  optional SCD30Disables scd30 = 3;
+
+  /*
+   * SCD4X disables
+   */
+  optional SCD4XDisables scd4x = 4;
+
+  /*
+   * SFA30 disables
+   */
+  optional SFA30Disables sfa30 = 5;
+}
+
+/*
+ * PMSA003I disables, for saving to flash
+ */
+message PMSA003IDisables {
+  /*
+   * Toggle for enabling PM readings
+   */
+  optional bool disable_pm = 1;
+
+  /*
+   * Toggle for enabling PM environmental readings
+   */
+  optional bool disable_pm_env = 2;
+
+  /*
+   * Toggle for enabling PN readings
+   */
+  optional bool disable_pn = 3;
+}
+
+/*
+ * SEN5X disables, for saving to flash
+ */
+message SEN5XDisables {
+  /*
+   * Toggle for enabling PM readings
+   */
+  optional bool disable_pm = 1;
+
+  /*
+   * Toggle for enabling PN readings
+   */
+  optional bool disable_pn = 2;
+
+  /*
+   * Toggle for enabling T/RH readings
+   */
+  optional bool disable_trh = 3;
+
+  /*
+   * Toggle for enabling IDx readings
+   */
+  optional bool disable_idx = 4;
+}
+
+/*
+ * SCD30 disables, for saving to flash
+ */
+message SCD30Disables {
+  /*
+   * Toggle for enabling CO2 readings
+   */
+  optional bool disable_co2 = 1;
+
+  /*
+   * Toggle for enabling T/RH readings
+   */
+  optional bool disable_trh = 2;
+}
+
+/*
+ * SCD4X disables, for saving to flash
+ */
+message SCD4XDisables {
+  /*
+   * Toggle for enabling CO2 readings
+   */
+  optional bool disable_co2 = 1;
+
+  /*
+   * Toggle for enabling T/RH readings
+   */
+  optional bool disable_trh = 2;
+}
+
+/*
+ * SFA30 disables, for saving to flash
+ */
+message SFA30Disables {
+  /*
+   * Toggle for enabling HCHO readings
+   */
+  optional bool disable_hcho = 1;
+
+  /*
+   * Toggle for enabling T/RH readings
+   */
+  optional bool disable_trh = 2;
+}