Diff: main.cpp

Revision:

6:bc4901a948b1

Parent:

4:e1d2c6f94c69

Child:

7:bda2a6a118f7

--- a/main.cpp	Fri Nov 04 12:14:43 2016 +0000
+++ b/main.cpp	Sat Nov 05 07:50:59 2016 +0000
@@ -37,7 +37,6 @@
 }
 
 float val;
-int mathtest;
 bool out=false;
 unsigned char RH,RL,TH,TL;
 unsigned char data_byte;
@@ -69,12 +68,6 @@
     
     while(true)
     {   
-        wait(1);
-        int temp = TH;
-        int hum = RH;
-        int gas = myInA1.read();
-        int led = myOutD12.read();
-        static int val;
         if(num)
         {
             if (num == 4)
@@ -82,13 +75,14 @@
             else if (num == 3)
                 val = RH;
             else if (num == 2)
-                val = gas;
+                val = myInA1.read();
             else if (num == 1)
-                val = led;
+                val = myOutD12.read();
         }
-        //ceil(val);//math.h
-        pc.printf("send_data=%d,n=%d\r\n",val,mathtest);
+        //int mathtest = ceil(val);//math.h
+        pc.printf("send_data=%d\r\n",val);
         pc.printf("start http_post\r\n");
+        wait(1);
         if(http_POST(conn, val))
         {
             if(!conn.close()){//短连接，断开一次连接一次
@@ -104,7 +98,7 @@
         }
         
         val = 0.0;  
-        mathtest = 0; 
+        //mathtest = 0; 
         
         if(out)break;
     }
@@ -212,310 +206,6 @@
     return true;
 }
 
-/*socket GET*/
-bool socket_GET(TCPSocketConnection &conn)
-{
-    if(conn.is_connected()){
-        pc.printf("connect is already ok!\r\n");    
-    }else{
-        if(!conn.connect("iot.espressif.cn", socketPort)) //80 for http,8000 for socket,处理超时，拔掉网线后，卡在conn.connect
-            pc.printf("connect OK!\r\n");
-        else{
-            pc.printf("connct ERR!\r\n");
-            out = true;
-            return false;    
-        }
-    }
-    
-    cJSON * pJsonRoot = NULL;
-    pJsonRoot = cJSON_CreateObject();
-    if(NULL == pJsonRoot)
-    {
-        pc.printf("socket_GET OUT1\r\n");
-        out = true;
-        return false;
-    }
-
-    cJSON * pSubJson = NULL;
-    pSubJson = cJSON_CreateObject();
-    if(NULL == pSubJson)
-    {
-         cJSON_Delete(pJsonRoot);
-         pc.printf("socket_GET OUT2\r\n");
-         out = true;
-         return false;
-    }
-
-    cJSON_AddStringToObject(pJsonRoot, "path", "/v1/datastreams/test/datapoint/");  
-    cJSON_AddStringToObject(pSubJson, "Authorization", "token 48661aa81484f501362ed5ef4cc85e67eb2a3e3d");
-    cJSON_AddItemToObject(pJsonRoot, "meta", pSubJson);
-    cJSON_AddStringToObject(pJsonRoot, "method", "GET");  
-      
-    char* pJSON = cJSON_PrintUnformatted(pJsonRoot);
-    strcat(pJSON,"\n");//socket at the end should have '\n',use wireshark
- 
-    if(NULL == pJSON)
-    {
-        cJSON_Delete(pJsonRoot);
-        pc.printf("socket_GET OUT3\r\n");
-        out = true;
-        return false;
-    }
-    
-    conn.send_all(pJSON, strlen(pJSON));//http_cmd for http,pJSON for socket,should be three changes
-    pc.printf("%s\r\n",pJSON);
-    
-    char *buffer = NULL;
-    buffer = (char *)malloc(MallocSize);
-    if(!buffer)pc.printf("malloc buffer err\r\n");
-    int ret;
-
-    while (true) {
-        wait(1);
-        ret = conn.receive(buffer, MallocSize-1);
-        pc.printf("ret = %d\r\n",ret);
-        if (ret <= 0) {
-            break;
-        }
-        buffer[ret] = '\0';
-        pc.printf("Received %d chars from server: %s\n", ret, buffer);     
-    }
-    pc.printf("socket_GET OUT\r\n");
-    
-    free(pJSON);//for socket
-    cJSON_Delete(pJsonRoot);//for socket
-    free(buffer);
-    return true;
-}
-
-/*http_GET*/
-bool http_GET(TCPSocketConnection &conn)
-{
-    if(conn.is_connected()){
-        pc.printf("connect is already ok!\r\n");    
-    }else{
-        if(!conn.connect("iot.espressif.cn", httpPort)) //80 for http,8000 for socket
-            pc.printf("connect OK!\r\n");
-        else{
-            pc.printf("connct ERR!\r\n");
-            out = true;
-            return false;    
-        }
-    }
-    
-    char http_cmd[] = "GET /v1/datastreams/test/datapoint/ HTTP/1.1\r\nUser-Agent: curl/7.22.0 (i686-pc-linux-gnu) libcurl/7.22.0 OpenSSL/1.0.1 zlib/1.2.3.4 libidn/1.23 librtmp/2.3\r\n"\
-                      "Host:iot.espressif.cn\r\nAccept: */*\r\nAuthorization: token ebe1671e9d9f42a5231d017ec550552b9bae2cdf\r\n\r\n";
-    
-    conn.send_all(http_cmd, strlen(http_cmd));//http_cmd for http,pJSON for socket,should be three changes
-    pc.printf("%s\r\n",http_cmd);
-    
-    //char *buffer = NULL;
-    //buffer = (char *)malloc(MallocSize);
-    //if(!buffer)pc.printf("malloc buffer err\r\n");
-    char buffer[500];
-    int ret;
-
-    while (true) {
-        wait(1);
-        ret = conn.receive(buffer, 500-1);
-        pc.printf("ret = %d\r\n",ret);
-        if (ret <= 0) {
-            break;
-        }
-        buffer[ret] = '\0';
-        pc.printf("Received %d chars from server: %s\n", ret, buffer);     
-    }
-    pc.printf("http_GET OUT\r\n");
-    /* ///conn.close
-    if(conn.close()){
-        pc.printf("conn.close OK\r\n");    
-    }else{
-        pc.printf("conn.close ERR\r\n");    
-    }
-    */
-    //free(buffer);
-    return true;
-}
-
-/*socket POST*/
-bool socket_POST(TCPSocketConnection &conn,int vall)
-{   
-    if(conn.is_connected()){
-        pc.printf("connect is already ok!\r\n");    
-    }else{
-        if(!conn.connect("iot.espressif.cn", socketPort)) //80 for http,8000 for socket
-            pc.printf("connect OK!\r\n");
-        else{
-            pc.printf("connct ERR!\r\n");
-            out = true;
-            return false;    
-        }
-    }
-    cJSON* socket_post=NULL;  
-    socket_post = cJSON_CreateObject();    
-    if(NULL == socket_post)
-    {
-         pc.printf("OUT4\r\n");
-         out = true;
-         return false;
-    }
-    
-    
-    cJSON_AddStringToObject(socket_post, "path", path); 
-    cJSON_AddStringToObject(socket_post, "method", "POST"); 
-    
-    cJSON* sock_post_token=NULL;  
-    sock_post_token = cJSON_CreateObject();    
-    if(NULL == sock_post_token)
-    {
-         cJSON_Delete(socket_post);
-         pc.printf("OUT5\r\n");
-         out = true;
-         return false;
-    }
-    cJSON_AddStringToObject(sock_post_token, "Authorization", "token 514cc9c3aa07a4a56246cb9259c8264fd2ae56f6");
-    cJSON_AddItemToObject(socket_post, "meta", sock_post_token);
-    
-    cJSON* sock_post_xyz=NULL;  
-    sock_post_xyz = cJSON_CreateObject();    
-    if(NULL == sock_post_xyz)
-    {
-         cJSON_Delete(socket_post);
-         pc.printf("OUT6\r\n");
-         out = true;
-         return false;
-    }
-    cJSON_AddNumberToObject(sock_post_xyz, "x", vall);
-    //cJSON_AddNumberToObject(sock_post_xyz, "y", 8);
-    //cJSON_AddNumberToObject(sock_post_xyz, "z", 8);
-    cJSON* sock_post_datapoint=NULL;  
-    sock_post_datapoint = cJSON_CreateObject();    
-    if(NULL == sock_post_datapoint)
-    {
-         cJSON_Delete(socket_post);
-         pc.printf("OUT6\r\n");
-         out = true;
-         return false;
-    }
-    cJSON_AddItemToObject(sock_post_datapoint, "datapoint", sock_post_xyz);
-    cJSON_AddItemToObject(socket_post, "body", sock_post_datapoint);
-    
-    char* pJSON_sock_post = cJSON_PrintUnformatted(socket_post);
-
-    if(NULL == pJSON_sock_post)
-    {
-        cJSON_Delete(socket_post);
-        pc.printf("OUT7\r\n");
-        out = true;
-        return false;
-    } 
-    strcat(pJSON_sock_post,"\n");
-    
-    conn.send_all(pJSON_sock_post, strlen(pJSON_sock_post));//http_cmd for http,pJSON for socket,should be three changes
-    pc.printf("%s\r\n",pJSON_sock_post); 
-    
-    char *buffer = NULL;
-    buffer = (char *)malloc(MallocSize);
-    if(!buffer)pc.printf("malloc buffer err\r\n");
-
-    int ret;
-
-    while (true) {
-        ret = conn.receive(buffer, MallocSize-1);
-        pc.printf("ret = %d\r\n",ret);
-        if (ret <= 0) {
-            break;
-        }
-        buffer[ret] = '\0';
-        pc.printf("Received %d chars from server: %s\n", ret, buffer);     
-    }
-    pc.printf("socket_POST OUT\r\n");
-    
-    free(pJSON_sock_post);
-    free(buffer);
-    cJSON_Delete(socket_post);
-
-    return true;  
-}
-
-bool closeConnect(TCPSocketConnection &conn)
-{
-    if(conn.is_connected()){
-        pc.printf("connect is already ok!\r\n");    
-    }else{
-        if(!conn.connect("iot.espressif.cn", socketPort)) //80 for http,8000 for socket
-            pc.printf("connect OK!\r\n");
-        else{
-            pc.printf("connct ERR!\r\n");
-            out = true;
-            return false;    
-        }
-    }
-    
-
-    cJSON* close_post=NULL;  
-    close_post = cJSON_CreateObject();    
-    if(NULL == close_post)
-    {
-         pc.printf("OUT4\r\n");
-         out = true;
-         return false;
-    }
-    
-    
-    cJSON_AddStringToObject(close_post, "path", "/v1/The_Gas/quit/"); 
-    cJSON_AddStringToObject(close_post, "method", "POST"); 
-    
-    cJSON* close_post_token=NULL;  
-    close_post_token = cJSON_CreateObject();    
-    if(NULL == close_post_token)
-    {
-         cJSON_Delete(close_post);
-         pc.printf("OUT5\r\n");
-         out = true;
-         return false;
-    }
-    cJSON_AddStringToObject(close_post_token, "Authorization", "token 514cc9c3aa07a4a56246cb9259c8264fd2ae56f6");
-    cJSON_AddItemToObject(close_post, "meta", close_post_token);  
-    
-    char* close_pJSON = cJSON_PrintUnformatted(close_post);
-
-    if(NULL == close_pJSON)
-    {
-        cJSON_Delete(close_post);
-        pc.printf("OUT7\r\n");
-        out = true;
-        return false;
-    } 
-    strcat(close_pJSON,"\n");
-    
-    conn.send_all(close_pJSON, strlen(close_pJSON));//http_cmd for http,pJSON for socket,should be three changes
-    pc.printf("%s\r\n",close_pJSON); 
-    
-    char *buffer = NULL;
-    buffer = (char *)malloc(MallocSize);
-    if(!buffer)pc.printf("malloc buffer err\r\n");
-
-    int ret;
-
-    while (true) {
-        ret = conn.receive(buffer, MallocSize-1);
-        pc.printf("ret = %d\r\n",ret);
-        if (ret <= 0) {
-            break;
-        }
-        buffer[ret] = '\0';
-        pc.printf("Received %d chars from server: %s\n", ret, buffer);     
-    }
-    pc.printf("close_POST OUT\r\n");
-    
-    free(close_pJSON);
-    free(buffer);
-    cJSON_Delete(close_post);
-
-    return true;
-}
-
 unsigned char receive_byte()
 {
     unsigned char i,temp;
@@ -560,9 +250,9 @@
         T_H=receive_byte();
         T_L=receive_byte();
         check=receive_byte();
-        pc.printf("--R_H--%d---R_L---%d--T_H--%d---T_L---%d\r\n", R_H,R_L,T_H,T_L);
+        //pc.printf("--R_H--%d---R_L---%d--T_H--%d---T_L---%d\r\n", R_H,R_L,T_H,T_L);
         Delay_us(20);
-        num_check=R_H+R_L+T_H+T_L;pc.printf("--num_check--%d---check---%d\r\n", num_check,check);
+        num_check=R_H+R_L+T_H+T_L;//pc.printf("--num_check--%d---check---%d\r\n", num_check,check);
         if(num_check==check)
         {
             RH=R_H;