fixup! changing namespace for timedAttempt to avoid conflicts with time()

Author: andreagilardoni

src/time/TimedAttempt.cpp

@@ -12,67 +12,63 @@
 #include <Arduino.h>
 #include "TimedAttempt.h"
 
-namespace arduino { namespace tattempt {
-
-    TimedAttempt::TimedAttempt(unsigned long minDelay, unsigned long maxDelay)
-    : _minDelay(minDelay)
-    , _maxDelay(maxDelay) {
-    }
-
-    void TimedAttempt::begin(unsigned long delay) {
-        _retryCount = 0;
-        _retryDelay = 0;
-        _retryTick = 0;
-        _minDelay = delay;
-        _maxDelay = delay;
-    }
-
-    void TimedAttempt::begin(unsigned long minDelay, unsigned long maxDelay) {
-        _retryCount = 0;
-        _retryDelay = 0;
-        _retryTick = 0;
-        _minDelay = minDelay;
-        _maxDelay = maxDelay;
-    }
-
-    unsigned long TimedAttempt::reconfigure(unsigned long minDelay, unsigned long maxDelay) {
-        _minDelay = minDelay;
-        _maxDelay = maxDelay;
-        return reload();
-    }
-
-    unsigned long TimedAttempt::retry() {
-        _retryCount++;
-        return reload();
-    }
-
-    unsigned long TimedAttempt::reload() {
-        unsigned long shift = _retryCount > 31 ? 31 : _retryCount;
-        unsigned long delay = (1UL << shift) * _minDelay;
-        /* delay should always increase */
-        _retryDelay =  (delay > _retryDelay) ? min(delay, _maxDelay): _maxDelay;
-        _retryTick = millis();
-        return _retryDelay;
-    }
-
-    void TimedAttempt::reset() {
-        _retryCount = 0;
-    }
-
-    bool TimedAttempt::isRetry() {
-        return _retryCount > 0;
-    }
-
-    bool TimedAttempt::isExpired() {
-        return millis() - _retryTick > _retryDelay;
-    }
-
-    unsigned int TimedAttempt::getRetryCount() {
-        return _retryCount;
-    }
-
-    unsigned int TimedAttempt::getWaitTime() {
-        return _retryDelay;
-    }
-
-}}  // arduino::tattempt
+TimedAttempt::TimedAttempt(unsigned long minDelay, unsigned long maxDelay)
+: _minDelay(minDelay)
+, _maxDelay(maxDelay) {
+}
+
+void TimedAttempt::begin(unsigned long delay) {
+    _retryCount = 0;
+    _retryDelay = 0;
+    _retryTick = 0;
+    _minDelay = delay;
+    _maxDelay = delay;
+}
+
+void TimedAttempt::begin(unsigned long minDelay, unsigned long maxDelay) {
+    _retryCount = 0;
+    _retryDelay = 0;
+    _retryTick = 0;
+    _minDelay = minDelay;
+    _maxDelay = maxDelay;
+}
+
+unsigned long TimedAttempt::reconfigure(unsigned long minDelay, unsigned long maxDelay) {
+    _minDelay = minDelay;
+    _maxDelay = maxDelay;
+    return reload();
+}
+
+unsigned long TimedAttempt::retry() {
+    _retryCount++;
+    return reload();
+}
+
+unsigned long TimedAttempt::reload() {
+    unsigned long shift = _retryCount > 31 ? 31 : _retryCount;
+    unsigned long delay = (1UL << shift) * _minDelay;
+    /* delay should always increase */
+    _retryDelay =  (delay > _retryDelay) ? min(delay, _maxDelay): _maxDelay;
+    _retryTick = millis();
+    return _retryDelay;
+}
+
+void TimedAttempt::reset() {
+    _retryCount = 0;
+}
+
+bool TimedAttempt::isRetry() {
+    return _retryCount > 0;
+}
+
+bool TimedAttempt::isExpired() {
+    return millis() - _retryTick > _retryDelay;
+}
+
+unsigned int TimedAttempt::getRetryCount() {
+    return _retryCount;
+}
+
+unsigned int TimedAttempt::getWaitTime() {
+    return _retryDelay;
+}

src/time/TimedAttempt.h

@@ -10,91 +10,87 @@
 
 #pragma once
 
-namespace arduino { namespace tattempt {
+/**
+    * The TimedAttempt class manages retry attempts with configurable delays.
+    * It allows setting minimum and maximum delays, and provides methods to
+    * begin, retry, reset, and check the status of attempts.
+    */
+class TimedAttempt {
+
+public:
+    /**
+    * Constructor to initialize TimedAttempt with minimum and maximum delay
+    * @param minDelay: minimum delay between attempts
+    * @param maxDelay: maximum delay between attempts
+    */
+    TimedAttempt(unsigned long minDelay, unsigned long maxDelay);
+
+    /**
+    * Begin the attempt with a fixed delay
+    * @param delay: fixed delay between attempts
+    */
+    void begin(unsigned long delay);
+
+    /**
+    * Begin the attempt with a range of delays
+    * @param minDelay: minimum delay between attempts
+    * @param maxDelay: maximum delay between attempts
+    */
+    void begin(unsigned long minDelay, unsigned long maxDelay);
+
+    /**
+    * Reconfigure the attempt with new minimum and maximum delays and reload
+    * @param minDelay: new minimum delay between attempts
+    * @param maxDelay: new maximum delay between attempts
+    * @return the new delay after reconfiguration
+    */
+    unsigned long reconfigure(unsigned long minDelay, unsigned long maxDelay);
+
+    /**
+    * Retry the attempt, incrementing the retry count and reloading the delay
+    * @return the new delay after retry
+    */
+    unsigned long retry();
+
+    /**
+    * Reload the delay based on the retry count and return the new delay
+    * @return the new delay after reload
+    */
+    unsigned long reload();
+
+    /**
+    * Reset the retry count to zero
+    */
+    void reset();
+
+    /**
+    * Check if a retry has been attempted
+    * @return true if a retry has been attempted, false otherwise
+    */
+    bool isRetry();
+
+    /**
+    * Check if the current attempt has expired based on the delay
+    * @return true if the current attempt has expired, false otherwise
+    */
+    bool isExpired();
+
+    /**
+    * Get the current retry count
+    * @return the current retry count
+    */
+    unsigned int getRetryCount();
 
     /**
-     * The TimedAttempt class manages retry attempts with configurable delays.
-     * It allows setting minimum and maximum delays, and provides methods to
-     * begin, retry, reset, and check the status of attempts.
-     */
-    class TimedAttempt {
-
-    public:
-        /**
-        * Constructor to initialize TimedAttempt with minimum and maximum delay
-        * @param minDelay: minimum delay between attempts
-        * @param maxDelay: maximum delay between attempts
-        */
-        TimedAttempt(unsigned long minDelay, unsigned long maxDelay);
-
-        /**
-        * Begin the attempt with a fixed delay
-        * @param delay: fixed delay between attempts
-        */
-        void begin(unsigned long delay);
-
-        /**
-        * Begin the attempt with a range of delays
-        * @param minDelay: minimum delay between attempts
-        * @param maxDelay: maximum delay between attempts
-        */
-        void begin(unsigned long minDelay, unsigned long maxDelay);
-
-        /**
-        * Reconfigure the attempt with new minimum and maximum delays and reload
-        * @param minDelay: new minimum delay between attempts
-        * @param maxDelay: new maximum delay between attempts
-        * @return the new delay after reconfiguration
-        */
-        unsigned long reconfigure(unsigned long minDelay, unsigned long maxDelay);
-
-        /**
-        * Retry the attempt, incrementing the retry count and reloading the delay
-        * @return the new delay after retry
-        */
-        unsigned long retry();
-
-        /**
-        * Reload the delay based on the retry count and return the new delay
-        * @return the new delay after reload
-        */
-        unsigned long reload();
-
-        /**
-        * Reset the retry count to zero
-        */
-        void reset();
-
-        /**
-        * Check if a retry has been attempted
-        * @return true if a retry has been attempted, false otherwise
-        */
-        bool isRetry();
-
-        /**
-        * Check if the current attempt has expired based on the delay
-        * @return true if the current attempt has expired, false otherwise
-        */
-        bool isExpired();
-
-        /**
-        * Get the current retry count
-        * @return the current retry count
-        */
-        unsigned int getRetryCount();
-
-        /**
-        * Get the current wait time for the next retry
-        * @return the current wait time for the next retry
-        */
-        unsigned int getWaitTime();
-
-    private:
-        unsigned long _minDelay;
-        unsigned long _maxDelay;
-        unsigned long _retryTick;
-        unsigned long _retryDelay;
-        unsigned int _retryCount;
-    };
-
-}}  // arduino::tattempt
+    * Get the current wait time for the next retry
+    * @return the current wait time for the next retry
+    */
+    unsigned int getWaitTime();
+
+private:
+    unsigned long _minDelay;
+    unsigned long _maxDelay;
+    unsigned long _retryTick;
+    unsigned long _retryDelay;
+    unsigned int _retryCount;
+};