More fixes

Author: hhvrc

include/Checksum.h

@@ -1,23 +1,16 @@
 #pragma once
 
+#include <bit>
+#include <concepts>
+#include <cstddef>
 #include <cstdint>
 #include <memory>
 
-#if __cplusplus >= 202'002L
-// #error Take into use C++20 std::integral instead of this macro logic
-#endif
-
-#define SUM8_INT_FN(Type)                                       \
-  constexpr uint8_t Sum8(Type data)                             \
-  {                                                             \
-    uint8_t result = 0;                                         \
-    for (int i = 0; i < sizeof(Type); ++i) {                    \
-      result += static_cast<uint8_t>((data >> (i * 8)) & 0xFF); \
-    }                                                           \
-    return result;                                              \
-  }
-
 namespace OpenShock::Checksum {
+
+  // ------------------------------------------------------------
+  // Raw byte span checksum
+  // ------------------------------------------------------------
   constexpr uint8_t Sum8(const uint8_t* data, std::size_t size)
   {
     uint8_t checksum = 0;
@@ -26,19 +19,32 @@ namespace OpenShock::Checksum {
     }
     return checksum;
   }
+
+  // ------------------------------------------------------------
+  // Generic integral overload (C++20 concepts)
+  // ------------------------------------------------------------
+  template<std::integral T>
+  constexpr uint8_t Sum8(T value)
+  {
+    uint8_t result = 0;
+
+    for (std::size_t i = 0; i < sizeof(T); ++i) {
+      result += static_cast<uint8_t>((value >> (i * 8)) & 0xFF);
+    }
+
+    return result;
+  }
+
+  // ------------------------------------------------------------
+  // Generic trivially copyable object overload
+  // ------------------------------------------------------------
   template<typename T>
+    requires(!std::integral<T> && std::is_trivially_copyable_v<T>)
   constexpr uint8_t Sum8(const T& data)
   {
     return Sum8(reinterpret_cast<const uint8_t*>(std::addressof(data)), sizeof(T));
   }
 
-  SUM8_INT_FN(int16_t)
-  SUM8_INT_FN(uint16_t)
-  SUM8_INT_FN(int32_t)
-  SUM8_INT_FN(uint32_t)
-  SUM8_INT_FN(int64_t)
-  SUM8_INT_FN(uint64_t)
-
   /**
    * Make sure the uint8 only has its high bits (0x0F) set before using this function
    */

include/wifi/WiFiManager.h

@@ -59,11 +59,6 @@ namespace OpenShock::WiFiManager {
   /// @return True if the hub is connected to a network
   bool GetIPAddress(char* ipAddress);
 
-  // /// @brief Gets the hubs IP address if it's connected to a network (IPv6)
-  // /// @param ipAddress Variable to store the IP address in
-  // /// @return True if the hub is connected to a network
-  // bool GetIPv6Address(char* ipAddress);
-
   /// @brief Gets a copy of the vector of discovered WiFi networks
   /// @return Vector of discovered WiFiNetworks
   std::vector<WiFiNetwork> GetDiscoveredWiFiNetworks();

src/serial/command_handlers/authtoken.cpp

@@ -36,9 +36,9 @@ void _handleAuthtokenCommand(std::string_view arg, bool isAutomated)
   }
 }
 
-OpenShock::Serial::CommandGroup OpenShock::Serial::CommandHandlers::AuthTokenHandler()
+OpenShock::SerialCmds::CommandGroup OpenShock::SerialCmds::CommandHandlers::AuthTokenHandler()
 {
-  auto group = OpenShock::Serial::CommandGroup("authtoken"sv);
+  auto group = OpenShock::SerialCmds::CommandGroup("authtoken"sv);
 
   auto& getCommand = group.addCommand("Get the backend auth token"sv, _handleAuthtokenCommand);
 

src/serial/command_handlers/domain.cpp

@@ -63,9 +63,9 @@ void _handleDomainCommand(std::string_view arg, bool isAutomated)
   esp_restart();
 }
 
-OpenShock::Serial::CommandGroup OpenShock::Serial::CommandHandlers::DomainHandler()
+OpenShock::SerialCmds::CommandGroup OpenShock::SerialCmds::CommandHandlers::DomainHandler()
 {
-  auto group = OpenShock::Serial::CommandGroup("domain"sv);
+  auto group = OpenShock::SerialCmds::CommandGroup("domain"sv);
 
   auto& getCommand = group.addCommand("Get the backend domain."sv, _handleDomainCommand);
 

src/serial/command_handlers/echo.cpp

@@ -30,9 +30,9 @@ void _handleSerialEchoCommand(std::string_view arg, bool isAutomated)
   }
 }
 
-OpenShock::Serial::CommandGroup OpenShock::Serial::CommandHandlers::EchoHandler()
+OpenShock::SerialCmds::CommandGroup OpenShock::SerialCmds::CommandHandlers::EchoHandler()
 {
-  auto group = OpenShock::Serial::CommandGroup("echo"sv);
+  auto group = OpenShock::SerialCmds::CommandGroup("echo"sv);
 
   auto& getCommand = group.addCommand("Get the serial echo status"sv, _handleSerialEchoCommand);
 

src/serial/command_handlers/hostname.cpp

@@ -30,9 +30,9 @@ void _handleHostnameCommand(std::string_view arg, bool isAutomated)
   }
 }
 
-OpenShock::Serial::CommandGroup OpenShock::Serial::CommandHandlers::HostnameHandler()
+OpenShock::SerialCmds::CommandGroup OpenShock::SerialCmds::CommandHandlers::HostnameHandler()
 {
-  auto group = OpenShock::Serial::CommandGroup("hostname"sv);
+  auto group = OpenShock::SerialCmds::CommandGroup("hostname"sv);
 
   auto& getCommand = group.addCommand("Get the network hostname."sv, _handleHostnameCommand);
 

src/serial/command_handlers/jsonconfig.cpp

@@ -24,9 +24,9 @@ void _handleJsonConfigCommand(std::string_view arg, bool isAutomated)
   esp_restart();
 }
 
-OpenShock::Serial::CommandGroup OpenShock::Serial::CommandHandlers::JsonConfigHandler()
+OpenShock::SerialCmds::CommandGroup OpenShock::SerialCmds::CommandHandlers::JsonConfigHandler()
 {
-  auto group = OpenShock::Serial::CommandGroup("jsonconfig"sv);
+  auto group = OpenShock::SerialCmds::CommandGroup("jsonconfig"sv);
 
   auto& getCommand = group.addCommand("Get the configuration as JSON"sv, _handleJsonConfigCommand);
 

src/serial/command_handlers/keepalive.cpp

@@ -34,9 +34,9 @@ void _handleKeepAliveCommand(std::string_view arg, bool isAutomated)
   }
 }
 
-OpenShock::Serial::CommandGroup OpenShock::Serial::CommandHandlers::KeepAliveHandler()
+OpenShock::SerialCmds::CommandGroup OpenShock::SerialCmds::CommandHandlers::KeepAliveHandler()
 {
-  auto group = OpenShock::Serial::CommandGroup("keepalive"sv);
+  auto group = OpenShock::SerialCmds::CommandGroup("keepalive"sv);
 
   auto& getCommand = group.addCommand("Get the shocker keep-alive status"sv, _handleKeepAliveCommand);
 

src/serial/command_handlers/rawconfig.cpp

@@ -45,9 +45,9 @@ void _handleRawConfigCommand(std::string_view arg, bool isAutomated)
   esp_restart();
 }
 
-OpenShock::Serial::CommandGroup OpenShock::Serial::CommandHandlers::RawConfigHandler()
+OpenShock::SerialCmds::CommandGroup OpenShock::SerialCmds::CommandHandlers::RawConfigHandler()
 {
-  auto group = OpenShock::Serial::CommandGroup("rawconfig"sv);
+  auto group = OpenShock::SerialCmds::CommandGroup("rawconfig"sv);
 
   auto& getCommand = group.addCommand("Get the raw binary config"sv, _handleRawConfigCommand);
 

src/serial/command_handlers/restart.cpp

@@ -11,9 +11,9 @@ void _handleRestartCommand(std::string_view arg, bool isAutomated)
   esp_restart();
 }
 
-OpenShock::Serial::CommandGroup OpenShock::Serial::CommandHandlers::RestartHandler()
+OpenShock::SerialCmds::CommandGroup OpenShock::SerialCmds::CommandHandlers::RestartHandler()
 {
-  auto group = OpenShock::Serial::CommandGroup("restart"sv);
+  auto group = OpenShock::SerialCmds::CommandGroup("restart"sv);
 
   auto& cmd = group.addCommand("Restart the board"sv, _handleRestartCommand);