Diff: main.cpp

Revision:

3:a4f6abad9378

Parent:

2:ae85337d4ca7

Child:

5:445f35444a6a

--- a/main.cpp	Thu Jul 14 11:48:52 2016 +0000
+++ b/main.cpp	Fri Jul 15 02:08:48 2016 +0000
@@ -53,18 +53,7 @@
 }
 
 void AlohaDataEcho(AlohaFrame *frame)
-{    
-    // print received message
-    printf("AlohaDataHandler invoked\r\n");
-    printf("    Type: 0x%x, PayloadLength: 0x%x\r\n", frame->getType(), frame->getPayloadLength());
-    printf("    SrcAddr: 0x%x, DestAddr: 0x%x\r\n", frame->getSourceAddress(), frame->getDestinationAddress());
-    printf("    FMF: 0x%x, SequenceID: 0x%x\r\n", frame->getFullMessageFlag(), frame->getSequenceID());
-    for (uint8_t i = 0; i < frame->getPayloadLength(); i++)
-    {
-        printf("    Payload[%d]: 0x%x\r\n", i, frame->getPayload(i));
-    }
-    printf("    CRC: 0x%x\r\n", frame->getCrc());
-    
+{   
     // get rssi and snr
     uint16_t rssi = aloha.getRssi();
     uint8_t snr = aloha.getSnr();
@@ -91,6 +80,18 @@
     
     aloha.send(buffer, 20);
     
+    // print received message
+    printf("-----------------------------------------\r\n");
+    printf(">Received Frame\r\n");
+    printf(">    Type: 0x%x, PayloadLength: 0x%x\r\n", frame->getType(), frame->getPayloadLength());
+    printf(">    SrcAddr: 0x%x, DestAddr: 0x%x\r\n", frame->getSourceAddress(), frame->getDestinationAddress());
+    printf(">    FMF: 0x%x, SequenceID: 0x%x\r\n", frame->getFullMessageFlag(), frame->getSequenceID());
+    for (uint8_t i = 0; i < frame->getPayloadLength(); i++)
+    {
+        printf(">    Payload[%d]: 0x%x\r\n", i, frame->getPayload(i));
+    }
+    printf(">    CRC: 0x%x\r\n", frame->getCrc());
+    printf("-----------------------------------------\r\n");
 }
 
 int main() {