Merge develop into main branch (#137)
* SdCard HAL refactored (#135) - Refactor SdCard HAL - introduce Lockable * Screenshot and FatFS improvements (#136) - Fix screenshots on ESP32 - Improve Screenshot service - Convert Screenshot app to class-based instead of structs - Screenshot app now automatically updates when task is finished - Enable FatFS long filename support * Re-use common log messages (#138) For consistency and binary size reduction * Toolbar spinner should get margin to the right * More TactilityC features (#139) * Rewrote Loader - Simplified Loader by removing custom threa - Created DispatcherThread - Move auto-starting apps to Boot app - Fixed Dispatcher bug where it could get stuck not processing new messages * Hide AP settings if the AP is not saved * Missing from previous commit * Replace LV_EVENT_CLICKED with LV_EVENT_SHORT_CLICKED * Refactored files app and created InputDialog (#140) - Changed Files app so that it has a View and State - Files app now allows for long-pressing on files to perform actions - Files app now has rename and delete actions - Created InputDialog app - Improved AlertDialog app layout
This commit is contained in:
committed by
GitHub
parent
9033daa6dd
commit
50bd6e8bf6
@@ -8,6 +8,7 @@
|
||||
#include "Thread.h"
|
||||
#include "RtosCompatSemaphore.h"
|
||||
#include "Check.h"
|
||||
#include "Lockable.h"
|
||||
#include <memory>
|
||||
|
||||
namespace tt {
|
||||
@@ -18,7 +19,7 @@ class ScopedMutexUsage;
|
||||
* Wrapper for FreeRTOS xSemaphoreCreateMutex and xSemaphoreCreateRecursiveMutex
|
||||
* Can be used in IRQ mode (within ISR context)
|
||||
*/
|
||||
class Mutex {
|
||||
class Mutex : public Lockable {
|
||||
|
||||
public:
|
||||
|
||||
@@ -35,35 +36,15 @@ private:
|
||||
public:
|
||||
|
||||
explicit Mutex(Type type = TypeNormal);
|
||||
~Mutex();
|
||||
~Mutex() override;
|
||||
|
||||
TtStatus acquire(uint32_t timeout) const;
|
||||
TtStatus acquire(uint32_t timeoutTicks) const;
|
||||
TtStatus release() const;
|
||||
|
||||
bool lock(uint32_t timeoutTicks) const override { return acquire(timeoutTicks) == TtStatusOk; }
|
||||
bool unlock() const override { return release() == TtStatusOk; }
|
||||
|
||||
ThreadId getOwner() const;
|
||||
|
||||
std::unique_ptr<ScopedMutexUsage> scoped() const;
|
||||
};
|
||||
|
||||
class ScopedMutexUsage {
|
||||
|
||||
const Mutex& mutex;
|
||||
bool acquired = false;
|
||||
|
||||
public:
|
||||
|
||||
ScopedMutexUsage(const Mutex& mutex) : mutex(mutex) {}
|
||||
|
||||
~ScopedMutexUsage() {
|
||||
if (acquired) {
|
||||
tt_check(mutex.release() == TtStatusOk);
|
||||
}
|
||||
}
|
||||
|
||||
bool acquire(uint32_t timeout) {
|
||||
TtStatus result = mutex.acquire(timeout);
|
||||
acquired = (result == TtStatusOk);
|
||||
return acquired;
|
||||
}
|
||||
};
|
||||
|
||||
/** Allocate Mutex
|
||||
|
||||
Reference in New Issue
Block a user