mirror of
https://github.com/ByteWelder/Tactility.git
synced 2026-02-19 03:13:14 +00:00
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`
85 lines
2.1 KiB
C++
85 lines
2.1 KiB
C++
#include "Mutex.h"
|
|
#include "Timer.h"
|
|
|
|
#include "service/ServiceContext.h"
|
|
#include "TactilityHeadless.h"
|
|
#include "service/ServiceRegistry.h"
|
|
|
|
#define TAG "sdcard_service"
|
|
|
|
namespace tt::service::sdcard {
|
|
|
|
extern const ServiceManifest manifest;
|
|
|
|
class SdCardService final : public Service {
|
|
|
|
private:
|
|
|
|
Mutex mutex;
|
|
std::unique_ptr<Timer> updateTimer;
|
|
hal::SdCard::State lastState = hal::SdCard::State::Unmounted;
|
|
|
|
bool lock(TickType_t timeout) const {
|
|
return mutex.lock(timeout);
|
|
}
|
|
|
|
void unlock() const {
|
|
mutex.unlock();
|
|
}
|
|
|
|
void update() {
|
|
auto sdcard = tt::hal::getConfiguration()->sdcard;
|
|
assert(sdcard);
|
|
|
|
if (lock(50)) {
|
|
auto new_state = sdcard->getState();
|
|
|
|
if (new_state == hal::SdCard::State::Error) {
|
|
TT_LOG_W(TAG, "Sdcard error - unmounting. Did you eject the card in an unsafe manner?");
|
|
sdcard->unmount();
|
|
}
|
|
|
|
if (new_state != lastState) {
|
|
lastState = new_state;
|
|
}
|
|
|
|
unlock();
|
|
} else {
|
|
TT_LOG_W(TAG, LOG_MESSAGE_MUTEX_LOCK_FAILED);
|
|
}
|
|
}
|
|
|
|
static void onUpdate(std::shared_ptr<void> context) {
|
|
auto service = std::static_pointer_cast<SdCardService>(context);
|
|
service->update();
|
|
}
|
|
|
|
public:
|
|
|
|
void onStart(ServiceContext& serviceContext) final {
|
|
if (hal::getConfiguration()->sdcard != nullptr) {
|
|
auto service = findServiceById(manifest.id);
|
|
updateTimer = std::make_unique<Timer>(Timer::Type::Periodic, onUpdate, service);
|
|
// We want to try and scan more often in case of startup or scan lock failure
|
|
updateTimer->start(1000);
|
|
} else {
|
|
TT_LOG_I(TAG, "Timer not started: no SD card config");
|
|
}
|
|
}
|
|
|
|
void onStop(ServiceContext& serviceContext) final {
|
|
if (updateTimer != nullptr) {
|
|
// Stop thread
|
|
updateTimer->stop();
|
|
updateTimer = nullptr;
|
|
}
|
|
}
|
|
};
|
|
|
|
extern const ServiceManifest manifest = {
|
|
.id = "sdcard",
|
|
.createService = create<SdCardService>
|
|
};
|
|
|
|
} // namespace
|