Rename icons, fix T-Lora Pager config and more (#502)
* **New Features** * Added NFC chip-select to SD card hardware configuration. * **Refactor** * Consolidated and renamed icon resources; apps and status-bar now reference unified icon headers and new icon constants. * Renamed LVGL lock API (timed → lvgl_try_lock) and updated callers. * **Documentation** * Updated module README and license files; added Apache-2.0 license document.
This commit is contained in:
committed by
GitHub
parent
72b55b221e
commit
3a24d058c9
@@ -1,4 +1,4 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
#ifdef ESP_PLATFORM
|
||||
|
||||
#include <esp_lvgl_port.h>
|
||||
@@ -16,7 +16,7 @@ bool lvgl_lock(void) {
|
||||
return lvgl_port_lock(portMAX_DELAY);
|
||||
}
|
||||
|
||||
bool lvgl_try_lock_timed(uint32_t timeout) {
|
||||
bool lvgl_try_lock(uint32_t timeout) {
|
||||
if (!initialized) return true; // We allow (fake) locking because it's safe to do so as LVGL is not running yet
|
||||
return lvgl_port_lock(millis_to_ticks(timeout));
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
#ifndef ESP_PLATFORM
|
||||
|
||||
#include <tactility/check.h>
|
||||
@@ -43,7 +43,7 @@ bool lvgl_lock(void) {
|
||||
return true;
|
||||
}
|
||||
|
||||
bool lvgl_try_lock_timed(uint32_t timeout) {
|
||||
bool lvgl_try_lock(uint32_t timeout) {
|
||||
if (!lvgl_mutex_initialised) return false;
|
||||
return recursive_mutex_try_lock(&lvgl_mutex, millis_to_ticks(timeout));
|
||||
}
|
||||
@@ -75,7 +75,7 @@ static void lvgl_task(void* arg) {
|
||||
if (lvgl_module_config.on_start) lvgl_module_config.on_start();
|
||||
|
||||
while (!lvgl_task_is_interrupt_requested()) {
|
||||
if (lvgl_try_lock_timed(10)) {
|
||||
if (lvgl_try_lock(10)) {
|
||||
task_delay_ms = lv_timer_handler();
|
||||
lvgl_unlock();
|
||||
}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
#include <lvgl.h>
|
||||
#include <tactility/lvgl_fonts.h>
|
||||
#include <tactility/check.h>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
#include <lvgl.h>
|
||||
#include <string.h>
|
||||
#include <tactility/module.h>
|
||||
|
||||
@@ -1,7 +1,25 @@
|
||||
#include <tactility/module.h>
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
#include <tactility/lvgl_module.h>
|
||||
#include <tactility/lvgl_fonts.h>
|
||||
|
||||
#include <lvgl.h>
|
||||
#include <tactility/module.h>
|
||||
|
||||
const struct ModuleSymbol lvgl_module_symbols[] = {
|
||||
// lvgl_module
|
||||
DEFINE_MODULE_SYMBOL(lvgl_lock),
|
||||
DEFINE_MODULE_SYMBOL(lvgl_try_lock),
|
||||
DEFINE_MODULE_SYMBOL(lvgl_unlock),
|
||||
DEFINE_MODULE_SYMBOL(lvgl_is_running),
|
||||
// lvgl_fonts
|
||||
DEFINE_MODULE_SYMBOL(lvgl_get_shared_icon_font),
|
||||
DEFINE_MODULE_SYMBOL(lvgl_get_shared_icon_font_height),
|
||||
DEFINE_MODULE_SYMBOL(lvgl_get_text_font),
|
||||
DEFINE_MODULE_SYMBOL(lvgl_get_text_font_height),
|
||||
DEFINE_MODULE_SYMBOL(lvgl_get_launcher_icon_font),
|
||||
DEFINE_MODULE_SYMBOL(lvgl_get_launcher_icon_font_height),
|
||||
DEFINE_MODULE_SYMBOL(lvgl_get_statusbar_icon_font),
|
||||
DEFINE_MODULE_SYMBOL(lvgl_get_statusbar_icon_font_height),
|
||||
// lv_event
|
||||
DEFINE_MODULE_SYMBOL(lv_event_get_code),
|
||||
DEFINE_MODULE_SYMBOL(lv_event_get_indev),
|
||||
|
||||
Reference in New Issue
Block a user