summaryrefslogtreecommitdiff
path: root/irmp.h
diff options
context:
space:
mode:
authorukw2013-04-09 11:57:14 +0000
committerukw2013-04-09 11:57:14 +0000
commit40ca460491ac6e0c0e9edd87973711f58323dd91 (patch)
tree4eb316d2c852c473bfaf3a3af6a3a409badda27f /irmp.h
parentb85cb27dc97335aac5a98eacfefdb6119ad8312e (diff)
downloadirmp-40ca460491ac6e0c0e9edd87973711f58323dd91.zip
Version 2.3.10: improved ORTEK detection, added ROOMBA protocol
git-svn-id: svn://mikrocontroller.net/irmp@118 aeb2e35e-bfc4-4214-b83c-9e8de998ed28
Diffstat (limited to 'irmp.h')
-rw-r--r--irmp.h9
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