Merge pull request MHeironimus#27 from MHeironimus/master

Update version-2.0 branch with issue-25 changes

Author: MHeironimus

Joystick/examples/JoystickTest/JoystickTest.ino

@@ -157,13 +157,13 @@ void testHatSwitch(unsigned int currentStep)
 void testThrottleRudder(unsigned int value)
 {
   Joystick.setThrottle(value);
-  Joystick.setRudder(255 - value);
+  Joystick.setRudder(value);
 }
 
 void testXYZAxisRotation(unsigned int degree)
 {
   Joystick.setRxAxis(degree);
-  Joystick.setRyAxis(360 - degree);
+  Joystick.setRyAxis(degree);
   Joystick.setRzAxis(degree * 2);
 }
 
@@ -174,10 +174,10 @@ void setup() {
   Joystick.setYAxisRange(-127, 127);
   Joystick.setZAxisRange(-127, 127);
   Joystick.setRxAxisRange(0, 360);
-  Joystick.setRyAxisRange(0, 360);
+  Joystick.setRyAxisRange(360, 0);
   Joystick.setRzAxisRange(0, 720);
   Joystick.setThrottleRange(0, 255);
-  Joystick.setRudderRange(0, 255);
+  Joystick.setRudderRange(255, 0);
 
   if (testAutoSendMode)
   {

Joystick/src/Joystick.cpp

@@ -519,80 +519,58 @@ void Joystick_::releaseButton(uint8_t button)
 
 void Joystick_::setXAxis(int16_t value)
 {
-	if ((value < _xAxisMinimum) || (value > _xAxisMaximum)) return;
-	
 	_xAxis = value;
 	if (_autoSendState) sendState();
 }
 void Joystick_::setYAxis(int16_t value)
 {
-	if ((value < _yAxisMinimum) || (value > _yAxisMaximum)) return;
-	
 	_yAxis = value;
 	if (_autoSendState) sendState();
 }
 void Joystick_::setZAxis(int16_t value)
 {
-	if ((value < _zAxisMinimum) || (value > _zAxisMaximum)) return;
-
 	_zAxis = value;
 	if (_autoSendState) sendState();
 }
 
 void Joystick_::setRxAxis(int16_t value)
 {
-	if ((value < _rxAxisMinimum) || (value > _rxAxisMaximum)) return;
-
 	_xAxisRotation = value;
 	if (_autoSendState) sendState();
 }
 void Joystick_::setRyAxis(int16_t value)
 {
-	if ((value < _ryAxisMinimum) || (value > _ryAxisMaximum)) return;
-
 	_yAxisRotation = value;
 	if (_autoSendState) sendState();
 }
 void Joystick_::setRzAxis(int16_t value)
 {
-	if ((value < _rzAxisMinimum) || (value > _rzAxisMaximum)) return;
-
 	_zAxisRotation = value;
 	if (_autoSendState) sendState();
 }
 
 void Joystick_::setRudder(int16_t value)
 {
-	if ((value < _rudderMinimum) || (value > _rudderMaximum)) return;
-	
 	_rudder = value;
 	if (_autoSendState) sendState();
 }
 void Joystick_::setThrottle(int16_t value)
 {
-	if ((value < _throttleMinimum) || (value > _throttleMaximum)) return;
-	
 	_throttle = value;
 	if (_autoSendState) sendState();
 }
 void Joystick_::setAccelerator(int16_t value)
 {
-	if ((value < _acceleratorMinimum) || (value > _acceleratorMaximum)) return;
-
 	_accelerator = value;
 	if (_autoSendState) sendState();
 }
 void Joystick_::setBrake(int16_t value)
 {
-	if ((value < _brakeMinimum) || (value > _brakeMaximum)) return;
-
 	_brake = value;
 	if (_autoSendState) sendState();
 }
 void Joystick_::setSteering(int16_t value)
 {
-	if ((value < _steeringMinimum) || (value > _steeringMaximum)) return;
-
 	_steering = value;
 	if (_autoSendState) sendState();
 }
@@ -610,20 +588,32 @@ int Joystick_::buildAndSet16BitValue(bool includeValue, int16_t value, int16_t v
 	int16_t convertedValue;
 	uint8_t highByte;
 	uint8_t lowByte;
+	int16_t realMinimum = min(valueMinimum, valueMaximum);
+	int16_t realMaximum = max(valueMinimum, valueMaximum);
 
-	if (includeValue == true) {
-		convertedValue = map(value, valueMinimum, valueMaximum, actualMinimum, actualMaximum);
-				
-		highByte = (uint8_t)(convertedValue >> 8);
-		lowByte = (uint8_t)(convertedValue & 0x00FF);
-		
-		dataLocation[0] = lowByte;
-		dataLocation[1] = highByte;
-		
-		return 2;
+	if (includeValue == false) return 0;
+
+	if (value < realMinimum) {
+		value = realMinimum;
+	}
+	if (value > realMaximum) {
+		value = realMaximum;
 	}
+
+	if (valueMinimum > valueMaximum) {
+		// Values go from a larger number to a smaller number (e.g. 1024 to 0)
+		value = realMaximum - value + realMinimum;
+	}
+
+	convertedValue = map(value, realMinimum, realMaximum, actualMinimum, actualMaximum);
+
+	highByte = (uint8_t)(convertedValue >> 8);
+	lowByte = (uint8_t)(convertedValue & 0x00FF);
+	
+	dataLocation[0] = lowByte;
+	dataLocation[1] = highByte;
 
-	return 0;
+	return 2;
 }
 
 int Joystick_::buildAndSetAxisValue(bool includeAxis, int16_t axisValue, int16_t axisMinimum, int16_t axisMaximum, uint8_t dataLocation[]) 

README.md

@@ -1,5 +1,5 @@
 # Arduino Joystick Library
-#### Version 2.0.1
+#### Version 2.0.2
 This library can be used with Arduino IDE 1.6.6 (or above) to add one or more joysticks (or gamepads) to the list of HID devices an [Arduino Leonardo](https://www.arduino.cc/en/Main/ArduinoBoardLeonardo) or [Arduino Micro](https://www.arduino.cc/en/Main/ArduinoBoardMicro) (or any Arduino clone that is based on the ATmega32u4) can support. This will not work with Arduino IDE 1.6.5 (or below) or with non-32u4 based Arduino devices (e.g. Arduino UNO, Arduino MEGA, etc.).
 
 ## Features
@@ -205,6 +205,7 @@ I have tested this library using the following Arduino IDE Versions:
 - 1.6.11
 - 1.6.12
 - 1.6.13
+- 1.8.0
 
 I have tested this library with the following boards:
 
@@ -220,4 +221,4 @@ works with the Arduino Due. I have also been told Version 1.x of the the Arduino
 - [Arduino UNO](https://www.arduino.cc/en/Main/ArduinoBoardUno) - NOT Supported - However, it might work with the [NicoHood/HoodLoader2](https://github.com/NicoHood/HoodLoader2) library, but I have not had a chance to try this out yet.
 - [Arduino MEGA](https://www.arduino.cc/en/Main/ArduinoBoardMega2560) - NOT Supported - However, it might work with the [NicoHood/HoodLoader2](https://github.com/NicoHood/HoodLoader2) library, but I have not had a chance to try this out yet.
 
-(as of 2016-11-25)
+(as of 2016-12-24)