Diff: main.cpp

Revision:

21:23bf4399020d

Parent:

20:257d56530ae1

Child:

22:576ee999b004

--- a/main.cpp	Tue Nov 25 15:22:53 2014 +0000
+++ b/main.cpp	Wed Nov 26 12:10:09 2014 +0000
@@ -8,33 +8,38 @@
 const float timeunit = 1/(128*499.2e6);
 int i=0;
 char message[1200] = "";
-uint64_t timestamp_old = 0;
+uint64_t TX_timestamp = 0;
+uint64_t RX_timestamp = 0;
 
 void callbackRX(int framelength) {
-    if (framelength<200) {
+    RX_timestamp = dw.readRegister40(DW1000_RX_TIME, 0);
+    if (framelength < 200) {
         char* receive = dw.receiveString();                             // receive a string
         pc.printf("Received: \"%s\" %d ", receive, framelength);
+#if 0
+        pc.printf("Status: %010llX  ", dw.getStatus());
+        sprintf(message, "ACK \"%s\"", receive);
+        dw.sendString(message);
+        wait(0.1);
+#endif
         delete[] receive;
     } else
         pc.printf("Received! %d ", framelength);
     
-    pc.printf("Status: %010llX  ", dw.getStatus());
-    
-    uint64_t timestamp = dw.readRegister40(DW1000_RX_TIME, 0);
-    uint64_t difference = timestamp - timestamp_old;
-    timestamp_old = timestamp;
+    uint64_t difference = RX_timestamp - TX_timestamp;
     //pc.printf("Timestamp: %lld\r\n", difference);
-    pc.printf("Timestamp: %fs\r\n", difference*timeunit);       // TODO: gives some wrong values because of timer overflow
+    pc.printf("Time since TX: %fs\r\n", difference*timeunit);       // TODO: gives some wrong values because of timer overflow
     dw.startRX();
 }
 
 void callbackTX() {
-    char messagecheck[1200];
-    dw.readRegister(DW1000_TX_BUFFER, 0, (uint8_t*)messagecheck, strlen(message)+1);
+    TX_timestamp = dw.readRegister40(DW1000_TX_TIME, 0);
+    char messagecheck[1021];
+    dw.readRegister(DW1000_TX_BUFFER, 0, (uint8_t*)messagecheck, 1021);
     if (i < 200)
-        pc.printf("%d Sent: \"%s\" %d ", i, messagecheck, strlen(message)+1);
+        pc.printf("%d Sent: \"%s\" %d ", i, messagecheck, strlen(messagecheck)+1);
     else
-        pc.printf("%d Sent! %d ", i, strlen(message)+1);
+        pc.printf("%d Sent! %d ", i, strlen(messagecheck)+1);
     pc.printf("Status: %010llX\r\n", dw.getStatus());
 }
 
@@ -49,22 +54,18 @@
     dw.callbackTX = &callbackTX;
     
     // Receiver initialisation
-    dw.writeRegister16(DW1000_SYS_MASK, 0, 0x4080); // TODO: RX only good frame 0x4000, RX all frames 0x2000, TX done 0x0080
+    dw.writeRegister16(DW1000_SYS_MASK, 0, 0x4000); //| 0x0080); // TODO: RX only good frame 0x4000, RX all frames 0x2000, TX done 0x0080
     dw.startRX();
     
     while(1) {
 #if 1
-        if(i < 1200) {
-            message[i] = 48+ (i%10);
-            message[i+1] = '\0';
-        }
-        
-        wait(0.01);
+        wait(10);
+        sprintf(message, "Hi %d", i);
         dw.sendString(message);
-        
+        wait(0.3);
 #endif
 #if 0
-        pc.printf("%d Waiting...  ", i);
+        pc.printf("%d Waiting... %d %d ", i, dw.receiving, dw.sending);
         pc.printf("Status: %010llX\r\n", dw.getStatus());
         wait(5);
 #endif