Refactor app launching (#174)
- Refactor the way apps work: Instead of a C interface, they are now C++ classes. The main reasoning is that attaching data to an app was cumbersome. Having different implementations for different kinds of apps was cumbersome too. (3 or 4 layers of manifest nesting for the TactilityC project) - External apps are still written in C, but they get a createData/destroyData in their manifest, so: - External apps now have their own manifest. - All functions in the original AppManifest are removed and replaced by a single `createApp` function - External apps now automatically register (each app individually!) when they run the first time. As a side-effect they become visible in the `AppList` app! - Adapted all apps for the new interface. - Adapted all internal logic for these changes (Gui, ViewPort, Loader, AppContext, AppInstance, etc.) - Rewrote parts of Loader to use std::shared_ptr to make the code much safer. - Added a refcount check for the `AppInstance` and `App` at the end of their lifecycle. Show warning if refcount is too high.
This commit is contained in:
Ken Van Hoeylandt
committed by
GitHub
GitHub
parent
2bbd44a8b5
commit
c3bcf93698
@@ -11,139 +11,121 @@
|
||||
|
||||
namespace tt::app::log {
|
||||
|
||||
struct LogAppData {
|
||||
class LogApp : public App {
|
||||
|
||||
private:
|
||||
|
||||
LogLevel filterLevel = LogLevel::Info;
|
||||
lv_obj_t* labelWidget = nullptr;
|
||||
};
|
||||
|
||||
static bool shouldShowLog(LogLevel filterLevel, LogLevel logLevel) {
|
||||
if (filterLevel == LogLevel::None || logLevel == LogLevel::None) {
|
||||
return false;
|
||||
} else {
|
||||
return filterLevel >= logLevel;
|
||||
}
|
||||
}
|
||||
|
||||
static void setLogEntries(lv_obj_t* label) {
|
||||
auto app = service::loader::getCurrentApp();
|
||||
if (app == nullptr) {
|
||||
return;
|
||||
}
|
||||
auto data = std::static_pointer_cast<LogAppData>(app->getData());
|
||||
auto filterLevel = data->filterLevel;
|
||||
|
||||
unsigned int index;
|
||||
auto* entries = copyLogEntries(index);
|
||||
std::stringstream buffer;
|
||||
if (entries != nullptr) {
|
||||
for (unsigned int i = index; i < TT_LOG_ENTRY_COUNT; ++i) {
|
||||
if (shouldShowLog(filterLevel, entries[i].level)) {
|
||||
buffer << entries[i].message;
|
||||
}
|
||||
static bool shouldShowLog(LogLevel filterLevel, LogLevel logLevel) {
|
||||
if (filterLevel == LogLevel::None || logLevel == LogLevel::None) {
|
||||
return false;
|
||||
} else {
|
||||
return filterLevel >= logLevel;
|
||||
}
|
||||
if (index != 0) {
|
||||
for (unsigned int i = 0; i < index; ++i) {
|
||||
}
|
||||
|
||||
void updateLogEntries() {
|
||||
unsigned int index;
|
||||
auto* entries = copyLogEntries(index);
|
||||
std::stringstream buffer;
|
||||
if (entries != nullptr) {
|
||||
for (unsigned int i = index; i < TT_LOG_ENTRY_COUNT; ++i) {
|
||||
if (shouldShowLog(filterLevel, entries[i].level)) {
|
||||
buffer << entries[i].message;
|
||||
}
|
||||
}
|
||||
}
|
||||
delete entries;
|
||||
if (!buffer.str().empty()) {
|
||||
lv_label_set_text(label, buffer.str().c_str());
|
||||
if (index != 0) {
|
||||
for (unsigned int i = 0; i < index; ++i) {
|
||||
if (shouldShowLog(filterLevel, entries[i].level)) {
|
||||
buffer << entries[i].message;
|
||||
}
|
||||
}
|
||||
}
|
||||
delete entries;
|
||||
if (!buffer.str().empty()) {
|
||||
lv_label_set_text(labelWidget, buffer.str().c_str());
|
||||
} else {
|
||||
lv_label_set_text(labelWidget, "No logs for the selected log level");
|
||||
}
|
||||
} else {
|
||||
lv_label_set_text(label, "No logs for the selected log level");
|
||||
}
|
||||
} else {
|
||||
lv_label_set_text(label, "Failed to load log");
|
||||
}
|
||||
}
|
||||
|
||||
static void onLevelFilterPressed(TT_UNUSED lv_event_t* event) {
|
||||
std::vector<std::string> items = {
|
||||
"Verbose",
|
||||
"Debug",
|
||||
"Info",
|
||||
"Warning",
|
||||
"Error",
|
||||
};
|
||||
app::selectiondialog::start("Log Level", items);
|
||||
}
|
||||
|
||||
static void updateViews() {
|
||||
auto app = service::loader::getCurrentApp();
|
||||
if (app == nullptr) {
|
||||
return;
|
||||
}
|
||||
auto data = std::static_pointer_cast<LogAppData>(app->getData());
|
||||
assert(data != nullptr);
|
||||
|
||||
if (lvgl::lock(100 / portTICK_PERIOD_MS)) {
|
||||
setLogEntries(data->labelWidget);
|
||||
lvgl::unlock();
|
||||
}
|
||||
}
|
||||
|
||||
static void onShow(AppContext& app, lv_obj_t* parent) {
|
||||
auto data = std::static_pointer_cast<LogAppData>(app.getData());
|
||||
|
||||
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
||||
auto* toolbar = lvgl::toolbar_create(parent, app);
|
||||
lvgl::toolbar_add_button_action(toolbar, LV_SYMBOL_EDIT, onLevelFilterPressed, nullptr);
|
||||
|
||||
auto* wrapper = lv_obj_create(parent);
|
||||
lv_obj_set_width(wrapper, LV_PCT(100));
|
||||
lv_obj_set_flex_grow(wrapper, 1);
|
||||
lv_obj_set_flex_flow(wrapper, LV_FLEX_FLOW_COLUMN);
|
||||
lvgl::obj_set_style_no_padding(wrapper);
|
||||
lvgl::obj_set_style_bg_invisible(wrapper);
|
||||
|
||||
data->labelWidget = lv_label_create(wrapper);
|
||||
lv_obj_align(data->labelWidget, LV_ALIGN_CENTER, 0, 0);
|
||||
setLogEntries(data->labelWidget);
|
||||
}
|
||||
|
||||
static void onStart(AppContext& app) {
|
||||
auto data = std::make_shared<LogAppData>();
|
||||
app.setData(data);
|
||||
}
|
||||
|
||||
static void onResult(AppContext& app, Result result, const Bundle& bundle) {
|
||||
auto resultIndex = selectiondialog::getResultIndex(bundle);
|
||||
auto data = std::static_pointer_cast<LogAppData>(app.getData());
|
||||
if (result == ResultOk) {
|
||||
switch (resultIndex) {
|
||||
case 0:
|
||||
data->filterLevel = LogLevel::Verbose;
|
||||
break;
|
||||
case 1:
|
||||
data->filterLevel = LogLevel::Debug;
|
||||
break;
|
||||
case 2:
|
||||
data->filterLevel = LogLevel::Info;
|
||||
break;
|
||||
case 3:
|
||||
data->filterLevel = LogLevel::Warning;
|
||||
break;
|
||||
case 4:
|
||||
data->filterLevel = LogLevel::Error;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
lv_label_set_text(labelWidget, "Failed to load log");
|
||||
}
|
||||
}
|
||||
|
||||
updateViews();
|
||||
}
|
||||
void updateViews() {
|
||||
if (lvgl::lock(100 / portTICK_PERIOD_MS)) {
|
||||
updateLogEntries();
|
||||
lvgl::unlock();
|
||||
}
|
||||
}
|
||||
|
||||
static void onLevelFilterPressedCallback(TT_UNUSED lv_event_t* event) {
|
||||
std::vector<std::string> items = {
|
||||
"Verbose",
|
||||
"Debug",
|
||||
"Info",
|
||||
"Warning",
|
||||
"Error",
|
||||
};
|
||||
app::selectiondialog::start("Log Level", items);
|
||||
}
|
||||
|
||||
public:
|
||||
|
||||
void onShow(AppContext& app, lv_obj_t* parent) override {
|
||||
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
||||
auto* toolbar = lvgl::toolbar_create(parent, app);
|
||||
lvgl::toolbar_add_button_action(toolbar, LV_SYMBOL_EDIT, onLevelFilterPressedCallback, this);
|
||||
|
||||
auto* wrapper = lv_obj_create(parent);
|
||||
lv_obj_set_width(wrapper, LV_PCT(100));
|
||||
lv_obj_set_flex_grow(wrapper, 1);
|
||||
lv_obj_set_flex_flow(wrapper, LV_FLEX_FLOW_COLUMN);
|
||||
lvgl::obj_set_style_no_padding(wrapper);
|
||||
lvgl::obj_set_style_bg_invisible(wrapper);
|
||||
|
||||
labelWidget = lv_label_create(wrapper);
|
||||
lv_obj_align(labelWidget, LV_ALIGN_CENTER, 0, 0);
|
||||
|
||||
updateLogEntries();
|
||||
}
|
||||
|
||||
void onResult(AppContext& app, Result result, std::unique_ptr<Bundle> bundle) override {
|
||||
auto resultIndex = selectiondialog::getResultIndex(*bundle);
|
||||
if (result == Result::Ok) {
|
||||
switch (resultIndex) {
|
||||
case 0:
|
||||
filterLevel = LogLevel::Verbose;
|
||||
break;
|
||||
case 1:
|
||||
filterLevel = LogLevel::Debug;
|
||||
break;
|
||||
case 2:
|
||||
filterLevel = LogLevel::Info;
|
||||
break;
|
||||
case 3:
|
||||
filterLevel = LogLevel::Warning;
|
||||
break;
|
||||
case 4:
|
||||
filterLevel = LogLevel::Error;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
updateViews();
|
||||
}
|
||||
};
|
||||
|
||||
extern const AppManifest manifest = {
|
||||
.id = "Log",
|
||||
.name = "Log",
|
||||
.icon = LV_SYMBOL_LIST,
|
||||
.type = TypeSystem,
|
||||
.onStart = onStart,
|
||||
.onShow = onShow,
|
||||
.onResult = onResult
|
||||
.type = Type::System,
|
||||
.createApp = create<LogApp>
|
||||
};
|
||||
|
||||
} // namespace
|
||||
|
||||
Reference in New Issue
Block a user