Revision 4:4b093f9bd41c, committed 2014-10-22

Comitter:

alphasig

Date:

Wed Oct 22 20:43:07 2014 +0000

Parent:

3:b81a3d326aee

Child:

5:a7c0a09a7c58

Commit message:

Final Version of the Code

Changed in this revision

--- a/main.cpp	Wed Oct 22 02:06:11 2014 +0000
+++ b/main.cpp	Wed Oct 22 20:43:07 2014 +0000
@@ -16,7 +16,7 @@
 
 
 float servopos;
-float motorspeed;
+float motorspeed=.3;
 int counter=0;
 int counter1=0;
 
@@ -33,10 +33,11 @@
         while (Switch==1) {
 
 
-            for(servopos=.50; servopos<=.65; servopos+=.03) {
-                servo1=.77;
+            for(servopos=.40; servopos<=.60; servopos+=.03) {
+                servo1=.7;
                 servo2=servopos;
-
+                motorspeed=0;
+                m.speed(motorspeed);
                 counter=counter+1;
                 counter1=counter%20;
                 if (counter1==17) {
@@ -44,10 +45,11 @@
                 }
                 wait (.1);
             }
-            for(servopos=.50; servopos>=.45; servopos-=.03) {
-                servo1=.77;
+            for(servopos=.60; servopos>=.40; servopos-=.03) {
+                servo1=.7;
                 servo2=servopos;
-
+                motorspeed=0;
+                m.speed(motorspeed);
                 counter=counter+1;
                 counter1=counter%20;
                 if (counter1==17) {
@@ -55,14 +57,15 @@
                 }
                 wait (.1);
             }
-        }
+        }//Swartzwelder  swartzwe.usna.edu
         while(Switch==2) {
 
 
-            for(servopos=.38; servopos<=.72; servopos+=.03) {
-                servo1=servopos+.5;
-                servo2=.52;
-
+            for(servopos=.40; servopos<=.60; servopos+=.03) {
+                servo1=servopos+.2;
+                servo2=.5;
+                motorspeed=0;
+                m.speed(motorspeed);
                 counter=counter+1;
                 counter1=counter%20;
                 if (counter1==17) {
@@ -70,10 +73,11 @@
                 }
                 wait (.03);
             }
-            for(servopos=.72; servopos>=.38; servopos-=.03) {
-                servo1=servopos+.5;
-                servo2=.52;
-
+            for(servopos=.60; servopos>=.40; servopos-=.03) {
+                servo1=servopos+.2;
+                servo2=.5;
+                motorspeed=0;
+                m.speed(motorspeed);
                 counter=counter+1;
                 counter1=counter%20;
                 if (counter1==17) {
@@ -84,11 +88,35 @@
         }
         while(Switch==4) {
 
+            for(servopos=.40; servopos<=.60; servopos+=.03) {
+                servo1=servopos+.2;
+                servo2=servopos;
+                counter=counter+1;
+                counter1=counter%20;
+                if (counter1==17) {
+                    LED=rand()%129;
+                }
+                wait (.02);
+            }
+            for(servopos=.60; servopos>=.40; servopos-=.03) {
+                servo1=servopos+.2;
+                servo2=servopos;
+                counter=counter+1;
+                counter1=counter%20;
+                if (counter1==17) {
+                    LED=rand()%129;
+                }
+                wait (.02);
+            }
+        }
 
-            for(servopos=.38; servopos<=.74; servopos+=.03) {
-                servo1=servopos+.5;
+        while(Switch==8) {
+            motorspeed=.31;
+            m.speed(motorspeed);
+            for(servopos=.40; servopos<=.60; servopos+=.03) {
+                servo1=servopos+.2;
                 servo2=servopos;
-
+                m.speed(motorspeed);
                 counter=counter+1;
                 counter1=counter%20;
                 if (counter1==17) {
@@ -96,10 +124,10 @@
                 }
                 wait (.025);
             }
-            for(servopos=.74; servopos>=.38; servopos-=.03) {
-                servo1=servopos+.5;
+            for(servopos=.60; servopos>=.40; servopos-=.03) {
+                servo1=servopos+.2;
                 servo2=servopos;
-
+                m.speed(motorspeed);
                 counter=counter+1;
                 counter1=counter%20;
                 if (counter1==17) {
@@ -108,32 +136,12 @@
                 wait (.025);
             }
         }
-        while(Switch==8) {
+
+        while(Switch==0) {
+            servo1=.7;
+            servo2=.5;
+            motorspeed=0;
             m.speed(motorspeed);
-
-            for(servopos=.38; servopos<=.80; servopos+=.03) {
-                servo1=servopos+.21;
-                servo2=servopos;
-                motorspeed=.10;
-                counter=counter+1;
-                counter1=counter%20;
-                if (counter1==17) {
-                    LED=rand()%129;
-                }
-                wait (.02);
-            }
-            for(servopos=.80; servopos>=.38; servopos-=.03) {
-                servo1=servopos-.5;
-                servo2=servopos;
-                motorspeed=.10;
-                counter=counter+1;
-                counter1=counter%20;
-                if (counter1==17) {
-                    LED=rand()%129;
-                }
-                wait (.02);
-            }
-
         }
     }
 }
\ No newline at end of file