Merge develop into main (#368)

New boards: - LilyGO T-Dongle S3 - M5Stack StickC Plus - M5Stack StickC Plus2 New drivers: - AXP192: power control via I2C - ButtonControl: GPIO button input as LVGL device Other changes: - Updated implementation of AXP192 driver for Core2 board - Fix launcher UX for vertical layout - Fix error when properties file had an empty line - Add `__floatsidf` to `tt_init.cpp`
2025-10-14 20:39:23 +02:00
parent 3a59540365
commit d8346998ce
68 changed files with 1857 additions and 142 deletions
@@ -0,0 +1,123 @@
+#include "M5StackStickCPlus.h"
+#include "devices/Display.h"
+#include "devices/Power.h"
+#include <ButtonControl.h>
+
+#include <Tactility/lvgl/LvglSync.h>
+
+#define SPI_TRANSFER_SIZE_LIMIT (LCD_DRAW_BUFFER_SIZE * LV_COLOR_DEPTH / 8)
+
+using namespace tt::hal;
+
+constexpr auto* TAG = "StickCPlus";
+
+bool initBoot() {
+    TT_LOG_I(TAG, "initBoot");
+
+    // CH552 applies 4 V to GPIO 0, which reduces Wi-Fi sensitivity
+    // Setting output to high adds a bias of 3.3 V and suppresses over-voltage:
+    gpio::configure(0, gpio::Mode::Output, false, false);
+    gpio::setLevel(0, true);
+
+    return initAxp();
+}
+
+static DeviceVector createDevices() {
+    return {
+        getAxp192(),
+        ButtonControl::createTwoButtonControl(37, 39),
+        createDisplay()
+    };
+}
+
+extern const Configuration m5stack_stickc_plus = {
+    .initBoot = initBoot,
+    .uiScale = UiScale::Smallest,
+    .createDevices = createDevices,
+    .i2c = {
+        i2c::Configuration {
+            .name = "Internal",
+            .port = I2C_NUM_0,
+            .initMode = i2c::InitMode::ByTactility,
+            .isMutable = false,
+            .config = (i2c_config_t) {
+                .mode = I2C_MODE_MASTER,
+                .sda_io_num = GPIO_NUM_21,
+                .scl_io_num = GPIO_NUM_22,
+                .sda_pullup_en = true,
+                .scl_pullup_en = true,
+                .master = {
+                    .clk_speed = 400000
+                },
+                .clk_flags = 0
+            }
+        },
+        i2c::Configuration {
+            .name = "Grove",
+            .port = I2C_NUM_1,
+            .initMode = i2c::InitMode::ByTactility,
+            .isMutable = true,
+            .config = (i2c_config_t) {
+                .mode = I2C_MODE_MASTER,
+                .sda_io_num = GPIO_NUM_32,
+                .scl_io_num = GPIO_NUM_33,
+                .sda_pullup_en = true,
+                .scl_pullup_en = true,
+                .master = {
+                    .clk_speed = 400000
+                },
+                .clk_flags = 0
+            }
+        }
+    },
+    .spi {
+        spi::Configuration {
+            .device = SPI2_HOST,
+            .dma = SPI_DMA_CH_AUTO,
+            .config = {
+                .mosi_io_num = GPIO_NUM_15,
+                .miso_io_num = GPIO_NUM_NC,
+                .sclk_io_num = GPIO_NUM_13,
+                .quadwp_io_num = GPIO_NUM_NC,
+                .quadhd_io_num = GPIO_NUM_NC,
+                .data4_io_num = GPIO_NUM_NC,
+                .data5_io_num = GPIO_NUM_NC,
+                .data6_io_num = GPIO_NUM_NC,
+                .data7_io_num = GPIO_NUM_NC,
+                .data_io_default_level = false,
+                .max_transfer_sz = SPI_TRANSFER_SIZE_LIMIT,
+                .flags = 0,
+                .isr_cpu_id = ESP_INTR_CPU_AFFINITY_AUTO,
+                .intr_flags = 0
+            },
+            .initMode = spi::InitMode::ByTactility,
+            .isMutable = false,
+            .lock = tt::lvgl::getSyncLock() // esp_lvgl_port owns the lock for the display
+        }
+    },
+    .uart {
+        uart::Configuration {
+            .name = "Grove",
+            .port = UART_NUM_1,
+            .rxPin = GPIO_NUM_32,
+            .txPin = GPIO_NUM_33,
+            .rtsPin = GPIO_NUM_NC,
+            .ctsPin = GPIO_NUM_NC,
+            .rxBufferSize = 1024,
+            .txBufferSize = 1024,
+            .config = {
+                .baud_rate = 115200,
+                .data_bits = UART_DATA_8_BITS,
+                .parity    = UART_PARITY_DISABLE,
+                .stop_bits = UART_STOP_BITS_1,
+                .flow_ctrl = UART_HW_FLOWCTRL_DISABLE,
+                .rx_flow_ctrl_thresh = 0,
+                .source_clk = UART_SCLK_DEFAULT,
+                .flags = {
+                    .allow_pd = 0,
+                    .backup_before_sleep = 0,
+                }
+            }
+        },
+    }
+};
@@ -0,0 +1,5 @@
+#pragma once
+
+#include <Tactility/hal/Configuration.h>
+
+extern const tt::hal::Configuration m5stack_stickc_plus;
@@ -0,0 +1,63 @@
+#include "Display.h"
+
+#include "Power.h"
+
+#include <St7789Display.h>
+#include <bitset>
+
+constexpr auto* TAG = "StickCPlus";
+
+static void setBacklightOn(bool on) {
+    const auto axp = getAxp192();
+    const auto* driver = axp->getAxp192();
+    uint8_t state;
+    if (axp192_read(driver, AXP192_DCDC13_LDO23_CONTROL, &state) != AXP192_OK) {
+        TT_LOG_I(TAG, "Failed to read LCD brightness state");
+        return;
+    }
+    std::bitset<8> new_state = state;
+    if (new_state[2] != on) {
+        new_state[2] = on;
+        const auto new_state_long = new_state.to_ulong();
+        axp192_write(driver, AXP192_DCDC13_LDO23_CONTROL, static_cast<uint8_t>(new_state_long)); // Display on/off
+    }
+}
+
+static void setBrightness(uint8_t brightness) {
+    const auto axp = getAxp192();
+    if (brightness)
+    {
+        brightness = (((brightness >> 1) + 8) / 13) + 5;
+        setBacklightOn(true);
+        axp192_write(axp->getAxp192(), AXP192_LDO23_VOLTAGE, brightness << 4); // Display brightness
+    }
+    else
+    {
+        setBacklightOn(false);
+    }
+}
+
+std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
+    auto configuration = std::make_unique<St7789Display::Configuration>(
+        LCD_SPI_HOST,
+        LCD_PIN_CS,
+        LCD_PIN_DC,
+        LCD_HORIZONTAL_RESOLUTION,
+        LCD_VERTICAL_RESOLUTION,
+        nullptr,
+        false,
+        false,
+        false,
+        true,
+        LCD_DRAW_BUFFER_SIZE,
+        52,
+        40
+    );
+
+    configuration->pixelClockFrequency = 40'000'000;
+    configuration->resetPin = LCD_PIN_RESET;
+
+    configuration->backlightDutyFunction = setBrightness;
+    const auto display = std::make_shared<St7789Display>(std::move(configuration));
+    return std::reinterpret_pointer_cast<tt::hal::display::DisplayDevice>(display);
+}
@@ -0,0 +1,15 @@
+#pragma once
+
+#include "Tactility/hal/display/DisplayDevice.h"
+#include <memory>
+
+#define LCD_SPI_HOST SPI2_HOST
+#define LCD_PIN_CS GPIO_NUM_5
+#define LCD_PIN_DC GPIO_NUM_23
+#define LCD_PIN_RESET GPIO_NUM_18
+#define LCD_HORIZONTAL_RESOLUTION 135
+#define LCD_VERTICAL_RESOLUTION 240
+#define LCD_DRAW_BUFFER_HEIGHT (LCD_VERTICAL_RESOLUTION / 3)
+#define LCD_DRAW_BUFFER_SIZE (LCD_HORIZONTAL_RESOLUTION * LCD_DRAW_BUFFER_HEIGHT)
+
+std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();
@@ -0,0 +1,38 @@
+#include <Axp192.h>
+
+static std::shared_ptr<Axp192> axp192 = nullptr;
+
+std::shared_ptr<Axp192> createAxp192() {
+    assert(axp192 == nullptr);
+    auto configuration = std::make_unique<Axp192::Configuration>(I2C_NUM_0);
+    axp192 = std::make_shared<Axp192>(std::move(configuration));
+    return axp192;
+}
+
+std::shared_ptr<Axp192> getAxp192() {
+    assert(axp192 != nullptr);
+    return axp192;
+}
+
+bool initAxp() {
+    const auto axp = createAxp192();
+    return axp->init([](auto* driver) {
+        // Reference: https://github.com/pr3y/Bruce/blob/main/lib/utility/AXP192.cpp
+        axp192_ioctl(driver, AXP192_LDO23_VOLTAGE, 3300); // LCD backlight
+        axp192_ioctl(driver, AXP192_ADC_ENABLE_1, 0xff); // Set all ADC enabled
+        axp192_ioctl(driver, AXP192_CHARGE_CONTROL_1, 0xc0); // Battery charging at 4.2 V and 100 mA
+        axp192_ioctl(driver, AXP192_ADC_ENABLE_1, 0xff); // Enable battery, AC in, Vbus, APS ADC
+        uint8_t buffer;
+        axp192_read(driver, AXP192_DCDC13_LDO23_CONTROL, &buffer);
+        axp192_ioctl(driver, AXP192_DCDC13_LDO23_CONTROL, buffer | 0x4D); // Enable Ext, LDO2, LDO3, DCDC1
+        axp192_ioctl(driver, AXP192_PEK, 0x0C); // 128 ms power on, 4 s power off
+        axp192_ioctl(driver, AXP192_GPIO0_LDOIO0_VOLTAGE, 0xF0); // 3.3 V RTC voltage
+        axp192_ioctl(driver, AXP192_GPIO0_CONTROL, 0x02); // Set GPIO0 to LDO
+        axp192_ioctl(driver, AXP192_VBUS_IPSOUT_CHANNEL, 0x80); // Disable Vbus hold limit
+        axp192_ioctl(driver, AXP192_BATTERY_CHARGE_HIGH_TEMP, 0xFC); // Set temperature protection
+        axp192_ioctl(driver, AXP192_BATTERY_CHARGE_CONTROL, 0xA2); // Enable RTC BAT charge
+        axp192_ioctl(driver, AXP192_SHUTDOWN_BATTERY_CHGLED_CONTROL, 0x46); // Enable bat detection
+        return true;
+    });
+
+}
@@ -0,0 +1,9 @@
+#pragma once
+
+#include <Axp192.h>
+
+bool initAxp();
+
+// Must call initAxp() first before this returns a non-nullptr response
+std::shared_ptr<Axp192> getAxp192();
+