Target roboRIO, closes #7

Impact2585 · Aug 16, 2015 · bd4c853 · bd4c853
1 parent ea234e4
commit bd4c853
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 21 deletions.
diff --git a/src/org/_2585robophiles/lib2585/RunnableExecuter.java b/src/org/_2585robophiles/lib2585/RunnableExecuter.java
@@ -10,23 +10,23 @@ public abstract class RunnableExecuter implements Executer, Serializable {
 
 	private static final long serialVersionUID = -7700534735844195641L;
 
-	private final Vector runnables = new Vector();
+	private final Vector<Runnable> runnables = new Vector<Runnable>();
 
 	/* (non-Javadoc)
 	 * @see org._2585robophiles.lib2585.Executer#execute()
 	 */
 	public void execute() {
 		//run all the runnables
 		for(int i = 0; i < runnables.size(); i++){
-			Runnable runnable = (Runnable) runnables.elementAt(i);
+			Runnable runnable = runnables.elementAt(i);
 			runnable.run();
 		}
 	}
 
 	/**
 	 * @return the runnables
 	 */
-	public synchronized Vector getRunnables() {
+	public synchronized Vector<Runnable> getRunnables() {
 		return runnables;
 	}
 

diff --git a/src/org/_2585robophiles/lib2585/XboxConstants.java b/src/org/_2585robophiles/lib2585/XboxConstants.java
@@ -1,27 +1,14 @@
 package org._2585robophiles.lib2585;
 
-/*
-
-1: A
-2: B
-3: X
-4: Y
-5: Left Bumper
-6: Right Bumper
-7: Back
-8: Start
-9: Left Joystick
-10: Right Joystick
-
-*/
-
 /**
- *	holds constants for Xbox controller buttons and axes 
+ *	holds constants for Xbox 360 controller buttons and axes 
  */
 public interface XboxConstants {
 
-	public static final int LEFT_X_AXIS = 1;
-	public static final int LEFT_Y_AXIS = 2;
+	public static final int LEFT_X_AXIS = 0;
+	public static final int LEFT_Y_AXIS = 1;
+	public static final int LEFT_TRIGGER = 2;
+	public static final int RIGHT_TRIGGER = 3;
 	public static final int RIGHT_X_AXIS = 4;
 	public static final int RIGHT_Y_AXIS = 5;