Merge pull request #79 from plato2000/master

Fix a few things about Logitech joysticks

Author: rhauch

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

@@ -776,7 +776,7 @@ public static InputDevice driverStationJoystick(int port) {
         }
 
         /**
-         * Create a Logitech Attack 3D flight stick controlled by the Driver Station.
+         * Create a Logitech Attack 3 flight stick controlled by the Driver Station.
          *
          * @param port the port on the driver station that the flight stick is plugged into
          * @return the input device; never null
@@ -794,6 +794,25 @@ public static FlightStick logitechAttack3D(int port) {
                                       () -> joystick.getRawButton(2)); // thumb
         }
 
+        /**
+         * Create a Logitech Extreme 3D flight stick controlled by the Driver Station.
+         *
+         * @param port the port on the driver station that the flight stick is plugged into
+         * @return the input device; never null
+         */
+        public static FlightStick logitechExtreme3D(int port) {
+            Joystick joystick = new Joystick(port);
+            return FlightStick.create(joystick::getRawAxis,
+                                      joystick::getRawButton,
+                                      joystick::getPOV,
+                                      joystick::getY, // pitch
+                                      joystick::getTwist, // yaw
+                                      joystick::getX, // roll
+                                      joystick::getThrottle, // flapper thing on bottom
+                                      () -> joystick.getRawButton(1), // trigger
+                                      () -> joystick.getRawButton(2)); // thumb
+        }
+
         /**
          * Create a Microsoft SideWinder flight stick controlled by the Driver Station.
          *