Minor Adjustments such as slower indexer and longer wait between shot…

…s in autonomous.
team484 · Oct 18, 2013 · 39187a5 · 39187a5
1 parent 194fa31
commit 39187a5
Show file tree

Hide file tree

Showing 9 changed files with 8,065 additions and 8,074 deletions.
diff --git a/build/app.jar b/build/app.jar
diff --git a/build/suite/image.suite b/build/suite/image.suite
diff --git a/build/suite/image.suite.metadata b/build/suite/image.suite.metadata
diff --git a/build/suite/image.sym b/build/suite/image.sym
diff --git a/src/org/team484/frisbeebot/OI.java b/src/org/team484/frisbeebot/OI.java
@@ -17,9 +17,9 @@ public class OI {
     Joystick stick1 = new Joystick(1);
     Joystick stick2 = new Joystick(2);
     Joystick stick3 = new Joystick(3);
-    Button j1b1 =  new JoystickButton(stick1, 1);
-    Button j1b2 = new JoystickButton(stick1, 2);
-    Button j1b3 = new JoystickButton(stick1, 3);
+    Button j1b1 =  new JoystickButton(stick2, 1);
+    Button j1b2 = new JoystickButton(stick2, 2);
+    Button j1b3 = new JoystickButton(stick2, 3);
     Button j1b8 = new JoystickButton(stick1, 8);
     public double getStick1X() {
         return stick1.getX();
@@ -59,11 +59,11 @@ public double getStick1Y() {
     // until it is finished as determined by it's isFinished method.
     // button.whenReleased(new ExampleCommand());
     public OI() {
-        j1b2.whenPressed(new SolenoidOut());
-        j1b3.whenReleased(new SolenoidOut());
-        j1b3.whenPressed(new SolenoidIn());
-        j1b1.whileHeld(new ShooterOn());
-        j1b1.whenPressed(new FixFeeder());
+        j1b2.whenPressed(new SolenoidOut()); //Actually Joystick 2
+        j1b3.whenReleased(new SolenoidOut()); //Actually Joystick 2
+        j1b3.whenPressed(new SolenoidIn()); //Actually Joystick 2
+        j1b1.whileHeld(new ShooterOn()); //Actually Joystick 2
+        j1b1.whenPressed(new FixFeeder()); //Actually Joystick 2
     }
 }
 
diff --git a/src/org/team484/frisbeebot/Robot.java b/src/org/team484/frisbeebot/Robot.java
@@ -21,6 +21,7 @@
 import edu.wpi.first.wpilibj.image.NIVision;
 import edu.wpi.first.wpilibj.image.ParticleAnalysisReport;
 import edu.wpi.first.wpilibj.livewindow.LiveWindow;
+import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
 import org.team484.frisbeebot.commands.CommandBase;
 import org.team484.frisbeebot.commands.StartAutonomous;
 
@@ -86,7 +87,7 @@ public void teleopPeriodic() {
         if (periodics < 100) {
             periodics++;
         } else {
-            centerCalculate();
+            //centerCalculate();
             periodics = 0;
         }
         Timer.delay(0.01);
@@ -97,7 +98,6 @@ public void teleopPeriodic() {
      */
     public void testPeriodic() {
         LiveWindow.run();
-        //centerCalculate();
         Timer.delay(0.1);
     }
 

diff --git a/src/org/team484/frisbeebot/commands/StartAutonomous.java b/src/org/team484/frisbeebot/commands/StartAutonomous.java
@@ -30,12 +30,12 @@ public StartAutonomous() {
         // e.g. if Command1 requires chassis, and Command2 requires arm,
         // a CommandGroup containing them would require both the chassis and the
         // arm.
-        addParallel(new ShooterOn(), 4);
-        addSequential(new SolenoidOut(), 1);
+        addParallel(new ShooterOn(), 7);
+        addSequential(new SolenoidOut(), 2);
         addSequential(new SolenoidIn(), 0.1);
-        addSequential(new SolenoidOut(), 1);
+        addSequential(new SolenoidOut(), 2);
         addSequential(new SolenoidIn(), 0.1);
-        addSequential(new SolenoidOut(), 1);
+        addSequential(new SolenoidOut(), 2);
         //addSequential(new SolenoidIn(), 0.1);
         //addSequential(new SolenoidOut(), 1);
     }

diff --git a/src/org/team484/frisbeebot/subsystems/Feeder.java b/src/org/team484/frisbeebot/subsystems/Feeder.java
@@ -27,9 +27,9 @@ public void initDefaultCommand() {
     }
     public boolean checkFeeder() {
         if (tertiary.get() == false && secondary.get() == true) {
-            talon.set(-0.5);
+            talon.set(-0.25);
         } else if (secondary.get() == false && ir.get() == false) {
-            talon.set(-0.5);
+            talon.set(-0.25);
         } else {
             talon.set(0);
         }

diff --git a/src/org/team484/frisbeebot/subsystems/Shooter.java b/src/org/team484/frisbeebot/subsystems/Shooter.java
@@ -36,8 +36,8 @@ public void shooterOff() {
         jaguar2.set(0);
     }
     public void shooterOn() {
-        jaguar1.set(1);
-        jaguar2.set(1);
+        jaguar1.set(0.8);
+        jaguar2.set(0.8);
         double j1;
         double j2;
         j1 = 0;