From ee5f662f9bb150138545ca35ef5c4896eb74daea Mon Sep 17 00:00:00 2001 From: jacqueline Date: Thu, 1 Jun 2023 15:52:07 +1000 Subject: [PATCH] Fix missing service impl --- src/events/event_queue.cpp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/events/event_queue.cpp b/src/events/event_queue.cpp index 1b04cb90..8678211c 100644 --- a/src/events/event_queue.cpp +++ b/src/events/event_queue.cpp @@ -7,6 +7,7 @@ #include "event_queue.hpp" #include "freertos/FreeRTOS.h" +#include "freertos/portmacro.h" #include "freertos/queue.h" namespace events { @@ -18,9 +19,9 @@ EventQueue::EventQueue() ui_handle_(xQueueCreate(kMaxPendingEvents, sizeof(WorkItem*))), audio_handle_(xQueueCreate(kMaxPendingEvents, sizeof(WorkItem*))) {} -auto EventQueue::ServiceSystem(TickType_t max_wait_time) -> bool { +auto ServiceQueue(QueueHandle_t queue, TickType_t max_wait_time) -> bool { WorkItem* item; - if (xQueueReceive(system_handle_, &item, max_wait_time)) { + if (xQueueReceive(queue, &item, max_wait_time)) { (*item)(); delete item; return true; @@ -28,14 +29,16 @@ auto EventQueue::ServiceSystem(TickType_t max_wait_time) -> bool { return false; } +auto EventQueue::ServiceSystem(TickType_t max_wait_time) -> bool { + return ServiceQueue(system_handle_, max_wait_time); +} + auto EventQueue::ServiceUi(TickType_t max_wait_time) -> bool { - WorkItem* item; - if (xQueueReceive(ui_handle_, &item, max_wait_time)) { - (*item)(); - delete item; - return true; - } - return false; + return ServiceQueue(ui_handle_, max_wait_time); +} + +auto EventQueue::ServiceAudio(TickType_t max_wait_time) -> bool { + return ServiceQueue(audio_handle_, max_wait_time); } } // namespace events