feat: add user input manager; add list

src/input/encoder.cpp

@@ -57,7 +57,7 @@ namespace Encoder
 
     void handlePress()
     {
-        Serial.println("Encoder pressed");
+        //Serial.println("Encoder pressed");
         for (OnButtonPressCallback callback : onButtonPressCallbacks) {
             callback();
         }
@@ -65,7 +65,7 @@ namespace Encoder
 
     void handleRelease()
     {
-        Serial.println("Encoder released");
+        //Serial.println("Encoder released");
         for (OnButtonReleaseCallback callback : onButtonReleaseCallbacks) {
             callback();
         }
@@ -73,8 +73,8 @@ namespace Encoder
 
     void handleRotate(int8_t rotation)
     {
-        Serial.print("Encoder rotated by ");
+        //Serial.print("Encoder rotated by ");
-        Serial.println(rotation);
+        //Serial.println(rotation);
         for (OnRotateCallback callback : onRotateCallbacks) {
             callback(rotation);
         }

src/input/user_input_manager.cpp

@@ -0,0 +1,79 @@
+#include <Arduino.h>
+#include <input/encoder.hpp>
+#include <input/user_input_manager.hpp>
+
+#include <vector>
+#include <queue>
+#include <map>
+
+namespace UserInputManager
+{
+    using std::map;
+    using std::vector;
+    using std::queue;
+
+    void handleEncoderButtonRelease();
+    void handleEncoderButtonPress();
+    void handleEncoderRotate(int);
+
+    void pushEvent(InputEvent event);
+
+    map<String, queue<InputEvent>> input_event_queues;
+
+    void init()
+    {
+        Encoder::onButtonRelease(handleEncoderButtonRelease);
+        Encoder::onButtonPress(handleEncoderButtonPress);
+        Encoder::onRotate(handleEncoderRotate);
+    }
+
+    void handleEncoderButtonPress()
+    {
+        pushEvent(EncoderButtonPress);
+    }
+
+    void handleEncoderButtonRelease()
+    {
+        pushEvent(EncoderButtonRelease);
+    }
+
+    void handleEncoderRotate(int rotation)
+    {
+        if (rotation > 0)
+        {
+            pushEvent(EncoderRotateRight);
+        }
+        else
+        {
+            pushEvent(EncoderRotateLeft);
+        }
+    }
+
+    void pushEvent(InputEvent event)
+    {
+        Serial.println("pushing new event " + String(event));
+        for (auto &queue : input_event_queues)
+        {
+            Serial.println("pushing event to queue " + queue.first + " (" + String(queue.second.size()) + ")");
+            queue.second.push(event);
+        }
+    }
+
+    InputEvent getNextEvent(String name)
+    {
+        queue<InputEvent> &events = input_event_queues.at(name);
+        if (events.empty())
+        {
+            return InputEvent::None;
+        }
+        InputEvent event = events.front();
+        events.pop();
+        return event;
+    }
+
+    void registerForEvents(String name)
+    {
+        queue<InputEvent> events = {};
+        input_event_queues[name] = events;
+    }
+}

src/input/user_input_manager.hpp

@@ -0,0 +1,24 @@
+#ifndef DRUMZ_USER_INPUT_MANAGER_HPP
+#define DRUMZ_USER_INPUT_MANAGER_HPP
+
+#include <Arduino.h>
+#include <vector>
+
+namespace UserInputManager
+{
+    using std::vector;
+    
+    enum InputEvent
+    {
+        None,
+        EncoderButtonPress,
+        EncoderButtonRelease,
+        EncoderRotateLeft,
+        EncoderRotateRight,
+    };
+    void init();
+    InputEvent getNextEvent(String name);
+    void registerForEvents(String name);
+}
+
+#endif // DRUMZ_USER_INPUT_MANAGER_HPP

src/main.cpp

@@ -13,6 +13,7 @@
 #include <ui/display.hpp>
 #include <input/encoder.hpp>
 #include <input/pad_reader.hpp>
+#include <input/user_input_manager.hpp>
 #include <audio/tone_generator.hpp>
 
 const int ONBOARD_LED_PIN = 2;
@@ -26,6 +27,7 @@ void setup()
   Encoder::init();
   Display::init();
   ToneGenerator::init();
+  UserInputManager::init();
 
   Serial.println("setup complete");
 }

src/ui/display.cpp

@@ -5,6 +5,9 @@
 
 #include <input/encoder.hpp>
 #include <ui/views/main_view.hpp>
+#include <input/user_input_manager.hpp>
+
+#include <vector>
 
 #ifndef SCREEN_WIDTH
 #define SCREEN_WIDTH 320
@@ -17,16 +20,23 @@
 #define DRAW_BUF_SIZE (SCREEN_WIDTH * SCREEN_HEIGHT / 10 * (LV_COLOR_DEPTH / 8))
 namespace Display
 {
+  using std::vector;
+  using UserInputManager::InputEvent;
+
   const uint8_t MAIN_VIEW = 1;
+  const String USER_INPUT_HANDLE = "display";
 
   uint32_t draw_buf[DRAW_BUF_SIZE / 4];
 
   uint32_t getTime();
   void handleLvglLogs(lv_log_level_t level, const char *buf);
   void handleUpdateValues(lv_timer_t *timer);
+  void handleReadUserInput(lv_indev_t *indev, lv_indev_data_t *data);
   void setCurrentView(uint8_t view);
 
   lv_timer_t *update_values_timer;
+  lv_indev_t *indev;
+
   uint8_t current_view = 0;
 
   void init()
@@ -42,6 +52,11 @@ namespace Display
     display = lv_tft_espi_create(SCREEN_HEIGHT, SCREEN_WIDTH, draw_buf, sizeof(draw_buf));
     lv_display_set_rotation(display, LV_DISPLAY_ROTATION_90);
 
+    UserInputManager::registerForEvents(USER_INPUT_HANDLE);
+    indev = lv_indev_create();
+    lv_indev_set_type(indev, LV_INDEV_TYPE_KEYPAD);
+    lv_indev_set_read_cb(indev, handleReadUserInput);
+
     setCurrentView(MAIN_VIEW);
   }
 
@@ -60,14 +75,16 @@ namespace Display
     return esp_timer_get_time() / 1000;
   }
 
-  void setCurrentView(uint8_t view) {
+  void setCurrentView(uint8_t view)
+  {
     current_view = view;
     lv_obj_t *parent = lv_screen_active();
     lv_obj_clean(parent);
-    switch(view) {
+    switch (view)
-      case MAIN_VIEW:
+    {
-        MainView::render(parent);
+    case MAIN_VIEW:
-        break;
+      MainView::render(parent, indev);
+      break;
     }
   }
 
@@ -80,4 +97,32 @@ namespace Display
       break;
     }
   }
+
+  void handleReadUserInput(lv_indev_t *indev, lv_indev_data_t *data)
+  {
+    InputEvent event = UserInputManager::getNextEvent(USER_INPUT_HANDLE);
+    switch (event)
+    {
+    case InputEvent::EncoderButtonRelease:
+      data->key = LV_KEY_ENTER;
+      data->state = LV_INDEV_STATE_RELEASED;
+      Serial.println("indev event EncoderButtonRelease");
+      break;
+    case InputEvent::EncoderButtonPress:
+      data->key = LV_KEY_ENTER;
+      data->state = LV_INDEV_STATE_PRESSED;
+      Serial.println("indev event EncoderButtonPress");
+      break;
+    case InputEvent::EncoderRotateLeft:
+      data->key = LV_KEY_PREV;
+      data->state = LV_INDEV_STATE_PRESSED;
+      Serial.println("indev event EncoderRotateLeft");
+      break;
+    case InputEvent::EncoderRotateRight:
+      data->key = LV_KEY_NEXT;
+      data->state = LV_INDEV_STATE_PRESSED;
+      Serial.println("indev event EncoderRotateRight");
+      break;
+    }
+  }
 }

src/ui/views/main_view.cpp

@@ -4,38 +4,47 @@
 #include <input/encoder.hpp>
 #include <audio/tone_generator.hpp>
 
+#include <vector>
+
 namespace MainView
 {
-  void handleEnterButton();
+  using std::vector;
 
   lv_obj_t *label;
+  lv_obj_t *list;
   String label_text;
-  int frequency = ToneGenerator::getFrequency();
 
-  void render(lv_obj_t *parent)
+  void render(lv_obj_t *parent, lv_indev_t *indev)
   {
-    label = lv_label_create(lv_screen_active());
+    lv_group_t *group = lv_group_create();
-    lv_obj_align(label, LV_ALIGN_CENTER, 0, 0);
+    lv_indev_set_group(indev, group);
-    label_text = "Main view initialized.";
 
-    Encoder::onButtonPress(handleEnterButton);
+    list = lv_list_create(parent);
+    lv_obj_set_width(list, lv_pct(100));
+    lv_obj_set_height(list, lv_pct(100));
+    lv_obj_center(list);
+
+    vector<String> items = {
+        "Michael Jackson",
+        "The Beatles",
+        "Rolling Stones",
+        "Led Zeppelin",
+        "Queen",
+        "Prince",
+        "The Who",
+        "Nirvana",
+        "Pink Floyd",
+        "The Clash"};
+
+    lv_obj_t *btn;
+    for (String item : items)
+    {
+      btn = lv_list_add_btn(list, NULL, item.c_str());
+      lv_group_add_obj(group, btn);
+    }
   }
 
   void update()
   {
-    if (frequency != ToneGenerator::getFrequency())
-    {
-      frequency = ToneGenerator::getFrequency();
-      label_text = "Frequency: " + String(frequency) + "Hz";
-    }
-    if (label != NULL && lv_label_get_text(label) != label_text.c_str())
-    {
-      lv_label_set_text(label, label_text.c_str());
-    }
-  }
-
-  void handleEnterButton()
-  {
-    label_text = "Button pressed.";
   }
 }

src/ui/views/main_view.hpp

@@ -5,7 +5,7 @@
 
 namespace MainView
 {
-    void render(lv_obj_t *parent);
+    void render(lv_obj_t *parent, lv_indev_t *indev);
     void update();
 }