From 601b7733d4d6c622c4b47bcc53c930d851ae14c1 Mon Sep 17 00:00:00 2001
From: Ken Van Hoeylandt <git@kenvanhoeylandt.net>
Date: Mon, 1 Sep 2025 00:08:26 +0200
Subject: [PATCH] Cleanup/improvements

---
 TactilityCore/Include/Tactility/Bundle.h           | 4 +---
 TactilityCore/Include/Tactility/Dispatcher.h       | 3 ++-
 TactilityCore/Include/Tactility/DispatcherThread.h | 2 +-
 TactilityCore/Include/Tactility/EventFlag.h        | 3 +--
 TactilityCore/Include/Tactility/PubSub.h           | 2 +-
 TactilityCore/Include/Tactility/Semaphore.h        | 2 --
 TactilityCore/Include/Tactility/StreamBuffer.h     | 4 +---
 TactilityCore/Include/Tactility/Thread.h           | 9 ++++-----
 TactilityCore/Source/StreamBuffer.cpp              | 2 +-
 9 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/TactilityCore/Include/Tactility/Bundle.h b/TactilityCore/Include/Tactility/Bundle.h
index 559e658b..9b5c70bf 100644
--- a/TactilityCore/Include/Tactility/Bundle.h
+++ b/TactilityCore/Include/Tactility/Bundle.h
@@ -13,9 +13,7 @@ namespace tt {
 /**
  * A dictionary that maps keys (strings) onto several atomary types.
  */
-class Bundle {
-
-private:
+class Bundle final {
 
     typedef uint32_t Hash;
 
diff --git a/TactilityCore/Include/Tactility/Dispatcher.h b/TactilityCore/Include/Tactility/Dispatcher.h
index fb29796c..114eb639 100644
--- a/TactilityCore/Include/Tactility/Dispatcher.h
+++ b/TactilityCore/Include/Tactility/Dispatcher.h
@@ -19,7 +19,8 @@ namespace tt {
  * Generally, one task would dispatch the execution,
  * while the other thread consumes and executes the work.
  */
-class Dispatcher {
+class Dispatcher final {
+
 public:
 
     typedef std::function<void()> Function;
diff --git a/TactilityCore/Include/Tactility/DispatcherThread.h b/TactilityCore/Include/Tactility/DispatcherThread.h
index eaaf8417..2e0f1557 100644
--- a/TactilityCore/Include/Tactility/DispatcherThread.h
+++ b/TactilityCore/Include/Tactility/DispatcherThread.h
@@ -5,7 +5,7 @@
 namespace tt {
 
 /** Starts a Thread to process dispatched messages */
-class DispatcherThread {
+class DispatcherThread final {
 
     Dispatcher dispatcher;
     std::unique_ptr<Thread> thread;
diff --git a/TactilityCore/Include/Tactility/EventFlag.h b/TactilityCore/Include/Tactility/EventFlag.h
index d7949762..91319f43 100644
--- a/TactilityCore/Include/Tactility/EventFlag.h
+++ b/TactilityCore/Include/Tactility/EventFlag.h
@@ -8,8 +8,7 @@ namespace tt {
 /**
  * Wrapper for FreeRTOS xEventGroup.
  */
-class EventFlag {
-private:
+class EventFlag final {
 
     struct EventGroupHandleDeleter {
         void operator()(EventGroupHandle_t handleToDelete) {
diff --git a/TactilityCore/Include/Tactility/PubSub.h b/TactilityCore/Include/Tactility/PubSub.h
index 394251bc..77dd087f 100644
--- a/TactilityCore/Include/Tactility/PubSub.h
+++ b/TactilityCore/Include/Tactility/PubSub.h
@@ -7,7 +7,7 @@ namespace tt {
 
 /** Publish and subscribe to messages in a thread-safe manner. */
 template<typename DataType>
-class PubSub {
+class PubSub final {
 
     struct Subscription {
         uint64_t id;
diff --git a/TactilityCore/Include/Tactility/Semaphore.h b/TactilityCore/Include/Tactility/Semaphore.h
index 788e2fea..756363ca 100644
--- a/TactilityCore/Include/Tactility/Semaphore.h
+++ b/TactilityCore/Include/Tactility/Semaphore.h
@@ -21,8 +21,6 @@ namespace tt {
  */
 class Semaphore final : public Lock {
 
-private:
-
     struct SemaphoreHandleDeleter {
         void operator()(QueueHandle_t handleToDelete) {
             assert(!kernel::isIsr());
diff --git a/TactilityCore/Include/Tactility/StreamBuffer.h b/TactilityCore/Include/Tactility/StreamBuffer.h
index 94c6fb82..b85e5b8a 100644
--- a/TactilityCore/Include/Tactility/StreamBuffer.h
+++ b/TactilityCore/Include/Tactility/StreamBuffer.h
@@ -22,9 +22,7 @@ namespace tt {
  * interrupt that will write to the buffer (the writer), and only one task or
  * interrupt that will read from the buffer (the reader).
  */
-class StreamBuffer {
-
-private:
+class StreamBuffer final {
 
     struct StreamBufferHandleDeleter {
         void operator()(StreamBufferHandle_t handleToDelete) {
diff --git a/TactilityCore/Include/Tactility/Thread.h b/TactilityCore/Include/Tactility/Thread.h
index 98de178b..6d623e6e 100644
--- a/TactilityCore/Include/Tactility/Thread.h
+++ b/TactilityCore/Include/Tactility/Thread.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "CoreDefines.h"
 #include "RtosCompatTask.h"
 
 #include <functional>
@@ -11,7 +10,7 @@ namespace tt {
 
 typedef TaskHandle_t ThreadId;
 
-class Thread {
+class Thread final {
 
 public:
 
@@ -184,8 +183,8 @@ public:
     static uint32_t awaitFlags(uint32_t flags, uint32_t options, uint32_t timeout);
 };
 
-#define THREAD_PRIORITY_SERVICE Thread::Priority::High
-#define THREAD_PRIORITY_RENDER Thread::Priority::Higher
-#define THREAD_PRIORITY_ISR Thread::Priority::Critical
+constexpr auto THREAD_PRIORITY_SERVICE = Thread::Priority::High;
+constexpr auto THREAD_PRIORITY_RENDER = Thread::Priority::Higher;
+constexpr auto THREAD_PRIORITY_ISR = Thread::Priority::Critical;
 
 } // namespace
diff --git a/TactilityCore/Source/StreamBuffer.cpp b/TactilityCore/Source/StreamBuffer.cpp
index 0b9ffdec..0c1372af 100644
--- a/TactilityCore/Source/StreamBuffer.cpp
+++ b/TactilityCore/Source/StreamBuffer.cpp
@@ -5,7 +5,7 @@
 
 namespace tt {
 
-inline static StreamBufferHandle_t createStreamBuffer(size_t size, size_t triggerLevel) {
+static StreamBufferHandle_t createStreamBuffer(size_t size, size_t triggerLevel) {
     assert(size != 0);
     return xStreamBufferCreate(size, triggerLevel);
 }