coelner/MQ7-esp
1
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

small bugfix for globalStatus

Browse Source
This commit is contained in:
coelner 2021-06-17 15:57:10 +02:00
parent 2a3445b9bb
commit 7c4adc0267
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
esp8266-dashboard/esp8266-dashboard.ino
View File

@ -57,19 +57,17 @@ void globalStatus() {
DEBUGLOG("available Peers:"); DEBUGLOG("available Peers:");
WifiEspNowPeerInfo peers[MAX_PEERS]; WifiEspNowPeerInfo peers[MAX_PEERS];
int nPeers = std::min(WifiEspNow.listPeers(peers, MAX_PEERS), MAX_PEERS); int nPeers = std::min(WifiEspNow.listPeers(peers, MAX_PEERS), MAX_PEERS);
byte loopPointer = (rxCounter - 1 >= 0) ? (rxCounter - 1) : MAX_PEERS - 1;
byte lastLoopPointer = rxCounter;
for (int i = 0; i < nPeers; ++i) { for (int i = 0; i < nPeers; ++i) {
LOG(" %02X:%02X:%02X:%02X:%02X:%02X", peers[i].mac[0], peers[i].mac[1], peers[i].mac[2], peers[i].mac[3], peers[i].mac[4], peers[i].mac[5]); byte loopPointer = (rxCounter - 1 >= 0) ? (rxCounter - 1) : MAX_PEERS - 1;
LOG(" %02X:%02X:%02X:%02X:%02X:%02X", peers[i].mac[0], peers[i].mac[1], peers[i].mac[2], peers[i].mac[3], peers[i].mac[4], peers[i].mac[5]);
//walk backwards through the buffer to get the latest message //walk backwards through the buffer to get the latest message
while (loopPointer != lastLoopPointer) while (loopPointer != rxCounter)
{ {
//DEBUGLOG("lastLoopPointer | loopPointer: %d|%d", lastLoopCounter, loopPointer); //DEBUGLOG("rxCounter | loopPointer: %d|%d", rxCounter, loopPointer);
int ret = memcmp(&receiveBuffer[loopPointer].originMAC[0], &peers[i].mac, sizeof(receiveBuffer[loopPointer].originMAC)); int ret = memcmp(&receiveBuffer[loopPointer].originMAC[0], &peers[i].mac, sizeof(receiveBuffer[loopPointer].originMAC));
if (ret == 0) { if (ret == 0) {
LOG("\tStatus: %c | BatWarn: %c", receiveBuffer[loopPointer].code, (receiveBuffer[loopPointer].batteryWarning) ? '!' : '.'); LOG("\tStatus: %c | BatWarn: %c", receiveBuffer[loopPointer].code, (receiveBuffer[loopPointer].batteryWarning) ? '!' : '.');
lastLoopPointer = loopPointer; loopPointer = rxCounter + 1;
break;
} }
if (loopPointer - 1 >= 0) { if (loopPointer - 1 >= 0) {
loopPointer--; loopPointer--;
@ -78,8 +76,8 @@ void globalStatus() {
loopPointer = MAX_PEERS - 1; loopPointer = MAX_PEERS - 1;
} }
} }
refreshGlobalStatus = false;
} }
refreshGlobalStatus = false;
} }
void setup() { void setup() {