mirror
/
meshtastic-firmware
kopia lustrzana https://github.com/meshtastic/firmware
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

read in 512 bytes at a time and break and clear serial input if we got wind data

pull/4296/head
Tavis 2024-07-14 20:26:48 -10:00
rodzic 87ae819be1
commit 3e46ba6840
1 zmienionych plików z 8 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
src/modules/SerialModule.cpp
Wyświetl plik

@ -66,7 +66,7 @@ SerialModule::SerialModule() : StreamAPI(&Serial2), concurrency::OSThread("Seria
static Print *serialPrint = &Serial2; static Print *serialPrint = &Serial2;
#endif #endif
char serialBytes[meshtastic_Constants_DATA_PAYLOAD_LEN]; char serialBytes[512];
size_t serialPayloadSize; size_t serialPayloadSize;
SerialModuleRadio::SerialModuleRadio() : MeshModule("SerialModuleRadio") SerialModuleRadio::SerialModuleRadio() : MeshModule("SerialModuleRadio")
@ -220,7 +220,7 @@ int32_t SerialModule::runOnce()
// clear serialBytes buffer // clear serialBytes buffer
memset(serialBytes, '\0', sizeof(serialBytes)); memset(serialBytes, '\0', sizeof(serialBytes));
// memset(formattedString, '\0', sizeof(formattedString)); // memset(formattedString, '\0', sizeof(formattedString));
serialPayloadSize = Serial2.readBytes(serialBytes, meshtastic_Constants_DATA_PAYLOAD_LEN); serialPayloadSize = Serial2.readBytes(serialBytes, 512);
// check for a strings we care about // check for a strings we care about
// example output of serial data fields from the WS85 // example output of serial data fields from the WS85
// WindDir = 79 // WindDir = 79
@ -279,6 +279,7 @@ int32_t SerialModule::runOnce()
if (batVoltagePos != NULL) { if (batVoltagePos != NULL) {
strcpy(batVoltage, batVoltagePos + 17); // 18 for ws 80, 17 for ws85 strcpy(batVoltage, batVoltagePos + 17); // 18 for ws 80, 17 for ws85
batVoltageF = strtof(batVoltage, nullptr); batVoltageF = strtof(batVoltage, nullptr);
break; // last possible data we want so break
} }
} else if (strstr(line, "CapVoltage") != NULL) { // we have a cappVoltage line } else if (strstr(line, "CapVoltage") != NULL) { // we have a cappVoltage line
char *capVoltagePos = strstr(line, "CapVoltage = "); char *capVoltagePos = strstr(line, "CapVoltage = ");
@ -292,6 +293,11 @@ int32_t SerialModule::runOnce()
lineStart = lineEnd + 1; lineStart = lineEnd + 1;
} }
} }
break;
// clear the input buffer
while (Serial2.available() > 0) {
Serial2.read(); // Read and discard the bytes in the input buffer
}
} }
} }
if (gotwind) { if (gotwind) {