Merge develop into main (#316)

- Updated all boards to use `hal::Configuration.createDevices` - Updated all boards to use new directory structure and file naming convention - Refactored `Xpt2046SoftSpi` driver. - Created `Axp2101Power` device in `Drivers/AXP2101` - Removed global static instances from some drivers (instances that kept a reference to the Device*) - Improved `SystemInfoApp` UI: better memory labels, hide external memory bar when there's no PSRAM - Fix for HAL: register touch devices after displays are registered - Fix for Boot splash hanging on WiFi init: unlock file lock after using it
2025-09-03 22:05:28 +02:00
parent 1deaf4c426
commit 1627b9fa85
135 changed files with 543 additions and 577 deletions
@@ -0,0 +1,118 @@
+#include "Hx8357Display.h"
+#include "Touch.h"
+
+#include <UnPhoneFeatures.h>
+#include <Tactility/Log.h>
+
+#include <hx8357/disp_spi.h>
+#include <hx8357/hx8357.h>
+
+constexpr auto TAG = "Hx8357Display";
+constexpr auto BUFFER_SIZE = (UNPHONE_LCD_HORIZONTAL_RESOLUTION * UNPHONE_LCD_DRAW_BUFFER_HEIGHT * LV_COLOR_DEPTH / 8);
+
+extern std::shared_ptr<UnPhoneFeatures> unPhoneFeatures;
+
+bool Hx8357Display::start() {
+    TT_LOG_I(TAG, "start");
+
+    disp_spi_add_device(SPI2_HOST);
+
+    hx8357_reset(GPIO_NUM_46);
+    hx8357_init(UNPHONE_LCD_PIN_DC);
+    uint8_t madctl = (1U << MADCTL_BIT_INDEX_COLUMN_ADDRESS_ORDER);
+    hx8357_set_madctl(madctl);
+
+    return true;
+}
+
+bool Hx8357Display::stop() {
+    TT_LOG_I(TAG, "stop");
+    disp_spi_remove_device();
+    return true;
+}
+
+bool Hx8357Display::startLvgl() {
+    TT_LOG_I(TAG, "startLvgl");
+
+    if (lvglDisplay != nullptr) {
+        TT_LOG_W(TAG, "LVGL was already started");
+        return false;
+    }
+
+    lvglDisplay = lv_display_create(UNPHONE_LCD_HORIZONTAL_RESOLUTION, UNPHONE_LCD_VERTICAL_RESOLUTION);
+    lv_display_set_physical_resolution(lvglDisplay, UNPHONE_LCD_HORIZONTAL_RESOLUTION, UNPHONE_LCD_VERTICAL_RESOLUTION);
+    lv_display_set_color_format(lvglDisplay, LV_COLOR_FORMAT_NATIVE);
+
+    // TODO malloc to use SPIRAM
+    buffer = static_cast<uint8_t*>(heap_caps_malloc(BUFFER_SIZE, MALLOC_CAP_DMA));
+    assert(buffer != nullptr);
+
+    lv_display_set_buffers(
+        lvglDisplay,
+        buffer,
+        nullptr,
+        BUFFER_SIZE,
+        LV_DISPLAY_RENDER_MODE_PARTIAL
+    );
+
+    lv_display_set_flush_cb(lvglDisplay, hx8357_flush);
+
+    if (lvglDisplay == nullptr) {
+        TT_LOG_I(TAG, "Failed");
+        return false;
+    }
+
+    unPhoneFeatures->setBacklightPower(true);
+
+    auto touch_device = getTouchDevice();
+    if (touch_device != nullptr) {
+        touch_device->startLvgl(lvglDisplay);
+    }
+
+    return true;
+}
+
+bool Hx8357Display::stopLvgl() {
+    TT_LOG_I(TAG, "stopLvgl");
+
+    if (lvglDisplay == nullptr) {
+        TT_LOG_W(TAG, "LVGL was already stopped");
+        return false;
+    }
+
+    // Just in case
+    disp_wait_for_pending_transactions();
+
+    auto touch_device = getTouchDevice();
+    if (touch_device != nullptr && touch_device->getLvglIndev() != nullptr) {
+        TT_LOG_I(TAG, "Stopping touch device");
+        touch_device->stopLvgl();
+    }
+
+    lv_display_delete(lvglDisplay);
+    lvglDisplay = nullptr;
+
+    heap_caps_free(buffer);
+    buffer = nullptr;
+
+    return true;
+}
+
+std::shared_ptr<tt::hal::touch::TouchDevice> _Nullable Hx8357Display::getTouchDevice() {
+    if (touchDevice == nullptr) {
+        touchDevice = std::reinterpret_pointer_cast<tt::hal::touch::TouchDevice>(createTouch());
+        TT_LOG_I(TAG, "Created touch device");
+    }
+
+    return touchDevice;
+}
+
+std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
+    return std::make_shared<Hx8357Display>();
+}
+
+bool Hx8357Display::Hx8357Driver::drawBitmap(int xStart, int yStart, int xEnd, int yEnd, const void* pixelData) {
+    lv_area_t area = { xStart, yStart, xEnd, yEnd };
+    hx8357_flush(nullptr, &area, (uint8_t*)pixelData);
+    return true;
+}
@@ -0,0 +1,70 @@
+#pragma once
+
+#include <Tactility/hal/display/DisplayDevice.h>
+#include <Tactility/hal/display/DisplayDriver.h>
+#include <Tactility/Mutex.h>
+
+#include <esp_lcd_types.h>
+#include <lvgl.h>
+
+#include <Tactility/hal/spi/Spi.h>
+
+#define UNPHONE_LCD_SPI_HOST SPI2_HOST
+#define UNPHONE_LCD_PIN_CS GPIO_NUM_48
+#define UNPHONE_LCD_PIN_DC GPIO_NUM_47
+#define UNPHONE_LCD_PIN_RESET GPIO_NUM_46
+#define UNPHONE_LCD_SPI_FREQUENCY 27000000
+#define UNPHONE_LCD_HORIZONTAL_RESOLUTION 320
+#define UNPHONE_LCD_VERTICAL_RESOLUTION 480
+#define UNPHONE_LCD_DRAW_BUFFER_HEIGHT (UNPHONE_LCD_VERTICAL_RESOLUTION / 15)
+#define UNPHONE_LCD_SPI_TRANSFER_HEIGHT (UNPHONE_LCD_VERTICAL_RESOLUTION / 15)
+
+class Hx8357Display : public tt::hal::display::DisplayDevice {
+
+    uint8_t* _Nullable buffer = nullptr;
+    lv_display_t* _Nullable lvglDisplay = nullptr;
+    std::shared_ptr<tt::hal::touch::TouchDevice> _Nullable touchDevice;
+    std::shared_ptr<tt::hal::display::DisplayDriver> _Nullable nativeDisplay;
+
+    class Hx8357Driver : public tt::hal::display::DisplayDriver {
+        std::shared_ptr<tt::Lock> lock = tt::hal::spi::getLock(SPI2_HOST);
+    public:
+        tt::hal::display::ColorFormat getColorFormat() const override { return tt::hal::display::ColorFormat::RGB888; }
+        uint16_t getPixelWidth() const override { return UNPHONE_LCD_HORIZONTAL_RESOLUTION; }
+        uint16_t getPixelHeight() const override { return UNPHONE_LCD_VERTICAL_RESOLUTION; }
+        bool drawBitmap(int xStart, int yStart, int xEnd, int yEnd, const void* pixelData) override;
+        std::shared_ptr<tt::Lock> getLock() const override { return lock; }
+    };
+
+public:
+
+    std::string getName() const final { return "HX8357"; }
+    std::string getDescription() const final { return "SPI display"; }
+
+    bool start() override;
+
+    bool stop() override;
+
+    bool supportsLvgl() const override { return true; }
+
+    bool startLvgl() override;
+
+    bool stopLvgl() override;
+
+    std::shared_ptr<tt::hal::touch::TouchDevice> _Nullable getTouchDevice() override;
+
+    lv_display_t* _Nullable getLvglDisplay() const override { return lvglDisplay; }
+
+    // TODO: Set to true after fixing UnPhoneDisplayDriver
+    bool supportsDisplayDriver() const override { return false; }
+
+    std::shared_ptr<tt::hal::display::DisplayDriver> _Nullable getDisplayDriver() override {
+        if (nativeDisplay == nullptr) {
+            nativeDisplay = std::make_shared<Hx8357Driver>();
+        }
+        assert(nativeDisplay != nullptr);
+        return nativeDisplay;
+    }
+};
+
+std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();
@@ -0,0 +1,31 @@
+#include "SdCard.h"
+
+#include <Tactility/lvgl/LvglSync.h>
+#include <Tactility/hal/sdcard/SpiSdCardDevice.h>
+
+#define UNPHONE_SDCARD_PIN_CS GPIO_NUM_43
+#define UNPHONE_LCD_PIN_CS GPIO_NUM_48
+#define UNPHONE_LORA_PIN_CS GPIO_NUM_44
+#define UNPHONE_TOUCH_PIN_CS GPIO_NUM_38
+
+using tt::hal::sdcard::SpiSdCardDevice;
+
+std::shared_ptr<SdCardDevice> createSdCard() {
+    auto configuration = std::make_unique<SpiSdCardDevice::Config>(
+        UNPHONE_SDCARD_PIN_CS,
+        GPIO_NUM_NC,
+        GPIO_NUM_NC,
+        GPIO_NUM_NC,
+        SdCardDevice::MountBehaviour::AtBoot,
+        tt::lvgl::getSyncLock(),
+        std::vector {
+            UNPHONE_LORA_PIN_CS,
+            UNPHONE_LCD_PIN_CS,
+            UNPHONE_TOUCH_PIN_CS
+        }
+    );
+
+    return std::make_shared<SpiSdCardDevice>(
+        std::move(configuration)
+    );
+}
@@ -0,0 +1,7 @@
+#pragma once
+
+#include "Tactility/hal/sdcard/SdCardDevice.h"
+
+using tt::hal::sdcard::SdCardDevice;
+
+std::shared_ptr<SdCardDevice> createSdCard();
@@ -0,0 +1,14 @@
+#include "Touch.h"
+
+#include <Tactility/Log.h>
+
+std::shared_ptr<Xpt2046Touch> createTouch() {
+    auto configuration = std::make_unique<Xpt2046Touch::Configuration>(
+        SPI2_HOST,
+        GPIO_NUM_38,
+        320,
+        480
+    );
+
+    return std::make_shared<Xpt2046Touch>(std::move(configuration));
+}
@@ -0,0 +1,8 @@
+#pragma once
+
+#include <memory>
+#include <Xpt2046Touch.h>
+
+extern std::shared_ptr<Xpt2046Touch> touchInstance;
+
+std::shared_ptr<Xpt2046Touch> createTouch();