Merge develop into main (#150)
- Update `Configuration` to use C++ vector instead of C arrays - Rename `Desktop` app to `Launcher` - Fix for hard-coded app start of `Launcher` and `CrashDiagnostics` apps. - Ensure `Launcher` icons are clickable, even if they're not loading. - Don't show error scenario for SD card in statusbar when SD card status is unknown (this happens during Mutex timeout due to LVGL rendering delays) - Cleanup deprecated `Mutex` methods. - `hal::getConfiguration()` now returns a pointer instead of a reference, just like `tt:getConfiguration()`
This commit is contained in:
committed by
GitHub
parent
415096c3b2
commit
4f360741a1
@@ -1,12 +1,12 @@
|
||||
#ifdef ESP_PLATFORM
|
||||
#ifdef ESP_TARGET
|
||||
|
||||
#include <esp_private/panic_internal.h>
|
||||
#include "lvgl.h"
|
||||
#include "lvgl/Statusbar.h"
|
||||
#include "service/loader/Loader.h"
|
||||
#include "app/launcher/Launcher.h"
|
||||
#include "qrcode.h"
|
||||
#include "QrHelpers.h"
|
||||
#include "QrUrl.h"
|
||||
#include "service/loader/Loader.h"
|
||||
|
||||
#define TAG "crash_diagnostics"
|
||||
|
||||
@@ -14,10 +14,10 @@ namespace tt::app::crashdiagnostics {
|
||||
|
||||
void onContinuePressed(TT_UNUSED lv_event_t* event) {
|
||||
tt::service::loader::stopApp();
|
||||
tt::service::loader::startApp("Desktop");
|
||||
tt::app::launcher::start();
|
||||
}
|
||||
|
||||
static void onShow(TT_UNUSED AppContext& app, lv_obj_t* parent) {
|
||||
static void onShow(AppContext& app, lv_obj_t* parent) {
|
||||
auto* display = lv_obj_get_display(parent);
|
||||
int32_t parent_height = lv_display_get_vertical_resolution(display) - STATUSBAR_HEIGHT;
|
||||
|
||||
@@ -116,6 +116,10 @@ extern const AppManifest manifest = {
|
||||
.onShow = onShow
|
||||
};
|
||||
|
||||
void start() {
|
||||
service::loader::startApp(manifest.id);
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user