MightyPork/tangara-fw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add interrupts for samd changes

Browse Source
This commit is contained in:
jacqueline
2023-08-18 15:40:24 +10:00
parent 697ec3c584
commit cad7060540
10 changed files with 118 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/main.cpp
+8 -3
View File
@@ -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{});
}
}
}