diff options
| author | jacqueline <me@jacqueline.id.au> | 2023-07-25 17:42:36 +1000 |
|---|---|---|
| committer | jacqueline <me@jacqueline.id.au> | 2023-07-25 17:43:12 +1000 |
| commit | 80d7df910987db5201402fe987124f29f09344f3 (patch) | |
| tree | 7e8c1e04ab40026087343efee95a771c7839b32f /src/events | |
| parent | 7b72e5479ee6d11f76c49f7463ba0e7f4e5165c5 (diff) | |
| download | tangara-fw-80d7df910987db5201402fe987124f29f09344f3.tar.gz | |
fuck off
Diffstat (limited to 'src/events')
| -rw-r--r-- | src/events/event_queue.cpp | 9 | ||||
| -rw-r--r-- | src/events/include/event_queue.hpp | 6 |
2 files changed, 3 insertions, 12 deletions
diff --git a/src/events/event_queue.cpp b/src/events/event_queue.cpp index 8678211c..8d60218a 100644 --- a/src/events/event_queue.cpp +++ b/src/events/event_queue.cpp @@ -16,8 +16,7 @@ static const std::size_t kMaxPendingEvents = 16; EventQueue::EventQueue() : system_handle_(xQueueCreate(kMaxPendingEvents, sizeof(WorkItem*))), - ui_handle_(xQueueCreate(kMaxPendingEvents, sizeof(WorkItem*))), - audio_handle_(xQueueCreate(kMaxPendingEvents, sizeof(WorkItem*))) {} + ui_handle_(xQueueCreate(kMaxPendingEvents, sizeof(WorkItem*))) {} auto ServiceQueue(QueueHandle_t queue, TickType_t max_wait_time) -> bool { WorkItem* item; @@ -29,7 +28,7 @@ auto ServiceQueue(QueueHandle_t queue, TickType_t max_wait_time) -> bool { return false; } -auto EventQueue::ServiceSystem(TickType_t max_wait_time) -> bool { +auto EventQueue::ServiceSystemAndAudio(TickType_t max_wait_time) -> bool { return ServiceQueue(system_handle_, max_wait_time); } @@ -37,8 +36,4 @@ auto EventQueue::ServiceUi(TickType_t max_wait_time) -> bool { 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 diff --git a/src/events/include/event_queue.hpp b/src/events/include/event_queue.hpp index 01f37896..95c331d5 100644 --- a/src/events/include/event_queue.hpp +++ b/src/events/include/event_queue.hpp @@ -50,8 +50,6 @@ class EventQueue { [=]() { tinyfsm::FsmList<Machine>::template dispatch<Event>(ev); }); if (std::is_same<Machine, ui::UiState>()) { xQueueSend(ui_handle_, &item, portMAX_DELAY); - } else if (std::is_same<Machine, audio::AudioState>()) { - xQueueSend(audio_handle_, &item, portMAX_DELAY); } else { xQueueSend(system_handle_, &item, portMAX_DELAY); } @@ -61,9 +59,8 @@ class EventQueue { template <typename Event> auto Dispatch(const Event& ev) -> void {} - auto ServiceSystem(TickType_t max_wait_time) -> bool; + auto ServiceSystemAndAudio(TickType_t max_wait_time) -> bool; auto ServiceUi(TickType_t max_wait_time) -> bool; - auto ServiceAudio(TickType_t max_wait_time) -> bool; EventQueue(EventQueue const&) = delete; void operator=(EventQueue const&) = delete; @@ -73,7 +70,6 @@ class EventQueue { QueueHandle_t system_handle_; QueueHandle_t ui_handle_; - QueueHandle_t audio_handle_; }; template <typename Event, typename... Machines> |
