Diff: main.cpp

Revision:

3:b81a3d326aee

Parent:

2:c95e4e33eaee

Child:

4:4b093f9bd41c

--- a/main.cpp	Mon Oct 20 19:24:49 2014 +0000
+++ b/main.cpp	Wed Oct 22 02:06:11 2014 +0000
@@ -2,16 +2,17 @@
 #include "Servo.h"
 #include "Motor.h"
 
-DigitalIn Switch1(p16);
-DigitalIn Switch2(p17);
-DigitalIn Switch3(p18);
-DigitalIn Switch4(p19);
+//DigitalIn Switch1(p16);
+//DigitalIn Switch2(p17);
+//DigitalIn Switch3(p18);
+//DigitalIn Switch4(p19);
 
+BusIn Switch(p16,p17,p18,p19);
 BusOut LED(p5,p6,p7,p8,p11);
 
 Motor m(p26,p29,p30);
-Servo servo1(p21);
-Servo servo2(p22);
+Servo servo1(p21); //top    .39 to 1.02
+Servo servo2(p22); //bottom .38 to .93
 
 
 float servopos;
@@ -19,110 +20,120 @@
 int counter=0;
 int counter1=0;
 
+//float sw1=Switch1;
+//float sw2=Switch2;
+//float sw3=Switch3;
+//float sw4=Switch4;
+
 int main()
 {
-    while (1) {
-        int sw1=Switch1;
-        int sw2=Switch2;
-        int sw3=Switch3;
-        int sw4=Switch4;
-        
-        while (sw1==1) {
-            m.speed(motorspeed);
-            motorspeed=.35;
-            for(servopos=.48; servopos<=.68; servopos+=.005) {
-                servo1=servopos+.07;
+    while(1) {
+
+
+        while (Switch==1) {
+
+
+            for(servopos=.50; servopos<=.65; servopos+=.03) {
+                servo1=.77;
                 servo2=servopos;
+
                 counter=counter+1;
                 counter1=counter%20;
                 if (counter1==17) {
                     LED=rand()%129;
                 }
-                wait (.01);
+                wait (.1);
             }
-            for(servopos=.68; servopos>=.48; servopos-=.005) {
-                servo1=servopos+.07;
+            for(servopos=.50; servopos>=.45; servopos-=.03) {
+                servo1=.77;
                 servo2=servopos;
+
                 counter=counter+1;
                 counter1=counter%20;
                 if (counter1==17) {
                     LED=rand()%129;
                 }
-                wait (.01);
+                wait (.1);
             }
         }
-        while(sw2==1) {
-            m.speed(motorspeed);
-            motorspeed=.41;
-            for(servopos=.48; servopos<=.68; servopos+=.005) {
-                servo1=servopos+.07;
-                servo2=servopos;
+        while(Switch==2) {
+
+
+            for(servopos=.38; servopos<=.72; servopos+=.03) {
+                servo1=servopos+.5;
+                servo2=.52;
+
                 counter=counter+1;
                 counter1=counter%20;
                 if (counter1==17) {
                     LED=rand()%129;
                 }
-                wait (.009);
+                wait (.03);
             }
-            for(servopos=.68; servopos>=.48; servopos-=.005) {
-                servo1=servopos+.07;
-                servo2=servopos;
+            for(servopos=.72; servopos>=.38; servopos-=.03) {
+                servo1=servopos+.5;
+                servo2=.52;
+
                 counter=counter+1;
                 counter1=counter%20;
                 if (counter1==17) {
                     LED=rand()%129;
                 }
-                wait (.009);
+                wait (.03);
             }
         }
-        while(sw3==1) {
-            m.speed(motorspeed);
-            motorspeed=.47;
-            for(servopos=.48; servopos<=.68; servopos+=.005) {
-                servo1=servopos+.07;
+        while(Switch==4) {
+
+
+            for(servopos=.38; servopos<=.74; servopos+=.03) {
+                servo1=servopos+.5;
                 servo2=servopos;
+
                 counter=counter+1;
                 counter1=counter%20;
                 if (counter1==17) {
                     LED=rand()%129;
                 }
-                wait (.008);
+                wait (.025);
             }
-            for(servopos=.68; servopos>=.48; servopos-=.005) {
-                servo1=servopos+.07;
+            for(servopos=.74; servopos>=.38; servopos-=.03) {
+                servo1=servopos+.5;
                 servo2=servopos;
+
                 counter=counter+1;
                 counter1=counter%20;
                 if (counter1==17) {
                     LED=rand()%129;
                 }
-                wait (.008);
+                wait (.025);
             }
         }
-        while(sw4==1) {
+        while(Switch==8) {
             m.speed(motorspeed);
-            motorspeed=.77;
-            for(servopos=.48; servopos<=.68; servopos+=.005) {
-                servo1=servopos+.07;
+
+            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 (.005);
+                wait (.02);
             }
-            for(servopos=.68; servopos>=.48; servopos-=.005) {
-                servo1=servopos+.07;
+            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 (.005);
+                wait (.02);
             }
+
         }
-
     }
 }
\ No newline at end of file