Initial support for Uno WiFi rev2

Need to add a patch to Arduino_ConnectionHandler:

diff --git a/src/Arduino_ConnectionHandler.h b/src/Arduino_ConnectionHandler.h
index 195ab13..8d80f2e 100644
--- a/src/Arduino_ConnectionHandler.h
+++ b/src/Arduino_ConnectionHandler.h
@@ -29,7 +29,8 @@
   #define WIFI_FIRMWARE_VERSION_REQUIRED WIFI_FIRMWARE_REQUIRED
 #endif

-#if defined(ARDUINO_SAMD_MKRWIFI1010) || defined(ARDUINO_SAMD_NANO_33_IOT)
+#if defined(ARDUINO_SAMD_MKRWIFI1010) || defined(ARDUINO_SAMD_NANO_33_IOT) || \
+  defined(ARDUINO_AVR_UNO_WIFI_REV2)
   #include <WiFiNINA.h>
   #include <WiFiUdp.h>

Author: facchinm

src/AIoTC_Config.h

@@ -79,7 +79,8 @@
   #define HAS_TCP
 #endif
 
-#if defined(ARDUINO_SAMD_MKRWIFI1010) || defined(ARDUINO_SAMD_NANO_33_IOT)
+#if defined(ARDUINO_SAMD_MKRWIFI1010) || defined(ARDUINO_SAMD_NANO_33_IOT) || \
+  defined(ARDUINO_AVR_UNO_WIFI_REV2)
   #define BOARD_HAS_OFFLOADED_ECCX08
   #define HAS_TCP
   #undef OTA_ENABLED

src/cbor/CBORDecoder.h

@@ -21,6 +21,10 @@
 /******************************************************************************
    INCLUDE
  ******************************************************************************/
+#ifdef __AVR__
+#include <Arduino.h>
+#include <ArduinoSTL.h>
+#endif
 
 #undef max
 #undef min

src/cbor/CBOREncoder.h

@@ -22,6 +22,11 @@
  * INCLUDE
  ******************************************************************************/
 
+#ifdef __AVR__
+#include <Arduino.h>
+#include <ArduinoSTL.h>
+#endif
+
 #include "../property/PropertyContainer.h"
 
 /******************************************************************************

src/cbor/lib/tinycbor/src/cbor.h

@@ -25,6 +25,11 @@
 #ifndef CBOR_H
 #define CBOR_H
 
+#ifdef __AVR__
+#define FP_NAN          NAN
+#define FP_INFINITE     INFINITY
+#endif
+
 #ifndef assert
 #include <assert.h>
 #endif

src/cbor/lib/tinycbor/src/cborpretty.c

@@ -28,6 +28,8 @@
 #  define __STDC_LIMIT_MACROS 1
 #endif
 
+#ifndef __AVR__
+
 #include "cbor.h"
 #include "cborinternal_p.h"
 #include "compilersupport_p.h"
@@ -580,4 +582,6 @@ CborError cbor_value_to_pretty_stream(CborStreamFunction streamFunction, void *t
 
 #pragma GCC diagnostic pop
 
+#endif // __AVR__
+
 /** @} */

src/cbor/lib/tinycbor/src/cbortojson.c

@@ -30,6 +30,8 @@
 #  define __STDC_LIMIT_MACROS 1
 #endif
 
+#ifndef __AVR__
+
 #include "cbor.h"
 #include "cborjson.h"
 #include "cborinternal_p.h"
@@ -701,4 +703,6 @@ CborError cbor_value_to_json_advance(FILE *out, CborValue *value, int flags)
 
 #pragma GCC diagnostic pop
 
+#endif // __AVR__
+
 /** @} */

src/cbor/lib/tinycbor/src/open_memstream.c

@@ -34,6 +34,10 @@
 
 #include <unistd.h>
 
+#ifdef __AVR__
+typedef size_t ssize_t;
+#endif
+
 typedef ssize_t RetType;
 typedef size_t LenType;
 

src/property/Property.cpp

@@ -189,7 +189,12 @@ CborError Property::appendAttributeReal(String value, String attributeName, Cbor
   }, encoder);
 }
 
-CborError Property::appendAttributeName(String attributeName, std::function<CborError (CborEncoder& mapEncoder)>appendValue, CborEncoder *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
     _attributeIdentifier++;
@@ -271,7 +276,11 @@ void Property::setAttributeReal(String& value, String attributeName) {
   });
 }
 
+#ifdef __AVR__
+void Property::setAttributeReal(String attributeName, nonstd::function<void (CborMapData & md)>setValue)
+#else
 void Property::setAttributeReal(String attributeName, std::function<void (CborMapData & md)>setValue)
+#endif
 {
   if (attributeName != "") {
     _attributeIdentifier++;

src/property/Property.h

@@ -133,6 +133,10 @@ typedef void(*OnSyncCallbackFunc)(Property &);
    CLASS DECLARATION
  ******************************************************************************/
 
+#ifdef __AVR__
+#include "nonstd/nonstd.h"
+#endif
+
 class Property
 {
   public:
@@ -177,13 +181,18 @@ class Property
     CborError appendAttributeReal(int value, String attributeName = "", CborEncoder *encoder = nullptr);
     CborError appendAttributeReal(float value, String attributeName = "", CborEncoder *encoder = nullptr);
     CborError appendAttributeReal(String value, String attributeName = "", CborEncoder *encoder = nullptr);
+#ifndef __AVR__
     CborError appendAttributeName(String attributeName, std::function<CborError (CborEncoder& mapEncoder)>f, CborEncoder *encoder);
+    void setAttributeReal(String attributeName, std::function<void (CborMapData & md)>setValue);
+#else
+    CborError appendAttributeName(String attributeName, nonstd::function<CborError (CborEncoder& mapEncoder)>f, CborEncoder *encoder);
+    void setAttributeReal(String attributeName, nonstd::function<void (CborMapData & md)>setValue);
+#endif
     void setAttributesFromCloud(std::list<CborMapData> * map_data_list);
     void setAttributeReal(bool& value, String attributeName = "");
     void setAttributeReal(int& value, String attributeName = "");
     void setAttributeReal(float& value, String attributeName = "");
     void setAttributeReal(String& value, String attributeName = "");
-    void setAttributeReal(String attributeName, std::function<void (CborMapData & md)>setValue);
     String getAttributeName(String propertyName, char separator);
 
     virtual bool isDifferentFromCloud() = 0;