Linter fixes

include/Mrfc522Driver.hpp

@@ -3,6 +3,7 @@
 
 #include "Arduino.h"
 #include <memory>
+#include <array>
 
 #include "FabUser.hpp"
 #include "MFRC522Debug.h"
@@ -24,9 +25,9 @@ namespace fablabbg
   public:
     struct UidDriver
     {
-      byte size; // Number of bytes in the UID. 4, 7 or 10.
-      byte uidByte[10];
-      byte sak; // The SAK (Select acknowledge) byte returned from the PICC after successful selection.
+      byte size;                       // Number of bytes in the UID. 4, 7 or 10.
+      std::array<byte, 10> uidByte{0}; // The UID (Unique Identifier) of the PICC.
+      byte sak;                        // The SAK (Select acknowledge) byte returned from the PICC after successful selection.
     };
 
     Mrfc522Driver();

include/RFIDWrapper.hpp

@@ -51,7 +51,7 @@ namespace fablabbg
     RFIDWrapper &operator=(const RFIDWrapper &x) = delete; // copy assignment
     RFIDWrapper(RFIDWrapper &&) = delete;                  // move constructor
     RFIDWrapper &operator=(RFIDWrapper &&) = delete;       // move assignment
-    ~RFIDWrapper() = default;                              // Default destructor
+    ~RFIDWrapper() override{};                             // Default destructor
   };
 } // namespace fablabbg
 

include/Tasks.hpp

@@ -105,9 +105,6 @@ namespace fablabbg::Tasks
   class Scheduler
   {
   public:
-    Scheduler() : tasks{} {};
-    ~Scheduler() = default;
-
     auto addTask(Task &task) -> void;
     auto removeTask(const Task &task) -> void;
 

include/WhiteList.hpp

@@ -14,7 +14,7 @@ namespace fablabbg
   namespace conf::cards
   {
     static constexpr auto LEN = 10U; /* Number of whitelisted cards */
-  }
+  } // namespace conf::cards
 
   using WhiteListEntry = std::tuple<card::uid_t, FabUser::UserLevel, std::string_view>;
   using WhiteList = std::array<WhiteListEntry, conf::cards::LEN>;
@@ -47,6 +47,6 @@ namespace fablabbg
 
     return sorted1 == sorted2;
   }
-}
+} // namespace fablabbg
 
 #endif // WHITELIST_HPP

include/card.hpp

@@ -12,7 +12,7 @@ namespace fablabbg::card
 {
   using uid_t = u_int64_t;
   static constexpr uid_t INVALID = 0ULL;
-  
+
   /// @brief Returns a string representation of the UID
   /// @param uid number to convert
   /// @return an hex string representation of the UID (e.g. "123456ADCD")
@@ -42,6 +42,19 @@ namespace fablabbg::card
     return result;
   }
 
+  /// @brief Converts a UID from an array of bytes to a number
+  /// @param uid array of bytes
+  /// @return the UID as a number
+  [[nodiscard]] constexpr inline auto to_array(const uid_t uid) -> std::array<uint8_t, conf::rfid_tags::UID_BYTE_LEN>
+  {
+    std::array<uint8_t, conf::rfid_tags::UID_BYTE_LEN> retVal{0};
+    for (auto i = (conf::rfid_tags::UID_BYTE_LEN - 1); i >= 0; i--)
+    {
+      retVal[i] = (uid >> (i * 8)) & 0xFF;
+    }
+    return retVal;
+  }
+
   inline void print(uint64_t uid)
   {
     ESP_LOGI(TAG, "Card UID = %s", card::uid_str(uid).c_str());

include/mock/MockMrfc522.hpp

@@ -2,6 +2,8 @@
 #define MOCK_MOCKMRFC522_HPP_
 
 #include "Arduino.h"
+
+#include <array>
 #include <memory>
 #include <optional>
 
@@ -22,9 +24,9 @@ namespace fablabbg
   public:
     struct UidDriver
     {
-      byte size; // Number of bytes in the UID. 4, 7 or 10.
-      byte uidByte[10];
-      byte sak; // The SAK (Select acknowledge) byte returned from the PICC after successful selection.
+      byte size{4}; // Number of bytes in the UID. 4, 7 or 10.
+      std::array<byte, 10> uidByte{0};
+      byte sak{0}; // The SAK (Select acknowledge) byte returned from the PICC after successful selection.
     };
 
     constexpr MockMrfc522(){};

src/Mrfc522Driver.cpp

@@ -1,4 +1,5 @@
 #include "Arduino.h"
+#include <algorithm>
 #include <memory>
 
 #include "MFRC522DriverPinSimple.h"
@@ -57,11 +58,10 @@ namespace fablabbg
 
   bool Mrfc522Driver::PCD_PerformSelfTest() { return mfrc522->PCD_PerformSelfTest(); }
 
-  Mrfc522Driver::UidDriver Mrfc522Driver::getDriverUid() const
+  auto Mrfc522Driver::getDriverUid() const -> UidDriver
   {
     UidDriver retVal{};
-    memset(&retVal, 0, sizeof(retVal));
-    memcpy(retVal.uidByte, mfrc522->uid.uidByte, sizeof(retVal.uidByte));
+    std::copy(mfrc522->uid.uidByte, mfrc522->uid.uidByte + 10, retVal.uidByte.begin());
     retVal.size = mfrc522->uid.size;
     retVal.sak = mfrc522->uid.sak;
     return retVal;

src/RFIDWrapper.tpp

@@ -1,3 +1,4 @@
+#include <algorithm>
 #include <memory>
 
 #include "Logging.hpp"
@@ -94,11 +95,9 @@ namespace fablabbg
   {
     std::array<uint8_t, conf::rfid_tags::UID_BYTE_LEN> arr{0};
     auto const &uid = driver->getDriverUid();
-    memcpy(arr.data(), uid.uidByte, std::min(conf::rfid_tags::UID_BYTE_LEN, uid.size));
-
-    auto c = card::from_array(arr);
-
-    return c;
+    size_t size = std::min(uid.size, conf::rfid_tags::UID_BYTE_LEN);
+    std::copy(uid.uidByte.cbegin(), uid.uidByte.cbegin() + size, arr.begin());
+    return card::from_array(arr);
   }
 
   /// @brief Initializes RFID chip including self test

src/Tasks.cpp

@@ -81,7 +81,7 @@ namespace fablabbg::Tasks
   auto Scheduler::execute() const -> void
   {
     // Tasks shall be run in order of expiration (the most expired task shall run first)
-    std::vector<decltype(tasks)::const_iterator> iters{0};
+    std::vector<decltype(tasks)::const_iterator> iters;
     for (auto it = tasks.begin(); it != tasks.end(); ++it)
     {
       iters.push_back(it); // Vector of iterators

src/mock/MockMrfc522.cpp

@@ -1,15 +1,17 @@
 #include "mock/MockMrfc522.hpp"
 
+#include <algorithm>
+
 namespace fablabbg
 {
   auto MockMrfc522::getDriverUid() const -> MockMrfc522::UidDriver
   {
     UidDriver retVal{};
-    memset(&retVal, 0, sizeof(retVal));
-    if (getSimulatedUid().has_value())
+    if (auto sim = getSimulatedUid(); sim.has_value())
     {
-      memcpy(retVal.uidByte, &uid.value(), sizeof(uid.value()));
       retVal.size = sizeof(uid.value());
+      auto uid = card::to_array(sim.value());
+      std::copy(uid.begin(), uid.end(), retVal.uidByte.begin());
       retVal.sak = 1;
     }
     return retVal;