From 03b5089b406aee6afb9be7514dcbfaf291e8fb5f Mon Sep 17 00:00:00 2001
From: niccellular <79813408+niccellular@users.noreply.github.com>
Date: Sun, 22 Feb 2026 18:35:43 -0500
Subject: [PATCH 1/3] enhancement: Add TAKConfig message for on-device TAK
 team/role configuration

Add TAKConfig to ModuleConfig with Team and MemberRole fields,
allowing TAK_TRACKER devices to configure ATAK group settings
instead of using hardcoded defaults.

- module_config.proto: TAKConfig message (team, role) at oneof field 16
- localonly.proto: tak field at position 17 in LocalModuleConfig
- admin.proto: TAK_CONFIG = 15 in ModuleConfigType enum

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 meshtastic/admin.proto         |  5 +++++
 meshtastic/localonly.proto     |  5 +++++
 meshtastic/module_config.proto | 23 +++++++++++++++++++++++
 3 files changed, 33 insertions(+)

diff --git a/meshtastic/admin.proto b/meshtastic/admin.proto
index 0fbfbe3..5ecf310 100644
--- a/meshtastic/admin.proto
+++ b/meshtastic/admin.proto
@@ -162,6 +162,11 @@ message AdminMessage {
      * Traffic management module config
      */
     TRAFFICMANAGEMENT_CONFIG = 14;
+
+    /*
+     * TAK module config
+     */
+    TAK_CONFIG = 15;
   }
 
   enum BackupLocation {
diff --git a/meshtastic/localonly.proto b/meshtastic/localonly.proto
index 50b74f7..2a6c7ca 100644
--- a/meshtastic/localonly.proto
+++ b/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
diff --git a/meshtastic/module_config.proto b/meshtastic/module_config.proto
index a8a4307..10753c6 100644
--- a/meshtastic/module_config.proto
+++ b/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;
   }
 }
 

From a229208f29a59cf1d8cfa24cbb7567a08f2d1771 Mon Sep 17 00:00:00 2001
From: Quency-D <55523105+Quency-D@users.noreply.github.com>
Date: Tue, 3 Mar 2026 17:30:14 +0800
Subject: [PATCH 2/3] Add the LORA FEM control variable. (#869)

---
 meshtastic/config.proto | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/meshtastic/config.proto b/meshtastic/config.proto
index f1cdc4f..33eaa58 100644
--- a/meshtastic/config.proto
+++ b/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 {

From dee56bac97d65a5941f5b45df09e0eb1bafd2bd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= <tgoettgens@gmail.com>
Date: Thu, 5 Mar 2026 11:56:15 +0100
Subject: [PATCH 3/3] Add LORAWAN_BRIDGE enum value to portnums.proto

---
 meshtastic/portnums.proto | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meshtastic/portnums.proto b/meshtastic/portnums.proto
index 918b063..07c8051 100644
--- a/meshtastic/portnums.proto
+++ b/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