Merge develop into main (#167)
- WiFi Connect app is now hidden by default, but accessible at the bottom of the WiFi Manage app when WiFi is turned on. - WiFi service now turns on WiFi when calling connect() and WiFi is not on. - Removed `blocking` option for `service::loader::startApp()`. This feature was unused and complex. - Various apps: Moved private headers into Private/ folder. - Various apps: created start() function for easy starting. - Added documentation to all TactilityC APIs - Refactored various `enum` into `class enum` - Refactor M5Stack `initBoot()` (but VBus is still 0V for some reason)
This commit is contained in:
committed by
GitHub
parent
3ca0f8cf97
commit
3ea02d912f
@@ -57,17 +57,12 @@ typedef struct {
|
||||
|
||||
class LoaderMessageAppStart {
|
||||
public:
|
||||
// This lock blocks anyone from starting an app as long
|
||||
// as an app is already running via loader_start()
|
||||
// This lock's lifecycle is not owned by this class.
|
||||
std::shared_ptr<EventFlag> api_lock = std::make_shared<EventFlag>();
|
||||
std::string id;
|
||||
std::shared_ptr<const Bundle> _Nullable parameters;
|
||||
|
||||
LoaderMessageAppStart() = default;
|
||||
|
||||
LoaderMessageAppStart(LoaderMessageAppStart& other) :
|
||||
api_lock(other.api_lock),
|
||||
id(other.id),
|
||||
parameters(other.parameters) {}
|
||||
|
||||
@@ -77,14 +72,6 @@ public:
|
||||
{}
|
||||
|
||||
~LoaderMessageAppStart() = default;
|
||||
|
||||
std::shared_ptr<EventFlag> getApiLockEventFlag() { return api_lock; }
|
||||
|
||||
uint32_t getApiLockEventFlagValue() { return 1; }
|
||||
|
||||
void onProcessed() {
|
||||
api_lock->set(1);
|
||||
}
|
||||
};
|
||||
|
||||
// endregion LoaderMessage
|
||||
@@ -92,7 +79,7 @@ public:
|
||||
struct Loader {
|
||||
std::shared_ptr<PubSub> pubsubInternal = std::make_shared<PubSub>();
|
||||
std::shared_ptr<PubSub> pubsubExternal = std::make_shared<PubSub>();
|
||||
Mutex mutex = Mutex(Mutex::TypeRecursive);
|
||||
Mutex mutex = Mutex(Mutex::Type::Recursive);
|
||||
std::stack<app::AppInstance*> appStack;
|
||||
/** The dispatcher thread needs a callstack large enough to accommodate all the dispatched methods.
|
||||
* This includes full LVGL redraw via Gui::redraw()
|
||||
|
||||
Reference in New Issue
Block a user