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

Timestamp:

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

Author:

ertl-honda

Message:

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

File:

• rtos_arduino/trunk/examples/BlueMix_basic/rca_app.cpp (modified) (7 diffs)

rtos_arduino/trunk/examples/BlueMix_basic/rca_app.cpp

@@ -16 +16 @@
 char password[] = PASSWORD;
 
-ESP8266Client wifi;
-PubSubClient client(serverName, 1883, 0, wifi);
+ESP8266Client wifi_client;
+PubSubClient client(serverName, 1883, 0, wifi_client);
 
-#define SSID            ""
-#define WIFI_PASSWORD   ""
+#define STA_SSID       ""
+#define STA_PASSWORD   ""
 
 void MqttConnect()
@@ -74 +74 @@
     Serial.println("Echo Server : Start!");
     
-    ret = wifi.begin(Serial5, 115200);
+    ret = WiFi.begin(Serial5, 115200);
 
     if(ret == 1) {
@@ -82 +82 @@
         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);
@@ -91 +91 @@
 
     Serial.print("FW Version:");
-    Serial.println(wifi.getVersion().c_str());
+    Serial.println(WiFi.getVersion().c_str());
     
-    if (wifi.setOprToStation()) {
+    if (WiFi.setOprToStation()) {
         Serial.print("to station ok\r\n");
     } else {
@@ -99 +99 @@
     }
     
-    if (wifi.joinAP(SSID, WIFI_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");
     }
     
-    if (wifi.stopServer()) {
+    if (WiFi.stopServer()) {
         Serial.print("Stop server ok\r\n");
     } else {
@@ -113 +113 @@
     }        
     
-    if (wifi.disableMUX()) {
+    if (WiFi.disableMUX()) {
         Serial.print("single ok\r\n");
     } else {
@@ -121 +121 @@
     MqttConnect();
     Serial.println("MQTT set up");
-
-    Wire.begin();
-    TSL2561.init();
 }
 
 int cnt = 0;
-
 void loop()
-{
+{    
     MqttRequest(cnt++);
     delay(1000);
     client.loop();
+
+    if (Serial.available() > 0) {
+        Serial.read();
+        Serial.print("Pause  : Input any char to continue.\n\r");
+        while(!(Serial.available() > 0));
+        Serial.print("Resume.\n\r");
+        Serial.read();
+    }
 }