Merge pull request #18 from talbotmcinnis/IntegrateMatrixSwitches

Integrated Dehuman's Matrix2Pos and Matrix3Pos

Author: talbotmcinnis

examples/Button_Matrix_Example/Button_Matrix_Example.ino

@@ -1,5 +1,5 @@
 /*
-    Name:				Button_Matrix_Example.ino
+    Name:				Button_matrix_Example.ino
     Created:			10/06/2019 2:27:18 PM
     Author:				Azza276
 	Button Matrix by:	ChronoZoggt
@@ -18,6 +18,7 @@
 
 #include <Arduino.h>
 #define DCSBIOS_DEFAULT_SERIAL //Use DCSBIOS_DEFAULT_SERIAL is IRQ does not work.
+#define USE_MATRIX_SWITCHES
 #include "DcsBios.h"
 
 
@@ -74,6 +75,8 @@ DcsBios::MatActionButton ufcClr("UFC_CLR", "TOGGLE", &in_mat[3][0]);
 DcsBios::MatActionButton ufc0("UFC_0", "TOGGLE", &in_mat[3][1]);
 DcsBios::MatActionButton ufcEnt("UFC_ENT", "TOGGLE", &in_mat[3][2]);*/
 
+DcsBios::Matrix2Pos aapCdupwr("AAP_CDUPWR", 2, 2);
+DcsBios::Matrix3Pos ahcpAltSce("AHCP_ALT_SCE", 1, 2, 1, 2);
 
 // The setup() function runs once each time the micro-controller starts
 void setup() {
@@ -101,4 +104,4 @@ void loop() {
 		digitalWrite(colPins[x], HIGH); //set the current column output to a high +V source to so it is not recognised as a press when the other columns are LOW.
 	}
 	DcsBios::loop(); //DcsBios loop is here.
-}
+}

src/DcsBios.h

@@ -128,6 +128,7 @@ do not come with their own build system, we are just putting everything into the
 #include "internal/BcdWheels.h"
 #include "internal/AnalogMultiPos.h"
 #include "internal/RotarySwitch.h"
+#include "internal/MatrixSwitches.h"
 
 namespace DcsBios {
 	template<unsigned int first, unsigned int second>

src/internal/MatrixSwitches.h

@@ -0,0 +1,116 @@
+#ifndef __DCSBIOS_MATRIX_SWITCHES_H
+#define __DCSBIOS_MATRIX_SWITCHES_H
+
+#ifdef USE_MATRIX_SWITCHES
+
+#include <math.h>
+#include "Arduino.h"
+#include "SwitchMatrix.h"	// https://github.com/dagoston93/SwitchMatrix
+
+SwitchMatrix swPanel = SwitchMatrix();
+
+namespace DcsBios {
+	template <unsigned long pollIntervalMs = POLL_EVERY_TIME>
+	class Matrix2PosT : PollingInput, public ResettableInput {
+		private:
+			const char* msg_;
+			char row_;
+			char col_;
+			char lastState_;
+			bool reverse_;
+			void init_(const char* msg, char row, char col, bool reverse) {
+				msg_ = msg;
+				row_ = row;
+				col_ = col;
+				lastState_ = swPanel.GetSwitchState(row_, col_);
+				reverse_ = reverse;
+			}
+			void resetState()
+			{
+				lastState_ = (lastState_==0)?-1:0;
+			}
+			void pollInput() {
+				char state = swPanel.GetSwitchState(row_, col_);
+				if (reverse_) state = !state;
+				if (state != lastState_) {
+					if (tryToSendDcsBiosMessage(msg_, state == false ? "0" : "1")) {
+						lastState_ = state;
+					}
+				}
+			}
+		public:
+			Matrix2PosT(const char* msg, char row, char col, bool reverse) : PollingInput(pollIntervalMs)
+			{ 
+				init_(msg, row, col, reverse); 
+			}
+			
+			Matrix2PosT(const char* msg, char row, char col) : PollingInput(pollIntervalMs)
+			{ 
+				init_(msg, row, col, false); 
+			}
+
+			void resetThisState()
+			{
+				this->resetState();
+			}
+	};
+	typedef Matrix2PosT<> Matrix2Pos;
+	
+	template <unsigned long pollIntervalMs = POLL_EVERY_TIME>
+	class Matrix3PosT : PollingInput, public ResettableInput {
+		private:
+			const char* msg_;
+			char rowA_;
+			char colA_;
+			char rowB_;
+			char colB_;
+			char lastState_;
+			char readState() {
+				if (swPanel.GetSwitchState(rowA_, colA_) == true) return 0;
+				if (swPanel.GetSwitchState(rowB_, colB_) == true) return 2;
+				return 1;
+			}
+			void resetState()
+			{
+				lastState_ = (lastState_==0)?-1:0;
+			}
+			void pollInput() {
+				char state = readState();
+				if (state != lastState_) {
+					if (state == 0) {
+						if (tryToSendDcsBiosMessage(msg_, "0")) {
+							lastState_ = state;
+						}
+					}
+					else if (state == 1) {
+						if (tryToSendDcsBiosMessage(msg_, "1")) {
+							lastState_ = state;
+						}
+					}
+					else if (state == 2) {
+						if(tryToSendDcsBiosMessage(msg_, "2")){
+							lastState_ = state;
+						}
+					}
+				}
+			}
+		public:
+			Matrix3PosT(const char* msg, char rowA, char colA, char rowB, char colB) : PollingInput(pollIntervalMs)
+			{
+				msg_ = msg;
+				colA_ = colA;
+				rowA_ = rowA;
+				colB_ = colB;
+				rowB_ = rowB;
+				lastState_ = readState();
+			}
+
+			void resetThisState()
+			{
+				this->resetState();
+			}
+	};
+	typedef Matrix3PosT<> Matrix3Pos;
+}
+#endif
+#endif