ua1zbe
/
TTGO-T-Beam-LoRa-APRS
mirror of https://github.com/SQ9MDD/TTGO-T-Beam-LoRa-APRS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix LOCAL_KISS_ECHO for WiFi clients

This commit is contained in:
Łukasz Nidecki 2021-02-18 23:01:15 +01:00
parent 3091f535ab
commit 13964e152b
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/taskTNC.cpp
View File

@ -7,6 +7,24 @@
String inTNCData = ""; String inTNCData = "";
QueueHandle_t tncToSendQueue = nullptr; QueueHandle_t tncToSendQueue = nullptr;
QueueHandle_t tncReceivedQueue = nullptr; QueueHandle_t tncReceivedQueue = nullptr;
#ifdef ENABLE_WIFI
std::list<WiFiClient *> clientsList;
typedef void (*f_connectedClientCallback_t) (WiFiClient *, const String *);
void iterateWifiClients(std::list<WiFiClient *> clients, f_connectedClientCallback_t callback, const String *data){
auto clientsIterator = clients.begin();
while (clientsIterator != clients.end()){
if ((*clientsIterator)->connected()){
callback(*clientsIterator, data);
clientsIterator++;
} else {
clientsIterator = clients.erase(clientsIterator);
}
}
}
#endif
/** /**
* Handle incoming TNC KISS data character * Handle incoming TNC KISS data character
@ -25,10 +43,12 @@ void handleKISSData(char character) {
} }
#endif #endif
#ifdef ENABLE_WIFI #ifdef ENABLE_WIFI
if (client.connected()){ iterateWifiClients(clientsList, [](WiFiClient *client, const String *data){
client.print(inTNCData); if (client->connected()){
client.flush(); client->print(*data);
} client->flush();
}
}, &inTNCData);
#endif #endif
#endif #endif
auto *buffer = new String(); auto *buffer = new String();
@ -40,30 +60,11 @@ void handleKISSData(char character) {
} }
} }
#ifdef ENABLE_WIFI
typedef void (*f_connectedClientCallback_t) (WiFiClient *, const String *);
void iterateWifiClients(std::list<WiFiClient *> clients, f_connectedClientCallback_t callback, const String *data){
auto clientsIterator = clients.begin();
while (clientsIterator != clients.end()){
if ((*clientsIterator)->connected()){
callback(*clientsIterator, data);
clientsIterator++;
} else {
clientsIterator = clients.erase(clientsIterator);
}
}
}
#endif
[[noreturn]] void taskTNC(void *parameter) { [[noreturn]] void taskTNC(void *parameter) {
tncToSendQueue = xQueueCreate(4,sizeof(String *)); tncToSendQueue = xQueueCreate(4,sizeof(String *));
tncReceivedQueue = xQueueCreate(4,sizeof(String *)); tncReceivedQueue = xQueueCreate(4,sizeof(String *));
String *loraReceivedFrameString = nullptr; String *loraReceivedFrameString = nullptr;
#ifdef ENABLE_WIFI
std::list<WiFiClient *> clients;
#endif
while (true) { while (true) {
while (Serial.available() > 0) { while (Serial.available() > 0) {
@ -81,9 +82,9 @@ void iterateWifiClients(std::list<WiFiClient *> clients, f_connectedClientCallba
#ifdef ENABLE_WIFI #ifdef ENABLE_WIFI
WiFiClient new_client = tncServer.available(); WiFiClient new_client = tncServer.available();
if (new_client.connected()){ if (new_client.connected()){
clients.push_back(new WiFiClient(new_client)); clientsList.push_back(new WiFiClient(new_client));
} }
iterateWifiClients(clients, [](WiFiClient * client, const String * unused){ iterateWifiClients(clientsList, [](WiFiClient * client, const String * unused){
while (client->available() > 0) { while (client->available() > 0) {
char character = client->read(); char character = client->read();
handleKISSData(character); handleKISSData(character);
@ -100,7 +101,7 @@ void iterateWifiClients(std::list<WiFiClient *> clients, f_connectedClientCallba
} }
#endif #endif
#ifdef ENABLE_WIFI #ifdef ENABLE_WIFI
iterateWifiClients(clients, [](WiFiClient *client, const String *data){ iterateWifiClients(clientsList, [](WiFiClient *client, const String *data){
if (client->connected()){ if (client->connected()){
client->print(*data); client->print(*data);
client->flush(); client->flush();