diff --git a/Multiprotocol/DSM_cyrf6936.ino b/Multiprotocol/DSM_cyrf6936.ino
index d80cf6e..acc4331 100644
--- a/Multiprotocol/DSM_cyrf6936.ino
+++ b/Multiprotocol/DSM_cyrf6936.ino
@@ -411,9 +411,7 @@ uint16_t ReadDsm()
 				if(len==10 && DSM_Check_RX_packet())
 				{
 					pkt[0]=0x80;
-#if defined(TELEMETRY)
 					telemetry_link=1;						// send received data on serial
-#endif 
 					phase++;
 					return 2000;
 				}
@@ -495,9 +493,7 @@ uint16_t ReadDsm()
 					len=MAX_PKT-2;
 				CYRF_ReadDataPacketLen(pkt+1, len);
 				pkt[0]=CYRF_ReadRegister(CYRF_13_RSSI)&0x1F;// store RSSI of the received telemetry signal
-#if defined(TELEMETRY)
 				telemetry_link=1;
-#endif 
 			}
 			CYRF_WriteRegister(CYRF_29_RX_ABORT, 0x20);		// Abort RX operation
 			if (phase == DSM_CH2_READ_A && (sub_protocol==DSM2_22 || sub_protocol==DSMX_22) && DSM_num_ch < 8)	// 22ms mode
diff --git a/Multiprotocol/Devo_cyrf6936.ino b/Multiprotocol/Devo_cyrf6936.ino
index e210c5a..885e6c0 100644
--- a/Multiprotocol/Devo_cyrf6936.ino
+++ b/Multiprotocol/Devo_cyrf6936.ino
@@ -13,7 +13,7 @@
  along with Multiprotocol.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if defined(DEVO_CYRF6936_INO) && defined(CYRF6936_INSTALLED)
+#if defined(DEVO_CYRF6936_INO) 
  
 #include "iface_cyrf6936.h"
 
diff --git a/Multiprotocol/Multiprotocol.ino b/Multiprotocol/Multiprotocol.ino
index 1727a1e..27b0286 100644
--- a/Multiprotocol/Multiprotocol.ino
+++ b/Multiprotocol/Multiprotocol.ino
@@ -31,17 +31,6 @@
 #include "TX_Def.h"
 #include "Validate.h"
 
-#ifdef ENABLE_NUNCHUCK
-	#undef ENABLE_SERIAL
-	#undef ENABLE_PPM
-	
-	#undef TELEMETRY
-	
-	#undef CYRF6936_INSTALLED
-	#undef CC2500_INSTALLED
-	#undef NRF24L01_INSTALLED
-	
-#endif
 
 #ifndef STM32_BOARD
 	#include <avr/eeprom.h>
diff --git a/Multiprotocol/Validate.h b/Multiprotocol/Validate.h
index 277d5b1..e92d6f1 100644
--- a/Multiprotocol/Validate.h
+++ b/Multiprotocol/Validate.h
@@ -18,6 +18,25 @@
 	#endif
 #endif
 
+#ifdef ENABLE_NUNCHUCK
+	#if not defined(ARDUINO_AVR_PRO) && not defined(ARDUINO_AVR_MINI) && not defined(ARDUINO_AVR_NANO)
+		#error You must select one of these boards: "Multi 4-in-1", "Arduino Pro or Pro Mini" or "Arduino Mini"
+	#endif
+	#if F_CPU != 16000000L || not defined(__AVR_ATmega328P__)
+		#error You must select the processor type "ATmega328(5V, 16MHz)"
+	#endif
+	
+	#undef ENABLE_SERIAL
+	#undef ENABLE_PPM
+	
+	#undef TELEMETRY
+	
+	#undef CYRF6936_INSTALLED
+	#undef CC2500_INSTALLED
+	#undef NRF24L01_INSTALLED
+	
+#endif
+
 //Change/Force configuration if OrangeTX
 #ifdef ORANGE_TX
 	#undef ENABLE_PPM			// Disable PPM for OrangeTX module
diff --git a/Multiprotocol/boards.txt b/Multiprotocol/boards.txt
index 70dc5a6..c82a744 100644
--- a/Multiprotocol/boards.txt
+++ b/Multiprotocol/boards.txt
@@ -856,7 +856,7 @@ multi.bootloader.lock_bits=0x0F
 multi.build.board=AVR_PRO
 multi.build.core=arduino
 multi.build.variant=eightanaloginputs
-
+## --------------------------------------------------
 multi.menu.cpu.16MHzatmega328=ATmega328 (3.3V, 16 MHz)
 
 multi.menu.cpu.16MHzatmega328.upload.maximum_size=32768
diff --git a/Multiprotocol/sync.ffs_db b/Multiprotocol/sync.ffs_db
index 827f5be..b1813b4 100644
Binary files a/Multiprotocol/sync.ffs_db and b/Multiprotocol/sync.ffs_db differ