Diff: main.cpp

Revision:

1:e821c773d5f0

Parent:

0:998e2e00df0c

Child:

4:99a67256b765

--- a/main.cpp	Tue Feb 10 12:15:47 2015 +0000
+++ b/main.cpp	Sun Feb 15 00:18:07 2015 +0000
@@ -7,26 +7,40 @@
  */
 
 /* Set this */ 
-#define WIFI_SSID           ""
-#define WIFI_SECUTIRY_KEY   ""
+//#define WIFI_SSID           ""
+//#define WIFI_SECUTIRY_KEY   ""
+
+/*
+#define WIFI_SSID           "2ndguests"
+#define WIFI_SECUTIRY_KEY   "Sepkddi0077"
+#define WIFI_SECURITY_TYPE  e_SEC_WPA2_AES
+*/
+
+//#define WIFI_SSID           "Team3_4"
+#define WIFI_SSID           "Team11_12"
+#define WIFI_SECUTIRY_KEY   "123456789"
+#define WIFI_SECURITY_TYPE  e_SEC_WPA2_AES
+
+
+
 //#define WIFI_SECURITY_TYPE  e_SEC_OPEN
 //#define WIFI_SECURITY_TYPE  e_SEC_WEP
 //#define WIFI_SECURITY_TYPE  e_SEC_WPA_TKIP
-#define WIFI_SECURITY_TYPE  e_SEC_WPA2_AES
+//#define WIFI_SECURITY_TYPE  e_SEC_WPA2_AES
 //#define WIFI_SECURITY_TYPE  e_SEC_WPA2_MIXED
-//#define WIFI_SECURITY_TYPE  e_SEC_WPA_AES
 
 
-#define IP_ADDRESS      "192.168.0.44"
+#define IP_ADDRESS      "192.168.100.44"
 #define NET_MASK        "255.255.255.0"
 #define DEFAULT_GATEWAY "192.168.0.1"
 #define PORT_NUMBER     80
 
+#define _DEBUG
 
 Serial pc(USBTX, USBRX);    // This is required when defined "_DEBUG"
 /** Wi-Fi SNIC UART Interface*/
-C_SNIC_WifiInterface     mSNICwifi( p13, p14, p12, p11, p20 );
-
+//C_SNIC_WifiInterface     mSNICwifi( p13, p14, p12, p11, p20 );
+C_SNIC_WifiInterface     mSNICwifi( p9, p10, NC, NC, p30 );
 
 
 
@@ -58,6 +72,7 @@
     wait(0.5);
     
     int retIp = mSNICwifi.setIPConfig(false, IP_ADDRESS, NET_MASK, DEFAULT_GATEWAY);
+    
 }
 
 
@@ -67,7 +82,7 @@
     pc.baud( 115200 );
 
     wifi_connect();
-    
+
     HTTPServer srv;
     
     pc.printf("server init.\r\n");
@@ -81,3 +96,5 @@
     pc.printf("server running.\r\n");
     srv.run();
 }
+
+