Merge remote-tracking branch 'upstream/master'

meshtastic/atak.options

@@ -2,4 +2,5 @@
 *Contact.device_callsign max_size:120
 *Status.battery int_size:8
 *PLI.course int_size:16
-*GeoChat.message max_size:200
+*GeoChat.message max_size:200
+*GeoChat.to max_size:120

meshtastic/config.proto

@@ -735,6 +735,11 @@ message Config {
        * Malaysia 919mhz
        */
       MY_919 = 17;
+
+      /*
+       * Singapore 923mhz
+       */
+      SG_923 = 18;
     }
 
     /*

meshtastic/mesh.proto

@@ -339,6 +339,11 @@ enum HardwareModel {
     */
   CANARYONE = 29;
 
+  /*
+   * Waveshare RP2040 LoRa - https://www.waveshare.com/rp2040-lora.htm
+   */
+  RP2040_LORA = 30;
+
   /*
    * ---------------------------------------------------------------------------
    * Less common/prototype boards listed here (needs one more byte over the air)

meshtastic/storeforward.options

@@ -0,0 +1 @@
+*StoreAndForward.text max_size:237

meshtastic/storeforward.proto

@@ -58,6 +58,16 @@ message StoreAndForward {
      */
     ROUTER_STATS = 7;
 
+    /*
+     * Router sends a text message from its history that was a direct message.
+     */
+    ROUTER_TEXT_DIRECT = 8;
+
+    /*
+     * Router sends a text message from its history that was a broadcast.
+     */
+    ROUTER_TEXT_BROADCAST = 9;
+
     /*
      * Client is an in error state.
      */
@@ -130,12 +140,12 @@ message StoreAndForward {
     bool heartbeat = 7;
 
     /*
-     * Is the heartbeat enabled on the server?
+     * Maximum number of messages the server will return.
      */
     uint32 return_max = 8;
 
     /*
-     * Is the heartbeat enabled on the server?
+     * Maximum history window in minutes the server will return messages from.
      */
     uint32 return_window = 9;
   }
@@ -155,7 +165,8 @@ message StoreAndForward {
     uint32 window = 2;
 
     /*
-     * The window of messages that was used to filter the history client requested
+     * Index in the packet history of the last message sent in a previous request to the server.
+     * Will be sent to the client before sending the history and can be set in a subsequent request to avoid getting packets the server already sent to the client.
      */
     uint32 last_request = 3;
   }
@@ -165,7 +176,7 @@ message StoreAndForward {
    */
   message Heartbeat {
     /*
-     * Number of that will be sent to the client
+     * Period in seconds that the heartbeat is sent out that will be sent to the client
      */
     uint32 period = 1;
 
@@ -200,8 +211,8 @@ message StoreAndForward {
     Heartbeat heartbeat = 4;
 
     /*
-     * Empty Payload
+     * Text from history message.
      */
-    bool empty = 5;
+    bytes text = 5;
   }
-}
+}