jetfishteam / Mbed 2 deprecated jetfish

the fish that looks like a jet

Dependencies:   ADXL345 ADXL345_I2C IMUfilter ITG3200 mbed Servo

Diff: motor_controller.h

Revision:
10:d9f1037f0cb0
Parent:
8:0574a5db1fc4
Child:
11:8ec915eb70f6
diff -r 8dd7a76756e2 -r d9f1037f0cb0 motor_controller.h
--- a/motor_controller.h	Fri Jan 31 04:53:10 2014 +0000
+++ b/motor_controller.h	Fri Jan 31 05:18:19 2014 +0000
@@ -16,7 +16,7 @@
     
     //for driving
     float phi1, ome1,amp1;
-    
+    bool firstTime;
     
     public:
     PololuMController();
@@ -25,6 +25,6 @@
     void setspeed(float speed);         //0 to 1
     void setpolarspeed(float speed);    //-1 to 1
     void reverse();                     //only works on non-polar speed
-    void drive_sinusoidal(float currentTime, float amplitude, float frequency);
+    float drive_sinusoidal(float currentTime, float amplitude, float frequency);
     void drive_rectangular(float currentTime, float amplitude, float frequency);
 };
\ No newline at end of file