diff options
Diffstat (limited to 'src/main/main.cpp')
| -rw-r--r-- | src/main/main.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/main/main.cpp b/src/main/main.cpp index 685e1fc1..f6aba812 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -18,7 +18,8 @@ extern "C" void app_main(void) { ESP_ERROR_CHECK(drivers::init_i2c()); - drivers::Gpios* gpios = system_fsm::SystemState::early_init_gpios(); + 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 @@ -27,7 +28,8 @@ extern "C" void app_main(void) { QueueSetHandle_t set = xQueueCreateSet(2); auto* event_queue = events::queues::SystemAndAudio(); xQueueAddToSet(event_queue->has_events(), set); - xQueueAddToSet(gpios->IsReadPending(), set); + xQueueAddToSet(gpios_semphr, set); + xQueueAddToSet(samd_semphr, set); tinyfsm::FsmList<system_fsm::SystemState, ui::UiState, audio::AudioState>::start(); @@ -36,9 +38,12 @@ extern "C" void app_main(void) { QueueSetMemberHandle_t member = xQueueSelectFromSet(set, portMAX_DELAY); if (member == event_queue->has_events()) { event_queue->Service(0); - } else if (member == gpios->IsReadPending()) { + } 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{}); } } } |