Merge pull request #515 from LeeLeahy2/link-break

Use a single link break multiplier

Author: nseidle

Firmware/LoRaSerial/Commands.ino

@@ -87,7 +87,7 @@ bool commandAT(const char * commandString)
       case ('B'): //ATB - Break the link
 
         //Compute the time delay
-        delayMillis = (VC_LINK_BREAK_MULTIPLIER + 2) * settings.heartbeatTimeout;
+        delayMillis = (LINK_BREAK_MULTIPLIER + 2) * settings.heartbeatTimeout;
 
         //Warn the user of the delay
         systemPrint("Delaying ");
@@ -111,7 +111,7 @@ bool commandAT(const char * commandString)
         //Idle the system to break the link
         //This is required on the server system which does not request an VC number assignment
         timer = millis();
-        while ((millis() - timer) < ((VC_LINK_BREAK_MULTIPLIER + 2) * settings.heartbeatTimeout))
+        while ((millis() - timer) < ((LINK_BREAK_MULTIPLIER + 2) * settings.heartbeatTimeout))
           petWDT();
         changeState(RADIO_RESET);
 

Firmware/LoRaSerial/States.ino

@@ -988,7 +988,7 @@ void updateRadioState()
       //----------
       //Always check for link timeout
       //----------
-      if ((millis() - linkDownTimer) >= (P2P_LINK_BREAK_MULTIPLIER * settings.heartbeatTimeout))
+      if ((millis() - linkDownTimer) >= (LINK_BREAK_MULTIPLIER * settings.heartbeatTimeout))
         //Break the link
         breakLink();
       break;
@@ -2486,7 +2486,7 @@ void updateRadioState()
         //Determine if the link has timed out
         vc = &virtualCircuitList[index];
         if ((vc->vcState != VC_STATE_LINK_DOWN) && (serverLinkBroken
-            || ((currentMillis - vc->lastTrafficMillis) > (VC_LINK_BREAK_MULTIPLIER * settings.heartbeatTimeout))))
+            || ((currentMillis - vc->lastTrafficMillis) > (LINK_BREAK_MULTIPLIER * settings.heartbeatTimeout))))
         {
           if (index == VC_SERVER)
           {

Firmware/LoRaSerial/Virtual_Circuit_Protocol.h

@@ -64,8 +64,6 @@
 #define VC_HB_CHANNEL       (VC_HB_CHANNEL_TIMER + sizeof(uint16_t))
 #define VC_HB_END           (VC_HB_CHANNEL + sizeof(uint8_t))
 
-#define VC_LINK_BREAK_MULTIPLIER    3 //Number of missing HEARTBEAT timeouts
-
 //ASCII characters
 #define START_OF_VC_SERIAL  0x02      //From ASCII table - Start of Text
 

Firmware/LoRaSerial/settings.h

@@ -43,7 +43,7 @@ typedef enum
 
 RadioStates radioState = RADIO_RESET;
 
-#define P2P_LINK_BREAK_MULTIPLIER       3
+#define LINK_BREAK_MULTIPLIER           3
 
 typedef struct _RADIO_STATE_ENTRY
 {