adolforeyna/tactility
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Time & date, system events and much more (#152)

Browse Source 
## Time & Date
- Added time to statusbar widget
- Added Time & Date Settings app
- Added TimeZone app for selecting TimeZone
- Added `tt::time` namespace with timezone code

## Other changes

- Added `SystemEvent` to publish/subscribe to system wide (e.g. for init code, but also for time settings changes)
- Changed the way the statusbar widget works: now there's only 1 that gets shown/hidden, instead of 1 instance per app instance.
- Moved `lowercase()` function to new namespace: `tt::string`
- Increased T-Deck flash & PSRAM SPI frequencies to 120 MHz (from 80 MHz)
- Temporary work-around (+ TODO item) for LVGL stack size (issue with WiFi app)
- Suppress T-Deck keystroke debugging to debug level (privacy issue)
- Improved SDL dependency wiring in various `CMakeLists.txt`
- `Loader` service had some variables renamed to the newer C++ style (from previous C style)
This commit is contained in:
Ken Van Hoeylandt
2025-01-10 23:44:32 +01:00
committed by GitHub
parent 4f360741a1
commit bf91e7530d
50 changed files with 1498 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactility/Source/service/gui/Gui.cpp
+36 -14
View File
@@ -1,9 +1,10 @@
#include "Tactility.h"
#include "service/gui/Gui_i.h"
#include "service/loader/Loader_i.h"
#include "lvgl/LvglKeypad.h"
#include "lvgl/LvglSync.h"
#include "RtosCompat.h"
#include "lvgl/Style.h"
#include "lvgl/Statusbar.h"
namespace tt::service::gui {
@@ -11,11 +12,11 @@ namespace tt::service::gui {
// Forward declarations
void redraw(Gui*);
static int32_t gui_main(void*);
static int32_t guiMain(TT_UNUSED void* p);
Gui* gui = nullptr;
void loader_callback(const void* message, TT_UNUSED void* context) {
void onLoaderMessage(const void* message, TT_UNUSED void* context) {
auto* event = static_cast<const loader::LoaderEvent*>(message);
if (event->type == loader::LoaderEventTypeApplicationShowing) {
app::AppContext& app = event->app_showing.app;
@@ -32,13 +33,34 @@ Gui* gui_alloc() {
instance->thread = new Thread(
"gui",
4096, // Last known minimum was 2800 for launching desktop
&gui_main,
&guiMain,
nullptr
);
instance->loader_pubsub_subscription = tt_pubsub_subscribe(loader::getPubsub(), &loader_callback, instance);
instance->loader_pubsub_subscription = tt_pubsub_subscribe(loader::getPubsub(), &onLoaderMessage, instance);
tt_check(lvgl::lock(1000 / portTICK_PERIOD_MS));
instance->keyboard_group = lv_group_create();
instance->lvgl_parent = lv_scr_act();
instance->keyboardGroup = lv_group_create();
auto* screen_root = lv_scr_act();
lvgl::obj_set_style_bg_blacken(screen_root);
lv_obj_t* vertical_container = lv_obj_create(screen_root);
lv_obj_set_size(vertical_container, LV_PCT(100), LV_PCT(100));
lv_obj_set_flex_flow(vertical_container, LV_FLEX_FLOW_COLUMN);
lvgl::obj_set_style_no_padding(vertical_container);
lvgl::obj_set_style_bg_blacken(vertical_container);
instance->statusbarWidget = lvgl::statusbar_create(vertical_container);
auto* app_container = lv_obj_create(vertical_container);
lvgl::obj_set_style_no_padding(app_container);
lv_obj_set_style_border_width(app_container, 0, 0);
lvgl::obj_set_style_bg_blacken(app_container);
lv_obj_set_width(app_container, LV_PCT(100));
lv_obj_set_flex_grow(app_container, 1);
lv_obj_set_flex_flow(app_container, LV_FLEX_FLOW_COLUMN);
instance->appRootWidget = app_container;
lvgl::unlock();
return instance;
@@ -48,9 +70,9 @@ void gui_free(Gui* instance) {
tt_assert(instance != nullptr);
delete instance->thread;
lv_group_delete(instance->keyboard_group);
lv_group_delete(instance->keyboardGroup);
tt_check(lvgl::lock(1000 / portTICK_PERIOD_MS));
lv_group_del(instance->keyboard_group);
lv_group_del(instance->keyboardGroup);
lvgl::unlock();
delete instance;
@@ -74,15 +96,15 @@ void requestDraw() {
void showApp(app::AppContext& app, ViewPortShowCallback on_show, ViewPortHideCallback on_hide) {
lock();
tt_check(gui->app_view_port == nullptr);
gui->app_view_port = view_port_alloc(app, on_show, on_hide);
tt_check(gui->appViewPort == nullptr);
gui->appViewPort = view_port_alloc(app, on_show, on_hide);
unlock();
requestDraw();
}
void hideApp() {
lock();
ViewPort* view_port = gui->app_view_port;
ViewPort* view_port = gui->appViewPort;
tt_check(view_port != nullptr);
// We must lock the LVGL port, because the viewport hide callbacks
@@ -92,11 +114,11 @@ void hideApp() {
lvgl::unlock();
view_port_free(view_port);
gui->app_view_port = nullptr;
gui->appViewPort = nullptr;
unlock();
}
static int32_t gui_main(TT_UNUSED void* p) {
static int32_t guiMain(TT_UNUSED void* p) {
tt_check(gui);
Gui* local_gui = gui;
Tactility/Source/service/gui/GuiDraw.cpp
+15 -20
View File
@@ -9,27 +9,14 @@ namespace tt::service::gui {
#define TAG "gui"
static lv_obj_t* create_app_views(Gui* gui, lv_obj_t* parent, app::AppContext& app) {
lvgl::obj_set_style_bg_blacken(parent);
lv_obj_t* vertical_container = lv_obj_create(parent);
lv_obj_set_size(vertical_container, LV_PCT(100), LV_PCT(100));
lv_obj_set_flex_flow(vertical_container, LV_FLEX_FLOW_COLUMN);
lvgl::obj_set_style_no_padding(vertical_container);
lvgl::obj_set_style_bg_blacken(vertical_container);
// TODO: Move statusbar into separate ViewPort
app::Flags flags = app.getFlags();
if (flags.showStatusbar) {
lvgl::statusbar_create(vertical_container);
}
lv_obj_t* child_container = lv_obj_create(vertical_container);
static lv_obj_t* createAppViews(Gui* gui, lv_obj_t* parent, app::AppContext& app) {
lv_obj_send_event(gui->statusbarWidget, LV_EVENT_DRAW_MAIN, nullptr);
lv_obj_t* child_container = lv_obj_create(parent);
lv_obj_set_width(child_container, LV_PCT(100));
lv_obj_set_flex_grow(child_container, 1);
if (keyboardIsEnabled()) {
gui->keyboard = lv_keyboard_create(vertical_container);
gui->keyboard = lv_keyboard_create(parent);
lv_obj_add_flag(gui->keyboard, LV_OBJ_FLAG_HIDDEN);
} else {
gui->keyboard = nullptr;
@@ -45,12 +32,20 @@ void redraw(Gui* gui) {
lock();
if (lvgl::lock(1000)) {
lv_obj_clean(gui->lvgl_parent);
lv_obj_clean(gui->appRootWidget);
ViewPort* view_port = gui->app_view_port;
ViewPort* view_port = gui->appViewPort;
if (view_port != nullptr) {
app::AppContext& app = view_port->app;
lv_obj_t* container = create_app_views(gui, gui->lvgl_parent, app);
app::Flags flags = app.getFlags();
if (flags.showStatusbar) {
lv_obj_remove_flag(gui->statusbarWidget, LV_OBJ_FLAG_HIDDEN);
} else {
lv_obj_add_flag(gui->statusbarWidget, LV_OBJ_FLAG_HIDDEN);
}
lv_obj_t* container = createAppViews(gui, gui->appRootWidget, app);
view_port_show(view_port, container);
} else {
TT_LOG_W(TAG, "nothing to draw");
Tactility/Source/service/gui/Keyboard.cpp
+2 -2
View File
@@ -54,9 +54,9 @@ void keyboardAddTextArea(lv_obj_t* textarea) {
}
// lv_obj_t auto-remove themselves from the group when they are destroyed (last checked in LVGL 8.3)
lv_group_add_obj(gui->keyboard_group, textarea);
lv_group_add_obj(gui->keyboardGroup, textarea);
lvgl::keypad_activate(gui->keyboard_group);
lvgl::keypad_activate(gui->keyboardGroup);
lvgl::unlock();
unlock();
Tactility/Source/service/loader/Loader.cpp
+16 -17
View File
@@ -11,7 +11,6 @@
#else
#include "lvgl/LvglSync.h"
#include "TactilityHeadless.h"
#endif
namespace tt::service::loader {
@@ -42,7 +41,7 @@ static void loader_free() {
loader_singleton = nullptr;
}
void startApp(const std::string& id, bool blocking, std::shared_ptr<const Bundle> parameters) {
void startApp(const std::string& id, bool blocking, const std::shared_ptr<const Bundle>& parameters) {
TT_LOG_I(TAG, "Start app %s", id.c_str());
tt_assert(loader_singleton);
@@ -67,7 +66,7 @@ void stopApp() {
app::AppContext* _Nullable getCurrentApp() {
tt_assert(loader_singleton);
if (loader_singleton->mutex.lock(10 / portTICK_PERIOD_MS)) {
app::AppInstance* app = loader_singleton->app_stack.top();
app::AppInstance* app = loader_singleton->appStack.top();
loader_singleton->mutex.unlock();
return dynamic_cast<app::AppContext*>(app);
} else {
@@ -80,7 +79,7 @@ std::shared_ptr<PubSub> getPubsub() {
// it's safe to return pubsub without locking
// because it's never freed and loader is never exited
// also the loader instance cannot be obtained until the pubsub is created
return loader_singleton->pubsub_external;
return loader_singleton->pubsubExternal;
}
static const char* appStateToString(app::State state) {
@@ -129,7 +128,7 @@ static void transitionAppToState(app::AppInstance& app, app::State state) {
.app = app
}
};
tt_pubsub_publish(loader_singleton->pubsub_external, &event_showing);
tt_pubsub_publish(loader_singleton->pubsubExternal, &event_showing);
app.setState(app::StateShowing);
break;
}
@@ -140,7 +139,7 @@ static void transitionAppToState(app::AppInstance& app, app::State state) {
.app = app
}
};
tt_pubsub_publish(loader_singleton->pubsub_external, &event_hiding);
tt_pubsub_publish(loader_singleton->pubsubExternal, &event_hiding);
app.setState(app::StateHiding);
break;
}
@@ -167,11 +166,11 @@ static LoaderStatus startAppWithManifestInternal(
return LoaderStatusErrorInternal;
}
auto previous_app = !loader_singleton->app_stack.empty() ? loader_singleton->app_stack.top() : nullptr;
auto previous_app = !loader_singleton->appStack.empty() ? loader_singleton->appStack.top() : nullptr;
auto new_app = new app::AppInstance(*manifest, parameters);
new_app->mutableFlags().showStatusbar = (manifest->type != app::TypeBoot);
loader_singleton->app_stack.push(new_app);
loader_singleton->appStack.push(new_app);
transitionAppToState(*new_app, app::StateInitial);
transitionAppToState(*new_app, app::StateStarted);
@@ -183,7 +182,7 @@ static LoaderStatus startAppWithManifestInternal(
transitionAppToState(*new_app, app::StateShowing);
LoaderEventInternal event_internal = {.type = LoaderEventTypeApplicationStarted};
tt_pubsub_publish(loader_singleton->pubsub_internal, &event_internal);
tt_pubsub_publish(loader_singleton->pubsubInternal, &event_internal);
LoaderEvent event_external = {
.type = LoaderEventTypeApplicationStarted,
@@ -191,7 +190,7 @@ static LoaderStatus startAppWithManifestInternal(
.app = *new_app
}
};
tt_pubsub_publish(loader_singleton->pubsub_external, &event_external);
tt_pubsub_publish(loader_singleton->pubsubExternal, &event_external);
return LoaderStatusOk;
}
@@ -228,7 +227,7 @@ static void stopAppInternal() {
return;
}
size_t original_stack_size = loader_singleton->app_stack.size();
size_t original_stack_size = loader_singleton->appStack.size();
if (original_stack_size == 0) {
TT_LOG_E(TAG, "Stop app: no app running");
@@ -236,7 +235,7 @@ static void stopAppInternal() {
}
// Stop current app
app::AppInstance* app_to_stop = loader_singleton->app_stack.top();
app::AppInstance* app_to_stop = loader_singleton->appStack.top();
if (original_stack_size == 1 && app_to_stop->getManifest().type != app::TypeBoot) {
TT_LOG_E(TAG, "Stop app: can't stop root app");
@@ -249,7 +248,7 @@ static void stopAppInternal() {
transitionAppToState(*app_to_stop, app::StateHiding);
transitionAppToState(*app_to_stop, app::StateStopped);
loader_singleton->app_stack.pop();
loader_singleton->appStack.pop();
delete app_to_stop;
#ifdef ESP_PLATFORM
@@ -259,8 +258,8 @@ static void stopAppInternal() {
app::AppOnResult on_result = nullptr;
app::AppInstance* app_to_resume = nullptr;
// If there's a previous app, resume it
if (!loader_singleton->app_stack.empty()) {
app_to_resume = loader_singleton->app_stack.top();
if (!loader_singleton->appStack.empty()) {
app_to_resume = loader_singleton->appStack.top();
tt_assert(app_to_resume);
transitionAppToState(*app_to_resume, app::StateShowing);
@@ -272,7 +271,7 @@ static void stopAppInternal() {
// WARNING: After this point we cannot change the app states from this method directly anymore as we don't have a lock!
LoaderEventInternal event_internal = {.type = LoaderEventTypeApplicationStopped};
tt_pubsub_publish(loader_singleton->pubsub_internal, &event_internal);
tt_pubsub_publish(loader_singleton->pubsubInternal, &event_internal);
LoaderEvent event_external = {
.type = LoaderEventTypeApplicationStopped,
@@ -280,7 +279,7 @@ static void stopAppInternal() {
.manifest = manifest
}
};
tt_pubsub_publish(loader_singleton->pubsub_external, &event_external);
tt_pubsub_publish(loader_singleton->pubsubExternal, &event_external);
if (on_result != nullptr && app_to_resume != nullptr) {
if (result_holder != nullptr) {
Tactility/Source/service/loader/Loader.h
+1 -1
View File
@@ -24,7 +24,7 @@ typedef enum {
* @param[in] blocking whether this call is blocking or not. You cannot call this from an LVGL thread.
* @param[in] parameters optional parameters to pass onto the application
*/
void startApp(const std::string& id, bool blocking = false, std::shared_ptr<const Bundle> _Nullable parameters = nullptr);
void startApp(const std::string& id, bool blocking = false, const std::shared_ptr<const Bundle>& _Nullable parameters = nullptr);
/** @brief Stop the currently showing app. Show the previous app if any app was still running. */
void stopApp();