Commit: fb1963284ac1e29034dd58db957318f192637a66 - LoRa_Farm_IOT (git)

Commit MetaInfo

• Revision: fb1963284ac1e29034dd58db957318f192637a66 (tree)
• Zeit: 2018-11-21 23:02:55
• Autor: kazuhiro_kondow <simauma.circus@gmai...>
• Commiter: kazuhiro_kondow

Log Message

The event that the Curl command could not be issued from LG 01 to the server via Bridge resolved

Ändern Zusammenfassung

• delete: "\351\226\213\347\231\272\343\203\255\343\202\260Book1.xlsx"
• modified: LoRa_farme/server_lg01/server_lg01.ino
• modified: Yun/Sketch_jun01a_bridge/sketch_jun01a_bridge.ino

Diff

--- a/LoRa_farme/server_lg01/server_lg01.ino
+++ b/LoRa_farme/server_lg01/server_lg01.ino
@@ -6,18 +6,15 @@
   Then send the value to Database Server
 */
 
-#include <SPI.h>
 #include <RH_RF95.h>
-#include <Bridge.h>
-#include <RTClib.h>
-#include <String.h>
 #include <Process.h>
 
 // Objects
 RH_RF95 rf95;
 
 #define BAUDRATE 115200
-const char* const PostUrl = "http://shimauma-circus.sakura.ne.jp/webapp/iot/dataentry  -X POST -d \"data=";
+#define MAX_DATA_SIZE 50
+const char* const PostUrl = "http://shimauma-circus.sakura.ne.jp/webapp/iot/dataentry";
 uint16_t crcdata = 0;
 uint16_t recCRCData = 0;
 float frequency = 920.0;
@@ -31,19 +28,12 @@ void runCurl(const char*param);
 
 void setup()
 {
-    // Bridge takes about two seconds to start up
-    // it can be helpful to use the on-board LED
-    // as an indicator for when it has initialized
-    pinMode(A2, OUTPUT);
-    digitalWrite(A2, LOW);
-    Bridge.begin(BAUDRATE);
-    digitalWrite(A2, HIGH);
 
+    Bridge.begin(BAUDRATE);
     Console.begin();
 
     // wait for a serial connection
-    while (!Console)
-        ;
+    while (!Console);
 
     // Setup rf95
     if (!rf95.init())
@@ -61,11 +51,11 @@ void setup()
 void loop()
 {
     //receive data buffer
-    uint8_t buf[RH_RF95_MAX_MESSAGE_LEN];
+    uint8_t buf[MAX_DATA_SIZE];
     //data buffer length
     uint8_t len = sizeof(buf);
     //post data buffer
-    char postdata[RH_RF95_MAX_MESSAGE_LEN] = {'\0'};
+    char postdata[MAX_DATA_SIZE] = {'\0'};
 
     // Listen Data from LoRa Node
     if (rf95.waitAvailableTimeout(2000))
@@ -87,12 +77,10 @@ void loop()
              }
              Console.println("");
 
-            snprintf(postdata,RH_RF95_MAX_MESSAGE_LEN,"%s",PostUrl);
             for (int i = 0; i < len; i++)
             {
                 snprintf(postdata,RH_RF95_MAX_MESSAGE_LEN,"%s%02x",postdata,buf[i]);
             }
-            snprintf(postdata,RH_RF95_MAX_MESSAGE_LEN,"%s%s",postdata,"\"");
             Console.println(postdata);
             runCurl(postdata);
 
@@ -184,17 +172,26 @@ boolean rcvSensorData(uint8_t *buf,uint8_t *len)
 }
 
 void runCurl(const char*param) {
-  Process p;
-  p.begin("curl");  
-  p.addParameter(param); 
-  p.run(); 
-
-  while (p.available() > 0) {
-    char c = p.read();
-    Console.print(c);
-  }
-  Console.println("");
-  Console.println("Process is not available!");
-  
-  Console.flush();
+    Process process;
+    char mbuffer[100] = {'\0'};
+    snprintf(mbuffer,100,"data=%s",param);
+    Console.print(mbuffer);
+    
+    process.begin("curl");  
+    process.addParameter(PostUrl); 
+    process.addParameter("-i"); 
+    process.addParameter("-X"); 
+    process.addParameter("POST"); 
+    process.addParameter("-d"); 
+    process.addParameter(mbuffer); 
+    process.run(); 
+
+    while (process.available() > 0) {
+        char c = process.read();
+        Console.print(c);
+    }
+    Console.println("");
+    Console.println("Process is not available!");
+
+    Console.flush();
 }

--- a/Yun/Sketch_jun01a_bridge/sketch_jun01a_bridge.ino
+++ b/Yun/Sketch_jun01a_bridge/sketch_jun01a_bridge.ino
@@ -1,8 +1,18 @@
-#include<Process.h>
+#include <Process.h>
+
 #define BAUDRATE 115200
+
+// Objects
+Process process;
+
+const char* const PostUrl = "http://shimauma-circus.sakura.ne.jp/webapp/iot/dataentry";
+
+// ProtType
+void runCurl(const char*param);
+
 void setup() {
-  // put your setup code here, to run once:
 
+  // put your setup code here, to run once:
   // Bridge startup
   pinMode(A2, OUTPUT);
   digitalWrite(A2, LOW);
@@ -17,23 +27,34 @@ void setup() {
 }
 
 void loop() {
-  // put your main code here, to run repeatedly:
-  runCurl("http://10.130.1.209:80/pythontest.py");
+  runCurl("sendTestData");
   while(1);
+  
 }
 
 void runCurl(const char*param) {
-  Process p;
-  p.begin("curl");  
-  p.addParameter(param); 
-  p.run(); 
+    char mbuffer[100] = {'\0'};
+    snprintf(mbuffer,100,"data=%s",param);
+    Console.print(mbuffer);
+    
+    process.begin("curl");  
+    process.addParameter(PostUrl); 
+    process.addParameter("-i"); 
+    process.addParameter("-X"); 
+    process.addParameter("POST"); 
+    process.addParameter("-d"); 
+    process.addParameter(mbuffer); 
+    process.run(); 
 
-  while (p.available() > 0) {
-    char c = p.read();
+    while (process.available() > 0) {
+    char c = process.read();
     Console.print(c);
-  }
-  Console.println("");
-  Console.println("Process is not available!");
-  
-  Console.flush();
-}
+    }
+    Console.println("");
+    Console.println("Process is not available!");
+
+    Console.flush();
+}
+
+
+

Binary files "a/\351\226\213\347\231\272\343\203\255\343\202\260Book1.xlsx" and "b/\351\226\213\347\231\272\343\203\255\343\202\260Book1.xlsx" differ