Offload IoT Cloud connection to Nina module

.github/workflows/compile-examples.yml

@@ -41,6 +41,7 @@ jobs:
           {"fqbn": "arduino:samd:mkr1000", "type": "mkr1000"},
           {"fqbn": "arduino:samd:mkrwifi1010", "type": "nina"},
           {"fqbn": "arduino:samd:nano_33_iot", "type": "nina"},
+          {"fqbn": "arduino:megaavr:uno2018", "type": "megaavr"},
           {"fqbn": "arduino:samd:mkrwan1300", "type": "wan"},
           {"fqbn": "arduino:samd:mkrgsm1400", "type": "gsm"},
           {"fqbn": "arduino:samd:mkrnb1500", "type": "nb"},
@@ -79,6 +80,20 @@ jobs:
             sketch-paths: |
               - examples/utility/Provisioning
               - examples/utility/SelfProvisioning
+          # Uno WiFi Rev2
+          - board:
+              type: "megaavr"
+            platforms: |
+              - name: arduino:megaavr
+            libraries: |
+              - name: ArduinoECCX08
+              - source-url: https://github.com/arduino-libraries/Arduino_AVRSTL.git
+              - name: WiFiNINA
+              - name: Arduino_JSON
+              - name: ArduinoBearSSL
+            sketch-paths: |
+              - examples/utility/Provisioning
+              - examples/utility/SelfProvisioning
           # LoRaWAN boards
           - board:
               type: "wan"

library.properties

@@ -6,6 +6,6 @@ sentence=This library allows to connect to the Arduino IoT Cloud service.
 paragraph=It provides a ConnectionManager to handle connection/disconnection, property-change updates and events callbacks. The supported boards are MKRGSM, MKR1000 and WiFi101.
 category=Communication
 url=https://github.com/arduino-libraries/ArduinoIoTCloud
-architectures=mbed,samd,esp8266
+architectures=mbed,samd,esp8266,megaavr
 includes=ArduinoIoTCloud.h
 depends=Arduino_ConnectionHandler,Arduino_DebugUtils,ArduinoMqttClient,ArduinoECCX08,RTCZero

src/AIoTC_Config.h

@@ -30,31 +30,65 @@
   #define NTP_USE_RANDOM_PORT     (1)
 #endif
 
-#ifndef DBG_ERROR
-  #define DBG_ERROR(fmt, ...) Debug.print(DBG_ERROR, fmt, ## __VA_ARGS__)
+#ifndef DEBUG_ERROR
+# if defined(ARDUINO_AVR_UNO_WIFI_REV2)
+#   define DEBUG_ERROR(fmt, ...) Debug.print(DBG_ERROR, fmt, ## __VA_ARGS__)
+# else
+#   define DEBUG_ERROR(fmt, ...) Debug.print(DBG_ERROR, fmt, ## __VA_ARGS__)
+# endif
 #endif
 
-#ifndef DBG_WARNING
-  #define DBG_WARNING(fmt, ...) Debug.print(DBG_WARNING, fmt, ## __VA_ARGS__)
+#ifndef DEBUG_WARNING
+# if defined(ARDUINO_AVR_UNO_WIFI_REV2)
+#   define DEBUG_WARNING(fmt, ...)
+# else
+#   define DEBUG_WARNING(fmt, ...) Debug.print(DBG_WARNING, fmt, ## __VA_ARGS__)
+# endif
 #endif
 
-#ifndef DBG_INFO
-  #define DBG_INFO(fmt, ...) Debug.print(DBG_INFO, fmt, ## __VA_ARGS__)
+#ifndef DEBUG_INFO
+# if defined(ARDUINO_AVR_UNO_WIFI_REV2)
+#   define DEBUG_INFO(fmt, ...)
+# else
+#   define DEBUG_INFO(fmt, ...) Debug.print(DBG_INFO, fmt, ## __VA_ARGS__)
+# endif
 #endif
 
-#ifndef DBG_DEBUG
-  #define DBG_DEBUG(fmt, ...) Debug.print(DBG_DEBUG, fmt, ## __VA_ARGS__)
+#ifndef DEBUG_DEBUG
+# if defined(ARDUINO_AVR_UNO_WIFI_REV2)
+#   define DEBUG_DEBUG(fmt, ...)
+# else
+#   define DEBUG_DEBUG(fmt, ...) Debug.print(DBG_DEBUG, fmt, ## __VA_ARGS__)
+# endif
 #endif
 
-#ifndef DBG_VERBOSE
-  #define DBG_VERBOSE(fmt, ...) //Debug.print(DBG_VERBOSE, fmt, ## __VA_ARGS__)
+#ifndef DEBUG_VERBOSE
+# if defined(ARDUINO_AVR_UNO_WIFI_REV2)
+#   define DEBUG_VERBOSE(fmt, ...)
+# else
+#   define DEBUG_VERBOSE(fmt, ...) //Debug.print(DBG_VERBOSE, fmt, ## __VA_ARGS__)
+# endif
+#endif
+
+#if defined(ARDUINO_AVR_UNO_WIFI_REV2) && !(defined(DEBUG_ERROR) || defined(DEBUG_WARNING) || defined(DEBUG_INFO) || defined(DEBUG_DEBUG) || defined(DEBUG_VERBOSE))
+/* Provide defines for constants provided within Arduino_DebugUtils
+ * in order to allow older sketches using those constants to still
+ * compile.
+ */
+#  define DBG_NONE    -1
+#  define DBG_ERROR    0
+#  define DBG_WARNING  1
+#  define DBG_INFO     2
+#  define DBG_DEBUG    3
+#  define DBG_VERBOSE  4
 #endif
 
 /******************************************************************************
  * AUTOMATICALLY CONFIGURED DEFINES
  ******************************************************************************/
 
-#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 OTA_STORAGE_SNU         (1)
 #else
   #define OTA_STORAGE_SNU         (0)
@@ -66,20 +100,25 @@
   #define OTA_STORAGE_SSU         (0)
 #endif
 
-#if OTA_STORAGE_SFU || OTA_STORAGE_SSU || OTA_STORAGE_SNU
+#if (OTA_STORAGE_SFU || OTA_STORAGE_SSU || OTA_STORAGE_SNU) && !defined(ARDUINO_AVR_UNO_WIFI_REV2)
   #define OTA_ENABLED             (1)
 #else
   #define OTA_ENABLED             (0)
 #endif
 
-#if defined(ARDUINO_SAMD_MKRGSM1400) || defined(ARDUINO_SAMD_MKRWIFI1010) ||   \
-  defined(ARDUINO_SAMD_MKR1000) || defined(ARDUINO_SAMD_NANO_33_IOT)      ||   \
+#if defined(ARDUINO_SAMD_MKRGSM1400) || defined(ARDUINO_SAMD_MKR1000) ||   \
   defined(ARDUINO_SAMD_MKRNB1500) || defined(ARDUINO_PORTENTA_H7_M7)      ||   \
   defined(ARDUINO_PORTENTA_H7_M4)
   #define BOARD_HAS_ECCX08
   #define HAS_TCP
 #endif
 
+#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
+#endif
+
 #if defined(ARDUINO_SAMD_MKRWAN1300) || defined(ARDUINO_SAMD_MKRWAN1310)
   #define HAS_LORA
 #endif

src/ArduinoIoTCloud.cpp

@@ -179,3 +179,8 @@ void ArduinoIoTCloudClass::execCloudEventCallback(ArduinoIoTCloudEvent const eve
     (*callback)();
   }
 }
+
+__attribute__((weak)) void setDebugMessageLevel(int const /* level */)
+{
+  /* do nothing */
+}

src/ArduinoIoTCloud.h

@@ -25,7 +25,10 @@
 #include <AIoTC_Config.h>
 
 #include <Arduino_ConnectionHandler.h>
-#include <Arduino_DebugUtils.h>
+
+#if defined(DEBUG_ERROR) || defined(DEBUG_WARNING) || defined(DEBUG_INFO) || defined(DEBUG_DEBUG) || defined(DEBUG_VERBOSE)
+#  include <Arduino_DebugUtils.h>
+#endif
 
 #include "AIoTC_Const.h"
 
@@ -154,4 +157,7 @@ class ArduinoIoTCloudClass
   #include "ArduinoIoTCloudLPWAN.h"
 #endif
 
+// declaration for boards without debug library
+void setDebugMessageLevel(int const level);
+
 #endif

src/ArduinoIoTCloudLPWAN.cpp

@@ -87,8 +87,8 @@ void ArduinoIoTCloudLPWAN::update()
 
 void ArduinoIoTCloudLPWAN::printDebugInfo()
 {
-  DBG_INFO(F("***** Arduino IoT Cloud LPWAN - configuration info *****"));
-  DBG_INFO(F("Thing ID: %s"), getThingId().c_str());
+  DEBUG_INFO("***** Arduino IoT Cloud LPWAN - configuration info *****");
+  DEBUG_INFO("Thing ID: %s", getThingId().c_str());
 }
 
 /******************************************************************************
@@ -106,16 +106,16 @@ ArduinoIoTCloudLPWAN::State ArduinoIoTCloudLPWAN::handle_ConnectPhy()
 ArduinoIoTCloudLPWAN::State ArduinoIoTCloudLPWAN::handle_SyncTime()
 {
   unsigned long const internal_posix_time = _time_service.getTime();
-  DBG_VERBOSE(F("ArduinoIoTCloudLPWAN::%s internal clock configured to posix timestamp %d"), __FUNCTION__, internal_posix_time);
-  DBG_INFO(F("Connected to Arduino IoT Cloud"));
+  DEBUG_VERBOSE("ArduinoIoTCloudLPWAN::%s internal clock configured to posix timestamp %d", __FUNCTION__, internal_posix_time);
+  DEBUG_INFO("Connected to Arduino IoT Cloud");
   return State::Connected;
 }
 
 ArduinoIoTCloudLPWAN::State ArduinoIoTCloudLPWAN::handle_Connected()
 {
   if (!connected())
   {
-    DBG_ERROR(F("ArduinoIoTCloudLPWAN::%s connection to gateway lost"), __FUNCTION__);
+    DEBUG_ERROR("ArduinoIoTCloudLPWAN::%s connection to gateway lost", __FUNCTION__);
     return State::ConnectPhy;
   }
 
@@ -175,4 +175,4 @@ int ArduinoIoTCloudLPWAN::writeProperties(const byte data[], int length)
 
 ArduinoIoTCloudLPWAN ArduinoCloud;
 
-#endif
+#endif