OTA: prepare for UNO WiFi rev2

Author: facchinm

src/AIoTC_Config.h

@@ -30,6 +30,16 @@
   #define NTP_USE_RANDOM_PORT     (1)
 #endif
 
+#if defined(ARDUINO_AVR_UNO_WIFI_REV2)
+#define DBG_ERROR
+#define DBG_WARNING
+#define DBG_INFO
+#define DBG_DEBUG
+#define DBG_VERBOSE
+// avoid including debugutils
+#define ARDUINO_DEBUG_UTILS_H_
+#endif
+
 #ifndef DBG_ERROR
   #define DBG_ERROR(fmt, ...) Debug.print(DBG_ERROR, fmt, ## __VA_ARGS__)
 #endif
@@ -54,7 +64,8 @@
  * 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,7 +77,7 @@
   #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)

src/ArduinoIoTCloud.cpp

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

src/ArduinoIoTCloud.h

@@ -154,4 +154,7 @@ class ArduinoIoTCloudClass
   #include "ArduinoIoTCloudLPWAN.h"
 #endif
 
+// declaration for boards without debug library
+void setDebugMessageLevel(int const level);
+
 #endif

src/ArduinoIoTCloudTCP.cpp

@@ -103,7 +103,7 @@ int ArduinoIoTCloudTCP::begin(String brokerAddress, uint16_t brokerPort)
   _brokerAddress = brokerAddress;
   _brokerPort = brokerPort;
 
-#if OTA_ENABLED
+#if OTA_ENABLED && !defined(__AVR__)
   /* Calculate the SHA256 checksum over the firmware stored in the flash of the
    * MCU. Note: As we don't know the length per-se we read chunks of the flash
    * until we detect one containing only 0xFF (= flash erased). This only works
@@ -429,9 +429,11 @@ void ArduinoIoTCloudTCP::onOTARequest()
   ota_download_success = true;
 #endif /* OTA_STORAGE_SNU */
 
+#ifndef __AVR__
   /* Perform the reset to reboot to SxU. */
   if (ota_download_success)
     NVIC_SystemReset();
+#endif
 }
 #endif
 

src/utility/ota/FlashSHA256.cpp

@@ -20,7 +20,7 @@
  ******************************************************************************/
 
 #include <AIoTC_Config.h>
-#if OTA_ENABLED
+#if OTA_ENABLED && !defined(__AVR__)
 
 #include "FlashSHA256.h"
 

src/utility/ota/OTA.h

@@ -25,7 +25,7 @@
 #include <AIoTC_Config.h>
 #if OTA_ENABLED
 
-#if OTA_STORAGE_SNU
+#if OTA_STORAGE_SNU && !defined(ARDUINO_AVR_UNO_WIFI_REV2)
   #include <SNU.h>
 #endif /* OTA_STORAGE_SNU */