Diff: main.cpp

Revision:

10:d9f1037f0cb0

Parent:

9:8dd7a76756e2

Child:

11:8ec915eb70f6

--- a/main.cpp	Fri Jan 31 04:53:10 2014 +0000
+++ b/main.cpp	Fri Jan 31 05:18:19 2014 +0000
@@ -39,13 +39,12 @@
         
         float vol_norm=ch6.dutycyclescaledup();
         float freq_norm=ch3.dutycyclescaledup();
-        
-        
-        pc.printf("channel 3: %f, channel 6: %f\n", vol_norm, freq_norm);
+           
 
         //mcon.drive_rectangular(t.read(), vol_norm*freq_norm, 3*freq_norm);
         //mcon.drive_sinusoidal(t.read(), vol_norm*freq_norm, 3*freq_norm);
-        mcon.drive_sinusoidal(t.read(), vol_norm*freq_norm, 3*freq_norm);
+        float dutycycle = mcon.drive_sinusoidal(t.read(), vol_norm*freq_norm, freq_norm);
+        pc.printf("ch 3: %f, ch 6: %f, dc: %f, asin: %f\n", vol_norm, freq_norm, dutycycle, asin(sin(t.read())) );
         //pc.printf("time: %f\n\r", t.read());
         //pc.printf("throttle: %f frequency: %f rudder: %f\n\r",throttle,frequency,rudder);
         wait_ms(20);