Diff: main.cpp

Revision:

2:e8b13ea2881b

Parent:

0:4d16a55d0eec

Child:

3:2ce0da6b91dc

--- a/main.cpp	Fri Dec 30 20:23:00 2011 +0000
+++ b/main.cpp	Mon Jan 02 03:53:46 2012 +0000
@@ -1,47 +1,36 @@
 #include "mbed.h"
+#include "WatchDogTimer.h"
 #include "radioEmulator.h"
-#include "WatchDogTimer.h"
 #include "ecu_reader.h"
 
+#include "Eth.h"
+
 WatchDogTimer wdt;
 
-RadioEmulator *radio;
+Eth eth;
 
-Ticker obdTicker;
+RadioEmulator *radio;
 ecu_reader *obdii;
-char buffer[128];
-void readOBD(void);
+
+CAN interiorBus(p30,p29);
+CAN obd2Bus(p9,p10);
 
 int main()
 {
-    CAN can1(p9,p10);
-    obdii = new ecu_reader(&can1, CANSPEED_500);     //Create object and set CAN speed
-    
-    obdTicker.attach(readOBD, 5);
+    radio = new RadioEmulator(&interiorBus, wdt.TimedOut());
+
+    obdii = new ecu_reader(&obd2Bus, CANSPEED_500);     //Create object and set CAN speed    
 
     wdt.kick(2);
-    radio = new RadioEmulator();
+
     while (1)
     {
+        eth.Operate();
+        
         radio->readCANbus();
-        radio->HostComm();
         
-        obdii->readCAN();
+        obdii->UpdateData();
         
         wdt.kick();        
     }
-}
-
-void readOBD(void)
-{
-    printf("Trying OBD-II data\n\r");
-    
-    obdii->request(VEHICLE_SPEED);
-    obdii->request(MAF_SENSOR);
-    obdii->request(FUEL_LEVEL);
-
-    obdii->request(ENGINE_RPM);
-    obdii->request(ENGINE_COOLANT_TEMP);
-    obdii->request(THROTTLE);
-    obdii->request(O2_VOLTAGE);
 }
\ No newline at end of file