Diff: main.cpp

Revision:

11:54a1a576df9f

Parent:

10:248b81efda00

Child:

13:5b96cb34bc70

--- a/main.cpp	Sat May 06 00:08:06 2017 +0000
+++ b/main.cpp	Sat May 06 00:25:04 2017 +0000
@@ -33,15 +33,16 @@
 WIFIDevice wifi;
 
 TCPSocketConnection sock_tcp;
-char* ECHO_SERVER_ADDRESS = "10.0.1.13";
-//char* ECHO_SERVER_ADDRESS = "192.168.1.7";
-int ECHO_SERVER_PORT = 1030;
+char* AP_SSID = "SOG";
+char* AP_PWD = "1122334455667788";
+char* TCP_SERVER_ADDRESS = "10.0.1.13";
+int TCP_SERVER_PORT = 1030;
 
 uint8_t initialValueForDOORCharacteristic = 0xFF;
 uint8_t BLE_RX_CMD = 0xFF;
 const char DEVICE_NAME[] = "FITNCTL";
 uint8_t ADV_manuf[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-char     out_buffer[45];
+char    out_buffer[45];
 static EventQueue eventQueue(
     /* event count */ 16 * /* event size */ 32
 );
@@ -157,7 +158,7 @@
                     sock_tcp.set_blocking(false, 200);// Timeout after 0.2s
                      isCloudFiling = true;
                 } else {
-                    if (sock_tcp.connect(ECHO_SERVER_ADDRESS, ECHO_SERVER_PORT) < 0) {
+                    if (sock_tcp.connect(TCP_SERVER_ADDRESS, TCP_SERVER_PORT) < 0) {
                         isConnect = false;
                         BLE_RX_CMD = 0xFF;
 #if DEBUG_LOG                        
@@ -211,8 +212,7 @@
             
             if (isWiFiEnable == false) {
                 eth.init();  
-                wifi.setNetwork(M2M_WIFI_SEC_WPA_PSK, "SOG", "0227322327");
-                //wifi.setNetwork(M2M_WIFI_SEC_WPA_PSK, "netis_2.4G_cybing", "11223344"); 
+                wifi.setNetwork(M2M_WIFI_SEC_WPA_PSK, AP_SSID, AP_PWD);
                 eth.connect(); 
                 while(true) {
                     if (wifi.is_AP_connected()==1) break;
@@ -238,7 +238,7 @@
             
             if (isConnect == false) {
                 if (isWiFiEnable == true) {
-                    if (sock_tcp.connect(ECHO_SERVER_ADDRESS, ECHO_SERVER_PORT) < 0) {
+                    if (sock_tcp.connect(TCP_SERVER_ADDRESS, TCP_SERVER_PORT) < 0) {
 #if DEBUG_LOG                         
                             pc.printf("Unable to connect to (%s) on port (%d)\n", ECHO_SERVER_ADDRESS, ECHO_SERVER_PORT);
 #endif