mainscnt/mains-frequency-counter-rpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mark invalid and replaced values in database

Browse Source
This commit is contained in:
Wolfgang Hottgenroth 2019-11-05 15:07:19 +01:00
parent 61b1498d7b
commit 8c0c864905
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/counter.c
View File

@ -86,15 +86,17 @@ int main (void) {
uint32_t diff = ringbufferGet(); uint32_t diff = ringbufferGet();
double f = 1.0 / (((double) diff) / 1000000.0); double f = 1.0 / (((double) diff) / 1000000.0);
int valid = settled ? 1 : 0;
if (settled && (abs(f - lastF) > epsilon)) { if (settled && (abs(f - lastF) > epsilon)) {
logmsg(LOG_INFO, "Current f=%f, last f=%f, gradient too large, skipped\n", f, lastF); logmsg(LOG_INFO, "Current f=%f, last f=%f, gradient too large, skipped\n", f, lastF);
skipped++; skipped++;
f = lastF; f = lastF;
valid = 0;
} }
lastF = f; lastF = f;
// printf("%f\n", f); // printf("%f, %d\n", f, valid);
influxAddFrequency(f); influxAddFrequency(f, valid);
ledTick++; ledTick++;
if (ledTick == 50) { if (ledTick == 50) {

4
src/influx.c
View File

@ -79,7 +79,7 @@ static void influxSendRequest() {
led(E_BLUE, false); led(E_BLUE, false);
} }
void influxAddFrequency(double f) { void influxAddFrequency(double f, int valid) {
static uint32_t entries = 0; static uint32_t entries = 0;
static uint32_t totalEntries = 0; static uint32_t totalEntries = 0;
char tmpBuf[256]; char tmpBuf[256];
@ -87,7 +87,7 @@ void influxAddFrequency(double f) {
clock_gettime(CLOCK_REALTIME, &t); clock_gettime(CLOCK_REALTIME, &t);
uint64_t tt = (((uint64_t)t.tv_sec) * 1000) + (((uint64_t)t.tv_nsec) / 1000000); uint64_t tt = (((uint64_t)t.tv_sec) * 1000) + (((uint64_t)t.tv_nsec) / 1000000);
int c = sprintf(tmpBuf, "mainsfrequency,host=%s freq=%f %llu\n", influxTag, f, tt); int c = sprintf(tmpBuf, "mainsfrequency,host=%s,valid=%d freq=%f %llu\n", influxTag, valid, f, tt);
if ((bufferNextEntry + c + 10) > (influxBuffer + BUFSIZE)) { if ((bufferNextEntry + c + 10) > (influxBuffer + BUFSIZE)) {
influxSendRequest(); influxSendRequest();

4
src/influx.h
View File

@ -3,7 +3,7 @@
#include <libconfig.h> #include <libconfig.h>
void influxAddFrequency(double f); void influxAddFrequency(double f, int valid);
void influxInit(config_t *pCfg); void influxInit(config_t *pCfg);
#endif // _INFLUX_H_ #endif // _INFLUX_H_