[BREAKING] Update espp for LVGL v9 and refactor some components

components/box-emu/CMakeLists.txt

@@ -18,6 +18,7 @@ idf_component_register(
   "button"
   "display"
   "display_drivers"
+  "drv2605"
   "mcp23x17"
   "input_drivers"
   "tt21100"

components/box-emu/include/box-emu.hpp

@@ -22,6 +22,7 @@
 #include "aw9523.hpp"
 #include "base_component.hpp"
 #include "button.hpp"
+#include "drv2605.hpp"
 #include "events.hpp"
 #include "high_resolution_timer.hpp"
 #include "keypad_input.hpp"
@@ -36,6 +37,8 @@
 #include "gamepad_state.hpp"
 #include "video_setting.hpp"
 
+#include "make_color.h"
+
 class BoxEmu : public espp::BaseComponent {
 public:
   /// The Version of the BoxEmu
@@ -59,10 +62,6 @@ class BoxEmu : public espp::BaseComponent {
 
   static constexpr char mount_point[] = "/sdcard";
 
-  static uint16_t make_color(uint8_t r, uint8_t g, uint8_t b) {
-    return lv_color_make(r,g,b).full;
-  }
-
   /// Get the version of the BoxEmu that was detected
   /// \return The version of the BoxEmu that was detected
   /// \see Version
@@ -129,6 +128,16 @@ class BoxEmu : public espp::BaseComponent {
   VideoSetting video_setting() const;
   void video_setting(const VideoSetting setting);
 
+  /////////////////////////////////////////////////////////////////////////////
+  // Haptic Motor (DRV2605)
+  /////////////////////////////////////////////////////////////////////////////
+
+  bool initialize_haptics();
+  std::shared_ptr<espp::Drv2605> haptics() const;
+  void play_haptic_effect();
+  void play_haptic_effect(int effect);
+  void set_haptic_effect(int effect);
+
   /////////////////////////////////////////////////////////////////////////////
   // USB
   /////////////////////////////////////////////////////////////////////////////
@@ -319,6 +328,9 @@ class BoxEmu : public espp::BaseComponent {
   const uint16_t* palette_{nullptr};
   size_t palette_size_{256};
 
+  // haptics
+  std::shared_ptr<espp::Drv2605> haptic_motor_{nullptr};
+
   // usb
   std::atomic<bool> usb_enabled_{false};
   usb_phy_handle_t jtag_phy_;

components/box-emu/src/box-emu.cpp

@@ -50,8 +50,15 @@ bool BoxEmu::initialize_box() {
     return false;
   }
   static constexpr size_t pixel_buffer_size = espp::EspBox::lcd_width() * num_rows_in_framebuffer;
+  static constexpr int update_period_ms = 16;
+  espp::Task::BaseConfig display_task_config = {
+    .name = "Display",
+    .stack_size_bytes = 6 * 1024,
+    .priority = 10,
+    .core_id = 1,
+  };
   // initialize the LVGL display for the esp-box
-  if (!box.initialize_display(pixel_buffer_size)) {
+  if (!box.initialize_display(pixel_buffer_size, display_task_config, update_period_ms)) {
     logger_.error("Failed to initialize display!");
     return false;
   }
@@ -496,6 +503,67 @@ void BoxEmu::video_setting(const VideoSetting setting) {
   video_setting_ = setting;
 }
 
+/////////////////////////////////////////////////////////////////////////////
+// Haptic Motor
+/////////////////////////////////////////////////////////////////////////////
+
+bool BoxEmu::initialize_haptics() {
+  if (haptic_motor_) {
+    logger_.error("Haptics already initialized!");
+    return false;
+  }
+  logger_.info("Initializing haptics");
+  haptic_motor_ = std::make_shared<espp::Drv2605>(espp::Drv2605::Config{
+      .device_address = espp::Drv2605::DEFAULT_ADDRESS,
+      .write = std::bind(&espp::I2c::write, &external_i2c_, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3),
+      .read_register = std::bind(&espp::I2c::read_at_register, &external_i2c_, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4),
+      .motor_type = espp::Drv2605::MotorType::LRA
+    });
+  // we're using an LRA motor, so select th LRA library.
+  std::error_code ec;
+  haptic_motor_->select_library(espp::Drv2605::Library::LRA, ec);
+  if (ec) {
+    logger_.error("Error selecting LRA library: {}", ec.message());
+    return false;
+  }
+  return true;
+}
+
+std::shared_ptr<espp::Drv2605> BoxEmu::haptics() const {
+  return haptic_motor_;
+}
+
+void BoxEmu::play_haptic_effect() {
+  if (haptic_motor_ == nullptr) {
+    logger_.error("Haptic motor not initialized!");
+    return;
+  }
+    std::error_code ec;
+    haptic_motor_->start(ec);
+    if (ec) {
+      logger_.error("Error starting haptic motor: {}", ec.message());
+    }
+}
+
+void BoxEmu::play_haptic_effect(int effect) {
+  if (haptic_motor_ == nullptr) {
+    logger_.error("Haptic motor not initialized!");
+    return;
+  }
+  set_haptic_effect(effect);
+  play_haptic_effect();
+}
+
+void BoxEmu::set_haptic_effect(int effect) {
+  if (haptic_motor_ == nullptr) {
+    logger_.error("Haptic motor not initialized!");
+    return;
+  }
+  std::error_code ec;
+  haptic_motor_->set_waveform(0, (espp::Drv2605::Waveform)(effect), ec);
+  haptic_motor_->set_waveform(1, espp::Drv2605::Waveform::END, ec);
+}
+
 /////////////////////////////////////////////////////////////////////////////
 // USB
 /////////////////////////////////////////////////////////////////////////////

components/box-emu/src/make_color.cpp

@@ -3,5 +3,5 @@
 #include <lvgl/lvgl.h>
 
 extern "C" uint16_t make_color(uint8_t r, uint8_t g, uint8_t b) {
-    return lv_color_make(r,g,b).full;
+    return lv_color_to_u16(lv_color_make(r, g, b));
 }

components/genesis/gwenesis/src/vdp/gwenesis_vdp_mem.c

@@ -36,10 +36,16 @@ __license__ = "GPLv3"
 #define VDP_MEM_DISABLE_LOGGING 1
 
 static inline uint16_t to_pixel(uint16_t value) {
+  // convert rgb 444 to bgr 565
   return
-    ((value & 0xe00) << 1) |
-    ((value & 0x0e0) >> 5) |
-    ((value & 0x00e) << 4);
+    ((value & 0xe00)) >> 7 | // red
+    ((value & 0x0e0)) << 3 | // green
+    ((value & 0x00e)) << 12; // blue
+  // was:
+  /* return */
+  /*   ((value & 0xe00) << 1) | */
+  /*   ((value & 0x0e0) >> 5) | */
+  /*   ((value & 0x00e) << 4); */
 }
 
 #if !VDP_MEM_DISABLE_LOGGING

components/gui/CMakeLists.txt

@@ -1,5 +1,5 @@
 idf_component_register(
-  SRC_DIRS "src" "generated" "generated/screens" "generated/components"
   INCLUDE_DIRS "include"
   PRIV_INCLUDE_DIRS "generated"
-  REQUIRES lvgl task display logger jpeg rom_info box-emu)
+  SRC_DIRS "src" "generated" "generated/screens" "generated/components" "generated/images"
+  REQUIRES lvgl timer display logger jpeg rom_info box-emu)

components/gui/generated/CMakeLists.txt

@@ -3,6 +3,6 @@ SET(SOURCES screens/ui_romscreen.c
     ui.c
     components/ui_comp_hook.c
     ui_helpers.c
-    ui_events.c)
+    ui_temporary_image.c)
 
 add_library(ui ${SOURCES})

components/gui/generated/filelist.txt

@@ -3,4 +3,4 @@ screens/ui_settingsscreen.c
 ui.c
 components/ui_comp_hook.c
 ui_helpers.c
-ui_events.c
+ui_temporary_image.c