From 219970c2acba6bf3c659b07da7fa070cb95ccbab Mon Sep 17 00:00:00 2001 From: Ken Van Hoeylandt Date: Sun, 1 Feb 2026 21:21:09 +0100 Subject: [PATCH] Fix for build --- Modules/lvgl-module/Source/arch/lvgl_posix.c | 6 +++--- TactilityKernel/Include/tactility/time.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Modules/lvgl-module/Source/arch/lvgl_posix.c b/Modules/lvgl-module/Source/arch/lvgl_posix.c index 513eb63b..9ce8dbc2 100644 --- a/Modules/lvgl-module/Source/arch/lvgl_posix.c +++ b/Modules/lvgl-module/Source/arch/lvgl_posix.c @@ -97,7 +97,7 @@ static void lvgl_task(void* arg) { if (lvgl_module_config.on_stop) lvgl_module_config.on_stop(); - vTaskDelete(nullptr); + vTaskDelete(NULL); } error_t lvgl_arch_start() { @@ -110,7 +110,7 @@ error_t lvgl_arch_start() { lvgl_module_config.task_stack_size, &lvgl_task_handle, lvgl_module_config.task_priority, - nullptr + NULL ); return (task_result == pdTRUE) ? ERROR_NONE : ERROR_RESOURCE; @@ -119,7 +119,7 @@ error_t lvgl_arch_start() { error_t lvgl_arch_stop() { TickType_t start_ticks = get_ticks(); lvgl_task_interrupt(); - while (lvgl_task_handle != nullptr) { // TODO: make thread-safe + while (lvgl_task_handle != NULL) { // TODO: make thread-safe delay_ticks(LVGL_STOP_POLL_INTERVAL); if (get_ticks() - start_ticks > LVGL_STOP_TIMEOUT) { return ERROR_TIMEOUT; diff --git a/TactilityKernel/Include/tactility/time.h b/TactilityKernel/Include/tactility/time.h index 5d0e93a3..c05dbe76 100644 --- a/TactilityKernel/Include/tactility/time.h +++ b/TactilityKernel/Include/tactility/time.h @@ -59,7 +59,7 @@ static inline int64_t get_micros_since_boot() { return ((int64_t)ts.tv_sec * 1000000LL) + (ts.tv_nsec / 1000); } struct timeval tv; - gettimeofday(&tv, nullptr); + gettimeofday(&tv, NULL); return ((int64_t)tv.tv_sec * 1000000LL) + tv.tv_usec; #endif }