Fix tests

CMakeLists.txt

@@ -85,7 +85,8 @@ if (NOT DEFINED ENV{ESP_IDF_VERSION})
     add_subdirectory(Libraries/QRCode)
     add_subdirectory(Libraries/minitar)
     add_subdirectory(Libraries/minmea)
-    add_subdirectory(Modules/hal-device)
+    add_subdirectory(Modules/hal-device-module)
+    add_subdirectory(Modules/lvgl-module)
 
     # FreeRTOS
     set(FREERTOS_CONFIG_FILE_DIRECTORY ${PROJECT_SOURCE_DIR}/Devices/simulator/Source CACHE STRING "")

Devices/btt-panda-touch/Source/devices/Display.cpp

@@ -4,7 +4,7 @@
 #include <PwmBacklight.h>
 #include <RgbDisplay.h>
 
-std::shared_ptr<tt::hal::touch::TouchDevice> _Nullable createTouch() {
+std::shared_ptr<tt::hal::touch::TouchDevice> createTouch() {
     // Note for future changes: Reset pin is 41 and interrupt pin is 40
     auto configuration = std::make_unique<Gt911Touch::Configuration>(
         I2C_NUM_0,

Devices/cyd-4848s040c/Source/devices/St7701Display.cpp

@@ -219,7 +219,7 @@ lvgl_port_display_rgb_cfg_t St7701Display::getLvglPortDisplayRgbConfig(esp_lcd_p
     };
 }
 
-std::shared_ptr<tt::hal::touch::TouchDevice> _Nullable St7701Display::getTouchDevice() {
+std::shared_ptr<tt::hal::touch::TouchDevice> St7701Display::getTouchDevice() {
     if (touchDevice == nullptr) {
         auto configuration = std::make_unique<Gt911Touch::Configuration>(
            I2C_NUM_0,

Devices/cyd-4848s040c/Source/devices/St7701Display.h

@@ -7,7 +7,7 @@
 
 class St7701Display final : public EspLcdDisplay {
 
-    std::shared_ptr<tt::hal::touch::TouchDevice> _Nullable touchDevice;
+    std::shared_ptr<tt::hal::touch::TouchDevice> touchDevice;
 
     bool createIoHandle(esp_lcd_panel_io_handle_t& outHandle) override;
 
@@ -27,7 +27,7 @@ public:
 
     std::string getDescription() const override { return "ST7701S RGB display"; }
 
-    std::shared_ptr<tt::hal::touch::TouchDevice> _Nullable getTouchDevice() override;
+    std::shared_ptr<tt::hal::touch::TouchDevice> getTouchDevice() override;
 
     void setBacklightDuty(uint8_t backlightDuty) override;
 

Devices/cyd-8048s043c/Source/devices/Display.cpp

@@ -4,7 +4,7 @@
 #include <PwmBacklight.h>
 #include <RgbDisplay.h>
 
-std::shared_ptr<tt::hal::touch::TouchDevice> _Nullable createTouch() {
+std::shared_ptr<tt::hal::touch::TouchDevice> createTouch() {
     // Note for future changes: Reset pin is 38 and interrupt pin is 18
     // or INT = NC, schematic and other info floating around is kinda conflicting...
     auto configuration = std::make_unique<Gt911Touch::Configuration>(

Devices/elecrow-crowpanel-advance-50/Source/devices/Display.cpp

@@ -3,7 +3,7 @@
 #include <Gt911Touch.h>
 #include <RgbDisplay.h>
 
-std::shared_ptr<tt::hal::touch::TouchDevice> _Nullable createTouch() {
+std::shared_ptr<tt::hal::touch::TouchDevice> createTouch() {
     // Note for future changes: Reset pin is 38 and interrupt pin is 18
     // or INT = NC, schematic and other info floating around is kinda conflicting...
     auto configuration = std::make_unique<Gt911Touch::Configuration>(

Devices/elecrow-crowpanel-basic-50/Source/devices/Display.cpp

@@ -4,7 +4,7 @@
 #include <PwmBacklight.h>
 #include <RgbDisplay.h>
 
-std::shared_ptr<tt::hal::touch::TouchDevice> _Nullable createTouch() {
+std::shared_ptr<tt::hal::touch::TouchDevice> createTouch() {
     // Note for future changes: Reset pin is 38 and interrupt pin is 18
     // or INT = NC, schematic and other info floating around is kinda conflicting...
     auto configuration = std::make_unique<Gt911Touch::Configuration>(

Devices/guition-jc3248w535c/Source/Axs15231b/Axs15231bDisplay.h

@@ -72,23 +72,23 @@ public:
         uint32_t bufferSize; // Size in pixel count. 0 means default, which is 1/10 of the screen size
         lcd_rgb_element_order_t rgbElementOrder;
         std::shared_ptr<tt::hal::touch::TouchDevice> touch;
-        std::function<void(uint8_t)> _Nullable backlightDutyFunction = nullptr;
+        std::function<void(uint8_t)> backlightDutyFunction = nullptr;
     };
 
 private:
 
-    esp_lcd_panel_io_handle_t _Nullable ioHandle = nullptr;
-    esp_lcd_panel_handle_t _Nullable panelHandle = nullptr;
-    lv_display_t* _Nullable lvglDisplay = nullptr;
-    uint16_t* _Nullable buffer1 = nullptr;
-    uint16_t* _Nullable buffer2 = nullptr;
-    uint16_t* _Nullable tempBuf = nullptr;
-    SemaphoreHandle_t _Nullable teSyncSemaphore = nullptr;
+    esp_lcd_panel_io_handle_t ioHandle = nullptr;
+    esp_lcd_panel_handle_t panelHandle = nullptr;
+    lv_display_t* lvglDisplay = nullptr;
+    uint16_t* buffer1 = nullptr;
+    uint16_t* buffer2 = nullptr;
+    uint16_t* tempBuf = nullptr;
+    SemaphoreHandle_t teSyncSemaphore = nullptr;
     bool teIsrInstalled = false;
     bool isrServiceInstalledByUs = false;
 
     std::unique_ptr<Configuration> configuration;
-    std::shared_ptr<tt::hal::display::DisplayDriver> _Nullable displayDriver;
+    std::shared_ptr<tt::hal::display::DisplayDriver> displayDriver;
 
     bool createIoHandle();
 
@@ -118,9 +118,9 @@ public:
 
     bool stopLvgl() override;
 
-    lv_display_t* _Nullable getLvglDisplay() const override { return lvglDisplay; }
+    lv_display_t* getLvglDisplay() const override { return lvglDisplay; }
 
-    std::shared_ptr<tt::hal::touch::TouchDevice> _Nullable getTouchDevice() override { return configuration->touch; }
+    std::shared_ptr<tt::hal::touch::TouchDevice> getTouchDevice() override { return configuration->touch; }
 
     void setBacklightDuty(uint8_t backlightDuty) override {
         if (configuration->backlightDutyFunction != nullptr) {
@@ -132,7 +132,7 @@ public:
 
     bool supportsDisplayDriver() const override { return true; }
 
-    std::shared_ptr<tt::hal::display::DisplayDriver> _Nullable getDisplayDriver() override;
+    std::shared_ptr<tt::hal::display::DisplayDriver> getDisplayDriver() override;
 
     static void lvgl_port_flush_callback(lv_display_t *drv, const lv_area_t *area, uint8_t *color_map);
 

Devices/guition-jc8048w550c/Source/devices/Display.cpp

@@ -4,7 +4,7 @@
 #include <PwmBacklight.h>
 #include <RgbDisplay.h>
 
-std::shared_ptr<tt::hal::touch::TouchDevice> _Nullable createTouch() {
+std::shared_ptr<tt::hal::touch::TouchDevice> createTouch() {
     // Note for future changes: Reset pin is 38 and interrupt pin is 18
     // or INT = NC, schematic and other info floating around is kinda conflicting...
     auto configuration = std::make_unique<Gt911Touch::Configuration>(

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

@@ -5,7 +5,7 @@
 
 class TdeckKeyboard final : public tt::hal::keyboard::KeyboardDevice {
 
-    lv_indev_t* _Nullable deviceHandle = nullptr;
+    lv_indev_t* deviceHandle = nullptr;
 
 public:
 
@@ -15,5 +15,5 @@ public:
     bool startLvgl(lv_display_t* display) override;
     bool stopLvgl() override;
     bool isAttached() const override;
-    lv_indev_t* _Nullable getLvglIndev() override { return deviceHandle; }
+    lv_indev_t* getLvglIndev() override { return deviceHandle; }
 };

Devices/lilygo-tlora-pager/Source/devices/TpagerEncoder.h

@@ -5,7 +5,7 @@
 
 class TpagerEncoder final : public tt::hal::encoder::EncoderDevice {
 
-    lv_indev_t* _Nullable encHandle = nullptr;
+    lv_indev_t* encHandle = nullptr;
     pcnt_unit_handle_t encPcntUnit = nullptr;
 
     bool initEncoder();
@@ -26,5 +26,5 @@ public:
 
     int getEncoderPulses() const;
 
-    lv_indev_t* _Nullable getLvglIndev() override { return encHandle; }
+    lv_indev_t* getLvglIndev() override { return encHandle; }
 };

Devices/lilygo-tlora-pager/Source/devices/TpagerKeyboard.h

@@ -10,7 +10,7 @@
 
 class TpagerKeyboard final : public tt::hal::keyboard::KeyboardDevice {
 
-    lv_indev_t* _Nullable kbHandle = nullptr;
+    lv_indev_t* kbHandle = nullptr;
     gpio_num_t backlightPin = GPIO_NUM_NC;
     ledc_timer_t backlightTimer;
     ledc_channel_t backlightChannel;
@@ -45,7 +45,7 @@ public:
     bool stopLvgl() override;
 
     bool isAttached() const override;
-    lv_indev_t* _Nullable getLvglIndev() override { return kbHandle; }
+    lv_indev_t* getLvglIndev() override { return kbHandle; }
 
     bool setBacklightDuty(uint8_t duty);
     void makeBacklightImpulse();

Devices/lilygo-tlora-pager/Source/drivers/TloraPager.cpp

@@ -19,10 +19,10 @@ static int stop(Device* device) {
 Driver tlora_pager_driver = {
     .name = "T-Lora Pager",
     .compatible = (const char*[]) { "lilygo,tlora-pager", nullptr },
-    .startDevice = start,
-    .stopDevice = stop,
+    .start_device = start,
+    .stop_device = stop,
     .api = nullptr,
-    .deviceType = nullptr,
+    .device_type = nullptr,
     .owner = &device_module,
     .driver_private = nullptr
 };

Devices/m5stack-cardputer-adv/Source/devices/CardputerKeyboard.h

@@ -9,7 +9,7 @@
 
 class CardputerKeyboard final : public tt::hal::keyboard::KeyboardDevice {
 
-    lv_indev_t* _Nullable kbHandle = nullptr;
+    lv_indev_t* kbHandle = nullptr;
     QueueHandle_t queue = nullptr;
 
     std::shared_ptr<Tca8418> keypad;
@@ -42,5 +42,5 @@ public:
     bool stopLvgl() override;
 
     bool isAttached() const override;
-    lv_indev_t* _Nullable getLvglIndev() override { return kbHandle; }
+    lv_indev_t* getLvglIndev() override { return kbHandle; }
 };

Devices/m5stack-cardputer/Source/devices/CardputerEncoder.h

@@ -13,7 +13,7 @@
 class CardputerEncoder final : public tt::hal::encoder::EncoderDevice {
     KEYBOARD::Keyboard keyboard;
     int lastKeyNum = 0;
-    lv_indev_t* _Nullable lvglDevice = nullptr;
+    lv_indev_t* lvglDevice = nullptr;
 
     static void readCallback(lv_indev_t* indev, lv_indev_data_t* data);
 
@@ -25,5 +25,5 @@ public:
     bool startLvgl(lv_display_t* display) override;
     bool stopLvgl() override;
 
-    lv_indev_t* _Nullable getLvglIndev() override { return lvglDevice; }
+    lv_indev_t* getLvglIndev() override { return lvglDevice; }
 };

Devices/m5stack-cardputer/Source/devices/CardputerKeyboard.h

@@ -8,7 +8,7 @@
 class CardputerKeyboard : public tt::hal::keyboard::KeyboardDevice {
     KEYBOARD::Keyboard keyboard;
     int lastKeyNum = 0;
-    lv_indev_t* _Nullable lvglDevice = nullptr;
+    lv_indev_t* lvglDevice = nullptr;
 
     static void readCallback(lv_indev_t* indev, lv_indev_data_t* data);
 
@@ -22,5 +22,5 @@ public:
 
     bool isAttached() const override { return true; }
 
-    lv_indev_t* _Nullable getLvglIndev() override { return lvglDevice; }
+    lv_indev_t* getLvglIndev() override { return lvglDevice; }
 };

Devices/simulator/CMakeLists.txt

@@ -21,7 +21,4 @@ if (NOT DEFINED ENV{ESP_IDF_VERSION})
 
     target_link_libraries(Simulator PRIVATE ${SDL2_LIBRARIES})
 
-    add_definitions(-D_Nullable=)
-    add_definitions(-D_Nonnull=)
-
 endif()

Devices/simulator/Source/LvglTask.cpp

@@ -1,108 +0,0 @@
-#include "LvglTask.h"
-
-#include <Tactility/Logger.h>
-#include <Tactility/RecursiveMutex.h>
-#include <Tactility/Thread.h>
-#include <tactility/check.h>
-#include <Tactility/lvgl/LvglSync.h>
-
-#include <lvgl.h>
-
-static const auto LOGGER = tt::Logger("LvglTask");
-
-// Mutex for LVGL drawing
-static tt::RecursiveMutex lvgl_mutex;
-static tt::RecursiveMutex task_mutex;
-
-static uint32_t task_max_sleep_ms = 10;
-// Mutex for LVGL task state (to modify task_running state)
-static bool task_running = false;
-
-lv_disp_t* displayHandle = nullptr;
-
-static void lvgl_task(void* arg);
-
-static bool task_lock(TickType_t timeout) {
-    return task_mutex.lock(timeout);
-}
-
-static void task_unlock() {
-    task_mutex.unlock();
-}
-
-static void task_set_running(bool running) {
-    assert(task_lock(configTICK_RATE_HZ / 100));
-    task_running = running;
-    task_unlock();
-}
-
-bool lvgl_task_is_running() {
-    assert(task_lock(configTICK_RATE_HZ / 100));
-    bool result = task_running;
-    task_unlock();
-    return result;
-}
-
-static bool lvgl_lock(uint32_t timeoutMillis) {
-    return lvgl_mutex.lock(pdMS_TO_TICKS(timeoutMillis));
-}
-
-static void lvgl_unlock() {
-    lvgl_mutex.unlock();
-}
-
-void lvgl_task_interrupt() {
-    check(task_lock(portMAX_DELAY));
-    task_set_running(false); // interrupt task with boolean as flag
-    task_unlock();
-}
-
-void lvgl_task_start() {
-    LOGGER.info("LVGL task starting");
-
-    tt::lvgl::syncSet(&lvgl_lock, &lvgl_unlock);
-
-    // Create the main app loop, like ESP-IDF
-    BaseType_t task_result = xTaskCreate(
-        lvgl_task,
-        "lvgl",
-        8192,
-        nullptr,
-        static_cast<UBaseType_t>(tt::Thread::Priority::High), // Should be higher than main app task
-        nullptr
-    );
-
-    assert(task_result == pdTRUE);
-}
-
-static void lvgl_task(void* arg) {
-    LOGGER.info("LVGL task started");
-
-    /** Ideally. the display handle would be created during Simulator.start(),
-     * but somehow that doesn't work. Waiting here from a ThreadFlag when that happens
-     * also doesn't work. It seems that it must be called from this task. */
-    displayHandle = lv_sdl_window_create(320, 240);
-    lv_sdl_window_set_title(displayHandle, "Tactility");
-
-    uint32_t task_delay_ms = task_max_sleep_ms;
-
-    task_set_running(true);
-
-    while (lvgl_task_is_running()) {
-        if (lvgl_lock(10)) {
-            task_delay_ms = lv_timer_handler();
-            lvgl_unlock();
-        }
-        if ((task_delay_ms > task_max_sleep_ms) || (1 == task_delay_ms)) {
-            task_delay_ms = task_max_sleep_ms;
-        } else if (task_delay_ms < 1) {
-            task_delay_ms = 1;
-        }
-        vTaskDelay(pdMS_TO_TICKS(task_delay_ms));
-    }
-
-    lv_disp_remove(displayHandle);
-    displayHandle = nullptr;
-    vTaskDelete(nullptr);
-}
-

Devices/simulator/Source/LvglTask.h

@@ -1,5 +0,0 @@
-#pragma once
-
-void lvgl_task_start();
-bool lvgl_task_is_running();
-void lvgl_task_interrupt();

Devices/simulator/Source/Main.cpp

@@ -40,21 +40,3 @@ void freertosMain() {
 }
 
 } // namespace
-
-/**
- * Assert implementation as defined in the FreeRTOSConfig.h
- * It allows you to set breakpoints and debug asserts.
- */
-void vAssertCalled(unsigned long line, const char* const file) {
-    volatile uint32_t set_to_nonzero_in_debugger_to_continue = 0;
-    LOGGER.error("Assert triggered at {}:{}", file, line);
-    taskENTER_CRITICAL();
-    {
-        // Step out by attaching a debugger and setting set_to_nonzero_in_debugger_to_continue
-        while (set_to_nonzero_in_debugger_to_continue == 0) {
-            // NO-OP
-        }
-    }
-    taskEXIT_CRITICAL();
-}
-

Devices/simulator/Source/Simulator.cpp

@@ -1,4 +1,3 @@
-#include "LvglTask.h"
 #include "hal/SdlDisplay.h"
 #include "hal/SdlKeyboard.h"
 #include "hal/SimulatorPower.h"
@@ -11,23 +10,6 @@
 
 using namespace tt::hal;
 
-static bool initBoot() {
-    lv_init();
-    lvgl_task_start();
-    return true;
-}
-
-static void deinitPower() {
-    lvgl_task_interrupt();
-    while (lvgl_task_is_running()) {
-        tt::kernel::delayMillis(10);
-    }
-
-#if LV_ENABLE_GC || !LV_MEM_CUSTOM
-    lv_deinit();
-#endif
-}
-
 static std::vector<std::shared_ptr<tt::hal::Device>> createDevices() {
     return {
         std::make_shared<SdlDisplay>(),
@@ -38,7 +20,7 @@ static std::vector<std::shared_ptr<tt::hal::Device>> createDevices() {
 }
 
 extern const Configuration hardwareConfiguration = {
-    .initBoot = initBoot,
+    .initBoot = nullptr,
     .createDevices = createDevices,
     .uart = {
         uart::Configuration {

Devices/simulator/Source/hal/SdlDisplay.h

@@ -4,26 +4,39 @@
 #include <tactility/check.h>
 #include <Tactility/hal/display/DisplayDevice.h>
 
-/** Hack: variable comes from LvglTask.cpp */
-extern lv_disp_t* displayHandle;
-
 class SdlDisplay final : public tt::hal::display::DisplayDevice {
 
+    lv_disp_t* displayHandle = nullptr;
+
 public:
 
     std::string getName() const override { return "SDL Display"; }
     std::string getDescription() const override { return ""; }
 
     bool start() override { return true; }
-    bool stop() override { check(false, "Not supported"); }
+
+    bool stop() override { return true; }
 
     bool supportsLvgl() const override { return true; }
-    bool startLvgl() override { return displayHandle != nullptr; }
-    bool stopLvgl() override { check(false, "Not supported"); }
-    lv_display_t* _Nullable getLvglDisplay() const override { return displayHandle; }
 
-    std::shared_ptr<tt::hal::touch::TouchDevice> _Nullable getTouchDevice() override { return std::make_shared<SdlTouch>(); }
+    bool startLvgl() override {
+        if (displayHandle) return true; // already started
+        displayHandle = lv_sdl_window_create(320, 240);
+        lv_sdl_window_set_title(displayHandle, "Tactility");
+        return displayHandle != nullptr;
+    }
+
+    bool stopLvgl() override {
+        if (!displayHandle) return true;
+        lv_display_delete(displayHandle);
+        displayHandle = nullptr;
+        return true;
+    }
+
+    lv_display_t* getLvglDisplay() const override { return displayHandle; }
+
+    std::shared_ptr<tt::hal::touch::TouchDevice> getTouchDevice() override { return std::make_shared<SdlTouch>(); }
 
     bool supportsDisplayDriver() const override { return false; }
-    std::shared_ptr<tt::hal::display::DisplayDriver> _Nullable getDisplayDriver() override { return nullptr; }
+    std::shared_ptr<tt::hal::display::DisplayDriver> getDisplayDriver() override { return nullptr; }
 };

Devices/simulator/Source/hal/SdlKeyboard.h

@@ -6,7 +6,7 @@
 
 class SdlKeyboard final : public tt::hal::keyboard::KeyboardDevice {
 
-    lv_indev_t* _Nullable handle = nullptr;
+    lv_indev_t* handle = nullptr;
 
 public:
 
@@ -22,5 +22,5 @@ public:
 
     bool isAttached() const override { return true; }
 
-    lv_indev_t* _Nullable getLvglIndev() override { return handle; }
+    lv_indev_t* getLvglIndev() override { return handle; }
 };

Devices/simulator/Source/hal/SdlTouch.h

@@ -6,7 +6,7 @@
 
 class SdlTouch final : public tt::hal::touch::TouchDevice {
 
-    lv_indev_t* _Nullable handle = nullptr;
+    lv_indev_t* handle = nullptr;
 
 public:
 
@@ -27,10 +27,10 @@ public:
 
     bool stopLvgl() override { check(false, "Not supported"); }
 
-    lv_indev_t* _Nullable getLvglIndev() override { return handle; }
+    lv_indev_t* getLvglIndev() override { return handle; }
 
     bool supportsTouchDriver() override { return false; }
 
-    std::shared_ptr<tt::hal::touch::TouchDriver> _Nullable getTouchDriver() override { return nullptr; };
+    std::shared_ptr<tt::hal::touch::TouchDriver> getTouchDriver() override { return nullptr; };
 };
 

Devices/unphone/Source/devices/Hx8357Display.cpp

@@ -99,7 +99,7 @@ bool Hx8357Display::stopLvgl() {
     return true;
 }
 
-std::shared_ptr<tt::hal::touch::TouchDevice> _Nullable Hx8357Display::getTouchDevice() {
+std::shared_ptr<tt::hal::touch::TouchDevice> Hx8357Display::getTouchDevice() {
     if (touchDevice == nullptr) {
         touchDevice = std::reinterpret_pointer_cast<tt::hal::touch::TouchDevice>(createTouch());
         LOGGER.info("Created touch device");

Devices/unphone/Source/devices/Hx8357Display.h

@@ -21,10 +21,10 @@
 
 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;
+    uint8_t* buffer = nullptr;
+    lv_display_t* lvglDisplay = nullptr;
+    std::shared_ptr<tt::hal::touch::TouchDevice> touchDevice;
+    std::shared_ptr<tt::hal::display::DisplayDriver> nativeDisplay;
 
     class Hx8357Driver : public tt::hal::display::DisplayDriver {
         std::shared_ptr<tt::Lock> lock = tt::hal::spi::getLock(SPI2_HOST);
@@ -51,14 +51,14 @@ public:
 
     bool stopLvgl() override;
 
-    std::shared_ptr<tt::hal::touch::TouchDevice> _Nullable getTouchDevice() override;
+    std::shared_ptr<tt::hal::touch::TouchDevice> getTouchDevice() override;
 
-    lv_display_t* _Nullable getLvglDisplay() const override { return lvglDisplay; }
+    lv_display_t* 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 {
+    std::shared_ptr<tt::hal::display::DisplayDriver> getDisplayDriver() override {
         if (nativeDisplay == nullptr) {
             nativeDisplay = std::make_shared<Hx8357Driver>();
         }

Devices/waveshare-s3-touch-lcd-128/Source/devices/Display.cpp

@@ -4,7 +4,7 @@
 #include <PwmBacklight.h>
 #include <Gc9a01Display.h>
 
-std::shared_ptr<tt::hal::touch::TouchDevice> _Nullable createTouch() {
+std::shared_ptr<tt::hal::touch::TouchDevice> createTouch() {
     auto configuration = std::make_unique<Cst816sTouch::Configuration>(
         I2C_NUM_0,
         240,

Devices/waveshare-s3-touch-lcd-147/Source/devices/Jd9853Display.h

@@ -67,7 +67,7 @@ public:
         uint32_t bufferSize; // Size in pixel count. 0 means default, which is 1/10 of the screen size
         lcd_rgb_element_order_t rgbElementOrder;
         std::shared_ptr<tt::hal::touch::TouchDevice> touch;
-        std::function<void(uint8_t)> _Nullable backlightDutyFunction = nullptr;
+        std::function<void(uint8_t)> backlightDutyFunction = nullptr;
     };
 
 private:
@@ -93,7 +93,7 @@ public:
 
     std::string getDescription() const override { return "JD9853 display"; }
 
-    std::shared_ptr<tt::hal::touch::TouchDevice> _Nullable getTouchDevice() override { return configuration->touch; }
+    std::shared_ptr<tt::hal::touch::TouchDevice> getTouchDevice() override { return configuration->touch; }
 
     void setBacklightDuty(uint8_t backlightDuty) override {
         if (configuration->backlightDutyFunction != nullptr) {

Devices/waveshare-s3-touch-lcd-43/Source/devices/Display.cpp

@@ -3,7 +3,7 @@
 #include <Gt911Touch.h>
 #include <RgbDisplay.h>
 
-std::shared_ptr<tt::hal::touch::TouchDevice> _Nullable createTouch() {
+std::shared_ptr<tt::hal::touch::TouchDevice> createTouch() {
     // Note for future changes: Reset pin is 38 and interrupt pin is 18
     // or INT = NC, schematic and other info floating around is kinda conflicting...
     auto configuration = std::make_unique<Gt911Touch::Configuration>(

Drivers/ButtonControl/Source/ButtonControl.h

@@ -37,7 +37,7 @@ private:
         bool triggerLongPress = false;
     };
 
-    lv_indev_t* _Nullable deviceHandle = nullptr;
+    lv_indev_t* deviceHandle = nullptr;
     std::shared_ptr<tt::Thread> driverThread;
     bool interruptDriverThread = false;
     tt::Mutex mutex;
@@ -67,7 +67,8 @@ public:
     bool startLvgl(lv_display_t* display) override;
     bool stopLvgl() override;
 
-    lv_indev_t* _Nullable getLvglIndev() override { return deviceHandle; }
+    /** Could return nullptr if not started */
+    lv_indev_t* getLvglIndev() override { return deviceHandle; }
 
     static std::shared_ptr<ButtonControl> createOneButtonControl(tt::hal::gpio::Pin pin) {
         return std::make_shared<ButtonControl>(std::vector {

Drivers/CST816S/Source/Cst816Touch.h

@@ -49,7 +49,7 @@ private:
     std::unique_ptr<Configuration> configuration;
     esp_lcd_panel_io_handle_t ioHandle = nullptr;
     esp_lcd_touch_handle_t touchHandle = nullptr;
-    lv_indev_t* _Nullable deviceHandle = nullptr;
+    lv_indev_t* deviceHandle = nullptr;
 
     void cleanup();
 

Drivers/EspLcdCompat/Source/EspLcdDisplay.h

@@ -10,10 +10,10 @@
 /** @deprecated use EspLcdDisplayV2 */
 class EspLcdDisplay : public 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;
-    std::shared_ptr<tt::hal::display::DisplayDriver> _Nullable displayDriver;
+    esp_lcd_panel_io_handle_t ioHandle = nullptr;
+    esp_lcd_panel_handle_t panelHandle = nullptr;
+    lv_display_t* lvglDisplay = nullptr;
+    std::shared_ptr<tt::hal::display::DisplayDriver> displayDriver;
     std::shared_ptr<tt::Lock> lock;
     lcd_rgb_element_order_t rgbElementOrder;
 
@@ -52,7 +52,7 @@ public:
 
     bool stopLvgl() final;
 
-    lv_display_t* _Nullable getLvglDisplay() const final { return lvglDisplay; }
+    lv_display_t* getLvglDisplay() const final { return lvglDisplay; }
 
     // endregion
 
@@ -61,7 +61,7 @@ public:
     bool supportsDisplayDriver() const override { return true; }
 
     /** @return a NativeDisplay instance if this device supports it */
-    std::shared_ptr<tt::hal::display::DisplayDriver> _Nullable getDisplayDriver() final;
+    std::shared_ptr<tt::hal::display::DisplayDriver> getDisplayDriver() final;
 
     // endregion
 };

Drivers/EspLcdCompat/Source/EspLcdTouch.h

@@ -11,7 +11,7 @@ class EspLcdTouch : public tt::hal::touch::TouchDevice {
     esp_lcd_touch_config_t config;
     esp_lcd_panel_io_handle_t _Nullable ioHandle = nullptr;
     esp_lcd_touch_handle_t _Nullable touchHandle = nullptr;
-    lv_indev_t* _Nullable lvglDevice = nullptr;
+    lv_indev_t* lvglDevice = nullptr;
     std::shared_ptr<tt::hal::touch::TouchDriver> touchDriver;
 
 protected:
@@ -36,7 +36,7 @@ public:
 
     bool stopLvgl() final;
 
-    lv_indev_t* _Nullable getLvglIndev() final { return lvglDevice; }
+    lv_indev_t* getLvglIndev() final { return lvglDevice; }
 
     bool supportsTouchDriver() override { return true; }
 

Drivers/FT6x36/Source/Ft6x36Touch.h

@@ -34,7 +34,7 @@ public:
 private:
 
     std::unique_ptr<Configuration> configuration;
-    lv_indev_t* _Nullable deviceHandle = nullptr;
+    lv_indev_t* deviceHandle = nullptr;
     FT6X36 driver = FT6X36(configuration->port, configuration->pinInterrupt);
     std::shared_ptr<tt::Thread> driverThread;
     bool interruptDriverThread = false;
@@ -65,7 +65,7 @@ public:
     bool startLvgl(lv_display_t* display) override;
     bool stopLvgl() override;
 
-    lv_indev_t* _Nullable getLvglIndev() override { return deviceHandle; }
+    lv_indev_t* getLvglIndev() override { return deviceHandle; }
 
     class Ft6TouchDriver : public tt::hal::touch::TouchDriver {
     public:

Drivers/ILI934x/Source/Ili934xDisplay.h

@@ -25,7 +25,7 @@ public:
         bool swapBytes;
         uint32_t bufferSize; // Pixel count, not byte count. Set to 0 for default (1/10th of display size)
         std::shared_ptr<tt::hal::touch::TouchDevice> touch;
-        std::function<void(uint8_t)> _Nullable backlightDutyFunction;
+        std::function<void(uint8_t)> backlightDutyFunction; // Nullable
         gpio_num_t resetPin;
         lcd_rgb_element_order_t rgbElementOrder;
     };

Firmware/CMakeLists.txt

@@ -36,14 +36,13 @@ else ()
         TactilityCore
         TactilityFreeRtos
         TactilityKernel
-        hal-device
+        hal-device-module
+        lvgl-module
         Simulator
         PlatformPosix
         SDL2::SDL2-static SDL2-static
     )
 
-    add_definitions(-D_Nullable=)
-    add_definitions(-D_Nonnull=)
 endif ()
 
 add_custom_target(AlwaysRun

Modules/hal-device-module/CMakeLists.txt

@@ -1,7 +1,8 @@
 cmake_minimum_required(VERSION 3.20)
 
+file(GLOB_RECURSE SOURCE_FILES "Source/*.c*")
+
 if (DEFINED ENV{ESP_IDF_VERSION})
-    file(GLOB_RECURSE SOURCE_FILES Source/*.c*)
 
     list(APPEND REQUIRES_LIST
         TactilityKernel
@@ -21,21 +22,15 @@ if (DEFINED ENV{ESP_IDF_VERSION})
 
 else ()
 
-    file(GLOB_RECURSE SOURCES "Source/*.c*")
+    add_library(hal-device-module OBJECT)
 
-    add_library(hal-device OBJECT)
+    target_sources(hal-device-module PRIVATE ${SOURCE_FILES})
 
-    target_sources(hal-device PRIVATE ${SOURCES})
-
-    target_include_directories(hal-device
-        PRIVATE Private/
+    target_include_directories(hal-device-module
         PUBLIC Include/
     )
 
-    add_definitions(-D_Nullable=)
-    add_definitions(-D_Nonnull=)
-
-    target_link_libraries(hal-device PUBLIC
+    target_link_libraries(hal-device-module PUBLIC
         TactilityFreeRtos
         TactilityCore
         TactilityKernel

Modules/hal-device-module/Include/tactility/hal/Device.h

@@ -79,17 +79,17 @@ void registerDevice(const std::shared_ptr<Device>& device);
 /** Remove a device from the registry. */
 void deregisterDevice(const std::shared_ptr<Device>& device);
 
-/** Find a single device with a custom filter */
-std::shared_ptr<Device> _Nullable findDevice(const std::function<bool(const std::shared_ptr<Device>&)>& filterFunction);
+/** Find a single device with a custom filter. Could return nullptr if not found. */
+std::shared_ptr<Device> findDevice(const std::function<bool(const std::shared_ptr<Device>&)>& filterFunction);
 
 /** Find devices with a custom filter */
 std::vector<std::shared_ptr<Device>> findDevices(const std::function<bool(const std::shared_ptr<Device>&)>& filterFunction);
 
-/** Find a device in the registry by its name. */
-std::shared_ptr<Device> _Nullable findDevice(std::string name);
+/** Find a device in the registry by its name. Could return nullptr if not found. */
+std::shared_ptr<Device> findDevice(std::string name);
 
-/** Find a device in the registry by its identifier. */
-std::shared_ptr<Device> _Nullable findDevice(Device::Id id);
+/** Find a device in the registry by its identifier. Could return nullptr if not found.*/
+std::shared_ptr<Device> findDevice(Device::Id id);
 
 /** Find 0, 1 or more devices in the registry by type. */
 std::vector<std::shared_ptr<Device>> findDevices(Device::Type type);

Modules/hal-device-module/Source/drivers/hal_device.cpp

@@ -115,10 +115,10 @@ extern struct Module hal_device_module;
 Driver hal_device_driver = {
     .name = "hal-device",
     .compatible = (const char*[]) {"hal-device", nullptr},
-    .startDevice = start,
-    .stopDevice = stop,
+    .start_device = start,
+    .stop_device = stop,
     .api = nullptr,
-    .deviceType = &HAL_DEVICE_TYPE,
+    .device_type = &HAL_DEVICE_TYPE,
     .owner = &hal_device_module,
     .driver_private = nullptr
 };

Modules/hal-device-module/Source/hal/Device.cpp

@@ -88,7 +88,7 @@ std::vector<std::shared_ptr<Device>> findDevices(const std::function<bool(const
     return toVector(devices_view);
 }
 
-std::shared_ptr<Device> _Nullable findDevice(const std::function<bool(const std::shared_ptr<Device>&)>& filterFunction) {
+std::shared_ptr<Device> findDevice(const std::function<bool(const std::shared_ptr<Device>&)>& filterFunction) {
     auto scoped_mutex = mutex.asScopedLock();
     scoped_mutex.lock();
 
@@ -102,13 +102,13 @@ std::shared_ptr<Device> _Nullable findDevice(const std::function<bool(const std:
     }
 }
 
-std::shared_ptr<Device> _Nullable findDevice(std::string name) {
+std::shared_ptr<Device> findDevice(std::string name) {
     return findDevice([&name](auto& device){
         return device->getName() == name;
     });
 }
 
-std::shared_ptr<Device> _Nullable findDevice(Device::Id id) {
+std::shared_ptr<Device> findDevice(Device::Id id) {
     return findDevice([id](auto& device){
       return device->getId() == id;
     });

Modules/lvgl-module/CMakeLists.txt

@@ -0,0 +1,30 @@
+cmake_minimum_required(VERSION 3.20)
+
+file(GLOB_RECURSE SOURCE_FILES Source/*.c*)
+
+if (DEFINED ENV{ESP_IDF_VERSION})
+
+    idf_component_register(
+        SRCS ${SOURCE_FILES}
+        INCLUDE_DIRS "Include/"
+        REQUIRES TactilityKernel lvgl esp_lvgl_port
+    )
+
+else ()
+
+    add_library(lvgl-module OBJECT)
+
+    target_sources(lvgl-module PRIVATE ${SOURCE_FILES})
+
+    target_include_directories(lvgl-module
+        PUBLIC Include/
+    )
+
+    target_link_libraries(lvgl-module PUBLIC
+        TactilityKernel
+        freertos_kernel
+        lvgl
+    )
+    
+endif ()
+

Modules/lvgl-module/Include/tactility/lvgl_module.h

@@ -0,0 +1,91 @@
+// SPDX-License-Identifier: Apache-2.0
+#pragma once
+
+/**
+ * @file lvgl_module.h
+ * @brief LVGL module for Tactility.
+ *
+ * This module manages the lifecycle of the LVGL library, including initialization,
+ * task management, and thread-safety.
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdint.h>
+#include <stdbool.h>
+
+/**
+ * @brief The LVGL module instance.
+ */
+extern struct Module lvgl_module;
+
+/**
+ * @brief Configuration for the LVGL module.
+ */
+struct LvglModuleConfig {
+    /**
+     * @brief Callback invoked when the LVGL task starts.
+     * Use this to add devices (e.g. displays, pointers), start services, create widgets, etc.
+     */
+    void (*on_start)(void);
+
+    /**
+     * @brief Callback invoked when the LVGL task stops.
+     * Use this to remove devices, stop services, etc.
+     */
+    void (*on_stop)(void);
+
+    /** @brief Priority of the LVGL task. */
+    int task_priority;
+
+    /** @brief Stack size of the LVGL task in bytes. */
+    int task_stack_size;
+
+#ifdef ESP_PLATFORM
+    /** @brief CPU affinity of the LVGL task (ESP32 specific). */
+    int task_affinity;
+#endif
+};
+
+/**
+ * @brief Configures the LVGL module.
+ *
+ * @warning This must be called before starting the module.
+ * @param config The configuration to apply.
+ */
+void lvgl_module_configure(struct LvglModuleConfig config);
+
+/**
+ * @brief Locks the LVGL mutex.
+ *
+ * This should be called before any LVGL API calls from threads other than the LVGL task.
+ * It is a recursive mutex.
+ * @retval true when a lock was acquired, false otherwise
+ */
+bool lvgl_lock(void);
+
+/**
+ * @brief Tries to lock the LVGL mutex with a timeout.
+ *
+ * @param timeout Timeout in ticks
+ * @return true if the lock was acquired, false otherwise.
+ */
+bool lvgl_try_lock_timed(uint32_t timeout);
+
+/**
+ * @brief Unlocks the LVGL mutex.
+ */
+void lvgl_unlock(void);
+
+/**
+ * @brief Checks if the LVGL module is currently running.
+ *
+ * @return true if running, false otherwise.
+ */
+bool lvgl_is_running();
+
+#ifdef __cplusplus
+}
+#endif

Modules/lvgl-module/LICENSE-GPL-3.0.md

@@ -0,0 +1,675 @@
+# GNU GENERAL PUBLIC LICENSE
+
+Version 3, 29 June 2007
+
+Copyright (C) 2007 Free Software Foundation, Inc.
+<https://fsf.org/>
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+## Preamble
+
+The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom
+to share and change all versions of a program--to make sure it remains
+free software for all its users. We, the Free Software Foundation, use
+the GNU General Public License for most of our software; it applies
+also to any other work released this way by its authors. You can apply
+it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you
+have certain responsibilities if you distribute copies of the
+software, or if you modify it: responsibilities to respect the freedom
+of others.
+
+For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the
+manufacturer can do so. This is fundamentally incompatible with the
+aim of protecting users' freedom to change the software. The
+systematic pattern of such abuse occurs in the area of products for
+individuals to use, which is precisely where it is most unacceptable.
+Therefore, we have designed this version of the GPL to prohibit the
+practice for those products. If such problems arise substantially in
+other domains, we stand ready to extend this provision to those
+domains in future versions of the GPL, as needed to protect the
+freedom of users.
+
+Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish
+to avoid the special danger that patents applied to a free program
+could make it effectively proprietary. To prevent this, the GPL
+assures that patents cannot be used to render the program non-free.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
+
+## TERMS AND CONDITIONS
+
+### 0. Definitions.
+
+"This License" refers to version 3 of the GNU General Public License.
+
+"Copyright" also means copyright-like laws that apply to other kinds
+of works, such as semiconductor masks.
+
+"The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of
+an exact copy. The resulting work is called a "modified version" of
+the earlier work or a work "based on" the earlier work.
+
+A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user
+through a computer network, with no transfer of a copy, is not
+conveying.
+
+An interactive user interface displays "Appropriate Legal Notices" to
+the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+### 1. Source Code.
+
+The "source code" for a work means the preferred form of the work for
+making modifications to it. "Object code" means any non-source form of
+a work.
+
+A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+The Corresponding Source need not include anything that users can
+regenerate automatically from other parts of the Corresponding Source.
+
+The Corresponding Source for a work in source code form is that same
+work.
+
+### 2. Basic Permissions.
+
+All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+You may make, run and propagate covered works that you do not convey,
+without conditions so long as your license otherwise remains in force.
+You may convey covered works to others for the sole purpose of having
+them make modifications exclusively for you, or provide you with
+facilities for running those works, provided that you comply with the
+terms of this License in conveying all material for which you do not
+control copyright. Those thus making or running the covered works for
+you must do so exclusively on your behalf, under your direction and
+control, on terms that prohibit them from making any copies of your
+copyrighted material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under the
+conditions stated below. Sublicensing is not allowed; section 10 makes
+it unnecessary.
+
+### 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such
+circumvention is effected by exercising rights under this License with
+respect to the covered work, and you disclaim any intention to limit
+operation or modification of the work as a means of enforcing, against
+the work's users, your or third parties' legal rights to forbid
+circumvention of technological measures.
+
+### 4. Conveying Verbatim Copies.
+
+You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+### 5. Conveying Modified Source Versions.
+
+You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these
+conditions:
+
+-   a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+-   b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under
+    section 7. This requirement modifies the requirement in section 4
+    to "keep intact all notices".
+-   c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy. This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged. This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+-   d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+### 6. Conveying Non-Source Forms.
+
+You may convey a covered work in object code form under the terms of
+sections 4 and 5, provided that you also convey the machine-readable
+Corresponding Source under the terms of this License, in one of these
+ways:
+
+-   a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+-   b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the Corresponding
+    Source from a network server at no charge.
+-   c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source. This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+-   d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge. You need not require recipients to copy the
+    Corresponding Source along with the object code. If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source. Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+-   e) Convey the object code using peer-to-peer transmission,
+    provided you inform other peers where the object code and
+    Corresponding Source of the work are being offered to the general
+    public at no charge under subsection 6d.
+
+A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal,
+family, or household purposes, or (2) anything designed or sold for
+incorporation into a dwelling. In determining whether a product is a
+consumer product, doubtful cases shall be resolved in favor of
+coverage. For a particular product received by a particular user,
+"normally used" refers to a typical or common use of that class of
+product, regardless of the status of the particular user or of the way
+in which the particular user actually uses, or expects or is expected
+to use, the product. A product is a consumer product regardless of
+whether the product has substantial commercial, industrial or
+non-consumer uses, unless such uses represent the only significant
+mode of use of the product.
+
+"Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to
+install and execute modified versions of a covered work in that User
+Product from a modified version of its Corresponding Source. The
+information must suffice to ensure that the continued functioning of
+the modified object code is in no case prevented or interfered with
+solely because modification has been made.
+
+If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or
+updates for a work that has been modified or installed by the
+recipient, or for the User Product in which it has been modified or
+installed. Access to a network may be denied when the modification
+itself materially and adversely affects the operation of the network
+or violates the rules and protocols for communication across the
+network.
+
+Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+### 7. Additional Terms.
+
+"Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders
+of that material) supplement the terms of this License with terms:
+
+-   a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+-   b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+-   c) Prohibiting misrepresentation of the origin of that material,
+    or requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+-   d) Limiting the use for publicity purposes of names of licensors
+    or authors of the material; or
+-   e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+-   f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions
+    of it) with contractual assumptions of liability to the recipient,
+    for any liability that these contractual assumptions directly
+    impose on those licensors and authors.
+
+All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions; the
+above requirements apply either way.
+
+### 8. Termination.
+
+You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+However, if you cease all violation of this License, then your license
+from a particular copyright holder is reinstated (a) provisionally,
+unless and until the copyright holder explicitly and finally
+terminates your license, and (b) permanently, if the copyright holder
+fails to notify you of the violation by some reasonable means prior to
+60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+### 9. Acceptance Not Required for Having Copies.
+
+You are not required to accept this License in order to receive or run
+a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+### 10. Automatic Licensing of Downstream Recipients.
+
+Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+### 11. Patents.
+
+A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+A contributor's "essential patent claims" are all patent claims owned
+or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+A patent license is "discriminatory" if it does not include within the
+scope of its coverage, prohibits the exercise of, or is conditioned on
+the non-exercise of one or more of the rights that are specifically
+granted under this License. You may not convey a covered work if you
+are a party to an arrangement with a third party that is in the
+business of distributing software, under which you make payment to the
+third party based on the extent of your activity of conveying the
+work, and under which the third party grants, to any of the parties
+who would receive the covered work from you, a discriminatory patent
+license (a) in connection with copies of the covered work conveyed by
+you (or copies made from those copies), or (b) primarily for and in
+connection with specific products or compilations that contain the
+covered work, unless you entered into that arrangement, or that patent
+license was granted, prior to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+### 12. No Surrender of Others' Freedom.
+
+If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under
+this License and any other pertinent obligations, then as a
+consequence you may not convey it at all. For example, if you agree to
+terms that obligate you to collect a royalty for further conveying
+from those to whom you convey the Program, the only way you could
+satisfy both those terms and this License would be to refrain entirely
+from conveying the Program.
+
+### 13. Use with the GNU Affero General Public License.
+
+Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+### 14. Revised Versions of this License.
+
+The Free Software Foundation may publish revised and/or new versions
+of the GNU General Public License from time to time. Such new versions
+will be similar in spirit to the present version, but may differ in
+detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies that a certain numbered version of the GNU General Public
+License "or any later version" applies to it, you have the option of
+following the terms and conditions either of that numbered version or
+of any later version published by the Free Software Foundation. If the
+Program does not specify a version number of the GNU General Public
+License, you may choose any version ever published by the Free
+Software Foundation.
+
+If the Program specifies that a proxy can decide which future versions
+of the GNU General Public License can be used, that proxy's public
+statement of acceptance of a version permanently authorizes you to
+choose that version for the Program.
+
+Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+### 15. Disclaimer of Warranty.
+
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
+WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
+DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
+CORRECTION.
+
+### 16. Limitation of Liability.
+
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR
+CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT
+NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
+LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
+TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
+PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+### 17. Interpretation of Sections 15 and 16.
+
+If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+END OF TERMS AND CONDITIONS
+
+## How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these
+terms.
+
+To do so, attach the following notices to the program. It is safest to
+attach them to the start of each source file to most effectively state
+the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+        <one line to give the program's name and a brief idea of what it does.>
+        Copyright (C) <year>  <name of author>
+
+        This program is free software: you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation, either version 3 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper
+mail.
+
+If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+        <program>  Copyright (C) <year>  <name of author>
+        This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+        This is free software, and you are welcome to redistribute it
+        under certain conditions; type `show c' for details.
+
+The hypothetical commands \`show w' and \`show c' should show the
+appropriate parts of the General Public License. Of course, your
+program's commands might be different; for a GUI interface, you would
+use an "about box".
+
+You should also get your employer (if you work as a programmer) or
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. For more information on this, and how to apply and follow
+the GNU GPL, see <https://www.gnu.org/licenses/>.
+
+The GNU General Public License does not permit incorporating your
+program into proprietary programs. If your program is a subroutine
+library, you may consider it more useful to permit linking proprietary
+applications with the library. If this is what you want to do, use the
+GNU Lesser General Public License instead of this License. But first,
+please read <https://www.gnu.org/licenses/why-not-lgpl.html>.

Modules/lvgl-module/README.md

@@ -0,0 +1,8 @@
+**WARNING: This module contains deprecated code**
+
+This module is the basis for the old Tactility HAL.
+This HAL existed before TactilityKernel.
+
+The C++ `tt::hal::Device` class is replaced by `struct Device` from TactilityKernel.
+
+License: Apache v2.0

Modules/lvgl-module/Source/arch/lvgl_esp32.c

@@ -0,0 +1,66 @@
+// SPDX-License-Identifier: GPL-3.0-only
+#ifdef ESP_PLATFORM
+
+#include <esp_lvgl_port.h>
+
+#include <tactility/time.h>
+#include <tactility/error.h>
+#include <tactility/lvgl_module.h>
+
+extern struct LvglModuleConfig lvgl_module_config;
+
+static bool initialized = false;
+
+bool lvgl_lock(void) {
+    if (!initialized) return false;
+    return lvgl_port_lock(portMAX_DELAY);
+}
+
+bool lvgl_try_lock_timed(uint32_t timeout) {
+    if (!initialized) return false;
+    return lvgl_port_lock(millis_to_ticks(timeout));
+}
+
+void lvgl_unlock(void) {
+    if (!initialized) return;
+    lvgl_port_unlock();
+}
+
+error_t lvgl_arch_start() {
+    const lvgl_port_cfg_t lvgl_cfg = {
+        .task_priority = lvgl_module_config.task_priority,
+        .task_stack = lvgl_module_config.task_stack_size,
+        .task_affinity = lvgl_module_config.task_affinity,
+        .task_max_sleep_ms = 500,
+        .timer_period_ms = 5
+    };
+
+    if (lvgl_port_init(&lvgl_cfg) != ESP_OK) {
+        return ERROR_RESOURCE;
+    }
+
+    // We must have the state set to "initialized" so that the lvgl lock works
+    // when we call listener functions. These functions could create new
+    // devices and services. The latter might start adding widgets immediately.
+    initialized = true;
+
+    if (lvgl_module_config.on_start) lvgl_module_config.on_start();
+
+    return ERROR_NONE;
+}
+
+error_t lvgl_arch_stop() {
+    if (lvgl_module_config.on_stop) lvgl_module_config.on_stop();
+
+    if (lvgl_port_deinit() != ESP_OK) {
+        // Call on_start again to recover
+        if (lvgl_module_config.on_start) lvgl_module_config.on_start();
+        return ERROR_RESOURCE;
+    }
+
+    initialized = false;
+
+    return ERROR_NONE;
+}
+
+#endif

Modules/lvgl-module/Source/arch/lvgl_posix.c

@@ -0,0 +1,148 @@
+// SPDX-License-Identifier: GPL-3.0-only
+#ifndef ESP_PLATFORM
+
+#include <tactility/check.h>
+#include <tactility/delay.h>
+#include <tactility/concurrent/recursive_mutex.h>
+#include <tactility/concurrent/thread.h>
+#include <tactility/freertos/task.h>
+#include <tactility/time.h>
+
+#include <lvgl.h>
+
+#include "tactility/lvgl_module.h"
+
+extern struct LvglModuleConfig lvgl_module_config;
+
+// Mutex for LVGL drawing
+static struct RecursiveMutex lvgl_mutex;
+static bool lvgl_mutex_initialised = false;
+static struct RecursiveMutex task_mutex;
+static bool task_mutex_initialised = false;
+
+static uint32_t task_max_sleep_ms = 10;
+static TaskHandle_t lvgl_task_handle = NULL;
+static bool lvgl_task_interrupt_requested = false;
+
+#define LVGL_STOP_POLL_INTERVAL 10
+#define LVGL_STOP_TIMEOUT 5000
+
+static void task_lock(void) {
+    if (!task_mutex_initialised) return;
+    recursive_mutex_lock(&task_mutex);
+}
+
+static void task_unlock(void) {
+    if (!task_mutex_initialised) return;
+    recursive_mutex_unlock(&task_mutex);
+}
+
+bool lvgl_lock(void) {
+    if (!lvgl_mutex_initialised) return false;
+    recursive_mutex_lock(&lvgl_mutex);
+    return true;
+}
+
+bool lvgl_try_lock_timed(uint32_t timeout) {
+    if (!lvgl_mutex_initialised) return false;
+    return recursive_mutex_try_lock_timed(&lvgl_mutex, millis_to_ticks(timeout));
+}
+
+void lvgl_unlock(void) {
+    if (!lvgl_mutex_initialised) return;
+    recursive_mutex_unlock(&lvgl_mutex);
+}
+
+static void lvgl_task_set_interrupted(bool interrupted) {
+    task_lock();
+    lvgl_task_interrupt_requested = interrupted;
+    task_unlock();
+}
+
+static bool lvgl_task_is_interrupt_requested() {
+    task_lock();
+    bool result = lvgl_task_interrupt_requested;
+    task_unlock();
+    return result;
+}
+
+static void lvgl_task(void* arg) {
+    uint32_t task_delay_ms = task_max_sleep_ms;
+
+    check(!lvgl_task_is_interrupt_requested());
+
+    // on_start must be called from the task, otherwise the display doesn't work
+    if (lvgl_module_config.on_start) lvgl_module_config.on_start();
+
+    while (!lvgl_task_is_interrupt_requested()) {
+        if (lvgl_try_lock_timed(10)) {
+            task_delay_ms = lv_timer_handler();
+            lvgl_unlock();
+        }
+        if ((task_delay_ms > task_max_sleep_ms) || (1 == task_delay_ms)) {
+            task_delay_ms = task_max_sleep_ms;
+        } else if (task_delay_ms < 1) {
+            task_delay_ms = 1;
+        }
+        vTaskDelay(pdMS_TO_TICKS(task_delay_ms));
+    }
+
+    if (lvgl_module_config.on_stop) lvgl_module_config.on_stop();
+
+    task_lock();
+    lvgl_task_handle = NULL;
+    task_unlock();
+
+    vTaskDelete(NULL);
+}
+
+error_t lvgl_arch_start() {
+    if (!lvgl_mutex_initialised) {
+        recursive_mutex_construct(&lvgl_mutex);
+        lvgl_mutex_initialised = true;
+    }
+
+    if (!task_mutex_initialised) {
+        recursive_mutex_construct(&task_mutex);
+        task_mutex_initialised = true;
+    }
+
+    lvgl_task_set_interrupted(false);
+
+    lv_init();
+
+    // Create the main app loop, like ESP-IDF
+    BaseType_t task_result = xTaskCreate(
+        lvgl_task,
+        "lvgl",
+        lvgl_module_config.task_stack_size,
+        NULL,
+        lvgl_module_config.task_priority,
+        &lvgl_task_handle
+    );
+
+    return (task_result == pdTRUE) ? ERROR_NONE : ERROR_RESOURCE;
+}
+
+error_t lvgl_arch_stop() {
+    TickType_t start_ticks = get_ticks();
+    lvgl_task_set_interrupted(true);
+    while (true) {
+        task_lock();
+        bool done = (lvgl_task_handle == NULL);
+        task_unlock();
+        if (done) break;
+
+        delay_ticks(LVGL_STOP_POLL_INTERVAL);
+
+        if (get_ticks() - start_ticks > LVGL_STOP_TIMEOUT) {
+            return ERROR_TIMEOUT;
+        }
+    }
+
+    lv_deinit();
+
+    return ERROR_NONE;
+}
+
+#endif

Modules/lvgl-module/Source/lvgl_module.c

@@ -0,0 +1,67 @@
+// SPDX-License-Identifier: GPL-3.0-only
+#include <lvgl.h>
+#include <string.h>
+#include <tactility/module.h>
+#include <tactility/lvgl_module.h>
+
+
+error_t lvgl_arch_start();
+error_t lvgl_arch_stop();
+
+static bool is_running = false;
+static bool is_configured = false;
+
+struct LvglModuleConfig lvgl_module_config = {
+    NULL,
+    NULL,
+    0,
+    0,
+#ifdef ESP_PLATFORM
+    0,
+#endif
+};
+
+void lvgl_module_configure(const struct LvglModuleConfig config) {
+    is_configured = true;
+    memcpy(&lvgl_module_config, &config, sizeof(struct LvglModuleConfig));
+}
+
+static error_t start() {
+    if (!is_configured) {
+        return ERROR_INVALID_STATE;
+    }
+
+    if (is_running) {
+        return ERROR_NONE;
+    }
+
+    error_t result = lvgl_arch_start();
+    if (result == ERROR_NONE) {
+        is_running = true;
+    }
+
+    return result;
+}
+
+static error_t stop() {
+    if (!is_running) {
+        return ERROR_NONE;
+    }
+
+    error_t error = lvgl_arch_stop();
+    if (error == ERROR_NONE) {
+        is_running = false;
+    }
+
+    return error;
+}
+
+bool lvgl_is_running() {
+    return is_running;
+}
+
+struct Module lvgl_module = {
+    .name = "lvgl",
+    .start = start,
+    .stop = stop
+};

Platforms/PlatformEsp32/Source/drivers/esp32_gpio.cpp

@@ -118,10 +118,10 @@ extern struct Module platform_module;
 Driver esp32_gpio_driver = {
     .name = "esp32_gpio",
     .compatible = (const char*[]) { "espressif,esp32-gpio", nullptr },
-    .startDevice = start,
-    .stopDevice = stop,
+    .start_device = start,
+    .stop_device = stop,
     .api =  (void*)&esp32_gpio_api,
-    .deviceType = &GPIO_CONTROLLER_TYPE,
+    .device_type = &GPIO_CONTROLLER_TYPE,
     .owner = &platform_module,
     .driver_private = nullptr
 };

Platforms/PlatformEsp32/Source/drivers/esp32_i2c.cpp

@@ -211,10 +211,10 @@ extern struct Module platform_module;
 Driver esp32_i2c_driver = {
     .name = "esp32_i2c",
     .compatible = (const char*[]) { "espressif,esp32-i2c", nullptr },
-    .startDevice = start,
-    .stopDevice = stop,
+    .start_device = start,
+    .stop_device = stop,
     .api = (void*)&esp32_i2c_api,
-    .deviceType = &I2C_CONTROLLER_TYPE,
+    .device_type = &I2C_CONTROLLER_TYPE,
     .owner = &platform_module,
     .driver_private = nullptr
 };

Platforms/PlatformPosix/Source/freertos.c

@@ -0,0 +1,20 @@
+#include <stdlib.h>
+#if defined(__GLIBC__)
+#include <assert.h>
+#endif
+#include <tactility/freertos/task.h>
+#include <tactility/log.h>
+
+#define TAG LOG_TAG(freertos)
+
+/**
+ * Assert implementation as defined in the FreeRTOSConfig.h
+ */
+void vAssertCalled(unsigned long line, const char* const file) {
+    LOG_E("Assert triggered at {}:{}", file, line);
+#if defined(__GLIBC__)
+    __assert_fail("assert failed", file, line, "");
+#else
+    abort();
+#endif
+}

Platforms/PlatformPosix/Source/module.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Apache-2.0
 #include <tactility/module.h>
 
 extern "C" {

Tactility/CMakeLists.txt

@@ -8,8 +8,8 @@ if (DEFINED ENV{ESP_IDF_VERSION})
         PlatformEsp32
         TactilityCore
         TactilityFreeRtos
-        hal-device
-        lvgl
+        hal-device-module
+        lvgl-module
         driver
         elf_loader
         lv_screenshot
@@ -17,7 +17,6 @@ if (DEFINED ENV{ESP_IDF_VERSION})
         esp_http_server
         esp_http_client
         esp-tls
-        esp_lvgl_port
         esp_wifi
         json
         minitar
@@ -63,16 +62,14 @@ else()
         PUBLIC Include/
     )
 
-    add_definitions(-D_Nullable=)
-    add_definitions(-D_Nonnull=)
-
     target_link_libraries(Tactility PUBLIC
         cJSON
         TactilityFreeRtos
         TactilityCore
         TactilityKernel
         PlatformPosix
-        hal-device
+        hal-device-module
+        lvgl-module
         freertos_kernel
         lvgl
         lv_screenshot

Tactility/Include/Tactility/Tactility.h

@@ -27,9 +27,10 @@ void run(const Configuration& config, Module* platformModule, Module* deviceModu
 
 /**
  * While technically nullable, this instance is always set if tt_init() succeeds.
+ * Could return nullptr if init was not called.
  * @return the Configuration instance that was passed on to tt_init() if init is successful
  */
-const Configuration* _Nullable getConfiguration();
+const Configuration* getConfiguration();
 
 /** Provides access to the dispatcher that runs on the main task.
  * @warning This dispatcher is used for WiFi and might block for some time during WiFi connection.
@@ -40,7 +41,7 @@ Dispatcher& getMainDispatcher();
 namespace hal {
 
 /** While technically this configuration is nullable, it's never null after initHeadless() is called. */
-const Configuration* _Nullable getConfiguration();
+const Configuration* getConfiguration();
 
 } // namespace hal
 

Tactility/Include/Tactility/app/App.h

@@ -44,7 +44,8 @@ public:
     virtual void onDestroy(AppContext& appContext) {}
     virtual void onShow(AppContext& appContext, lv_obj_t* parent) {}
     virtual void onHide(AppContext& appContext) {}
-    virtual void onResult(AppContext& appContext, LaunchId launchId, Result result, std::unique_ptr<Bundle> _Nullable resultData) {}
+    /** resultData could be null */
+    virtual void onResult(AppContext& appContext, LaunchId launchId, Result result, std::unique_ptr<Bundle> resultData) {}
 
     Mutex& getMutex() { return mutex; }
 
@@ -81,9 +82,9 @@ std::shared_ptr<App> create() { return std::shared_ptr<T>(new T); }
 /**
  * @brief Start an app
  * @param[in] id application name or id
- * @param[in] parameters optional parameters to pass onto the application
+ * @param[in] parameters optional parameters to pass onto the application. can be nullptr.
  */
-LaunchId start(const std::string& id, std::shared_ptr<const Bundle> _Nullable parameters = nullptr);
+LaunchId start(const std::string& id, std::shared_ptr<const Bundle> parameters = nullptr);
 
 /** @brief Stop the currently showing app. Show the previous app if any app was still running. */
 void stop();
@@ -103,10 +104,10 @@ void stopAll(const std::string& id);
 bool isRunning(const std::string& id);
 
 /** @return the currently running app context (it is only ever null before the splash screen is shown) */
-std::shared_ptr<AppContext> _Nullable getCurrentAppContext();
+std::shared_ptr<AppContext> getCurrentAppContext();
 
 /** @return the currently running app (it is only ever null before the splash screen is shown) */
-std::shared_ptr<App> _Nullable getCurrentApp();
+std::shared_ptr<App> getCurrentApp();
 
 bool install(const std::string& path);
 

Tactility/Include/Tactility/app/AppRegistration.h

@@ -18,7 +18,7 @@ bool removeAppManifest(const std::string& id);
  * @param[in] id the manifest id
  * @return the application manifest if it was found
  */
-_Nullable std::shared_ptr<AppManifest> findAppManifestById(const std::string& id);
+std::shared_ptr<AppManifest> findAppManifestById(const std::string& id);
 
 /** @return a list of all registered apps. This includes user and system apps. */
 std::vector<std::shared_ptr<AppManifest>> getAppManifests();

Tactility/Include/Tactility/app/ElfApp.h

@@ -8,20 +8,26 @@ namespace tt::app {
 
 typedef void* (*CreateData)();
 typedef void (*DestroyData)(void* data);
-typedef void (*OnCreate)(void* appContext, void* _Nullable data);
-typedef void (*OnDestroy)(void* appContext, void* _Nullable data);
-typedef void (*OnShow)(void* appContext, void* _Nullable data, lv_obj_t* parent);
-typedef void (*OnHide)(void* appContext, void* _Nullable data);
-typedef void (*OnResult)(void* appContext, void* _Nullable data, LaunchId launchId, Result result, Bundle* resultData);
+/** data is nullable */
+typedef void (*OnCreate)(void* appContext, void* data);
+/** data is nullable */
+typedef void (*OnDestroy)(void* appContext, void* data);
+/** data is nullable */
+typedef void (*OnShow)(void* appContext, void* data, lv_obj_t* parent);
+/** data is nullable */
+typedef void (*OnHide)(void* appContext, void* data);
+/** data is nullable, resultData is nullable. */
+typedef void (*OnResult)(void* appContext, void* data, LaunchId launchId, Result result, Bundle* resultData);
 
+/** All fields are nullable */
 void setElfAppParameters(
-    CreateData _Nullable createData,
-    DestroyData _Nullable destroyData,
-    OnCreate _Nullable onCreate,
-    OnDestroy _Nullable onDestroy,
-    OnShow _Nullable onShow,
-    OnHide _Nullable onHide,
-    OnResult _Nullable onResult
+    CreateData createData,
+    DestroyData destroyData,
+    OnCreate onCreate,
+    OnDestroy onDestroy,
+    OnShow onShow,
+    OnHide onHide,
+    OnResult onResult
 );
 
 std::shared_ptr<App> createElfApp(const std::shared_ptr<AppManifest>& manifest);

Tactility/Include/Tactility/file/FileLock.h

@@ -15,6 +15,6 @@ namespace tt::file {
  * @param[in] path the path to find a lock for
  * @return a lock instance when a lock was found, otherwise nullptr
  */
-std::shared_ptr<Lock> _Nullable findLock(const std::string& path);
+std::shared_ptr<Lock> findLock(const std::string& path);
 
 }

Tactility/Include/Tactility/hal/Configuration.h

@@ -31,7 +31,7 @@ struct Configuration {
      * Called before I2C/SPI/etc is initialized.
      * Used for powering on the peripherals manually.
      */
-    const InitBoot _Nullable initBoot = nullptr;
+    const InitBoot initBoot = nullptr;
 
     /** Init behaviour: default (esp_lvgl_port for ESP32, nothing for PC) or None (nothing on any platform). Only used in Tactility, not in TactilityHeadless. */
     const LvglInit lvglInit = LvglInit::Default;

Tactility/Include/Tactility/hal/display/DisplayDevice.h

@@ -26,7 +26,8 @@ public:
     virtual bool isPoweredOn() const { return true; }
     virtual bool supportsPowerControl() const { return false; }
 
-    virtual std::shared_ptr<touch::TouchDevice> _Nullable getTouchDevice() = 0;
+    /** Could return nullptr if not started */
+    virtual std::shared_ptr<touch::TouchDevice> getTouchDevice() = 0;
 
     /** Set a value in the range [0, 255] */
     virtual void setBacklightDuty(uint8_t backlightDuty) { /* NO-OP */ }
@@ -40,10 +41,12 @@ public:
     virtual bool startLvgl() = 0;
     virtual bool stopLvgl() = 0;
 
-    virtual lv_display_t* _Nullable getLvglDisplay() const = 0;
+    /** Could return nullptr if not started */
+    virtual lv_display_t* getLvglDisplay() const = 0;
 
     virtual bool supportsDisplayDriver() const = 0;
-    virtual std::shared_ptr<DisplayDriver> _Nullable getDisplayDriver() = 0;
+    /** Could return nullptr if not supported */
+    virtual std::shared_ptr<DisplayDriver> getDisplayDriver() = 0;
 };
 
 } // namespace tt::hal::display

Tactility/Include/Tactility/hal/encoder/EncoderDevice.h

@@ -17,7 +17,8 @@ public:
     virtual bool startLvgl(lv_display_t* display) = 0;
     virtual bool stopLvgl() = 0;
 
-    virtual lv_indev_t* _Nullable getLvglIndev() = 0;
+    /** Could return nullptr if not started */
+    virtual lv_indev_t* getLvglIndev() = 0;
 };
 
 }

Tactility/Include/Tactility/hal/gps/GpsDevice.h

@@ -48,7 +48,7 @@ private:
 
     const GpsConfiguration configuration;
     RecursiveMutex mutex;
-    std::unique_ptr<Thread> _Nullable thread;
+    std::unique_ptr<Thread> thread;
     bool threadInterrupted = false;
     std::vector<GgaSubscription> ggaSubscriptions;
     std::vector<RmcSubscription> rmcSubscriptions;

Tactility/Include/Tactility/hal/keyboard/KeyboardDevice.h

@@ -20,7 +20,8 @@ public:
     /** @return true when the keyboard currently is physically attached */
     virtual bool isAttached() const = 0;
 
-    virtual lv_indev_t* _Nullable getLvglIndev() = 0;
+    /** Could return nullptr if not started */
+    virtual lv_indev_t* getLvglIndev() = 0;
 };
 
 }

Tactility/Include/Tactility/hal/sdcard/SdCardDevice.h

@@ -67,8 +67,8 @@ public:
     bool isMounted(TickType_t timeout = kernel::MAX_TICKS) const { return getState(timeout) == State::Mounted; }
 };
 
-/** Return the SdCard device if the path is within the SdCard mounted path (path std::string::starts_with() check)*/
-std::shared_ptr<SdCardDevice> _Nullable find(const std::string& path);
+/** Return the SdCard device if the path is within the SdCard mounted path (path std::string::starts_with() check), otherwise return nullptr */
+std::shared_ptr<SdCardDevice> find(const std::string& path);
 
 /**
  * Attempt to find an SD card that the specified belongs to,

Tactility/Include/Tactility/hal/sdcard/SdmmcDevice.h

@@ -82,7 +82,8 @@ public:
 
     State getState(TickType_t timeout) const override;
 
-    sdmmc_card_t* _Nullable getCard() { return card; }
+    /** return card when mounted, otherwise return nullptr */
+    sdmmc_card_t* getCard() { return card; }
 };
 
 }

Tactility/Include/Tactility/hal/sdcard/SpiSdCardDevice.h

@@ -29,7 +29,7 @@ public:
             gpio_num_t spiPinInt,
             MountBehaviour mountBehaviourAtBoot,
             /** When customLock is a nullptr, use the SPI default one */
-            std::shared_ptr<Lock> _Nullable customLock = nullptr,
+            std::shared_ptr<Lock> customLock = nullptr,
             std::vector<gpio_num_t> csPinWorkAround = std::vector<gpio_num_t>(),
             spi_host_device_t spiHost = SPI2_HOST,
             int spiFrequencyKhz = SDMMC_FREQ_DEFAULT
@@ -50,7 +50,7 @@ public:
         gpio_num_t spiPinWp; // Write-protect
         gpio_num_t spiPinInt; // Interrupt
         MountBehaviour mountBehaviourAtBoot;
-        std::shared_ptr<Lock> _Nullable customLock;
+        std::shared_ptr<Lock> customLock; // can be nullptr
         std::vector<gpio_num_t> csPinWorkAround;
         spi_host_device_t spiHost;
         bool formatOnMountFailed = false;
@@ -91,7 +91,8 @@ public:
 
     State getState(TickType_t timeout) const override;
 
-    sdmmc_card_t* _Nullable getCard() { return card; }
+    /** return card when mounted, otherwise return nullptr */
+    sdmmc_card_t* getCard() { return card; }
 };
 
 }

Tactility/Include/Tactility/hal/spi/Spi.h

@@ -24,7 +24,7 @@ struct Configuration {
     /** Whether configuration can be changed. */
     bool isMutable;
     /** Optional custom lock - otherwise creates one internally */
-    std::shared_ptr<Lock> _Nullable lock;
+    std::shared_ptr<Lock> lock;
 };
 
 enum class Status {

Tactility/Include/Tactility/hal/touch/TouchDevice.h

@@ -22,11 +22,13 @@ public:
     virtual bool startLvgl(lv_display_t* display) = 0;
     virtual bool stopLvgl() = 0;
 
-    virtual lv_indev_t* _Nullable getLvglIndev() = 0;
+    /** Could return nullptr if not started */
+    virtual lv_indev_t* getLvglIndev() = 0;
 
     virtual bool supportsTouchDriver() = 0;
 
-    virtual std::shared_ptr<TouchDriver> _Nullable getTouchDriver() = 0;
+    /** Could return nullptr if not supported */
+    virtual std::shared_ptr<TouchDriver> getTouchDriver() = 0;
 };
 
 }

Tactility/Include/Tactility/hal/touch/TouchDriver.h

@@ -11,13 +11,13 @@ public:
      *
      * @param[in] x array of X coordinates
      * @param[in] y array of Y coordinates
-     * @param[in] strength optional array of strengths
+     * @param[in] strength optional array of strengths (nullable)
      * @param[in] pointCount the number of points currently touched on the screen
      * @param[in] maxPointCount the maximum number of points that can be touched at once
      *
      * @return true when touched and coordinates are available
      */
-    virtual bool getTouchedPoints(uint16_t* x, uint16_t* y, uint16_t* _Nullable strength, uint8_t* pointCount, uint8_t maxPointCount) = 0;
+    virtual bool getTouchedPoints(uint16_t* x, uint16_t* y, uint16_t* strength, uint8_t* pointCount, uint8_t maxPointCount) = 0;
 };
 
 }

Tactility/Include/Tactility/kernel/SystemEvents.h

@@ -12,11 +12,6 @@ enum class SystemEvent {
     /** Gained IP address */
     NetworkConnected,
     NetworkDisconnected,
-    /** LVGL devices are initialized and usable */
-    LvglStarted,
-    /** LVGL devices were removed and not usable anymore */
-    LvglStopped,
-    /** An important system time-related event, such as NTP update or time-zone change */
     Time,
 };
 

Tactility/Include/Tactility/lvgl/LvglSync.h

@@ -8,23 +8,13 @@ namespace tt::lvgl {
 
 constexpr TickType_t defaultLockTime = 500 / portTICK_PERIOD_MS;
 
-/**
- * LVGL locking function
- * @param[in] timeoutMillis timeout in milliseconds. waits forever when 0 is passed.
- * @warning this works with milliseconds, as opposed to every other FreeRTOS function that works in ticks!
- * @warning when passing zero, we wait forever, as this is the default behaviour for esp_lvgl_port, and we want it to remain consistent
- */
-typedef bool (*LvglLock)(uint32_t timeoutMillis);
-typedef void (*LvglUnlock)();
-
-void syncSet(LvglLock lock, LvglUnlock unlock);
-
 /**
  * LVGL locking function
  * @param[in] timeout as ticks
  * @warning when passing zero, we wait forever, as this is the default behaviour for esp_lvgl_port, and we want it to remain consistent
  */
-bool lock(TickType_t timeout);
+bool lock(TickType_t timeout = portMAX_DELAY);
+
 void unlock();
 
 std::shared_ptr<Lock> getSyncLock();

Tactility/Include/Tactility/service/ServiceRegistration.h

@@ -40,26 +40,26 @@ State getState(const std::string& id);
  * @param[in] id the id as defined in the manifest
  * @return the matching manifest or nullptr when it wasn't found
  */
-std::shared_ptr<const ServiceManifest> _Nullable findManifestById(const std::string& id);
+std::shared_ptr<const ServiceManifest> findManifestById(const std::string& id);
 
 /** Find a ServiceContext by its manifest id.
  * @param[in] id the id as defined in the manifest
  * @return the service context or nullptr when it wasn't found
  */
-std::shared_ptr<ServiceContext> _Nullable findServiceContextById(const std::string& id);
+std::shared_ptr<ServiceContext> findServiceContextById(const std::string& id);
 
 /** Find a Service by its manifest id.
  * @param[in] id the id as defined in the manifest
  * @return the service context or nullptr when it wasn't found
  */
-std::shared_ptr<Service> _Nullable findServiceById(const std::string& id);
+std::shared_ptr<Service> findServiceById(const std::string& id);
 
 /** Find a Service by its manifest id.
  * @param[in] id the id as defined in the manifest
  * @return the service context or nullptr when it wasn't found
  */
 template <typename T>
-std::shared_ptr<T> _Nullable findServiceById(const std::string& id) {
+std::shared_ptr<T> findServiceById(const std::string& id) {
     return std::static_pointer_cast<T>(findServiceById(id));
 }
 

Tactility/Include/Tactility/service/gps/GpsService.h

@@ -34,7 +34,8 @@ class GpsService final : public Service {
     bool startGpsDevice(GpsDeviceRecord& deviceRecord);
     static bool stopGpsDevice(GpsDeviceRecord& deviceRecord);
 
-    GpsDeviceRecord* _Nullable findGpsRecord(const std::shared_ptr<hal::gps::GpsDevice>& record);
+    /** return nullptr when not found */
+    GpsDeviceRecord* findGpsRecord(const std::shared_ptr<hal::gps::GpsDevice>& record);
 
     void onGgaSentence(hal::Device::Id deviceId, const minmea_sentence_gga& gga);
     void onRmcSentence(hal::Device::Id deviceId, const minmea_sentence_rmc& rmc);

Tactility/Include/Tactility/service/loader/Loader.h

@@ -62,10 +62,10 @@ public:
     /**
      * @brief Start an app given an app id and an optional bundle with parameters
      * @param id the app identifier
-     * @param parameters optional parameter bundle
+     * @param parameters optional parameter bundle (nullable)
      * @return the launch id
      */
-    app::LaunchId start(const std::string& id, std::shared_ptr<const Bundle> _Nullable parameters);
+    app::LaunchId start(const std::string& id, std::shared_ptr<const Bundle> parameters);
 
     /**
      * @brief Stops the top-most app (the one that is currently active shown to the user
@@ -85,8 +85,8 @@ public:
      */
     void stopAll(const std::string& id);
 
-    /** @return the AppContext of the top-most application */
-    std::shared_ptr<app::AppContext> _Nullable getCurrentAppContext();
+    /** @return the AppContext of the top-most application, or nullptr if no app is running. */
+    std::shared_ptr<app::AppContext> getCurrentAppContext();
 
     /** @return true if the app is running anywhere in the app stack (the app does not have to be the top-most one for this to return true) */
     bool isRunning(const std::string& id) const;
@@ -95,6 +95,7 @@ public:
     std::shared_ptr<PubSub<Event>> getPubsub() const { return pubsubExternal; }
 };
 
-std::shared_ptr<LoaderService> _Nullable findLoaderService();
+/** return the service or nullptr if it's not running */
+std::shared_ptr<LoaderService> findLoaderService();
 
 } // namespace

Tactility/Private/Tactility/app/AppInstance.h

@@ -36,7 +36,7 @@ class AppInstance : public AppContext {
      * When these are stored in the app struct, the struct takes ownership.
      * Do not mutate after app creation.
      */
-    std::shared_ptr<const Bundle> _Nullable parameters;
+    std::shared_ptr<const Bundle> parameters;
 
     std::shared_ptr<App> app;
 

Tactility/Private/Tactility/lvgl/EspLvglPort.h

@@ -1,11 +0,0 @@
-#pragma once
-
-#ifdef ESP_PLATFORM
-
-namespace tt::lvgl {
-
-bool initEspLvglPort();
-
-}
-
-#endif

Tactility/Private/Tactility/lvgl/LvglPrivate.h

@@ -1,9 +1,11 @@
 #pragma once
 
-#include <Tactility/hal/Configuration.h>
+#include <Tactility/lvgl/Lvgl.h>
 
 namespace tt::lvgl {
 
-void init(const hal::Configuration& config);
+void attachDevices();
 
-} // namespace
+void detachDevices();
+
+}

Tactility/Private/Tactility/service/gui/GuiService.h

@@ -39,7 +39,7 @@ class GuiService final : public Service {
     // App-specific
     std::shared_ptr<app::AppInstance> appToRender = nullptr;
 
-    lv_obj_t* _Nullable keyboard = nullptr;
+    lv_obj_t* keyboard = nullptr;
     lv_group_t* keyboardGroup = nullptr;
 
     bool isStarted = false;

Tactility/Private/Tactility/service/screenshot/Screenshot.h

@@ -48,7 +48,7 @@ public:
     void stop();
 };
 
-std::shared_ptr<ScreenshotService> _Nullable optScreenshotService();
+std::shared_ptr<ScreenshotService> optScreenshotService();
 
 } // namespace
 

Tactility/Source/Tactility.cpp

@@ -2,11 +2,15 @@
 #include <sdkconfig.h>
 #endif
 
+#include <format>
+#include <map>
+
 #include <Tactility/Tactility.h>
 #include <Tactility/TactilityConfig.h>
 
 #include <Tactility/app/AppManifestParsing.h>
 #include <Tactility/app/AppRegistration.h>
+#include <Tactility/CpuAffinity.h>
 #include <Tactility/DispatcherThread.h>
 #include <Tactility/file/File.h>
 #include <Tactility/file/FileLock.h>
@@ -19,14 +23,12 @@
 #include <Tactility/network/NtpPrivate.h>
 #include <Tactility/service/ServiceManifest.h>
 #include <Tactility/service/ServiceRegistration.h>
-#include <Tactility/service/loader/Loader.h>
 #include <Tactility/settings/TimePrivate.h>
 
+#include <tactility/concurrent/thread.h>
 #include <tactility/kernel_init.h>
 #include <tactility/hal_device_module.h>
-
-#include <map>
-#include <format>
+#include <tactility/lvgl_module.h>
 
 #ifdef ESP_PLATFORM
 #include <Tactility/InitEsp.h>
@@ -336,8 +338,9 @@ void run(const Configuration& config, Module* platformModule, Module* deviceModu
         return;
     }
 
-    // HAL compatibility module: it creates kernel driver wrappers for tt::hal::Device
+    // Module parent
     check(module_parent_construct(&tactility_module_parent) == ERROR_NONE);
+    // hal-device-module
     check(module_set_parent(&hal_device_module, &tactility_module_parent) == ERROR_NONE);
     check(module_start(&hal_device_module) == ERROR_NONE);
 
@@ -355,7 +358,22 @@ void run(const Configuration& config, Module* platformModule, Module* deviceModu
     network::ntp::init();
 
     registerAndStartPrimaryServices();
-    lvgl::init(hardware);
+
+    lvgl_module_configure((LvglModuleConfig) {
+        .on_start = lvgl::attachDevices,
+        .on_stop = lvgl::detachDevices,
+        .task_priority = THREAD_PRIORITY_HIGHER,
+        /** Minimum seems to be about 3500. In some scenarios, the WiFi app crashes at 8192,
+         * so we now have 9120 to run in a stable manner. We should figure out a way to avoid this.
+         * Perhaps we can give apps their own stack space and deal with lvgl callback handlers in a clever way. */
+        .task_stack_size = 9120,
+#ifdef ESP_PLATFORM
+        .task_affinity = getCpuAffinityConfiguration().graphics
+#endif
+    });
+    check(module_set_parent(&lvgl_module, &tactility_module_parent) == ERROR_NONE);
+    lvgl::start();
+
     registerAndStartSecondaryServices();
 
     LOGGER.info("Core systems ready");
@@ -371,7 +389,8 @@ void run(const Configuration& config, Module* platformModule, Module* deviceModu
     }
 }
 
-const Configuration* _Nullable getConfiguration() {
+/** return the configuration or nullptr if it's not initialized */
+const Configuration* getConfiguration() {
     return config_instance;
 }
 

Tactility/Source/app/App.cpp

@@ -5,7 +5,7 @@ namespace tt::app {
 
 constexpr auto* TAG = "App";
 
-LaunchId start(const std::string& id, std::shared_ptr<const Bundle> _Nullable parameters) {
+LaunchId start(const std::string& id, std::shared_ptr<const Bundle> parameters) {
     const auto service = service::loader::findLoaderService();
     assert(service != nullptr);
     return service->start(id, std::move(parameters));
@@ -35,15 +35,15 @@ bool isRunning(const std::string& id) {
     return service->isRunning(id);
 }
 
-std::shared_ptr<AppContext> _Nullable getCurrentAppContext() {
+std::shared_ptr<AppContext> getCurrentAppContext() {
     const auto service = service::loader::findLoaderService();
     assert(service != nullptr);
     return service->getCurrentAppContext();
 }
 
-std::shared_ptr<App> _Nullable getCurrentApp() {
+std::shared_ptr<App> getCurrentApp() {
     const auto app_context = getCurrentAppContext();
-    return (app_context !=  nullptr) ? app_context->getApp() : nullptr;
+    return (app_context != nullptr) ? app_context->getApp() : nullptr;
 }
 
 }

Tactility/Source/app/AppRegistration.cpp

@@ -39,7 +39,7 @@ bool removeAppManifest(const std::string& id) {
     return app_manifest_map.erase(id) == 1;
 }
 
-_Nullable std::shared_ptr<AppManifest> findAppManifestById(const std::string& id) {
+std::shared_ptr<AppManifest> findAppManifestById(const std::string& id) {
     hash_mutex.lock();
     auto result = app_manifest_map.find(id);
     hash_mutex.unlock();

Tactility/Source/app/ElfApp.cpp

@@ -34,13 +34,13 @@ class ElfApp final : public App {
 public:
 
     struct Parameters {
-        CreateData _Nullable createData = nullptr;
-        DestroyData _Nullable destroyData = nullptr;
-        OnCreate _Nullable onCreate = nullptr;
-        OnDestroy _Nullable onDestroy = nullptr;
-        OnShow _Nullable onShow = nullptr;
-        OnHide _Nullable onHide = nullptr;
-        OnResult _Nullable onResult = nullptr;
+        CreateData createData = nullptr;
+        DestroyData destroyData = nullptr;
+        OnCreate onCreate = nullptr;
+        OnDestroy onDestroy = nullptr;
+        OnShow onShow = nullptr;
+        OnHide onHide = nullptr;
+        OnResult onResult = nullptr;
     };
 
     static void setParameters(const Parameters& parameters) {
@@ -202,13 +202,13 @@ size_t ElfApp::staticParametersSetCount = 0;
 std::shared_ptr<Lock> ElfApp::staticParametersLock = std::make_shared<Mutex>();
 
 void setElfAppParameters(
-    CreateData _Nullable createData,
-    DestroyData _Nullable destroyData,
-    OnCreate _Nullable onCreate,
-    OnDestroy _Nullable onDestroy,
-    OnShow _Nullable onShow,
-    OnHide _Nullable onHide,
-    OnResult _Nullable onResult
+    CreateData createData,
+    DestroyData destroyData,
+    OnCreate onCreate,
+    OnDestroy onDestroy,
+    OnShow onShow,
+    OnHide onHide,
+    OnResult onResult
 ) {
     ElfApp::setParameters({
         .createData = createData,

Tactility/Source/app/apphub/AppHubApp.cpp

@@ -30,7 +30,7 @@ class AppHubApp final : public App {
     std::vector<AppHubEntry> entries;
     Mutex mutex;
 
-    static std::shared_ptr<AppHubApp> _Nullable findAppInstance() {
+    static std::shared_ptr<AppHubApp> findAppInstance() {
         auto app_context = getCurrentAppContext();
         if (app_context->getManifest().appId != manifest.appId) {
             return nullptr;

Tactility/Source/app/i2cscanner/I2cScanner.cpp

@@ -71,7 +71,7 @@ public:
 };
 
 /** Returns the app data if the app is active. Note that this could clash if the same app is started twice and a background thread is slow. */
-std::shared_ptr<I2cScannerApp> _Nullable optApp() {
+std::shared_ptr<I2cScannerApp> optApp() {
     auto appContext = getCurrentAppContext();
     if (appContext != nullptr && appContext->getManifest().appId == manifest.appId) {
         return std::static_pointer_cast<I2cScannerApp>(appContext->getApp());

Tactility/Source/app/power/Power.cpp

@@ -20,7 +20,7 @@ extern const AppManifest manifest;
 class PowerApp;
 
 /** Returns the app data if the app is active. Note that this could clash if the same app is started twice and a background thread is slow. */
-std::shared_ptr<PowerApp> _Nullable optApp() {
+std::shared_ptr<PowerApp> optApp() {
     auto appContext = getCurrentAppContext();
     if (appContext != nullptr && appContext->getManifest().appId == manifest.appId) {
         return std::static_pointer_cast<PowerApp>(appContext->getApp());

Tactility/Source/app/screenshot/Screenshot.cpp

@@ -49,7 +49,7 @@ public:
 
 
 /** Returns the app data if the app is active. Note that this could clash if the same app is started twice and a background thread is slow. */
-std::shared_ptr<ScreenshotApp> _Nullable optApp() {
+std::shared_ptr<ScreenshotApp> optApp() {
     auto appContext = getCurrentAppContext();
     if (appContext != nullptr && appContext->getManifest().appId == manifest.appId) {
         return std::static_pointer_cast<ScreenshotApp>(appContext->getApp());

Tactility/Source/app/systeminfo/SystemInfo.cpp

@@ -274,7 +274,7 @@ extern const AppManifest manifest;
 
 class SystemInfoApp;
 
-static std::shared_ptr<SystemInfoApp> _Nullable optApp() {
+static std::shared_ptr<SystemInfoApp> optApp() {
     auto appContext = getCurrentAppContext();
     if (appContext != nullptr && appContext->getManifest().appId == manifest.appId) {
         return std::static_pointer_cast<SystemInfoApp>(appContext->getApp());

Tactility/Source/app/wifimanage/View.cpp

@@ -16,7 +16,7 @@ namespace tt::app::wifimanage {
 
 static const auto LOGGER = Logger("WifiManageView");
 
-std::shared_ptr<WifiManage> _Nullable optWifiManage();
+std::shared_ptr<WifiManage> optWifiManage();
 
 static uint8_t mapRssiToPercentage(int rssi) {
     auto abs_rssi = std::abs(rssi);

Tactility/Source/file/FileLock.cpp

@@ -5,7 +5,7 @@
 
 namespace tt::file {
 
-std::shared_ptr<Lock> _Nullable findLock(const std::string& path) {
+std::shared_ptr<Lock> findLock(const std::string& path) {
     return hal::sdcard::findSdCardLock(path);
 }
 

Tactility/Source/hal/sdcard/SdCard.cpp

@@ -3,7 +3,7 @@
 
 namespace tt::hal::sdcard {
 
-std::shared_ptr<SdCardDevice> _Nullable find(const std::string& path) {
+std::shared_ptr<SdCardDevice> find(const std::string& path) {
     auto sdcards = findDevices<SdCardDevice>(Device::Type::SdCard);
     for (auto& sdcard : sdcards) {
         if (sdcard->isMounted() && path.starts_with(sdcard->getMountPath())) {

Tactility/Source/hal/usb/Usb.cpp

@@ -20,7 +20,7 @@ struct BootModeData {
 static Mode currentMode = Mode::Default;
 static RTC_NOINIT_ATTR BootModeData bootModeData;
 
-sdmmc_card_t* _Nullable getCard() {
+sdmmc_card_t* getCard() {
     auto sdcards = findDevices<sdcard::SpiSdCardDevice>(Device::Type::SdCard);
 
     std::shared_ptr<sdcard::SpiSdCardDevice> usable_sdcard;

Tactility/Source/hal/usb/UsbTusb.cpp

@@ -19,7 +19,7 @@
 static const auto LOGGER = tt::Logger("USB");
 
 namespace tt::hal::usb {
-    extern sdmmc_card_t* _Nullable getCard();
+    extern sdmmc_card_t* getCard();
 }
 
 enum {

Tactility/Source/kernel/SystemEvents.cpp

@@ -34,10 +34,6 @@ static const char* getEventName(SystemEvent event) {
             return TT_STRINGIFY(NetworkConnected);
         case NetworkDisconnected:
             return TT_STRINGIFY(NetworkDisconnected);
-        case LvglStarted:
-            return TT_STRINGIFY(LvglStarted);
-        case LvglStopped:
-            return TT_STRINGIFY(LvglStopped);
         case Time:
             return TT_STRINGIFY(Time);
     }

Tactility/Source/lvgl/EspLvglPort.cpp

@@ -1,42 +0,0 @@
-#ifdef ESP_PLATFORM
-
-#include <Tactility/Thread.h>
-#include <Tactility/CpuAffinity.h>
-#include <Tactility/Logger.h>
-#include <Tactility/Mutex.h>
-#include <Tactility/lvgl/LvglSync.h>
-
-#include <esp_lvgl_port.h>
-
-namespace tt::lvgl {
-
-// LVGL
-// The minimum task stack seems to be about 3500, but that crashes the wifi app in some scenarios
-// At 8192, it sometimes crashes when wifi-auto enables and is busy connecting and then you open WifiManage
-constexpr auto LVGL_TASK_STACK_DEPTH = 9216;
-
-static const auto LOGGER = Logger("EspLvglPort");
-
-bool initEspLvglPort() {
-    LOGGER.debug("Init");
-    const lvgl_port_cfg_t lvgl_cfg = {
-        .task_priority = static_cast<UBaseType_t>(Thread::Priority::Critical),
-        .task_stack = LVGL_TASK_STACK_DEPTH,
-        .task_affinity = getCpuAffinityConfiguration().graphics,
-        .task_max_sleep_ms = 500,
-        .timer_period_ms = 5
-    };
-
-    if (lvgl_port_init(&lvgl_cfg) != ESP_OK) {
-        LOGGER.error("Init failed");
-        return false;
-    }
-
-    syncSet(&lvgl_port_lock, &lvgl_port_unlock);
-
-    return true;
-}
-
-} // namespace tt::lvgl
-
-#endif