Merge branch 'meshtastic:master' into router-infill

meshtastic/mesh.proto

@@ -664,6 +664,14 @@ enum HardwareModel {
    */
   ROUTASTIC = 85;
 
+  /*
+   * Mesh-Tab, esp32 based
+   * https://github.com/valzzu/Mesh-Tab
+   */
+  MESH_TAB = 86;
+
+
+
   /*
    * ------------------------------------------------------------------------------------------------------------------------------------------
    * 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.
@@ -1087,6 +1095,11 @@ message MeshPacket {
      */ 
     HIGH = 100;
 
+    /*
+     * Higher priority alert message used for critical alerts which take priority over other reliable packets.
+     */ 
+    ALERT = 110;
+
     /*
      * Ack/naks are sent with very high priority to ensure that retransmission
      * stops as soon as possible
@@ -2073,4 +2086,4 @@ message ChunkedPayloadResponse {
      */
     resend_chunks resend_chunks = 4;
   }
-}
+}

meshtastic/portnums.proto

@@ -105,6 +105,11 @@ enum PortNum {
    */
   DETECTION_SENSOR_APP = 10;
 
+  /*
+   * Same as Text Message but used for critical alerts.
+   */
+  ALERT_APP = 11;
+
   /*
    * Provides a 'ping' service that replies to any packet it receives.
    * Also serves as a small example module.

meshtastic/telemetry.proto

@@ -536,6 +536,11 @@ enum TelemetrySensorType {
    * ClimateGuard RadSens, radiation, Geiger-Muller Tube
    */
   RADSENS = 33;
+
+  /*
+   * High accuracy current and voltage
+   */
+  INA226 = 34;
 
 }