Diff: main.cpp

Revision:

2:da289f7a67c9

Parent:

1:da313e5e8914

Child:

3:59a9bd160e29

--- a/main.cpp	Sat Feb 01 16:47:22 2014 +0000
+++ b/main.cpp	Sat Feb 01 16:53:35 2014 +0000
@@ -40,9 +40,14 @@
 // Functions for button 1
 void a_hit_interrupt (void) {
 
-    //move VEX motor
+    //move VEX motor (1 is full CCW, 0 is full CW)
     speed = 1.0;
     motor1 = speed;
+    //set the motor on duration in seconds:
+    wait(1);
+    //stop motor
+    speed = 0.5;
+    motor1 = speed;
     
     //Set LED 1
     led1 = 1, led2 = 0, led3 = 0, led4 = 0;
@@ -53,9 +58,15 @@
 // Functions for button 2
 void b_hit_interrupt (void) {
 
-    //move VEX motor
+    //move VEX motor (1 is full CCW, 0 is full CW)
     speed = 0.0;
     motor1 = speed;
+    //set the motor on duration in seconds:
+    wait(1);
+    //stop motor
+    speed = 0.5;
+    motor1 = speed;
+    
     //Set LED 2
     led1 = 0, led2 = 1, led3 = 0, led4 = 0;    
 }
@@ -86,9 +97,6 @@
 //==========================================================
 
 int main() {
-
-    //tune range depending on VEX motor
-    float range = 0.0009;
        
     // Use internal pullup resistors to limit the signal current
     a.mode(PullUp);
@@ -106,10 +114,7 @@
     d.fall(&d_hit_interrupt);
     
     
-    while(1) { 
-        //set the VEX to use the set value
-        motor1.calibrate(range, 45.0); 
-        
+    while(1) {
         //reset LEDs
         led1 = 0, led2 = 0, led3 = 0, led4 = 0;