Trying to solve repeated start/stop use events in short periods

Probably the user is keeping the card a little bit too long on the box, so I added a configuration settings with 2s default value to disable RFID readings.
fablab-bergamo · Aug 11, 2024 · b633f4d · b633f4d
1 parent e092868
commit b633f4d
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 11 deletions.
diff --git a/conf/conf.hpp b/conf/conf.hpp
@@ -70,6 +70,9 @@ namespace fabomatic
     /// @brief Minimum time to confirm by long tap maintenance
     static constexpr auto LONG_TAP_DURATION{10s};
 
+    /// @brief Disabled RFID reading after a successfull read for X seconds.
+    static constexpr auto DELAY_BETWEEN_SWEEPS{2s};
+
   } // namespace conf::machine
 
   /// @brief Debug settings

diff --git a/include/BaseRfidWrapper.hpp b/include/BaseRfidWrapper.hpp
@@ -21,6 +21,8 @@ namespace fabomatic
     virtual auto readCardSerial() const -> std::optional<card::uid_t> = 0;
     virtual auto selfTest() const -> bool = 0;
     virtual auto reset() const -> void = 0;
+
+    virtual auto setDisabledUntil(fabomatic::Tasks::time_point t) -> void = 0;
   };
 } // namespace fabomatic
 #endif // BASERFIDWRAPPER_HPP_
diff --git a/include/BoardLogic.hpp b/include/BoardLogic.hpp
@@ -95,7 +95,6 @@ namespace fabomatic
     FabBackend server;
     std::optional<std::reference_wrapper<BaseRFIDWrapper>> rfid{std::nullopt}; // Configured at runtime
     std::optional<std::reference_wrapper<LCDWrapper>> lcd{std::nullopt};       // Configured at runtime
-    bool ready_for_a_new_card{true};
     bool led_status{false};
 
     Machine machine;

diff --git a/include/RFIDWrapper.hpp b/include/RFIDWrapper.hpp
@@ -19,6 +19,7 @@ namespace fabomatic
   {
   private:
     std::unique_ptr<Driver> driver;
+    std::optional<fabomatic::Tasks::time_point> disabledUntil;
 
   public:
     RFIDWrapper();
@@ -46,14 +47,16 @@ namespace fabomatic
 
     [[nodiscard]] auto getUid() const -> card::uid_t override;
 
+    [[nodiscard]] auto setDisabledUntil(fabomatic::Tasks::time_point delay) -> void override;
+
     /// @brief Returns the driver object for testing/simulation
     Driver &getDriver();
 
     RFIDWrapper(const RFIDWrapper &) = delete;             // copy constructor
     RFIDWrapper &operator=(const RFIDWrapper &x) = delete; // copy assignment
     RFIDWrapper(RFIDWrapper &&) = delete;                  // move constructor
     RFIDWrapper &operator=(RFIDWrapper &&) = delete;       // move assignment
-    ~RFIDWrapper() override{};                             // Default destructor
+    ~RFIDWrapper() override {};                            // Default destructor
   };
 } // namespace fabomatic
 

diff --git a/src/BoardLogic.cpp b/src/BoardLogic.cpp
@@ -75,12 +75,6 @@ namespace fabomatic
   {
     ESP_LOGD(TAG, "New card present");
 
-    if (!ready_for_a_new_card)
-    {
-      return;
-    }
-    ready_for_a_new_card = false;
-
     if (machine.isFree())
     {
       // machine is free
@@ -557,12 +551,11 @@ namespace fabomatic
       if (result)
       {
         onNewCard(result.value());
+        rfid.setDisabledUntil(Tasks::arduinoNow() + conf::machine::DELAY_BETWEEN_SWEEPS);
       }
       return;
     }
 
-    // No new card present
-    ready_for_a_new_card = true;
     if (machine.isFree())
     {
       changeStatus(Status::MachineFree);

diff --git a/src/RFIDWrapper.tpp b/src/RFIDWrapper.tpp
@@ -12,7 +12,7 @@ namespace fabomatic
 {
   /// @brief Constructor
   template <typename Driver>
-  RFIDWrapper<Driver>::RFIDWrapper() : driver{std::make_unique<Driver>()} {};
+  RFIDWrapper<Driver>::RFIDWrapper() : driver{std::make_unique<Driver>()}, disabledUntil{std::nullopt} {};
 
   /// @brief indicates if a new card is present in the RFID chip antenna area
   /// @return true if a new card is present
@@ -24,15 +24,34 @@ namespace fabomatic
     if (conf::debug::ENABLE_LOGS && result)
       ESP_LOGD(TAG, "isNewCardPresent=%d", result);
 
+    if (disabledUntil && disabledUntil > fabomatic::Tasks::arduinoNow())
+    {
+      ESP_LOGD(TAG, "isNewCardPresent is disabled");
+      return false;
+    }
+
     return result;
   }
 
+  template <typename Driver>
+  [[nodiscard]] auto RFIDWrapper<Driver>::setDisabledUntil(fabomatic::Tasks::time_point delay) -> void
+  {
+    this->disabledUntil = delay;
+  }
+
   /// @brief tries to read the card serial number
   /// @return true if successfull, result can be read with getUid()
   template <typename Driver>
   auto RFIDWrapper<Driver>::readCardSerial() const -> std::optional<card::uid_t>
   {
     const auto &result = driver->PICC_ReadCardSerial();
+
+    if (disabledUntil && disabledUntil > fabomatic::Tasks::arduinoNow())
+    {
+      ESP_LOGD(TAG, "readCardSerial is disabled");
+      return std::nullopt;
+    }
+
     if (result)
     {
       return getUid();