Merge branch 'master' into feat/sen5x-state-proto

meshtastic/config.proto

@@ -108,6 +108,14 @@ message Config {
        *    consuming hops.
        */
       ROUTER_LATE = 11;
+
+      /*
+       * Description: Treats packets from or to favorited nodes as ROUTER, and all other packets as CLIENT.
+       * Technical Details: Used for stronger attic/roof nodes to distribute messages more widely
+       *    from weaker, indoor, or less-well-positioned nodes. Recommended for users with multiple nodes
+       *    where one CLIENT_BASE acts as a more powerful base station, such as an attic/roof node.
+       */
+      CLIENT_BASE = 12;
     }
 
     /*
@@ -666,14 +674,14 @@ message Config {
       OLED_SH1106 = 2;
 
       /*
-       * Can not be auto detected but set by proto. Used for 128x128 screens
+       * Can not be auto detected but set by proto. Used for 128x64 screens
        */
       OLED_SH1107 = 3;
 
       /*
-       * Can not be auto detected but set by proto. Used for 128x64 screens
+       * Can not be auto detected but set by proto. Used for 128x128 screens
        */
-      OLED_SH1107_128_64 = 4;
+      OLED_SH1107_128_128 = 4;
     }
 
     /*

meshtastic/device_ui.proto

@@ -314,6 +314,11 @@ enum Language {
    */
   BULGARIAN = 17;
 
+  /*
+   * Czech
+   */
+  CZECH = 18;
+
   /*
    * Simplified Chinese (experimental)
    */

meshtastic/mesh.proto

@@ -780,6 +780,16 @@ enum HardwareModel {
    */
   HELTEC_MESH_SOLAR = 108;
 
+  /*
+   * Lilygo T-Echo Lite
+   */
+  T_ECHO_LITE = 109;
+
+  /*
+   * New Heltec LoRA32 with ESP32-S3 CPU
+   */
+  HELTEC_V4 = 110;
+
   /*
    * ------------------------------------------------------------------------------------------------------------------------------------------
    * Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits.
@@ -1272,6 +1282,51 @@ message MeshPacket {
     DELAYED_DIRECT = 2;
   }
 
+  /*
+   * Enum to identify which transport mechanism this packet arrived over
+   */
+  enum TransportMechanism {
+    /*
+     * The default case is that the node generated a packet itself
+     */
+    TRANSPORT_INTERNAL = 0;
+
+    /*
+     * Arrived via the primary LoRa radio
+     */
+    TRANSPORT_LORA = 1;
+
+    /*
+     * Arrived via a secondary LoRa radio
+     */
+    TRANSPORT_LORA_ALT1 = 2;
+
+    /*
+     * Arrived via a tertiary LoRa radio
+     */
+    TRANSPORT_LORA_ALT2 = 3;
+
+    /*
+     * Arrived via a quaternary LoRa radio
+     */
+    TRANSPORT_LORA_ALT3 = 4;
+
+    /*
+     * Arrived via an MQTT connection
+     */
+    TRANSPORT_MQTT = 5;
+
+    /*
+     * Arrived via Multicast UDP
+     */
+    TRANSPORT_MULTICAST_UDP = 6;
+
+    /*
+     * Arrived via API connection
+     */
+    TRANSPORT_API = 7;
+  }
+
   /*
    * The sending node number.
    * Note: Our crypto implementation uses this field as well.
@@ -1419,6 +1474,11 @@ message MeshPacket {
    * Set by the firmware internally, clients are not supposed to set this.
    */
   uint32 tx_after = 20;
+
+  /*
+   * Indicates which transport mechanism this packet arrived over
+   */
+  TransportMechanism transport_mechanism = 21;
 }
 
 /*
@@ -2251,7 +2311,12 @@ enum ExcludedModules {
  * A heartbeat message is sent to the node from the client to keep the connection alive.
  * This is currently only needed to keep serial connections alive, but can be used by any PhoneAPI.
  */
-message Heartbeat {}
+message Heartbeat {
+  /*
+   * The nonce of the heartbeat message
+   */
+  uint32 nonce = 1;
+}
 
 /*
  * RemoteHardwarePins associated with a node

meshtastic/module_config.proto

@@ -530,6 +530,12 @@ message ModuleConfig {
      * ESP32 Only
      */
     bool save = 3;
+
+    /*
+     * Bool indicating that the node should cleanup / destroy it's RangeTest.csv file.
+     * ESP32 Only
+     */
+    bool clear_on_reboot = 4;
   }
 
   /*

meshtastic/telemetry.proto

@@ -781,6 +781,10 @@ enum TelemetrySensorType {
    * SEN5X PM SENSORS
    */
   SEN5X = 43;
+  /*
+   * TSL2561 light sensor
+   */
+  TSL2561 = 44;
 }
 
 /*