arthurr/esp-air-monitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
a62732a1b59a4bece11533466d7d26d6b1d1da2a
esp-air-monitor/main/main.c
Arthur Roberts a62732a1b5 Think I found the bug 
Some kind of integer issue with dividing or something
2023-10-31 22:40:17 +00:00

264 lines
9.8 KiB
C
Raw Blame History

/**
* Author: Arthur Roberts (c) 2023
*
* License: GPLv3+
*/
#include "dht22.h"
#include "esp_log.h"
#include "esp_sntp.h"
#include "freertos/FreeRTOS.h"
#include "freertos/projdefs.h"
#include "freertos/task.h"
#include "nvs_flash.h"
#include "portmacro.h"
#include "sdkconfig.h"
#include "wifi.h"
#include <stdbool.h>
#include <stdint.h>
#include <stdio.h>
#include <inttypes.h>
static const char *TAG = "YASPAM";
static volatile bool run_dht = true;
static volatile bool run_pms5003 = true;
static TaskHandle_t dht22_handle = NULL;
static TaskHandle_t pms5003_handle = NULL;
typedef struct {
uint8_t myt_sec; // 0 -> 61
uint8_t myt_min; // 0 -> 69
uint8_t myt_hour; // 0 -> 23
uint8_t myt_day; // 1 -> 31
uint8_t myt_month; // 0 -> 11 !!
uint8_t myt_year; // years since 1900
} my_time;
#ifdef CONFIG_PMS5003_ENABLED
#include "pms5003.h"
void read_from_pms5003() {
while (run_pms5003) {
// TODO: actually collect some data
ESP_LOGI(TAG, "Got PMS5003 data!");
// TODO: Write the data out somewhere
vTaskDelay(pdMS_TO_TICKS(CONFIG_PMS5003_PERIOD_POLL * 1000));
}
}
#endif /* CONFIG_PMS5003_ENABLED */
#ifdef CONFIG_DHT22_ENABLED
#include "dht22.h"
typedef struct {
deci_percent rh;
deci_degrees_c temp;
my_time time;
} my_dht22_data;
my_dht22_data latest_datapoint;
void read_from_dht22() {
// From datasheet:
// - Don't start within 1 second of powering on
vTaskDelay(pdMS_TO_TICKS(1000));
uint32_t num_samples_last_ten_mins = 0;
float relative_humidity_tmp;
float temperature_tmp;
my_dht22_data ten_minute_average;
while (run_dht) {
int ret = dht22_read();
if (ret != DHT22_OK) {
dht22_handle_error(ret);
} else {
latest_datapoint.temp = dht22_temperature();
latest_datapoint.rh = dht22_relative_humidity();
if (has_ntp_time_obtained_once()) {
// I _think_ I only want to be doing that rolling average and saving
// if/when we've got an actual time to do that with. I think that'd
// avoid some weird bugs (e.g. time changing from 1970 -> current time within
// a 10 min period or just saving data saying it's from the 70s)
/*
There is a bug _somewhere_
First log:
W (327852) YASPAM: temperature: 19.500000 & relative humidity: 64.000000
W (327852) YASPAM: ten_minute_average.temp: 195, num_samples: 62
W (332862) YASPAM: temperature: 19.400000 & relative humidity: 64.100000
W (332862) YASPAM: ten_minute_average.temp: 2309, num_samples: 63
W (337872) YASPAM: temperature: 19.500000 & relative humidity: 64.300000
W (337872) YASPAM: ten_minute_average.temp: 18919, num_samples: 64
W (342882) YASPAM: temperature: 19.400000 & relative humidity: 64.200000
W (342882) YASPAM: ten_minute_average.temp: 18626, num_samples: 65
W (347892) YASPAM: temperature: 19.500000 & relative humidity: 64.400000
W (347892) YASPAM: ten_minute_average.temp: 34474, num_samples: 66
W (352902) YASPAM: temperature: 19.300000 & relative humidity: 64.300000
W (352912) YASPAM: ten_minute_average.temp: 34947, num_samples: 67
W (357912) YASPAM: temperature: 19.300000 & relative humidity: 64.500000
W (357912) YASPAM: ten_minute_average.temp: 35406, num_samples: 68
W (362922) YASPAM: temperature: 19.400000 & relative humidity: 64.600000
W (362922) YASPAM: ten_minute_average.temp: 35851, num_samples: 69
Another log:
I (387992) YASPAM: ten_minute_average.temp: 187, num_samples: 74
W (392992) YASPAM: temperature: 18.700000 & relative humidity: 69.900000
I (393002) YASPAM: ten_minute_average.temp: 187, num_samples: 75
W (398002) YASPAM: temperature: 18.600000 & relative humidity: 69.900000
I (398012) YASPAM: ten_minute_average.temp: 53489, num_samples: 76
W (403012) YASPAM: temperature: 18.800000 & relative humidity: 69.900000
I (403022) YASPAM: ten_minute_average.temp: 53649, num_samples: 77
W (408022) YASPAM: temperature: 18.700000 & relative humidity: 69.800000
I (408032) YASPAM: ten_minute_average.temp: 53805, num_samples: 78
W (413032) YASPAM: temperature: 18.800000 & relative humidity: 69.600000
Another log where it corrected itself (decided to print the decitemp
rather than float):
I (22231) YASPAM: latest_datapoint.temp: 188
I (22231) YASPAM: ten_minute_average.temp: 188, num_samples: 1
I (27241) YASPAM: latest_datapoint.temp: 188
I (27241) YASPAM: ten_minute_average.temp: 188, num_samples: 2
I (32251) YASPAM: latest_datapoint.temp: 188
I (32251) YASPAM: ten_minute_average.temp: 188, num_samples: 3
I (37261) YASPAM: latest_datapoint.temp: 187
I (37261) YASPAM: ten_minute_average.temp: 22033, num_samples: 4
I (42271) YASPAM: latest_datapoint.temp: 187
I (42271) YASPAM: ten_minute_average.temp: 16571, num_samples: 5
I (47281) YASPAM: latest_datapoint.temp: 187
I (47281) YASPAM: ten_minute_average.temp: 26401, num_samples: 6
I (52291) YASPAM: latest_datapoint.temp: 187
I (52291) YASPAM: ten_minute_average.temp: 186, num_samples: 7
I (57301) YASPAM: latest_datapoint.temp: 187
I (57301) YASPAM: ten_minute_average.temp: 186, num_samples: 8
I (62311) YASPAM: latest_datapoint.temp: 188
I (62311) YASPAM: ten_minute_average.temp: 186, num_samples: 9
I think someone might be stomping on my bits perhaps?
There's potentially a bug with the average temp calculation (or storing)
I (152421) YASPAM: latest_datapoint.temp: 187
I (152421) YASPAM: ten_minute_average.temp: 187, num_samples: 27
I (157431) YASPAM: latest_datapoint.temp: 188
I (157431) YASPAM: ten_minute_average.temp: 187, num_samples: 28
I (162441) YASPAM: latest_datapoint.temp: 188
I (162441) YASPAM: ten_minute_average.temp: 187, num_samples: 29
... increase temperature for a while
I (558231) YASPAM: latest_datapoint.temp: 246
I (558231) YASPAM: ten_minute_average.temp: 187, num_samples: 108
I (563241) YASPAM: latest_datapoint.temp: 245
I (563241) YASPAM: ten_minute_average.temp: 187, num_samples: 109
I (568241) YASPAM: latest_datapoint.temp: 244
I (568241) YASPAM: ten_minute_average.temp: 187, num_samples: 110
... no change in average
I (618321) YASPAM: latest_datapoint.temp: 234
I (618321) YASPAM: ten_minute_average.temp: 187, num_samples: 120
W (618331) YASPAM: 10 minutes of samples collected. Average temp: 187
I (623331) YASPAM: latest_datapoint.temp: 233
I (623331) YASPAM: ten_minute_average.temp: 233, num_samples: 1
I (628331) YASPAM: latest_datapoint.temp: 231
I (628331) YASPAM: ten_minute_average.temp: 231, num_samples: 2
I (633341) YASPAM: latest_datapoint.temp: 231
I (633341) YASPAM: ten_minute_average.temp: 231, num_samples: 3
I (638341) YASPAM: latest_datapoint.temp: 229
I (638341) YASPAM: ten_minute_average.temp: 22075, num_samples: 4
I (643351) YASPAM: latest_datapoint.temp: 228
I (643351) YASPAM: ten_minute_average.temp: 16613, num_samples: 5
^ Did capture 10 mins of samples though! And appears to reset correctly.
I think the problem is with the integer math truncating any changes properly...
Or something weird like that - I forgot how careful to be around dividing with integers
*/
if (num_samples_last_ten_mins == 0) {
relative_humidity_tmp = latest_datapoint.rh;
temperature_tmp = latest_datapoint.temp;
} else {
relative_humidity_tmp +=
((float) latest_datapoint.rh - relative_humidity_tmp) /
((float) num_samples_last_ten_mins + 1.0);
temperature_tmp +=
((float) latest_datapoint.temp - temperature_tmp ) /
((float) num_samples_last_ten_mins + 1.0);
}
num_samples_last_ten_mins += 1;
ESP_LOGI(TAG, "latest_datapoint.temp: %"PRIi16, latest_datapoint.temp);
ESP_LOGI(TAG, "ten_minute_average.temp: %f, num_samples: %"PRIu32, temperature_tmp, num_samples_last_ten_mins);
// This should be: if (10 minutes of sample taken)
// TODO: check max samples / second that can fit in 10 minutes
if (num_samples_last_ten_mins >=
((10 * 60) / (CONFIG_DHT22_PERIOD_POLL))) {
ESP_LOGW(TAG, "10 minutes of samples collected. Average temp: %f", temperature_tmp);
num_samples_last_ten_mins = 0;
time_t epoch;
time(&epoch);
struct tm *timeinfo = localtime(&epoch);
// There must be a better way - I couldn't figure out how to do it
// nicely all at once
ten_minute_average.time.myt_sec = timeinfo->tm_sec;
// -5 to get the middle of the averaged window
ten_minute_average.time.myt_min = timeinfo->tm_min - 5;
ten_minute_average.time.myt_hour = timeinfo->tm_hour;
ten_minute_average.time.myt_day = timeinfo->tm_mday;
ten_minute_average.time.myt_month = timeinfo->tm_mon;
ten_minute_average.time.myt_year = timeinfo->tm_year;
// TODO check this conversion just works
ten_minute_average.temp = temperature_tmp;
ten_minute_average.rh = relative_humidity_tmp;
// TODO: Write the data out somewhere - into RAM maybe
// TODO: maybe push the data somewhere - or put a flag up that data
// can be pushed
// ^ could do a cute Semaphore thingy here - I don't think I've
// actually used one before
}
}
}
vTaskDelay(pdMS_TO_TICKS(CONFIG_DHT22_PERIOD_POLL * 1000));
}
}
#endif /* CONFIG DHT22_ENABLED */
void app_main(void) {
esp_err_t ret = nvs_flash_init();
if (ret == ESP_ERR_NVS_NO_FREE_PAGES ||
ret == ESP_ERR_NVS_NEW_VERSION_FOUND) {
ESP_ERROR_CHECK(nvs_flash_erase());
ret = nvs_flash_init();
}
ESP_ERROR_CHECK(ret);
#ifdef CONFIG_DHT22_ENABLED
xTaskCreate(read_from_dht22, "DHT22",
4 * 1024, // honestly I have _no_ idea
NULL,
5, // no idea either
&dht22_handle);
#endif /* CONFIG_DHT22_ENABLED */
#ifdef CONFIG_PMS5003_ENABLED
xTaskCreate(read_from_pms5003, "PMS5003",
4 * 1024, // honestly I have _no_ idea
NULL,
5, // no idea either
&pms5003_handle);
#endif /* CONFIG_PMS5003_ENABLED */
start_wifi();
}
Reference in New Issue View Git Blame Copy Permalink