Merge branch 'master' into InvertableLeds

Author: talbotmcinnis

examples/OneOfEverything/OneOfEverything.ino

@@ -77,6 +77,7 @@ const int ANALOG_OUT_PIN_A = 16;
 // A single LED
 DcsBios::Dimmer defaultDimmerExample(0x1012, OUT_PIN_A);
 DcsBios::LED masterCaution(0x1012, 0x0800, OUT_PIN_A);
+
 DcsBios::LED invertedLedExample(0x1012, 0x0800, OUT_PIN_A, true);
 
 // An analog output with a value that comes from a DCS address

releasenotes.md

@@ -2,6 +2,7 @@
 - Added input_min and input_max optional parameters to PotentiometerEWMA to allow a user to calibrate their analog inputs if their physical control does not utilize the full range available to the controller.
 - Fix Switch2Pos state reset logic, and improve it's internal debounce logic for a few edge cases.
 - Add DualModeButton for first multi-seat support.  Originally developed for use in Apache cockpits where one switch toggles the function of a physical button between front and back seat DCS control.
+- Included AerialElectron's Concentric Rotary Encoder Emulator.  Useful for simpits with a rotary that has a pushbutton, to emulate controlling two different dcs cockpit controls, especially if the dcs controls are dual-ring concentric rotaries.  Thanks for the contribution AerialElectron!
 - Integrated No1sonuk's inverted LED support.  LEDs now take an optional parameter which can be used to have an SimPit LED operate opposite to a DcsPit LED.
 
 ## v0.3.7

src/internal/Encoders.h

@@ -294,7 +294,6 @@ namespace DcsBios {
 
   	//To emulate dual concentric rotary encoders/resolvers/potentiometers using a rotary encoder with a push button.
 	//Secondary message is used when push button or switch is enabled.
-
 	template <unsigned long pollIntervalMs = POLL_EVERY_TIME, StepsPerDetent stepsPerDetent = ONE_STEP_PER_DETENT>
 	class EmulatedConcentricRotaryEncoderT : PollingInput, public ResettableInput {
 	private:
@@ -306,29 +305,27 @@ namespace DcsBios {
 		const char* incArg2_;
 		char pinA_;
 		char pinB_;
-		char pinC_;	//Integrated button pin
+		char pinToggle_;	//Integrated button pin
 		bool msg1Mode_;
 		char prevMode_;
 		char lastState_;
 		signed char delta_;
 
 		char readState() {
-			return (digitalRead(pinA_) << 1) | digitalRead(pinB_);
-		}
-		
-		void checkPress() {
 			char currentMode;
-			msg1Mode_ = ((currentMode = digitalRead(pinC_)) != prevMode_)?!msg1Mode_:msg1Mode_;
+			msg1Mode_ = ((currentMode = digitalRead(pinToggle_)) != prevMode_)?!msg1Mode_:msg1Mode_;
 			prevMode_ = currentMode;
+
+			return (digitalRead(pinA_) << 1) | digitalRead(pinB_);
 		}
 
 		void resetState() {
+			msg1Mode_ = !msg1Mode_;
 			lastState_ = (lastState_==0)?-1:0;
 		}
 
 		void pollInput() {
 			char state = readState();
-			checkPress();
 			switch(lastState_) {
 				case 0:
 					if (state == 2) delta_--;
@@ -349,47 +346,42 @@ namespace DcsBios {
 			}
 			lastState_ = state;
 
-			if ((delta_ >= stepsPerDetent) && (msg1Mode_)) {
-				if (tryToSendDcsBiosMessage(msg1_, incArg1_))
-					delta_ -= stepsPerDetent;
-			}
-			if ((delta_ <= -stepsPerDetent) && (msg1Mode_)) {
-				if (tryToSendDcsBiosMessage(msg1_, decArg1_))
-					delta_ += stepsPerDetent;
-			}
-			if ((delta_ >= stepsPerDetent) && (!msg1Mode_)) {
-				if (tryToSendDcsBiosMessage(msg2_, incArg2_))
+			if (delta_ >= stepsPerDetent) {
+				if (tryToSendDcsBiosMessage(msg1Mode_?msg1_:msg2_, msg1Mode_?incArg1_:incArg2_))
 					delta_ -= stepsPerDetent;
 			}
-			if ((delta_ <= -stepsPerDetent) && (!msg1Mode_)) {
-				if (tryToSendDcsBiosMessage(msg2_, decArg2_))
+			if (delta_ <= -stepsPerDetent) {
+				if (tryToSendDcsBiosMessage(msg1Mode_?msg1_:msg2_, msg1Mode_?decArg1_:decArg2_))
 					delta_ += stepsPerDetent;
 			}
 		}
 	public:
 		EmulatedConcentricRotaryEncoderT(const char* msg1, const char* decArg1, const char* incArg1, const char* msg2, const char* decArg2, const char* incArg2, char pinA, char pinB, char pinC) :
-			PollingInput(pollIntervalMs) {
+			PollingInput(pollIntervalMs)
+		{
 			msg1_ = msg1;
 			decArg1_ = decArg1;
 			incArg1_ = incArg1;
 			msg2_ = msg2;
 			decArg2_ = decArg2;
 			incArg2_ = incArg2;
+			
 			pinA_ = pinA;
 			pinB_ = pinB;
-			pinC_ = pinC;
+			pinToggle_ = pinC;
 			msg1Mode_ = true;
-			prevMode_ = 1;
+			
 			pinMode(pinA_, INPUT_PULLUP);
 			pinMode(pinB_, INPUT_PULLUP);
-			pinMode(pinC_, INPUT_PULLUP);
-			prevMode_ = digitalRead(pinC_);	//Prevents defaulting to secondary action on initialization
+			pinMode(pinToggle_, INPUT_PULLUP);
+			prevMode_ = digitalRead(pinToggle_);	//Prevents defaulting to secondary action on initialization
+			
 			delta_ = 0;
 			lastState_ = readState();
 		}
 
 		void SetControl(const char* msg) {	
-			msg1_ = msg;
+			msg1_ = msg;	// Note this won't work to remap the second message
 		}