1) Changed return type to uint8_t;

2) Changed switch statement to if/else statement in example sketch and ping_cb;
3) Included socket/include/m2m_socket_host_if.h in WiFi101.cpp to use already defined constants like PING_ERR_SUCCESS;
4) Fixed spacing and added comments.

Author: PKGeorgiev

examples/WiFiPing/WiFiPing.ino

@@ -3,7 +3,7 @@
  This example connects to a encrypted Wifi network (WPA/WPA2).
  Then it prints the  MAC address of the Wifi shield,
  the IP address obtained, and other network details.
- Then it continuously pings given IP Address.
+ Then it continuously pings given host specified by IP Address or name.
 
  Circuit:
  * WiFi shield attached / MKR1000
@@ -20,11 +20,12 @@ char ssid[] = "yourNetwork";     //  your network SSID (name)
 char pass[] = "secretPassword";  // your network password
 int status = WL_IDLE_STATUS;     // the Wifi radio's status
 
+// Specify IP address or hostname
 String hostName = "www.google.com";
 byte pingResult;
 
 void setup() {
-  //Initialize serial and wait for port to open:
+  // Initialize serial and wait for port to open:
   Serial.begin(9600);
   while (!Serial) {
     ; // wait for serial port to connect. Needed for native USB port only
@@ -63,11 +64,11 @@ void loop() {
 
   pingResult = WiFi.ping(hostName);
 
-  if (pingResult == WL_PING_SUCCESS){
+  if (pingResult == WL_PING_SUCCESS) {
     Serial.println("SUCCESS!");
   } else {
-	Serial.print("FAILED! Error code: ");
-	Serial.println(pingResult);     
+    Serial.print("FAILED! Error code: ");
+    Serial.println(pingResult);     
   };
 
   delay(3000);

src/WiFi.cpp

@@ -22,8 +22,9 @@
 extern "C" {
   #include "bsp/include/nm_bsp.h"
   #include "socket/include/socket_buffer.h"
+  #include "socket/include/m2m_socket_host_if.h"
   #include "driver/source/nmasic.h"
-  #include "driver/include/m2m_periph.h"
+  #include "driver/include/m2m_periph.h"  
 }
 
 static void wifi_cb(uint8_t u8MsgType, void *pvMsg)
@@ -148,31 +149,23 @@ static void resolve_cb(uint8_t * /* hostName */, uint32_t hostIp)
 }
 
 static void ping_cb(uint32 u32IPAddr, uint32 u32RTT, uint8 u8ErrorCode) {
-	switch(u8ErrorCode){
-		
-		// PING_ERR_SUCCESS
-		case 0: {
-			// Ensure that reply IP address matches requested IP address
-			if (WiFi._resolve == u32IPAddr)
-			  WiFi._resolve = WL_PING_SUCCESS;
-			else
-			  // Another network device replied to the our ICMP request
-			  WiFi._resolve = WL_PING_DEST_UNREACHABLE;			
-		}; break;
-		
-		// PING_ERR_DEST_UNREACH
-		case 1: {
+	if (PING_ERR_SUCCESS == u8ErrorCode){
+		// Ensure this ICMP reply comes from requested IP address
+		if (WiFi._resolve == u32IPAddr)
+		  WiFi._resolve = WL_PING_SUCCESS;
+		else
+		  // Another network device replied to the our ICMP request
+		  WiFi._resolve = WL_PING_DEST_UNREACHABLE;				
+	} 
+	else if (PING_ERR_DEST_UNREACH == u8ErrorCode) {
 			WiFi._resolve = WL_PING_DEST_UNREACHABLE;
-		}; break;
-		
-		// PING_ERR_TIMEOUT
-		case 2: {
+		} 
+		else if (PING_ERR_TIMEOUT == u8ErrorCode) {
 			WiFi._resolve = WL_PING_TIMEOUT;
-		}; break;
-		
-		// Unknown error codes
-		default: WiFi._resolve = WL_PING_ERROR;
-	};
+		} 
+		else {
+			WiFi._resolve = WL_PING_ERROR;
+		};
 };
 
 WiFiClass::WiFiClass()
@@ -751,19 +744,19 @@ void WiFiClass::refresh(void)
 	m2m_wifi_handle_events(NULL);
 }
 
-wl_ping_result_t WiFiClass::ping(const char* hostname, uint8_t ttl){
+uint8_t WiFiClass::ping(const char* hostname, uint8_t ttl){
 	IPAddress ip;
 	if (hostByName(hostname, ip) > 0)
 		return ping(ip, ttl);
 	else
 		return WL_PING_UNKNOWN_HOST;
 };
 
-wl_ping_result_t WiFiClass::ping(const String &hostname, uint8_t ttl){
+uint8_t WiFiClass::ping(const String &hostname, uint8_t ttl){
 	return ping(hostname.c_str(), ttl);
 };
 
-wl_ping_result_t WiFiClass::ping(IPAddress host, uint8_t ttl) {
+uint8_t WiFiClass::ping(IPAddress host, uint8_t ttl) {
 
   // Network led ON (rev A then rev B).
   m2m_periph_gpio_set_val(M2M_PERIPH_GPIO16, 0);

src/WiFi101.h

@@ -146,9 +146,9 @@ class WiFiClass
 	int hostByName(const char* hostname, IPAddress& result);
 	int hostByName(const String &hostname, IPAddress& result) { return hostByName(hostname.c_str(), result); }
 
-	wl_ping_result_t ping(const char* hostname, uint8_t ttl = 128);
-	wl_ping_result_t ping(const String &hostname, uint8_t ttl = 128);
-	wl_ping_result_t ping(IPAddress host, uint8_t ttl = 128);
+	uint8_t ping(const char* hostname, uint8_t ttl = 128);
+	uint8_t ping(const String &hostname, uint8_t ttl = 128);
+	uint8_t ping(IPAddress host, uint8_t ttl = 128);
 
 	void refresh(void);