Lockable renamed to Lock (#219)

Also changed usage from unique_ptr to class value.

TactilityHeadless/Source/hal/gps/GpsDevice.cpp

@@ -75,8 +75,8 @@ int32_t GpsDevice::threadMain() {
 }
 
 bool GpsDevice::start() {
-    auto scoped_lockable = mutex.scoped();
-    scoped_lockable->lock(portMAX_DELAY);
+    auto lock = mutex.asScopedLock();
+    lock.lock();
 
     if (thread != nullptr && thread->getState() != Thread::State::Stopped) {
         TT_LOG_W(TAG, "Already started");
@@ -108,8 +108,8 @@ bool GpsDevice::start() {
 }
 
 bool GpsDevice::stop() {
-    auto scoped_lockable = mutex.scoped();
-    scoped_lockable->lock();
+    auto lock = mutex.asScopedLock();
+    lock.lock(portMAX_DELAY);
 
     if (thread != nullptr) {
         threadInterrupted = true;
@@ -119,11 +119,11 @@ bool GpsDevice::stop() {
 
         if (old_thread->getState() != Thread::State::Stopped) {
             // Unlock so thread can lock
-            scoped_lockable->unlock();
+            lock.unlock();
             // Wait for thread to finish
             old_thread->join();
             // Re-lock to continue logic below
-            scoped_lockable->lock();
+            lock.lock();
         }
     }
 
@@ -138,14 +138,14 @@ bool GpsDevice::stop() {
 }
 
 bool GpsDevice::isStarted() const {
-    auto scoped_lockable = mutex.scoped();
-    scoped_lockable->lock(portMAX_DELAY);
+    auto lock = mutex.asScopedLock();
+    lock.lock();
     return thread != nullptr && thread->getState() != Thread::State::Stopped;
 }
 
 bool GpsDevice::isThreadInterrupted() const {
-    auto scoped_lockable = mutex.scoped();
-    scoped_lockable->lock(portMAX_DELAY);
+    auto lock = mutex.asScopedLock();
+    lock.lock(portMAX_DELAY);
     return threadInterrupted;
 }
 

TactilityHeadless/Source/hal/gps/Satellites.cpp

@@ -23,8 +23,8 @@ SatelliteStorage::SatelliteRecord* SatelliteStorage::findRecord(int number) {
 }
 
 SatelliteStorage::SatelliteRecord* SatelliteStorage::findUnusedRecord() {
-    auto lockable = mutex.scoped();
-    lockable->lock();
+    auto lock = mutex.asScopedLock();
+    lock.lock();
 
     auto result = records | std::views::filter([](auto& record) {
         return !record.inUse;
@@ -41,8 +41,8 @@ SatelliteStorage::SatelliteRecord* SatelliteStorage::findUnusedRecord() {
 }
 
 SatelliteStorage::SatelliteRecord* SatelliteStorage::findRecordToRecycle() {
-    auto lockable = mutex.scoped();
-    lockable->lock();
+    auto lock = mutex.asScopedLock();
+    lock.lock();
 
     int candidate_index = -1;
     auto candidate_age = portMAX_DELAY;
@@ -72,8 +72,8 @@ SatelliteStorage::SatelliteRecord* SatelliteStorage::findRecordToRecycle() {
 }
 
 SatelliteStorage::SatelliteRecord* SatelliteStorage::findWithFallback(int number) {
-    auto lockable = mutex.scoped();
-    lockable->lock();
+    auto lock = mutex.asScopedLock();
+    lock.lock();
 
     if (auto* found_record = findRecord(number)) {
         return found_record;
@@ -85,8 +85,8 @@ SatelliteStorage::SatelliteRecord* SatelliteStorage::findWithFallback(int number
 }
 
 void SatelliteStorage::notify(const minmea_sat_info& data) {
-    auto lockable = mutex.scoped();
-    lockable->lock();
+    auto lock = mutex.asScopedLock();
+    lock.lock();
 
     auto* record = findWithFallback(data.nr);
     if (record != nullptr) {
@@ -98,8 +98,8 @@ void SatelliteStorage::notify(const minmea_sat_info& data) {
 }
 
 void SatelliteStorage::getRecords(const std::function<void(const minmea_sat_info&)>& onRecord) const {
-    auto lockable = mutex.scoped();
-    lockable->lock();
+    auto lock = mutex.asScopedLock();
+    lock.lock();
 
     TickType_t expire_duration = kernel::secondsToTicks(recentTimeSeconds);
     TickType_t now = kernel::getTicks();