Diff: xbee.cpp

Revision:

5:9e6a09a38785

Parent:

2:a9bb12eefc08

Child:

6:9ed8153f1328

--- a/xbee.cpp	Sat Sep 30 18:24:44 2017 +0000
+++ b/xbee.cpp	Sat Sep 30 18:36:28 2017 +0000
@@ -38,59 +38,6 @@
     return 0L;
 }
 
-bool transmit_request(char* buffer, int length)
-{
-    // Frame Type
-    /*TransmitBuffer[3] = 0x10;
-    
-    // Frame ID
-    TransmitBuffer[4] = 0x01;
-    
-    // Should set address if different from coordinator
-    //TransmitBuffer[5] = 
-    
-    // 16-bit address, broadcast address
-    TransmitBuffer[13] = 0xFF;
-    TransmitBuffer[14] = 0xFE;
-    
-    // Max hops, 0 = max
-    TransmitBuffer[15] = 0x00;
-    
-    // Transmit options
-    TransmitBuffer[16] = 0x00;
-    
-    // Insert buffer data
-    for (int i = 0; i < length; i++)
-    {
-        TransmitBuffer[17 + i] = buffer[i];
-    }   
-
-    for (int i = 0; i < 17 + length + 1; i++)
-    {
-        xbee_transmit_led = !xbee_transmit_led;
-        xbee.putc(TransmitBuffer[i]);
-    }*/
-    
-    return false;
-}
-
-
-int receive_buffer(char* buffer, int max_length)
-{
-    int length = 0;
-    
-    while(xbee.readable() && length < max_length)
-    {
-        xbee_receive_led = !xbee_receive_led;
-        buffer[length++] = xbee.getc();        
-    }       
-    
-    for (int i = 17; i < length - 1; i++)
-    {
-       // pc.putc(ReceiveBuffer[i]);
-    }
-    return length;    
-}
 
 void build_api_frame_header(int frame_data_size)
 {
@@ -238,7 +185,24 @@
 {
     for (int i = 0; i < 18 + packet_length; i++)
     {
-        xbee_transmit_led = !xbee_transmit_led;
         xbee.putc(TransmitBuffer[i]);
     }
-}
\ No newline at end of file
+    xbee_transmit_led = !xbee_transmit_led;
+}
+
+int receive(char* buffer, int max_length)
+{
+    int length = 0;
+    
+    while(xbee.readable() && length < max_length)
+    {
+        xbee_receive_led = !xbee_receive_led;
+        buffer[length++] = xbee.getc();        
+    }       
+    
+    for (int i = 17; i < length - 1; i++)
+    {
+       // pc.putc(ReceiveBuffer[i]);
+    }
+    return length;    
+}