Incremental steps towards remote command control

Author: nseidle

Firmware/LoRaSerial_Firmware/Commands.ino

@@ -7,6 +7,13 @@
 //Check to see if a valid command has been received
 void checkCommand()
 {
+  //Check if this command was received over the RF link or local serial
+  if (serialState == SERIAL_PASSTHROUGH && commandBuffer[0] == 'R')
+  {
+    //We have a remote command, change the data to AT command, but pass response to command back out over RF link
+    commandBuffer[0] = 'A';
+  }
+
   systemPrintln();
 
   if (commandLength < 2) //Too short
@@ -16,6 +23,10 @@ void checkCommand()
   else if (isATcommand(commandBuffer) == false)
     reportERROR();
 
+  //Check for 'RT'
+  else if (isRTcommand(commandBuffer) == false)
+    sendRemoteCommand();
+
   //'AT'
   else if (commandLength == 2)
     reportOK();
@@ -37,31 +48,20 @@ void checkCommand()
         systemPrintln();
         break;
       case ('O'): //Exit command mode
-        //If linked, send new settings to remote unit
-        if (isLinked() == true)
-        {
-          //Todo check to see if there are new settings to transmit or not
-          settingsDelivered = 0;
-          sendCommandDataPacket(); //Send updated settings to remote
-          changeState(RADIO_LINKED_COMMAND_TRANSMITTING);
-        }
+        //Apply settings and return
+        generateHopTable(); //Generate freq with new settings
+        configureRadio(); //Apply any new settings
+
+        digitalWrite(pin_linkLED, LOW);
+        digitalWrite(pin_activityLED, LOW);
+        if (settings.pointToPoint == true)
+          changeState(RADIO_NO_LINK_RECEIVING_STANDBY);
         else
-        {
-          //If not linked, apply settings and return
-          generateHopTable(); //Generate freq with new settings
-          configureRadio(); //Apply any new settings
-
-          digitalWrite(pin_linkLED, LOW);
-          digitalWrite(pin_activityLED, LOW);
-          if (settings.pointToPoint == true)
-            changeState(RADIO_NO_LINK_RECEIVING_STANDBY);
-          else
-            changeState(RADIO_BROADCASTING_RECEIVING_STANDBY);
+          changeState(RADIO_BROADCASTING_RECEIVING_STANDBY);
 
-          serialState = RADIO_SERIAL_PASSTHROUGH;
+        serialState = SERIAL_PASSTHROUGH;
 
-          reportOK();
-        }
+        reportOK();
         break;
       case ('T'): //Enter training mode
         reportOK();
@@ -722,6 +722,31 @@ bool isATcommand(char *buffer)
   return (false);
 }
 
+//Check if RT appears in the correct position
+bool isRTcommand(char *buffer)
+{
+  if (buffer[0] == 'R')
+    if (buffer[1] == 'T')
+      return (true);
+  return (false);
+}
+
+//Send the AT command over RF link, if available
+void sendRemoteCommand()
+{
+  if (isLinked() == true && radioState == RADIO_LINKED_RECEIVING_STANDBY)
+  {
+    for (int x = 0 ; x < commandLength ; x++)
+      outgoingPacket[x] = commandBuffer[x];
+
+    packetSize = commandLength;
+
+    //Fire off packet
+    sendCommandDataPacket();
+    //changeState();
+  }
+}
+
 //Show current settings in user friendly way
 void displayParameters(char parameterType)
 {

Firmware/LoRaSerial_Firmware/Radio.ino

@@ -97,7 +97,7 @@ PacketType identifyPacketType()
       return (PROCESS_TRAINING_CONTROL_PACKET);
     }
 
-    //If this packet is marked as a remote command, it's either an ack or a ping
+    //If this packet is marked as a remote command, it's either an ack or a zero length packet (not known)
     else if (receiveTrailer.remoteCommand == 1)
     {
       if (receiveTrailer.ack == 1)
@@ -106,22 +106,15 @@ PacketType identifyPacketType()
         return (PACKET_COMMAND_ACK);
       }
 
-      LRS_DEBUG_PRINTLN(F("RX: Command Ping"));
-      return (PACKET_COMMAND_PING);
+      LRS_DEBUG_PRINTLN(F("RX: Unknown Command"));
+      return (PROCESS_BAD_PACKET);
     }
 
     //Not training, not command packet, just a ping
     LRS_DEBUG_PRINTLN(F("RX: Control Packet"));
     return (PROCESS_CONTROL_PACKET);
   }
 
-  //If we have one byte, and remote command, we are being asked for our settings
-  if (receivedBytes == 1 && receiveTrailer.remoteCommand == 1)
-  {
-      LRS_DEBUG_PRINTLN(F("RX: Command Request Settings"));
-      return (PACKET_COMMAND_REQUEST_SETTINGS);
-  }
-  
   //Update lastPacket details with current packet
   memcpy(lastPacket, incomingBuffer, receivedBytes);
   lastPacketSize = receivedBytes;
@@ -136,15 +129,9 @@ PacketType identifyPacketType()
 
   else if (receiveTrailer.remoteCommand == 1)
   {
-    if (receiveTrailer.ack == 1)
-    {
-      //Remote is giving us their settings
-      LRS_DEBUG_PRINTLN(F("RX: Command Current Settings"));
-      return (PACKET_COMMAND_CURRENT_SETTINGS);
-    }
-    //New settings from remote
-    LRS_DEBUG_PRINTLN(F("RX: Command New Settings"));
-    return (PACKET_COMMAND_NEW_SETTINGS);
+    //New data from remote
+    LRS_DEBUG_PRINTLN(F("RX: Command Data"));
+    return (PACKET_COMMAND_DATA);
   }
 
   LRS_DEBUG_PRINTLN(F("RX: Data packet"));
@@ -490,110 +477,19 @@ void sendCommandAckPacket()
   sendPacket();
 }
 
-//Create short packet of 2 control bytes - query remote radio for proof of life (ack)
-void sendCommandPingPacket()
-{
-  LRS_DEBUG_PRINT(F("TX: Command Ping "));
-  responseTrailer.ack = 0; //This is not an ACK to a previous transmission
-  responseTrailer.resend = 0; //This is not a resend
-  responseTrailer.train = 0; //This is not a training packet
-  responseTrailer.remoteCommand = 1; //This is a remote command packet
-
-  packetSize = 2;
-  packetSent = 0; //Reset the number of times we've sent this packet
-
-  //SF6 requires an implicit header which means there is no dataLength in the header
-  //Because we cannot predict when a ping packet will be received, the receiver will always
-  //expecting 255 bytes. Pings must be increased to 255 bytes. ACKs are still 2 bytes.
-  if (settings.radioSpreadFactor == 6)
-  {
-    //Manually store actual data length 3 bytes from the end (before NetID)
-    //Manual packet size is whatever has been processed + 1 for the manual packetSize byte
-    outgoingPacket[255 - 3] = packetSize + 1;
-    packetSize = 255; //We're now going to transmit 255 bytes
-  }
-
-  expectingAck = true; //We expect destination to ack
-  sendPacket();
-}
-
-//Create short packet of 2 control bytes, 1 dummy byte, with remoteSetting = 1
-void sendCommandRequestSettingsPacket()
-{
-  LRS_DEBUG_PRINT(F("TX: Settings Request "));
-  responseTrailer.ack = 0; //This is not an ACK to a previous transmission
-  responseTrailer.resend = 0; //This is not a resend
-  responseTrailer.train = 0; //This is not a training packet
-  responseTrailer.remoteCommand = 1; //This is a remote command packet
-
-  outgoingPacket[0] = 0xAA; //Avoid DC bias
-
-  packetSize = 3;
-  packetSent = 0; //Reset the number of times we've sent this packet
-
-  //SF6 requires an implicit header which means there is no dataLength in the header
-  //Because we cannot predict when a ping packet will be received, the receiver will always
-  //expecting 255 bytes. Pings must be increased to 255 bytes. ACKs are still 2 bytes.
-  if (settings.radioSpreadFactor == 6)
-  {
-    //Manually store actual data length 3 bytes from the end (before NetID)
-    //Manual packet size is whatever has been processed + 1 for the manual packetSize byte
-    outgoingPacket[255 - 3] = packetSize + 1;
-    packetSize = 255; //We're now going to transmit 255 bytes
-  }
-
-  expectingAck = true; //We expect destination to ack
-  sendPacket();
-}
-
-//Create packet of unit's settings with remote command = 1, ack = 0
-void sendCommandCurrentSettingsPacket()
+//Create packet of serial command with remote command = 1, ack = 0
+void sendCommandDataPacket()
 {
-  LRS_DEBUG_PRINT(F("TX: Settings Data "));
+  LRS_DEBUG_PRINT(F("TX: Command Data "));
   responseTrailer.ack = 0; //This is not an ACK to a previous transmission.
   responseTrailer.resend = 0; //This is not a resend
   responseTrailer.train = 0; //This is not training packet
   responseTrailer.remoteCommand = 1; //This is a remote control packet
 
-  moveSettingsToPacket(settings, outgoingPacket); //Copy settings to outgoingPacket
-  packetSize = sizeof(settings);
-
-  packetSize += 2;
-  packetSent = 0; //Reset the number of times we've sent this packet
-
-  //SF6 requires an implicit header which means there is no dataLength in the header
-  //Because we cannot predict when a ping packet will be received, the receiver will always
-  //expecting 255 bytes. Pings must be increased to 255 bytes. ACKs are still 2 bytes.
-  if (settings.radioSpreadFactor == 6)
-  {
-    //Manually store actual data length 3 bytes from the end (before NetID)
-    //Manual packet size is whatever has been processed + 1 for the manual packetSize byte
-    outgoingPacket[255 - 3] = packetSize + 1;
-    packetSize = 255; //We're now going to transmit 255 bytes
-  }
-
-  expectingAck = true; //We do expect destination to ack
-  sendPacket();
-}
-
-//Create packet of unit's settings with remote command = 1
-void sendCommandNewSettingsPacket()
-{
-  LRS_DEBUG_PRINT(F("TX: Settings Data "));
-  responseTrailer.ack = 0; //This is not a normal ping packet.
-  responseTrailer.resend = 0; //This is not a resend
-  responseTrailer.train = 0; //This is not training packet
-  responseTrailer.remoteCommand = 1; //This is a remote command packet
-
-  moveSettingsToPacket(settings, outgoingPacket); //Copy settings to outgoingPacket
-  packetSize = sizeof(settings);
-
-  packetSize += 2;
+  packetSize += 2; //Make room for control bytes
   packetSent = 0; //Reset the number of times we've sent this packet
 
   //SF6 requires an implicit header which means there is no dataLength in the header
-  //Because we cannot predict when a ping packet will be received, the receiver will always
-  //expecting 255 bytes. Pings must be increased to 255 bytes. ACKs are still 2 bytes.
   if (settings.radioSpreadFactor == 6)
   {
     //Manually store actual data length 3 bytes from the end (before NetID)
@@ -602,24 +498,7 @@ void sendCommandNewSettingsPacket()
     packetSize = 255; //We're now going to transmit 255 bytes
   }
 
-  expectingAck = false; //We do not expect destination to ack
-  sendPacket();
-}
-
-//Create short packet of 2 control bytes - do not expect ack, remoteCommand = 1
-void sendCommandDataPacketAck()
-{
-  LRS_DEBUG_PRINT(F("TX: Ack "));
-  responseTrailer.ack = 0; //This is not a normal packet, no ack
-  responseTrailer.resend = 0; //This is not a resend
-  responseTrailer.train = 0; //This is not a training packet
-  responseTrailer.remoteCommand = 1; //This is a remote control packet
-  responseTrailer.remoteCommandAck = 1; //ACK the reception of the remote command data packet
-
-  packetSize = 2;
-  packetSent = 0; //Reset the number of times we've sent this packet
-
-  expectingAck = false; //We do not expect destination to ack
+  expectingAck = true; //We expect destination to ack
   sendPacket();
 }
 

Firmware/LoRaSerial_Firmware/Serial.ino

@@ -80,7 +80,7 @@ void updateSerial()
     byte incoming = systemRead();
 
     //Process serial into either rx buffer or command buffer
-    if (serialState == RADIO_SERIAL_COMMAND)
+    if (serialState == SERIAL_COMMAND)
     {
       if (incoming == '\r' && commandLength > 0)
         checkCommand(); //Process potential command
@@ -112,19 +112,7 @@ void updateSerial()
 
             systemPrintln(F("\r\nOK"));
 
-            serialState = RADIO_SERIAL_COMMAND;
-
-            //If we are linked to a remote radio, request remote settings
-            if (isLinked() == true)
-            {
-              //Transmit empty packet with remoteSettings = 1 to get remote's settings
-              sendCommandPacket();
-
-              //Recalculate packetAirTime because we need to wait not for a 2-byte response, but a ~73 byte response
-              packetAirTime = calcAirTime(sizeof(settings));
-
-              changeState(RADIO_LINKED_COMMAND_TRANSMITTING);
-            }
+            serialState = SERIAL_COMMAND;
 
             escapeCharsReceived = 0;
             lastByteReceived_ms = millis();