Merge branch 'arduino-libraries:master' into master

Author: khoih-prog

docs/api.md

@@ -0,0 +1,15 @@
+# WiFiNINA Library
+
+
+This library allows you to use the Arduino UNO WiFi Rev.2, Arduino NANO 33 IoT, Arduino MKR 1010 and Arduino MKR VIDOR 4000 WiFi capabilities. It can serve as either a server accepting incoming connections or a client making outgoing ones. The library supports WEP, WPA2 Personal and WPA2 Enterprise encryptions. This library support all the same methods of the original WiFi library plus the connectSSL(). The WiFiNINA library is very similar to the Ethernet and the library WiFi, and many of the function calls are the same.
+
+To use this library
+
+```
+#include <SPI.h>
+#include <WiFiNINA.h>
+```
+
+## Examples
+
+Several examples for the **WiFiNINA** library are available from the [Examples from Libraries page](https://docs.arduino.cc/library-examples/). 

docs/readme.md

@@ -101,10 +101,10 @@ void loop() {
 
         // Check to see if the client request was "GET /H" or "GET /L":
         if (currentLine.endsWith("GET /H")) {
-          digitalWrite(9, HIGH);               // GET /H turns the LED on
+          digitalWrite(LED_BUILTIN, HIGH);               // GET /H turns the LED on
         }
         if (currentLine.endsWith("GET /L")) {
-          digitalWrite(9, LOW);                // GET /L turns the LED off
+          digitalWrite(LED_BUILTIN, LOW);                // GET /L turns the LED off
         }
       }
     }

examples/SimpleWebServerWiFi/SimpleWebServerWiFi.ino

@@ -28,11 +28,11 @@ int keyIndex = 0;            // your network key index number (needed only for W
 
 unsigned int localPort = 2390;      // local port to listen for UDP packets
 
-IPAddress timeServer(129, 6, 15, 28); // time.nist.gov NTP server
+IPAddress timeServer(162, 159, 200, 123); // pool.ntp.org NTP server
 
 const int NTP_PACKET_SIZE = 48; // NTP timestamp is in the first 48 bytes of the message
 
-byte packetBuffer[ NTP_PACKET_SIZE]; //buffer to hold incoming and outgoing packets
+byte packetBuffer[NTP_PACKET_SIZE]; //buffer to hold incoming and outgoing packets
 
 // A UDP instance to let us send and receive packets over UDP
 WiFiUDP Udp;

examples/WiFiUdpNtpClient/WiFiUdpNtpClient.ino

@@ -1,5 +1,5 @@
 name=WiFiNINA
-version=1.8.10
+version=1.8.13
 author=Arduino
 maintainer=Arduino <[email protected]>
 sentence=Enables network connection (local and Internet) with the Arduino MKR WiFi 1010, Arduino MKR VIDOR 4000, Arduino UNO WiFi Rev.2 and Nano 33 IoT.

library.properties

@@ -27,7 +27,7 @@ extern "C" {
   #include "utility/debug.h"
 }
 
-WiFiClass::WiFiClass() : _timeout(50000)
+WiFiClass::WiFiClass() : _timeout(50000), _feed_watchdog_func(0)
 {
 }
 
@@ -49,6 +49,7 @@ int WiFiClass::begin(const char* ssid)
    {
 	   for (unsigned long start = millis(); (millis() - start) < _timeout;)
 	   {
+		   feedWatchdog();
 		   delay(WL_DELAY_START_CONNECTION);
 		   status = WiFiDrv::getConnectionStatus();
 		   if ((status != WL_IDLE_STATUS) && (status != WL_NO_SSID_AVAIL) && (status != WL_SCAN_COMPLETED)) {
@@ -71,6 +72,7 @@ int WiFiClass::begin(const char* ssid, uint8_t key_idx, const char *key)
    {
 	   for (unsigned long start = millis(); (millis() - start) < _timeout;)
 	   {
+		   feedWatchdog();
 		   delay(WL_DELAY_START_CONNECTION);
 		   status = WiFiDrv::getConnectionStatus();
 		   if ((status != WL_IDLE_STATUS) && (status != WL_NO_SSID_AVAIL) && (status != WL_SCAN_COMPLETED)) {
@@ -92,6 +94,7 @@ int WiFiClass::begin(const char* ssid, const char *passphrase)
     {
 	   for (unsigned long start = millis(); (millis() - start) < _timeout;)
  	   {
+		   feedWatchdog();
  		   delay(WL_DELAY_START_CONNECTION);
  		   status = WiFiDrv::getConnectionStatus();
 		   if ((status != WL_IDLE_STATUS) && (status != WL_NO_SSID_AVAIL) && (status != WL_SCAN_COMPLETED)) {
@@ -382,4 +385,16 @@ void WiFiClass::setTimeout(unsigned long timeout)
 {
 	_timeout = timeout;
 }
+
+void WiFiClass::setFeedWatchdogFunc(FeedHostProcessorWatchdogFuncPointer func)
+{
+  _feed_watchdog_func = func;
+}
+
+void WiFiClass::feedWatchdog()
+{
+  if (_feed_watchdog_func)
+	_feed_watchdog_func();
+}
+
 WiFiClass WiFi;

src/WiFi.cpp

@@ -21,7 +21,8 @@
 #ifndef WiFi_h
 #define WiFi_h
 
-#define WIFI_FIRMWARE_LATEST_VERSION "1.4.5"
+#define WIFI_FIRMWARE_LATEST_VERSION "1.4.8"
+#define WIFI_HAS_FEED_WATCHDOG_FUNC
 
 #include <inttypes.h>
 
@@ -36,12 +37,15 @@ extern "C" {
 #include "WiFiServer.h"
 #include "WiFiStorage.h"
 
+typedef void(*FeedHostProcessorWatchdogFuncPointer)();
+
 class WiFiClass
 {
 private:
 
     static void init();
     unsigned long _timeout;
+    FeedHostProcessorWatchdogFuncPointer _feed_watchdog_func;
 public:
     WiFiClass();
 
@@ -274,6 +278,9 @@ class WiFiClass
     int ping(IPAddress host, uint8_t ttl = 128);
 
     void setTimeout(unsigned long timeout);
+
+    void setFeedWatchdogFunc(FeedHostProcessorWatchdogFuncPointer func);
+    void feedWatchdog();
 };
 
 extern WiFiClass WiFi;

src/WiFi.h

@@ -30,6 +30,12 @@
  * FUNCTION DEFINITION
  ******************************************************************************/
 
+#ifdef NINA_PINS_AS_CLASS
+#define VAL(x) x.get()
+#else
+#define VAL(x) static_cast<uint8_t>(x)
+#endif
+
 uint8_t toAnalogPin(NinaPin pin)
 {
   if      (pin == A4) return 6; /* ADC1 - CH6 */
@@ -41,20 +47,20 @@ uint8_t toAnalogPin(NinaPin pin)
 
 void pinMode(NinaPin pin, PinMode mode)
 {
-  WiFiDrv::pinMode(static_cast<uint8_t>(pin), static_cast<uint8_t>(mode));
+  WiFiDrv::pinMode(VAL(pin), static_cast<uint8_t>(mode));
 }
 
 PinStatus digitalRead(NinaPin pin)
 {
-  return WiFiDrv::digitalRead(static_cast<uint8_t>(pin));
+  return WiFiDrv::digitalRead(VAL(pin));
 }
 
 void digitalWrite(NinaPin pin, PinStatus value)
 {
   if (value == LOW)
-    WiFiDrv::digitalWrite(static_cast<uint8_t>(pin), 1);
+    WiFiDrv::digitalWrite(VAL(pin), 1);
   else
-    WiFiDrv::digitalWrite(static_cast<uint8_t>(pin), 0);
+    WiFiDrv::digitalWrite(VAL(pin), 0);
 }
 
 int analogRead(NinaPin pin)
@@ -64,12 +70,16 @@ int analogRead(NinaPin pin)
   if (adc_channel == 0xFF)
     return 0;
   else
+#ifdef NINA_PINS_AS_CLASS
+    return WiFiDrv::analogRead(adc_channel) >> (12 - pin.analogReadResolution());
+#else
     return WiFiDrv::analogRead(adc_channel);
+#endif
 }
 
 void analogWrite(NinaPin pin, int value)
 {
-  WiFiDrv::analogWrite(static_cast<uint8_t>(pin), static_cast<uint8_t>(value));
+  WiFiDrv::analogWrite(VAL(pin), static_cast<uint8_t>(value));
 }
 
 #endif /* ARDUINO_NANO_RP2040_CONNECT */

src/utility/nano_rp2040_support.cpp

@@ -22,6 +22,7 @@
 #include <SPI.h>
 #include "utility/spi_drv.h"
 #include "pins_arduino.h"
+#include "WiFi.h"
 
 #ifdef ARDUINO_SAMD_MKRVIDOR4000
 
@@ -67,13 +68,7 @@ static bool inverted_reset = false;
 
 bool SpiDrv::initialized = false;
 
-__attribute__((weak)) void wifi_nina_feed_watchdog()
-{
-    /* This function can be overwritten by a "strong" implementation
-     * in a higher level application, such as the ArduinoIoTCloud
-     * firmware stack.
-     */
-}
+extern WiFiClass WiFi;
 
 void SpiDrv::begin()
 {
@@ -227,7 +222,7 @@ void SpiDrv::waitForSlaveReady(bool const feed_watchdog)
     {
         if (feed_watchdog) {
             if ((millis() - start) < 10000) {
-                wifi_nina_feed_watchdog();
+                WiFi.feedWatchdog();
             }
         }
     }