Merge pull request #532 from LeeLeahy2/fix-rmt-cmd

Bug Fix: Receive remote command responses when in command mode

Author: nseidle

Firmware/LoRaSerial/Commands.ino

@@ -780,6 +780,12 @@ bool sendRemoteCommand(const char * commandString)
     commandTXBuffer[commandTXHead++] = commandString[x];
     commandTXHead %= sizeof(commandTXBuffer);
   }
+  if (settings.debugSerial)
+  {
+    systemPrint("sendRemoteCommand moved ");
+    systemPrint(commandLength);
+    systemPrintln(" from commandBuffer into commandTXBuffer");
+  }
   remoteCommandResponse = false;
   return true;
 }
@@ -812,8 +818,20 @@ void checkCommand()
   char * commandString;
   int index;
   int prefixLength;
+  PrinterEndpoints responseDestination;
+  uint16_t responseLength;
   bool success;
 
+  //Save previous index
+  if (settings.debugSerial)
+  {
+    responseDestination = printerEndpoint;
+    if (responseDestination == PRINT_TO_SERIAL)
+      responseLength = txHead;
+    else
+      responseLength = commandTXHead;
+  }
+
   //Zero terminate the string
   success = false;
   commandBuffer[commandLength] = 0;
@@ -860,6 +878,28 @@ void checkCommand()
     systemPrintln("ERROR");
     commandComplete(false);
   }
+
+  //Display the response
+  printerEndpoint = PRINT_TO_SERIAL;
+  if (settings.debugSerial)
+  {
+    uint16_t tail;
+    tail = responseLength;
+    if (responseDestination == PRINT_TO_SERIAL)
+    {
+      responseLength = (txHead + sizeof(serialTransmitBuffer) - responseLength) % sizeof(serialTransmitBuffer);
+      systemPrint("checkCommand placed ");
+      systemPrint(responseLength);
+      systemPrintln(" command response bytes into serialTransmitBuffer");
+    }
+    else
+    {
+      responseLength = (commandTXHead + sizeof(commandTXBuffer) - responseLength) % sizeof(commandTXBuffer);
+      systemPrint("checkCommand placed ");
+      systemPrint(responseLength);
+      systemPrintln(" command response bytes into commandTXBuffer");
+    }
+  }
   outputSerialData(true);
   petWDT();
 
@@ -911,6 +951,17 @@ char * trimCommand()
   int index;
   int j;
 
+  //Remove the comment
+  for (index = 0; index < commandLength; index++)
+  {
+    if (commandBuffer[index] == '#')
+    {
+      commandBuffer[index] = 0;
+      commandLength = index;
+      break;
+    }
+  }
+
   //Remove the white space
   for (index = 0; index < commandLength; index++)
   {

Firmware/LoRaSerial/Radio.ino

@@ -2393,7 +2393,10 @@ PacketType validateDatagram(VIRTUAL_CIRCUIT * vc, PacketType datagramType, uint8
   }
 
   //Verify that there is sufficient space in the serialTransmitBuffer
-  if (inCommandMode || (freeBytes < rxDataBytes))
+  //Apply back pressure if the remote system is trying to send data while
+  //the local system is in command mode.  Remote command responses should
+  //be received.
+  if ((inCommandMode && (datagramType == DATAGRAM_DATA)) || (freeBytes < rxDataBytes))
   {
     if (settings.debugReceive || settings.debugDatagrams)
     {

Firmware/LoRaSerial/Serial.ino

@@ -375,7 +375,6 @@ void updateSerial()
       commandBuffer[0] = 'A'; //Convert this RT command to an AT command for local consumption
       printerEndpoint = PRINT_TO_RF; //Send prints to RF link
       checkCommand(); //Parse the command buffer
-      printerEndpoint = PRINT_TO_SERIAL;
       remoteCommandResponse = true;
     }
     else
@@ -418,6 +417,12 @@ void processSerialInput()
       {
         printerEndpoint = PRINT_TO_SERIAL;
         systemPrintln();
+        if (settings.debugSerial)
+        {
+          systemPrint("processSerialInput moved ");
+          systemPrint(commandLength);
+          systemPrintln(" from serialReceiveBuffer into commandBuffer");
+        }
         checkCommand(); //Process command buffer
       }
       else if (incoming == '\n')