0f8380e8fe
- 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)
120 lines
3.3 KiB
C++
120 lines
3.3 KiB
C++
#include <Tactility/app/wificonnect/WifiConnect.h>
|
|
|
|
#include <Tactility/app/AppContext.h>
|
|
#include <Tactility/service/loader/Loader.h>
|
|
#include <Tactility/service/wifi/Wifi.h>
|
|
#include <Tactility/lvgl/LvglSync.h>
|
|
|
|
namespace tt::app::wificonnect {
|
|
|
|
constexpr auto* TAG = "WifiConnect";
|
|
constexpr auto* WIFI_CONNECT_PARAM_SSID = "ssid"; // String
|
|
constexpr auto* WIFI_CONNECT_PARAM_PASSWORD = "password"; // String
|
|
|
|
extern const AppManifest manifest;
|
|
|
|
static void onConnect(const service::wifi::settings::WifiApSettings& ap_settings, bool remember, TT_UNUSED void* parameter) {
|
|
auto* wifi = static_cast<WifiConnect*>(parameter);
|
|
wifi->getState().setApSettings(ap_settings);
|
|
wifi->getState().setConnecting(true);
|
|
service::wifi::connect(ap_settings, remember);
|
|
}
|
|
|
|
void WifiConnect::onWifiEvent(service::wifi::WifiEvent event) {
|
|
State& state = getState();
|
|
switch (event) {
|
|
case service::wifi::WifiEvent::ConnectionFailed:
|
|
if (state.isConnecting()) {
|
|
state.setConnecting(false);
|
|
state.setConnectionError(true);
|
|
requestViewUpdate();
|
|
}
|
|
break;
|
|
case service::wifi::WifiEvent::ConnectionSuccess:
|
|
if (getState().isConnecting()) {
|
|
state.setConnecting(false);
|
|
service::loader::stopApp();
|
|
}
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
requestViewUpdate();
|
|
}
|
|
|
|
WifiConnect::WifiConnect() {
|
|
wifiSubscription = service::wifi::getPubsub()->subscribe([this](auto event) {
|
|
onWifiEvent(event);
|
|
});
|
|
|
|
bindings = (Bindings) {
|
|
.onConnectSsid = onConnect,
|
|
.onConnectSsidContext = this,
|
|
};
|
|
}
|
|
|
|
WifiConnect::~WifiConnect() {
|
|
service::wifi::getPubsub()->unsubscribe(wifiSubscription);
|
|
}
|
|
|
|
void WifiConnect::lock() {
|
|
mutex.lock();
|
|
}
|
|
|
|
void WifiConnect::unlock() {
|
|
mutex.unlock();
|
|
}
|
|
|
|
void WifiConnect::requestViewUpdate() {
|
|
lock();
|
|
if (view_enabled) {
|
|
if (lvgl::lock(1000)) {
|
|
view.update();
|
|
lvgl::unlock();
|
|
} else {
|
|
TT_LOG_E(TAG, LOG_MESSAGE_MUTEX_LOCK_FAILED_FMT, "LVGL");
|
|
}
|
|
}
|
|
unlock();
|
|
}
|
|
|
|
void WifiConnect::onShow(AppContext& app, lv_obj_t* parent) {
|
|
lock();
|
|
view_enabled = true;
|
|
view.init(app, parent);
|
|
view.update();
|
|
unlock();
|
|
}
|
|
|
|
void WifiConnect::onHide(TT_UNUSED AppContext& app) {
|
|
// No need to lock view, as this is called from within Gui's LVGL context
|
|
lock();
|
|
view_enabled = false;
|
|
unlock();
|
|
}
|
|
|
|
extern const AppManifest manifest = {
|
|
.id = "WifiConnect",
|
|
.name = "Wi-Fi Connect",
|
|
.icon = LV_SYMBOL_WIFI,
|
|
.type = Type::Hidden,
|
|
.createApp = create<WifiConnect>
|
|
};
|
|
|
|
void start(const std::string& ssid, const std::string& password) {
|
|
auto parameters = std::make_shared<Bundle>();
|
|
parameters->putString(WIFI_CONNECT_PARAM_SSID, ssid);
|
|
parameters->putString(WIFI_CONNECT_PARAM_PASSWORD, password);
|
|
service::loader::startApp(manifest.id, parameters);
|
|
}
|
|
|
|
bool optSsidParameter(const std::shared_ptr<const Bundle>& bundle, std::string& ssid) {
|
|
return bundle->optString(WIFI_CONNECT_PARAM_SSID, ssid);
|
|
}
|
|
|
|
bool optPasswordParameter(const std::shared_ptr<const Bundle>& bundle, std::string& password) {
|
|
return bundle->optString(WIFI_CONNECT_PARAM_PASSWORD, password);
|
|
}
|
|
|
|
} // namespace
|