Diff: main.cpp

Revision:

24:9d75ed1462d6

Parent:

23:ef1be367726e

Child:

25:4f2f441eceec

--- a/main.cpp	Thu Jun 05 17:32:51 2014 +0000
+++ b/main.cpp	Fri Jun 06 19:48:01 2014 +0000
@@ -1,26 +1,31 @@
 #include "mbed.h"
+//#include "rtos.h"
 #include "Servo.h"
 //#include "rtos.h"
 //#include "PwmReader.h"
 //#include "PwmIn.h"
 #include "MainController.h"
 Serial pc(USBTX, USBRX);
+//Serial syren(p9,p10); //syren replaced the pololu controller
 Timer t;
 
 int main()
 {
+    //syren.baud(38400);
     t.start();
 
     MainController mainCtrl;
 
     mainCtrl.start();
 
-    //printf("started\n");
+    printf("started\n");
     while(true) {
         pc.printf("control: %d, frq: %.3f, vol: %.2f, amp: %.3f, yaw: %.2f, dut: %.2f, pit: %.2f, adj: %.2f, t: %.2f\n",
                   mainCtrl.getOpMode(), mainCtrl.getFrequency(), mainCtrl.getVolume(), mainCtrl.getAmplitude(), mainCtrl.getYaw(), mainCtrl.getDutyCycle(), mainCtrl.getPitch(), mainCtrl.getAdj(), t.read());
 
-        //wait_ms(100);
+        //syren.putc(int(mainCtrl.getDutyCycle()));
+        //Thread::wait(100);
+        wait_ms(100);
     }
     //t.stop();
     //mainCtrl.stop();