From 230721cd6271f3239b42e1d2471f8db15bebd712 Mon Sep 17 00:00:00 2001 From: jacqueline Date: Fri, 24 Nov 2023 07:18:14 +1100 Subject: Periodically check int lines instead of relying on interrupts --- src/main/main.cpp | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) (limited to 'src/main/main.cpp') diff --git a/src/main/main.cpp b/src/main/main.cpp index 3ae045d1..ddd9cad0 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -6,7 +6,6 @@ #include "freertos/portmacro.h" -#include "gpios.hpp" #include "i2c.hpp" #include "system_events.hpp" #include "tinyfsm.hpp" @@ -18,32 +17,12 @@ extern "C" void app_main(void) { ESP_ERROR_CHECK(drivers::init_i2c()); - SemaphoreHandle_t gpios_semphr = drivers::Gpios::CreateReadPending(); - SemaphoreHandle_t samd_semphr = drivers::Samd::CreateReadPending(); - - // Semaphores must be empty before being added to a queue set. Hence all this - // weird early init stuff; by being explicit about initialisation order, we're - // able to handle GPIO ISR notifcations + system events from the same task, - // and a little mess with worth not needing to allocate a whole extra stack. - QueueSetHandle_t set = xQueueCreateSet(3); - auto* event_queue = events::queues::SystemAndAudio(); - xQueueAddToSet(event_queue->has_events(), set); - xQueueAddToSet(gpios_semphr, set); - xQueueAddToSet(samd_semphr, set); tinyfsm::FsmList::start(); + auto* event_queue = events::queues::SystemAndAudio(); while (1) { - QueueSetMemberHandle_t member = xQueueSelectFromSet(set, portMAX_DELAY); - if (member == event_queue->has_events()) { - event_queue->Service(0); - } else if (member == gpios_semphr) { - xSemaphoreTake(member, 0); - events::System().Dispatch(system_fsm::internal::GpioInterrupt{}); - } else if (member == samd_semphr) { - xSemaphoreTake(member, 0); - events::System().Dispatch(system_fsm::internal::SamdInterrupt{}); - } + event_queue->Service(portMAX_DELAY); } } -- cgit v1.2.3