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`
63 lines
1.2 KiB
C++
63 lines
1.2 KiB
C++
#include "app/wifimanage/WifiManagePrivate.h"
|
|
|
|
namespace tt::app::wifimanage {
|
|
|
|
void State::setScanning(bool isScanning) {
|
|
mutex.lock();
|
|
scanning = isScanning;
|
|
scannedAfterRadioOn |= isScanning;
|
|
mutex.unlock();
|
|
}
|
|
|
|
void State::setRadioState(service::wifi::RadioState state) {
|
|
mutex.lock();
|
|
radioState = state;
|
|
if (radioState == service::wifi::RadioState::Off) {
|
|
scannedAfterRadioOn = false;
|
|
}
|
|
mutex.unlock();
|
|
}
|
|
|
|
service::wifi::RadioState State::getRadioState() const {
|
|
mutex.lock();
|
|
auto result = radioState;
|
|
mutex.unlock();
|
|
return result;
|
|
}
|
|
|
|
bool State::isScanning() const {
|
|
mutex.lock();
|
|
bool result = scanning;
|
|
mutex.unlock();
|
|
return result;
|
|
}
|
|
|
|
const std::vector<service::wifi::ApRecord>& State::lockApRecords() const {
|
|
mutex.lock();
|
|
return apRecords;
|
|
}
|
|
|
|
void State::unlockApRecords() const {
|
|
mutex.unlock();
|
|
}
|
|
|
|
void State::updateApRecords() {
|
|
mutex.lock();
|
|
apRecords = service::wifi::getScanResults();
|
|
mutex.unlock();
|
|
}
|
|
|
|
void State::setConnectSsid(const std::string& ssid) {
|
|
mutex.lock();
|
|
connectSsid = ssid;
|
|
mutex.unlock();
|
|
}
|
|
|
|
std::string State::getConnectSsid() const {
|
|
mutex.lock();
|
|
auto result = connectSsid;
|
|
return result;
|
|
}
|
|
|
|
} // namespace
|