arthurr/esp-air-monitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Issues with stack traces when 3 tasks running

Browse Source 
I think it could be with ISR... maybe? I'm not 100% what an interrupt
actually realy is
This commit is contained in:
Arthur Roberts
2023-10-25 19:50:10 +01:00
parent bef67215cb
commit ae598ea5b9
1 changed files with 39 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
main/main.c
View File

@@ -20,6 +20,7 @@ static EventGroupHandle_t s_monitor_event_group;
static volatile bool run_dht = true; static volatile bool run_dht = true;
static volatile bool run_pms5003 = true; static volatile bool run_pms5003 = true;
static volatile bool run_data_collection = true;
#ifdef CONFIG_DHT22_DATA_GPIO #ifdef CONFIG_DHT22_DATA_GPIO
#define SENSOR_DHT22_BIT (1 << 0) #define SENSOR_DHT22_BIT (1 << 0)
@@ -33,11 +34,14 @@ static volatile bool run_pms5003 = true;
#define SENSOR_PMS5003_BIT 0 #define SENSOR_PMS5003_BIT 0
#endif /* CONFIG_PMS5003_ENABLED */ #endif /* CONFIG_PMS5003_ENABLED */
#define SENSOR_PMS5003_BIT (1 << 1)
#define SENSOR_ALL SENSOR_DHT22_BIT | SENSOR_PMS5003_BIT #define SENSOR_ALL SENSOR_DHT22_BIT | SENSOR_PMS5003_BIT
// TODO - figure out how to continually call this, maybe make a task for it? // TODO - figure out how to continually call this, maybe make a task for it?
void save_measurements() { void save_measurements() {
while (run_data_collection) {
EventBits_t bits = xEventGroupWaitBits( EventBits_t bits = xEventGroupWaitBits(
s_monitor_event_group, s_monitor_event_group,
SENSOR_ALL, SENSOR_ALL,
@@ -45,57 +49,64 @@ void save_measurements() {
pdFALSE, pdFALSE,
portMAX_DELAY); portMAX_DELAY);
if (bits & SENSOR_DHT22_BIT) { if (bits & SENSOR_DHT22_BIT) {
deci_percent rh = dht22_relative_humidity(); deci_percent rh = dht22_relative_humidity();
deci_degrees_c temp = dht22_temperature(); deci_degrees_c temp = dht22_temperature();
// TODO - think about how to actually store this somewhere (for pushing and/or pulling) // TODO - think about how to actually store this somewhere (for pushing and/or pulling)
// and what sort of structures I could use // and what sort of structures I could use
ESP_LOGI(TAG, "Saved DHT data");
xEventGroupClearBits(s_monitor_event_group, SENSOR_DHT22_BIT);
} }
if (bits & SENSOR_PMS5003_BIT) { if (bits & SENSOR_PMS5003_BIT) {
ESP_LOGI(TAG, "Saved PMS data");
// TODO // TODO
xEventGroupClearBits(s_monitor_event_group, SENSOR_PMS5003_BIT);
}
} }
} }
void read_from_pms5003() { void read_from_pms5003() {
while (run_pms5003) { while (run_pms5003) {
// Data reading is based on time spent high, so need to block interrups etc // TODO - actually collect some data
portDISABLE_INTERRUPTS();
//int ret = pms5003_read();
portENABLE_INTERRUPTS();
ESP_LOGI(TAG, "Got PMS5003 data! Setting PMS bit now!"); ESP_LOGI(TAG, "Got PMS5003 data! Setting PMS bit now!");
xEventGroupSetBits(s_monitor_event_group, SENSOR_DHT22_BIT); xEventGroupSetBitsFromISR(s_monitor_event_group, SENSOR_PMS5003_BIT);
vTaskDelay(pdMS_TO_TICKS(1000)); // TODO: make this a config check vTaskDelay(pdMS_TO_TICKS(100)); // TODO: make this a config check
} }
} }
void read_from_dht22() { void read_from_dht22() {
while (run_dht) { while (run_dht) {
// Data reading is based on time spent high, so need to block interrups etc // Data reading is based on time, so need to block interrups etc
portDISABLE_INTERRUPTS(); portDISABLE_INTERRUPTS();
int ret = dht22_read(); int ret = dht22_read();
portENABLE_INTERRUPTS(); portENABLE_INTERRUPTS();
ESP_LOGI(TAG, "Got DHT22 data! Setting DHT bit now!"); ESP_LOGI(TAG, "Got DHT22 data! Setting DHT bit now!");
xEventGroupSetBits(s_monitor_event_group, SENSOR_DHT22_BIT); xEventGroupSetBitsFromISR(s_monitor_event_group, SENSOR_DHT22_BIT);
vTaskDelay(pdMS_TO_TICKS(2000)); // TODO: make this a config check vTaskDelay(pdMS_TO_TICKS(3000)); // TODO: make this a config check
} }
} }
void app_main(void) { void app_main(void) {
s_monitor_event_group = xEventGroupCreate();
xTaskCreate(read_from_dht22, xTaskCreate(read_from_dht22,
"READ DHT22", "DHT22",
1024, // honestly I have _no_ idea 1024, // honestly I have _no_ idea
NULL, NULL,
5, // no idea either 5, // no idea either
NULL); // will probably change this so that I can cancel the delay NULL); // will probably change this so that I can cancel the delay
xTaskCreate(read_from_pms5003, xTaskCreate(read_from_pms5003,
"READ PMS5003", "PMS5003",
1024, // honestly I have _no_ idea 1024, // honestly I have _no_ idea
NULL, NULL,
5, // no idea either 5, // no idea either
NULL); // will probably change this so that I can cancel the delay NULL); // will probably change this so that I can cancel the delay
xTaskCreate(save_measurements,
esp_restart(); "save_measurements",
4*1024, // honestly I have _no_ idea
NULL,
5, // no idea either
NULL); // will probably change this so that I can cancel the delay
} }