Diff: main.cpp

Revision:

1:33ef833aae0b

Parent:

0:db9e971c8ba6

Child:

2:c95e4e33eaee

--- a/main.cpp	Sun Oct 19 23:38:13 2014 +0000
+++ b/main.cpp	Sun Oct 19 23:57:41 2014 +0000
@@ -28,7 +28,7 @@
 {
     while (1) {
         while (sw1==1) {
-            for(servopos=.38; servopos<=.51; servopos+=.001) {
+            for(servopos=.38; servopos<=.51; servopos+=.005) {
                 servo1=servopos;
                 servo2=servopos;
                 motorspeed=.35;
@@ -37,19 +37,19 @@
                 if (counter1==17) {
                     LED=rand()%129;
                 }
-                wait (.005);
+                wait (.01);
             }
-             for(servopos=.51; servopos<=.38; servopos+=.001) {
-                        servo1=servopos;
-                        servo2=servopos;
-                        motorspeed=.35;
-                        counter=counter+1;
-                        counter1=counter%20;
-                        if (counter1==17) {
-                            LED=rand()%129;
-                        }
-                        wait (.005);
-                        }
+            for(servopos=.51; servopos>=.38; servopos-=.005) {
+                servo1=servopos;
+                servo2=servopos;
+                motorspeed=.35;
+                counter=counter+1;
+                counter1=counter%20;
+                if (counter1==17) {
+                    LED=rand()%129;
+                }
+                wait (.01);
+            }
         }
         while(sw2==1) {
             for(servopos=.38; servopos<=.51; servopos+=.001) {
@@ -63,17 +63,17 @@
                 }
                 wait (.003);
             }
-             for(servopos=.51; servopos<=.38; servopos+=.001) {
-                        servo1=servopos;
-                        servo2=servopos;
-                        motorspeed=.41;
-                        counter=counter+1;
-                        counter1=counter%20;
-                        if (counter1==17) {
-                            LED=rand()%129;
-                        }
-                        wait (.003);
-                        }
+            for(servopos=.51; servopos>=.38; servopos-=.001) {
+                servo1=servopos;
+                servo2=servopos;
+                motorspeed=.41;
+                counter=counter+1;
+                counter1=counter%20;
+                if (counter1==17) {
+                    LED=rand()%129;
+                }
+                wait (.003);
+            }
         }
         while(sw3==1) {
             for(servopos=.38; servopos<=.51; servopos+=.001) {
@@ -87,17 +87,17 @@
                 }
                 wait (.002);
             }
-             for(servopos=.51; servopos<=.38; servopos+=.001) {
-                        servo1=servopos;
-                        servo2=servopos;
-                        motorspeed=.47;
-                        counter=counter+1;
-                        counter1=counter%20;
-                        if (counter1==17) {
-                            LED=rand()%129;
-                        }
-                        wait (.002);
-                        }
+            for(servopos=.51; servopos>=.38; servopos-=.001) {
+                servo1=servopos;
+                servo2=servopos;
+                motorspeed=.47;
+                counter=counter+1;
+                counter1=counter%20;
+                if (counter1==17) {
+                    LED=rand()%129;
+                }
+                wait (.002);
+            }
         }
         while(sw4==1) {
             for(servopos=.38; servopos<=.51; servopos+=.001) {
@@ -111,7 +111,7 @@
                 }
                 wait (.001);
             }
-            for(servopos=.51; servopos<=.38; servopos+=.001) {
+            for(servopos=.51; servopos>=.38; servopos-=.001) {
                 servo1=servopos;
                 servo2=servopos;
                 motorspeed=.77;