X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FJoystick.java;fp=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FJoystick.java;h=7eac768cb0554bce4dcafdb9386bd2794898b7c6;hb=299be0310c4e309e9877df8eadbcc2073f943401;hp=fab679234f9c1486cd4a427da34aab418a786bd2;hpb=f86bcb4376227b9c86981b23b13d821d7be37531;p=3501%2F3501-spark-go

diff --git a/src/org/usfirst/frc/team3501/robot/Joystick.java b/src/org/usfirst/frc/team3501/robot/Joystick.java
index fab6792..7eac768 100644
--- a/src/org/usfirst/frc/team3501/robot/Joystick.java
+++ b/src/org/usfirst/frc/team3501/robot/Joystick.java
@@ -13,7 +13,9 @@ public class Joystick extends edu.wpi.first.wpilibj.Joystick {
     public Joystick(int port) {
         super(port);
 
-        IntStream.rangeClosed(1, 12).forEach((b) -> {
+        buttons = new HashMap<Integer, JoystickButton>();
+
+        IntStream.rangeClosed(1, getButtonCount()).forEach((b) -> {
             buttons.put(b, new JoystickButton(this, b));
         });
     }