Skip to content

Improve remote command processing, add more serial debugging #511

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 7, 2023
Merged

Improve remote command processing, add more serial debugging #511

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 28 additions & 3 deletions Firmware/LoRaSerial/States.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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))
Expand All @@ -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);
Expand Down