dominic/Tactility
1
0
Fork 0
mirror of https://github.com/ByteWelder/Tactility.git synced 2026-02-18 10:53:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed getLvglSyncLock() to getSyncLock() (#221)

Browse Source
This commit is contained in:
Ken Van Hoeylandt 2025-02-14 00:06:52 +01:00 committed by GitHub
parent 6e77d5027f
commit ad2cad3bf1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Boards/CYD-2432S024C/Source/CYD2432S024C.cpp
View File

@ -73,7 +73,7 @@ const tt::hal::Configuration cyd_2432S024c_config = {
.initMode = tt::hal::spi::InitMode::ByTactility, .initMode = tt::hal::spi::InitMode::ByTactility,
.canReinit = false, .canReinit = false,
.hasMutableConfiguration = false, .hasMutableConfiguration = false,
.lock = tt::lvgl::getLvglSyncLock() // esp_lvgl_port owns the lock for the display .lock = tt::lvgl::getSyncLock() // esp_lvgl_port owns the lock for the display
}, },
tt::hal::spi::Configuration { tt::hal::spi::Configuration {
.device = SPI3_HOST, .device = SPI3_HOST,

2
Boards/LilygoTdeck/Source/LilygoTdeck.cpp
View File

@ -78,7 +78,7 @@ extern const tt::hal::Configuration lilygo_tdeck = {
.initMode = tt::hal::spi::InitMode::ByTactility, .initMode = tt::hal::spi::InitMode::ByTactility,
.canReinit = false, .canReinit = false,
.hasMutableConfiguration = false, .hasMutableConfiguration = false,
.lock = tt::lvgl::getLvglSyncLock() // esp_lvgl_port owns the lock for the display .lock = tt::lvgl::getSyncLock() // esp_lvgl_port owns the lock for the display
} }
}, },
.uart { .uart {

2
Boards/LilygoTdeck/Source/hal/TdeckSdCard.cpp
View File

@ -18,7 +18,7 @@ std::shared_ptr<SdCardDevice> createTdeckSdCard() {
GPIO_NUM_NC, GPIO_NUM_NC,
GPIO_NUM_NC, GPIO_NUM_NC,
SdCardDevice::MountBehaviour::AtBoot, SdCardDevice::MountBehaviour::AtBoot,
tt::lvgl::getLvglSyncLock(), tt::lvgl::getSyncLock(),
{ {
TDECK_RADIO_PIN_CS, TDECK_RADIO_PIN_CS,
TDECK_LCD_PIN_CS TDECK_LCD_PIN_CS

2
Boards/M5stackCore2/Source/M5stackCore2.cpp
View File

@ -75,7 +75,7 @@ extern const tt::hal::Configuration m5stack_core2 = {
.initMode = tt::hal::spi::InitMode::ByTactility, .initMode = tt::hal::spi::InitMode::ByTactility,
.canReinit = false, .canReinit = false,
.hasMutableConfiguration = false, .hasMutableConfiguration = false,
.lock = tt::lvgl::getLvglSyncLock() // esp_lvgl_port owns the lock for the display .lock = tt::lvgl::getSyncLock() // esp_lvgl_port owns the lock for the display
} }
} }
}; };

2
Boards/M5stackCore2/Source/hal/Core2SdCard.cpp
View File

@ -17,7 +17,7 @@ std::shared_ptr<SdCardDevice> createSdCard() {
GPIO_NUM_NC, GPIO_NUM_NC,
GPIO_NUM_NC, GPIO_NUM_NC,
SdCardDevice::MountBehaviour::AtBoot, SdCardDevice::MountBehaviour::AtBoot,
tt::lvgl::getLvglSyncLock(), tt::lvgl::getSyncLock(),
{ {
CORE2_LCD_PIN_CS CORE2_LCD_PIN_CS
} }

2
Boards/M5stackCoreS3/Source/M5stackCoreS3.cpp
View File

@ -74,7 +74,7 @@ const tt::hal::Configuration m5stack_cores3 = {
.initMode = tt::hal::spi::InitMode::ByTactility, .initMode = tt::hal::spi::InitMode::ByTactility,
.canReinit = false, .canReinit = false,
.hasMutableConfiguration = false, .hasMutableConfiguration = false,
.lock = tt::lvgl::getLvglSyncLock() // esp_lvgl_port owns the lock for the display .lock = tt::lvgl::getSyncLock() // esp_lvgl_port owns the lock for the display
} }
} }
}; };

2
Boards/M5stackCoreS3/Source/hal/CoreS3SdCard.cpp
View File

@ -17,7 +17,7 @@ std::shared_ptr<SdCardDevice> createSdCard() {
GPIO_NUM_NC, GPIO_NUM_NC,
GPIO_NUM_NC, GPIO_NUM_NC,
SdCardDevice::MountBehaviour::AtBoot, SdCardDevice::MountBehaviour::AtBoot,
tt::lvgl::getLvglSyncLock(), tt::lvgl::getSyncLock(),
{ {
CORES3_LCD_PIN_CS CORES3_LCD_PIN_CS
}, },

2
Boards/UnPhone/Source/UnPhone.cpp
View File

@ -76,7 +76,7 @@ extern const tt::hal::Configuration unPhone = {
.initMode = tt::hal::spi::InitMode::ByTactility, .initMode = tt::hal::spi::InitMode::ByTactility,
.canReinit = false, .canReinit = false,
.hasMutableConfiguration = false, .hasMutableConfiguration = false,
.lock = tt::lvgl::getLvglSyncLock() // esp_lvgl_port owns the lock for the display .lock = tt::lvgl::getSyncLock() // esp_lvgl_port owns the lock for the display
} }
} }
}; };

2
Boards/UnPhone/Source/hal/UnPhoneSdCard.cpp
View File

@ -19,7 +19,7 @@ std::shared_ptr<SdCardDevice> createUnPhoneSdCard() {
GPIO_NUM_NC, GPIO_NUM_NC,
GPIO_NUM_NC, GPIO_NUM_NC,
SdCardDevice::MountBehaviour::AtBoot, SdCardDevice::MountBehaviour::AtBoot,
tt::lvgl::getLvglSyncLock(), tt::lvgl::getSyncLock(),
{ {
UNPHONE_LORA_PIN_CS, UNPHONE_LORA_PIN_CS,
UNPHONE_LCD_PIN_CS, UNPHONE_LCD_PIN_CS,

2
Tactility/Include/Tactility/lvgl/LvglSync.h
View File

@ -25,6 +25,6 @@ void syncSet(LvglLock lock, LvglUnlock unlock);
bool lock(TickType_t timeout); bool lock(TickType_t timeout);
void unlock(); void unlock();
std::shared_ptr<Lock> getLvglSyncLock(); std::shared_ptr<Lock> getSyncLock();
} // namespace } // namespace

6
Tactility/Source/app/files/View.cpp
View File

@ -228,7 +228,7 @@ void View::showActionsForFile() {
} }
void View::update() { void View::update() {
auto scoped_lockable = lvgl::getLvglSyncLock()->scoped(); auto scoped_lockable = lvgl::getSyncLock()->scoped();
if (scoped_lockable->lock(100 / portTICK_PERIOD_MS)) { if (scoped_lockable->lock(100 / portTICK_PERIOD_MS)) {
lv_obj_clean(dir_entry_list); lv_obj_clean(dir_entry_list);
@ -277,14 +277,14 @@ void View::init(lv_obj_t* parent) {
} }
void View::onDirEntryListScrollBegin() { void View::onDirEntryListScrollBegin() {
auto scoped_lockable = lvgl::getLvglSyncLock()->scoped(); auto scoped_lockable = lvgl::getSyncLock()->scoped();
if (scoped_lockable->lock(100 / portTICK_PERIOD_MS)) { if (scoped_lockable->lock(100 / portTICK_PERIOD_MS)) {
lv_obj_add_flag(action_list, LV_OBJ_FLAG_HIDDEN); lv_obj_add_flag(action_list, LV_OBJ_FLAG_HIDDEN);
} }
} }
void View::onNavigate() { void View::onNavigate() {
auto scoped_lockable = lvgl::getLvglSyncLock()->scoped(); auto scoped_lockable = lvgl::getSyncLock()->scoped();
if (scoped_lockable->lock(100 / portTICK_PERIOD_MS)) { if (scoped_lockable->lock(100 / portTICK_PERIOD_MS)) {
lv_obj_add_flag(action_list, LV_OBJ_FLAG_HIDDEN); lv_obj_add_flag(action_list, LV_OBJ_FLAG_HIDDEN);
} }

2
Tactility/Source/app/gpio/Gpio.cpp
View File

@ -49,7 +49,7 @@ void GpioApp::updatePinStates() {
} }
void GpioApp::updatePinWidgets() { void GpioApp::updatePinWidgets() {
auto scoped_lvgl_lock = lvgl::getLvglSyncLock()->scoped(); auto scoped_lvgl_lock = lvgl::getSyncLock()->scoped();
auto scoped_gpio_lock = mutex.asScopedLock(); auto scoped_gpio_lock = mutex.asScopedLock();
if (scoped_gpio_lock.lock() && scoped_lvgl_lock->lock(100)) { if (scoped_gpio_lock.lock() && scoped_lvgl_lock->lock(100)) {
for (int j = 0; j < GPIO_NUM_MAX; ++j) { for (int j = 0; j < GPIO_NUM_MAX; ++j) {

2
Tactility/Source/app/screenshot/Screenshot.cpp
View File

@ -90,7 +90,7 @@ ScreenshotApp::~ScreenshotApp() {
} }
void ScreenshotApp::onTimerTick() { void ScreenshotApp::onTimerTick() {
auto lvgl_lock = lvgl::getLvglSyncLock()->scoped(); auto lvgl_lock = lvgl::getSyncLock()->scoped();
if (lvgl_lock->lock(50 / portTICK_PERIOD_MS)) { if (lvgl_lock->lock(50 / portTICK_PERIOD_MS)) {
updateScreenshotMode(); updateScreenshotMode();
} }

2
Tactility/Source/lvgl/LvglSync.cpp
View File

@ -52,7 +52,7 @@ public:
static std::shared_ptr<Lock> lvglSync = std::make_shared<LvglSync>(); static std::shared_ptr<Lock> lvglSync = std::make_shared<LvglSync>();
std::shared_ptr<Lock> getLvglSyncLock() { std::shared_ptr<Lock> getSyncLock() {
return lvglSync; return lvglSync;
} }