richonguzman/LoRa_APRS_iGate
1
0
Fork 0
mirror of https://github.com/richonguzman/LoRa_APRS_iGate.git synced 2026-03-16 02:04:45 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: tnc handle input data

Browse source
This commit is contained in:
SQ2CPA 2024-03-17 19:28:08 +01:00
parent 9f617c406e
commit 67e1c528f3
1 changed files with 22 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
src/tnc_utils.cpp
View file

@ -45,64 +45,45 @@ namespace TNC_Utils {
}
}
void handleServerInputData(char character, int bufferIndex) {
String* inTNCData = &inputServerBuffer[bufferIndex];
void handleInputData(char character, int bufferIndex) {
String* data;
if (bufferIndex == -1) {
data = &inputSerialBuffer;
} else {
data = &inputServerBuffer[bufferIndex];
}
if (inTNCData->length() == 0 && character != (char)FEND) {
if (data->length() == 0 && character != (char)FEND) {
return;
}
inTNCData->concat(character);
data->concat(character);
if (character == (char)FEND && inTNCData->length() > 3) {
if (character == (char)FEND && data->length() > 3) {
bool isDataFrame = false;
const String& frame = decodeKISS(*inTNCData, isDataFrame);
const String& frame = decodeKISS(*data, isDataFrame);
if (isDataFrame) {
Utils::print("<--- Got from TNC : ");
Utils::println(frame);
if (bufferIndex != -1) {
Utils::print("<--- Got from TNC : ");
Utils::println(frame);
}
String sender = frame.substring(0,frame.indexOf(">"));
if (Config.tnc.acceptOwn || sender != Config.callsign) {
LoRa_Utils::sendNewPacket("APRS", frame);
} else {
Utils::println("Ignored own frame from TNC");
Utils::println("Ignored own frame from KISS");
}
}
inTNCData->clear();
data->clear();
}
if (inTNCData->length() > 255) {
inTNCData->clear();
}
}
void handleSerialInputData(char character) {
if (inputSerialBuffer.length() == 0 && character != (char)FEND) {
return;
}
inputSerialBuffer.concat(character);
if (character == (char)FEND && inputSerialBuffer.length() > 3) {
bool isDataFrame = false;
const String& frame = decodeKISS(inputSerialBuffer, isDataFrame);
if (isDataFrame) {
String sender = frame.substring(0,frame.indexOf(">"));
if (Config.tnc.acceptOwn || sender != Config.callsign) {
LoRa_Utils::sendNewPacket("APRS", frame);
}
}
inputSerialBuffer.clear();
}
if (inputSerialBuffer.length() > 255) {
inputSerialBuffer.clear();
if (data->length() > 255) {
data->clear();
}
}
@ -113,7 +94,7 @@ namespace TNC_Utils {
if (client->connected()) {
while (client->available() > 0) {
char character = client->read();
handleServerInputData(character, 2 + i);
handleInputData(character, 2 + i);
}
} else {
delete client;
@ -126,7 +107,7 @@ namespace TNC_Utils {
void readFromSerial() {
while (Serial.available() > 0) {
char character = Serial.read();
handleSerialInputData(character);
handleInputData(character, -1);
}
}