small code cleaning on 25SecBuffer

This commit is contained in:
richonguzman 2024-11-16 08:02:15 -03:00
parent 3d01ea03c0
commit 57f720b0d1
2 changed files with 9 additions and 20 deletions

View File

@ -48,7 +48,7 @@ ___________________________________________________________________*/
#include "A7670_utils.h" #include "A7670_utils.h"
#endif #endif
String versionDate = "2024.11.06"; String versionDate = "2024.11.16";
Configuration Config; Configuration Config;
WiFiClient espClient; WiFiClient espClient;
#ifdef HAS_GPS #ifdef HAS_GPS

View File

@ -72,32 +72,21 @@ namespace STATION_Utils {
} }
void clean25SegBuffer() { void clean25SegBuffer() {
if (!packet25SegBuffer.empty()) { if (!packet25SegBuffer.empty() && (millis() - packet25SegBuffer[0].receivedTime) > 25 * 1000) packet25SegBuffer.erase(packet25SegBuffer.begin());
if ((millis() - packet25SegBuffer[0].receivedTime) > 25 * 1000) {
packet25SegBuffer.erase(packet25SegBuffer.begin());
}
}
} }
bool check25SegBuffer(const String& station, const String& textMessage) { bool check25SegBuffer(const String& station, const String& textMessage) {
bool shouldBeIgnored = false;
if (!packet25SegBuffer.empty()) { if (!packet25SegBuffer.empty()) {
for (int i = 0; i < packet25SegBuffer.size(); i++) { for (int i = 0; i < packet25SegBuffer.size(); i++) {
if (packet25SegBuffer[i].station == station && packet25SegBuffer[i].payload == textMessage) { if (packet25SegBuffer[i].station == station && packet25SegBuffer[i].payload == textMessage) return false;
shouldBeIgnored = true;
}
} }
} }
if (shouldBeIgnored) { Packet25SegBuffer packet;
return false; packet.receivedTime = millis();
} else { packet.station = station;
Packet25SegBuffer packet; packet.payload = textMessage;
packet.receivedTime = millis(); packet25SegBuffer.push_back(packet);
packet.station = station; return true;
packet.payload = textMessage;
packet25SegBuffer.push_back(packet);
return true;
}
} }
void processOutputPacketBuffer() { void processOutputPacketBuffer() {