Merge pull request #311 from pennam/remove_avr

Remove __AVR__ compile options to improve code clarity
arduino-libraries · Oct 9, 2023 · 6a9acc2 · 6a9acc2
2 parents 8e654f9 + 8373e90
commit 6a9acc2
Show file tree

Hide file tree

Showing 13 changed files with 2 additions and 304 deletions.
diff --git a/src/ArduinoIoTCloudTCP.cpp b/src/ArduinoIoTCloudTCP.cpp
@@ -132,16 +132,7 @@ int ArduinoIoTCloudTCP::begin(bool const enable_watchdog, String brokerAddress,
   _brokerAddress = brokerAddress;
   _brokerPort = brokerPort;
 
-#if defined(__AVR__)
-  String const nina_fw_version = WiFi.firmwareVersion();
-  if (nina_fw_version < "1.4.2")
-  {
-    DEBUG_ERROR("ArduinoIoTCloudTCP::%s NINA firmware needs to be >= 1.4.2 to support cloud on Uno WiFi Rev. 2, current %s", __FUNCTION__, nina_fw_version.c_str());
-    return 0;
-  }
-#endif /* AVR */
-
-#if OTA_ENABLED && !defined(__AVR__)
+#if OTA_ENABLED
   _ota_img_sha256 = OTA::getImageSHA256();
   DEBUG_VERBOSE("SHA256: HASH(%d) = %s", strlen(_ota_img_sha256.c_str()), _ota_img_sha256.c_str());
 #endif /* OTA_ENABLED */
@@ -483,18 +474,14 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_SubscribeThingTopics()
   if (!_mqttClient.subscribe(_dataTopicIn))
   {
     DEBUG_ERROR("ArduinoIoTCloudTCP::%s could not subscribe to %s", __FUNCTION__, _dataTopicIn.c_str());
-#if !defined(__AVR__)
     DEBUG_ERROR("Check your thing configuration, and press the reset button on your board.");
-#endif
     return State::SubscribeThingTopics;
   }
 
   if (!_mqttClient.subscribe(_shadowTopicIn))
   {
     DEBUG_ERROR("ArduinoIoTCloudTCP::%s could not subscribe to %s", __FUNCTION__, _shadowTopicIn.c_str());
-#if !defined(__AVR__)
     DEBUG_ERROR("Check your thing configuration, and press the reset button on your board.");
-#endif
     return State::SubscribeThingTopics;
   }
 

diff --git a/src/cbor/CBORDecoder.h b/src/cbor/CBORDecoder.h
@@ -24,10 +24,6 @@
 
 #include <Arduino.h>
 
-#ifdef __AVR__
-# include <Arduino_AVRSTL.h>
-#endif
-
 #undef max
 #undef min
 #include <list>

diff --git a/src/cbor/CBOREncoder.h b/src/cbor/CBOREncoder.h
@@ -24,10 +24,6 @@
 
 #include <Arduino.h>
 
-#ifdef __AVR__
-# include <Arduino_AVRSTL.h>
-#endif
-
 #undef max
 #undef min
 #include <list>

diff --git a/src/cbor/lib/tinycbor/src/cbor.h b/src/cbor/lib/tinycbor/src/cbor.h
@@ -25,11 +25,6 @@
 #ifndef CBOR_H
 #define CBOR_H
 
-#ifdef __AVR__
-#define FP_NAN          NAN
-#define FP_INFINITE     INFINITY
-#endif
-
 #ifndef assert
 #include <assert.h>
 #endif

diff --git a/src/cbor/lib/tinycbor/src/cborpretty.c b/src/cbor/lib/tinycbor/src/cborpretty.c
@@ -28,8 +28,6 @@
 #  define __STDC_LIMIT_MACROS 1
 #endif
 
-#ifndef __AVR__
-
 #include "cbor.h"
 #include "cborinternal_p.h"
 #include "compilersupport_p.h"
@@ -582,6 +580,4 @@ CborError cbor_value_to_pretty_stream(CborStreamFunction streamFunction, void *t
 
 #pragma GCC diagnostic pop
 
-#endif // __AVR__
-
 /** @} */
diff --git a/src/cbor/lib/tinycbor/src/cbortojson.c b/src/cbor/lib/tinycbor/src/cbortojson.c
@@ -30,8 +30,6 @@
 #  define __STDC_LIMIT_MACROS 1
 #endif
 
-#ifndef __AVR__
-
 #include "cbor.h"
 #include "cborjson.h"
 #include "cborinternal_p.h"
@@ -703,6 +701,4 @@ CborError cbor_value_to_json_advance(FILE *out, CborValue *value, int flags)
 
 #pragma GCC diagnostic pop
 
-#endif // __AVR__
-
 /** @} */
diff --git a/src/cbor/lib/tinycbor/src/open_memstream.c b/src/cbor/lib/tinycbor/src/open_memstream.c
@@ -34,10 +34,6 @@
 
 #include <unistd.h>
 
-#ifdef __AVR__
-typedef size_t ssize_t;
-#endif
-
 typedef ssize_t RetType;
 typedef size_t LenType;
 

diff --git a/src/nonstd/nonstd.h b/src/nonstd/nonstd.h
diff --git a/src/property/Property.cpp b/src/property/Property.cpp
@@ -226,11 +226,7 @@ CborError Property::appendAttribute(String value, String attributeName, CborEnco
   }, encoder);
 }
 
-#ifdef __AVR__
-CborError Property::appendAttributeName(String attributeName, nonstd::function<CborError (CborEncoder& mapEncoder)>appendValue, CborEncoder *encoder)
-#else
 CborError Property::appendAttributeName(String attributeName, std::function<CborError (CborEncoder& mapEncoder)>appendValue, CborEncoder *encoder)
-#endif
 {
   if (attributeName != "") {
     // when the attribute name string is not empty, the attribute identifier is incremented in order to be encoded in the message if the _lightPayload flag is set
@@ -319,11 +315,7 @@ void Property::setAttribute(String& value, String attributeName) {
   });
 }
 
-#ifdef __AVR__
-void Property::setAttribute(String attributeName, nonstd::function<void (CborMapData & md)>setValue)
-#else
 void Property::setAttribute(String attributeName, std::function<void (CborMapData & md)>setValue)
-#endif
 {
   if (attributeName != "") {
     _attributeIdentifier++;