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

Timestamp:

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

Author:

ertl-honda

Message:

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

File:

• rtos_arduino/trunk/examples/Milkcocoa_basic/rca_app.cpp (modified) (6 diffs)

rtos_arduino/trunk/examples/Milkcocoa_basic/rca_app.cpp

@@ -4 +4 @@
 #include "Client_ESP8266.h"
 
-#define SSID       ""
-#define PASSWORD   ""
+#define STA_SSID       ""
+#define STA_PASSWORD   ""
 
 #define MILKCOCOA_APP_ID      ""
 #define MILKCOCOA_DATASTORE   ""
 
-#define MILKCOCOA_PUSH
+//#define MILKCOCOA_PUSH
 #define MILKCOCOA_ON
 
 #define MILKCOCOA_SERVERPORT  1883
 
-ESP8266Client wifi;
+ESP8266Client wifi_client;
 
 const char MQTT_SERVER[] PROGMEM    = MILKCOCOA_APP_ID ".mlkcca.com";
 const char MQTT_CLIENTID[] PROGMEM  = __TIME__ MILKCOCOA_APP_ID;
 
-Milkcocoa milkcocoa = Milkcocoa(&wifi, MQTT_SERVER, MILKCOCOA_SERVERPORT, MILKCOCOA_APP_ID, MQTT_CLIENTID);
+Milkcocoa milkcocoa = Milkcocoa(&wifi_client, MQTT_SERVER, MILKCOCOA_SERVERPORT, MILKCOCOA_APP_ID, MQTT_CLIENTID);
 
 extern void onpush(DataElement *elem);
@@ -34 +34 @@
     Serial.println(); Serial.println();
     Serial.print("Connecting to ");
-    Serial.println(SSID);
+    Serial.println(STA_SSID);
 
-    ret = wifi.begin(Serial5, 115200);
+    ret = WiFi.begin(Serial5, 115200);
 
     if(ret == 1) {
@@ -44 +44 @@
         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);
@@ -53 +53 @@
 
     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 {
@@ -61 +61 @@
     }
     
-    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");
     }
 
-    if (wifi.stopServer()) {
+    if (WiFi.stopServer()) {
         Serial.print("Stop server ok\r\n");
     } else {
@@ -75 +75 @@
     }        
     
-    if (wifi.disableMUX()) {
+    if (WiFi.disableMUX()) {
         Serial.print("single ok\r\n");
     } else {