Merge pull request #26 from andreagilardoni/ns-fixes

removing namespaces that may cause name clashes

Author: andreagilardoni

extras/test/src/time/test_TimedAttempt.cpp

@@ -14,8 +14,6 @@
 #include <Arduino.h>
 #include <limits.h>
 
-using namespace arduino::tattempt;
-
 SCENARIO("Test broker connection retries") {
   TimedAttempt _connection_attempt(0,0);
 

src/Arduino_HEX.h

@@ -10,5 +10,5 @@
 #pragma once
 
 #include "./hex/hex.h"
+
 using namespace arduino;
-using namespace hex;

src/Arduino_SHA256.h

@@ -10,5 +10,3 @@
 #pragma once
 
 #include "./sha256/SHA256.h"
-using namespace arduino;
-using namespace sha256;

src/Arduino_TimedAttempt.h

@@ -10,5 +10,3 @@
 #pragma once
 
 #include "./time/TimedAttempt.h"
-
-using namespace arduino::tattempt;

src/hex/hex.h

@@ -22,21 +22,19 @@ namespace arduino { namespace hex {
     String encodeUpper(const uint8_t* in, uint32_t size);
 
     bool decode(const String in, uint8_t* out, uint32_t size);
+}} // arduino::hex
 
-    class THEXT {
-
-    public:
-        static inline String encode(const uint8_t* in, uint32_t size) {
-            return arduino::hex::encode(in, size);
-        }
-        static inline String encodeUpper(const uint8_t* in, uint32_t size) {
-            return arduino::hex::encodeUpper(in, size);
-        }
-
-        static inline bool decode(const String in, uint8_t* out, uint32_t size) {
-            return arduino::hex::decode(in, out, size);
-        }
+class THEXT {
+public:
+    static inline String encode(const uint8_t* in, uint32_t size) {
+        return arduino::hex::encode(in, size);
+    }
+    static inline String encodeUpper(const uint8_t* in, uint32_t size) {
+        return arduino::hex::encodeUpper(in, size);
+    }
 
-    };
+    static inline bool decode(const String in, uint8_t* out, uint32_t size) {
+        return arduino::hex::decode(in, out, size);
+    }
 
-}} // arduino::hex
+};

src/sha256/SHA256.h

@@ -27,27 +27,27 @@ namespace arduino { namespace sha256 {
         ::acu_sha256(input, ilen, output);
     }
 
-    class SHA256 {
-    public:
+}} // arduino::sha256
 
-        static constexpr uint32_t HASH_SIZE = SHA256_DIGEST_SIZE;
+class SHA256 {
+public:
 
-        inline void begin() {
-            return arduino::sha256::begin(&_ctx);
-        }
-        inline void update(uint8_t const * data, uint32_t const len) {
-            return arduino::sha256::update(&_ctx, data, len);
-        }
-        inline void finalize(uint8_t * hash) {
-            return arduino::sha256::finalize(&_ctx, hash);
-        }
-        static inline void sha256(uint8_t const * data, uint32_t const len, uint8_t * hash) {
-            return arduino::sha256::sha256(data, len, hash);
-        }
+    static constexpr uint32_t HASH_SIZE = SHA256_DIGEST_SIZE;
 
-    private:
+    inline void begin() {
+        return arduino::sha256::begin(&_ctx);
+    }
+    inline void update(uint8_t const * data, uint32_t const len) {
+        return arduino::sha256::update(&_ctx, data, len);
+    }
+    inline void finalize(uint8_t * hash) {
+        return arduino::sha256::finalize(&_ctx, hash);
+    }
+    static inline void sha256(uint8_t const * data, uint32_t const len, uint8_t * hash) {
+        return arduino::sha256::sha256(data, len, hash);
+    }
 
-        acu_sha256_ctx _ctx;
-    };
+private:
 
-}} // arduino::sha256
+    acu_sha256_ctx _ctx;
+};

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;
+}