Merged to branch

Dependencies:   USBDevice mbed EquatorStrutController LightWeightSerialTransmit

Fork of EquatorStrutDigitalMonitor by Stewart Coulden-Smith

Files at this revision

API Documentation at this revision

Comitter:
alpesh
Date:
Mon Aug 11 13:48:04 2014 +0000
Parent:
8:7f6e81140f27
Child:
11:b6958b3dbddf
Commit message:
Adding Iterations and testing Proportional Term

Changed in this revision

main.cpp Show annotated file Show diff for this revision Revisions of this file
--- a/main.cpp	Mon Aug 11 09:19:19 2014 +0000
+++ b/main.cpp	Mon Aug 11 13:48:04 2014 +0000
@@ -533,14 +533,19 @@
 
     while(Enabled)
     {
-        double pow = 0.5;
-        for (int i = 0; i < 10; i++)
+        double pow = 0.0;
+        for (int i = 0; i < 20; i++)
         {
             //KpGain += 0.1;
             float iterationStart = RunningTime.read();
             
             pow += 0.05;
             
+            if (pow > 1.0)
+            {
+                pow = 1.0;
+            }
+            
             //while(RunningTime.read()-iterationStart < 10.0)
             //{
             //    SerialTransmit();