From 1961579fe45f78ff4a01b7aeafd199c7d6f77b3c Mon Sep 17 00:00:00 2001
From: Andrew Shkolik <andrew.shkolik@selerix.com>
Date: Mon, 30 Dec 2019 15:44:16 -0600
Subject: [PATCH] code cleanup

---
 Multiprotocol/Multiprotocol.ino | 40 ++++++++++++++++++++++++--------
 Multiprotocol/Validate.h        | 15 ++++++++++++
 Multiprotocol/_Config.h         | 41 +++++++++++++--------------------
 3 files changed, 62 insertions(+), 34 deletions(-)

diff --git a/Multiprotocol/Multiprotocol.ino b/Multiprotocol/Multiprotocol.ino
index 43a15bb..de9ceb5 100644
--- a/Multiprotocol/Multiprotocol.ino
+++ b/Multiprotocol/Multiprotocol.ino
@@ -331,6 +331,21 @@ void setup()
 		pinMode(S2_pin,INPUT_PULLUP);
 		pinMode(S3_pin,INPUT_PULLUP);
 		pinMode(S4_pin,INPUT_PULLUP);
+
+		#if defined ENABLE_DIRECT_INPUTS
+			#if defined (DI1_PIN)
+				pinMode(DI1_PIN,INPUT_PULLUP);
+			#endif
+			#if defined (DI2_PIN)
+				pinMode(DI2_PIN,INPUT_PULLUP);
+			#endif
+			#if defined (DI3_PIN)
+				pinMode(DI3_PIN,INPUT_PULLUP);
+			#endif
+			#if defined (DI4_PIN)
+				pinMode(DI4_PIN,INPUT_PULLUP);
+			#endif
+		#endif
 		//Random pins
 		pinMode(PB0, INPUT_ANALOG); // set up pin for analog input
 
@@ -666,23 +681,29 @@ bool Update_All()
 		if(mode_select!=MODE_SERIAL && IS_PPM_FLAG_on)		// PPM mode and a full frame has been received
 		{
 			uint32_t chan_or=chan_order;
-			uint8_t ch;
-			uint8_t channels_count = PPM_chan_max;
-			#ifdef ENABLE_DIRECT_INPUTS
+			uint8_t ch;		
+			uint8_t channelsCount = PPM_chan_max;
+			
+			#ifdef ENABLE_DIRECT_INPUTS				
 				#ifdef DI_CH1_read
-					PPM_data[channels_count++] = DI_CH1_read
+					PPM_data[channelsCount] = DI_CH1_read;
+					channelsCount++;
 				#endif
 				#ifdef DI_CH2_read
-					PPM_data[channels_count++] = DI_CH2_read
+					PPM_data[channelsCount] = DI_CH2_read;
+					channelsCount++;
 				#endif
 				#ifdef DI_CH3_read
-					PPM_data[channels_count++] = DI_CH3_read
+					PPM_data[channelsCount] = DI_CH3_read;
+					channelsCount++;
 				#endif
 				#ifdef DI_CH4_read
-					PPM_data[channels_count++] = DI_CH4_read
-				#endif
+					PPM_data[channelsCount] = DI_CH4_read;
+					channelsCount++;
+				#endif 
 			#endif
-			for(uint8_t i=0;i<channels_count;i++)
+			
+			for(uint8_t i=0;i<channelsCount;i++)
 			{ // update servo data without interrupts to prevent bad read
 				uint16_t val;
 				cli();										// disable global int
@@ -703,6 +724,7 @@ bool Update_All()
 				else
 					Channel_data[i]=val;
 			}
+       
 			PPM_FLAG_off;									// wait for next frame before update
 			#ifdef FAILSAFE_ENABLE
 				PPM_failsafe();
diff --git a/Multiprotocol/Validate.h b/Multiprotocol/Validate.h
index 4473be1..0d9cd7c 100644
--- a/Multiprotocol/Validate.h
+++ b/Multiprotocol/Validate.h
@@ -414,3 +414,18 @@
 #if defined (STM32_BOARD) && defined (DEBUG_SERIAL) && defined (NRF24L01_INSTALLED)
 	#define XN297DUMP_NRF24L01_INO
 #endif
+
+//Check if Direct inputs defined correctly
+#if defined (ENABLE_DIRECT_INPUTS) 
+	#if not defined (STM32_BOARD) || not defined (ENABLE_PPM) || defined (ENABLE_SERIAL)
+		#error You can enable dirct inputs only in PPM mode and only for STM32 board.
+	#endif
+
+	#if not defined (DI1_PIN) && not defined (DI2_PIN) && not defined (DI3_PIN) && not defined (DI4_PIN)
+		#error You must define at least 1 direct input pin or undefine ENABLE_DIRECT_INPUTS in config.
+	#endif
+	
+	#if not defined (DI_CH1_read) && not defined (DI_CH2_read) && not defined (DI_CH3_read) && not defined (DI_CH4_read)
+		#error You must define at least 1 direct input chanell read macros or undefine ENABLE_DIRECT_INPUTS in config.
+	#endif
+#endif
\ No newline at end of file
diff --git a/Multiprotocol/_Config.h b/Multiprotocol/_Config.h
index ed728c0..39fffe1 100644
--- a/Multiprotocol/_Config.h
+++ b/Multiprotocol/_Config.h
@@ -494,36 +494,27 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]=	{
 /**********************************/
 //In this section you can configure the direct inputs.
 //It enables switches wired directly to the board
-//Current mappings are: AUX1-PB10, AUX2-PB11, AUX3-PA2, AUX4-PA3
 //Direct inputs works only in ppm mode and only for stm_32 boards
-#if defined(ENABLE_PPM) && defined (STM32_BOARD) && not defined (ENABLE_SERIAL)
+//Uncomment following lines to enable derect inputs or define your own configuration in _MyConfig.h
+/*
+#define ENABLE_DIRECT_INPUTS
+		
+#define DI1_PIN				PC13	
+#define IS_DI1_on			(digitalRead(DI1_PIN)==LOW)
 
-	//If plan to use direct input mode please uncomment lines below
-	#define ENABLE_DIRECT_INPUTS
-	//
-	
-	#define DI1_PIN				PC13
-	#define DI1_SET_INPUT 		pinMode(DI1_PIN,INPUT)
-	#define DI1_SET_PULLUP 		digitalWrite(DI1_PIN,HIGH)
-	#define IS_DI1_on			(digitalRead(DI1_PIN)==LOW)
+#define DI2_PIN				PC14	
+#define IS_DI2_on			(digitalRead(DI2_PIN)==LOW)
 
-	#define DI2_PIN				PC14
-	#define DI2_SET_INPUT 		pinMode(DI2_PIN,INPUT)
-	#define DI2_SET_PULLUP 		digitalWrite(DI2_PIN,HIGH)
-	#define IS_DI2_on			(digitalRead(DI2_PIN)==LOW)
+#define DI3_PIN				PC15	
+#define IS_DI3_on			(digitalRead(DI3_PIN)==LOW)
 
-	#define DI3_PIN				PC15
-	#define DI3_SET_INPUT 		pinMode(DI3_PIN,INPUT)
-	#define DI3_SET_PULLUP 		digitalWrite(DI3_PIN,HIGH)
-	#define IS_DI3_on			(digitalRead(DI3_PIN)==LOW)
+//Define up to 4 direct input channels
+//CHANNEL1 - 2pos switch
+#define DI_CH1_read			IS_DI1_on ? PPM_MAX_100*2 : PPM_MIN_100*2
+//CHANNEL2 - 3pos switch
+#define DI_CH2_read			IS_DI2_on ? PPM_MAX_100*2 : (IS_DI2_on ? PPM_MAX_100 + PPM_MIN_100 : PPM_MIN_100*2)
+*/
 
-	//CHANNEL1 - 2pos switch
-	#define DI_CH1_read			IS_DI1_on ? PPM_MAX_100*2 : PPM_MIN_100*2
-
-	//CHANNEL2 - 3pos switch
-	#define DI_CH2_read			IS_DI2_on ? PPM_MAX_100*2 : (IS_DI2_on ? PPM_MAX_100 + PPM_MIN_100 : PPM_MIN_100*2)
-
-#endif
 /* Available protocols and associated sub protocols to pick and choose from (Listed in alphabetical order)
 	PROTO_AFHDS2A
 		PWM_IBUS