Compressed vs uncompressed variants

meshtastic/mesh.options

@@ -44,7 +44,6 @@
 # MyMessage.name         max_size:40 
 # or fixed_length or fixed_count, or max_count
 
-
 #This value may want to be a few bytes smaller to compensate for the parent fields.
 *Compressed.data max_size:237
 
@@ -57,4 +56,7 @@
 
 *MqttClientProxyMessage.topic max_size:60
 *MqttClientProxyMessage.data max_size:435
-*MqttClientProxyMessage.text max_size:435
+*MqttClientProxyMessage.text max_size:435
+
+*TAK_Packet.callsign_variant.uncompressed max_size:64
+*TAK_Packet.callsign_variant.compressed max_size:64

meshtastic/mesh.proto

@@ -1525,7 +1525,16 @@ message DeviceMetadata {
  */
 message TAK_Packet
 {
-  string call_sign = 1;
+  oneof callsign_variant {
+    /*
+     * Uncompressed callsign from ATAK
+     */
+    string uncompressed = 1;
+    /*
+     * Compressed callsign using unishox2 for the wire
+     */
+    string compressed = 2;
+  }
   /*
    * The payload of the packet
    */
@@ -1533,11 +1542,11 @@ message TAK_Packet
     /*
      * TAK position report
      */
-    TAK_PLI tak_pli = 2;
+    TAK_PLI tak_pli = 3;
     /*
      * Other binary data
      */
-    bytes data = 3;
+    bytes data = 4;
   }
 }
 /*