Merge develop into main (#6)
- Update TactilitySDK to `0.6.0-SNAPSHOT10`: Refactor `tt_app_registration()` for the related changes - Fix for Diceware app hanging - Deleted unused `assets/` in HelloWorld app
This commit is contained in:
committed by
GitHub
parent
37c5002c5d
commit
e1579d3cbd
@@ -1 +0,0 @@
|
||||
Hello, world!
|
||||
@@ -1,11 +1,11 @@
|
||||
#include <tt_app_manifest.h>
|
||||
#include <tt_app.h>
|
||||
#include <tt_lvgl_toolbar.h>
|
||||
|
||||
/**
|
||||
* Note: LVGL and Tactility methods need to be exposed manually from TactilityC/Source/tt_init.cpp
|
||||
* Only C is supported for now (C++ symbols fail to link)
|
||||
*/
|
||||
static void onShow(AppHandle app, void* data, lv_obj_t* parent) {
|
||||
static void onShowApp(AppHandle app, void* data, lv_obj_t* parent) {
|
||||
lv_obj_t* toolbar = tt_lvgl_toolbar_create_for_app(parent, app);
|
||||
lv_obj_align(toolbar, LV_ALIGN_TOP_MID, 0, 0);
|
||||
|
||||
@@ -14,11 +14,9 @@ static void onShow(AppHandle app, void* data, lv_obj_t* parent) {
|
||||
lv_obj_align(label, LV_ALIGN_CENTER, 0, 0);
|
||||
}
|
||||
|
||||
ExternalAppManifest manifest = {
|
||||
.onShow = onShow
|
||||
};
|
||||
|
||||
int main(int argc, char* argv[]) {
|
||||
tt_app_register(&manifest);
|
||||
tt_app_register((AppRegistration) {
|
||||
.onShow = onShowApp
|
||||
});
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
[manifest]
|
||||
version=0.1
|
||||
[target]
|
||||
sdk=0.6.0-SNAPSHOT9
|
||||
sdk=0.6.0-SNAPSHOT10
|
||||
platforms=esp32,esp32s3
|
||||
[app]
|
||||
id=one.tactility.helloworld
|
||||
|
||||
Reference in New Issue
Block a user