Merge pull request #71 from CardcaptorRLH85/patch-1

Fix for the Xbox 360 Controller Definition

Author: rhauch

strongback/src/org/strongback/hardware/Hardware.java

@@ -870,33 +870,34 @@ public static Gamepad logitechF310(int port) {
                                   () -> joystick.getRawButton(8),
                                   () -> joystick.getRawButton(9));
         }
-    }
-    /**
-     * Create a Microsoft Xbox360 gamepad controlled by the Driver Station.
-     *
-     * @param port the port on the driver station that the gamepad is plugged into
-     * @return the input device; never null
-     */
-    public static Gamepad xbox360(int port) {
-        Joystick joystick = new Joystick(port);
-        return Gamepad.create(joystick::getRawAxis,
-                              joystick::getRawButton,
-                              joystick::getPOV,
-                              () -> joystick.getRawAxis(0),
-                              () -> joystick.getRawAxis(1) * -1,
-                              () -> joystick.getRawAxis(4),
-                              () -> joystick.getRawAxis(5) * -1,
-                              () -> joystick.getRawAxis(2),
-                              () -> joystick.getRawAxis(3),
-                              () -> joystick.getRawButton(5),
-                              () -> joystick.getRawButton(6),
-                              () -> joystick.getRawButton(1),
-                              () -> joystick.getRawButton(2),
-                              () -> joystick.getRawButton(3),
-                              () -> joystick.getRawButton(4),
-                              () -> joystick.getRawButton(8),
-                              () -> joystick.getRawButton(7),
-                              () -> joystick.getRawButton(9),
-                              () -> joystick.getRawButton(10));
+        
+        /**
+         * Create a Microsoft Xbox360 gamepad controlled by the Driver Station.
+         *
+         * @param port the port on the driver station that the gamepad is plugged into
+         * @return the input device; never null
+         */
+        public static Gamepad xbox360(int port) {
+            Joystick joystick = new Joystick(port);
+            return Gamepad.create(joystick::getRawAxis,
+                                  joystick::getRawButton,
+                                  joystick::getPOV,
+                                  () -> joystick.getRawAxis(0),
+                                  () -> joystick.getRawAxis(1) * -1,
+                                  () -> joystick.getRawAxis(4),
+                                  () -> joystick.getRawAxis(5) * -1,
+                                  () -> joystick.getRawAxis(2),
+                                  () -> joystick.getRawAxis(3),
+                                  () -> joystick.getRawButton(5),
+                                  () -> joystick.getRawButton(6),
+                                  () -> joystick.getRawButton(1),
+                                  () -> joystick.getRawButton(2),
+                                  () -> joystick.getRawButton(3),
+                                  () -> joystick.getRawButton(4),
+                                  () -> joystick.getRawButton(8),
+                                  () -> joystick.getRawButton(7),
+                                  () -> joystick.getRawButton(9),
+                                  () -> joystick.getRawButton(10));
+        }
     }
 }