pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-18 19:12:09 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

proper direction averging with trig.

Browse Source
This commit is contained in:
Tavis 2024-07-12 09:46:57 -10:00
parent ea639059d3
commit 9d29a9c168
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/modules/SerialModule.cpp
View File

@ -201,7 +201,8 @@ int32_t SerialModule::runOnce()
// } else if ((moduleConfig.serial.mode == meshtastic_ModuleConfig_SerialConfig_Serial_Mode_TEXTMSG)) { // } else if ((moduleConfig.serial.mode == meshtastic_ModuleConfig_SerialConfig_Serial_Mode_TEXTMSG)) {
static unsigned int lastAveraged = 0; static unsigned int lastAveraged = 0;
static unsigned int averageIntervalMillis = 300000; // 5 minutes hard coded. static unsigned int averageIntervalMillis = 300000; // 5 minutes hard coded.
static int dirSum = 0; // TODO : this needs trig, probably a second variable to keep track static double dir_sum_sin = 0;
static double dir_sum_cos = 0;
static float velSum = 0; static float velSum = 0;
static float gust = 0; static float gust = 0;
static float lull = -1; static float lull = -1;
@ -253,7 +254,9 @@ int32_t SerialModule::runOnce()
if (windDirPos != NULL) { if (windDirPos != NULL) {
// Extract data after "=" for WindDir // Extract data after "=" for WindDir
strcpy(windDir, windDirPos + 15); // Add 15 to skip "WindDir = " strcpy(windDir, windDirPos + 15); // Add 15 to skip "WindDir = "
dirSum += atoi(windDir); double radians = toRadians(strtof(windDir, nullptr));
dir_sum_sin += sin(radians);
dir_sum_cos += cos(radians);
dirCount++; dirCount++;
} else if (windSpeedPos != NULL) { } else if (windSpeedPos != NULL) {
// Extract data after "=" for WindSpeed // Extract data after "=" for WindSpeed
@ -300,7 +303,17 @@ int32_t SerialModule::runOnce()
if (gotwind && millis() - lastAveraged > averageIntervalMillis) { if (gotwind && millis() - lastAveraged > averageIntervalMillis) {
// calulate average and send to the mesh // calulate average and send to the mesh
float velAvg = 1.0 * velSum / velCount; float velAvg = 1.0 * velSum / velCount;
float dirAvg = dirSum / dirCount; // TODO : this needs some trig to be accurate // float dirAvg = dirSum / dirCount; // TODO : this needs some trig to be accurate
double avgSin = dir_sum_sin / dirCount;
double avgCos = dir_sum_cos / dirCount;
double avgRadians = atan2(avgSin, avgCos);
float dirAvg = toDegrees(avgRadians);
if (dirAvg < 0) {
dirAvg += 360.0;
}
lastAveraged = millis(); lastAveraged = millis();
// make a telemetry packet with the data // make a telemetry packet with the data
@ -332,7 +345,8 @@ int32_t SerialModule::runOnce()
service.sendToMesh(p, RX_SRC_LOCAL, true); service.sendToMesh(p, RX_SRC_LOCAL, true);
// reset counters and gust/lull // reset counters and gust/lull
velSum = velCount = dirSum = dirCount = 0; velSum = velCount = dirCount = 0;
dir_sum_sin = dir_sum_cos = 0;
gust = 0; gust = 0;
lull = -1; lull = -1;