Merge branch 'master' into device-ui-languages

meshtastic/config.proto

@@ -126,6 +126,11 @@ message Config {
        * but takes it step further by also ignoring messages from nodenums not in the node's known list (NodeDB)
        */
       KNOWN_ONLY = 3;
+
+      /*
+       * Only permitted for SENSOR, TRACKER and TAK_TRACKER roles, this will inhibit all rebroadcasts, not unlike CLIENT_MUTE role.
+       */
+      NONE = 4;
     }
 
     /*

meshtastic/device_ui.options

@@ -1,5 +1,5 @@
 *DeviceUIConfig.screen_brightness int_size:8
 *DeviceUIConfig.screen_timeout int_size:16
 *NodeFilter.node_name max_size:16
-*NodeFilter.hopys_away int_size:8
+*NodeFilter.hops_away int_size:8
 *NodeHighlight.node_name max_size:16

meshtastic/device_ui.proto

@@ -4,7 +4,7 @@ package meshtastic;
 
 option csharp_namespace = "Meshtastic.Protobufs";
 option go_package = "github.com/meshtastic/go/generated";
-option java_outer_classname = "LocalOnlyProtos";
+option java_outer_classname = "DeviceUIProtos";
 option java_package = "com.geeksville.mesh";
 option swift_prefix = "";
 
@@ -184,4 +184,5 @@ enum Language {
    * Turkish
    */
   TURKISH = 9;
-  }
+}
+

meshtastic/telemetry.proto

@@ -228,6 +228,11 @@ message AirQualityMetrics {
    * 10.0um Particle Count
    */
   optional uint32 particles_100um = 12;
+  
+  /*
+   * 10.0um Particle Count
+   */
+  optional uint32 co2 = 13;
 }
 
 /*
@@ -512,9 +517,14 @@ enum TelemetrySensorType {
   MAX30102 = 30;
   
   /*
-   * MLX90614 non-contact IR temperature sensor.
+   * MLX90614 non-contact IR temperature sensor
    */
   MLX90614 = 31;
+  
+  /*
+   * SCD40/SCD41 CO2, humidity, temperature sensor
+   */
+  SCD4X = 32;
 }
 
 /*