updated tests/examples

Author: JAndrassy

examples/LegacyEthernetTest/LegacyEthernetTest.ino

@@ -14,7 +14,9 @@ void setup() {
   Serial.println();
 
 //	Ethernet.init(10);
-//  Ethernet.begin(mac, IPAddress(182, 168, 0, 177)); // force hw init for some libraries
+
+  Serial.println("Attempting to connect with DHCP ...");
+  testEthernet(true);
 
   if (Ethernet.hardwareStatus() == EthernetNoHardware) {
     Serial.println("Ethernet shield was not found.  Sorry, can't run without hardware. :(");
@@ -40,9 +42,6 @@ void setup() {
   }
   Serial.println();
 
-  Serial.println("Attempting to connect with DHCP ...");
-  testEthernet(true);
-
   IPAddress ip = Ethernet.localIP();
   IPAddress gw = Ethernet.gatewayIP();
   IPAddress mask = Ethernet.subnetMask();
@@ -145,6 +144,7 @@ void setup() {
 }
 
 void loop() {
+  Ethernet.maintain();
 }
 
 void testEthernet(bool dhcp) {

examples/ModernEthernetTest/ModernEthernetTest.ino

@@ -1,8 +1,4 @@
 
-// work in progress ...
-// - status() ?
-// - linkStatus ?
-
 #include <W5500lwIP.h>
 #include <NetApiHelpers.h>
 #include <MACAddress.h>
@@ -27,7 +23,25 @@ void setup() {
 
   Serial.println("Attempting to connect with DHCP ...");
   Ethernet.setHostname("arduino");
-  testEthernet(true);
+  testEthernet();
+
+  Serial.println("Checking link ...");
+  if (Ethernet.linkStatus() == LinkOFF) {
+    Serial.println("\tretry...");
+    delay(500);
+  }
+  switch (Ethernet.linkStatus()) {
+    case LinkOFF:
+      Serial.println("\tEthernet cable is not connected.");
+      break;
+    case LinkON:
+      Serial.println("\tEthernet cable is connected.");
+      break;
+    default:
+      Serial.println("\tLink state unknown.");
+      break;
+  }
+  Serial.println();
 
   IPAddress ip = Ethernet.localIP();
   IPAddress gw = Ethernet.gatewayIP();
@@ -60,7 +74,7 @@ void setup() {
       delay(1);
     }
   }
-  testEthernet(false);
+  testEthernet();
   if (ip != Ethernet.localIP()) {
     Serial.println("ERROR: Static IP was not used.");
     while (true) {
@@ -79,7 +93,7 @@ void setup() {
   Ethernet.end();
 
   Serial.println("Attempting to connect without resetting static IP configuration"); // <-------
-  testEthernet(false);
+  testEthernet();
   if (ip != Ethernet.localIP()) {
     Serial.println("ERROR: Static IP was cleared.");
   }
@@ -89,7 +103,7 @@ void setup() {
   ip[3] = 178;
   Serial.println(ip);
   Ethernet.config(ip);
-  testEthernet(false);
+  testEthernet();
   if (ip != Ethernet.localIP()) {
     Serial.println("ERROR: Static IP was not used.");
     while (true) {
@@ -123,7 +137,7 @@ void setup() {
   Serial.println("Attempting to connect with DHCP again ...");
   Ethernet.setHostname("arduino");
   Ethernet.config(INADDR_NONE);
-  testEthernet(true);
+  testEthernet();
   if (Ethernet.localIP() == INADDR_NONE) {
     Serial.println("ERROR: DHCP didn't run.");
   } else if (Ethernet.localIP() == ip) {
@@ -139,22 +153,22 @@ void setup() {
 void loop() {
 }
 
-void testEthernet(bool dhcp) {
-  bool ok = Ethernet.begin(mac);
-  if (!ok) {
-    Serial.println("ERROR:  Ethernet didn't connect");
+void testEthernet() {
+  Ethernet.begin(mac);
+  while (Ethernet.status() == WL_DISCONNECTED) {
+    Serial.print('.');
+    delay(1000);
+  }
+  Serial.println();
+  if (Ethernet.status() != WL_CONNECTED) {
+    Serial.println("ERROR:  Ethenet didn't connect");
+    printStatus();
     while (true) {
       delay(1);
     }
+  } else {
+    Serial.println("\t...success");
   }
-  if (dhcp) {
-    while (!Ethernet.connected()) {
-      Serial.print(".");
-      delay(1000);
-    }
-    Serial.println();
-  }
-  Serial.println("\t...success");
   Serial.println();
 
   printEthernetInfo();
@@ -201,3 +215,31 @@ void printEthernetInfo() {
     }
   }
 }
+
+void printStatus() {
+  int status = Ethernet.status();
+  const char* msg = nullptr;
+  switch (status) {
+    case WL_NO_SHIELD:
+      msg = "NO_SHIELD";
+      break;
+    case WL_CONNECTED:
+      msg = "CONNECTED";
+      break;
+    case WL_CONNECT_FAILED:
+      msg = "CONNECT_FAILED";
+      break;
+    case WL_CONNECTION_LOST:
+      msg = "CONNECTION_LOST";
+      break;
+    case WL_DISCONNECTED:
+      msg = "DISCONNECTED";
+      break;
+  }
+  Serial.print("status: ");
+  if (msg != nullptr) {
+    Serial.println(msg);
+  } else {
+    Serial.println(status);
+  }
+}

examples/WiFiAdvancedChatServer/WiFiAdvancedChatServer.ino

@@ -39,15 +39,10 @@ void setup() {
   Serial.print("Attempting to connect to SSID \"");
   Serial.print(ssid);
   Serial.println("\" with DHCP ...");
-  int status = WiFi.begin(ssid, pass);
-//  status = WiFi.waitForConnectResult();
-  if (status != WL_CONNECTED) {
-    Serial.println("STA didn't connect");
-    while (true) {
-      delay(1);
-    }
-  } else {
-    Serial.println("\t...success");
+  WiFi.begin(ssid, pass);
+  while (WiFi.status() != WL_CONNECTED) {
+    Serial.print('.');
+    delay(1000);
   }
   Serial.println();
 

examples/WiFiPagerServer/WiFiPagerServer.ino

@@ -46,14 +46,12 @@ void setup() {
   Serial.print("Attempting to connect to SSID \"");
   Serial.print(ssid);
   Serial.println("\" with DHCP ...");
-  int status = WiFi.begin(ssid, pass);
-//  status = WiFi.waitForConnectResult();
-  if (status != WL_CONNECTED) {
-    Serial.println("STA didn't connect");
-    while (true) {
-      delay(1);
-    }
+  WiFi.begin(ssid, pass);
+  while (WiFi.status() != WL_CONNECTED) {
+    Serial.print('.');
+    delay(1000);
   }
+  Serial.println();
 
   server.begin();
 

examples/WiFiTest/WiFiTest.ino

@@ -103,6 +103,7 @@ void setup() {
   testWiFi();
   if (ip != WiFi.localIP()) {
     Serial.println("ERROR: Static IP was cleared.");
+    Serial.println();
   }
   WiFi.disconnect();
 //  while (WiFi.status() == WL_CONNECTED) {
@@ -154,7 +155,6 @@ void setup() {
   Serial.println("\" with DHCP again..."); // <-------
   WiFi.setHostname("arduino");
   WiFi.config(INADDR_NONE);
-//  WiFi.config(INADDR_NONE, INADDR_NONE, INADDR_NONE);
   testWiFi();
   if (WiFi.localIP() == INADDR_NONE) {
     Serial.println("ERROR: DHCP didn't run.");
@@ -172,11 +172,15 @@ void loop() {
 }
 
 void testWiFi() {
-  int status = WiFi.begin(ssid, pass);
-//  status = WiFi.waitForConnectResult();
-  if (status != WL_CONNECTED) {
+  WiFi.begin(ssid, pass);
+  while (WiFi.status() == WL_DISCONNECTED) {
+    Serial.print('.');
+    delay(1000);
+  }
+  Serial.println();
+  if (WiFi.status() != WL_CONNECTED) {
     Serial.println("ERROR:  STA didn't connect");
-    printWiFiStatus(status);
+    printWiFiStatus();
     while (true) {
       delay(1);
     }
@@ -215,7 +219,6 @@ void printWiFiInfo() {
 
   MACAddress bssid;
   WiFi.BSSID(bssid);
-//  bssid = WiFi.BSSID();
   Serial.print("BSSID: ");
   Serial.println(bssid);
   if (bssid[0] & 1) { // multicast bit is set
@@ -249,7 +252,8 @@ void printWiFiInfo() {
   }
 }
 
-void printWiFiStatus(int status) {
+void printWiFiStatus() {
+  int status = WiFi.status();
   const char* msg = nullptr;
   switch (status) {
     case WL_NO_SHIELD: