Changeset 213 for rtos_arduino/trunk/examples/WifiEcho/rca_app.cpp

Timestamp:

Apr 2, 2016, 1:19:24 PM (8 years ago)

Author:

ertl-honda

Message:

クライアントの変更に対応

File:

• rtos_arduino/trunk/examples/WifiEcho/rca_app.cpp (modified) (18 diffs)

rtos_arduino/trunk/examples/WifiEcho/rca_app.cpp

@@ -2 +2 @@
 #include "ESP8266.h"
 
-#define SSID       ""
-#define PASSWORD   ""
+#define STA_SSID       ""
+#define STA_PASSWORD   ""
 
 #define AP_SSID       "M0_AP"
@@ -9 +9 @@
 
 #define WMODE_STATION
-
-ESP8266 wifi;
 
 bool setup_done = false;
@@ -20 +18 @@
     Serial.println("Echo Server : Start!");
     
-    ret = wifi.begin(Serial5, 115200);
+    ret = WiFi.begin(Serial5, 115200);
 
     if(ret == 1) {
@@ -28 +26 @@
         Serial.println("FW Version mismatch.");
         Serial.print("FW Version:");
-        Serial.println(wifi.getVersion().c_str());
+        Serial.println(WiFi.getVersion().c_str());
         Serial.print("Supported FW Version:");
         Serial.println(ESP8266_SUPPORT_VERSION);
@@ -37 +35 @@
 
     Serial.print("FW Version:");
-    Serial.println(wifi.getVersion().c_str());
+    Serial.println(WiFi.getVersion().c_str());
     
 #ifdef  WMODE_STATION
-    if (wifi.setOprToStation()) {
+    if (WiFi.setOprToStation()) {
         Serial.print("to station ok\r\n");
     } else {
@@ -46 +44 @@
     }
     
-    if (wifi.joinAP(SSID, PASSWORD)) {
+    if (WiFi.joinAP(STA_SSID, STA_PASSWORD)) {
         Serial.print("Join AP success\r\n");
         Serial.print("IP: ");
-        Serial.println(wifi.getLocalIP().c_str());    
+        Serial.println(WiFi.getLocalIP().c_str());    
     } else {
         Serial.print("Join AP failure\r\n");
     }
 #else /* !WMODE_STATION */ 
-    if (wifi.setOprToSoftAP()) {
+    if (WiFi.setOprToSoftAP()) {
         Serial.print("to softap ok\r\n");
     } else {
         Serial.print("to softap err\r\n");
     }    
-    if(wifi.setSoftAPParam(AP_SSID, AP_PASSWORD, 7, 0)){
+    if(WiFi.setSoftAPParam(AP_SSID, AP_PASSWORD, 7, 0)){
         Serial.print("Set SoftAP success\r\n");
         Serial.print("IP: ");
-        Serial.println(wifi.getLocalIP().c_str());            
+        Serial.println(WiFi.getLocalIP().c_str());            
     }
     else {
@@ -69 +67 @@
 #endif /* WMODE_STATION */
     
-    if (wifi.enableMUX()) {
+    if (WiFi.enableMUX()) {
         Serial.print("multiple ok\r\n");
     } else {
@@ -75 +73 @@
     }
 
-    if (wifi.startTCPServer(80)) {
+    if (WiFi.startTCPServer(80)) {
         Serial.print("start tcp server ok\r\n");
     } else {
@@ -81 +79 @@
     }
 
-    if (wifi.setTCPServerTimeout(60)) { 
+    if (WiFi.setTCPServerTimeout(60)) { 
         Serial.print("set tcp server timout 60 seconds\r\n");
     } else {
@@ -110 +108 @@
     pre_mux_id_ptn = mux_id_ptn;
 
-    if(!wifi.getMuxCStatus(&mux_id_ptn)) {
+    if(!WiFi.getMuxCStatus(&mux_id_ptn)) {
         Serial.println("getMuxCStatus(&mux_id_ptn) : Error!");
     }
@@ -130 +128 @@
     }
     
-    if (!wifi.isConnected(mux_id)) {
+    if (!WiFi.isConnected(mux_id)) {
         Serial.print("Echo Server : Port is closed: ");
         Serial.println(mux_id);
@@ -137 +135 @@
     }
     
-    if((len = wifi.recv(mux_id, buffer, sizeof(buffer))) == 0) {
+    if((len = WiFi.recv(mux_id, buffer, sizeof(buffer))) == 0) {
         return;
     }
@@ -148 +146 @@
             Serial.print("Echo Server : Close port : ");
             Serial.println(mux_id);            
-            wifi.releaseTCP(mux_id);
+            WiFi.releaseTCP(mux_id);
             mux_id = MUX_NULL;
             return;
@@ -161 +159 @@
     Serial.println((char*)buffer);
     
-    if(!wifi.send(mux_id, buffer, len)) {
+    if(!WiFi.send(mux_id, buffer, len)) {
         Serial.println("Echo Server : send(mux_id, cmd) : Error!");
     }
@@ -189 +187 @@
     }
     
-    if (!wifi.isConnected(task1_mux_id)) {
+    if (!WiFi.isConnected(task1_mux_id)) {
         Serial.print("Echo Server Task1 : Port is closed: ");
         Serial.println(task1_mux_id);
@@ -195 +193 @@
         return;
     }
-    if((len = wifi.recv(task1_mux_id, buffer, sizeof(buffer))) == 0) {
+    if((len = WiFi.recv(task1_mux_id, buffer, sizeof(buffer))) == 0) {
         return;
     }        
@@ -206 +204 @@
             Serial.print("Echo Server Task1 : Close port : ");
             Serial.println(task1_mux_id);            
-            wifi.releaseTCP(task1_mux_id);
+            WiFi.releaseTCP(task1_mux_id);
             task1_mux_id = MUX_NULL;
             return;
@@ -219 +217 @@
     Serial.println((char*)buffer);
     
-    if(!wifi.send(task1_mux_id, buffer, len)) {
+    if(!WiFi.send(task1_mux_id, buffer, len)) {
         Serial.println("Echo Server Task1 : send(task1_mux_id, cmd) : Error!");
     }