Merge branch 'release_candidate' of https://github.com/sparkfun/SparkFun_LoRaSerial into release_candidate

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/LoRaSerial.ino

@@ -490,6 +490,7 @@ bool trainingPreviousRxInProgress = false; //Previous RX status
 float originalChannel; //Original channel from HOP table while training is in progress
 uint8_t trainingPartnerID[UNIQUE_ID_BYTES]; //Unique ID of the training partner
 uint8_t myUniqueId[UNIQUE_ID_BYTES]; // Unique ID of this system
+uint32_t buttonPressedTime;
 
 //Virtual-Circuit
 int8_t cmdVc;   //VC index for ATI commands only

Firmware/LoRaSerial/Serial.ino

@@ -938,10 +938,8 @@ void resetSerial()
 
   //Empty the buffers
   rxHead = rxTail;
-  radioTxHead = radioTxTail;
   txHead = txTail;
   commandRXHead = commandRXTail;
   commandTXHead = commandTXTail;
-  endOfTxData = &outgoingPacket[headerBytes];
   commandLength = 0;
 }

Firmware/LoRaSerial/States.ino

@@ -721,6 +721,14 @@ void updateRadioState()
             triggerEvent(TRIGGER_RX_DATA);
 
             //Place the data in the serial output buffer
+            if (settings.debugSerial)
+            {
+              systemPrint("Moving ");
+              systemPrint(rxDataBytes);
+              systemPrintln(" from incomingBuffer to serialTransmitBuffer");
+              dumpBuffer(rxData, length);
+              outputSerialData(true);
+            }
             serialBufferOutput(rxData, rxDataBytes);
 
             //Transmit ACK
@@ -750,6 +758,16 @@ void updateRadioState()
           case DATAGRAM_REMOTE_COMMAND:
             triggerEvent(TRIGGER_RX_COMMAND);
 
+            //Debug the remote command operation
+            if (settings.debugSerial)
+            {
+              systemPrint("Moving ");
+              systemPrint(rxDataBytes);
+              systemPrintln(" from incomingBuffer to commandRXBuffer");
+              dumpBuffer(rxData, length);
+              outputSerialData(true);
+            }
+
             //Determine the number of bytes received
             length = 0;
             if ((commandRXHead + rxDataBytes) > sizeof(commandRXBuffer))
@@ -772,9 +790,16 @@ void updateRadioState()
           case DATAGRAM_REMOTE_COMMAND_RESPONSE:
             triggerEvent(TRIGGER_RX_COMMAND_RESPONSE);
 
-            //Print received data. This is blocking but we do not use the serialTransmitBuffer because we're in command mode (and it's not much data to print).
-            for (int x = 0 ; x < rxDataBytes ; x++)
-              Serial.write(rxData[x]);
+            //Print received data.
+            if (settings.debugSerial)
+            {
+              systemPrint("Moving ");
+              systemPrint(rxDataBytes);
+              systemPrintln(" from incomingBuffer to serialTransmitBuffer");
+              dumpBuffer(rxData, length);
+              outputSerialData(true);
+            }
+            serialBufferOutput(rxData, rxDataBytes);
 
             //Transmit ACK
             P2P_SEND_ACK(TRIGGER_TX_ACK);
@@ -963,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;
@@ -2461,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)
           {
@@ -2887,7 +2912,10 @@ void breakLink()
   }
 
   //Flush the buffers
-  resetSerial();
+  if (!inCommandMode)
+    resetSerial();
+  radioTxHead = radioTxTail;
+  endOfTxData = &outgoingPacket[headerBytes];
 
   //Reset the radio and the link
   triggerEvent(TRIGGER_RADIO_RESET);
@@ -3052,7 +3080,11 @@ void vcBreakLink(int8_t vcIndex)
   //Flush the buffers
   outputSerialData(true);
   if (vcIndex == myVc)
+  {
     resetSerial();
+    radioTxHead = radioTxTail;
+    endOfTxData = &outgoingPacket[headerBytes];
+  }
 }
 
 //Place VC in LINK-UP state since it is receiving HEARTBEATs from the remote radio

Firmware/LoRaSerial/System.ino

@@ -261,7 +261,6 @@ void updateButton()
   static bool buttonWasPressed;
   uint32_t deltaTime;
   static Settings originalSettings;
-  static uint32_t pressedTime;
 
   if (trainBtn != NULL)
   {
@@ -271,9 +270,7 @@ void updateButton()
     //Determine the current button state
     if (buttonWasPressed)
     {
-      //Update the LEDs
-      deltaTime = millis() - pressedTime;
-      buttonLeds(deltaTime);
+      deltaTime = millis() - buttonPressedTime;
       if (!buttonPressed)
       {
         //Button just released
@@ -319,8 +316,6 @@ void updateButton()
           else
           {
             //The user has stopped training with the button
-            //Restore the previous settings
-            settings = originalSettings;
             if (inTraining)
             {
               inTraining = false;
@@ -338,11 +333,14 @@ void updateButton()
       if (buttonPressed)
       {
         //Button just pressed
-        pressedTime = millis();
+        buttonPressedTime = millis();
 
         //Save the previous led state
         if (!inTraining)
+        {
             originalSettings = settings;
+            settings.selectLedUse = LEDS_BUTTON_PRESS;
+        }
       }
     }
 
@@ -1064,14 +1062,16 @@ void updateCylonLEDs()
 }
 
 //Acknowledge the button press
-void buttonLeds(uint32_t pressedMilliseconds)
+void buttonLeds()
 {
   const uint32_t blinkTime = 1000 / 4;  //Blink 4 times per second
   uint8_t on;
   const uint32_t onTime = blinkTime / 2;
+  uint32_t pressedMilliseconds;
   uint8_t seconds;
 
   //Display the number of seconds the button has been pushed
+  pressedMilliseconds = millis() - buttonPressedTime;
   seconds = pressedMilliseconds / 1000;
   setRSSI((pressedMilliseconds >= trainButtonFactoryResetTime) ? 15 : seconds);
 
@@ -1146,6 +1146,10 @@ void updateLeds()
       radioLeds();
       break;
 
+    case LEDS_BUTTON_PRESS:
+      buttonLeds();
+      break;
+
     //Turn off all the LEDs
     case LEDS_ALL_OFF:
       break;

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
 {