Diff: main.cpp

Revision:

5:aad8eafb8702

Parent:

4:1a7fd4f12932

Child:

6:0ab34e2cd5dc

diff -r 1a7fd4f12932 -r aad8eafb8702 main.cpp
--- a/main.cpp	Fri Jan 25 00:58:36 2019 +0000
+++ b/main.cpp	Fri Jan 25 02:05:17 2019 +0000
@@ -16,7 +16,7 @@
 #define TIMEOUT 2000
 
 //Length of PUT (data) response
-#define PUT_ANS_LEN 9
+#define PUT_ANS_LEN 5
 //Length of GET (conf) response
 #define GET_ANS_LEN 10
 
@@ -55,20 +55,25 @@
     t.start();
     while(!wifi.readable() && t.read_ms() < TIMEOUT) {}
     if(wifi.readable()) 
-        ret = wifi.read(rx_buff, len, event_callback_t(&read_cb));
-    else 
+        //ret = wifi.read(rx_buff, len, event_callback_t(&read_cb));
+        wifi.gets((char*)rx_buff, len + 1);
+    else {
+        t.stop();
         return NULL;
+    }
     PCDBG("Started reading");
+    //t.reset();
+    //t.start();
     //while(read_finished == 0 && t.read_ms() < TIMEOUT) {}
-    while(read_finished == 0) {}
+    //while(read_finished == 0) {}
     t.stop();
     PCDBG("Finished Reading, ret = %d, read_finished = %d, time = %d", ret, read_finished, t.read_ms())
     HEXDBG(rx_buff, len);
-    if(read_finished != 1) {
-        wifi.abort_read();
-        read_finished = 0;
-        return NULL;
-    }
+    //if(read_finished != 1) {
+//        wifi.abort_read();
+//        read_finished = 0;
+//        return NULL;
+//    }
     read_finished = 0;
     CoapPDU* recvPDU = new CoapPDU(rx_buff, len);
     PCDBG("PDU created");
@@ -77,7 +82,7 @@
         recvPDU->printHuman();
         PCDBG("Code = %d", recvPDU->getCode());
         PCDBG("Payload:");
-        HEXDBG(recvPDU->getPayloadPointer(), len - 9);
+        HEXDBG(recvPDU->getPayloadPointer(), len - 6);
         return recvPDU;
     }
     return NULL;
@@ -156,6 +161,7 @@
 int get_config(uint8_t type) {
     uint8_t buff[1];
     uint8_t rx_buff[GET_ANS_LEN];
+    PCDBG("Gonna get the conf for type %d", type);
     buff[0] = type;
     CoapPDU pdu = CoapPDU();
     preparePDU(pdu);
@@ -187,8 +193,8 @@
     //int ret;
     int data = 1;
     while(1) {
-        //send_data(1, ++data); 
-        //wait(5);
+        send_data(1, ++data); 
+        wait(5);
         get_config(1);
         wait(5);
     }