Merge branch 'develop' into feat/arduino-3.0

Author: hhvrc

.clang-format

@@ -125,12 +125,9 @@ IndentWrappedFunctionNames: true
 InsertNewlineAtEOF: true
 InsertTrailingCommas: Wrapped
 IntegerLiteralSeparator:
-  Binary: 4
-  BinaryMinDigits: 9
-  Decimal: 3
-  DecimalMinDigits: 5
-  Hex: 2
-  HexMinDigits: 9
+  Binary: 0
+  Decimal: 0
+  Hex: 0
 KeepEmptyLinesAtEOF: false
 KeepEmptyLinesAtTheStartOfBlocks: false
 LambdaBodyIndentation: OuterScope

.github/workflows/cpp-linter.yml

@@ -3,9 +3,9 @@ name: cpp-linter
 on:
   pull_request:
     types: [opened, reopened, synchronize]
-    paths: ['**.c', '**.h', '**.cpp', '**.hpp', '.clang-format']
+    paths: ['**.c', '**.h', '**.cpp', '**.hpp', '.clang-format', '.github/workflows/cpp-linter.yml']
   push:
-    paths: ['**.c', '**.h', '**.cpp', '**.hpp', '.clang-format']
+    paths: ['**.c', '**.h', '**.cpp', '**.hpp', '.clang-format', '.github/workflows/cpp-linter.yml']
   workflow_dispatch: # Manually invoked by user.
 
 jobs:
@@ -37,10 +37,12 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           style: file
-          version: 18
-          lines-changed-only: diff
-          thread-comments: true
-          file-annotations: false
+          version: 21
+          ignore: |
+            .github
+            include/serialization/_fbs
+          thread-comments: update
+          no-lgtm: false
 
       - name: Fail fast?!
         if: steps.linter.outputs.checks-failed > 0

include/Checksum.h

@@ -50,15 +50,15 @@ namespace OpenShock::Checksum {
    */
   constexpr uint8_t ReverseNibble(uint8_t b)
   {
-    return (0xF7'B3'D5'91'E6'A2'C4'80 >> (b * 4)) & 0xF;  // Trust me bro
+    return (0xF7B3D591E6A2C480ull >> (b * 4)) & 0xF;  // Trust me bro
   }
 
   /**
    * Make sure the uint8 only has its high bits (0x0F) set before using this function
    */
   constexpr uint8_t ReverseInverseNibble(uint8_t b)
   {
-    return (0x08'4C'2A'6E'19'5D'3B'7F >> (b * 4)) & 0xF;  // Trust me bro
+    return (0x084C2A6E195D3B7Full >> (b * 4)) & 0xF;  // Trust me bro
   }
 }  // namespace OpenShock::Checksum
 

include/Common.h

@@ -45,17 +45,17 @@
   "Let it be known that Arduino hath finally been cast aside in favor of the noble ESP-IDF! I beseech thee, kind sir or madam, wouldst thou kindly partake in the honors of expunging 'arduino-esp32' from yonder useragent aloft, and in its stead, bestow the illustrious 'ESP-IDF'?"
 #endif
 
-#if __cplusplus >= 202'302L
+#if __cplusplus >= 202302L
 #warning "C++23 compiler detected"
-#elif __cplusplus >= 202'002L
+#elif __cplusplus >= 202002L
 // C++20 :3
-#elif __cplusplus >= 201'703L
+#elif __cplusplus >= 201703L
 #error "C++17 compiler detected, OpenShock requires a C++20 compliant compiler"
-#elif __cplusplus >= 201'402L
+#elif __cplusplus >= 201402L
 #error "C++14 compiler detected, OpenShock requires a C++20 compliant compiler"
-#elif __cplusplus >= 201'103L
+#elif __cplusplus >= 201103L
 #error "C++11 compiler detected, OpenShock requires a C++20 compliant compiler"
-#elif __cplusplus >= 199'711L
+#elif __cplusplus >= 199711L
 #error "C++98 compiler detected, OpenShock requires a C++20 compliant compiler"
 #elif __cplusplus == 1
 #error "Pre-C++98 compiler detected, OpenShock requires a C++20 compliant compiler"

include/serial/command_handlers/CommandEntry.h

@@ -16,8 +16,8 @@ namespace OpenShock::SerialCmds {
 
   class CommandEntry {
   public:
-    CommandEntry(std::string_view description, CommandHandler commandHandler);
-    CommandEntry(std::string_view name, std::string_view description, CommandHandler commandHandler);
+    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; }

requirements.txt

@@ -1,3 +1,3 @@
 platformio==6.1.19
 esptool==5.1.0
-cryptography==45.0.5
+cryptography==46.0.5

src/serial/command_handlers/CommandEntry.cpp

@@ -2,13 +2,13 @@
 
 using namespace OpenShock::SerialCmds;
 
-CommandEntry::CommandEntry(std::string_view description, CommandHandler commandHandler)
+CommandEntry::CommandEntry(std::string_view description, CommandHandler commandHandler) noexcept
   : m_description(description)
   , m_commandHandler(commandHandler)
 {
 }
 
-CommandEntry::CommandEntry(std::string_view name, std::string_view description, CommandHandler commandHandler)
+CommandEntry::CommandEntry(std::string_view name, std::string_view description, CommandHandler commandHandler) noexcept
   : m_name(name)
   , m_description(description)
   , m_commandHandler(commandHandler)

src/wifi/WiFiManager.cpp

@@ -86,15 +86,15 @@ std::vector<WiFiNetwork>::iterator _findNetwork(std::function<bool(WiFiNetwork&)
 }
 std::vector<WiFiNetwork>::iterator _findNetworkBySSID(const char* ssid, bool sortByAttractivity = true)
 {
-  return _findNetwork([ssid](const WiFiNetwork& net) { return strcmp(net.ssid, ssid) == 0; }, sortByAttractivity);
+  return _findNetwork([ssid](const WiFiNetwork& net) noexcept { return strcmp(net.ssid, ssid) == 0; }, sortByAttractivity);
 }
 std::vector<WiFiNetwork>::iterator _findNetworkByBSSID(const uint8_t (&bssid)[6])
 {
-  return _findNetwork([bssid](const WiFiNetwork& net) { return memcmp(net.bssid, bssid, sizeof(bssid)) == 0; }, false);
+  return _findNetwork([bssid](const WiFiNetwork& net) noexcept { return memcmp(net.bssid, bssid, sizeof(bssid)) == 0; }, false);
 }
 std::vector<WiFiNetwork>::iterator _findNetworkByCredentialsID(uint8_t credentialsID, bool sortByAttractivity = true)
 {
-  return _findNetwork([credentialsID](const WiFiNetwork& net) { return net.credentialsID == credentialsID; }, sortByAttractivity);
+  return _findNetwork([credentialsID](const WiFiNetwork& net) noexcept { return net.credentialsID == credentialsID; }, sortByAttractivity);
 }
 
 bool _markNetworkAsAttempted(const uint8_t (&bssid)[6])
@@ -564,7 +564,7 @@ bool WiFiManager::GetConnectedNetwork(OpenShock::WiFiNetwork& network)
     return false;
   }
 
-  auto it = _findNetwork([](const WiFiNetwork& net) { return net.credentialsID == s_connectedCredentialsID; });
+  auto it = _findNetwork([](const WiFiNetwork& net) noexcept { return net.credentialsID == s_connectedCredentialsID; });
   if (it == s_wifiNetworks.end()) {
     return false;
   }