Merge remote-tracking branch 'upstream/main' into feature/es3c28p-es3c35p-modern
This commit is contained in:
@@ -1,9 +0,0 @@
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
|
||||
namespace tt::app::appdetails {
|
||||
|
||||
void start(const std::string& appId);
|
||||
|
||||
} // namespace
|
||||
@@ -0,0 +1,9 @@
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
|
||||
namespace tt::app::apppackagedetails {
|
||||
|
||||
void start(const std::string& packageId);
|
||||
|
||||
} // namespace
|
||||
@@ -68,12 +68,12 @@ std::string getUserHomePath() {
|
||||
}
|
||||
|
||||
std::string getAppInstallPath(const std::string& appId) {
|
||||
assert(app_id_is_valid(appId.c_str()));
|
||||
assert(app_manifest_id_is_valid(appId.c_str()));
|
||||
return std::format("{}/{}", getAppInstallPath(), appId);
|
||||
}
|
||||
|
||||
std::string getAppUserPath(const std::string& appId) {
|
||||
assert(app_id_is_valid(appId.c_str()));
|
||||
assert(app_manifest_id_is_valid(appId.c_str()));
|
||||
return std::format("{}/app/{}", getUserHomePath(), appId);
|
||||
}
|
||||
|
||||
|
||||
@@ -26,9 +26,9 @@
|
||||
|
||||
#include <app/event.h>
|
||||
#include <app/manager.h>
|
||||
#include <app/start.h>
|
||||
#include <app/manifest.h>
|
||||
#include <app/module.h>
|
||||
#include <app/start.h>
|
||||
|
||||
#include <Tactility/Tactility.h>
|
||||
|
||||
@@ -150,9 +150,9 @@ namespace app {
|
||||
namespace alertdialog { extern const ::AppManifest manifest; }
|
||||
namespace apphub { extern const ::AppManifest manifest; }
|
||||
namespace apphubdetails { extern const ::AppManifest manifest; }
|
||||
namespace appdetails { extern const ::AppManifest manifest; }
|
||||
namespace apppackagedetails { extern const ::AppManifest manifest; }
|
||||
namespace applist { extern const ::AppManifest manifest; }
|
||||
namespace appsettings { extern const ::AppManifest manifest; }
|
||||
namespace apppackagelist { extern const ::AppManifest manifest; }
|
||||
namespace audiosettings { extern const ::AppManifest manifest; }
|
||||
namespace boot { extern const ::AppManifest manifest; }
|
||||
namespace development { extern const ::AppManifest manifest; }
|
||||
@@ -212,11 +212,11 @@ static void registerInternalApps() {
|
||||
LOG_I(TAG, "Registering internal apps");
|
||||
|
||||
app_manager_add(&app::alertdialog::manifest);
|
||||
app_manager_add(&app::appdetails::manifest);
|
||||
app_manager_add(&app::apppackagedetails::manifest);
|
||||
app_manager_add(&app::apphub::manifest);
|
||||
app_manager_add(&app::apphubdetails::manifest);
|
||||
app_manager_add(&app::applist::manifest);
|
||||
app_manager_add(&app::appsettings::manifest);
|
||||
app_manager_add(&app::apppackagelist::manifest);
|
||||
if (service::audio::isAvailable()) {
|
||||
app_manager_add(&app::audiosettings::manifest);
|
||||
}
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
|
||||
#include <app/event.h>
|
||||
#include <app/manager.h>
|
||||
#include <app/start.h>
|
||||
#include <app/manifest.h>
|
||||
#include <app/scheduler.h>
|
||||
#include <app/start.h>
|
||||
|
||||
#include <lvgl_window_manager/window_manager.h>
|
||||
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
#include <app/event.h>
|
||||
#include <app/install.h>
|
||||
#include <app/metadata.h>
|
||||
#include <app/manager.h>
|
||||
#include <app/start.h>
|
||||
#include <app/manifest.h>
|
||||
#include <app/package_manifest.h>
|
||||
#include <app/scheduler.h>
|
||||
#include <app/start.h>
|
||||
|
||||
#include <http/download.h>
|
||||
|
||||
@@ -204,9 +204,9 @@ void updateViews(Context* ctx) {
|
||||
|
||||
if (is_installed) {
|
||||
std::string metadata_path = std::string(install_path) + "/manifest.properties";
|
||||
AppMetadata metadata;
|
||||
if (app_metadata_parse(metadata_path.c_str(), &metadata) == ERROR_NONE
|
||||
&& metadata.app_version_code < ctx->entry.appVersionCode) {
|
||||
PackageManifest package;
|
||||
if (app_package_manifest_parse(metadata_path.c_str(), &package, nullptr, 0) == ERROR_NONE
|
||||
&& package.version_code < ctx->entry.appVersionCode) {
|
||||
ctx->updateButton = lvgl_toolbar_add_image_button_action(ctx->toolbar, LV_SYMBOL_DOWNLOAD, onUpdatePressed, ctx);
|
||||
lv_obj_remove_flag(ctx->updateLabel, LV_OBJ_FLAG_HIDDEN);
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#include <app/event.h>
|
||||
#include <app/manager.h>
|
||||
#include <app/start.h>
|
||||
#include <app/manifest.h>
|
||||
#include <app/scheduler.h>
|
||||
#include <app/start.h>
|
||||
|
||||
#include <lvgl_window_manager/window_manager.h>
|
||||
|
||||
|
||||
+69
-45
@@ -1,9 +1,10 @@
|
||||
#include <app/event.h>
|
||||
#include <app/manager.h>
|
||||
#include <app/start.h>
|
||||
#include <app/manifest.h>
|
||||
#include <app/install.h>
|
||||
#include <app/manager.h>
|
||||
#include <app/manifest.h>
|
||||
#include <app/package_manifest.h>
|
||||
#include <app/scheduler.h>
|
||||
#include <app/start.h>
|
||||
|
||||
#include <format>
|
||||
|
||||
@@ -12,17 +13,15 @@
|
||||
|
||||
#include <lvgl_window_manager/window_manager.h>
|
||||
|
||||
#include <Tactility/StringUtils.h>
|
||||
#include <Tactility/app/alertdialog/AlertDialog.h>
|
||||
#include <Tactility/file/File.h>
|
||||
#include <Tactility/lvgl/Style.h>
|
||||
|
||||
#include <tactility/check.h>
|
||||
#include <tactility/log.h>
|
||||
|
||||
constexpr auto* TAG = "AppDetails";
|
||||
constexpr auto* TAG = "AppPackageDetails";
|
||||
|
||||
namespace tt::app::appdetails {
|
||||
namespace tt::app::apppackagedetails {
|
||||
|
||||
extern const ::AppManifest manifest;
|
||||
|
||||
@@ -30,13 +29,34 @@ namespace {
|
||||
|
||||
struct Context {
|
||||
uint32_t appInstanceId;
|
||||
std::string targetAppId;
|
||||
// findAppManifestById() returns the old-model registry's AppManifest type - AppDetails
|
||||
// shows details for apps in that registry regardless of which system they run under.
|
||||
AppManifest targetManifest = { };
|
||||
std::string targetPackageId;
|
||||
PackageManifest targetPackage = {};
|
||||
std::vector<std::string> appIds;
|
||||
uint32_t pendingUninstallDialogId = 0;
|
||||
};
|
||||
|
||||
struct FindPackageContext {
|
||||
const std::string* packageId;
|
||||
PackageManifest* outPackage;
|
||||
std::vector<std::string>* outAppIds;
|
||||
bool found = false;
|
||||
};
|
||||
|
||||
void onVisitPackage(const ::AppPackage* pkg, void* context) {
|
||||
auto* findContext = static_cast<FindPackageContext*>(context);
|
||||
if (findContext->found || *findContext->packageId != pkg->package.id) {
|
||||
return;
|
||||
}
|
||||
*findContext->outPackage = pkg->package;
|
||||
findContext->outAppIds->assign(pkg->app_ids, pkg->app_ids + pkg->app_id_count);
|
||||
findContext->found = true;
|
||||
}
|
||||
|
||||
bool findPackage(const std::string& packageId, PackageManifest& outPackage, std::vector<std::string>& outAppIds) {
|
||||
FindPackageContext findContext { &packageId, &outPackage, &outAppIds };
|
||||
app_manager_for_each_package(onVisitPackage, &findContext);
|
||||
return findContext.found;
|
||||
}
|
||||
|
||||
void onPressUninstall(lv_event_t* event) {
|
||||
auto* ctx = static_cast<Context*>(lv_event_get_user_data(event));
|
||||
@@ -44,7 +64,7 @@ void onPressUninstall(lv_event_t* event) {
|
||||
ctx->pendingUninstallDialogId = alertdialog::start(
|
||||
ctx->appInstanceId,
|
||||
"Confirmation",
|
||||
std::format("Uninstall {}?", ctx->targetManifest.name),
|
||||
std::format("Uninstall {}?", ctx->targetPackage.id),
|
||||
choices
|
||||
);
|
||||
}
|
||||
@@ -59,7 +79,7 @@ void createWidgets(lv_obj_t* parent, void* userData) {
|
||||
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
||||
lv_obj_set_style_pad_row(parent, 0, LV_STATE_DEFAULT);
|
||||
|
||||
auto title = std::format("{} details", ctx->targetManifest.name);
|
||||
auto title = std::format("{} details", ctx->targetPackage.id);
|
||||
auto* toolbar = lvgl_toolbar_create(parent, title.c_str());
|
||||
// The global toolbar nav callback only knows how to stop old-model apps.
|
||||
lvgl_toolbar_set_nav_action(toolbar, LV_SYMBOL_CLOSE, onBackPressed, ctx);
|
||||
@@ -71,35 +91,39 @@ void createWidgets(lv_obj_t* parent, void* userData) {
|
||||
lv_obj_set_style_border_width(wrapper, 0, LV_STATE_DEFAULT);
|
||||
lvgl::obj_set_style_bg_invisible(wrapper);
|
||||
|
||||
auto identifier = std::format("Identifier: {}", ctx->targetManifest.id);
|
||||
auto identifier = std::format("Identifier: {}", ctx->targetPackage.id);
|
||||
auto* identifier_label = lv_label_create(wrapper);
|
||||
lv_label_set_text(identifier_label, identifier.c_str());
|
||||
|
||||
auto* location_label = lv_label_create(wrapper);
|
||||
std::string location;
|
||||
bool is_internal = ctx->targetManifest.location.type == APP_LOCATION_MEMORY;
|
||||
bool is_external = ctx->targetManifest.location.type == APP_LOCATION_PATH;
|
||||
if (is_internal) {
|
||||
location = "internal";
|
||||
} else if (is_external) {
|
||||
if (!string::getPathParent(static_cast<const char*>(ctx->targetManifest.location.location), location)) {
|
||||
location = "external";
|
||||
}
|
||||
} else {
|
||||
LOG_E(TAG, "Unknown app location type %d", ctx->targetManifest.location.type);
|
||||
return;
|
||||
}
|
||||
std::string location_label_text = std::format("Location: {}", location);
|
||||
lv_label_set_text(location_label, location_label_text.c_str());
|
||||
auto version = std::format("Version: {} ({})", ctx->targetPackage.version_name, ctx->targetPackage.version_code);
|
||||
auto* version_label = lv_label_create(wrapper);
|
||||
lv_label_set_text(version_label, version.c_str());
|
||||
|
||||
if (is_external) {
|
||||
auto* uninstall_button = lv_button_create(wrapper);
|
||||
lv_obj_set_width(uninstall_button, LV_PCT(100));
|
||||
lv_obj_add_event_cb(uninstall_button, onPressUninstall, LV_EVENT_SHORT_CLICKED, ctx);
|
||||
auto* uninstall_label = lv_label_create(uninstall_button);
|
||||
lv_obj_align(uninstall_label, LV_ALIGN_CENTER, 0, 0);
|
||||
lv_label_set_text(uninstall_label, "Uninstall");
|
||||
char install_path[192];
|
||||
std::string location = "unknown";
|
||||
if (app_get_install_path(ctx->targetPackage.id, install_path, sizeof(install_path)) == ERROR_NONE) {
|
||||
location = install_path;
|
||||
}
|
||||
auto location_text = std::format("Location: {}", location);
|
||||
auto* location_label = lv_label_create(wrapper);
|
||||
lv_label_set_text(location_label, location_text.c_str());
|
||||
|
||||
std::string apps;
|
||||
for (const auto& appId : ctx->appIds) {
|
||||
AppManifest appManifest {};
|
||||
const char* label = app_manager_find_manifest(appId.c_str(), &appManifest) == ERROR_NONE ? appManifest.name : appId.c_str();
|
||||
apps += apps.empty() ? label : std::format(", {}", label);
|
||||
}
|
||||
auto apps_text = std::format("Apps: {}", apps);
|
||||
auto* apps_label = lv_label_create(wrapper);
|
||||
lv_label_set_text(apps_label, apps_text.c_str());
|
||||
|
||||
auto* uninstall_button = lv_button_create(wrapper);
|
||||
lv_obj_set_width(uninstall_button, LV_PCT(100));
|
||||
lv_obj_add_event_cb(uninstall_button, onPressUninstall, LV_EVENT_SHORT_CLICKED, ctx);
|
||||
auto* uninstall_label = lv_label_create(uninstall_button);
|
||||
lv_obj_align(uninstall_label, LV_ALIGN_CENTER, 0, 0);
|
||||
lv_label_set_text(uninstall_label, "Uninstall");
|
||||
}
|
||||
|
||||
int32_t appMain(int argc, char* argv[]) {
|
||||
@@ -107,9 +131,9 @@ int32_t appMain(int argc, char* argv[]) {
|
||||
|
||||
Context ctx {};
|
||||
ctx.appInstanceId = appInstanceId;
|
||||
ctx.targetAppId = (argc > 0) ? argv[0] : std::string();
|
||||
if (app_manager_find_manifest(ctx.targetAppId.c_str(), &ctx.targetManifest) != ERROR_NONE) {
|
||||
LOG_W(TAG, "App %s not found", ctx.targetAppId.c_str());
|
||||
ctx.targetPackageId = (argc > 0) ? argv[0] : std::string();
|
||||
if (!findPackage(ctx.targetPackageId, ctx.targetPackage, ctx.appIds)) {
|
||||
LOG_W(TAG, "Package %s not found", ctx.targetPackageId.c_str());
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -134,7 +158,7 @@ int32_t appMain(int argc, char* argv[]) {
|
||||
case APP_EVENT_RESULT:
|
||||
if (event.result.launch_id == ctx.pendingUninstallDialogId) {
|
||||
if (event.result.result == 0) { // 0 = Yes
|
||||
app_uninstall(ctx.targetManifest.id);
|
||||
app_uninstall(ctx.targetPackage.id);
|
||||
shouldClose = true;
|
||||
}
|
||||
app_manager_stop(event.result.launch_id);
|
||||
@@ -156,15 +180,15 @@ int32_t appMain(int argc, char* argv[]) {
|
||||
|
||||
} // namespace
|
||||
|
||||
void start(const std::string& appId) {
|
||||
const char* argv[] = { appId.c_str() };
|
||||
void start(const std::string& packageId) {
|
||||
const char* argv[] = { packageId.c_str() };
|
||||
uint32_t instanceId = 0;
|
||||
app_start(manifest.id, 1, argv, &instanceId);
|
||||
}
|
||||
|
||||
extern const ::AppManifest manifest = {
|
||||
.id = "tactility.appdetails",
|
||||
.name = "App Details",
|
||||
.id = "tactility.apppackagedetails",
|
||||
.name = "Package Details",
|
||||
.category = APP_CATEGORY_SYSTEM,
|
||||
.location = { APP_LOCATION_MEMORY, reinterpret_cast<void*>(appMain) },
|
||||
.flags = APP_MANIFEST_FLAG_HIDDEN,
|
||||
+22
-26
@@ -1,11 +1,12 @@
|
||||
#include <lvgl/icons/shared.h>
|
||||
#include <lvgl/fonts.h>
|
||||
|
||||
#include <Tactility/app/appdetails/AppDetails.h>
|
||||
#include <Tactility/app/apppackagedetails/AppPackageDetails.h>
|
||||
|
||||
#include <app/event.h>
|
||||
#include <app/manager.h>
|
||||
#include <app/manifest.h>
|
||||
#include <app/package_manifest.h>
|
||||
#include <app/scheduler.h>
|
||||
|
||||
#include <lvgl_window_manager/window_manager.h>
|
||||
@@ -18,7 +19,7 @@
|
||||
#include <cstring>
|
||||
#include <vector>
|
||||
|
||||
namespace tt::app::appsettings {
|
||||
namespace tt::app::apppackagelist {
|
||||
|
||||
extern const ::AppManifest manifest;
|
||||
|
||||
@@ -26,11 +27,13 @@ namespace {
|
||||
|
||||
struct Context {
|
||||
uint32_t appInstanceId;
|
||||
// Must outlive the widgets - button user-data points into this, not a createWidgets()-local vector.
|
||||
std::vector<std::string> packageIds;
|
||||
};
|
||||
|
||||
void onAppPressed(lv_event_t* e) {
|
||||
const auto* target_manifest = static_cast<const ::AppManifest*>(lv_event_get_user_data(e));
|
||||
appdetails::start(target_manifest->id);
|
||||
void onPackagePressed(lv_event_t* e) {
|
||||
auto* packageId = static_cast<char*>(lv_event_get_user_data(e));
|
||||
apppackagedetails::start(packageId);
|
||||
}
|
||||
|
||||
void onBackPressed(lv_event_t* event) {
|
||||
@@ -38,18 +41,16 @@ void onBackPressed(lv_event_t* event) {
|
||||
app_event_emit_close(ctx->appInstanceId);
|
||||
}
|
||||
|
||||
void createAppWidget(const ::AppManifest* target_manifest, lv_obj_t* list) {
|
||||
// The new AppManifest has no per-app icon - use a shared generic one for every entry, same
|
||||
// fallback AppList.cpp uses.
|
||||
lv_obj_t* btn = lv_list_add_button(list, LVGL_ICON_SHARED_TOOLBAR, target_manifest->name);
|
||||
void createPackageWidget(const char* packageId, lv_obj_t* list) {
|
||||
lv_obj_t* btn = lv_list_add_button(list, LVGL_ICON_SHARED_TOOLBAR, packageId);
|
||||
lv_obj_t* image = lv_obj_get_child(btn, 0);
|
||||
lv_obj_set_style_text_font(image, lvgl_get_shared_icon_font(), LV_PART_MAIN);
|
||||
lv_obj_add_event_cb(btn, &onAppPressed, LV_EVENT_SHORT_CLICKED, const_cast<::AppManifest*>(target_manifest));
|
||||
lv_obj_add_event_cb(btn, &onPackagePressed, LV_EVENT_SHORT_CLICKED, const_cast<char*>(packageId));
|
||||
}
|
||||
|
||||
void collectManifest(const ::AppManifest* manifest, void* context) {
|
||||
auto* manifests = static_cast<std::vector<const ::AppManifest*>*>(context);
|
||||
manifests->push_back(manifest);
|
||||
void collectPackageId(const ::AppPackage* pkg, void* context) {
|
||||
auto* packageIds = static_cast<std::vector<std::string>*>(context);
|
||||
packageIds->emplace_back(pkg->package.id);
|
||||
}
|
||||
|
||||
void createWidgets(lv_obj_t* parent, void* userData) {
|
||||
@@ -68,21 +69,16 @@ void createWidgets(lv_obj_t* parent, void* userData) {
|
||||
lv_obj_set_width(list, LV_PCT(100));
|
||||
lv_obj_set_flex_grow(list, 1);
|
||||
|
||||
std::vector<const ::AppManifest*> manifests;
|
||||
app_manager_for_each_manifest(collectManifest, &manifests);
|
||||
std::ranges::sort(manifests, [](const ::AppManifest* a, const ::AppManifest* b) {
|
||||
return strcmp(a->name, b->name) < 0;
|
||||
});
|
||||
// createWidgets() can rerun for this same Context (window rebuild-on-remove).
|
||||
ctx->packageIds.clear();
|
||||
app_manager_for_each_package(collectPackageId, &ctx->packageIds);
|
||||
std::ranges::sort(ctx->packageIds);
|
||||
|
||||
size_t app_count = 0;
|
||||
for (const auto* target_manifest: manifests) {
|
||||
if (target_manifest->location.type == APP_LOCATION_PATH) {
|
||||
app_count++;
|
||||
createAppWidget(target_manifest, list);
|
||||
}
|
||||
for (const auto& packageId : ctx->packageIds) {
|
||||
createPackageWidget(packageId.c_str(), list);
|
||||
}
|
||||
|
||||
if (app_count == 0) {
|
||||
if (ctx->packageIds.empty()) {
|
||||
// lv_obj_align() is ignored for children of a flex-managed parent, so the empty-state
|
||||
// label needs its own flex-growing wrapper to center within; the (empty) list is hidden
|
||||
// rather than deleted so the wrapper can just take its place in the flex flow.
|
||||
@@ -139,7 +135,7 @@ int32_t appMain(int argc, char* argv[]) {
|
||||
} // namespace
|
||||
|
||||
extern const ::AppManifest manifest = {
|
||||
.id = "tactility.appsettings",
|
||||
.id = "tactility.apppackagelist",
|
||||
.name = "Apps",
|
||||
.category = APP_CATEGORY_SETTINGS,
|
||||
.location = { .type = APP_LOCATION_MEMORY, .location = reinterpret_cast<void*>(appMain) },
|
||||
@@ -10,9 +10,9 @@
|
||||
|
||||
#include <app/event.h>
|
||||
#include <app/manager.h>
|
||||
#include <app/start.h>
|
||||
#include <app/manifest.h>
|
||||
#include <app/scheduler.h>
|
||||
#include <app/start.h>
|
||||
|
||||
#include <lvgl_window_manager/window_manager.h>
|
||||
|
||||
|
||||
@@ -5,9 +5,9 @@
|
||||
|
||||
#include <app/event.h>
|
||||
#include <app/manager.h>
|
||||
#include <app/start.h>
|
||||
#include <app/manifest.h>
|
||||
#include <app/scheduler.h>
|
||||
#include <app/start.h>
|
||||
|
||||
#include <lvgl_window_manager/window_manager.h>
|
||||
|
||||
|
||||
@@ -10,9 +10,9 @@
|
||||
|
||||
#include <app/event.h>
|
||||
#include <app/manager.h>
|
||||
#include <app/start.h>
|
||||
#include <app/manifest.h>
|
||||
#include <app/scheduler.h>
|
||||
#include <app/start.h>
|
||||
|
||||
#include <lvgl_window_manager/window_manager.h>
|
||||
|
||||
|
||||
@@ -11,8 +11,8 @@
|
||||
|
||||
#include <app/event.h>
|
||||
#include <app/manager.h>
|
||||
#include <app/start.h>
|
||||
#include <app/manifest.h>
|
||||
#include <app/start.h>
|
||||
#include <app/scheduler.h>
|
||||
|
||||
#include <lvgl_window_manager/window_manager.h>
|
||||
|
||||
@@ -7,9 +7,9 @@
|
||||
|
||||
#include <app/event.h>
|
||||
#include <app/manager.h>
|
||||
#include <app/start.h>
|
||||
#include <app/manifest.h>
|
||||
#include <app/scheduler.h>
|
||||
#include <app/start.h>
|
||||
|
||||
#include <lvgl_window_manager/window_manager.h>
|
||||
|
||||
|
||||
@@ -6,9 +6,9 @@
|
||||
#include <app/event.h>
|
||||
#include <app/io.h>
|
||||
#include <app/manager.h>
|
||||
#include <app/start.h>
|
||||
#include <app/manifest.h>
|
||||
#include <app/scheduler.h>
|
||||
#include <app/start.h>
|
||||
#include <app/stream.h>
|
||||
|
||||
#include <lvgl_window_manager/window_manager.h>
|
||||
|
||||
@@ -8,9 +8,9 @@
|
||||
|
||||
#include <app/event.h>
|
||||
#include <app/manager.h>
|
||||
#include <app/start.h>
|
||||
#include <app/manifest.h>
|
||||
#include <app/scheduler.h>
|
||||
#include <app/start.h>
|
||||
|
||||
#include <lvgl_window_manager/window_manager.h>
|
||||
|
||||
|
||||
@@ -7,10 +7,10 @@
|
||||
|
||||
#include <app/event.h>
|
||||
#include <app/manager.h>
|
||||
#include <app/start.h>
|
||||
#include <app/manifest.h>
|
||||
#include <app/paths.h>
|
||||
#include <app/scheduler.h>
|
||||
#include <app/start.h>
|
||||
|
||||
#include <lvgl_window_manager/window_manager.h>
|
||||
|
||||
|
||||
@@ -6,9 +6,9 @@
|
||||
|
||||
#include <app/event.h>
|
||||
#include <app/manager.h>
|
||||
#include <app/start.h>
|
||||
#include <app/manifest.h>
|
||||
#include <app/scheduler.h>
|
||||
#include <app/start.h>
|
||||
|
||||
#include <lvgl_window_manager/window_manager.h>
|
||||
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
|
||||
#include <app/event.h>
|
||||
#include <app/manager.h>
|
||||
#include <app/start.h>
|
||||
#include <app/manifest.h>
|
||||
#include <app/scheduler.h>
|
||||
#include <app/start.h>
|
||||
#include <app/stream.h>
|
||||
|
||||
#include <lvgl_window_manager/window_manager.h>
|
||||
|
||||
@@ -7,9 +7,9 @@
|
||||
|
||||
#include <app/event.h>
|
||||
#include <app/manager.h>
|
||||
#include <app/start.h>
|
||||
#include <app/manifest.h>
|
||||
#include <app/scheduler.h>
|
||||
#include <app/start.h>
|
||||
#include <app/stream.h>
|
||||
|
||||
#include <lvgl_window_manager/window_manager.h>
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
|
||||
#include <app/event.h>
|
||||
#include <app/manager.h>
|
||||
#include <app/start.h>
|
||||
#include <app/manifest.h>
|
||||
#include <app/scheduler.h>
|
||||
#include <app/start.h>
|
||||
|
||||
#include <lvgl_window_manager/window_manager.h>
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#include <app/event.h>
|
||||
#include <app/manager.h>
|
||||
#include <app/start.h>
|
||||
#include <app/manifest.h>
|
||||
#include <app/scheduler.h>
|
||||
#include <app/start.h>
|
||||
|
||||
#include <lvgl_window_manager/window_manager.h>
|
||||
|
||||
|
||||
@@ -10,9 +10,9 @@
|
||||
|
||||
#include <app/event.h>
|
||||
#include <app/manager.h>
|
||||
#include <app/start.h>
|
||||
#include <app/manifest.h>
|
||||
#include <app/scheduler.h>
|
||||
#include <app/start.h>
|
||||
|
||||
#include <lvgl_window_manager/window_manager.h>
|
||||
|
||||
|
||||
@@ -5,9 +5,9 @@
|
||||
|
||||
#include <app/event.h>
|
||||
#include <app/manager.h>
|
||||
#include <app/start.h>
|
||||
#include <app/manifest.h>
|
||||
#include <app/scheduler.h>
|
||||
#include <app/start.h>
|
||||
|
||||
#include <lvgl_window_manager/window_manager.h>
|
||||
|
||||
|
||||
@@ -8,9 +8,9 @@
|
||||
|
||||
#include <app/event.h>
|
||||
#include <app/manager.h>
|
||||
#include <app/start.h>
|
||||
#include <app/manifest.h>
|
||||
#include <app/scheduler.h>
|
||||
#include <app/start.h>
|
||||
|
||||
#include <lvgl_window_manager/window_manager.h>
|
||||
|
||||
|
||||
@@ -5,9 +5,9 @@
|
||||
|
||||
#include <app/event.h>
|
||||
#include <app/manager.h>
|
||||
#include <app/start.h>
|
||||
#include <app/manifest.h>
|
||||
#include <app/scheduler.h>
|
||||
#include <app/start.h>
|
||||
|
||||
#include <lvgl_window_manager/window_manager.h>
|
||||
|
||||
|
||||
@@ -6,9 +6,9 @@
|
||||
|
||||
#include <app/event.h>
|
||||
#include <app/manager.h>
|
||||
#include <app/start.h>
|
||||
#include <app/manifest.h>
|
||||
#include <app/scheduler.h>
|
||||
#include <app/start.h>
|
||||
|
||||
#include <lvgl_window_manager/window_manager.h>
|
||||
|
||||
|
||||
@@ -6,9 +6,9 @@
|
||||
|
||||
#include <app/event.h>
|
||||
#include <app/manager.h>
|
||||
#include <app/start.h>
|
||||
#include <app/manifest.h>
|
||||
#include <app/scheduler.h>
|
||||
#include <app/start.h>
|
||||
|
||||
#include <lvgl_window_manager/window_manager.h>
|
||||
|
||||
|
||||
@@ -190,7 +190,7 @@ error_t DevelopmentService::handleAppInstall(HttpServerRequest* request, void*)
|
||||
if (
|
||||
name_entry == content_disposition_map.end() ||
|
||||
filename_entry == content_disposition_map.end() ||
|
||||
name_entry->second != "elf"
|
||||
name_entry->second != "app"
|
||||
) {
|
||||
http_server_request_send_error(request, 400, "Multipart form error: name or filename parameter missing or mismatching");
|
||||
return ERROR_UNDEFINED;
|
||||
|
||||
@@ -81,8 +81,8 @@ dependencies:
|
||||
espressif/esp_lvgl_port: "2.7.2"
|
||||
lvgl/lvgl: "9.3.0"
|
||||
epdiy:
|
||||
git: https://github.com/Shadowtrance/epdiy.git
|
||||
version: 2.0.1
|
||||
git: https://github.com/vroland/epdiy.git
|
||||
version: 2.1.3
|
||||
rules:
|
||||
# More hardware might be supported - enable as needed
|
||||
- if: "target in [esp32s3]"
|
||||
|
||||
Reference in New Issue
Block a user