dandri/MeshCore
1
0
Fork 0
mirror of https://github.com/meshcore-dev/MeshCore.git synced 2026-03-30 21:25:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

* simplified alertIf()

Browse Source 
* refactored TimeSeriesData to top-level class
This commit is contained in:
Scott Powell
2025-07-08 16:35:11 +10:00
parent de3e4bc27c
commit ac834922de
5 changed files with 82 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
examples/simple_sensor/SensorMesh.cpp
View File

@@ -237,8 +237,8 @@ void SensorMesh::sendAlert(const char* text) {
}
}
void SensorMesh::alertIfLow(Trigger& t, float value, float threshold, const char* text) {
if (value < threshold) {
void SensorMesh::alertIf(bool condition, Trigger& t, const char* text) {
if (condition) {
if (!t.triggered) {
t.triggered = true;
t.time = getRTCClock()->getCurrentTime();
@@ -252,65 +252,6 @@ void SensorMesh::alertIfLow(Trigger& t, float value, float threshold, const char
}
}
void SensorMesh::alertIfHigh(Trigger& t, float value, float threshold, const char* text) {
if (value > threshold) {
if (!t.triggered) {
t.triggered = true;
t.time = getRTCClock()->getCurrentTime();
sendAlert(text);
}
} else {
if (t.triggered) {
t.triggered = false;
// TODO: apply debounce logic
}
}
}
void SensorMesh::recordData(TimeSeriesData& data, float value) {
uint32_t now = getRTCClock()->getCurrentTime();
if (now >= data.last_timestamp + data.interval_secs) {
data.last_timestamp = now;
data.data[data.next] = value; // append to cycle table
data.next = (data.next + 1) % data.num_slots;
}
}
void SensorMesh::calcDataMinMaxAvg(const TimeSeriesData& data, uint32_t start_secs_ago, uint32_t end_secs_ago, MinMaxAvg* dest, uint8_t channel, uint8_t lpp_type) {
int i = data.next, n = data.num_slots;
uint32_t ago = data.interval_secs * data.num_slots;
int num_values = 0;
float total = 0.0f;
dest->_channel = channel;
dest->_lpp_type = lpp_type;
// start at earliest recording, through to most recent
while (n > 0) {
n--;
i = (i + 1) % data.num_slots;
if (ago >= end_secs_ago && ago < start_secs_ago) {
float v = data.data[i];
num_values++;
total += v;
if (num_values == 1) {
dest->_max = dest->_min = v;
} else {
if (v < dest->_min) dest->_min = v;
if (v > dest->_max) dest->_max = v;
}
}
ago -= data.interval_secs;
}
// calc average
if (num_values > 0) {
dest->_avg = total / num_values;
} else {
dest->_avg = NAN;
}
}
float SensorMesh::getAirtimeBudgetFactor() const {
return _prefs.airtime_factor;
}