Diff: main.cpp

Revision:

6:79ecd4e53456

Parent:

4:4a46982a4cf2

Child:

8:6635ca3b5a5c

--- a/main.cpp	Fri Mar 13 20:27:06 2015 +0900
+++ b/main.cpp	Fri Mar 13 11:55:55 2015 +0000
@@ -10,6 +10,8 @@
 #define SEC_TYPE    e_SEC_WPA2_AES
 #define SEC_KEY     "wotpasswd"
 
+static bool connectWiFi();
+
 // tx, rx, cts, rts, reset, alarm=NC, baud=115200
 C_SNIC_WifiInterface wifi(p9, p10, NC, NC, p30);
 
@@ -17,33 +19,9 @@
 #if defined(TARGET_LPC1768)
     PHY_PowerDown();
 #endif
-    int ret = 0;
-
-    printf("connecting wifi\r\n");
-
-    ret = wifi.init();
-    if (ret != 0) {
-        printf("ERROR: Failed to init wifi %d\r\n", ret);
-        return 1;
+    while (!connectWiFi()) {
+        wait(3);
     }
-    wait(0.5);
-    
-    ret = wifi.disconnect();
-    if (ret != 0) {
-        printf("ERROR: Failed to disconnect wifi %d\r\n", ret);
-        return 1;
-    }
-    wait(0.3);
-
-    wifi.connect(SSID, strlen(SSID), SEC_TYPE, SEC_KEY, strlen(SEC_KEY));
-    if (ret != 0) {
-        printf("ERROR: Failed to connect wifi %d\r\n", ret);
-        return 1;
-    }
-    wait(0.5);
-
-    wifi.setIPConfig(true);
-    wait(0.5);
 
     printf("WiFi connected: %s\r\n", wifi.getIPAddress());
 
@@ -57,3 +35,33 @@
     server.run();
 }
 
+bool connectWiFi() {
+    printf("connecting wifi\r\n");
+
+    int ret = wifi.init();
+    if (ret != 0) {
+        printf("ERROR: Failed to init wifi %d\r\n", ret);
+        return false;
+    }
+    wait(0.5);
+    
+    ret = wifi.disconnect();
+    if (ret != 0) {
+        printf("ERROR: Failed to disconnect wifi %d\r\n", ret);
+        return false;
+    }
+    wait(0.3);
+
+    wifi.connect(SSID, strlen(SSID), SEC_TYPE, SEC_KEY, strlen(SEC_KEY));
+    if (ret != 0) {
+        printf("ERROR: Failed to connect wifi %d\r\n", ret);
+        return false;
+    }
+    wait(0.5);
+
+    wifi.setIPConfig(true);
+    wait(0.5);
+    
+    return true;
+}
+