Diff: main.cpp

Revision:

6:d2f9034ca30c

Parent:

5:46f139e53b15

Child:

7:ed2867165b19

--- a/main.cpp	Tue Jan 24 02:18:42 2012 +0000
+++ b/main.cpp	Mon May 28 18:57:13 2012 +0000
@@ -1,7 +1,9 @@
-#include "mbed.h"
+#include "rtg_mbed_bob.h"
+
+
 #include "WatchDogTimer.h"
 #include "radioEmulator.h"
-#include "ecu_reader.h"
+#include "OBDII.h"
 
 #include "Eth.h"
 
@@ -10,16 +12,21 @@
 Eth eth;
 
 RadioEmulator *radio;
-ecu_reader *obdii;
+OBDII *obdii;
 
-CAN interiorBus(p30,p29);
-CAN obd2Bus(p9,p10);
+CAN *interiorBus = &can2;
+CAN *obd2Bus = &can1;
+    
+DigitalOut *interior_RS = &can2_rs;
+InterruptIn *interiorIRQ = &can2_irq;
+
+DigitalOut *obdii_RS = &can1_rs;
 
 int main()
 {
-    radio = new RadioEmulator(&interiorBus, wdt.TimedOut());
+    radio = new RadioEmulator(interiorBus, interior_RS, interiorIRQ, wdt.TimedOut());
 
-//    obdii = new ecu_reader(&obd2Bus, CANSPEED_500);     //Create object and set CAN speed    
+    obdii = new OBDII(obd2Bus, obdii_RS, CANSPEED_500);     //Create object and set CAN speed    
 
     wdt.kick(2);
 
@@ -27,7 +34,7 @@
     {
         eth.Operate();
         radio->Operate();
-//        obdii->UpdateData();
+        obdii->UpdateData();
         
         wdt.kick();        
     }