Colin Stearns / Mbed 2 deprecated qcControl

QC Control software

Dependencies:   mbed

Fork of dgps by Colin Stearns

Diff: main.cpp

Revision:
9:da906eeac51e
Parent:
8:28b866df62cf
Child:
11:97625c27ab90
--- a/main.cpp	Tue Apr 01 17:58:35 2014 +0000
+++ b/main.cpp	Thu Apr 03 17:15:29 2014 +0000
@@ -2,7 +2,8 @@
 #include <string>
 #include <sstream>
 #include "adapt/usb.h"
-#include "adapt/camera.h"
+#include "handle/handleCamera.h"
+#include "handle/handleGPS.h"
 
 Serial pc(USBTX,USBRX);
 Serial xbee(p9,p10);//tx, rx
@@ -103,7 +104,7 @@
 int main()
 {
     ImageHandle imageHand;
-    GPSHand gpsHand;
+    GPSHandle gpsHand;
 
     /// Main Loop
     while(true) {
@@ -115,6 +116,7 @@
         while(true) {
             pc.putc(gps.getc());
         }
-        gps.attach(&handleGpsData, Serial::RxIrq);
-        xbee.attach(&handleXbeeGps, Serial::RxIrq)//;
+        //gps.attach(&handleGpsData, Serial::RxIrq);
+        //xbee.attach(&handleXbeeGps, Serial::RxIrq)//;
     }
+}