View difference between Paste ID: gEWNgm83 and drUnCfKN

-/* Simple HSI Knobs Sketch for Falcon BMS / DCS / FSX
+/* Modified HSI Knobs Sketch for Falcon BMS / DCS / FSX
  *  with additional 3rd Rotary Encoder (Z Axis)
- * by SemlerPDX June2019
+ *    *(coming next: a 3-way Toggle Switch add-on)
  *  for Arduino Micro/Leonardo / Sparkfun Pro Micro or equiv. clones
- * ( https://veterans-gaming.com/blogs/entry/32-diy-custom-game-controller-2-dial-hsi-course-and-heading-knobs/ )
+ * by SemlerPDX Aug2019
- *
+
  * ( in response to reply at:
  *    http://veterans-gaming.com/index.php?/blogs/entry/32-diy-custom-game-controller-2-dial-hsi-course-and-heading-knobs/ )
  *
- *
+
  *  Rotary Encoder 1 - (OUTA-OUTB-SW) = Arduino Pins (0,1,15)
- * https://www.pjrc.com/teensy/td_libs_Encoder.html
+
- *
+ *  Rotary Encoder 3 - (OUTA-OUTB-SW) = Arduino Pins (9,10,7)
- *  Joystick Library
+ *
  *  Encoder Library
  * http://www.pjrc.com/teensy/td_libs_Encoder.html
  *
  *  Joystick Library
  * by Matthew Heironimus
  * https://github.com/MHeironimus/ArduinoJoystickLibrary
  */
 
 #define ENCODER_USE_INTERRUPTS
-// Tell the Encoder Library which pins have encoders
+
 #include <Encoder.h>
 #include <Joystick.h>
 
-// Rotary Encoder Push Button Pins
+//Tell the Encoder Library which pins have encoders
-int buttonArray[2] = {15, 6};
+
-const int numButtons = sizeof(buttonArray) / sizeof(buttonArray[0]);
+
 Encoder axisZRotation(9, 10);
-// Rotary Encoder Interrupt Pins
+
 //Rotary Encoder Push Button Pins
 int buttonArray[3] = {15, 6, 7};
 
 //Rotary Encoder Interrupt Pins
 int EncoderPin0 = 0;
-// Delay Time between loops
+
 int EncoderPin2 = 2;
 int EncoderPin3 = 3;
-// Variables to compare current to old values
+int EncoderPin4 = 9;
 int EncoderPin5 = 10;
 
 //Delay Time between loops
 int debounceDelay = 260;
 
-// Intervals for Jump/Warp Speed Rotations
+//Variables to compare current to old values
 int oldX = 0;
 int oldY = 0;
 int oldZ = 0;
-// Set generic joystick using id 42 with 2 buttons and 2 axes
+
 int RyAxis_Value = 1;
-  0x04, 2, 0,
+int RzAxis_Value = 1;
-  false, false, false, true, true, false,
+
 //Intervals for Jump/Warp Speed Rotations
 int JumpSpeed = 18;
 int WarpSpeed = 30;
 
 //Set generic joystick with id 42 with 3 buttons and 3 axes
-  // Set Encoder Pins as Pullups
+
   0x04, 3, 0,
   false, false, false, true, true, true,
   false, false, false, false, false);
 
 
-  // Loop through buttons and set them as Pullups
+
-  for (int x = 0; x < numButtons; x++) {
+
   //Set Encoder Pins as Pullups
   pinMode(EncoderPin0, INPUT_PULLUP);
   pinMode(EncoderPin1, INPUT_PULLUP);
-  // Set Range of custom Axes
+
   pinMode(EncoderPin3, INPUT_PULLUP);
   pinMode(EncoderPin4, INPUT_PULLUP);
   pinMode(EncoderPin5, INPUT_PULLUP);
 
   //Loop through buttons and set them as Pullups
   for(int x = 0; x < sizeof(buttonArray); x++) {
     pinMode(buttonArray[x], INPUT_PULLUP);
   }
 
   //Set Range of custom Axes
   Joystick.setRxAxisRange(0, 359);
   Joystick.setRyAxisRange(0, 359);
-  for (int x = 0; x < numButtons; x++) {
+  Joystick.setRzAxisRange(0, 359);
 
   // Initialize Joystick Library
   Joystick.begin(false);
 
 }
 
-  if (newX != oldX) {
+
-    RxAxis_Value = getAxisVal(newX, oldX, RxAxis_Value);
+
 
   // Loop through button pin values & set to Joystick
   for (int x = 0; x < sizeof(buttonArray); x++) {
     byte currentButtonState = !digitalRead(buttonArray[x]);
     Joystick.setButton(x, currentButtonState);
   }
 
-  if (newY != oldY) {
+
-    RyAxis_Value = getAxisVal(newY, oldY, RyAxis_Value);
+
   int newX = axisXRotation.read();
   if (newX > oldX) {
     //Determine speed of increment & set output
     int difX = newX - oldX;
     RxAxis_Value = speedVal(difX, RxAxis_Value, 1);
-  // Send Joystick info through USB
+
     axisXRotation.write(newX);
     oldX = newX;
 
   }else if (newX < oldX) {
     //Determine speed of decrement & set output
-// Function to return Rotation Value adjusted for the turning speed
+    int difX = oldX - newX;
-int speedVal(int val) {
+    RxAxis_Value = speedVal(difX, RxAxis_Value, 0);
-  if (val >= WarpSpeed) {
+
-    val = WarpSpeed;
+
-  } else if (val >= JumpSpeed) {
+
-    val = JumpSpeed;
+
-  } else {
+
-    val = 1;
+
   // Read "Course" Y Axis Rotation Encoder Knob
   int newY = axisYRotation.read();
   if (newY > oldY) {
     //Determine speed of increment & set output
     int difY = newY - oldY;
-// Function to return modified Rotation Axis Value
+    RyAxis_Value = speedVal(difY, RyAxis_Value, 1);
-int getAxisVal(int newVal, int oldVal, int val) {
+
-  if (newVal > oldVal) {
+
-    // Determine speed of increment & set output
+
-    newVal = newVal - oldVal;
+
-    val = val + speedVal(newVal);
+  }else if (newY < oldY) {
-  } else if (newVal < oldVal) {
+    //Determine speed of decrement & set output
-    // Determine speed of decrement & set output
+    int difY = oldY - newY;
-    newVal = oldVal - newVal;
+    RyAxis_Value = speedVal(difY, RyAxis_Value, 0);
-    val = val - speedVal(newVal);
+
     axisYRotation.write(newY);
     oldY = newY;
-  // Correct Rotation Value within 360 degrees
+
-  val = (val % 360 + 360) % 360;
+
 
   // Read "QNH" Z Axis Rotation Encoder Knob
   int newZ = axisZRotation.read();
   if (newZ > oldZ) {
     //Determine speed of increment & set output
     int difZ = newZ - oldZ;
     RzAxis_Value = speedVal(difZ, RzAxis_Value, 1);
     Joystick.setRzAxis(RzAxis_Value);
     axisZRotation.write(newZ);
     oldZ = newZ;
 
   }else if (newZ < oldZ) {
     //Determine speed of decrement & set output
     int difZ = oldZ - newZ;
     RzAxis_Value = speedVal(difZ, RzAxis_Value, 0);
     Joystick.setRzAxis(RzAxis_Value);
     axisZRotation.write(newZ);
     oldZ = newZ;
   }
 
 
   //Send Joystick info through USB
   Joystick.sendState();
   delay(debounceDelay);
 }
 
 
 //Function to set Rotation value adjusted for the turning speed
 int speedVal(int dif, int val, int dir){
   if (dif >= WarpSpeed) {
     if (dir == 1) {
       val = val + WarpSpeed;
     }else{
       val = val - WarpSpeed;
     }
   }else if (dif >= JumpSpeed) {
     if (dir == 1) {
       val = val + JumpSpeed;
     }else{
       val = val - JumpSpeed;
     }
   }else{
     if (dir == 1) {
       val = val + 1;
     }else{
       val = val - 1;
     }
   }
   //Correct Rotation within 360 deg.
   if (val < 0) {
     val = val + 360;
   }else if (val >= 360) {
     val = val - 360;
   }
   return val;
 }