Improve serial command handling

include/serial/SerialBuffer.h

@@ -0,0 +1,84 @@
+#pragma once
+
+#include <cstdint>
+#include <cstring>
+#include <string_view>
+
+#include "Common.h"
+
+namespace OpenShock::Serial {
+  class SerialBuffer {
+    DISABLE_COPY(SerialBuffer);
+    DISABLE_MOVE(SerialBuffer);
+
+  public:
+    constexpr SerialBuffer()
+      : m_data(nullptr)
+      , m_size(0)
+      , m_capacity(0)
+    {
+    }
+    SerialBuffer(size_t capacity)
+      : m_data(new char[capacity])
+      , m_size(0)
+      , m_capacity(capacity)
+    {
+    }
+    ~SerialBuffer() { delete[] m_data; }
+
+    constexpr char* data() { return m_data; }
+    constexpr size_t size() const { return m_size; }
+    constexpr size_t capacity() const { return m_capacity; }
+    constexpr bool empty() const { return m_size == 0; }
+
+    constexpr void clear() { m_size = 0; }
+    void destroy()
+    {
+      delete[] m_data;
+      m_data     = nullptr;
+      m_size     = 0;
+      m_capacity = 0;
+    }
+
+    void reserve(size_t size)
+    {
+      size = (size + 31) & ~31;  // Align to 32 bytes
+
+      if (size <= m_capacity) {
+        return;
+      }
+
+      char* newData = new char[size];
+      if (m_data != nullptr) {
+        memcpy(newData, m_data, m_size);
+        delete[] m_data;
+      }
+
+      m_data     = newData;
+      m_capacity = size;
+    }
+
+    void push_back(char c)
+    {
+      if (m_size >= m_capacity) {
+        reserve(m_capacity + 16);
+      }
+
+      m_data[m_size++] = c;
+    }
+
+    constexpr void pop_back()
+    {
+      if (m_size > 0) {
+        --m_size;
+      }
+    }
+
+    constexpr operator std::string_view() const { return std::string_view(m_data, m_size); }
+
+  private:
+    char* m_data;
+    size_t m_size;
+    size_t m_capacity;
+  };
+}  // namespace OpenShock::Serial

include/serial/SerialInputHandler.h

@@ -1,6 +1,6 @@
 #pragma once
 
 #include <cstdint>
 
 // Making sense of the ESP32 Arduino core #defines
 #if ARDUINO_USB_MODE && ARDUINO_USB_CDC_ON_BOOT
@@ -42,6 +42,6 @@
   bool SerialEchoEnabled();
   void SetSerialEchoEnabled(bool enabled);
 
-  void PrintWelcomeHeader();
+  void PrintBootInfo();
   void PrintVersionInfo();
 }  // namespace OpenShock::SerialInputHandler

include/serial/SerialReadResult.h

@@ -0,0 +1,10 @@
+#pragma once
+
+namespace OpenShock::Serial {
+  enum class SerialReadResult {
+    NoData,
+    Data,
+    LineEnd,
+    AutoCompleteRequest,
+  };
+}  // namespace OpenShock::Serial

include/serial/command_handlers/CommandArgument.h

@@ -0,0 +1,14 @@
+#pragma once
+
+#include <string_view>
+#include <vector>
+
+namespace OpenShock::Serial {
+  class CommandArgument {
+  public:
+    std::string_view name;
+    std::string_view constraint;
+    std::string_view exampleValue;
+    std::vector<std::string_view> constraintExtensions;
+  };
+}  // namespace OpenShock::Serial

include/serial/command_handlers/CommandEntry.h

@@ -1,28 +1,21 @@
 #pragma once
 
+#include "CommandArgument.h"
+#include "CommandHandler.h"
+
 #include <string_view>
 #include <vector>
 
 namespace OpenShock::Serial {
-  typedef void (*CommandHandler)(std::string_view arg, bool isAutomated);
-
-  class CommandArgument {
-  public:
-    std::string_view name;
-    std::string_view constraint;
-    std::string_view exampleValue;
-    std::vector<std::string_view> constraintExtensions;
-  };
-
   class CommandEntry {
   public:
     CommandEntry(std::string_view description, CommandHandler commandHandler) noexcept;
     CommandEntry(std::string_view name, std::string_view description, CommandHandler commandHandler) noexcept;
 
     inline std::string_view name() const { return m_name; }
     inline std::string_view description() const { return m_description; }
     inline const std::vector<CommandArgument>& arguments() const { return m_arguments; }
-    inline CommandHandler commandHandler() { return m_commandHandler; }
+    inline CommandHandler commandHandler() const { return m_commandHandler; }
 
     CommandArgument& addArgument(std::string_view name, std::string_view constraint, std::string_view exampleValue, std::vector<std::string_view> constraintExtensions = {});
 
@@ -32,25 +25,4 @@
     std::vector<CommandArgument> m_arguments;
     CommandHandler m_commandHandler;
   };
-
-  class CommandGroup {
-  public:
-    CommandGroup() = default;
-    CommandGroup(std::string_view name);
-    CommandGroup(CommandGroup&& other)                 = default;
-    CommandGroup(const CommandGroup& other)            = default;
-    CommandGroup& operator=(CommandGroup&& other)      = default;
-    CommandGroup& operator=(const CommandGroup& other) = default;
-
-    inline std::string_view name() const { return m_name; }
-    inline std::vector<CommandEntry>& commands() { return m_commands; }
-    inline const std::vector<CommandEntry>& commands() const { return m_commands; }
-
-    CommandEntry& addCommand(std::string_view description, CommandHandler commandHandler);
-    CommandEntry& addCommand(std::string_view name, std::string_view description, CommandHandler commandHandler);
-
-  private:
-    std::string_view m_name;
-    std::vector<CommandEntry> m_commands;
-  };
 }  // namespace OpenShock::Serial

include/serial/command_handlers/CommandGroup.h

@@ -0,0 +1,29 @@
+#pragma once
+
+#include "CommandEntry.h"
+#include "CommandHandler.h"
+
+#include <string_view>
+#include <vector>
+
+namespace OpenShock::Serial {
+  class CommandGroup {
+  public:
+    CommandGroup() = default;
+    CommandGroup(std::string_view name);
+    CommandGroup(CommandGroup&& other)                 = default;
+    CommandGroup(const CommandGroup& other)            = default;
+    CommandGroup& operator=(CommandGroup&& other)      = default;
+    CommandGroup& operator=(const CommandGroup& other) = default;
+
+    constexpr std::string_view name() const { return m_name; }
+    const std::vector<CommandEntry>& commands() const { return m_commands; }
+
+    CommandEntry& addCommand(std::string_view description, CommandHandler commandHandler);
+    CommandEntry& addCommand(std::string_view name, std::string_view description, CommandHandler commandHandler);
+
+  private:
+    std::string_view m_name;
+    std::vector<CommandEntry> m_commands;
+  };
+}  // namespace OpenShock::Serial

include/serial/command_handlers/CommandHandler.h

@@ -0,0 +1,7 @@
+#pragma once
+
+#include <string_view>
+
+namespace OpenShock::Serial {
+  typedef void (*CommandHandler)(std::string_view arg, bool isAutomated);
+}  // namespace OpenShock::Serial

include/serial/command_handlers/index.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "serial/command_handlers/CommandEntry.h"
+#include "serial/command_handlers/CommandGroup.h"
 
 #include <vector>