From 9122a33693d8b57402159820fb9eabdda926c3e8 Mon Sep 17 00:00:00 2001
From: "D.R.racer" <drracer@drracer.eu>
Date: Tue, 29 Jun 2021 12:20:24 +0200
Subject: [PATCH] Rebase onto upstream/main, adapt to cleaned-up circular
 buffer interface

---
 src/modules/user_input.cpp | 16 ++++++++--------
 src/modules/user_input.h   |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/modules/user_input.cpp b/src/modules/user_input.cpp
index 6677738..4d0685c 100644
--- a/src/modules/user_input.cpp
+++ b/src/modules/user_input.cpp
@@ -8,29 +8,29 @@ UserInput userInput;
 
 void UserInput::Step() {
     if (buttons::buttons.ButtonPressed(0))
-        eventQueue.push_back(Event::Left);
+        eventQueue.push(Event::Left);
     if (buttons::buttons.ButtonPressed(1))
-        eventQueue.push_back(Event::Middle);
+        eventQueue.push(Event::Middle);
     if (buttons::buttons.ButtonPressed(2))
-        eventQueue.push_back(Event::Right);
+        eventQueue.push(Event::Right);
 }
 
 void UserInput::ProcessMessage(uint8_t ev) {
-    eventQueue.push_back((Event)ev);
+    eventQueue.push((Event)ev);
 }
 
 Event UserInput::ConsumeEvent() {
-    if (eventQueue.IsEmpty())
+    if (eventQueue.empty())
         return Event::NoEvent;
     Event rv;
-    eventQueue.ConsumeFirst(rv);
+    eventQueue.pop(rv);
     return rv;
 }
 
 void UserInput::Clear() {
-    while (!eventQueue.IsEmpty()) {
+    while (!eventQueue.empty()) {
         Event x;
-        eventQueue.ConsumeFirst(x);
+        eventQueue.pop(x);
     }
 }
 
diff --git a/src/modules/user_input.h b/src/modules/user_input.h
index 99c29b0..79d7098 100644
--- a/src/modules/user_input.h
+++ b/src/modules/user_input.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <stdint.h>
-#include "../hal/circle_buffer.hpp"
+#include "../hal/circular_buffer.h"
 
 namespace modules {
 
@@ -29,13 +29,13 @@ public:
     Event ConsumeEvent();
 
     /// @returns true if there is at least one event in the event queue
-    bool AnyEvent() const { return !eventQueue.IsEmpty(); }
+    bool AnyEvent() const { return !eventQueue.empty(); }
 
     /// Remove all buffered events from the event queue
     void Clear();
 
 private:
-    CircleBuffer<Event, 4> eventQueue;
+    CircularBuffer<Event, uint_fast8_t, 4> eventQueue;
 };
 
 extern UserInput userInput;