Diff: main.cpp

Revision:

22:807d5467fbf6

Parent:

21:835fd919b4bd

Child:

23:ef1be367726e

--- a/main.cpp	Tue Jun 03 15:30:09 2014 +0000
+++ b/main.cpp	Thu Jun 05 00:13:02 2014 +0000
@@ -4,26 +4,21 @@
 //#include "PwmReader.h"
 //#include "PwmIn.h"
 #include "MainController.h"
-
 Serial pc(USBTX, USBRX);
 Timer t;
 
 int main()
 {
     t.start();
-    
+
     MainController mainCtrl;
-    
-    // pixy cam!
-    pixySPI pcam(p5,p6,p7, 20, &pc);
-    //
-       
+
     mainCtrl.start();
 
+    //printf("started\n");
     while(true) {
-  
-        pc.printf("frq: %.2f, vol: %.2f, amp: %.2f, yaw: %.2f, dut: %.2f, pit: %.2f, adj: %.2f, tadd: %.2f, t: %.2f\n",
-         mainCtrl.getFrequency(), mainCtrl.getVolume(), mainCtrl.getAmplitude(), mainCtrl.getYaw(), mainCtrl.getDutyCycle(), mainCtrl.getPitch(), mainCtrl.getAdj(), mainCtrl.getTimeAdd(), t.read());
+        pc.printf("control: %d, frq: %.3f, vol: %.2f, amp: %.3f, yaw: %.2f, dut: %.2f, pit: %.2f, adj: %.2f, tadd: %.2f, t: %.2f\n",
+                  mainCtrl.getOpMode(), mainCtrl.getFrequency(), mainCtrl.getVolume(), mainCtrl.getAmplitude(), mainCtrl.getYaw(), mainCtrl.getDutyCycle(), mainCtrl.getPitch(), mainCtrl.getAdj(), mainCtrl.getTimeAdd(), t.read());
 
         wait_ms(100);
     }