Version 2.6.9: corrected some minor definition errors

[irmp.git] / irmp.h

diff --git a/irmp.h b/irmp.h
index faa4201e2f5ee6e41b3e2f9029a30cdf146e3c93..c7de84415385c580b1d6d3ad47cb6dea897aa387 100644 (file)
--- a/irmp.h
+++ b/irmp.h
@@ -1,11 +1,9 @@
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
  * irmp.h\r
  *\r
- * Copyright (c) 2009-2013 Frank Meyer - frank(at)fli4l.de\r
+ * Copyright (c) 2009-2014 Frank Meyer - frank(at)fli4l.de\r
  *\r
- * $Id: irmp.h,v 1.86 2014/07/09 15:26:02 fm Exp $\r
- *\r
- * ATMEGA88 @ 8 MHz\r
+ * $Id: irmp.h,v 1.90 2015/01/19 10:54:37 fm Exp $\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
@@ -63,11 +61,34 @@
 #  define sei()                                 IntMasterEnable()\r
 #endif\r
 \r
-#if IRMP_SUPPORT_DENON_PROTOCOL == 1 && IRMP_SUPPORT_RUWIDO_PROTOCOL == 1\r
-#  warning DENON protocol conflicts wih RUWIDO, please enable only one of both protocols\r
+#if IRMP_SUPPORT_DENON_PROTOCOL == 1 && (IRMP_SUPPORT_RUWIDO_PROTOCOL == 1 || IRMP_SUPPORT_SIEMENS_PROTOCOL == 1)\r
+#  warning DENON protocol conflicts wih RUWIDO/SIEMENS, please enable only one of both protocols\r
+#  warning RUWIDO protocol disabled\r
+#  warning SIEMENS protocol disabled\r
+#  warning DENON protocol stays enabled\r
+#  undef IRMP_SUPPORT_RUWIDO_PROTOCOL\r
+#  define IRMP_SUPPORT_RUWIDO_PROTOCOL          0\r
+#  undef IRMP_SUPPORT_SIEMENS_PROTOCOL\r
+#  define IRMP_SUPPORT_SIEMENS_PROTOCOL          0\r
+#endif\r
+\r
+#if IRMP_SUPPORT_DENON_PROTOCOL == 1 && (IRMP_SUPPORT_RUWIDO_PROTOCOL == 1 || IRMP_SUPPORT_SIEMENS_PROTOCOL == 1)\r
+#  warning MERLIN protocol conflicts wih RUWIDO/SIEMENS, please enable only one of both protocols\r
 #  warning RUWIDO protocol disabled\r
+#  warning SIEMENS protocol disabled\r
+#  warning MERLIN protocol stays enabled\r
 #  undef IRMP_SUPPORT_RUWIDO_PROTOCOL\r
 #  define IRMP_SUPPORT_RUWIDO_PROTOCOL          0\r
+#  undef IRMP_SUPPORT_SIEMENS_PROTOCOL\r
+#  define IRMP_SUPPORT_SIEMENS_PROTOCOL          0\r
+#endif\r
+\r
+#if IRMP_SUPPORT_DENON_PROTOCOL == 1 && IRMP_SUPPORT_A1TVBOX_PROTOCOL == 1\r
+#  warning MERLIN protocol conflicts wih A1TVBOX, please enable only one of both protocols\r
+#  warning A1TVBOX protocol disabled\r
+#  warning MERLIN protocol stays enabled\r
+#  undef IRMP_SUPPORT_A1TVBOX_PROTOCOL\r
+#  define IRMP_SUPPORT_A1TVBOX_PROTOCOL          0\r
 #endif\r
 \r
 #if IRMP_SUPPORT_RC6_PROTOCOL == 1 && IRMP_SUPPORT_ROOMBA_PROTOCOL == 1\r
@@ -173,16 +194,16 @@
 #define IRMP_FLAG_REPETITION            0x01\r
 \r
 extern void                             irmp_init (void);\r
-extern uint8_t                          irmp_get_data (IRMP_DATA *);\r
-extern uint8_t                          irmp_is_busy (void);\r
-extern uint8_t                          irmp_ISR (void);\r
+extern uint_fast8_t                     irmp_get_data (IRMP_DATA *);\r
+extern uint_fast8_t                     irmp_is_busy (void);\r
+extern uint_fast8_t                     irmp_ISR (void);\r
 \r
 #if IRMP_PROTOCOL_NAMES == 1\r
-extern char *                           irmp_protocol_names[IRMP_N_PROTOCOLS + 1];\r
+extern const char * const               irmp_protocol_names[IRMP_N_PROTOCOLS + 1] PROGMEM;\r
 #endif\r
 \r
 #if IRMP_USE_CALLBACK == 1\r
-extern void                             irmp_set_callback_ptr (void (*cb)(uint8_t));\r
+extern void                             irmp_set_callback_ptr (void (*cb)(uint_fast8_t));\r
 #endif // IRMP_USE_CALLBACK == 1\r
 \r
 #endif /* _IRMP_H_ */\r