Merge pull request #257 from meshtastic/develop

Develop -> Master

mesh.proto

@@ -296,6 +296,11 @@ enum HardwareModel {
    */
   TLORA_V2_1_1P8 = 15;
 
+  /*
+   * TODO: REPLACE
+   */
+  TLORA_T3_S3 = 16;
+
   /*
    * B&Q Consulting Station Edition G1: https://uniteng.com/wiki/doku.php?id=meshtastic:station
    */

storeforward.proto

@@ -12,8 +12,8 @@ option csharp_namespace = "Meshtastic.Protobufs";
 message StoreAndForward {
 
   /*
-   * 1   - 99  = From Router
-   * 101 - 199 = From Client
+   * 001 - 063 = From Router
+   * 064 - 127 = From Client
    */
   enum RequestResponse {
 
@@ -53,31 +53,36 @@ message StoreAndForward {
      */
     ROUTER_HISTORY = 6;
 
+    /*
+     * Router is responding to a request for stats.
+     */
+    ROUTER_STATS = 7;
+
     /*
      * Client is an in error state.
      */
-    CLIENT_ERROR = 101;
+    CLIENT_ERROR = 64;
 
     /*
      * Client has requested a replay from the router.
      */
-    CLIENT_HISTORY = 102;
+    CLIENT_HISTORY = 65;
 
     /*
      * Client has requested stats from the router.
      */
-    CLIENT_STATS = 103;
+    CLIENT_STATS = 66;
 
     /*
      * Client has requested the router respond. This can work as a
      * "are you there" message.
      */
-    CLIENT_PING = 104;
+    CLIENT_PING = 67;
 
     /*
      * The response to a "Ping"
      */
-    CLIENT_PONG = 105;
+    CLIENT_PONG = 68;
 
     /*
      * Client has requested that the router abort processing the client's request
@@ -181,16 +186,25 @@ message StoreAndForward {
   /*
    * TODO: REPLACE
    */
-  Statistics stats = 2;
+  oneof variant {
+    /*
+     * TODO: REPLACE
+     */
+    Statistics stats = 2;
 
-  /*
-   * TODO: REPLACE
-   */
-  History history = 3;
+    /*
+     * TODO: REPLACE
+     */
+    History history = 3;
 
-  /*
-   * TODO: REPLACE
-   */
-  Heartbeat heartbeat = 4;
+    /*
+     * TODO: REPLACE
+     */
+    Heartbeat heartbeat = 4;
 
+    /*
+     * Empty Payload
+     */
+    bool empty = 5;
+  }
 }