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`
48 lines
982 B
C++
48 lines
982 B
C++
#include "app/wificonnect/State.h"
|
|
#include <cstring>
|
|
|
|
namespace tt::app::wificonnect {
|
|
|
|
void State::setConnectionError(bool error) {
|
|
lock.lock();
|
|
connectionError = error;
|
|
lock.unlock();
|
|
}
|
|
|
|
bool State::hasConnectionError() const {
|
|
lock.lock();
|
|
auto result = connectionError;
|
|
lock.unlock();
|
|
return result;
|
|
}
|
|
|
|
void State::setApSettings(const service::wifi::settings::WifiApSettings* newSettings) {
|
|
lock.lock();
|
|
memcpy(&this->apSettings, newSettings, sizeof(service::wifi::settings::WifiApSettings));
|
|
lock.unlock();
|
|
}
|
|
|
|
const service::wifi::settings::WifiApSettings& State::lockApSettings() {
|
|
lock.lock();
|
|
return apSettings;
|
|
}
|
|
|
|
void State::unlockApSettings() {
|
|
lock.unlock();
|
|
}
|
|
|
|
void State::setConnecting(bool isConnecting) {
|
|
lock.lock();
|
|
connecting = isConnecting;
|
|
lock.unlock();
|
|
}
|
|
|
|
bool State::isConnecting() const {
|
|
lock.lock();
|
|
auto result = connecting;
|
|
lock.unlock();
|
|
return result;
|
|
}
|
|
|
|
} // namespace
|