Merge develop into main (#313)
- Add app path get() functions to `TactilityC` - Improved `Dispatcher` and `DispatcherThread` - Improved `PubSub` (type safety) - Created test for `DispatcherThread` and `PubSub` - Save properties files on app exit (various apps) by posting it to the main dispatcher (fixes UI hanging briefly on app exit) - Fixed bug with `SystemSettings` being read from the wrong file path. - `loadPropertiesFile()` now uses `file::readLines()` instead of doing that manually - Increased timer task stack size (required due to issues when reading a properties file for the very first time) - General cleanup - Created `EstimatedPower` driver that uses an ADC pin to measure voltage and estimate the battery charge that is left. - Cleanup of T-Deck board (updated to new style)
This commit is contained in:
committed by
GitHub
parent
5cc5b50694
commit
0f8380e8fe
@@ -19,9 +19,11 @@ class WifiConnect : public App {
|
||||
.onConnectSsidContext = nullptr
|
||||
};
|
||||
View view = View(&bindings, &state);
|
||||
PubSub::SubscriptionHandle wifiSubscription;
|
||||
PubSub<service::wifi::WifiEvent>::SubscriptionHandle wifiSubscription;
|
||||
bool view_enabled = false;
|
||||
|
||||
void onWifiEvent(service::wifi::WifiEvent event);
|
||||
|
||||
public:
|
||||
|
||||
WifiConnect();
|
||||
|
||||
@@ -13,15 +13,15 @@ namespace tt::app::wifimanage {
|
||||
|
||||
class WifiManage : public App {
|
||||
|
||||
private:
|
||||
|
||||
PubSub::SubscriptionHandle wifiSubscription = nullptr;
|
||||
PubSub<service::wifi::WifiEvent>::SubscriptionHandle wifiSubscription = nullptr;
|
||||
Mutex mutex;
|
||||
Bindings bindings = { };
|
||||
State state;
|
||||
View view = View(&bindings, &state);
|
||||
bool isViewEnabled = false;
|
||||
|
||||
void onWifiEvent(service::wifi::WifiEvent event);
|
||||
|
||||
public:
|
||||
|
||||
WifiManage();
|
||||
|
||||
@@ -1,14 +1,13 @@
|
||||
#pragma once
|
||||
|
||||
#include <Tactility/app/AppContext.h>
|
||||
#include <Tactility/MessageQueue.h>
|
||||
#include <Tactility/Mutex.h>
|
||||
#include <Tactility/PubSub.h>
|
||||
#include <Tactility/service/Service.h>
|
||||
|
||||
#include "Tactility/app/AppContext.h"
|
||||
#include <Tactility/service/loader/Loader.h>
|
||||
|
||||
#include <cstdio>
|
||||
|
||||
#include <lvgl.h>
|
||||
|
||||
namespace tt::service::gui {
|
||||
@@ -23,7 +22,7 @@ class GuiService : public Service {
|
||||
// Thread and lock
|
||||
Thread* thread = nullptr;
|
||||
Mutex mutex = Mutex(Mutex::Type::Recursive);
|
||||
PubSub::SubscriptionHandle loader_pubsub_subscription = nullptr;
|
||||
PubSub<loader::LoaderEvent>::SubscriptionHandle loader_pubsub_subscription = nullptr;
|
||||
|
||||
// Layers and Canvas
|
||||
lv_obj_t* appRootWidget = nullptr;
|
||||
@@ -37,10 +36,10 @@ class GuiService : public Service {
|
||||
|
||||
bool isStarted = false;
|
||||
|
||||
static void onLoaderMessage(const void* message, TT_UNUSED void* context);
|
||||
|
||||
static int32_t guiMain();
|
||||
|
||||
void onLoaderEvent(loader::LoaderEvent event);
|
||||
|
||||
lv_obj_t* createAppViews(lv_obj_t* parent);
|
||||
|
||||
void redraw();
|
||||
|
||||
Reference in New Issue
Block a user