feat: update peripherals

* Updated espp submodule to have latest version which contains new I2C class and updated versions of the touch peripherals
* Updated box-emu-hal component to simplify the i2c code to use new espp::I2c class
* Updated associated input / main code using i2c peripherals to use new i2c classes and to simplify it.

Author: finger563

components/box-emu-hal/CMakeLists.txt

@@ -1,5 +1,5 @@
 idf_component_register(
   INCLUDE_DIRS "include"
   SRC_DIRS "src"
-  REQUIRES "driver" "heap" "fatfs" "esp_lcd" "esp_psram" "spi_flash" "nvs_flash" "codec" "display" "display_drivers" "controller" "mcp23x17" "ads1x15" "qwiicnes" "input_drivers" "ft5x06" "tt21100" "drv2605" "event_manager"
+  REQUIRES "driver" "heap" "fatfs" "esp_lcd" "esp_psram" "spi_flash" "nvs_flash" "codec" "display" "display_drivers" "mcp23x17" "input_drivers" "tt21100" "drv2605" "event_manager" "i2c"
   )

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

@@ -0,0 +1,10 @@
+#pragma once
+
+#include <memory>
+
+#include "i2c.hpp"
+
+extern std::shared_ptr<espp::I2c> internal_i2c;
+extern std::shared_ptr<espp::I2c> external_i2c;
+
+void i2c_init();

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

@@ -0,0 +1,30 @@
+#include "hal_i2c.hpp"
+
+// Only used for the touchpad and the imu
+static constexpr i2c_port_t I2C_INTERNAL = I2C_NUM_0;
+// used for our peripherals (external to the ESP S3 BOX)
+static constexpr i2c_port_t I2C_EXTERNAL = I2C_NUM_1;
+static constexpr int I2C_FREQ_HZ = (400*1000);
+static constexpr int I2C_TIMEOUT_MS = 10;
+
+std::shared_ptr<espp::I2c> internal_i2c = nullptr;
+std::shared_ptr<espp::I2c> external_i2c = nullptr;
+
+static bool initialized = false;
+
+void i2c_init() {
+  if (initialized) return;
+  internal_i2c = std::make_shared<espp::I2c>(espp::I2c::Config{
+      .port = I2C_INTERNAL,
+      .sda_io_num = GPIO_NUM_8,
+      .scl_io_num = GPIO_NUM_18,
+      .sda_pullup_en = GPIO_PULLUP_ENABLE,
+      .scl_pullup_en = GPIO_PULLUP_ENABLE});
+  external_i2c = std::make_shared<espp::I2c>(espp::I2c::Config{
+      .port = I2C_EXTERNAL,
+      .sda_io_num = GPIO_NUM_41,
+      .scl_io_num = GPIO_NUM_40,
+      .sda_pullup_en = GPIO_PULLUP_ENABLE,
+      .scl_pullup_en = GPIO_PULLUP_ENABLE});
+  initialized = true;
+}

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

@@ -1,87 +1,46 @@
 #include "input.h"
 
-#include "i2c.hpp"
+#include "hal_i2c.hpp"
 
 #include "task.hpp"
 
 #include "mcp23x17.hpp"
 
 #include "touchpad_input.hpp"
-#define USE_FT5X06 0
-#if USE_FT5X06
-#include "ft5x06.hpp"
-#else
 #include "tt21100.hpp"
-#endif
 
 using namespace std::chrono_literals;
 
 static std::shared_ptr<espp::Mcp23x17> mcp23x17;
-
-#if USE_FT5X06
-static std::shared_ptr<Ft5x06> ft5x06;
-#else
-static std::shared_ptr<Tt21100> tt21100;
-#endif
+static std::shared_ptr<espp::Tt21100> tt21100;
 static std::shared_ptr<espp::TouchpadInput> touchpad;
 
 /**
  * Touch Controller configuration
  */
-#if USE_FT5X06
-void ft5x06_write(uint8_t reg_addr, uint8_t value) {
-  uint8_t write_buf[] = {reg_addr, value};
-  i2c_write_internal_bus(Ft5x06::ADDRESS, write_buf, 2);
-}
-
-void ft5x06_read(uint8_t reg_addr, uint8_t *read_data, size_t read_len) {
-  i2c_read_internal_bus(Ft5x06::ADDRESS, reg_addr, read_data, read_len);
-}
-#else
-void tt21100_write(uint8_t reg_addr, uint8_t value) {
-  uint8_t write_buf[] = {reg_addr, value};
-  i2c_write_internal_bus(Tt21100::ADDRESS, write_buf, 2);
-}
-
-void tt21100_read(uint8_t *read_data, size_t read_len) {
-  i2c_read_internal_bus(Tt21100::ADDRESS, read_data, read_len);
-}
-#endif
-
 void touchpad_read(uint8_t* num_touch_points, uint16_t* x, uint16_t* y, uint8_t* btn_state) {
-  // NOTE: ft5x06 does not have button support, so data->btn_val cannot be set
-#if USE_FT5X06
-  ft5x06->get_touch_point(num_touch_points, x, y);
-  // TODO: how to handle quit condition if FT5x06?
-#else
   // get the latest data from the device
-  while (!tt21100->read())
-    ;
+  std::error_code ec;
+  tt21100->update(ec);
+  if (ec) {
+    fmt::print("error updating tt21100: {}\n", ec.message());
+    return;
+  }
   // now hand it off
   tt21100->get_touch_point(num_touch_points, x, y);
   *btn_state = tt21100->get_home_button_state();
-#endif
 }
 
 static std::atomic<bool> initialized = false;
 void init_input() {
   if (initialized) return;
   fmt::print("Initializing input drivers...\n");
 
-#if USE_FT5X06
-  fmt::print("Initializing ft5x06\n");
-  ft5x06 = std::make_shared<Ft5x06>(Ft5x06::Config{
-      .write = ft5x06_write,
-      .read = ft5x06_read,
-      .log_level = espp::Logger::Verbosity::WARN
-    });
-#else
   fmt::print("Initializing Tt21100\n");
-  tt21100 = std::make_shared<Tt21100>(Tt21100::Config{
-      .read = tt21100_read,
+  tt21100 = std::make_shared<espp::Tt21100>(espp::Tt21100::Config{
+      .read = std::bind(&espp::I2c::read, internal_i2c.get(), std::placeholders::_1, std::placeholders::_2, std::placeholders::_3),
       .log_level = espp::Logger::Verbosity::WARN
     });
-#endif
 
   fmt::print("Initializing touchpad\n");
   touchpad = std::make_shared<espp::TouchpadInput>(espp::TouchpadInput::Config{
@@ -98,8 +57,8 @@ void init_input() {
       .port_a_interrupt_mask = 0x00,
       .port_b_direction_mask = 0xFF,   // D-pad B0-B3, ABXY B4-B7
       .port_b_interrupt_mask = 0x00,
-      .write = i2c_write_external_bus,
-      .read = i2c_read_external_bus,
+      .write = std::bind(&espp::I2c::write, external_i2c.get(), std::placeholders::_1, std::placeholders::_2, std::placeholders::_3),
+      .read = std::bind(&espp::I2c::read_at_register, external_i2c.get(), std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4),
       .log_level = espp::Logger::Verbosity::WARN
     });