Merge develop into main (#303)

- `DisplayDevice` improvements related `DisplayDriver`
- Replaced incorrect usage of `spiBusHandle` with `spiHostDevice` in all SPI display devices
- Disabled `DisplayDriver` support for RGB displays for now
- Updated `GraphicsDemo` project for the above changes
- TactilityC improvements:
  - created `tt_hal_device_find()`
  - created `tt_hal_display_*`
  - created `tt_hal_touch_*`
  - created `tt_lvgl_*`
  - export `tt_app_*` calls

Drivers/EspLcdCompat/Source/EspLcdDisplay.cpp

@@ -58,13 +58,13 @@ bool EspLcdDisplay::startLvgl() {
         TT_LOG_W(TAG, "DisplayDriver is still in use.");
     }
 
-    lvglPortDisplayConfig = getLvglPortDisplayConfig(ioHandle, panelHandle);
+    auto lvgl_port_config  = getLvglPortDisplayConfig(ioHandle, panelHandle);
 
     if (isRgbPanel()) {
         auto rgb_config = getLvglPortDisplayRgbConfig(ioHandle, panelHandle);
-        lvglDisplay = lvgl_port_add_disp_rgb(&lvglPortDisplayConfig, &rgb_config);
+        lvglDisplay = lvgl_port_add_disp_rgb(&lvgl_port_config , &rgb_config);
     } else {
-        lvglDisplay = lvgl_port_add_disp(&lvglPortDisplayConfig);
+        lvglDisplay = lvgl_port_add_disp(&lvgl_port_config );
     }
 
     auto touch_device = getTouchDevice();
@@ -90,12 +90,40 @@ bool EspLcdDisplay::stopLvgl() {
     return true;
 }
 
-std::shared_ptr<display::DisplayDriver> EspLcdDisplay::getDisplayDriver() {
+std::shared_ptr<tt::hal::display::DisplayDriver> EspLcdDisplay::getDisplayDriver() {
     assert(lvglDisplay == nullptr); // Still attached to LVGL context. Call stopLvgl() first.
     if (displayDriver == nullptr) {
+        auto lvgl_port_config  = getLvglPortDisplayConfig(ioHandle, panelHandle);
+
+        tt::hal::display::ColorFormat color_format;
+        if (lvgl_port_config.color_format == LV_COLOR_FORMAT_I1) {
+            color_format = tt::hal::display::ColorFormat::Monochrome;
+        } else if (lvgl_port_config.color_format == LV_COLOR_FORMAT_RGB565) {
+            if (rgbElementOrder == LCD_RGB_ELEMENT_ORDER_RGB) {
+                if (lvgl_port_config.flags.swap_bytes) {
+                    color_format = tt::hal::display::ColorFormat::RGB565Swapped;
+                } else {
+                    color_format = tt::hal::display::ColorFormat::RGB565;
+                }
+            } else {
+                if (lvgl_port_config.flags.swap_bytes) {
+                    color_format = tt::hal::display::ColorFormat::BGR565Swapped;
+                } else {
+                    color_format = tt::hal::display::ColorFormat::BGR565;
+                }
+            }
+        } else if (lvgl_port_config.color_format == LV_COLOR_FORMAT_RGB888) {
+            color_format = tt::hal::display::ColorFormat::RGB888;
+        } else {
+            tt_crash("unsupported driver");
+        }
+
         displayDriver = std::make_shared<EspLcdDisplayDriver>(
             panelHandle,
-            lvglPortDisplayConfig
+            lock,
+            lvgl_port_config.hres,
+            lvgl_port_config.vres,
+            color_format
         );
     }
     return displayDriver;

Drivers/EspLcdCompat/Source/EspLcdDisplay.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Tactility/Lock.h"
+
 #include <Tactility/hal/display/DisplayDevice.h>
 
 #include <esp_lcd_types.h>
@@ -11,8 +13,9 @@ class EspLcdDisplay : tt::hal::display::DisplayDevice {
     esp_lcd_panel_io_handle_t _Nullable ioHandle = nullptr;
     esp_lcd_panel_handle_t _Nullable panelHandle = nullptr;
     lv_display_t* _Nullable lvglDisplay = nullptr;
-    lvgl_port_display_cfg_t _Nullable lvglPortDisplayConfig;
     std::shared_ptr<tt::hal::display::DisplayDriver> _Nullable displayDriver;
+    std::shared_ptr<tt::Lock> lock;
+    lcd_rgb_element_order_t rgbElementOrder;
 
 protected:
 
@@ -31,8 +34,12 @@ protected:
 
 public:
 
+    EspLcdDisplay(std::shared_ptr<tt::Lock> lock) : lock(lock) {}
+
     ~EspLcdDisplay() override;
 
+    std::shared_ptr<tt::Lock> getLock() const { return lock; }
+
     bool start() final;
 
     bool stop() final;

Drivers/EspLcdCompat/Source/EspLcdDisplayDriver.h

@@ -1,44 +1,40 @@
 #pragma once
 
+#include <Tactility/Mutex.h>
 #include <Tactility/hal/display/DisplayDriver.h>
+
 #include <esp_lcd_panel_ops.h>
-#include <esp_lvgl_port_disp.h>
 
-using namespace tt::hal;
-
-class EspLcdDisplayDriver : public display::DisplayDriver {
+class EspLcdDisplayDriver : public tt::hal::display::DisplayDriver {
 
     esp_lcd_panel_handle_t panelHandle;
-    const lvgl_port_display_cfg_t& lvglPortDisplayConfig;
+    std::shared_ptr<tt::Lock> lock;
+    uint16_t hRes;
+    uint16_t vRes;
+    tt::hal::display::ColorFormat colorFormat;
 
 public:
 
     EspLcdDisplayDriver(
         esp_lcd_panel_handle_t panelHandle,
-        const lvgl_port_display_cfg_t& lvglPortDisplayConfig
-    ) : panelHandle(panelHandle), lvglPortDisplayConfig(lvglPortDisplayConfig) {}
+        std::shared_ptr<tt::Lock> lock,
+        uint16_t hRes,
+        uint16_t vRes,
+        tt::hal::display::ColorFormat colorFormat
+    ) : panelHandle(panelHandle), lock(lock), hRes(hRes), vRes(vRes), colorFormat(colorFormat) {}
 
-    display::ColorFormat getColorFormat() const override {
-        using display::ColorFormat;
-        switch (lvglPortDisplayConfig.color_format) {
-            case LV_COLOR_FORMAT_I1:
-                return ColorFormat::Monochrome;
-            case LV_COLOR_FORMAT_RGB565:
-                // swap_bytes is only used for the 565 color format
-                // see lvgl_port_flush_callback() in esp_lvgl_port_disp.c
-                return lvglPortDisplayConfig.flags.swap_bytes ? ColorFormat::BGR565 : ColorFormat::RGB565;
-            case LV_COLOR_FORMAT_RGB888:
-                return ColorFormat::RGB888;
-            default:
-                return ColorFormat::RGB565;
-        }
+    tt::hal::display::ColorFormat getColorFormat() const override {
+        return colorFormat;
     }
 
     bool drawBitmap(int xStart, int yStart, int xEnd, int yEnd, const void* pixelData) override {
-        return esp_lcd_panel_draw_bitmap(panelHandle, xStart, yStart, xEnd, yEnd, pixelData) == ESP_OK;
+        bool result = esp_lcd_panel_draw_bitmap(panelHandle, xStart, yStart, xEnd, yEnd, pixelData) == ESP_OK;
+        return result;
     }
 
-    uint16_t getPixelWidth() const override { return lvglPortDisplayConfig.hres; }
+    uint16_t getPixelWidth() const override { return hRes; }
 
-    uint16_t getPixelHeight() const override { return lvglPortDisplayConfig.vres; }
+    uint16_t getPixelHeight() const override { return vRes; }
+
+    std::shared_ptr<tt::Lock> getLock() const override { return lock; }
 };

Drivers/EspLcdCompat/Source/EspLcdTouchDriver.cpp

@@ -9,5 +9,5 @@ bool EspLcdTouchDriver::getTouchedPoints(uint16_t* x, uint16_t* y, uint16_t* _Nu
         TT_LOG_E(TAG, "Read data failed");
         return false;
     }
-    return esp_lcd_touch_get_coordinates(handle, x, y, strength, pointCount, maxPointCount) == ESP_OK;
+    return esp_lcd_touch_get_coordinates(handle, x, y, strength, pointCount, maxPointCount);
 }