Merge pull request #153 from mc-hamster/master

Compression protobuf changes

mesh.proto

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

portnums.proto

@@ -75,6 +75,12 @@ enum PortNum {
    */
   ADMIN_APP = 6;
 
+
+  /*
+   * Compressed TEXT_MESSAGE payloads.
+   */
+  TEXT_MESSAGE_COMPRESSED_APP = 7;
+
   /*
    * Provides a 'ping' service that replies to any packet it receives.
    * Also serves as a small example module.
@@ -119,11 +125,6 @@ enum PortNum {
    */
   ZPS_APP = 68;
 
-  /*
-   * Compressed payloads.
-   */
-  COMPRESSION_APP = 69;
-
   /*
    * Private applications should use portnums >= 256.
    * To simplify initial development and testing you can use "PRIVATE_APP"