ee5a5a7181
## 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
118 lines
3.4 KiB
C++
118 lines
3.4 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 {
|
|
#define TAG "wifi_connect"
|
|
#define WIFI_CONNECT_PARAM_SSID "ssid" // String
|
|
#define WIFI_CONNECT_PARAM_PASSWORD "password" // String
|
|
|
|
extern const AppManifest manifest;
|
|
|
|
static void eventCallback(const void* message, void* context) {
|
|
auto* event = static_cast<const service::wifi::Event*>(message);
|
|
auto* wifi = static_cast<WifiConnect*>(context);
|
|
State& state = wifi->getState();
|
|
switch (event->type) {
|
|
case service::wifi::EventType::ConnectionFailed:
|
|
if (state.isConnecting()) {
|
|
state.setConnecting(false);
|
|
state.setConnectionError(true);
|
|
wifi->requestViewUpdate();
|
|
}
|
|
break;
|
|
case service::wifi::EventType::ConnectionSuccess:
|
|
if (wifi->getState().isConnecting()) {
|
|
state.setConnecting(false);
|
|
service::loader::stopApp();
|
|
}
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
wifi->requestViewUpdate();
|
|
}
|
|
|
|
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);
|
|
}
|
|
|
|
WifiConnect::WifiConnect() {
|
|
wifiSubscription = service::wifi::getPubsub()->subscribe(&eventCallback, this);
|
|
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
|