## New
- Read property files with `PropertiesFile`
- Support `boot.properties` so the user can specify the launcher app and an optional app to start after the launcher finishes. (see `BootProperties.cpp`)
- Create registry for CPU affinity and update code to make use of it
- `AppRegistration` and `ServiceRegistration` now also ensure that the `/data` directories always exist for all apps
- `Notes` is now the default app for opening text files. `TextViewer` is removed entirely. Created `tt::app:🎶:start(path)` function.
- WiFi settings moved from NVS to properties file.
- Specify `*.ap.properties` file on the SD card for automatic WiFi settings import on start-up.
- Added `file::getLock(path)` and `file::withLock(path, function)` to do safe file operations on SD cards
## Improvements
- Update TinyUSB to `1.7.6~1`
- Improved `Boot.cpp` code. General code quality fixes and some restructuring to improve readability.
- `tt::string` functionality improvements
- Rename `AppRegistry` to `AppRegistration`
- Rename `ServiceRegistry` to `ServiceRegistration`
- Cleanup in `Notes.cpp`
- `FileTest.cpp` fix for PC
- Created `TestFile` helper class for tests, which automatically deletes files after the test.
- Renamed `Partitions.h` to `MountPoints.h`
- Created `std::string getMountPoints()` function for easy re-use
- Other code quality improvements
- `SdCardDevice`'s `getState()` and `isMounted()` now have a timeout argument
## Fixes
- ELF loading now has a lock so to avoid a bug when 2 ELF apps are loaded in parallel
214 lines
6.0 KiB
C++
214 lines
6.0 KiB
C++
#ifdef ESP_PLATFORM
|
|
|
|
#include "Tactility/app/ElfApp.h"
|
|
#include "Tactility/file/File.h"
|
|
#include "Tactility/file/FileLock.h"
|
|
#include "Tactility/service/loader/Loader.h"
|
|
|
|
#include <Tactility/Log.h>
|
|
#include <Tactility/StringUtils.h>
|
|
|
|
#include "esp_elf.h"
|
|
|
|
#include <string>
|
|
#include <utility>
|
|
|
|
namespace tt::app {
|
|
|
|
constexpr auto* TAG = "ElfApp";
|
|
|
|
struct ElfManifest {
|
|
/** The user-readable name of the app. Used in UI. */
|
|
std::string name;
|
|
/** Optional icon. */
|
|
std::string icon;
|
|
CreateData _Nullable createData = nullptr;
|
|
DestroyData _Nullable destroyData = nullptr;
|
|
OnCreate _Nullable onCreate = nullptr;
|
|
OnDestroy _Nullable onDestroy = nullptr;
|
|
OnShow _Nullable onShow = nullptr;
|
|
OnHide _Nullable onHide = nullptr;
|
|
OnResult _Nullable onResult = nullptr;
|
|
};
|
|
|
|
static size_t elfManifestSetCount = 0;
|
|
static ElfManifest elfManifest;
|
|
static std::shared_ptr<Lock> elfManifestLock = std::make_shared<Mutex>();
|
|
|
|
class ElfApp : public App {
|
|
|
|
const std::string filePath;
|
|
std::unique_ptr<uint8_t[]> elfFileData;
|
|
esp_elf_t elf;
|
|
bool shouldCleanupElf = false; // Whether we have to clean up the above "elf" object
|
|
std::unique_ptr<ElfManifest> manifest;
|
|
void* data = nullptr;
|
|
|
|
bool startElf() {
|
|
TT_LOG_I(TAG, "Starting ELF %s", filePath.c_str());
|
|
assert(elfFileData == nullptr);
|
|
|
|
size_t size = 0;
|
|
file::withLock<void>(filePath, [this, &size]{
|
|
elfFileData = file::readBinary(filePath, size);
|
|
});
|
|
|
|
if (elfFileData == nullptr) {
|
|
return false;
|
|
}
|
|
|
|
if (esp_elf_init(&elf) != ESP_OK) {
|
|
TT_LOG_E(TAG, "Failed to initialize");
|
|
elfFileData = nullptr;
|
|
return false;
|
|
}
|
|
|
|
if (esp_elf_relocate(&elf, elfFileData.get()) != ESP_OK) {
|
|
TT_LOG_E(TAG, "Failed to load executable");
|
|
esp_elf_deinit(&elf);
|
|
elfFileData = nullptr;
|
|
return false;
|
|
}
|
|
|
|
int argc = 0;
|
|
char* argv[] = {};
|
|
|
|
if (esp_elf_request(&elf, 0, argc, argv) != ESP_OK) {
|
|
TT_LOG_W(TAG, "Executable returned error code");
|
|
esp_elf_deinit(&elf);
|
|
elfFileData = nullptr;
|
|
return false;
|
|
}
|
|
|
|
shouldCleanupElf = true;
|
|
return true;
|
|
}
|
|
|
|
void stopElf() {
|
|
TT_LOG_I(TAG, "Cleaning up ELF");
|
|
|
|
if (shouldCleanupElf) {
|
|
esp_elf_deinit(&elf);
|
|
}
|
|
|
|
if (elfFileData != nullptr) {
|
|
elfFileData = nullptr;
|
|
}
|
|
}
|
|
|
|
public:
|
|
|
|
explicit ElfApp(std::string filePath) : filePath(std::move(filePath)) {}
|
|
|
|
void onCreate(AppContext& appContext) override {
|
|
// Because we use global variables, we have to ensure that we are not starting 2 apps in parallel
|
|
// We use a ScopedLock so we don't have to safeguard all branches
|
|
auto lock = elfManifestLock->asScopedLock();
|
|
lock.lock();
|
|
|
|
auto initial_count = elfManifestSetCount;
|
|
if (startElf()) {
|
|
if (elfManifestSetCount > initial_count) {
|
|
manifest = std::make_unique<ElfManifest>(elfManifest);
|
|
lock.unlock();
|
|
|
|
if (manifest->createData != nullptr) {
|
|
data = manifest->createData();
|
|
}
|
|
|
|
if (manifest->onCreate != nullptr) {
|
|
manifest->onCreate(&appContext, data);
|
|
}
|
|
}
|
|
} else {
|
|
service::loader::stopApp();
|
|
}
|
|
}
|
|
|
|
void onDestroy(AppContext& appContext) override {
|
|
TT_LOG_I(TAG, "Cleaning up app");
|
|
if (manifest != nullptr) {
|
|
if (manifest->onDestroy != nullptr) {
|
|
manifest->onDestroy(&appContext, data);
|
|
}
|
|
|
|
if (manifest->destroyData != nullptr && data != nullptr) {
|
|
manifest->destroyData(data);
|
|
}
|
|
|
|
this->manifest = nullptr;
|
|
}
|
|
stopElf();
|
|
}
|
|
|
|
void onShow(AppContext& appContext, lv_obj_t* parent) override {
|
|
if (manifest != nullptr && manifest->onShow != nullptr) {
|
|
manifest->onShow(&appContext, data, parent);
|
|
}
|
|
}
|
|
|
|
void onHide(AppContext& appContext) override {
|
|
if (manifest != nullptr && manifest->onHide != nullptr) {
|
|
manifest->onHide(&appContext, data);
|
|
}
|
|
}
|
|
|
|
void onResult(AppContext& appContext, LaunchId launchId, Result result, std::unique_ptr<Bundle> resultBundle) override {
|
|
if (manifest != nullptr && manifest->onResult != nullptr) {
|
|
manifest->onResult(&appContext, data, launchId, result, resultBundle.get());
|
|
}
|
|
}
|
|
};
|
|
|
|
void setElfAppManifest(
|
|
const char* name,
|
|
const char* _Nullable icon,
|
|
CreateData _Nullable createData,
|
|
DestroyData _Nullable destroyData,
|
|
OnCreate _Nullable onCreate,
|
|
OnDestroy _Nullable onDestroy,
|
|
OnShow _Nullable onShow,
|
|
OnHide _Nullable onHide,
|
|
OnResult _Nullable onResult
|
|
) {
|
|
elfManifest = ElfManifest {
|
|
.name = name ? name : "",
|
|
.icon = icon ? icon : "",
|
|
.createData = createData,
|
|
.destroyData = destroyData,
|
|
.onCreate = onCreate,
|
|
.onDestroy = onDestroy,
|
|
.onShow = onShow,
|
|
.onHide = onHide,
|
|
.onResult = onResult
|
|
};
|
|
elfManifestSetCount++;
|
|
}
|
|
|
|
std::string getElfAppId(const std::string& filePath) {
|
|
return filePath;
|
|
}
|
|
|
|
void registerElfApp(const std::string& filePath) {
|
|
if (findAppById(filePath) == nullptr) {
|
|
auto manifest = AppManifest {
|
|
.id = getElfAppId(filePath),
|
|
.name = string::removeFileExtension(string::getLastPathSegment(filePath)),
|
|
.type = Type::User,
|
|
.location = Location::external(filePath)
|
|
};
|
|
addApp(manifest);
|
|
}
|
|
}
|
|
|
|
std::shared_ptr<App> createElfApp(const std::shared_ptr<AppManifest>& manifest) {
|
|
TT_LOG_I(TAG, "createElfApp");
|
|
assert(manifest != nullptr);
|
|
assert(manifest->location.isExternal());
|
|
return std::make_shared<ElfApp>(manifest->location.getPath());
|
|
}
|
|
|
|
} // namespace
|
|
|
|
#endif // ESP_PLATFORM
|