Fixed issue with non-zero based reverse ranges

MHeironimus#25

Author: MHeironimus

Joystick/src/Joystick.cpp

@@ -41,8 +41,6 @@
 #define JOYSTICK_INCLUDE_BRAKE       B00001000
 #define JOYSTICK_INCLUDE_STEERING    B00010000
 
-#define JOYSTICK_VALUE_RANGE_CHECK(value, l, g) if (((value) < min((l), (g))) || ((value) > max((l), (g)))) return
-
 Joystick_::Joystick_(
 	uint8_t hidReportId,
 	uint8_t joystickType,
@@ -521,80 +519,58 @@ void Joystick_::releaseButton(uint8_t button)
 
 void Joystick_::setXAxis(int16_t value)
 {
-	JOYSTICK_VALUE_RANGE_CHECK(value, _xAxisMinimum, _xAxisMaximum);
-	
 	_xAxis = value;
 	if (_autoSendState) sendState();
 }
 void Joystick_::setYAxis(int16_t value)
 {
-	JOYSTICK_VALUE_RANGE_CHECK(value, _yAxisMinimum, _yAxisMaximum);
-	
 	_yAxis = value;
 	if (_autoSendState) sendState();
 }
 void Joystick_::setZAxis(int16_t value)
 {
-	JOYSTICK_VALUE_RANGE_CHECK(value, _zAxisMinimum, _zAxisMaximum);
-
 	_zAxis = value;
 	if (_autoSendState) sendState();
 }
 
 void Joystick_::setRxAxis(int16_t value)
 {
-	JOYSTICK_VALUE_RANGE_CHECK(value, _rxAxisMinimum, _rxAxisMaximum);
-
 	_xAxisRotation = value;
 	if (_autoSendState) sendState();
 }
 void Joystick_::setRyAxis(int16_t value)
 {
-	JOYSTICK_VALUE_RANGE_CHECK(value, _ryAxisMinimum, _ryAxisMaximum);
-
 	_yAxisRotation = value;
 	if (_autoSendState) sendState();
 }
 void Joystick_::setRzAxis(int16_t value)
 {
-	JOYSTICK_VALUE_RANGE_CHECK(value, _rzAxisMinimum, _rzAxisMaximum);
-
 	_zAxisRotation = value;
 	if (_autoSendState) sendState();
 }
 
 void Joystick_::setRudder(int16_t value)
 {
-	JOYSTICK_VALUE_RANGE_CHECK(value, _rudderMinimum, _rudderMaximum);
-	
 	_rudder = value;
 	if (_autoSendState) sendState();
 }
 void Joystick_::setThrottle(int16_t value)
 {
-	JOYSTICK_VALUE_RANGE_CHECK(value, _throttleMinimum, _throttleMaximum);
-	
 	_throttle = value;
 	if (_autoSendState) sendState();
 }
 void Joystick_::setAccelerator(int16_t value)
 {
-	JOYSTICK_VALUE_RANGE_CHECK(value, _acceleratorMinimum, _acceleratorMaximum);
-
 	_accelerator = value;
 	if (_autoSendState) sendState();
 }
 void Joystick_::setBrake(int16_t value)
 {
-	JOYSTICK_VALUE_RANGE_CHECK(value, _brakeMinimum, _brakeMaximum);
-
 	_brake = value;
 	if (_autoSendState) sendState();
 }
 void Joystick_::setSteering(int16_t value)
 {
-	JOYSTICK_VALUE_RANGE_CHECK(value, _steeringMinimum, _steeringMaximum);
-
 	_steering = value;
 	if (_autoSendState) sendState();
 }
@@ -612,27 +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) {
+	if (includeValue == false) return 0;
 
-		if (valueMinimum > valueMaximum) {
-			// Values go from a larger number to a smaller number (e.g. 1024 to 0)
-			convertedValue = map(valueMinimum - value, valueMaximum, valueMinimum, actualMinimum, actualMaximum);
-		} else {
-			// Values go from a smaller number to a larger number (e.g. 0 to 1024)
-			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 (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

@@ -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)