686f7cce83
FreeRTOS handles were stored plainly and they were deleted in the destructor of classes. This meant that if a class were to be copied, the destructor would be called twice on the same handles and lead to double-free. Seha on Discord suggested to fix this by using `std::unique_ptr` with a custom deletion function. The changes affect: - Thread - Semaphore - Mutex - StreamBuffer - Timer - MessageQueue - EventFlag Thread changes: - Removal of the hack with the `Data` struct - Thread's main body is now just a private static function inside the class. - The C functions were relocated to static class members PubSub changes: - Refactored pubsub into class - Renamed files to `PubSub` instead of `Pubsub` - `PubSubSubscription` is now a private inner struct and `PubSub` only exposes `SubscriptionHandle` Lockable, ScopedLockable, Mutex: - Added `lock()` method that locks indefinitely - Remove deprecated `acquire()` and `release()` methods - Removed `TtWaitForever` in favour of `portMAX_DELAY`
50 lines
1.1 KiB
C++
50 lines
1.1 KiB
C++
#pragma once
|
|
|
|
#include "app/App.h"
|
|
#include "app/wificonnect/Bindings.h"
|
|
#include "app/wificonnect/State.h"
|
|
#include "app/wificonnect/View.h"
|
|
|
|
#include "Mutex.h"
|
|
#include "service/wifi/Wifi.h"
|
|
|
|
namespace tt::app::wificonnect {
|
|
|
|
class WifiConnect : public App {
|
|
|
|
private:
|
|
|
|
Mutex mutex;
|
|
State state;
|
|
Bindings bindings = {
|
|
.onConnectSsid = nullptr,
|
|
.onConnectSsidContext = nullptr
|
|
};
|
|
View view = View(&bindings, &state);
|
|
PubSub::SubscriptionHandle wifiSubscription;
|
|
bool view_enabled = false;
|
|
|
|
public:
|
|
|
|
WifiConnect();
|
|
~WifiConnect();
|
|
|
|
void lock();
|
|
void unlock();
|
|
|
|
void onShow(AppContext& app, lv_obj_t* parent) override;
|
|
void onHide(AppContext& app) override;
|
|
|
|
State& getState() { return state; }
|
|
Bindings& getBindings() { return bindings; }
|
|
View& getView() { return view; }
|
|
|
|
|
|
void requestViewUpdate();
|
|
};
|
|
|
|
bool optSsidParameter(const std::shared_ptr<const Bundle>& bundle, std::string& ssid);
|
|
bool optPasswordParameter(const std::shared_ptr<const Bundle>& bundle, std::string& password);
|
|
|
|
} // namespace
|