Hal refactored (#99)

2024-12-02 00:32:39 +01:00
parent 0188ce721c
commit 33bb742dfb
103 changed files with 1222 additions and 1228 deletions
@@ -0,0 +1,171 @@
+#include "YellowDisplay.h"
+#include "YellowDisplayConstants.h"
+#include "YellowTouch.h"
+#include "Log.h"
+
+#include <TactilityCore.h>
+
+#include "driver/gpio.h"
+#include "driver/ledc.h"
+#include "esp_err.h"
+#include "esp_lcd_ili9341.h"
+#include "esp_lcd_panel_ops.h"
+#include "esp_lvgl_port.h"
+
+#define TAG "yellow_display"
+
+static bool isBacklightInitialized = false;
+
+static bool initBacklight() {
+    ledc_timer_config_t ledc_timer = {
+        .speed_mode = TWODOTFOUR_LCD_BACKLIGHT_LEDC_MODE,
+        .duty_resolution = TWODOTFOUR_LCD_BACKLIGHT_LEDC_DUTY_RES,
+        .timer_num = TWODOTFOUR_LCD_BACKLIGHT_LEDC_TIMER,
+        .freq_hz = TWODOTFOUR_LCD_BACKLIGHT_LEDC_FREQUENCY,
+        .clk_cfg = LEDC_AUTO_CLK
+    };
+
+    if (ledc_timer_config(&ledc_timer) != ESP_OK) {
+        TT_LOG_E(TAG, "Backlight led timer config failed");
+        return false;
+    }
+
+    return true;
+}
+
+static bool setBacklight(uint8_t duty) {
+    ledc_channel_config_t ledc_channel = {
+        .gpio_num = TWODOTFOUR_LCD_PIN_BACKLIGHT,
+        .speed_mode = TWODOTFOUR_LCD_BACKLIGHT_LEDC_MODE,
+        .channel = TWODOTFOUR_LCD_BACKLIGHT_LEDC_CHANNEL,
+        .intr_type = LEDC_INTR_DISABLE,
+        .timer_sel = TWODOTFOUR_LCD_BACKLIGHT_LEDC_TIMER,
+        .duty = duty,
+        .hpoint = 0,
+        .flags = {
+            .output_invert = false
+        }
+    };
+
+    if (ledc_channel_config(&ledc_channel) != ESP_OK) {
+        TT_LOG_E(TAG, "Backlight init failed");
+        return false;
+    }
+
+    return true;
+}
+
+bool YellowDisplay::start() {
+    TT_LOG_I(TAG, "Starting");
+
+    const esp_lcd_panel_io_spi_config_t panel_io_config = ILI9341_PANEL_IO_SPI_CONFIG(
+        TWODOTFOUR_LCD_PIN_CS,
+        TWODOTFOUR_LCD_PIN_DC,
+        nullptr,
+        nullptr
+    );
+
+    if (esp_lcd_new_panel_io_spi((esp_lcd_spi_bus_handle_t)TWODOTFOUR_LCD_SPI_HOST, &panel_io_config, &ioHandle) != ESP_OK) {
+        TT_LOG_E(TAG, "Failed to create panel");
+        return false;
+    }
+
+    const esp_lcd_panel_dev_config_t panel_config = {
+        .reset_gpio_num = GPIO_NUM_NC,
+        .rgb_ele_order = LCD_RGB_ELEMENT_ORDER_BGR,
+        .data_endian = LCD_RGB_DATA_ENDIAN_BIG,
+        .bits_per_pixel = TWODOTFOUR_LCD_BITS_PER_PIXEL,
+        .flags = {
+            .reset_active_high = false
+        },
+        .vendor_config = nullptr
+    };
+
+    if (esp_lcd_new_panel_ili9341(ioHandle, &panel_config, &panelHandle) != ESP_OK) {
+        TT_LOG_E(TAG, "Failed to create ili9341");
+        return false;
+    }
+
+    if (esp_lcd_panel_reset(panelHandle) != ESP_OK) {
+        TT_LOG_E(TAG, "Failed to reset panel");
+        return false;
+    }
+
+    if (esp_lcd_panel_init(panelHandle) != ESP_OK) {
+        TT_LOG_E(TAG, "Failed to init panel");
+        return false;
+    }
+
+    if (esp_lcd_panel_mirror(panelHandle, true, false) != ESP_OK) {
+        TT_LOG_E(TAG, "Failed to set panel to mirror");
+        return false;
+    }
+
+    if (esp_lcd_panel_disp_on_off(panelHandle, true) != ESP_OK) {
+        TT_LOG_E(TAG, "Failed to turn display on");
+        return false;
+    }
+
+    const lvgl_port_display_cfg_t disp_cfg = {
+        .io_handle = ioHandle,
+        .panel_handle = panelHandle,
+        .buffer_size = TWODOTFOUR_LCD_DRAW_BUFFER_SIZE,
+        .double_buffer = false,
+        .hres = TWODOTFOUR_LCD_HORIZONTAL_RESOLUTION,
+        .vres = TWODOTFOUR_LCD_VERTICAL_RESOLUTION,
+        .monochrome = false,
+        .rotation = {
+            .swap_xy = false,
+            .mirror_x = true,
+            .mirror_y = false,
+        },
+        .flags = {
+            .buff_dma = true,
+            .buff_spiram = false,
+            .sw_rotate = false,
+            .swap_bytes = true
+        }
+    };
+
+    displayHandle = lvgl_port_add_disp(&disp_cfg);
+    TT_LOG_I(TAG, "Finished");
+    return displayHandle != nullptr;
+}
+
+bool YellowDisplay::stop() {
+    tt_assert(displayHandle != nullptr);
+
+    lvgl_port_remove_disp(displayHandle);
+
+    if (esp_lcd_panel_del(panelHandle) != ESP_OK) {
+        return false;
+    }
+
+    if (esp_lcd_panel_io_del(ioHandle) != ESP_OK) {
+        return false;
+    }
+
+    displayHandle = nullptr;
+    return true;
+}
+
+void YellowDisplay::setBacklightDuty(uint8_t backlightDuty) {
+    if (!isBacklightInitialized) {
+        tt_check(initBacklight());
+        isBacklightInitialized = true;
+    }
+
+    if (setBacklight(backlightDuty)) {
+        TT_LOG_I(TAG, "Backlight set: %d", backlightDuty);
+        lastBacklightDuty = backlightDuty;
+    } else {
+        TT_LOG_E(TAG, "Failed to configure display backlight");
+    }
+}
+tt::hal::Touch* _Nullable YellowDisplay::createTouch() {
+    return static_cast<tt::hal::Touch*>(new YellowTouch());
+}
+
+tt::hal::Display* createDisplay() {
+    return static_cast<tt::hal::Display*>(new YellowDisplay());
+}
@@ -0,0 +1,37 @@
+#pragma once
+
+#include "lvgl.h"
+#include "hal/Display.h"
+#include "esp_lcd_panel_io.h"
+
+extern lv_disp_t* displayHandle;
+
+class YellowDisplay : public tt::hal::Display {
+
+private:
+
+    esp_lcd_panel_io_handle_t ioHandle = nullptr;
+    esp_lcd_panel_handle_t panelHandle = nullptr;
+    lv_display_t* displayHandle = nullptr;
+    uint8_t lastBacklightDuty = 255;
+
+public:
+
+    bool start() override;
+
+    bool stop() override;
+
+    void setPowerOn(bool turnOn) override {}
+    bool isPoweredOn() const override { return true; };
+    bool supportsPowerControl() const override { return false; }
+
+    tt::hal::Touch* _Nullable createTouch() override;
+
+    void setBacklightDuty(uint8_t backlightDuty) override;
+    uint8_t getBacklightDuty() const override { return lastBacklightDuty; }
+    bool supportsBacklightDuty() const override { return true; }
+
+    lv_display_t* _Nullable getLvglDisplay() const override { return displayHandle; }
+};
+
+tt::hal::Display* createDisplay();
@@ -0,0 +1,21 @@
+#pragma once
+
+// Dipslay backlight (PWM)
+#define TWODOTFOUR_LCD_BACKLIGHT_LEDC_TIMER LEDC_TIMER_0
+#define TWODOTFOUR_LCD_BACKLIGHT_LEDC_MODE LEDC_LOW_SPEED_MODE
+#define TWODOTFOUR_LCD_BACKLIGHT_LEDC_CHANNEL LEDC_CHANNEL_0
+#define TWODOTFOUR_LCD_BACKLIGHT_LEDC_DUTY_RES LEDC_TIMER_8_BIT
+#define TWODOTFOUR_LCD_BACKLIGHT_LEDC_FREQUENCY (1000)
+
+#define TWODOTFOUR_LCD_PIN_BACKLIGHT GPIO_NUM_27
+
+// Display
+#define TWODOTFOUR_LCD_SPI_HOST SPI2_HOST
+#define TWODOTFOUR_LCD_HORIZONTAL_RESOLUTION 240
+#define TWODOTFOUR_LCD_VERTICAL_RESOLUTION 320
+#define TWODOTFOUR_LCD_BITS_PER_PIXEL 16
+#define TWODOTFOUR_LCD_DRAW_BUFFER_HEIGHT (TWODOTFOUR_LCD_VERTICAL_RESOLUTION / 10)
+#define TWODOTFOUR_LCD_DRAW_BUFFER_SIZE (TWODOTFOUR_LCD_HORIZONTAL_RESOLUTION * TWODOTFOUR_LCD_DRAW_BUFFER_HEIGHT * (TWODOTFOUR_LCD_BITS_PER_PIXEL / 8))
+#define TWODOTFOUR_LCD_PIN_CS GPIO_NUM_15
+#define TWODOTFOUR_LCD_PIN_DC GPIO_NUM_2
+
@@ -0,0 +1,73 @@
+#include "YellowTouch.h"
+#include "YellowTouchConstants.h"
+#include "Log.h"
+#include "driver/i2c.h"
+#include "esp_err.h"
+#include "esp_lcd_touch_cst816s.h"
+#include "esp_lcd_touch.h"
+#include "esp_lvgl_port.h"
+
+#define TAG "m5stack_touch"
+
+bool YellowTouch::start(lv_display_t* display) {
+    TT_LOG_I(TAG, "Starting");
+    esp_lcd_panel_io_handle_t ioHandle;
+    esp_lcd_touch_handle_t touchHandle;
+
+    const esp_lcd_panel_io_i2c_config_t touch_io_config = ESP_LCD_TOUCH_IO_I2C_CST816S_CONFIG();
+
+    // TODO: Check when ESP-IDF publishes fix (5.3.2 or 5.4.x)
+    static_assert(ESP_IDF_VERSION == ESP_IDF_VERSION_VAL(5, 3, 1));
+    esp_lcd_new_panel_io_i2c((esp_lcd_i2c_bus_handle_t)TWODOTFOUR_TOUCH_I2C_PORT, &touch_io_config, &ioHandle);
+    /*
+    if (esp_lcd_new_panel_io_i2c((esp_lcd_i2c_bus_handle_t)TWODOTFOUR_TOUCH_I2C_PORT, &touch_io_config, &ioHandle) != ESP_OK) {
+        TT_LOG_E(TAG, "Touch I2C IO init failed");
+        return false;
+    }
+    */
+
+    esp_lcd_touch_config_t config = {
+        .x_max = 240,
+        .y_max = 320,
+        .rst_gpio_num = GPIO_NUM_25,
+        .int_gpio_num = GPIO_NUM_21,
+        .levels = {
+            .reset = 0,
+            .interrupt = 0,
+        },
+        .flags = {
+            .swap_xy = 0,
+            .mirror_x = 0,
+            .mirror_y = 0,
+        },
+        .process_coordinates = nullptr,
+        .interrupt_callback = nullptr,
+        .user_data = nullptr
+    };
+
+    if (esp_lcd_touch_new_i2c_cst816s(ioHandle, &config, &touchHandle) != ESP_OK) {
+        TT_LOG_E(TAG, "Driver init failed");
+        return false;
+    }
+
+    const lvgl_port_touch_cfg_t touch_cfg = {
+        .disp = display,
+        .handle = touchHandle,
+    };
+
+    deviceHandle = lvgl_port_add_touch(&touch_cfg);
+    if (deviceHandle == nullptr) {
+        TT_LOG_E(TAG, "Adding touch failed");
+        return false;
+    }
+
+    TT_LOG_I(TAG, "Finished");
+    return true;
+}
+
+bool YellowTouch::stop() {
+    tt_assert(deviceHandle != nullptr);
+    lv_indev_delete(deviceHandle);
+    deviceHandle = nullptr;
+    return true;
+}
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "hal/Touch.h"
+#include "TactilityCore.h"
+
+class YellowTouch : public tt::hal::Touch {
+private:
+    lv_indev_t* _Nullable deviceHandle = nullptr;
+public:
+    bool start(lv_display_t* display) override;
+    bool stop() override;
+    lv_indev_t* _Nullable getLvglIndev() override { return deviceHandle; }
+};
@@ -0,0 +1,5 @@
+#pragma once
+
+// Touch
+#define TWODOTFOUR_TOUCH_I2C_PORT I2C_NUM_0
+