Diff: Send.cpp

Revision:

17:2f728fd13bc0

Parent:

16:cdfcb63b2c4b

--- a/Send.cpp	Wed Mar 20 00:28:27 2013 +0000
+++ b/Send.cpp	Thu Mar 21 06:51:31 2013 +0000
@@ -23,8 +23,11 @@
 #include "XBee.h"
 #include <stdarg.h>
 
-#define LOCK()          NVIC_DisableIRQ(UARTx_IRQn[_serial.index])
-#define UNLOCK()        NVIC_EnableIRQ(UARTx_IRQn[_serial.index])
+#define LOCK()      NVIC_DisableIRQ(UARTx_IRQn[_serial.index])
+#define UNLOCK()    NVIC_EnableIRQ(UARTx_IRQn[_serial.index])
+#define INDEX(n)    ((n) % BUFSIZE)
+#define SIZE(b, i)  (b[i] << 8 | b[INDEX(i + 1)])
+
 const IRQn_Type UARTx_IRQn[] = {UART0_IRQn, UART1_IRQn, UART2_IRQn, UART3_IRQn};
 
 void XBee::sendCommand(const char *command, int8_t param, bool queue) {
@@ -208,7 +211,7 @@
 
     send(PREAMBLE);
 
-    if (apiMode == 2) {
+    if (api == 2) {
         send2((length >> 8) & 255);
         send2(length & 255);
         for (int i = 0; i < length; i++) {