Migrate TactilityC and LVGL functionality (#588)
lvgl-module - Move and rename source and include files - Fix bug with missing lvgl unlock - New widgets: spinner, toolbar, sliderbox TactilityC - Removed tt_lock, tt_lvgl_\*
This commit is contained in:
committed by
GitHub
parent
cd2d9d6158
commit
b98a813f3c
@@ -5,10 +5,6 @@
|
||||
#include "tt_app_fileselection.h"
|
||||
#include "tt_app_selectiondialog.h"
|
||||
#include "tt_bundle.h"
|
||||
#include <tt_lock.h>
|
||||
#include "tt_lvgl_keyboard.h"
|
||||
#include "tt_lvgl_spinner.h"
|
||||
#include "tt_lvgl_toolbar.h"
|
||||
#include "tt_preferences.h"
|
||||
#include "tt_time.h"
|
||||
|
||||
@@ -281,10 +277,6 @@ const esp_elfsym main_symbols[] {
|
||||
ESP_ELFSYM_EXPORT(tt_app_get_user_data_child_path),
|
||||
ESP_ELFSYM_EXPORT(tt_app_get_assets_path),
|
||||
ESP_ELFSYM_EXPORT(tt_app_get_assets_child_path),
|
||||
ESP_ELFSYM_EXPORT(tt_lock_alloc_for_path),
|
||||
ESP_ELFSYM_EXPORT(tt_lock_acquire),
|
||||
ESP_ELFSYM_EXPORT(tt_lock_release),
|
||||
ESP_ELFSYM_EXPORT(tt_lock_free),
|
||||
ESP_ELFSYM_EXPORT(tt_bundle_alloc),
|
||||
ESP_ELFSYM_EXPORT(tt_bundle_free),
|
||||
ESP_ELFSYM_EXPORT(tt_bundle_opt_bool),
|
||||
@@ -293,22 +285,6 @@ const esp_elfsym main_symbols[] {
|
||||
ESP_ELFSYM_EXPORT(tt_bundle_put_bool),
|
||||
ESP_ELFSYM_EXPORT(tt_bundle_put_int32),
|
||||
ESP_ELFSYM_EXPORT(tt_bundle_put_string),
|
||||
ESP_ELFSYM_EXPORT(tt_lvgl_software_keyboard_show),
|
||||
ESP_ELFSYM_EXPORT(tt_lvgl_software_keyboard_hide),
|
||||
ESP_ELFSYM_EXPORT(tt_lvgl_software_keyboard_is_enabled),
|
||||
ESP_ELFSYM_EXPORT(tt_lvgl_software_keyboard_activate),
|
||||
ESP_ELFSYM_EXPORT(tt_lvgl_software_keyboard_deactivate),
|
||||
ESP_ELFSYM_EXPORT(tt_lvgl_hardware_keyboard_is_available),
|
||||
ESP_ELFSYM_EXPORT(tt_lvgl_hardware_keyboard_set_indev),
|
||||
ESP_ELFSYM_EXPORT(tt_lvgl_toolbar_create),
|
||||
ESP_ELFSYM_EXPORT(tt_lvgl_toolbar_create_for_app),
|
||||
ESP_ELFSYM_EXPORT(tt_lvgl_toolbar_set_title),
|
||||
ESP_ELFSYM_EXPORT(tt_lvgl_toolbar_set_nav_action),
|
||||
ESP_ELFSYM_EXPORT(tt_lvgl_toolbar_add_image_button_action),
|
||||
ESP_ELFSYM_EXPORT(tt_lvgl_toolbar_add_text_button_action),
|
||||
ESP_ELFSYM_EXPORT(tt_lvgl_toolbar_add_switch_action),
|
||||
ESP_ELFSYM_EXPORT(tt_lvgl_toolbar_add_spinner_action),
|
||||
ESP_ELFSYM_EXPORT(tt_lvgl_toolbar_clear_actions),
|
||||
ESP_ELFSYM_EXPORT(tt_preferences_alloc),
|
||||
ESP_ELFSYM_EXPORT(tt_preferences_free),
|
||||
ESP_ELFSYM_EXPORT(tt_preferences_opt_bool),
|
||||
@@ -322,8 +298,6 @@ const esp_elfsym main_symbols[] {
|
||||
ESP_ELFSYM_EXPORT(tt_timezone_get_code),
|
||||
ESP_ELFSYM_EXPORT(tt_timezone_is_format_24_hour),
|
||||
ESP_ELFSYM_EXPORT(tt_timezone_set_format_24_hour),
|
||||
// tt::lvgl
|
||||
ESP_ELFSYM_EXPORT(tt_lvgl_spinner_create),
|
||||
|
||||
// stdio.h
|
||||
ESP_ELFSYM_EXPORT(rename),
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
#include <Tactility/Mutex.h>
|
||||
#include <Tactility/RecursiveMutex.h>
|
||||
#include <Tactility/file/File.h>
|
||||
#include <tt_lock.h>
|
||||
#include <tt_lock_private.h>
|
||||
|
||||
#define HANDLE_AS_LOCK(handle) (static_cast<LockHolder*>(handle)->lock)
|
||||
|
||||
extern "C" {
|
||||
|
||||
LockHandle tt_lock_alloc_for_path(const char* path) {
|
||||
const auto lock = tt::file::getLock(path);
|
||||
return new LockHolder(lock);
|
||||
}
|
||||
|
||||
bool tt_lock_acquire(LockHandle handle, TickType_t timeout) {
|
||||
return HANDLE_AS_LOCK(handle)->lock(timeout);
|
||||
}
|
||||
|
||||
void tt_lock_release(LockHandle handle) {
|
||||
HANDLE_AS_LOCK(handle)->unlock();
|
||||
}
|
||||
|
||||
void tt_lock_free(LockHandle handle) {
|
||||
const auto holder = static_cast<LockHolder*>(handle);
|
||||
delete holder;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,33 +0,0 @@
|
||||
#include "Tactility/lvgl/Keyboard.h"
|
||||
|
||||
extern "C" {
|
||||
|
||||
void tt_lvgl_software_keyboard_show(lv_obj_t* textarea) {
|
||||
tt::lvgl::software_keyboard_show(textarea);
|
||||
}
|
||||
|
||||
void tt_lvgl_software_keyboard_hide() {
|
||||
tt::lvgl::software_keyboard_hide();
|
||||
}
|
||||
|
||||
bool tt_lvgl_software_keyboard_is_enabled() {
|
||||
return tt::lvgl::software_keyboard_is_enabled();
|
||||
}
|
||||
|
||||
void tt_lvgl_software_keyboard_activate(lv_group_t* group) {
|
||||
tt::lvgl::software_keyboard_activate(group);
|
||||
}
|
||||
|
||||
void tt_lvgl_software_keyboard_deactivate() {
|
||||
tt::lvgl::software_keyboard_deactivate();
|
||||
}
|
||||
|
||||
bool tt_lvgl_hardware_keyboard_is_available() {
|
||||
return tt::lvgl::hardware_keyboard_is_available();
|
||||
}
|
||||
|
||||
void tt_lvgl_hardware_keyboard_set_indev(lv_indev_t* device) {
|
||||
tt::lvgl::hardware_keyboard_set_indev(device);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
#include "tt_lvgl_spinner.h"
|
||||
#include <Tactility/lvgl/Spinner.h>
|
||||
|
||||
extern "C" {
|
||||
|
||||
lv_obj_t* tt_lvgl_spinner_create(lv_obj_t* parent) {
|
||||
return tt::lvgl::spinner_create(parent);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
#include "tt_lvgl_toolbar.h"
|
||||
#include <Tactility/lvgl/Toolbar.h>
|
||||
|
||||
extern "C" {
|
||||
|
||||
lv_obj_t* tt_lvgl_toolbar_create(lv_obj_t* parent, const char* title) {
|
||||
return tt::lvgl::toolbar_create(parent, title);
|
||||
}
|
||||
|
||||
lv_obj_t* tt_lvgl_toolbar_create_for_app(lv_obj_t* parent, AppHandle context) {
|
||||
return tt::lvgl::toolbar_create(parent, *(tt::app::AppContext*)context);
|
||||
}
|
||||
|
||||
void tt_lvgl_toolbar_set_title(lv_obj_t* obj, const char* title) {
|
||||
tt::lvgl::toolbar_set_title(obj, title);
|
||||
}
|
||||
|
||||
void tt_lvgl_toolbar_set_nav_action(lv_obj_t* obj, const char* icon, lv_event_cb_t callback, void* callbackEventUserData) {
|
||||
tt::lvgl::toolbar_set_nav_action(obj, icon, callback, callbackEventUserData);
|
||||
}
|
||||
|
||||
lv_obj_t* tt_lvgl_toolbar_add_image_button_action(lv_obj_t* obj, const char* imagePath, lv_event_cb_t callback, void* callbackUserData) {
|
||||
return tt::lvgl::toolbar_add_image_button_action(obj, imagePath, callback, callbackUserData);
|
||||
}
|
||||
|
||||
lv_obj_t* tt_lvgl_toolbar_add_text_button_action(lv_obj_t* obj, const char* text, lv_event_cb_t callback, void* callbackUserData) {
|
||||
return tt::lvgl::toolbar_add_text_button_action(obj, text, callback, callbackUserData);
|
||||
}
|
||||
|
||||
lv_obj_t* tt_lvgl_toolbar_add_switch_action(lv_obj_t* obj) {
|
||||
return tt::lvgl::toolbar_add_switch_action(obj);
|
||||
}
|
||||
|
||||
lv_obj_t* tt_lvgl_toolbar_add_spinner_action(lv_obj_t* obj) {
|
||||
return tt::lvgl::toolbar_add_spinner_action(obj);
|
||||
}
|
||||
|
||||
void tt_lvgl_toolbar_clear_actions(lv_obj_t* obj) {
|
||||
tt::lvgl::toolbar_clear_actions(obj);
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user