From cb93f9e9e7b2cc102071423a590cc4a57c06657c Mon Sep 17 00:00:00 2001
From: ukw
Date: Thu, 20 Feb 2014 15:25:39 +0000
Subject: Version 2.4.0: IRMP: added RCMM protocols, fixed decoding of SIEMENS
 protocol, fixed Timer routines for PIC C18 compiler IRSND: added RUWIDO
 protocol

git-svn-id: svn://mikrocontroller.net/irmp@121 aeb2e35e-bfc4-4214-b83c-9e8de998ed28
---
 irmp.h | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

(limited to 'irmp.h')

diff --git a/irmp.h b/irmp.h
index b529b06..bf53e3c 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.82 2013/04/09 11:55:39 fm Exp $
+ * $Id: irmp.h,v 1.84 2014/02/19 12:57:36 fm Exp $
  *
  * ATMEGA88 @ 8 MHz
  *
@@ -77,6 +77,27 @@
 #  define IRMP_SUPPORT_ROOMBA_PROTOCOL          0
 #endif
 
+#if IRMP_SUPPORT_RC5_PROTOCOL == 1 && IRMP_SUPPORT_ORTEK_PROTOCOL == 1
+#  warning RC5 protocol conflicts wih ORTEK, please enable only one of both protocols
+#  warning ORTEK protocol disabled
+#  undef IRMP_SUPPORT_ORTEK_PROTOCOL
+#  define IRMP_SUPPORT_ORTEK_PROTOCOL           0
+#endif
+
+#if IRMP_SUPPORT_FDC_PROTOCOL == 1 && IRMP_SUPPORT_ORTEK_PROTOCOL == 1
+#  warning FDC protocol conflicts wih ORTEK, please enable only one of both protocols
+#  warning ORTEK protocol disabled
+#  undef IRMP_SUPPORT_ORTEK_PROTOCOL
+#  define IRMP_SUPPORT_ORTEK_PROTOCOL           0
+#endif
+
+#if IRMP_SUPPORT_ORTEK_PROTOCOL == 1 && IRMP_SUPPORT_NETBOX_PROTOCOL == 1
+#  warning ORTEK protocol conflicts wih NETBOX, please enable only one of both protocols
+#  warning NETBOX protocol disabled
+#  undef IRMP_SUPPORT_NETBOX_PROTOCOL
+#  define IRMP_SUPPORT_NETBOX_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
@@ -125,6 +146,12 @@
 #  define IRMP_SUPPORT_NEC_PROTOCOL             1
 #endif
 
+#if IRMP_SUPPORT_RCMM_PROTOCOL == 1 && F_INTERRUPTS < 20000
+#  warning F_INTERRUPTS too low, RCMM protocol disabled (should be at least 20000)
+#  undef IRMP_SUPPORT_RCMM_PROTOCOL
+#  define IRMP_SUPPORT_RCMM_PROTOCOL            0
+#endif
+
 #if F_INTERRUPTS > 20000
 #error F_INTERRUPTS too high (should be not greater than 20000)
 #endif
-- 
cgit v1.2.3