Began work on making the X, Y, Z, X Rotation, Y Rotation, and Z Rotation configurable and 16-bit.

Author: MHeironimus

Joystick/examples/JoystickTest/JoystickTest.ino

@@ -69,27 +69,36 @@ void testMultiButtonPush(unsigned int currentStep)
 
 void testXYAxis(unsigned int currentStep)
 {
+  int xAxis;
+  int yAxis;
+  
   if (currentStep < 256)
   {
-    Joystick.setXAxis(currentStep - 127);
-    Joystick.setYAxis(-127);
+    xAxis = currentStep - 127;
+    yAxis = -127;
+    Joystick.setXAxis(xAxis);
+    Joystick.setYAxis(yAxis);
   } 
   else if (currentStep < 512)
   {
-    Joystick.setYAxis(currentStep - 256 - 127);
+    yAxis = currentStep - 256 - 127;
+    Joystick.setYAxis(yAxis);
   }
   else if (currentStep < 768)
   {
-    Joystick.setXAxis(128 - (currentStep - 512));
+    xAxis = 128 - (currentStep - 512);
+    Joystick.setXAxis(xAxis);
   }
   else if (currentStep < 1024)
   {
-    Joystick.setYAxis(128 - (currentStep - 768));
+    yAxis = 128 - (currentStep - 768);
+    Joystick.setYAxis(yAxis);
   }
   else if (currentStep < 1024 + 128)
   {
-    Joystick.setXAxis(currentStep - 1024 - 127);
-    Joystick.setYAxis(currentStep - 1024 - 127);
+    xAxis = currentStep - 1024 - 127;
+    Joystick.setXAxis(xAxis);
+    Joystick.setYAxis(xAxis);
   }
 }
 
@@ -150,13 +159,30 @@ void testThrottleRudder(unsigned int value)
   Joystick.setRudder(255 - value);
 }
 
-void testXYAxisRotation(unsigned int degree)
+void testXYZAxisRotation(unsigned int degree)
 {
-  Joystick.setXAxisRotation(degree);
-  Joystick.setYAxisRotation(360 - degree);
+  Joystick.setRxAxis(degree);
+  Joystick.setRyAxis(360 - degree);
+  Joystick.setRzAxis(degree * 2);
 }
 
 void setup() {
+
+/*
+ * Uncomment this out for debugging...
+  Serial.begin(9600);
+  while (!Serial) {
+      ; // wait for serial port to connect. Needed for native USB
+  }
+ */
+  
+  Joystick.setXAxisRange(-127, 127);
+  Joystick.setYAxisRange(-127, 127);
+  Joystick.setZAxisRange(-127, 127);
+  Joystick.setRxAxisRange(0, 360);
+  Joystick.setRyAxisRange(0, 360);
+  Joystick.setRzAxisRange(0, 720);
+  
   if (testAutoSendMode)
   {
     Joystick.begin();
@@ -175,6 +201,7 @@ void loop() {
   // System Disabled
   if (digitalRead(A0) != 0)
   {
+    // Turn indicator light off.
     digitalWrite(13, 0);
     return;
   }
@@ -218,7 +245,7 @@ void loop() {
     else if (gCurrentStep < (37 + 256 + 1024 + 128 + 510 + 28 + 360))
     {
       gNextTime = millis() + gcAnalogDelta;
-      testXYAxisRotation(gCurrentStep - (37 + 256 + 1024 + 128 + 510 + 28));
+      testXYZAxisRotation(gCurrentStep - (37 + 256 + 1024 + 128 + 510 + 28));
     }
 
     if (testAutoSendMode == false)

Joystick/examples/MultipleJoystickTest/MultipleJoystickTest.ino

@@ -1,6 +1,6 @@
-// Program used to test the Arduino Joystick Library to create 
-// multiple Joystick objects on a single Arduino Leonardo or 
-// Arduino Micro.
+// Program used to test using the Arduino Joystick Library 
+// to create multiple Joystick objects on a single Arduino 
+// Leonardo or Arduino Micro.
 //
 // Matthew Heironimus
 // 2016-05-13
@@ -10,9 +10,9 @@
 #define JOYSTICK_COUNT 4
 
 Joystick_ Joystick[JOYSTICK_COUNT] = {
-  Joystick_(0x03, 4),
-  Joystick_(0x04, 8),
-  Joystick_(0x05, 16),
+  Joystick_(0x03, 4, true, true, false, false, false, false),
+  Joystick_(0x04, 8, true, true, true, true, false, false),
+  Joystick_(0x05, 16, false, true, false, true, false, false),
   Joystick_(0x06, 32)
 };
 
@@ -97,9 +97,18 @@ void testXYAxis(int joystickId, unsigned int currentStep)
 }
 
 void setup() {
+
+/* Uncomment this out for debugging...
+  Serial.begin(9600);
+  while (!Serial) {
+      ; // wait for serial port to connect. Needed for native USB
+  }
+*/
 
   for (int index = 0; index < JOYSTICK_COUNT; index++)
   {
+    Joystick[index].setXAxisRange(-127, 127);
+  
     if (testAutoSendMode)
     {
       Joystick[index].begin();