Version 1.7.1: fixed #undefs for RECS80, RECS80EXT, SIEMENS

git-svn-id: svn://mikrocontroller.net/irmp@39 aeb2e35e-bfc4-4214-b83c-9e8de998ed28

diff --git a/IR-Data/rc6-hold.txt b/IR-Data/rc6-hold.txt
index 9f26e202656b6fdfc1d6f378772793bbc7a05a87..90ebb5a1629128b30dc1cd49f2a13a5889472d3b 100644 (file)
--- a/IR-Data/rc6-hold.txt
+++ b/IR-Data/rc6-hold.txt
@@ -1,5 +1,2 @@
 #RC6 Taste 2 gehalten\r
-0000000000000000000000000001111111100000011111111000001111000001111000000000000001111111111110000001110000011110000011110000011110000011110000011110000011110000011100000011100000011100000011100000011100000111100000000001111111100000111111111111111111111\r
-0000000000000000000000000000111111110000011111111000001111000001111000000000000001111111111110000001110000011110000011110000011110000011110000011110000011110000011110000011110000011100000011100000011100000011100000000001111111100000011111111111111111111\r
-0000000000000000000000000000111111110000011111111000001111000001111000000000000001111111111110000001110000011110000011110000011110000001110000011110000011110000011110000011110000011100000011100000011100000011100000000001111111100000111111111111111111111\r
-0000000000000000000000000000111111110000011111111000001111000001111000000000000001111111111110000001110000001110000001110000011110000011110000011110000011110000011110000011110000011110000011110000011100000011100000000001111111100000111111111111111111111\r
+0000000000000000000000000001111111100000011111111000001111000001111000000000000001111111111110000001110000011110000011110000011110000011110000011110000011110000011100000011100000011100000011100000011100000111100000000001111111100000111111111111111111111000000000000000000000000000011111111000001111111100000111100000111100000000000000111111111111000000111000001111000001111000001111000001111000001111000001111000001111000001111000001110000001110000001110000001110000000000111111110000001111111111111111111100000000000000000000000000001111111100000111111110000011110000011110000000000000011111111111100000011100000111100000111100000111100000011100000111100000111100000111100000111100000111000000111000000111000000111000000000011111111000001111111111111111111110000000000000000000000000000111111110000011111111000001111000001111000000000000001111111111110000001110000001110000001110000011110000011110000011110000011110000011110000011110000011110000011110000011100000011100000000001111111100000111111111111111111111\r

diff --git a/irmp.c b/irmp.c
index 7f478f076d7145fa58e1251db702b4c73a3c0612..99439d6029a49ea20ca6fdea91df16ba61b80c1c 100644 (file)
--- a/irmp.c
+++ b/irmp.c
@@ -3,7 +3,7 @@
  *\r
  * Copyright (c) 2009-2010 Frank Meyer - frank(at)fli4l.de\r
  *\r
- * $Id: irmp.c,v 1.64 2010/06/25 09:04:43 fm Exp $\r
+ * $Id: irmp.c,v 1.73 2010/06/26 18:13:11 fm Exp $\r
  *\r
  * ATMEGA88 @ 8 MHz\r
  *\r

diff --git a/irmp.h b/irmp.h
index c005e2b703cd886731a83e83df5c2817561b26b9..5035f37d0f6e9f64f20ca386f9db6f091c898df7 100644 (file)
--- a/irmp.h
+++ b/irmp.h
@@ -3,7 +3,7 @@
  *\r
  * Copyright (c) 2009-2010 Frank Meyer - frank(at)fli4l.de\r
  *\r
- * $Id: irmp.h,v 1.38 2010/06/23 07:05:03 fm Exp $\r
+ * $Id: irmp.h,v 1.39 2010/06/25 13:18:36 fm Exp $\r
  *\r
  * ATMEGA88 @ 8 MHz\r
  *\r
@@ -26,25 +26,25 @@ extern "C"
  * IR protocols\r
  *---------------------------------------------------------------------------------------------------------------------------------------------------\r
  */\r
-#define IRMP_SIRCS_PROTOCOL                      1                              // Sony\r
-#define IRMP_NEC_PROTOCOL                        2                              // NEC, Pioneer, JVC, Toshiba, NoName etc.\r
-#define IRMP_SAMSUNG_PROTOCOL                    3                              // Samsung\r
-#define IRMP_MATSUSHITA_PROTOCOL                 4                              // Matsushita\r
-#define IRMP_KASEIKYO_PROTOCOL                   5                              // Kaseikyo (Panasonic etc)\r
-#define IRMP_RECS80_PROTOCOL                     6                              // Philips, Thomson, Nordmende, Telefunken, Saba\r
-#define IRMP_RC5_PROTOCOL                        7                              // Philips etc\r
-#define IRMP_DENON_PROTOCOL                      8                              // Denon\r
-#define IRMP_RC6_PROTOCOL                        9                              // Philips etc\r
-#define IRMP_SAMSUNG32_PROTOCOL                 10                              // Samsung32: no sync pulse at bit 16, length 32 instead of 37\r
-#define IRMP_APPLE_PROTOCOL                     11                              // Apple, very similar to NEC\r
-#define IRMP_RECS80EXT_PROTOCOL                 12                              // Philips, Technisat, Thomson, Nordmende, Telefunken, Saba\r
-#define IRMP_NUBERT_PROTOCOL                    13                              // Nubert\r
-#define IRMP_BANG_OLUFSEN_PROTOCOL              14                              // Bang & Olufsen\r
-#define IRMP_GRUNDIG_PROTOCOL                   15                              // Grundig\r
-#define IRMP_NOKIA_PROTOCOL                     16                              // Nokia\r
-#define IRMP_SIEMENS_PROTOCOL                   17                              // Siemens, e.g. Gigaset\r
-#define IRMP_FDC_PROTOCOL                       18                              // FDC keyboard\r
-#define IRMP_RCCAR_PROTOCOL                     19                              // RC Car\r
+#define IRMP_SIRCS_PROTOCOL                      1              // Sony\r
+#define IRMP_NEC_PROTOCOL                        2              // NEC, Pioneer, JVC, Toshiba, NoName etc.\r
+#define IRMP_SAMSUNG_PROTOCOL                    3              // Samsung\r
+#define IRMP_MATSUSHITA_PROTOCOL                 4              // Matsushita\r
+#define IRMP_KASEIKYO_PROTOCOL                   5              // Kaseikyo (Panasonic etc)\r
+#define IRMP_RECS80_PROTOCOL                     6              // Philips, Thomson, Nordmende, Telefunken, Saba\r
+#define IRMP_RC5_PROTOCOL                        7              // Philips etc\r
+#define IRMP_DENON_PROTOCOL                      8              // Denon\r
+#define IRMP_RC6_PROTOCOL                        9              // Philips etc\r
+#define IRMP_SAMSUNG32_PROTOCOL                 10              // Samsung32: no sync pulse at bit 16, length 32 instead of 37\r
+#define IRMP_APPLE_PROTOCOL                     11              // Apple, very similar to NEC\r
+#define IRMP_RECS80EXT_PROTOCOL                 12              // Philips, Technisat, Thomson, Nordmende, Telefunken, Saba\r
+#define IRMP_NUBERT_PROTOCOL                    13              // Nubert\r
+#define IRMP_BANG_OLUFSEN_PROTOCOL              14              // Bang & Olufsen\r
+#define IRMP_GRUNDIG_PROTOCOL                   15              // Grundig\r
+#define IRMP_NOKIA_PROTOCOL                     16              // Nokia\r
+#define IRMP_SIEMENS_PROTOCOL                   17              // Siemens, e.g. Gigaset\r
+#define IRMP_FDC_PROTOCOL                       18              // FDC keyboard\r
+#define IRMP_RCCAR_PROTOCOL                     19              // RC Car\r
 \r
 // some flags of struct IRMP_PARAMETER:\r
 #define IRMP_PARAM_FLAG_IS_MANCHESTER           0x01\r

diff --git a/irmpconfig.h b/irmpconfig.h
index 255c3f6cd3dbad5716b720c9a896ba4bfc27feb0..a9b2f1b5b457a4966cd1a38ed62633688f4b2d0c 100644 (file)
--- a/irmpconfig.h
+++ b/irmpconfig.h
@@ -3,7 +3,7 @@
  *\r
  * Copyright (c) 2010 Frank Meyer - frank(at)fli4l.de\r
  *\r
- * $Id: irmpconfig.h,v 1.30 2010/06/25 09:04:43 fm Exp $\r
+ * $Id: irmpconfig.h,v 1.34 2010/06/26 18:11:08 fm Exp $\r
  *\r
  * ATMEGA88 @ 8 MHz\r
  *\r
@@ -89,14 +89,20 @@
 \r
 #if IRMP_SUPPORT_SIEMENS_PROTOCOL == 1 && F_INTERRUPTS < 15000\r
 #warning F_INTERRUPTS too low, SIEMENS protocol disabled (should be at least 15000)\r
+#undef IRMP_SUPPORT_SIEMENS_PROTOCOL\r
+#define IRMP_SUPPORT_SIEMENS_PROTOCOL           0\r
 #endif\r
 \r
 #if IRMP_SUPPORT_RECS80_PROTOCOL == 1 && F_INTERRUPTS < 20000\r
 #warning F_INTERRUPTS too low, RECS80 protocol disabled (should be at least 20000)\r
+#undef IRMP_SUPPORT_RECS80_PROTOCOL\r
+#define IRMP_SUPPORT_RECS80_PROTOCOL            0\r
 #endif\r
 \r
 #if IRMP_SUPPORT_RECS80EXT_PROTOCOL == 1 && F_INTERRUPTS < 20000\r
 #warning F_INTERRUPTS too low, RECS80EXT protocol disabled (should be at least 20000)\r
+#undef IRMP_SUPPORT_RECS80EXT_PROTOCOL\r
+#define IRMP_SUPPORT_RECS80EXT_PROTOCOL         0\r
 #endif\r
 \r
 #endif /* _WC_IRMPCONFIG_H_ */\r