Merge pull request meshtastic#141 from mc-hamster/location

Add compressed payload variant
rickmark · Apr 13, 2022 · 870a62b · 870a62b
2 parents 6ff1152 + 021d947
commit 870a62b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/mesh.options b/mesh.options
@@ -12,6 +12,8 @@
 # note: this payload length is ONLY the bytes that are sent inside of the Data protobuf (excluding protobuf overhead). The 16 byte header is
 # outside of this envelope
 *Data.payload max_size:237
+*Data.payload_compressed max_size:237
+*Data.payloadVariant anonymous_oneof:true
 
 # Big enough for 1.2.28.568032c-d
 *MyNodeInfo.firmware_version max_size:18

diff --git a/mesh.proto b/mesh.proto
@@ -638,10 +638,18 @@ message Data {
    */
   PortNum portnum = 1;
 
-  /*
-   * TODO: REPLACE
-   */
-  bytes payload = 2;
+  oneof payloadVariant {
+
+    /*
+    * TODO: REPLACE
+    */
+    bytes payload = 2;
+
+    /*
+    * TODO: REPLACE
+    */
+    bytes payload_compressed = 10;
+  }
 
   /*
    * Not normally used, but for testing a sender can request that recipient