Make whitespace and code style consistency to #68

Author: sandeepmistry

examples/WiFiPing/WiFiPing.ino

@@ -57,20 +57,19 @@ void setup() {
 }
 
 void loop() {
-
   Serial.print("Pinging ");
   Serial.print(hostName);
   Serial.print(": ");
-  
+
   pingResult = WiFi.ping(hostName);
-  
+
   if (pingResult == WL_PING_SUCCESS) {
     Serial.println("SUCCESS!");
   } else {
     Serial.print("FAILED! Error code: ");
-    Serial.println(pingResult);     
-  };
-  
+    Serial.println(pingResult);
+  }
+
   delay(3000);
 }
 

src/WiFi.cpp

@@ -24,7 +24,7 @@ extern "C" {
   #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,25 +148,24 @@ static void resolve_cb(uint8_t * /* hostName */, uint32_t hostIp)
 	WiFi._resolve = hostIp;
 }
 
-static void ping_cb(uint32 u32IPAddr, uint32 u32RTT, uint8 u8ErrorCode) {
-	if (PING_ERR_SUCCESS == u8ErrorCode){
+static void ping_cb(uint32 u32IPAddr, uint32 /*u32RTT*/, uint8 u8ErrorCode)
+{
+	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) {
+		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_TIMEOUT == u8ErrorCode) {
-			WiFi._resolve = WL_PING_TIMEOUT;
-		} 
-		else {
-			WiFi._resolve = WL_PING_ERROR;
-		};
-};
+		}
+	} else if (PING_ERR_DEST_UNREACH == u8ErrorCode) {
+		WiFi._resolve = WL_PING_DEST_UNREACHABLE;
+	} else if (PING_ERR_TIMEOUT == u8ErrorCode) {
+		WiFi._resolve = WL_PING_TIMEOUT;
+	} else {
+		WiFi._resolve = WL_PING_ERROR;
+	}
+}
 
 WiFiClass::WiFiClass()
 {
@@ -761,49 +760,54 @@ void WiFiClass::refresh(void)
 	m2m_wifi_handle_events(NULL);
 }
 
-uint8_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)
+
+	if (hostByName(hostname, ip) > 0) {
 		return ping(ip, ttl);
-	else
+	} else {
 		return WL_PING_UNKNOWN_HOST;
-};
+	}
+}
 
-uint8_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);
-};
-
-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);
-  m2m_periph_gpio_set_val(M2M_PERIPH_GPIO5, 0);
-
-  uint32_t dstHost = (uint32_t)host;
-  _resolve = dstHost;
-
-  if (m2m_ping_req((uint32_t)host, ttl, &ping_cb) < 0) {
-    // Network led OFF (rev A then rev B).
-    m2m_periph_gpio_set_val(M2M_PERIPH_GPIO16, 1);
-    m2m_periph_gpio_set_val(M2M_PERIPH_GPIO5, 1);
-    //  Error sending ping request
-    return WL_PING_ERROR;
-  };
-
-  // Wait for connection or timeout:
-  unsigned long start = millis();
-  while (_resolve == dstHost && millis() - start < 5000) {
-    m2m_wifi_handle_events(NULL);
-  };
-
-  // Network led OFF (rev A then rev B).
-  m2m_periph_gpio_set_val(M2M_PERIPH_GPIO16, 1);
-  m2m_periph_gpio_set_val(M2M_PERIPH_GPIO5, 1);
-
-  if (_resolve == dstHost)
-    return WL_PING_TIMEOUT;
-  else
-    return (wl_ping_result_t)_resolve;
-};
+}
+
+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);
+	m2m_periph_gpio_set_val(M2M_PERIPH_GPIO5, 0);
+
+	uint32_t dstHost = (uint32_t)host;
+	_resolve = dstHost;
+
+	if (m2m_ping_req((uint32_t)host, ttl, &ping_cb) < 0) {
+		// Network led OFF (rev A then rev B).
+		m2m_periph_gpio_set_val(M2M_PERIPH_GPIO16, 1);
+		m2m_periph_gpio_set_val(M2M_PERIPH_GPIO5, 1);
+		//  Error sending ping request
+		return WL_PING_ERROR;
+	}
+
+	// Wait for success or timeout:
+	unsigned long start = millis();
+	while (_resolve == dstHost && millis() - start < 5000) {
+		m2m_wifi_handle_events(NULL);
+	}
+
+	// Network led OFF (rev A then rev B).
+	m2m_periph_gpio_set_val(M2M_PERIPH_GPIO16, 1);
+	m2m_periph_gpio_set_val(M2M_PERIPH_GPIO5, 1);
+
+	if (_resolve == dstHost) {
+		return WL_PING_TIMEOUT;
+	} else {
+		return _resolve;
+	}
+}
 
 WiFiClass WiFi;