Move ifdef for USE_MATRIX_SWITCHES, and add more standardized DCSBIOS_USE_MATRIX_SWITCHES

Author: talbotmcinnis

src/DcsBios.h

@@ -130,7 +130,9 @@ 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"
+#if defined(USE_MATRIX_SWITCHES) || defined(DCSBIOS_USE_MATRIX_SWITCHES)
 #include "internal/MatrixSwitches.h"
+#endif
 #include "internal/DualModeButton.h"
 
 namespace DcsBios {

src/internal/MatrixSwitches.h

@@ -1,8 +1,6 @@
 #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
@@ -112,5 +110,4 @@ namespace DcsBios {
 	};
 	typedef Matrix3PosT<> Matrix3Pos;
 }
-#endif
 #endif