Changeset 256 for rtos_arduino

Timestamp:

Aug 11, 2016, 9:09:39 PM (8 years ago)

Author:

ertl-honda

Message:

プログラムの見直し

File:

• rtos_arduino/trunk/examples/IotText/sample4/rca_app.cpp (modified) (5 diffs)

rtos_arduino/trunk/examples/IotText/sample4/rca_app.cpp

@@ -4 +4 @@
 #include "../../examples_gdef.h"
 
-#define IFTTT_KEY       "h3VxLLschaMLhQrbKJ3fvN-3sdBFFxITDumQObU-iSr"
-#define EVENT_NAME      "maker2email"
+#define IFTTT_KEY       ""
+#define EVENT_NAME      ""
 
 #define HOST_NAME       "maker.ifttt.com"
@@ -11 +11 @@
 
 #define WiFi wifi
-#define LED_RED 2
-#define TOUCH_SW 3
+#define TOUCH_SW 2
 
 ESP8266 WiFi;
@@ -76 +75 @@
 }
 
+char buffer[1024];
+const char request1[] = "GET /trigger/" EVENT_NAME "/with/key/" IFTTT_KEY "/";
+const char request2[] = " HTTP/1.1\r\nHost: " HOST_NAME "\r\nConnection: close\r\n\r\n";
+
 void loop()
 {
@@ -82 +85 @@
         static int sw_st = 1;
 
-        switch(sw_st)
-        {
-        case 0:
-                if(digitalRead(TOUCH_SW))
-                {
+        switch(sw_st) {
+          case 0:
+                if(digitalRead(TOUCH_SW)) {
                         sw_push = 1;
                         sw_st = 1;
                 }
                 break;
-        default:
-                if(!digitalRead(TOUCH_SW))
-                {
+          default:
+                if(!digitalRead(TOUCH_SW)) {
                         sw_st = 0;
                 }
@@ -99 +99 @@
         }
 
-        if(sw_push)
-        {
-                value1++;
-                value2++;
-                value3++;
+        if(sw_push) {
+                value1++; value2++; value3++;
 
-                if (WiFi.createTCP(HOST_NAME, HOST_PORT)) {
-                        Serial.println("create tcp ok");
-                } else {
+                Serial.print("Send Touch Event and Extra Data ");
+                Serial.print(value1); Serial.print(", ");
+                Serial.print(value2); Serial.print(", ");
+                Serial.println(value3);
+
+                if (!WiFi.createTCP(HOST_NAME, HOST_PORT)) {
                         Serial.println("create tcp err");
+                        return;
                 }
-
-                char buffer[1024];
-                const char request1[] = "GET /trigger/" EVENT_NAME "/with/key/" IFTTT_KEY "/";
-                const char request2[] = " HTTP/1.1\r\nHost: " HOST_NAME "\r\nConnection: close\r\n\r\n";
 
                 sprintf(buffer, "%s?value1=%d&value2=%d&value3=%d%s", request1, value1, value2, value3, request2);
 
-#if 0
-                Serial.print(buffer);
-#endif
                 WiFi.send((const uint8_t*)buffer, strlen(buffer));
 
                 uint32_t len = WiFi.recv((uint8_t*)buffer, sizeof(buffer), 10000);
-                if (len > 0) {
-#if 0
-                        Serial.print("Received:[");
-                        for(uint32_t i = 0; i < len; i++) {
-                                Serial.print((char)buffer[i]);
-                        }
-                        Serial.println("]");
-#endif
-                }
 
-                if (WiFi.releaseTCP()) {
-                        Serial.println("release tcp ok");
-                } else {
+                if (!WiFi.releaseTCP()) {
                         Serial.println("release tcp err");
                 }