Merge pull request #2 from meshtastic/master

[pull] master from meshtastic:master

meshtastic/admin.proto

@@ -162,6 +162,11 @@ message AdminMessage {
      * Traffic management module config
      */
     TRAFFICMANAGEMENT_CONFIG = 14;
+
+    /*
+     * TAK module config
+     */
+    TAK_CONFIG = 15;
   }
 
   enum BackupLocation {

meshtastic/config.proto

@@ -992,6 +992,23 @@ message Config {
       LONG_TURBO = 9;
     }
 
+    enum FEM_LNA_Mode {
+      /*
+       * FEM_LNA is present but disabled
+       */
+      DISABLED = 0;
+
+      /*
+       * FEM_LNA is present and enabled
+       */
+      ENABLED = 1;
+
+      /*
+       * FEM_LNA is not present on the device
+       */
+      NOT_PRESENT = 2;
+    }
+
     /*
      * When enabled, the `modem_preset` fields will be adhered to, else the `bandwidth`/`spread_factor`/`coding_rate`
      * will be taked from their respective manually defined fields
@@ -1112,6 +1129,10 @@ message Config {
      * Sets the ok_to_mqtt bit on outgoing packets
      */
     bool config_ok_to_mqtt = 105;
+    /*
+     * Set where LORA FEM is enabled, disabled, or not present
+     */
+    FEM_LNA_Mode fem_lna_mode = 106;
   }
 
   message BluetoothConfig {

meshtastic/localonly.proto

@@ -141,6 +141,11 @@ message LocalModuleConfig {
    */
   ModuleConfig.TrafficManagementConfig traffic_management = 16;
 
+  /*
+   * TAK Config
+   */
+  ModuleConfig.TAKConfig tak = 17;
+
   /*
    * A version integer used to invalidate old save files when we make
    * incompatible changes This integer is set at build time and is private to

meshtastic/module_config.proto

@@ -2,6 +2,8 @@ syntax = "proto3";
 
 package meshtastic;
 
+import "meshtastic/atak.proto";
+
 option csharp_namespace = "Meshtastic.Protobufs";
 option go_package = "github.com/meshtastic/go/generated";
 option java_outer_classname = "ModuleConfigProtos";
@@ -933,6 +935,27 @@ message ModuleConfig {
      * Traffic management module config for mesh network optimization
      */
     TrafficManagementConfig traffic_management = 15;
+
+    /*
+     * TAK team/role configuration for TAK_TRACKER
+     */
+    TAKConfig tak = 16;
+  }
+
+  /*
+   * TAK team/role configuration
+   */
+  message TAKConfig {
+    /*
+     * Team color.
+     * Default Unspecifed_Color -> firmware uses Cyan
+     */
+    Team team = 1;
+    /*
+     * Member role.
+     * Default Unspecifed -> firmware uses TeamMember
+     */
+    MemberRole role = 2;
   }
 }
 

meshtastic/portnums.proto

@@ -227,6 +227,12 @@ enum PortNum {
    */
   POWERSTRESS_APP = 74;
 
+  /*
+   * LoraWAN Payload Transport
+   * ENCODING: compact binary LoRaWAN uplink (10-byte RF metadata + PHY payload) - see LoRaWANBridgeModule
+   */
+  LORAWAN_BRIDGE = 75;
+
   /*
    * Reticulum Network Stack Tunnel App
    * ENCODING: Fragmented RNS Packet. Handled by Meshtastic RNS interface