Diff: Libs/xbeeRelay/XbeeRelay.cpp

Revision:

33:6bc82b6b62e5

Parent:

31:7eaa5e881b56

diff -r e70407021ad2 -r 6bc82b6b62e5 Libs/xbeeRelay/XbeeRelay.cpp
--- a/Libs/xbeeRelay/XbeeRelay.cpp	Sun Nov 16 02:43:58 2014 +0000
+++ b/Libs/xbeeRelay/XbeeRelay.cpp	Tue Jan 06 20:45:26 2015 +0000
@@ -1,7 +1,7 @@
 #include "XbeeRelay.h"
 #include "mbed.h"
-#include "MODDMA.h"
-#include "MODSERIAL.h"
+//#include "MODDMA.h"
+//#include "MODSERIAL.h"
 #include "PERMessage.h"
 
 #define MOTORCONID 0x181
@@ -17,8 +17,8 @@
 XbeeRelay::XbeeRelay() : Xbee_e1(p9,p10), Xbee_e2(p13,p14), counter(0) {
    Xbee_e1.baud(250000);
    Xbee_e2.baud(250000);
-   Xbee_e1.MODDMA(&dma);
-   Xbee_e2.MODDMA(&dma);
+  // Xbee_e1.MODDMA(&dma);
+   //Xbee_e2.MODDMA(&dma);
 }
 
 bool XbeeRelay::receive(CANMessage cm)  {
@@ -52,13 +52,13 @@
     char dataarr[pm.getLength() + 2];
     pm.getDataArray(dataarr);
     
-    if (!dma.Enabled(DMA_CHANNEL_XBEE_1)) {
-        Xbee_e1.dmaSend(dataarr, sizeof(dataarr), DMA_CHANNEL_XBEE_1);
+   /* if (!dma.Enabled(DMA_CHANNEL_XBEE_1)) {
+      //  Xbee_e1.dmaSend(dataarr, sizeof(dataarr), DMA_CHANNEL_XBEE_1);
         return true;
     } else if (!dma.Enabled(DMA_CHANNEL_XBEE_2)) {
-        Xbee_e2.dmaSend(dataarr, sizeof(dataarr), DMA_CHANNEL_XBEE_2);
+      //  Xbee_e2.dmaSend(dataarr, sizeof(dataarr), DMA_CHANNEL_XBEE_2);
         return true;
     }
-    
+    */
     return false;
 }
\ No newline at end of file