v1.8.15-1 to use new WiFi101_Generic

### Releases v1.8.15-1 1. Using new [WiFi101_Generic](https://github.com/khoih-prog/WiFi101_Generic) library to permit sending larger data than total 4K when using `MKR1000` or `MKRWiFi1010` with `ATMEL WINC1500 WiFi` 2. Modify examples for new features
khoih-prog · Nov 18, 2022 · d628009 · d628009
1 parent 84f9f77
commit d628009
Show file tree

Hide file tree

Showing 40 changed files with 290 additions and 66 deletions.
diff --git a/examples/AP_SimpleWebServer/AP_SimpleWebServer.ino b/examples/AP_SimpleWebServer/AP_SimpleWebServer.ino
@@ -50,7 +50,12 @@
 #define WIFI_FIRMWARE_LATEST_VERSION "1.4.8"
 
 #include <SPI.h>
-#include <WiFiNINA_Generic.h>
+
+#if USING_WIFI101
+ #include <WiFi101_Generic.h>
+#else
+ #include <WiFiNINA_Generic.h>
+#endif
 
 ///////please enter your sensitive data in the Secret tab/arduino_secrets.h
 char ssid[] = SECRET_SSID; // your network SSID (name)
@@ -66,19 +71,24 @@ WiFiServer server(80);
 
 void setup()
 {
+ pinMode(led, OUTPUT); // set the LED pin mode
+
  //Initialize serial and wait for port to open:
  Serial.begin(115200);
 
  while (!Serial && millis() < 5000);
 
  Serial.print(F("\nStart AP_SimpleWebServer on "));
- Serial.println(BOARD_NAME);
- Serial.println(WIFININA_GENERIC_VERSION);
-
- pinMode(led, OUTPUT); // set the LED pin mode
+ Serial.println(BOARD_NAME); 
 
  // check for the WiFi module:
+#if USING_WIFI101
+ if (WiFi.status() == WL_NO_SHIELD)
+#else
+ Serial.println(WIFININA_GENERIC_VERSION);
+
  if (WiFi.status() == WL_NO_MODULE)
+#endif
  {
  Serial.println(F("Communication with WiFi module failed!"));
 

diff --git a/examples/AP_SimpleWebServer/defines.h b/examples/AP_SimpleWebServer/defines.h
@@ -49,8 +49,10 @@
  #define BOARD_TYPE "SAMD Zero"
  #elif defined(ARDUINO_SAMD_MKR1000)
  #define BOARD_TYPE "SAMD MKR1000"
+ #define USING_WIFI101 true
  #elif defined(ARDUINO_SAMD_MKRWIFI1010)
  #define BOARD_TYPE "SAMD MKRWIFI1010"
+ #define USING_WIFI101 true
  #elif defined(ARDUINO_SAMD_NANO_33_IOT)
  #define BOARD_TYPE "SAMD NANO_33_IOT"
  #elif defined(ARDUINO_SAMD_MKRFox1200)

diff --git a/examples/ConnectNoEncryption/ConnectNoEncryption.ino b/examples/ConnectNoEncryption/ConnectNoEncryption.ino
@@ -43,7 +43,12 @@
 #define WIFI_FIRMWARE_LATEST_VERSION "1.4.8"
 
 #include <SPI.h>
-#include <WiFiNINA_Generic.h>
+
+#if USING_WIFI101
+ #include <WiFi101_Generic.h>
+#else
+ #include <WiFiNINA_Generic.h>
+#endif
 
 char ssid[] = SECRET_SSID; // your network SSID (name)
 
@@ -58,10 +63,15 @@ void setup()
 
  Serial.print(F("\nStart ConnectNoEncryption on "));
  Serial.println(BOARD_NAME);
- Serial.println(WIFININA_GENERIC_VERSION);
-
+
  // check for the WiFi module:
+#if USING_WIFI101
+ if (WiFi.status() == WL_NO_SHIELD)
+#else
+ Serial.println(WIFININA_GENERIC_VERSION);
+
  if (WiFi.status() == WL_NO_MODULE)
+#endif
  {
  Serial.println(F("Communication with WiFi module failed!"));
 

diff --git a/examples/ConnectNoEncryption/defines.h b/examples/ConnectNoEncryption/defines.h
@@ -49,8 +49,10 @@
  #define BOARD_TYPE "SAMD Zero"
  #elif defined(ARDUINO_SAMD_MKR1000)
  #define BOARD_TYPE "SAMD MKR1000"
+ #define USING_WIFI101 true
  #elif defined(ARDUINO_SAMD_MKRWIFI1010)
  #define BOARD_TYPE "SAMD MKRWIFI1010"
+ #define USING_WIFI101 true
  #elif defined(ARDUINO_SAMD_NANO_33_IOT)
  #define BOARD_TYPE "SAMD NANO_33_IOT"
  #elif defined(ARDUINO_SAMD_MKRFox1200)

diff --git a/examples/ConnectWithWEP/ConnectWithWEP.ino b/examples/ConnectWithWEP/ConnectWithWEP.ino
@@ -52,7 +52,12 @@
 #define WIFI_FIRMWARE_LATEST_VERSION "1.4.8"
 
 #include <SPI.h>
-#include <WiFiNINA_Generic.h>
+
+#if USING_WIFI101
+ #include <WiFi101_Generic.h>
+#else
+ #include <WiFiNINA_Generic.h>
+#endif
 
 ///////please enter your sensitive data in the Secret tab/arduino_secrets.h
 char ssid[] = SECRET_SSID; // your network SSID (name)
@@ -71,10 +76,15 @@ void setup()
 
  Serial.print(F("\nStart ConnectWithWEP on "));
  Serial.println(BOARD_NAME);
- Serial.println(WIFININA_GENERIC_VERSION);
 
  // check for the WiFi module:
+#if USING_WIFI101
+ if (WiFi.status() == WL_NO_SHIELD)
+#else
+ Serial.println(WIFININA_GENERIC_VERSION);
+
  if (WiFi.status() == WL_NO_MODULE)
+#endif
  {
  Serial.println(F("Communication with WiFi module failed!"));
 

diff --git a/examples/ConnectWithWEP/defines.h b/examples/ConnectWithWEP/defines.h
@@ -49,8 +49,10 @@
  #define BOARD_TYPE "SAMD Zero"
  #elif defined(ARDUINO_SAMD_MKR1000)
  #define BOARD_TYPE "SAMD MKR1000"
+ #define USING_WIFI101 true
  #elif defined(ARDUINO_SAMD_MKRWIFI1010)
  #define BOARD_TYPE "SAMD MKRWIFI1010"
+ #define USING_WIFI101 true
  #elif defined(ARDUINO_SAMD_NANO_33_IOT)
  #define BOARD_TYPE "SAMD NANO_33_IOT"
  #elif defined(ARDUINO_SAMD_MKRFox1200)

diff --git a/examples/ConnectWithWPA/ConnectWithWPA.ino b/examples/ConnectWithWPA/ConnectWithWPA.ino
@@ -41,7 +41,12 @@
 #define WIFI_FIRMWARE_LATEST_VERSION "1.4.8"
 
 #include <SPI.h>
-#include <WiFiNINA_Generic.h>
+
+#if USING_WIFI101
+ #include <WiFi101_Generic.h>
+#else
+ #include <WiFiNINA_Generic.h>
+#endif
 
 ///////please enter your sensitive data in the Secret tab/arduino_secrets.h
 char ssid[] = SECRET_SSID; // your network SSID (name)
@@ -58,10 +63,15 @@ void setup()
 
  Serial.print(F("\nStart ConnectWithWPA on "));
  Serial.println(BOARD_NAME);
- Serial.println(WIFININA_GENERIC_VERSION);
-
+
  // check for the WiFi module:
+#if USING_WIFI101
+ if (WiFi.status() == WL_NO_SHIELD)
+#else
+ Serial.println(WIFININA_GENERIC_VERSION);
+
  if (WiFi.status() == WL_NO_MODULE)
+#endif
  {
  Serial.println(F("Communication with WiFi module failed!"));
 

diff --git a/examples/ConnectWithWPA/defines.h b/examples/ConnectWithWPA/defines.h
@@ -49,8 +49,10 @@
  #define BOARD_TYPE "SAMD Zero"
  #elif defined(ARDUINO_SAMD_MKR1000)
  #define BOARD_TYPE "SAMD MKR1000"
+ #define USING_WIFI101 true
  #elif defined(ARDUINO_SAMD_MKRWIFI1010)
  #define BOARD_TYPE "SAMD MKRWIFI1010"
+ #define USING_WIFI101 true
  #elif defined(ARDUINO_SAMD_NANO_33_IOT)
  #define BOARD_TYPE "SAMD NANO_33_IOT"
  #elif defined(ARDUINO_SAMD_MKRFox1200)

diff --git a/examples/ConnectWithWPA2Enterprise/ConnectWithWPA2Enterprise.ino b/examples/ConnectWithWPA2Enterprise/ConnectWithWPA2Enterprise.ino
@@ -57,8 +57,7 @@ void setup()
  Serial.print(F("\nStart ConnectWithWPA2Enterprise on "));
  Serial.println(BOARD_NAME);
  Serial.println(WIFININA_GENERIC_VERSION);
-
- // check for the WiFi module:
+
  if (WiFi.status() == WL_NO_MODULE)
  {
  Serial.println(F("Communication with WiFi module failed!"));

diff --git a/examples/MultiServers/MultiServers.ino b/examples/MultiServers/MultiServers.ino
@@ -34,7 +34,14 @@
 #define WIFI_FIRMWARE_LATEST_VERSION "1.4.8"
 
 #include "defines.h"
-#include <WiFiNINA_Generic.h>
+
+#include <SPI.h>
+
+#if USING_WIFI101
+ #include <WiFi101_Generic.h>
+#else
+ #include <WiFiNINA_Generic.h>
+#endif
 
 // https://github.com/ocrdu/NINA-Websocket
 #include <WebSocketServer.h>
@@ -119,10 +126,14 @@ void setup()
  Serial.print(F("\nStart MultiServers on "));
  Serial.println(BOARD_TYPE);
 
+// check for the WiFi module:
+#if USING_WIFI101
+ if (WiFi.status() == WL_NO_SHIELD)
+#else
  Serial.println(WIFININA_GENERIC_VERSION);
-
- // check for the WiFi module:
+
  if (WiFi.status() == WL_NO_MODULE)
+#endif
  {
  Serial.println(F("Communication with WiFi module failed!"));
 

diff --git a/examples/MultiServers/defines.h b/examples/MultiServers/defines.h
@@ -49,8 +49,10 @@
  #define BOARD_TYPE "SAMD Zero"
  #elif defined(ARDUINO_SAMD_MKR1000)
  #define BOARD_TYPE "SAMD MKR1000"
+ #define USING_WIFI101 true
  #elif defined(ARDUINO_SAMD_MKRWIFI1010)
  #define BOARD_TYPE "SAMD MKRWIFI1010"
+ #define USING_WIFI101 true
  #elif defined(ARDUINO_SAMD_NANO_33_IOT)
  #define BOARD_TYPE "SAMD NANO_33_IOT"
  #elif defined(ARDUINO_SAMD_MKRFox1200)

diff --git a/examples/RGB_LED_Test/RGB_LED_Test.ino b/examples/RGB_LED_Test/RGB_LED_Test.ino
@@ -30,7 +30,6 @@
  #error Only for ARDUINO_NANO_RP2040_CONNECT using arduino-pico core
 #endif
 
-//#include <WiFiNINA.h>
 #include <WiFiNINA_Generic.h>
 
 void setup()

diff --git a/examples/ScanNetworks/ScanNetworks.ino b/examples/ScanNetworks/ScanNetworks.ino
@@ -46,7 +46,12 @@
 #define WIFI_FIRMWARE_LATEST_VERSION "1.4.8"
 
 #include <SPI.h>
-#include <WiFiNINA_Generic.h>
+
+#if USING_WIFI101
+ #include <WiFi101_Generic.h>
+#else
+ #include <WiFiNINA_Generic.h>
+#endif
 
 void setup()
 {
@@ -57,10 +62,15 @@ void setup()
 
  Serial.print(F("\nStart ScanNetworks on "));
  Serial.println(BOARD_NAME);
+
+// check for the WiFi module:
+#if USING_WIFI101
+ if (WiFi.status() == WL_NO_SHIELD)
+#else
  Serial.println(WIFININA_GENERIC_VERSION);
-
- // check for the WiFi module:
+
  if (WiFi.status() == WL_NO_MODULE)
+#endif
  {
  Serial.println(F("Communication with WiFi module failed!"));
 
@@ -149,7 +159,9 @@ void printEncryptionType(int thisType)
  Serial.print(F("Auto"));
  break;
 
- case ENC_TYPE_UNKNOWN:
+#if !USING_WIFI101
+ case ENC_TYPE_UNKNOWN:
+#endif 
  default:
  Serial.print(F("Unknown"));
  break;

diff --git a/examples/ScanNetworksAdvanced/ScanNetworksAdvanced.ino b/examples/ScanNetworksAdvanced/ScanNetworksAdvanced.ino
@@ -47,7 +47,12 @@
 #define WIFI_FIRMWARE_LATEST_VERSION "1.4.8"
 
 #include <SPI.h>
-#include <WiFiNINA_Generic.h>
+
+#if USING_WIFI101
+ #include <WiFi101_Generic.h>
+#else
+ #include <WiFiNINA_Generic.h>
+#endif
 
 void setup()
 {
@@ -58,10 +63,15 @@ void setup()
 
  Serial.print(F("\nStart ScanNetworksAdvanced on "));
  Serial.println(BOARD_NAME);
- Serial.println(WIFININA_GENERIC_VERSION);
 
- // check for the WiFi module:
+// check for the WiFi module:
+#if USING_WIFI101
+ if (WiFi.status() == WL_NO_SHIELD)
+#else
+ Serial.println(WIFININA_GENERIC_VERSION);
+
  if (WiFi.status() == WL_NO_MODULE)
+#endif
  {
  Serial.println(F("Communication with WiFi module failed!"));
 
@@ -163,7 +173,9 @@ void printEncryptionType(int thisType)
  Serial.print(F("Auto"));
  break;
 
- case ENC_TYPE_UNKNOWN:
+#if !USING_WIFI101
+ case ENC_TYPE_UNKNOWN:
+#endif 
  default:
  Serial.print(F("Unknown"));
  break;

diff --git a/examples/ScanNetworksAdvanced/defines.h b/examples/ScanNetworksAdvanced/defines.h
@@ -49,8 +49,10 @@
  #define BOARD_TYPE "SAMD Zero"
  #elif defined(ARDUINO_SAMD_MKR1000)
  #define BOARD_TYPE "SAMD MKR1000"
+ #define USING_WIFI101 true
  #elif defined(ARDUINO_SAMD_MKRWIFI1010)
  #define BOARD_TYPE "SAMD MKRWIFI1010"
+ #define USING_WIFI101 true
  #elif defined(ARDUINO_SAMD_NANO_33_IOT)
  #define BOARD_TYPE "SAMD NANO_33_IOT"
  #elif defined(ARDUINO_SAMD_MKRFox1200)

diff --git a/examples/SimpleWebServerWiFi/SimpleWebServerWiFi.ino b/examples/SimpleWebServerWiFi/SimpleWebServerWiFi.ino
@@ -54,7 +54,12 @@
 #define WIFI_FIRMWARE_LATEST_VERSION "1.4.8"
 
 #include <SPI.h>
-#include <WiFiNINA_Generic.h>
+
+#if USING_WIFI101
+ #include <WiFi101_Generic.h>
+#else
+ #include <WiFiNINA_Generic.h>
+#endif
 
 ///////please enter your sensitive data in the Secret tab/arduino_secrets.h
 char ssid[] = SECRET_SSID; // your network SSID (name)
@@ -75,10 +80,15 @@ void setup()
 
  Serial.print(F("\nStart SimpleWebServerWiFi on "));
  Serial.println(BOARD_NAME);
- Serial.println(WIFININA_GENERIC_VERSION);
 
- // check for the WiFi module:
+// check for the WiFi module:
+#if USING_WIFI101
+ if (WiFi.status() == WL_NO_SHIELD)
+#else
+ Serial.println(WIFININA_GENERIC_VERSION);
+
  if (WiFi.status() == WL_NO_MODULE)
+#endif
  {
  Serial.println(F("Communication with WiFi module failed!"));
 

diff --git a/examples/SimpleWebServerWiFi/defines.h b/examples/SimpleWebServerWiFi/defines.h
@@ -49,8 +49,10 @@
  #define BOARD_TYPE "SAMD Zero"
  #elif defined(ARDUINO_SAMD_MKR1000)
  #define BOARD_TYPE "SAMD MKR1000"
+ #define USING_WIFI101 true
  #elif defined(ARDUINO_SAMD_MKRWIFI1010)
  #define BOARD_TYPE "SAMD MKRWIFI1010"
+ #define USING_WIFI101 true
  #elif defined(ARDUINO_SAMD_NANO_33_IOT)
  #define BOARD_TYPE "SAMD NANO_33_IOT"
  #elif defined(ARDUINO_SAMD_MKRFox1200)