Penn Electric Racing / Mbed 2 deprecated SystemManagement

Dependencies:   mbed CANBuffer Watchdog MODSERIAL mbed-rtos xbeeRelay IAP

Fork of SystemManagement by Martin Deng

Revision:
34:18bcf276d3bf
Parent:
33:6bc82b6b62e5
Child:
38:8efacce315ae
diff -r 6bc82b6b62e5 -r 18bcf276d3bf Libs/XbeeManager/XbeeManager.cpp
--- a/Libs/XbeeManager/XbeeManager.cpp	Tue Jan 06 20:45:26 2015 +0000
+++ b/Libs/XbeeManager/XbeeManager.cpp	Wed Jan 07 03:25:50 2015 +0000
@@ -1,9 +1,9 @@
 #include "XbeeManager.h"
 
-XbeeManager::XbeeManager(CANxbee* _x1, CANxbee* _x2)
+XbeeManager::XbeeManager(PinName tx1, PinName rx1, PinName tx2, PinName rx2, int baud, int txSize, int rxSize) :
+                        x1(tx1, rx1, baud, txSize, rxSize), x2(tx2, rx2, baud, txSize, rxSize)
 {
-    x1 = _x1;
-    x2 = _x2;
+    
     alternate = false;
     extraAvail = false;
     counterX1in = 0;
@@ -16,12 +16,12 @@
 {
     alternate = !alternate;
     if (alternate) {
-        if (x1->send(msg)) {
+        if (x1.send(msg)) {
             counterX1out++;
             return true;   
         }
     } else {
-        if (x2->send(msg)) {
+        if (x2.send(msg)) {
             counterX2out++;
             return true;   
         }
@@ -37,14 +37,14 @@
         counterX2in++;
         return true;
     }
-    if (x1->receive(msg)) {
-        if (x2->receive(extra)) {
+    if (x1.receive(msg)) {
+        if (x2.receive(extra)) {
             extraAvail = true;
         }
         counterX1in++;
         return true;
     } else {
-        if (x2->receive(msg)) {
+        if (x2.receive(msg)) {
             counterX2in++;
             return true;   
         }