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

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

4 files changed, 29 insertions, 26 deletions

diff --git a/IR-Data/rc6-hold.txt b/IR-Data/rc6-hold.txt
index 9f26e20..90ebb5a 100644
--- a/IR-Data/rc6-hold.txt
+++ b/IR-Data/rc6-hold.txt
@@ -1,5 +1,2 @@
 #RC6 Taste 2 gehalten

-0000000000000000000000000001111111100000011111111000001111000001111000000000000001111111111110000001110000011110000011110000011110000011110000011110000011110000011100000011100000011100000011100000011100000111100000000001111111100000111111111111111111111

-0000000000000000000000000000111111110000011111111000001111000001111000000000000001111111111110000001110000011110000011110000011110000011110000011110000011110000011110000011110000011100000011100000011100000011100000000001111111100000011111111111111111111

-0000000000000000000000000000111111110000011111111000001111000001111000000000000001111111111110000001110000011110000011110000011110000001110000011110000011110000011110000011110000011100000011100000011100000011100000000001111111100000111111111111111111111

-0000000000000000000000000000111111110000011111111000001111000001111000000000000001111111111110000001110000001110000001110000011110000011110000011110000011110000011110000011110000011110000011110000011100000011100000000001111111100000111111111111111111111

+0000000000000000000000000001111111100000011111111000001111000001111000000000000001111111111110000001110000011110000011110000011110000011110000011110000011110000011100000011100000011100000011100000011100000111100000000001111111100000111111111111111111111000000000000000000000000000011111111000001111111100000111100000111100000000000000111111111111000000111000001111000001111000001111000001111000001111000001111000001111000001111000001110000001110000001110000001110000000000111111110000001111111111111111111100000000000000000000000000001111111100000111111110000011110000011110000000000000011111111111100000011100000111100000111100000111100000011100000111100000111100000111100000111100000111000000111000000111000000111000000000011111111000001111111111111111111110000000000000000000000000000111111110000011111111000001111000001111000000000000001111111111110000001110000001110000001110000011110000011110000011110000011110000011110000011110000011110000011110000011100000011100000000001111111100000111111111111111111111

diff --git a/irmp.c b/irmp.c
index 7f478f0..99439d6 100644
--- a/irmp.c
+++ b/irmp.c
@@ -3,7 +3,7 @@
  *

  * Copyright (c) 2009-2010 Frank Meyer - frank(at)fli4l.de

  *

- * $Id: irmp.c,v 1.64 2010/06/25 09:04:43 fm Exp $

+ * $Id: irmp.c,v 1.73 2010/06/26 18:13:11 fm Exp $

  *

  * ATMEGA88 @ 8 MHz

  *

diff --git a/irmp.h b/irmp.h
index c005e2b..5035f37 100644
--- a/irmp.h
+++ b/irmp.h
@@ -3,7 +3,7 @@
  *

  * Copyright (c) 2009-2010 Frank Meyer - frank(at)fli4l.de

  *

- * $Id: irmp.h,v 1.38 2010/06/23 07:05:03 fm Exp $

+ * $Id: irmp.h,v 1.39 2010/06/25 13:18:36 fm Exp $

  *

  * ATMEGA88 @ 8 MHz

  *

@@ -26,25 +26,25 @@ extern "C"
  * IR protocols

  *---------------------------------------------------------------------------------------------------------------------------------------------------

  */

-#define IRMP_SIRCS_PROTOCOL                      1                              // Sony

-#define IRMP_NEC_PROTOCOL                        2                              // NEC, Pioneer, JVC, Toshiba, NoName etc.

-#define IRMP_SAMSUNG_PROTOCOL                    3                              // Samsung

-#define IRMP_MATSUSHITA_PROTOCOL                 4                              // Matsushita

-#define IRMP_KASEIKYO_PROTOCOL                   5                              // Kaseikyo (Panasonic etc)

-#define IRMP_RECS80_PROTOCOL                     6                              // Philips, Thomson, Nordmende, Telefunken, Saba

-#define IRMP_RC5_PROTOCOL                        7                              // Philips etc

-#define IRMP_DENON_PROTOCOL                      8                              // Denon

-#define IRMP_RC6_PROTOCOL                        9                              // Philips etc

-#define IRMP_SAMSUNG32_PROTOCOL                 10                              // Samsung32: no sync pulse at bit 16, length 32 instead of 37

-#define IRMP_APPLE_PROTOCOL                     11                              // Apple, very similar to NEC

-#define IRMP_RECS80EXT_PROTOCOL                 12                              // Philips, Technisat, Thomson, Nordmende, Telefunken, Saba

-#define IRMP_NUBERT_PROTOCOL                    13                              // Nubert

-#define IRMP_BANG_OLUFSEN_PROTOCOL              14                              // Bang & Olufsen

-#define IRMP_GRUNDIG_PROTOCOL                   15                              // Grundig

-#define IRMP_NOKIA_PROTOCOL                     16                              // Nokia

-#define IRMP_SIEMENS_PROTOCOL                   17                              // Siemens, e.g. Gigaset

-#define IRMP_FDC_PROTOCOL                       18                              // FDC keyboard

-#define IRMP_RCCAR_PROTOCOL                     19                              // RC Car

+#define IRMP_SIRCS_PROTOCOL                      1              // Sony

+#define IRMP_NEC_PROTOCOL                        2              // NEC, Pioneer, JVC, Toshiba, NoName etc.

+#define IRMP_SAMSUNG_PROTOCOL                    3              // Samsung

+#define IRMP_MATSUSHITA_PROTOCOL                 4              // Matsushita

+#define IRMP_KASEIKYO_PROTOCOL                   5              // Kaseikyo (Panasonic etc)

+#define IRMP_RECS80_PROTOCOL                     6              // Philips, Thomson, Nordmende, Telefunken, Saba

+#define IRMP_RC5_PROTOCOL                        7              // Philips etc

+#define IRMP_DENON_PROTOCOL                      8              // Denon

+#define IRMP_RC6_PROTOCOL                        9              // Philips etc

+#define IRMP_SAMSUNG32_PROTOCOL                 10              // Samsung32: no sync pulse at bit 16, length 32 instead of 37

+#define IRMP_APPLE_PROTOCOL                     11              // Apple, very similar to NEC

+#define IRMP_RECS80EXT_PROTOCOL                 12              // Philips, Technisat, Thomson, Nordmende, Telefunken, Saba

+#define IRMP_NUBERT_PROTOCOL                    13              // Nubert

+#define IRMP_BANG_OLUFSEN_PROTOCOL              14              // Bang & Olufsen

+#define IRMP_GRUNDIG_PROTOCOL                   15              // Grundig

+#define IRMP_NOKIA_PROTOCOL                     16              // Nokia

+#define IRMP_SIEMENS_PROTOCOL                   17              // Siemens, e.g. Gigaset

+#define IRMP_FDC_PROTOCOL                       18              // FDC keyboard

+#define IRMP_RCCAR_PROTOCOL                     19              // RC Car

 

 // some flags of struct IRMP_PARAMETER:

 #define IRMP_PARAM_FLAG_IS_MANCHESTER           0x01

diff --git a/irmpconfig.h b/irmpconfig.h
index 255c3f6..a9b2f1b 100644
--- a/irmpconfig.h
+++ b/irmpconfig.h
@@ -3,7 +3,7 @@
  *

  * Copyright (c) 2010 Frank Meyer - frank(at)fli4l.de

  *

- * $Id: irmpconfig.h,v 1.30 2010/06/25 09:04:43 fm Exp $

+ * $Id: irmpconfig.h,v 1.34 2010/06/26 18:11:08 fm Exp $

  *

  * ATMEGA88 @ 8 MHz

  *

@@ -89,14 +89,20 @@
 

 #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

+#define IRMP_SUPPORT_SIEMENS_PROTOCOL           0

 #endif

 

 #if IRMP_SUPPORT_RECS80_PROTOCOL == 1 && F_INTERRUPTS < 20000

 #warning F_INTERRUPTS too low, RECS80 protocol disabled (should be at least 20000)

+#undef IRMP_SUPPORT_RECS80_PROTOCOL

+#define IRMP_SUPPORT_RECS80_PROTOCOL            0

 #endif

 

 #if IRMP_SUPPORT_RECS80EXT_PROTOCOL == 1 && F_INTERRUPTS < 20000

 #warning F_INTERRUPTS too low, RECS80EXT protocol disabled (should be at least 20000)

+#undef IRMP_SUPPORT_RECS80EXT_PROTOCOL

+#define IRMP_SUPPORT_RECS80EXT_PROTOCOL         0

 #endif

 

 #endif /* _WC_IRMPCONFIG_H_ */