1 files changed, 8 insertions, 1 deletions
diff --git a/irmp.h b/irmp.h
index 9579250..b529b06 100644
--- a/irmp.h
+++ b/irmp.h
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2009-2013 Frank Meyer - frank(at)fli4l.de
  *
- * $Id: irmp.h,v 1.81 2013/01/17 07:33:13 fm Exp $
+ * $Id: irmp.h,v 1.82 2013/04/09 11:55:39 fm Exp $
  *
  * ATMEGA88 @ 8 MHz
  *
@@ -70,6 +70,13 @@
 #  define IRMP_SUPPORT_RUWIDO_PROTOCOL          0
 #endif
 
+#if IRMP_SUPPORT_RC6_PROTOCOL == 1 && IRMP_SUPPORT_ROOMBA_PROTOCOL == 1
+#  warning RC6 protocol conflicts wih ROOMBA, please enable only one of both protocols
+#  warning ROOMBA protocol disabled
+#  undef IRMP_SUPPORT_ROOMBA_PROTOCOL
+#  define IRMP_SUPPORT_ROOMBA_PROTOCOL          0
+#endif
+
 #if IRMP_SUPPORT_SIEMENS_PROTOCOL == 1 && F_INTERRUPTS < 15000
 #  warning F_INTERRUPTS too low, SIEMENS protocol disabled (should be at least 15000)
 #  undef IRMP_SUPPORT_SIEMENS_PROTOCOL