Grove driver, I2C migrations, bugfixes and docs (#532)

Devices/lilygo-tdeck/Source/Configuration.cpp

@@ -7,16 +7,20 @@
 
 #include <Tactility/hal/Configuration.h>
 #include <Tactility/lvgl/LvglSync.h>
+#include <tactility/check.h>
+#include <tactility/device.h>
 
 bool initBoot();
 
 using namespace tt::hal;
 
 static std::vector<std::shared_ptr<tt::hal::Device>> createDevices() {
+    auto* i2c_internal = device_find_by_name("i2c0");
+    check(i2c_internal);
     return {
         createPower(),
         createDisplay(),
-        std::make_shared<TdeckKeyboard>(),
+        std::make_shared<TdeckKeyboard>(i2c_internal),
         std::make_shared<KeyboardBacklightDevice>(),
         std::make_shared<TrackballDevice>(),
         createSdCard()

Devices/lilygo-tdeck/Source/Init.cpp

@@ -58,7 +58,7 @@ bool initBoot() {
             std::vector<tt::hal::gps::GpsConfiguration> gps_configurations;
             gps_service->getGpsConfigurations(gps_configurations);
             if (gps_configurations.empty()) {
-                if (gps_service->addGpsConfiguration(tt::hal::gps::GpsConfiguration {.uartName = "uart1", .baudRate = 38400, .model = tt::hal::gps::GpsModel::UBLOX10})) {
+                if (gps_service->addGpsConfiguration(tt::hal::gps::GpsConfiguration {.uartName = "uart0", .baudRate = 38400, .model = tt::hal::gps::GpsModel::UBLOX10})) {
                     LOGGER.info("Configured internal GPS");
                 } else {
                     LOGGER.error("Failed to configure internal GPS");

Devices/lilygo-tdeck/Source/devices/Display.cpp

@@ -3,10 +3,14 @@
 #include <Gt911Touch.h>
 #include <PwmBacklight.h>
 #include <St7789Display.h>
+#include <tactility/check.h>
+#include <tactility/device.h>
 
 static std::shared_ptr<tt::hal::touch::TouchDevice> createTouch() {
+    auto* i2c = device_find_by_name("i2c0");
+    check(i2c);
     auto configuration = std::make_unique<Gt911Touch::Configuration>(
-        I2C_NUM_0,
+        i2c,
         240,
         320,
         true,

Devices/lilygo-tdeck/Source/devices/KeyboardBacklight.cpp

@@ -1,6 +1,5 @@
 #include "KeyboardBacklight.h"
 #include <KeyboardBacklight/KeyboardBacklight.h>  // Driver
-#include <Tactility/hal/i2c/I2c.h>
 #include <Tactility/settings/KeyboardSettings.h>
 
 // TODO: Add Mutex and consider refactoring into a class

Devices/lilygo-tdeck/Source/devices/TdeckKeyboard.cpp

@@ -1,24 +1,18 @@
 #include "TdeckKeyboard.h"
-#include <Tactility/hal/i2c/I2c.h>
-#include <driver/i2c.h>
-#include <lvgl.h>
-#include <Tactility/settings/KeyboardSettings.h>
-#include <Tactility/settings/DisplaySettings.h>
-#include <Tactility/hal/display/DisplayDevice.h>
-#include <tactility/hal/Device.h>
-#include <Tactility/Logger.h>
+
 #include <KeyboardBacklight/KeyboardBacklight.h>
+#include <Tactility/Logger.h>
+#include <Tactility/hal/display/DisplayDevice.h>
+#include <Tactility/settings/DisplaySettings.h>
+#include <Tactility/settings/KeyboardSettings.h>
+#include <lvgl.h>
+#include <tactility/drivers/i2c_controller.h>
 
 using tt::hal::findFirstDevice;
 
 static const auto LOGGER = tt::Logger("TdeckKeyboard");
 
-constexpr auto TDECK_KEYBOARD_I2C_BUS_HANDLE = I2C_NUM_0;
-constexpr auto TDECK_KEYBOARD_SLAVE_ADDRESS = 0x55;
-
-static bool keyboard_i2c_read(uint8_t* output) {
-    return tt::hal::i2c::masterRead(TDECK_KEYBOARD_I2C_BUS_HANDLE, TDECK_KEYBOARD_SLAVE_ADDRESS, output, 1, 100 / portTICK_PERIOD_MS);
-}
+constexpr uint8_t TDECK_KEYBOARD_SLAVE_ADDRESS = 0x55;
 
 /**
  * The callback simulates press and release events, because the T-Deck
@@ -37,7 +31,8 @@ static void keyboard_read_callback(lv_indev_t* indev, lv_indev_data_t* data) {
     data->key = 0;
     data->state = LV_INDEV_STATE_RELEASED;
 
-    if (keyboard_i2c_read(&read_buffer)) {
+    auto* keyboard = static_cast<TdeckKeyboard*>(lv_indev_get_user_data(indev));
+    if (i2c_controller_read(keyboard->getI2cController(), TDECK_KEYBOARD_SLAVE_ADDRESS, &read_buffer, 1, 100 / portTICK_PERIOD_MS) == ERROR_NONE) {
         if (read_buffer == 0 && read_buffer != last_buffer) {
             if (LOGGER.isLoggingDebug()) {
                 LOGGER.debug("Released {}", last_buffer);
@@ -91,5 +86,5 @@ bool TdeckKeyboard::stopLvgl() {
 }
 
 bool TdeckKeyboard::isAttached() const {
-    return tt::hal::i2c::masterHasDeviceAtAddress(TDECK_KEYBOARD_I2C_BUS_HANDLE, TDECK_KEYBOARD_SLAVE_ADDRESS, 100);
+    return i2c_controller_has_device_at_address(i2cController, TDECK_KEYBOARD_SLAVE_ADDRESS, 100) == ERROR_NONE;
 }

Devices/lilygo-tdeck/Source/devices/TdeckKeyboard.h

@@ -1,17 +1,23 @@
 #pragma once
 
 #include <Tactility/hal/keyboard/KeyboardDevice.h>
-#include <Tactility/TactilityCore.h>
+
+struct Device;
 
 class TdeckKeyboard final : public tt::hal::keyboard::KeyboardDevice {
 
+    ::Device* i2cController;
     lv_indev_t* deviceHandle = nullptr;
 
 public:
 
+    explicit TdeckKeyboard(::Device* i2cController) : i2cController(i2cController) {}
+
     std::string getName() const override { return "T-Deck Keyboard"; }
     std::string getDescription() const override { return "I2C keyboard"; }
 
+    ::Device* getI2cController() const { return i2cController; }
+
     bool startLvgl(lv_display_t* display) override;
     bool stopLvgl() override;
     bool isAttached() const override;

Devices/lilygo-tdeck/lilygo,tdeck.dts

@@ -3,6 +3,7 @@
 #include <tactility/bindings/root.h>
 #include <tactility/bindings/esp32_ble.h>
 #include <tactility/bindings/esp32_gpio.h>
+#include <tactility/bindings/esp32_grove.h>
 #include <tactility/bindings/esp32_i2c.h>
 #include <tactility/bindings/esp32_i2s.h>
 #include <tactility/bindings/esp32_spi.h>
@@ -30,15 +31,6 @@
 		pin-scl = <&gpio0 8 GPIO_FLAG_NONE>;
 	};
 
-	i2c_external: i2c1 {
-		compatible = "espressif,esp32-i2c";
-		status = "disabled";
-		port = <I2C_NUM_1>;
-		clock-frequency = <400000>;
-		pin-sda = <&gpio0 43 GPIO_FLAG_NONE>;
-		pin-scl = <&gpio0 44 GPIO_FLAG_NONE>;
-	};
-
 	i2s0 {
 		compatible = "espressif,esp32-i2s";
 		port = <I2S_NUM_0>;
@@ -55,7 +47,7 @@
 		pin-sclk = <&gpio0 40 GPIO_FLAG_NONE>;
 	};
 
-	uart1 {
+	uart0 {
 		compatible = "espressif,esp32-uart";
 		port = <UART_NUM_1>;
 		pin-tx = <&gpio0 43 GPIO_FLAG_NONE>;