Make library compatible with NINA WiFi module

examples/WiFi_Nina_OTA/WiFi_Nina_OTA.ino

@@ -0,0 +1,91 @@
+/*
+
+ This example connects to an WPA encrypted WiFi network.
+ Then it prints the  MAC address of the Wifi shield,
+ the IP address obtained, and other network details.
+ It then polls for sketch updates over WiFi, sketches
+ can be updated by selecting a network port from within
+ the Arduino IDE: Tools -> Port -> Network Ports ...
+
+ Circuit:
+ * WiFi shield attached
+ * SD shield attached
+
+ created 13 July 2010
+ by dlf (Metodo2 srl)
+ modified 31 May 2012
+ by Tom Igoe
+ modified 16 January 2017
+ by Sandeep Mistry
+ */
+
+#include <Arduino_WiFiOTA.h>
+
+// SAMD boards use a second stage bootloader approach and have enough RAM to retrieve the update firmware by themselves
+// Uno WiFi Rev2 needs some little help, so the Nina module takes care of dowloading and flashing the board
+
+#ifdef ARDUINO_ARCH_SAMD
+#include <SNU.h>
+#define STORAGE   NINAStorageRaw
+#else
+#define STORAGE   NINAStorage
+#endif
+
+
+#include "arduino_secrets.h" 
+///////please enter your sensitive data in the Secret tab/arduino_secrets.h
+/////// Wifi Settings ///////
+char ssid[] = SECRET_SSID;      // your network SSID (name)
+char pass[] = SECRET_PASS;   // your network password
+
+int status = WL_IDLE_STATUS;
+
+void setup() {
+  //Initialize serial:
+  Serial.begin(9600);
+
+  // check for the presence of the shield:
+  if (WiFi.status() == WL_NO_SHIELD) {
+    Serial.println("WiFi shield not present");
+    // don't continue:
+    while (true);
+  }
+
+  // attempt to connect to Wifi network:
+  while ( status != WL_CONNECTED) {
+    Serial.print("Attempting to connect to SSID: ");
+    Serial.println(ssid);
+    // Connect to WPA/WPA2 network. Change this line if using open or WEP network:
+    status = WiFi.begin(ssid, pass);
+  }
+
+  // start the WiFi OTA library with Nina based storage
+  WiFiOTA.begin("Arduino", "password", STORAGE);
+
+  // you're connected now, so print out the status:
+  printWifiStatus();
+}
+
+void loop() {
+  // check for WiFi OTA updates
+  WiFiOTA.poll();
+
+  // add your normal loop code below ...
+}
+
+void printWifiStatus() {
+  // print the SSID of the network you're attached to:
+  Serial.print("SSID: ");
+  Serial.println(WiFi.SSID());
+
+  // print your WiFi shield's IP address:
+  IPAddress ip = WiFi.localIP();
+  Serial.print("IP Address: ");
+  Serial.println(ip);
+
+  // print the received signal strength:
+  long rssi = WiFi.RSSI();
+  Serial.print("signal strength (RSSI):");
+  Serial.print(rssi);
+  Serial.println(" dBm");
+}

examples/WiFi101_OTA/WiFi101_OTA.ino → examples/WiFi_OTA/WiFi_OTA.ino

@@ -19,8 +19,7 @@
  */
 
 #include <SPI.h>
-#include <WiFi101.h>
-#include <WiFi101OTA.h>
+#include <Arduino_WiFiOTA.h>
 
 #include "arduino_secrets.h" 
 ///////please enter your sensitive data in the Secret tab/arduino_secrets.h

examples/WiFi101_SD_OTA/WiFi101_SD_OTA.ino → examples/WiFi_SD_OTA/WiFi_SD_OTA.ino

@@ -21,8 +21,7 @@
 
 #include <SPI.h>
 #include <SD.h>
-#include <WiFi101.h>
-#include <WiFi101OTA.h>
+#include <Arduino_WiFiOTA.h>
 #include <SDU.h>
 
 #include "arduino_secrets.h" 

examples/WiFi_SD_OTA/arduino_secrets.h

@@ -0,0 +1,3 @@
+#define SECRET_SSID ""
+#define SECRET_PASS ""
+

keywords.txt

@@ -11,6 +11,9 @@ WiFiOTA	KEYWORD1
 
 InternalStorage	KEYWORD1
 SDStorage	KEYWORD1
+NINAStorage	KEYWORD1
+NINAStorageRaw	KEYWORD1
+SerialFlashStorage	KEYWORD1
 
 #######################################
 # Methods and Functions (KEYWORD2)

library.properties

@@ -1,9 +1,9 @@
-name=WiFi101OTA
-version=1.0.2
+name=Arduino_WiFiOTA
+version=1.1.0
 author=Arduino
 maintainer=Arduino <[email protected]>
 sentence=Update sketches on your board over WiFi
 paragraph=Requires an Arduino/Genuino SAMD board
 category=Other
 url=http://www.arduino.cc/en/Reference/WiFi101OTA
-architectures=samd
+architectures=samd,megaavr

src/WiFi101OTA.cpp → src/Arduino_WiFiOTA.cpp

@@ -18,17 +18,7 @@
 
 #include <Arduino.h>
 
-#include "WiFi101OTA.h"
-
-#if defined(ARDUINO_SAMD_ZERO)
-  #define BOARD "arduino_zero_edbg"
-#elif defined(ARDUINO_SAMD_MKR1000)
-  #define BOARD "mkr1000"
-#elif defined(ARDUINO_SAMD_MKRZERO)
-  #define BOARD "mkrzero"
-#else
-  #error "Unsupported board!"
-#endif
+#include "Arduino_WiFiOTA.h"
 
 #define BOARD_LENGTH (sizeof(BOARD) - 1)
 
@@ -82,7 +72,7 @@ void WiFiOTAClass::begin(const char* name, const char* password, OTAStorage& sto
 
   _server.begin();
 
-  _mdnsSocket.beginMulti(IPAddress(224, 0, 0, 251), 5353);
+  _mdnsSocket.beginMulticast(IPAddress(224, 0, 0, 251), 5353);
 }
 
 void WiFiOTAClass::poll()
@@ -297,15 +287,24 @@ void WiFiOTAClass::pollServer()
     }
 
     long read = 0;
+    String url;
 
     while (client.connected() && read < contentLength) {
       while (client.available()) {
         read++;
-
-        _storage->write((char)client.read());
+        char c = (char)client.read();
+        if (_storage->hasDownloadAPI()) {
+          url += c;
+        } else {
+          _storage->write(c);
+        }
       }
     }
 
+    if (_storage->hasDownloadAPI()) {
+      _storage->download(url);
+    }
+
     _storage->close();
 
     if (read == contentLength) {

src/WiFi101OTA.h → src/Arduino_WiFiOTA.h

@@ -21,13 +21,39 @@
 
 #include <Arduino.h>
 
-#include "WiFi101.h"
+#if defined(ARDUINO_SAMD_ZERO)
+  #include "WiFi101.h"
+  #define BOARD "arduino_zero_edbg"
+#elif defined(ARDUINO_SAMD_MKR1000)
+  #include "WiFi101.h"
+  #define BOARD "mkr1000"
+#elif defined(ARDUINO_SAMD_MKRZERO)
+  #include "WiFi101.h"
+  #define BOARD "mkrzero"
+#elif defined(ARDUINO_SAMD_MKRWIFI1010)
+  #include "WiFiNINA.h"
+  #define BOARD "mkrwifi1010"
+#elif defined(ARDUINO_SAMD_NANO_33_IOT)
+  #include "WiFiNINA.h"
+  #define BOARD "nano_33_iot"
+#elif defined(ARDUINO_SAMD_MKRVIDOR4000)
+  #include "WiFiNINA.h"
+  #define BOARD "mkrvidor4000"
+#elif defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(ARDUINO_MEGAAVR_UNO_WIFI_REV2)
+  #include "WiFiNINA.h"
+  #define BOARD "uno2018"
+#else
+  #error "Unsupported board!"
+#endif
+
 #include "WiFiUdp.h"
 
 #include "OTAStorage.h"
 #include "SDStorage.h"
 #include "InternalStorage.h"
 #include "SerialFlashStorage.h"
+#include "NINAStorage.h"
+#include "NINAStorageRaw.h"
 
 class WiFiOTAClass {
 public:

src/InternalStorage.cpp

@@ -16,6 +16,8 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#ifndef __AVR__
+
 #include <Arduino.h>
 
 #include "InternalStorage.h"
@@ -119,3 +121,5 @@ long InternalStorageClass::maxSize()
 }
 
 InternalStorageClass InternalStorage;
+
+#endif

src/NINAStorage.cpp

@@ -0,0 +1,87 @@
+/*
+  Copyright (c) 2018 Arduino LLC.  All right reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "NINAStorage.h"
+
+#ifdef HAS_NINA
+
+#define UPDATE_FILE "/fs/UPDATE.BIN"
+
+static inline void reboot() {
+#ifdef __AVR__
+    /* Write boot request */
+  USERROW.USERROW31 = 0xEB;
+  _PROTECTED_WRITE_SPM(NVMCTRL.CTRLA, NVMCTRL_CMD_PAGEERASEWRITE_gc);
+  while(NVMCTRL.STATUS & NVMCTRL_EEBUSY_bm);
+
+  _PROTECTED_WRITE(RSTCTRL.SWRR, RSTCTRL_SWRE_bm);
+#else
+  NVIC_SystemReset();
+#endif
+}
+
+int NINAStorageClass::open(int contentLength)
+{
+  if (WiFiStorage.exists(UPDATE_FILE)) {
+    WiFiStorage.remove(UPDATE_FILE);
+  }
+
+  _file = new WiFiStorageFile(UPDATE_FILE);
+
+  return 1;
+}
+
+size_t NINAStorageClass::write(uint8_t b)
+{
+  int ret = _file->write(&b, 1);
+  return ret;
+}
+
+void NINAStorageClass::close()
+{
+  _file->close();
+}
+
+void NINAStorageClass::clear()
+{
+  WiFiStorage.remove(UPDATE_FILE);
+}
+
+void NINAStorageClass::apply()
+{
+  WiFiDrv::applyOTA();
+  reboot();
+}
+
+void NINAStorageClass::download(String url)
+{
+  WiFiStorage.download(url, "UPDATE.BIN");
+}
+
+long NINAStorageClass::maxSize()
+{
+#ifdef __AVR__
+  return (0xFFFF - 0x3FFF - 0x100);
+#else
+  return ((256 * 1024) - 0x2000);
+#endif
+}
+
+NINAStorageClass NINAStorage;
+
+#endif

src/NINAStorage.h

@@ -0,0 +1,56 @@
+/*
+  Copyright (c) 2017 Arduino LLC.  All right reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef _NINA_STORAGE_H_INCLUDED
+#define _NINA_STORAGE_H_INCLUDED
+
+#ifdef __has_include
+  #if __has_include(<WiFiStorage.h>)
+    #include <WiFiStorage.h>
+    #define HAS_NINA 1
+  #endif
+#else
+    #include <WiFiStorage.h>
+    #define HAS_NINA 1
+#endif
+
+#ifdef HAS_NINA
+
+#include "OTAStorage.h"
+
+class NINAStorageClass : public OTAStorage {
+public:
+  virtual int open(int length);
+  virtual size_t write(uint8_t);
+  virtual void close();
+  virtual void clear();
+  virtual void apply();
+  virtual long maxSize();
+  virtual void download(String url);
+  virtual bool hasDownloadAPI() {
+    return true;
+  }
+
+private:
+  WiFiStorageFile* _file;
+};
+
+extern NINAStorageClass NINAStorage;
+
+#endif
+#endif