From e94b250143753d7cf092a5ecd68ed8e4c26e7f5f Mon Sep 17 00:00:00 2001
From: Jm Casler <jm@casler.org>
Date: Mon, 28 Feb 2022 19:34:20 -0800
Subject: [PATCH] Remove ROUTER_APP and add router_heartbeat to position

---
 mesh.proto     | 16 +++++++++-------
 portnums.proto |  9 +--------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/mesh.proto b/mesh.proto
index 181aa9a..24dc2f6 100644
--- a/mesh.proto
+++ b/mesh.proto
@@ -31,13 +31,6 @@ option java_outer_classname = "MeshProtos";
  * a gps position
  */
 message Position {
-
-  /*
-   * The old (pre 1.2) position encoding sent lat/lon as sint32s in field 7,8.
-   * Do not use to prevent confusing old apps
-   */
-  reserved 7, 8;
-
   /*
    * The new preferred location encoding, divide by 1e-7 to get degrees
    * in floating point
@@ -70,6 +63,15 @@ message Position {
    */
   int32 battery_level = 4;
 
+  /*
+   * This is sent by node only if it a router and if hop_limit is set to 0
+   *   and is not being sent as a reliable message.
+   *
+   *   Note to Ben & Garth : When position is refactored, please move this to the same message
+   *                         "time" is moving to.
+   */
+  bool router_heartbeat = 5;
+
   /*
    * This is usually not sent over the mesh (to save space), but it is sent
    * from the phone so that the local device can set its RTC If it is sent over
diff --git a/portnums.proto b/portnums.proto
index 690ca17..ec3a519 100644
--- a/portnums.proto
+++ b/portnums.proto
@@ -92,18 +92,12 @@ enum PortNum {
    */
   IP_TUNNEL_APP = 33;
 
-  /*
-   * Used for the router module
-   */
-  ROUTER_APP = 34;
-
   /*
    * Provides a hardware serial interface to send and receive from the Meshtastic network.
    * Connect to the RX/TX pins of a device with 38400 8N1. Packets received from the Meshtastic
    * network is forwarded to the RX pin while sending a packet to TX will go out to the Mesh network.
    * Maximum packet size of 240 bytes.
    * Module is disabled by default can be turned on by setting SERIALMODULE_ENABLED = 1 in SerialPlugh.cpp.
-   * Maintained by Jm Casler (MC Hamster) : jm@casler.org
    */
   SERIAL_APP = 64;
 
@@ -114,8 +108,7 @@ enum PortNum {
   STORE_FORWARD_APP = 65;
 
   /*
-   * STORE_FORWARD_APP (Work in Progress)
-   * Maintained by Jm Casler (MC Hamster) : jm@casler.org
+   * Optional port for messages for the range test module.
    */
   RANGE_TEST_APP = 66;