Rename Boards/ to Devices/ (#414)

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

@@ -0,0 +1,47 @@
+#include "Display.h"
+
+#include <Gt911Touch.h>
+#include <PwmBacklight.h>
+#include <St7789Display.h>
+
+static std::shared_ptr<tt::hal::touch::TouchDevice> createTouch() {
+    // Note for future changes: Reset pin is 48 and interrupt pin is 47
+    auto configuration = std::make_unique<Gt911Touch::Configuration>(
+        I2C_NUM_0,
+        240,
+        320,
+        true,
+        true,
+        false
+    );
+
+    return std::make_shared<Gt911Touch>(std::move(configuration));
+}
+
+std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
+    St7789Display::Configuration panel_configuration = {
+        .horizontalResolution = 320,
+        .verticalResolution = 240,
+        .gapX = 0,
+        .gapY = 0,
+        .swapXY = true,
+        .mirrorX = true,
+        .mirrorY = false,
+        .invertColor = true,
+        .bufferSize = LCD_BUFFER_SIZE,
+        .touch = createTouch(),
+        .backlightDutyFunction = driver::pwmbacklight::setBacklightDuty,
+        .resetPin = GPIO_NUM_NC,
+        .lvglSwapBytes = false
+    };
+
+    auto spi_configuration = std::make_shared<St7789Display::SpiConfiguration>(St7789Display::SpiConfiguration {
+        .spiHostDevice = LCD_SPI_HOST,
+        .csPin = LCD_PIN_CS,
+        .dcPin = LCD_PIN_DC,
+        .pixelClockFrequency = 62'500'000,
+        .transactionQueueDepth = 10
+    });
+
+    return std::make_shared<St7789Display>(panel_configuration, spi_configuration);
+}

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

@@ -0,0 +1,16 @@
+#pragma once
+
+#include <Tactility/hal/display/DisplayDevice.h>
+#include <driver/gpio.h>
+#include <driver/spi_common.h>
+
+constexpr auto LCD_SPI_HOST = SPI2_HOST;
+constexpr auto LCD_PIN_CS = GPIO_NUM_12;
+constexpr auto LCD_PIN_DC = GPIO_NUM_11; // RS
+constexpr auto LCD_HORIZONTAL_RESOLUTION = 320;
+constexpr auto LCD_VERTICAL_RESOLUTION = 240;
+constexpr auto LCD_BUFFER_HEIGHT = (LCD_VERTICAL_RESOLUTION / 3);
+constexpr auto LCD_BUFFER_SIZE = (LCD_HORIZONTAL_RESOLUTION * LCD_BUFFER_HEIGHT);
+constexpr auto LCD_SPI_TRANSFER_SIZE_LIMIT = LCD_BUFFER_SIZE * LV_COLOR_DEPTH / 8;
+
+std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();

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

@@ -0,0 +1,10 @@
+#include <ChargeFromAdcVoltage.h>
+#include <EstimatedPower.h>
+
+std::shared_ptr<PowerDevice> createPower() {
+    ChargeFromAdcVoltage::Configuration configuration;
+    // 2.0 ratio, but +.11 added as display voltage sag compensation.
+    configuration.adcMultiplier = 2.11;
+
+    return std::make_shared<EstimatedPower>(configuration);
+}

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

@@ -0,0 +1,5 @@
+#pragma once
+
+#include <Tactility/hal/power/PowerDevice.h>
+
+std::shared_ptr<tt::hal::power::PowerDevice> createPower();

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

@@ -0,0 +1,29 @@
+#include "Sdcard.h"
+
+#include <Tactility/lvgl/LvglSync.h>
+#include <Tactility/hal/sdcard/SpiSdCardDevice.h>
+
+using tt::hal::sdcard::SpiSdCardDevice;
+
+constexpr auto TDECK_SDCARD_PIN_CS = GPIO_NUM_39;
+constexpr auto TDECK_LCD_PIN_CS = GPIO_NUM_12;
+constexpr auto TDECK_RADIO_PIN_CS = GPIO_NUM_9;
+
+std::shared_ptr<SdCardDevice> createSdCard() {
+    auto configuration = std::make_unique<SpiSdCardDevice::Config>(
+        TDECK_SDCARD_PIN_CS,
+        GPIO_NUM_NC,
+        GPIO_NUM_NC,
+        GPIO_NUM_NC,
+        SdCardDevice::MountBehaviour::AtBoot,
+        tt::lvgl::getSyncLock(),
+        std::vector {
+            TDECK_RADIO_PIN_CS,
+            TDECK_LCD_PIN_CS
+        }
+    );
+
+    return std::make_shared<SpiSdCardDevice>(
+        std::move(configuration)
+    );
+}

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

@@ -0,0 +1,7 @@
+#pragma once
+
+#include "Tactility/hal/sdcard/SdCardDevice.h"
+
+using tt::hal::sdcard::SdCardDevice;
+
+std::shared_ptr<SdCardDevice> createSdCard();

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

@@ -0,0 +1,62 @@
+#include "TdeckKeyboard.h"
+#include <Tactility/hal/i2c/I2c.h>
+#include <driver/i2c.h>
+
+constexpr auto* TAG = "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);
+}
+
+/**
+ * The callback simulates press and release events, because the T-Deck
+ * keyboard only publishes press events on I2C.
+ * LVGL currently works without those extra release events, but they
+ * are implemented for correctness and future compatibility.
+ *
+ * @param indev_drv
+ * @param data
+ */
+static void keyboard_read_callback(TT_UNUSED lv_indev_t* indev, lv_indev_data_t* data) {
+    static uint8_t last_buffer = 0x00;
+    uint8_t read_buffer = 0x00;
+
+    // Defaults
+    data->key = 0;
+    data->state = LV_INDEV_STATE_RELEASED;
+
+    if (keyboard_i2c_read(&read_buffer)) {
+        if (read_buffer == 0 && read_buffer != last_buffer) {
+            TT_LOG_D(TAG, "Released %d", last_buffer);
+            data->key = last_buffer;
+            data->state = LV_INDEV_STATE_RELEASED;
+        } else if (read_buffer != 0) {
+            TT_LOG_D(TAG, "Pressed %d", read_buffer);
+            data->key = read_buffer;
+            data->state = LV_INDEV_STATE_PRESSED;
+        }
+    }
+
+    last_buffer = read_buffer;
+}
+
+bool TdeckKeyboard::startLvgl(lv_display_t* display) {
+    deviceHandle = lv_indev_create();
+    lv_indev_set_type(deviceHandle, LV_INDEV_TYPE_KEYPAD);
+    lv_indev_set_read_cb(deviceHandle, &keyboard_read_callback);
+    lv_indev_set_display(deviceHandle, display);
+    lv_indev_set_user_data(deviceHandle, this);
+    return true;
+}
+
+bool TdeckKeyboard::stopLvgl() {
+    lv_indev_delete(deviceHandle);
+    deviceHandle = nullptr;
+    return true;
+}
+
+bool TdeckKeyboard::isAttached() const {
+    return tt::hal::i2c::masterHasDeviceAtAddress(TDECK_KEYBOARD_I2C_BUS_HANDLE, TDECK_KEYBOARD_SLAVE_ADDRESS, 100);
+}

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

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