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
@@ -1,4 +1,4 @@
|
||||
#include "Tactility/app/wifimanage/WifiManagePrivate.h"
|
||||
#include <Tactility/app/wifimanage/WifiManagePrivate.h>
|
||||
|
||||
namespace tt::app::wifimanage {
|
||||
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
#include "Tactility/app/wifimanage/View.h"
|
||||
#include "Tactility/app/wifimanage/WifiManagePrivate.h"
|
||||
#include <Tactility/app/wifimanage/View.h>
|
||||
|
||||
#include "Tactility/lvgl/Style.h"
|
||||
#include "Tactility/lvgl/Toolbar.h"
|
||||
#include "Tactility/lvgl/Spinner.h"
|
||||
#include <Tactility/Tactility.h>
|
||||
#include <Tactility/app/wifimanage/WifiManagePrivate.h>
|
||||
|
||||
#include <Tactility/lvgl/Style.h>
|
||||
#include <Tactility/lvgl/Toolbar.h>
|
||||
#include <Tactility/lvgl/Spinner.h>
|
||||
|
||||
#include <Tactility/Log.h>
|
||||
#include <Tactility/service/wifi/Wifi.h>
|
||||
@@ -15,7 +17,7 @@
|
||||
|
||||
namespace tt::app::wifimanage {
|
||||
|
||||
#define TAG "wifi_main_view"
|
||||
constexpr auto* TAG = "WifiManageView";
|
||||
|
||||
std::shared_ptr<WifiManage> _Nullable optWifiManage();
|
||||
|
||||
@@ -49,7 +51,10 @@ static void on_enable_on_boot_switch_changed(lv_event_t* event) {
|
||||
auto* enable_switch = static_cast<lv_obj_t*>(lv_event_get_target(event));
|
||||
if (code == LV_EVENT_VALUE_CHANGED) {
|
||||
bool is_on = lv_obj_has_state(enable_switch, LV_STATE_CHECKED);
|
||||
service::wifi::settings::setEnableOnBoot(is_on);
|
||||
// Dispatch it, so file IO doesn't block the UI
|
||||
getMainDispatcher().dispatch([is_on] {
|
||||
service::wifi::settings::setEnableOnBoot(is_on);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,16 +1,15 @@
|
||||
#include "Tactility/app/wifimanage/WifiManagePrivate.h"
|
||||
#include "Tactility/app/wifimanage/View.h"
|
||||
#include <Tactility/app/wifimanage/WifiManagePrivate.h>
|
||||
#include <Tactility/app/wifimanage/View.h>
|
||||
|
||||
#include "Tactility/app/AppContext.h"
|
||||
#include "Tactility/app/wifiapsettings/WifiApSettings.h"
|
||||
#include "Tactility/service/loader/Loader.h"
|
||||
#include "Tactility/service/wifi/WifiSettings.h"
|
||||
#include "Tactility/lvgl/LvglSync.h"
|
||||
#include "Tactility/app/wificonnect/WifiConnect.h"
|
||||
#include <Tactility/app/AppContext.h>
|
||||
#include <Tactility/app/wifiapsettings/WifiApSettings.h>
|
||||
#include <Tactility/app/wificonnect/WifiConnect.h>
|
||||
#include <Tactility/lvgl/LvglSync.h>
|
||||
#include <Tactility/service/loader/Loader.h>
|
||||
|
||||
namespace tt::app::wifimanage {
|
||||
|
||||
#define TAG "wifi_manage"
|
||||
constexpr auto TAG = "WifiManage";
|
||||
|
||||
extern const AppManifest manifest;
|
||||
|
||||
@@ -72,20 +71,18 @@ void WifiManage::requestViewUpdate() {
|
||||
unlock();
|
||||
}
|
||||
|
||||
static void wifiManageEventCallback(const void* message, void* context) {
|
||||
auto* event = (service::wifi::Event*)message;
|
||||
auto* wifi = (WifiManage*)context;
|
||||
void WifiManage::onWifiEvent(service::wifi::WifiEvent event) {
|
||||
auto radio_state = service::wifi::getRadioState();
|
||||
TT_LOG_I(TAG, "Update with state %s", service::wifi::radioStateToString(radio_state));
|
||||
wifi->getState().setRadioState(radio_state);
|
||||
switch (event->type) {
|
||||
using enum tt::service::wifi::EventType;
|
||||
getState().setRadioState(radio_state);
|
||||
switch (event) {
|
||||
using enum service::wifi::WifiEvent;
|
||||
case ScanStarted:
|
||||
wifi->getState().setScanning(true);
|
||||
getState().setScanning(true);
|
||||
break;
|
||||
case ScanFinished:
|
||||
wifi->getState().setScanning(false);
|
||||
wifi->getState().updateApRecords();
|
||||
getState().setScanning(false);
|
||||
getState().updateApRecords();
|
||||
break;
|
||||
case RadioStateOn:
|
||||
if (!service::wifi::isScanning()) {
|
||||
@@ -96,11 +93,13 @@ static void wifiManageEventCallback(const void* message, void* context) {
|
||||
break;
|
||||
}
|
||||
|
||||
wifi->requestViewUpdate();
|
||||
requestViewUpdate();
|
||||
}
|
||||
|
||||
void WifiManage::onShow(AppContext& app, lv_obj_t* parent) {
|
||||
wifiSubscription = service::wifi::getPubsub()->subscribe(&wifiManageEventCallback, this);
|
||||
wifiSubscription = service::wifi::getPubsub()->subscribe([this](auto event) {
|
||||
onWifiEvent(event);
|
||||
});
|
||||
|
||||
// State update (it has its own locking)
|
||||
state.setRadioState(service::wifi::getRadioState());
|
||||
|
||||
Reference in New Issue
Block a user