My modifications/additions to the code

Dependencies:   ADXL345 ADXL345_I2C IMUfilter ITG3200 Servo fishgait mbed-rtos mbed pixy_cam

Fork of robotic_fish_ver_4_8 by jetfishteam

Revision:
19:655db88b045c
Parent:
18:9ba4566f2361
Child:
20:6ae16da1492a
--- a/MainController.h	Thu May 22 13:35:01 2014 +0000
+++ b/MainController.h	Wed May 28 01:48:23 2014 +0000
@@ -34,8 +34,9 @@
     float getFrequency();
     float getVolume();
     float getAmplitude();
-    float getRudder();
+    float getYaw();
     float getPitch();
+    float getTimeAdd();
     
     /** Stop the main controller
      *
@@ -47,8 +48,8 @@
 protected:        
     void control();
     float calculateFrequency();
-    float calculateVolume();
-    float calculateRudder();
+    float calculateAmplitude();
+    float calculateYaw();
     float calculatePitch();
     float signum(float input);
     float saturate(float input);
@@ -66,18 +67,25 @@
     
     Timer timer1;
     Ticker ticker1;
-    float vol;
+    float amp;
     float frq;
     float dutyCycle;
     float curTime;
     float frqMin;
     float frqMax;
-    float amplitude;
-    float rud;
+    float yaw;
     float pitch;
     
-    int state;
-    int change;
+    bool fullCycle;
+    float volume;
+    float volChg;
+    float volMax;
+    float frqCmd;
+    float timeAdd;
+    float ampNew;
+    float ampCmd;
+    //int state;
+    //int change;
     //float goofftime;
     //bool switched;
 };