]> cloudbase.mooo.com Git - irmp.git/blobdiff - irmp.c
Version 1.6.4: added RC CAR
[irmp.git] / irmp.c
diff --git a/irmp.c b/irmp.c
index 4e45d5176cb762bf8b7fdccddcb726aec52d91b7..125694c83fb895bbfdb397366e4860498faeb5e0 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.35 2010/06/08 22:22:36 fm Exp $\r
+ * $Id: irmp.c,v 1.46 2010/06/12 20:29:43 fm Exp $\r
  *\r
  * ATMEGA88 @ 8 MHz\r
  *\r
@@ -322,6 +322,12 @@ typedef unsigned int16  uint16_t;
 #define IRMP_SUPPORT_GRUNDIG_OR_NOKIA_PROTOCOL  0\r
 #endif\r
 \r
+#if IRMP_SUPPORT_RC5_PROTOCOL == 1 || IRMP_SUPPORT_RC6_PROTOCOL == 1 || IRMP_SUPPORT_GRUNDIG_OR_NOKIA_PROTOCOL == 1 || IRMP_SUPPORT_SIEMENS_PROTOCOL == 1 \r
+#define IRMP_SUPPORT_MANCHESTER                 1\r
+#else\r
+#define IRMP_SUPPORT_MANCHESTER                 0\r
+#endif\r
+\r
 #define IRMP_TIMEOUT_TIME                       16500.0e-6                    // timeout after 16.5 ms darkness\r
 #define IRMP_TIMEOUT_LEN                        (uint8_t)(F_INTERRUPTS * IRMP_TIMEOUT_TIME + 0.5)\r
 #define IRMP_KEY_REPETITION_LEN                 (uint16_t)(F_INTERRUPTS * 150.0e-3 + 0.5)  // autodetect key repetition within 150 msec\r
@@ -505,41 +511,96 @@ typedef unsigned int16  uint16_t;
 #define SIEMENS_BIT_LEN_MIN                     ((uint8_t)(F_INTERRUPTS * SIEMENS_BIT_TIME * 1 + 0.5) - 1)\r
 #define SIEMENS_BIT_LEN_MAX                     ((uint8_t)(F_INTERRUPTS * SIEMENS_BIT_TIME * 1 + 0.5) + 1)\r
 \r
-#define FDC_START_BIT_PULSE_LEN_MIN             ((uint8_t)(F_INTERRUPTS * FDC_START_BIT_PULSE_TIME * MIN_TOLERANCE_20 + 0.5) - 1)\r
-#define FDC_START_BIT_PULSE_LEN_MAX             ((uint8_t)(F_INTERRUPTS * FDC_START_BIT_PULSE_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
-#define FDC_START_BIT_PAUSE_LEN_MIN             ((uint8_t)(F_INTERRUPTS * FDC_START_BIT_PAUSE_TIME * MIN_TOLERANCE_20 + 0.5) - 1)\r
-#define FDC_START_BIT_PAUSE_LEN_MAX             ((uint8_t)(F_INTERRUPTS * FDC_START_BIT_PAUSE_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
-#define FDC_REPEAT_START_BIT_PAUSE_LEN_MIN      ((uint8_t)(F_INTERRUPTS * FDC_REPEAT_START_BIT_PAUSE_TIME * MIN_TOLERANCE_20 + 0.5) - 1)\r
-#define FDC_REPEAT_START_BIT_PAUSE_LEN_MAX      ((uint8_t)(F_INTERRUPTS * FDC_REPEAT_START_BIT_PAUSE_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
-#define FDC_PULSE_LEN_MIN                       ((uint8_t)(F_INTERRUPTS * FDC_PULSE_TIME * MIN_TOLERANCE_20 + 0.5) - 1)\r
-#define FDC_PULSE_LEN_MAX                       ((uint8_t)(F_INTERRUPTS * FDC_PULSE_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
-#define FDC_1_PAUSE_LEN_MIN                     ((uint8_t)(F_INTERRUPTS * FDC_1_PAUSE_TIME * MIN_TOLERANCE_20 + 0.5) - 1)\r
-#define FDC_1_PAUSE_LEN_MAX                     ((uint8_t)(F_INTERRUPTS * FDC_1_PAUSE_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
-#define FDC_0_PAUSE_LEN_MIN                     ((uint8_t)(F_INTERRUPTS * FDC_0_PAUSE_TIME * MIN_TOLERANCE_20 + 0.5) - 1)\r
-#define FDC_0_PAUSE_LEN_MAX                     ((uint8_t)(F_INTERRUPTS * FDC_0_PAUSE_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
+#define FDC1_START_BIT_PULSE_LEN_MIN             ((uint8_t)(F_INTERRUPTS * FDC1_START_BIT_PULSE_TIME * MIN_TOLERANCE_20 + 0.5) - 1)\r
+#define FDC1_START_BIT_PULSE_LEN_MAX             ((uint8_t)(F_INTERRUPTS * FDC1_START_BIT_PULSE_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
+#define FDC1_START_BIT_PAUSE_LEN_MIN             ((uint8_t)(F_INTERRUPTS * FDC1_START_BIT_PAUSE_TIME * MIN_TOLERANCE_20 + 0.5) - 1)\r
+#define FDC1_START_BIT_PAUSE_LEN_MAX             ((uint8_t)(F_INTERRUPTS * FDC1_START_BIT_PAUSE_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
+#define FDC1_PULSE_LEN_MIN                       ((uint8_t)(F_INTERRUPTS * FDC1_PULSE_TIME * MIN_TOLERANCE_20 + 0.5) - 1)\r
+#define FDC1_PULSE_LEN_MAX                       ((uint8_t)(F_INTERRUPTS * FDC1_PULSE_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
+#define FDC1_1_PAUSE_LEN_MIN                     ((uint8_t)(F_INTERRUPTS * FDC1_1_PAUSE_TIME * MIN_TOLERANCE_20 + 0.5) - 1)\r
+#define FDC1_1_PAUSE_LEN_MAX                     ((uint8_t)(F_INTERRUPTS * FDC1_1_PAUSE_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
+#define FDC1_0_PAUSE_LEN_MIN                     ((uint8_t)(F_INTERRUPTS * FDC1_0_PAUSE_TIME * MIN_TOLERANCE_20 + 0.5) - 1)\r
+#define FDC1_0_PAUSE_LEN_MAX                     ((uint8_t)(F_INTERRUPTS * FDC1_0_PAUSE_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
+\r
+#define FDC2_START_BIT_PULSE_LEN_MIN             ((uint8_t)(F_INTERRUPTS * FDC2_START_BIT_PULSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
+#define FDC2_START_BIT_PULSE_LEN_MAX             ((uint8_t)(F_INTERRUPTS * FDC2_START_BIT_PULSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
+#define FDC2_START_BIT_PAUSE_LEN_MIN             ((uint8_t)(F_INTERRUPTS * FDC2_START_BIT_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
+#define FDC2_START_BIT_PAUSE_LEN_MAX             ((uint8_t)(F_INTERRUPTS * FDC2_START_BIT_PAUSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
+#define FDC2_PULSE_LEN_MIN                       ((uint8_t)(F_INTERRUPTS * FDC2_PULSE_TIME * MIN_TOLERANCE_30 + 0.5) - 1)\r
+#define FDC2_PULSE_LEN_MAX                       ((uint8_t)(F_INTERRUPTS * FDC2_PULSE_TIME * MAX_TOLERANCE_30 + 0.5) + 1)\r
+#define FDC2_1_PAUSE_LEN_MIN                     ((uint8_t)(F_INTERRUPTS * FDC2_1_PAUSE_TIME * MIN_TOLERANCE_30 + 0.5) - 1)\r
+#define FDC2_1_PAUSE_LEN_MAX                     ((uint8_t)(F_INTERRUPTS * FDC2_1_PAUSE_TIME * MAX_TOLERANCE_30 + 0.5) + 1)\r
+#define FDC2_0_PAUSE_LEN_MIN                     ((uint8_t)(F_INTERRUPTS * FDC2_0_PAUSE_TIME * MIN_TOLERANCE_40 + 0.5) - 1)\r
+#define FDC2_0_PAUSE_LEN_MAX                     ((uint8_t)(F_INTERRUPTS * FDC2_0_PAUSE_TIME * MAX_TOLERANCE_40 + 0.5) + 1)\r
+\r
+#define RCCAR_START_BIT_PULSE_LEN_MIN           ((uint8_t)(F_INTERRUPTS * RCCAR_START_BIT_PULSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
+#define RCCAR_START_BIT_PULSE_LEN_MAX           ((uint8_t)(F_INTERRUPTS * RCCAR_START_BIT_PULSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
+#define RCCAR_START_BIT_PAUSE_LEN_MIN           ((uint8_t)(F_INTERRUPTS * RCCAR_START_BIT_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
+#define RCCAR_START_BIT_PAUSE_LEN_MAX           ((uint8_t)(F_INTERRUPTS * RCCAR_START_BIT_PAUSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
+#define RCCAR_PULSE_LEN_MIN                     ((uint8_t)(F_INTERRUPTS * RCCAR_PULSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
+#define RCCAR_PULSE_LEN_MAX                     ((uint8_t)(F_INTERRUPTS * RCCAR_PULSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
+#define RCCAR_1_PAUSE_LEN_MIN                   ((uint8_t)(F_INTERRUPTS * RCCAR_1_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
+#define RCCAR_1_PAUSE_LEN_MAX                   ((uint8_t)(F_INTERRUPTS * RCCAR_1_PAUSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
+#define RCCAR_0_PAUSE_LEN_MIN                   ((uint8_t)(F_INTERRUPTS * RCCAR_0_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
+#define RCCAR_0_PAUSE_LEN_MAX                   ((uint8_t)(F_INTERRUPTS * RCCAR_0_PAUSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
 \r
 #define AUTO_FRAME_REPETITION_LEN               (uint16_t)(F_INTERRUPTS * AUTO_FRAME_REPETITION_TIME + 0.5)       // use uint16_t!\r
 \r
 #ifdef DEBUG\r
-#define DEBUG_PUTCHAR(a)                        { if (! silent) { putchar (a);          } }\r
-#define DEBUG_PRINTF(...)                       { if (! silent) { printf (__VA_ARGS__); } }\r
+#define DEBUG_PUTCHAR(a)                        { if (! silent)             { putchar (a);          } }\r
+#define DEBUG_ONLY_NORMAL_PUTCHAR(a)            { if (! silent && !verbose) { putchar (a);          } }\r
+#define DEBUG_PRINTF(...)                       { if (verbose)              { printf (__VA_ARGS__); } }\r
+#define DEBUG_NEWLINE()                         { if (verbose)              { putchar ('\n');       } }\r
 static int      silent;\r
 static int      time_counter;\r
+static int      verbose;\r
 #else\r
 #define DEBUG_PUTCHAR(a)\r
+#define DEBUG_ONLY_NORMAL_PUTCHAR(a)\r
 #define DEBUG_PRINTF(...)\r
+#define DEBUG_NEWLINE()\r
 #endif\r
 \r
 #if IRMP_LOGGING == 1\r
-#define UART_BAUD                               9600L\r
+#define BAUD                                    9600L\r
+#include <util/setbaud.h>\r
+\r
+#ifdef UBRR0H\r
+\r
+#define UART0_UBRRH                             UBRR0H\r
+#define UART0_UBRRL                             UBRR0L\r
+#define UART0_UCSRA                             UCSR0A\r
+#define UART0_UCSRB                             UCSR0B\r
+#define UART0_UCSRC                             UCSR0C\r
+#define UART0_UDRE_BIT_VALUE                    (1<<UDRE0)\r
+#define UART0_UCSZ1_BIT_VALUE                   (1<<UCSZ01)\r
+#define UART0_UCSZ0_BIT_VALUE                   (1<<UCSZ00)\r
+#ifdef URSEL0\r
+#define UART0_URSEL_BIT_VALUE                   (1<<URSEL0)\r
+#else\r
+#define UART0_URSEL_BIT_VALUE                   (0)\r
+#endif\r
+#define UART0_TXEN_BIT_VALUE                    (1<<TXEN0)\r
+#define UART0_UDR                               UDR0\r
 \r
-// calculate real baud rate:\r
-#define UBRR_VAL                                ((F_CPU + UART_BAUD * 8) / (UART_BAUD * 16) - 1)    // round\r
-#define BAUD_REAL                               (F_CPU / (16 * (UBRR_VAL + 1)))                     // real baudrate\r
-#define BAUD_ERROR                              ((BAUD_REAL * 1000) / UART_BAUD)                    // error in promille\r
+#else\r
+\r
+#define UART0_UBRRH                             UBRRH\r
+#define UART0_UBRRL                             UBRRL\r
+#define UART0_UCSRA                             UCSRA\r
+#define UART0_UCSRB                             UCSRB\r
+#define UART0_UCSRC                             UCSRC\r
+#define UART0_UDRE_BIT_VALUE                    (1<<UDRE)\r
+#define UART0_UCSZ1_BIT_VALUE                   (1<<UCSZ1)\r
+#define UART0_UCSZ0_BIT_VALUE                   (1<<UCSZ0)\r
+#ifdef URSEL\r
+#define UART0_URSEL_BIT_VALUE                   (1<<URSEL)\r
+#else\r
+#define UART0_URSEL_BIT_VALUE                   (0)\r
+#endif\r
+#define UART0_TXEN_BIT_VALUE                    (1<<TXEN)\r
+#define UART0_UDR                               UDR\r
 \r
-#if ((BAUD_ERROR < 990) || (BAUD_ERROR > 1010))\r
-#  error Error of baud rate of RS232 UARTx is more than 1%. That is too high!\r
 #endif\r
 \r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
@@ -550,9 +611,17 @@ static int      time_counter;
 void\r
 irmp_uart_init (void)\r
 {\r
-    UCSR0B |= (1<<TXEN0);                                                                   // activate UART0 TX\r
-    UBRR0H = UBRR_VAL >> 8;                                                                 // store baudrate (upper byte)\r
-    UBRR0L = UBRR_VAL & 0xFF;                                                               // store baudrate (lower byte)\r
+    UART0_UBRRH = UBRRH_VALUE;                                                                      // set baud rate\r
+    UART0_UBRRL = UBRRL_VALUE;\r
+\r
+#if USE_2X\r
+    UART0_UCSRA = (1<<U2X);\r
+#else\r
+    UART0_UCSRA = 0;\r
+#endif\r
+\r
+    UART0_UCSRC = UART0_UCSZ1_BIT_VALUE | UART0_UCSZ0_BIT_VALUE | UART0_URSEL_BIT_VALUE;\r
+    UART0_UCSRB |= UART0_TXEN_BIT_VALUE;                                                            // enable UART TX\r
 }\r
 \r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
@@ -564,12 +633,12 @@ irmp_uart_init (void)
 void\r
 irmp_uart_putc (unsigned char ch)\r
 {\r
-    while (!(UCSR0A & (1<<UDRE0)))\r
+    while (!(UART0_UCSRA & UART0_UDRE_BIT_VALUE))\r
     {\r
         ;\r
     }\r
 \r
-    UDR0 = ch;\r
+    UART0_UDR = ch;\r
 }\r
 \r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
@@ -672,6 +741,7 @@ typedef struct
     uint8_t    complete_len;                                            // complete length of frame\r
     uint8_t    stop_bit;                                                // flag: frame has stop bit\r
     uint8_t    lsb_first;                                               // flag: LSB first\r
+    uint8_t    flags;                                                   // some flags\r
 } IRMP_PARAMETER;\r
 \r
 #if IRMP_SUPPORT_SIRCS_PROTOCOL == 1\r
@@ -693,7 +763,8 @@ static PROGMEM IRMP_PARAMETER sircs_param =
     SIRCS_COMMAND_OFFSET + SIRCS_COMMAND_LEN,                           // command_end:     end of command\r
     SIRCS_COMPLETE_DATA_LEN,                                            // complete_len:    complete length of frame\r
     SIRCS_STOP_BIT,                                                     // stop_bit:        flag: frame has stop bit\r
-    SIRCS_LSB                                                           // lsb_first:       flag: LSB first\r
+    SIRCS_LSB,                                                          // lsb_first:       flag: LSB first\r
+    SIRCS_FLAGS                                                         // flags:           some flags\r
 };\r
 \r
 #endif\r
@@ -717,7 +788,8 @@ static PROGMEM IRMP_PARAMETER nec_param =
     NEC_COMMAND_OFFSET + NEC_COMMAND_LEN,                               // command_end:     end of command\r
     NEC_COMPLETE_DATA_LEN,                                              // complete_len:    complete length of frame\r
     NEC_STOP_BIT,                                                       // stop_bit:        flag: frame has stop bit\r
-    NEC_LSB                                                             // lsb_first:       flag: LSB first\r
+    NEC_LSB,                                                            // lsb_first:       flag: LSB first\r
+    NEC_FLAGS                                                           // flags:           some flags\r
 };\r
 \r
 static PROGMEM IRMP_PARAMETER nec_rep_param =\r
@@ -737,7 +809,8 @@ static PROGMEM IRMP_PARAMETER nec_rep_param =
     0,                                                                  // command_end:     end of command\r
     0,                                                                  // complete_len:    complete length of frame\r
     NEC_STOP_BIT,                                                       // stop_bit:        flag: frame has stop bit\r
-    NEC_LSB                                                             // lsb_first:       flag: LSB first\r
+    NEC_LSB,                                                            // lsb_first:       flag: LSB first\r
+    NEC_FLAGS                                                           // flags:           some flags\r
 };\r
 \r
 #endif\r
@@ -761,7 +834,8 @@ static PROGMEM IRMP_PARAMETER samsung_param =
     SAMSUNG_COMMAND_OFFSET + SAMSUNG_COMMAND_LEN,                       // command_end:     end of command\r
     SAMSUNG_COMPLETE_DATA_LEN,                                          // complete_len:    complete length of frame\r
     SAMSUNG_STOP_BIT,                                                   // stop_bit:        flag: frame has stop bit\r
-    SAMSUNG_LSB                                                         // lsb_first:       flag: LSB first\r
+    SAMSUNG_LSB,                                                        // lsb_first:       flag: LSB first\r
+    SAMSUNG_FLAGS                                                       // flags:           some flags\r
 };\r
 \r
 #endif\r
@@ -785,7 +859,8 @@ static PROGMEM IRMP_PARAMETER matsushita_param =
     MATSUSHITA_COMMAND_OFFSET + MATSUSHITA_COMMAND_LEN,                 // command_end:     end of command\r
     MATSUSHITA_COMPLETE_DATA_LEN,                                       // complete_len:    complete length of frame\r
     MATSUSHITA_STOP_BIT,                                                // stop_bit:        flag: frame has stop bit\r
-    MATSUSHITA_LSB                                                      // lsb_first:       flag: LSB first\r
+    MATSUSHITA_LSB,                                                     // lsb_first:       flag: LSB first\r
+    MATSUSHITA_FLAGS                                                    // flags:           some flags\r
 };\r
 \r
 #endif\r
@@ -809,7 +884,8 @@ static PROGMEM IRMP_PARAMETER kaseikyo_param =
     KASEIKYO_COMMAND_OFFSET + KASEIKYO_COMMAND_LEN,                     // command_end:     end of command\r
     KASEIKYO_COMPLETE_DATA_LEN,                                         // complete_len:    complete length of frame\r
     KASEIKYO_STOP_BIT,                                                  // stop_bit:        flag: frame has stop bit\r
-    KASEIKYO_LSB                                                        // lsb_first:       flag: LSB first\r
+    KASEIKYO_LSB,                                                       // lsb_first:       flag: LSB first\r
+    KASEIKYO_FLAGS                                                      // flags:           some flags\r
 };\r
 \r
 #endif\r
@@ -833,7 +909,8 @@ static PROGMEM IRMP_PARAMETER recs80_param =
     RECS80_COMMAND_OFFSET + RECS80_COMMAND_LEN,                         // command_end:     end of command\r
     RECS80_COMPLETE_DATA_LEN,                                           // complete_len:    complete length of frame\r
     RECS80_STOP_BIT,                                                    // stop_bit:        flag: frame has stop bit\r
-    RECS80_LSB                                                          // lsb_first:       flag: LSB first\r
+    RECS80_LSB,                                                         // lsb_first:       flag: LSB first\r
+    RECS80_FLAGS                                                        // flags:           some flags\r
 };\r
 \r
 #endif\r
@@ -857,7 +934,8 @@ static PROGMEM IRMP_PARAMETER rc5_param =
     RC5_COMMAND_OFFSET + RC5_COMMAND_LEN,                               // command_end:     end of command\r
     RC5_COMPLETE_DATA_LEN,                                              // complete_len:    complete length of frame\r
     RC5_STOP_BIT,                                                       // stop_bit:        flag: frame has stop bit\r
-    RC5_LSB                                                             // lsb_first:       flag: LSB first\r
+    RC5_LSB,                                                            // lsb_first:       flag: LSB first\r
+    RC5_FLAGS                                                           // flags:           some flags\r
 };\r
 \r
 #endif\r
@@ -881,7 +959,8 @@ static PROGMEM IRMP_PARAMETER denon_param =
     DENON_COMMAND_OFFSET + DENON_COMMAND_LEN,                           // command_end:     end of command\r
     DENON_COMPLETE_DATA_LEN,                                            // complete_len:    complete length of frame\r
     DENON_STOP_BIT,                                                     // stop_bit:        flag: frame has stop bit\r
-    DENON_LSB                                                           // lsb_first:       flag: LSB first\r
+    DENON_LSB,                                                          // lsb_first:       flag: LSB first\r
+    DENON_FLAGS                                                         // flags:           some flags\r
 };\r
 \r
 #endif\r
@@ -905,7 +984,8 @@ static PROGMEM IRMP_PARAMETER rc6_param =
     RC6_COMMAND_OFFSET + RC6_COMMAND_LEN,                               // command_end:     end of command\r
     RC6_COMPLETE_DATA_LEN_SHORT,                                        // complete_len:    complete length of frame\r
     RC6_STOP_BIT,                                                       // stop_bit:        flag: frame has stop bit\r
-    RC6_LSB                                                             // lsb_first:       flag: LSB first\r
+    RC6_LSB,                                                            // lsb_first:       flag: LSB first\r
+    RC6_FLAGS                                                           // flags:           some flags\r
 };\r
 \r
 #endif\r
@@ -929,7 +1009,8 @@ static PROGMEM IRMP_PARAMETER recs80ext_param =
     RECS80EXT_COMMAND_OFFSET + RECS80EXT_COMMAND_LEN,                   // command_end:     end of command\r
     RECS80EXT_COMPLETE_DATA_LEN,                                        // complete_len:    complete length of frame\r
     RECS80EXT_STOP_BIT,                                                 // stop_bit:        flag: frame has stop bit\r
-    RECS80EXT_LSB                                                       // lsb_first:       flag: LSB first\r
+    RECS80EXT_LSB,                                                      // lsb_first:       flag: LSB first\r
+    RECS80EXT_FLAGS                                                     // flags:           some flags\r
 };\r
 \r
 #endif\r
@@ -953,7 +1034,8 @@ static PROGMEM IRMP_PARAMETER nubert_param =
     NUBERT_COMMAND_OFFSET + NUBERT_COMMAND_LEN,                         // command_end:     end of command\r
     NUBERT_COMPLETE_DATA_LEN,                                           // complete_len:    complete length of frame\r
     NUBERT_STOP_BIT,                                                    // stop_bit:        flag: frame has stop bit\r
-    NUBERT_LSB                                                          // lsb_first:       flag: LSB first\r
+    NUBERT_LSB,                                                         // lsb_first:       flag: LSB first\r
+    NUBERT_FLAGS                                                        // flags:           some flags\r
 };\r
 \r
 #endif\r
@@ -977,7 +1059,8 @@ static PROGMEM IRMP_PARAMETER bang_olufsen_param =
     BANG_OLUFSEN_COMMAND_OFFSET + BANG_OLUFSEN_COMMAND_LEN,             // command_end:     end of command\r
     BANG_OLUFSEN_COMPLETE_DATA_LEN,                                     // complete_len:    complete length of frame\r
     BANG_OLUFSEN_STOP_BIT,                                              // stop_bit:        flag: frame has stop bit\r
-    BANG_OLUFSEN_LSB                                                    // lsb_first:       flag: LSB first\r
+    BANG_OLUFSEN_LSB,                                                   // lsb_first:       flag: LSB first\r
+    BANG_OLUFSEN_FLAGS                                                  // flags:           some flags\r
 };\r
 \r
 #endif\r
@@ -1001,7 +1084,8 @@ static PROGMEM IRMP_PARAMETER grundig_param =
     GRUNDIG_COMMAND_OFFSET + GRUNDIG_COMMAND_LEN + 1,                   // command_end:     end of command (USE 1 bit MORE to STORE NOKIA DATA!)\r
     NOKIA_COMPLETE_DATA_LEN,                                            // complete_len:    complete length of frame, here: NOKIA instead of GRUNDIG!\r
     GRUNDIG_OR_NOKIA_STOP_BIT,                                          // stop_bit:        flag: frame has stop bit\r
-    GRUNDIG_OR_NOKIA_LSB                                                // lsb_first:       flag: LSB first\r
+    GRUNDIG_OR_NOKIA_LSB,                                               // lsb_first:       flag: LSB first\r
+    GRUNDIG_OR_NOKIA_FLAGS                                              // flags:           some flags\r
 };\r
 \r
 #endif\r
@@ -1025,31 +1109,83 @@ static PROGMEM IRMP_PARAMETER siemens_param =
     SIEMENS_COMMAND_OFFSET + SIEMENS_COMMAND_LEN,                       // command_end:     end of command\r
     SIEMENS_COMPLETE_DATA_LEN,                                          // complete_len:    complete length of frame\r
     SIEMENS_STOP_BIT,                                                   // stop_bit:        flag: frame has stop bit\r
-    SIEMENS_LSB                                                         // lsb_first:       flag: LSB first\r
+    SIEMENS_LSB,                                                        // lsb_first:       flag: LSB first\r
+    SIEMENS_FLAGS                                                       // flags:           some flags\r
 };\r
 \r
 #endif\r
 \r
-#if IRMP_SUPPORT_FDC_PROTOCOL == 1\r
+#if IRMP_SUPPORT_FDC1_PROTOCOL == 1\r
 \r
-static PROGMEM IRMP_PARAMETER fdc_param =\r
+static PROGMEM IRMP_PARAMETER fdc1_param =\r
 {\r
-    IRMP_FDC_PROTOCOL,                                                  // protocol:        ir protocol\r
-    FDC_PULSE_LEN_MIN,                                                  // pulse_1_len_min: minimum length of pulse with bit value 1\r
-    FDC_PULSE_LEN_MAX,                                                  // pulse_1_len_max: maximum length of pulse with bit value 1\r
-    FDC_1_PAUSE_LEN_MIN,                                                // pause_1_len_min: minimum length of pause with bit value 1\r
-    FDC_1_PAUSE_LEN_MAX,                                                // pause_1_len_max: maximum length of pause with bit value 1\r
-    FDC_PULSE_LEN_MIN,                                                  // pulse_0_len_min: minimum length of pulse with bit value 0\r
-    FDC_PULSE_LEN_MAX,                                                  // pulse_0_len_max: maximum length of pulse with bit value 0\r
-    FDC_0_PAUSE_LEN_MIN,                                                // pause_0_len_min: minimum length of pause with bit value 0\r
-    FDC_0_PAUSE_LEN_MAX,                                                // pause_0_len_max: maximum length of pause with bit value 0\r
-    FDC_ADDRESS_OFFSET,                                                 // address_offset:  address offset\r
-    FDC_ADDRESS_OFFSET + FDC_ADDRESS_LEN,                               // address_end:     end of address\r
-    FDC_COMMAND_OFFSET,                                                 // command_offset:  command offset\r
-    FDC_COMMAND_OFFSET + FDC_COMMAND_LEN,                               // command_end:     end of command\r
-    FDC_COMPLETE_DATA_LEN,                                              // complete_len:    complete length of frame\r
-    FDC_STOP_BIT,                                                       // stop_bit:        flag: frame has stop bit\r
-    FDC_LSB                                                             // lsb_first:       flag: LSB first\r
+    IRMP_FDC1_PROTOCOL,                                                 // protocol:        ir protocol\r
+    FDC1_PULSE_LEN_MIN,                                                 // pulse_1_len_min: minimum length of pulse with bit value 1\r
+    FDC1_PULSE_LEN_MAX,                                                 // pulse_1_len_max: maximum length of pulse with bit value 1\r
+    FDC1_1_PAUSE_LEN_MIN,                                               // pause_1_len_min: minimum length of pause with bit value 1\r
+    FDC1_1_PAUSE_LEN_MAX,                                               // pause_1_len_max: maximum length of pause with bit value 1\r
+    FDC1_PULSE_LEN_MIN,                                                 // pulse_0_len_min: minimum length of pulse with bit value 0\r
+    FDC1_PULSE_LEN_MAX,                                                 // pulse_0_len_max: maximum length of pulse with bit value 0\r
+    FDC1_0_PAUSE_LEN_MIN,                                               // pause_0_len_min: minimum length of pause with bit value 0\r
+    FDC1_0_PAUSE_LEN_MAX,                                               // pause_0_len_max: maximum length of pause with bit value 0\r
+    FDC1_ADDRESS_OFFSET,                                                // address_offset:  address offset\r
+    FDC1_ADDRESS_OFFSET + FDC1_ADDRESS_LEN,                             // address_end:     end of address\r
+    FDC1_COMMAND_OFFSET,                                                // command_offset:  command offset\r
+    FDC1_COMMAND_OFFSET + FDC1_COMMAND_LEN,                             // command_end:     end of command\r
+    FDC1_COMPLETE_DATA_LEN,                                             // complete_len:    complete length of frame\r
+    FDC1_STOP_BIT,                                                      // stop_bit:        flag: frame has stop bit\r
+    FDC1_LSB,                                                           // lsb_first:       flag: LSB first\r
+    FDC1_FLAGS                                                          // flags:           some flags\r
+};\r
+\r
+#endif\r
+\r
+#if IRMP_SUPPORT_FDC2_PROTOCOL == 1\r
+\r
+static PROGMEM IRMP_PARAMETER fdc2_param =\r
+{\r
+    IRMP_FDC2_PROTOCOL,                                                 // protocol:        ir protocol\r
+    FDC2_PULSE_LEN_MIN,                                                 // pulse_1_len_min: minimum length of pulse with bit value 1\r
+    FDC2_PULSE_LEN_MAX,                                                 // pulse_1_len_max: maximum length of pulse with bit value 1\r
+    FDC2_1_PAUSE_LEN_MIN,                                               // pause_1_len_min: minimum length of pause with bit value 1\r
+    FDC2_1_PAUSE_LEN_MAX,                                               // pause_1_len_max: maximum length of pause with bit value 1\r
+    FDC2_PULSE_LEN_MIN,                                                 // pulse_0_len_min: minimum length of pulse with bit value 0\r
+    FDC2_PULSE_LEN_MAX,                                                 // pulse_0_len_max: maximum length of pulse with bit value 0\r
+    FDC2_0_PAUSE_LEN_MIN,                                               // pause_0_len_min: minimum length of pause with bit value 0\r
+    FDC2_0_PAUSE_LEN_MAX,                                               // pause_0_len_max: maximum length of pause with bit value 0\r
+    FDC2_ADDRESS_OFFSET,                                                // address_offset:  address offset\r
+    FDC2_ADDRESS_OFFSET + FDC2_ADDRESS_LEN,                             // address_end:     end of address\r
+    FDC2_COMMAND_OFFSET,                                                // command_offset:  command offset\r
+    FDC2_COMMAND_OFFSET + FDC2_COMMAND_LEN,                             // command_end:     end of command\r
+    FDC2_COMPLETE_DATA_LEN,                                             // complete_len:    complete length of frame\r
+    FDC2_STOP_BIT,                                                      // stop_bit:        flag: frame has stop bit\r
+    FDC2_LSB,                                                           // lsb_first:       flag: LSB first\r
+    FDC2_FLAGS                                                          // flags:           some flags\r
+};\r
+\r
+#endif\r
+\r
+#if IRMP_SUPPORT_RCCAR_PROTOCOL == 1\r
+\r
+static PROGMEM IRMP_PARAMETER rccar_param =\r
+{\r
+    IRMP_RCCAR_PROTOCOL,                                                // protocol:        ir protocol\r
+    RCCAR_PULSE_LEN_MIN,                                                // pulse_1_len_min: minimum length of pulse with bit value 1\r
+    RCCAR_PULSE_LEN_MAX,                                                // pulse_1_len_max: maximum length of pulse with bit value 1\r
+    RCCAR_1_PAUSE_LEN_MIN,                                              // pause_1_len_min: minimum length of pause with bit value 1\r
+    RCCAR_1_PAUSE_LEN_MAX,                                              // pause_1_len_max: maximum length of pause with bit value 1\r
+    RCCAR_PULSE_LEN_MIN,                                                // pulse_0_len_min: minimum length of pulse with bit value 0\r
+    RCCAR_PULSE_LEN_MAX,                                                // pulse_0_len_max: maximum length of pulse with bit value 0\r
+    RCCAR_0_PAUSE_LEN_MIN,                                              // pause_0_len_min: minimum length of pause with bit value 0\r
+    RCCAR_0_PAUSE_LEN_MAX,                                              // pause_0_len_max: maximum length of pause with bit value 0\r
+    RCCAR_ADDRESS_OFFSET,                                               // address_offset:  address offset\r
+    RCCAR_ADDRESS_OFFSET + RCCAR_ADDRESS_LEN,                           // address_end:     end of address\r
+    RCCAR_COMMAND_OFFSET,                                               // command_offset:  command offset\r
+    RCCAR_COMMAND_OFFSET + RCCAR_COMMAND_LEN,                           // command_end:     end of command\r
+    RCCAR_COMPLETE_DATA_LEN,                                            // complete_len:    complete length of frame\r
+    RCCAR_STOP_BIT,                                                     // stop_bit:        flag: frame has stop bit\r
+    RCCAR_LSB,                                                          // lsb_first:       flag: LSB first\r
+    RCCAR_FLAGS                                                         // flags:           some flags\r
 };\r
 \r
 #endif\r
@@ -1206,7 +1342,7 @@ irmp_store_bit (uint8_t value)
  *  @details  ISR routine, called 10000 times per second\r
  *---------------------------------------------------------------------------------------------------------------------------------------------------\r
  */\r
-void\r
+uint8_t\r
 irmp_ISR (void)\r
 {\r
     static uint8_t    irmp_start_bit_detected;                                  // flag: start bit detected\r
@@ -1224,11 +1360,10 @@ irmp_ISR (void)
 #if IRMP_SUPPORT_RC5_PROTOCOL == 1\r
     static uint8_t    rc5_cmd_bit6;                                             // bit 6 of RC5 command is the inverted 2nd start bit\r
 #endif\r
-#if IRMP_SUPPORT_RC5_PROTOCOL == 1 || IRMP_SUPPORT_RC6_PROTOCOL == 1 || IRMP_SUPPORT_SIEMENS_PROTOCOL == 1\r
+#if IRMP_SUPPORT_MANCHESTER == 1\r
     static uint8_t    last_pause;                                               // last pause value\r
 #endif\r
-#if IRMP_SUPPORT_RC5_PROTOCOL == 1 || IRMP_SUPPORT_RC6_PROTOCOL == 1 || IRMP_SUPPORT_BANG_OLUFSEN_PROTOCOL == 1 || \\r
-    IRMP_SUPPORT_GRUNDIG_OR_NOKIA_PROTOCOL == 1 || IRMP_SUPPORT_SIEMENS_PROTOCOL == 1 \r
+#if IRMP_SUPPORT_MANCHESTER == 1 || IRMP_SUPPORT_BANG_OLUFSEN_PROTOCOL == 1\r
     static uint8_t    last_value;                                               // last bit value\r
 #endif\r
     uint8_t           irmp_input;                                               // input value\r
@@ -1287,6 +1422,7 @@ irmp_ISR (void)
                     if (irmp_pause_time > IRMP_TIMEOUT_LEN)                     // timeout?\r
                     {                                                           // yes...\r
                         DEBUG_PRINTF ("error 1: pause after start bit pulse %d too long: %d\n", irmp_pulse_time, irmp_pause_time);\r
+                        DEBUG_ONLY_NORMAL_PUTCHAR ('\n');\r
                         irmp_start_bit_detected = 0;                            // reset flags, let's wait for another start bit\r
                         irmp_pulse_time         = 0;\r
                         irmp_pause_time         = 0;\r
@@ -1509,18 +1645,39 @@ irmp_ISR (void)
                     }\r
                     else\r
 #endif // IRMP_SUPPORT_SIEMENS_PROTOCOL == 1\r
-#if IRMP_SUPPORT_FDC_PROTOCOL == 1\r
-                    if (irmp_pulse_time >= FDC_START_BIT_PULSE_LEN_MIN && irmp_pulse_time <= FDC_START_BIT_PULSE_LEN_MAX &&\r
-                        irmp_pause_time >= FDC_START_BIT_PAUSE_LEN_MIN && irmp_pause_time <= FDC_START_BIT_PAUSE_LEN_MAX)\r
+#if IRMP_SUPPORT_FDC1_PROTOCOL == 1\r
+                    if (irmp_pulse_time >= FDC1_START_BIT_PULSE_LEN_MIN && irmp_pulse_time <= FDC1_START_BIT_PULSE_LEN_MAX &&\r
+                        irmp_pause_time >= FDC1_START_BIT_PAUSE_LEN_MIN && irmp_pause_time <= FDC1_START_BIT_PAUSE_LEN_MAX)\r
                     {\r
-                        DEBUG_PRINTF ("protocol = FDC, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
-                                        FDC_START_BIT_PULSE_LEN_MIN, FDC_START_BIT_PULSE_LEN_MAX,\r
-                                        FDC_START_BIT_PAUSE_LEN_MIN, FDC_START_BIT_PAUSE_LEN_MAX);\r
-                        irmp_param_p = (IRMP_PARAMETER *) &fdc_param;\r
+                        DEBUG_PRINTF ("protocol = FDC1, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
+                                        FDC1_START_BIT_PULSE_LEN_MIN, FDC1_START_BIT_PULSE_LEN_MAX,\r
+                                        FDC1_START_BIT_PAUSE_LEN_MIN, FDC1_START_BIT_PAUSE_LEN_MAX);\r
+                        irmp_param_p = (IRMP_PARAMETER *) &fdc1_param;\r
                     }\r
                     else\r
-#endif // IRMP_SUPPORT_NEC_PROTOCOL == 1\r
-\r
+#endif // IRMP_SUPPORT_FDC1_PROTOCOL == 1\r
+#if IRMP_SUPPORT_FDC2_PROTOCOL == 1\r
+                    if (irmp_pulse_time >= FDC2_START_BIT_PULSE_LEN_MIN && irmp_pulse_time <= FDC2_START_BIT_PULSE_LEN_MAX &&\r
+                        irmp_pause_time >= FDC2_START_BIT_PAUSE_LEN_MIN && irmp_pause_time <= FDC2_START_BIT_PAUSE_LEN_MAX)\r
+                    {\r
+                        DEBUG_PRINTF ("protocol = FDC2, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
+                                        FDC2_START_BIT_PULSE_LEN_MIN, FDC2_START_BIT_PULSE_LEN_MAX,\r
+                                        FDC2_START_BIT_PAUSE_LEN_MIN, FDC2_START_BIT_PAUSE_LEN_MAX);\r
+                        irmp_param_p = (IRMP_PARAMETER *) &fdc2_param;\r
+                    }\r
+                    else\r
+#endif // IRMP_SUPPORT_FDC2_PROTOCOL == 1\r
+#if IRMP_SUPPORT_RCCAR_PROTOCOL == 1\r
+                    if (irmp_pulse_time >= RCCAR_START_BIT_PULSE_LEN_MIN && irmp_pulse_time <= RCCAR_START_BIT_PULSE_LEN_MAX &&\r
+                        irmp_pause_time >= RCCAR_START_BIT_PAUSE_LEN_MIN && irmp_pause_time <= RCCAR_START_BIT_PAUSE_LEN_MAX)\r
+                    {\r
+                        DEBUG_PRINTF ("protocol = RCCAR, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
+                                        RCCAR_START_BIT_PULSE_LEN_MIN, RCCAR_START_BIT_PULSE_LEN_MAX,\r
+                                        RCCAR_START_BIT_PAUSE_LEN_MIN, RCCAR_START_BIT_PAUSE_LEN_MAX);\r
+                        irmp_param_p = (IRMP_PARAMETER *) &rccar_param;\r
+                    }\r
+                    else\r
+#endif // IRMP_SUPPORT_RCCAR_PROTOCOL == 1\r
                     {\r
                         DEBUG_PRINTF ("protocol = UNKNOWN\n");\r
                         irmp_start_bit_detected = 0;                            // wait for another start bit...\r
@@ -1530,8 +1687,19 @@ irmp_ISR (void)
                     {\r
                         memcpy_P (&irmp_param, irmp_param_p, sizeof (IRMP_PARAMETER));\r
 \r
-                        DEBUG_PRINTF ("pulse_1: %3d - %3d\n", irmp_param.pulse_1_len_min, irmp_param.pulse_1_len_max);\r
-                        DEBUG_PRINTF ("pause_1: %3d - %3d\n", irmp_param.pause_1_len_min, irmp_param.pause_1_len_max);\r
+#ifdef DEBUG\r
+                        if (! (irmp_param.flags & IRMP_PARAM_FLAG_IS_MANCHESTER))\r
+                        {\r
+                            DEBUG_PRINTF ("pulse_1: %3d - %3d\n", irmp_param.pulse_1_len_min, irmp_param.pulse_1_len_max);\r
+                            DEBUG_PRINTF ("pause_1: %3d - %3d\n", irmp_param.pause_1_len_min, irmp_param.pause_1_len_max);\r
+                        }\r
+                        else\r
+                        {\r
+                            DEBUG_PRINTF ("pulse: %3d - %3d or %3d - %3d\n", irmp_param.pulse_1_len_min, irmp_param.pulse_1_len_max,\r
+                                          2 * irmp_param.pulse_1_len_min, 2 * irmp_param.pulse_1_len_max);\r
+                            DEBUG_PRINTF ("pause: %3d - %3d or %3d - %3d\n", irmp_param.pause_1_len_min, irmp_param.pause_1_len_max,\r
+                                          2 * irmp_param.pause_1_len_min, 2 * irmp_param.pause_1_len_max);\r
+                        }\r
 \r
 #if IRMP_SUPPORT_RC6_PROTOCOL == 1\r
                         if (irmp_param.protocol == IRMP_RC6_PROTOCOL)\r
@@ -1539,8 +1707,12 @@ irmp_ISR (void)
                             DEBUG_PRINTF ("pulse_toggle: %3d - %3d\n", RC6_TOGGLE_BIT_LEN_MIN, RC6_TOGGLE_BIT_LEN_MAX);\r
                         }\r
 #endif\r
-                        DEBUG_PRINTF ("pulse_0: %3d - %3d\n", irmp_param.pulse_0_len_min, irmp_param.pulse_0_len_max);\r
-                        DEBUG_PRINTF ("pause_0: %3d - %3d\n", irmp_param.pause_0_len_min, irmp_param.pause_0_len_max);\r
+\r
+                        if (! (irmp_param.flags & IRMP_PARAM_FLAG_IS_MANCHESTER))\r
+                        {\r
+                            DEBUG_PRINTF ("pulse_0: %3d - %3d\n", irmp_param.pulse_0_len_min, irmp_param.pulse_0_len_max);\r
+                            DEBUG_PRINTF ("pause_0: %3d - %3d\n", irmp_param.pause_0_len_min, irmp_param.pause_0_len_max);\r
+                        }\r
 \r
 #if IRMP_SUPPORT_BANG_OLUFSEN_PROTOCOL == 1\r
                         if (irmp_param.protocol == IRMP_BANG_OLUFSEN_PROTOCOL)\r
@@ -1554,72 +1726,32 @@ irmp_ISR (void)
                         DEBUG_PRINTF ("command_len:    %3d\n", irmp_param.command_end - irmp_param.command_offset);\r
                         DEBUG_PRINTF ("complete_len:   %3d\n", irmp_param.complete_len);\r
                         DEBUG_PRINTF ("stop_bit:       %3d\n", irmp_param.stop_bit);\r
+#endif // DEBUG\r
                     }\r
 \r
                     irmp_bit = 0;\r
 \r
-#if IRMP_SUPPORT_RC5_PROTOCOL == 1\r
-                    if (irmp_param.protocol == IRMP_RC5_PROTOCOL)\r
+#if IRMP_SUPPORT_MANCHESTER == 1\r
+                    if ((irmp_param.flags & IRMP_PARAM_FLAG_IS_MANCHESTER) && irmp_param.protocol != IRMP_RC6_PROTOCOL)    // manchester, but not rc6\r
                     {\r
-                        if (irmp_pause_time > RC5_START_BIT_LEN_MAX && irmp_pause_time <= 2 * RC5_START_BIT_LEN_MAX)\r
+                        if (irmp_pause_time > irmp_param.pulse_1_len_max && irmp_pause_time <= 2 * irmp_param.pulse_1_len_max)\r
                         {\r
-                          DEBUG_PRINTF ("%8d [bit %2d: pulse = %3d, pause = %3d] ", time_counter, irmp_bit, irmp_pulse_time, irmp_pause_time);\r
-                          DEBUG_PUTCHAR ('1');\r
-                          DEBUG_PUTCHAR ('\n');\r
-                          irmp_store_bit (1);\r
+                            DEBUG_PRINTF ("%8d [bit %2d: pulse = %3d, pause = %3d] ", time_counter, irmp_bit, irmp_pulse_time, irmp_pause_time);\r
+                            DEBUG_PUTCHAR ((irmp_param.flags & IRMP_PARAM_FLAG_1ST_PULSE_IS_1) ? '0' : '1');\r
+                            DEBUG_NEWLINE ();\r
+                            irmp_store_bit ((irmp_param.flags & IRMP_PARAM_FLAG_1ST_PULSE_IS_1) ? 0 : 1);\r
                         }\r
                         else if (! last_value)\r
                         {\r
-                          DEBUG_PRINTF ("%8d [bit %2d: pulse = %3d, pause = %3d] ", time_counter, irmp_bit, irmp_pulse_time, irmp_pause_time);\r
-                          DEBUG_PUTCHAR ('0');\r
-                          DEBUG_PUTCHAR ('\n');\r
-                          irmp_store_bit (0);\r
-                        }\r
-                    }\r
-                    else\r
-#endif // IRMP_SUPPORT_RC5_PROTOCOL == 1\r
+                            DEBUG_PRINTF ("%8d [bit %2d: pulse = %3d, pause = %3d] ", time_counter, irmp_bit, irmp_pulse_time, irmp_pause_time);\r
 \r
-#if IRMP_SUPPORT_GRUNDIG_OR_NOKIA_PROTOCOL == 1\r
-                    if (irmp_param.protocol == IRMP_GRUNDIG_PROTOCOL || irmp_param.protocol == IRMP_NOKIA_PROTOCOL)\r
-                    {\r
-                        if (irmp_pause_time > GRUNDIG_OR_NOKIA_START_BIT_LEN_MAX && irmp_pause_time <= 2 * GRUNDIG_OR_NOKIA_START_BIT_LEN_MAX)\r
-                        {\r
-                          DEBUG_PRINTF ("%8d [bit %2d: pulse = %3d, pause = %3d] ", time_counter, irmp_bit, irmp_pulse_time, irmp_pause_time);\r
-                          DEBUG_PUTCHAR ('0');\r
-                          DEBUG_PUTCHAR ('\n');\r
-                          irmp_store_bit (0);\r
-                        }\r
-                        else if (! last_value)\r
-                        {\r
-                          DEBUG_PRINTF ("%8d [bit %2d: pulse = %3d, pause = %3d] ", time_counter, irmp_bit, irmp_pulse_time, irmp_pause_time);\r
-                          DEBUG_PUTCHAR ('1');\r
-                          DEBUG_PUTCHAR ('\n');\r
-                          irmp_store_bit (1);\r
+                            DEBUG_PUTCHAR ((irmp_param.flags & IRMP_PARAM_FLAG_1ST_PULSE_IS_1) ? '1' : '0');\r
+                            DEBUG_NEWLINE ();\r
+                            irmp_store_bit ((irmp_param.flags & IRMP_PARAM_FLAG_1ST_PULSE_IS_1) ? 1 : 0);\r
                         }\r
                     }\r
                     else\r
-#endif // IRMP_SUPPORT_GRUNDIG_OR_NOKIA_PROTOCOL == 1\r
-\r
-#if IRMP_SUPPORT_SIEMENS_PROTOCOL == 1\r
-                    if (irmp_param.protocol == IRMP_SIEMENS_PROTOCOL)\r
-                    {\r
-                        if (irmp_pause_time > SIEMENS_START_BIT_LEN_MAX && irmp_pause_time <= 2 * SIEMENS_START_BIT_LEN_MAX)\r
-                        {\r
-                          DEBUG_PRINTF ("%8d [bit %2d: pulse = %3d, pause = %3d] ", time_counter, irmp_bit, irmp_pulse_time, irmp_pause_time);\r
-                          DEBUG_PUTCHAR ('0');\r
-                          DEBUG_PUTCHAR ('\n');\r
-                          irmp_store_bit (0);\r
-                        }\r
-                        else if (! last_value)\r
-                        {\r
-                          DEBUG_PRINTF ("%8d [bit %2d: pulse = %3d, pause = %3d] ", time_counter, irmp_bit, irmp_pulse_time, irmp_pause_time);\r
-                          DEBUG_PUTCHAR ('1');\r
-                          DEBUG_PUTCHAR ('\n');\r
-                          irmp_store_bit (1);\r
-                        }\r
-                    }\r
-                    else\r
-#endif // IRMP_SUPPORT_SIEMENS_PROTOCOL == 1\r
+#endif // IRMP_SUPPORT_MANCHESTER == 1\r
 \r
 #if IRMP_SUPPORT_DENON_PROTOCOL == 1\r
                     if (irmp_param.protocol == IRMP_DENON_PROTOCOL)\r
@@ -1629,13 +1761,13 @@ irmp_ISR (void)
                         if (irmp_pause_time >= DENON_1_PAUSE_LEN_MIN && irmp_pause_time <= DENON_1_PAUSE_LEN_MAX)\r
                         {                                                       // pause timings correct for "1"?\r
                           DEBUG_PUTCHAR ('1');                                  // yes, store 1\r
-                          DEBUG_PUTCHAR ('\n');\r
+                          DEBUG_NEWLINE ();\r
                           irmp_store_bit (1);\r
                         }\r
                         else // if (irmp_pause_time >= DENON_0_PAUSE_LEN_MIN && irmp_pause_time <= DENON_0_PAUSE_LEN_MAX)\r
                         {                                                       // pause timings correct for "0"?\r
                           DEBUG_PUTCHAR ('0');                                  // yes, store 0\r
-                          DEBUG_PUTCHAR ('\n');\r
+                          DEBUG_NEWLINE ();\r
                           irmp_store_bit (0);\r
                         }\r
                     }\r
@@ -1657,11 +1789,7 @@ irmp_ISR (void)
                         if (irmp_pulse_time >= irmp_param.pulse_0_len_min && irmp_pulse_time <= irmp_param.pulse_0_len_max)\r
                         {\r
 #ifdef DEBUG\r
-                            if (irmp_param.protocol != IRMP_RC5_PROTOCOL &&\r
-                                irmp_param.protocol != IRMP_RC6_PROTOCOL &&\r
-                                irmp_param.protocol != IRMP_GRUNDIG_PROTOCOL &&\r
-                                irmp_param.protocol != IRMP_NOKIA_PROTOCOL &&\r
-                                irmp_param.protocol != IRMP_SIEMENS_PROTOCOL)\r
+                            if (! (irmp_param.flags & IRMP_PARAM_FLAG_IS_MANCHESTER))\r
                             {\r
                                 DEBUG_PRINTF ("stop bit detected\n");\r
                             }\r
@@ -1693,71 +1821,42 @@ irmp_ISR (void)
                         }\r
                         else\r
 #endif\r
-#if IRMP_SUPPORT_RC5_PROTOCOL == 1\r
-                        if (irmp_param.protocol == IRMP_RC5_PROTOCOL &&\r
-                            irmp_pause_time > 2 * RC5_BIT_LEN_MAX && irmp_bit >= RC5_COMPLETE_DATA_LEN - 2 && !irmp_param.stop_bit)\r
-                        {                                                       // special rc5 decoder\r
-                            got_light = TRUE;                                   // this is a lie, but generates a stop bit ;-)\r
-                            irmp_param.stop_bit = TRUE;                         // set flag\r
-                        }\r
-                        else\r
-#endif\r
-#if IRMP_SUPPORT_RC6_PROTOCOL == 1\r
-                        if (irmp_param.protocol == IRMP_RC6_PROTOCOL &&\r
-                            irmp_pause_time > 2 * RC6_BIT_LEN_MAX && irmp_bit >= irmp_param.complete_len - 2 && !irmp_param.stop_bit)\r
-                        {                                                       // special rc6 decoder\r
-                            got_light = TRUE;                                   // this is a lie, but generates a stop bit ;-)\r
-                            irmp_param.stop_bit = TRUE;                         // set flag\r
-                        }\r
-                        else\r
-#endif\r
-#if IRMP_SUPPORT_GRUNDIG_PROTOCOL == 1\r
-                        if (irmp_param.protocol == IRMP_GRUNDIG_PROTOCOL &&\r
-                            irmp_pause_time > 2 * GRUNDIG_OR_NOKIA_BIT_LEN_MAX && irmp_bit >= GRUNDIG_COMPLETE_DATA_LEN - 2 && !irmp_param.stop_bit)\r
-                        {                                                           // special Grundig/Nokia decoder\r
-                            irmp_param.complete_len = GRUNDIG_COMPLETE_DATA_LEN;    // correct complete len\r
-                            got_light = TRUE;                                       // this is a lie, but generates a stop bit ;-)\r
-                            irmp_param.stop_bit = TRUE;                             // set flag\r
-                        }\r
-                        else\r
-#endif\r
-#if IRMP_SUPPORT_NOKIA_PROTOCOL == 1\r
-                        if (irmp_param.protocol == IRMP_GRUNDIG_PROTOCOL &&\r
-                            irmp_bit >= GRUNDIG_COMPLETE_DATA_LEN)\r
+#if IRMP_SUPPORT_GRUNDIG_OR_NOKIA_PROTOCOL == 1\r
+                        if (irmp_param.protocol == IRMP_GRUNDIG_PROTOCOL && !irmp_param.stop_bit)\r
                         {\r
-                            DEBUG_PRINTF ("Switching to NOKIA protocol\n");\r
-                            irmp_param.protocol         = IRMP_NOKIA_PROTOCOL;      // change protocol\r
-                            irmp_param.address_offset   = NOKIA_ADDRESS_OFFSET;\r
-                            irmp_param.address_end      = NOKIA_ADDRESS_OFFSET + NOKIA_ADDRESS_LEN;\r
-                            irmp_param.command_offset   = NOKIA_COMMAND_OFFSET;\r
-                            irmp_param.command_end      = NOKIA_COMMAND_OFFSET + NOKIA_COMMAND_LEN;\r
-\r
-                            if (irmp_tmp_command & 0x300)\r
+                            if (irmp_pause_time > 2 * irmp_param.pause_1_len_max && irmp_bit >= GRUNDIG_COMPLETE_DATA_LEN - 2)\r
+                            {                                                           // special manchester decoder\r
+                                irmp_param.complete_len = GRUNDIG_COMPLETE_DATA_LEN;    // correct complete len\r
+                                got_light = TRUE;                                       // this is a lie, but generates a stop bit ;-)\r
+                                irmp_param.stop_bit = TRUE;                             // set flag\r
+                            }\r
+                            else if (irmp_bit >= GRUNDIG_COMPLETE_DATA_LEN)\r
                             {\r
-                                irmp_tmp_address = (irmp_tmp_command >> 8);\r
-                                irmp_tmp_command &= 0xFF;\r
+                                DEBUG_PRINTF ("Switching to NOKIA protocol\n");\r
+                                irmp_param.protocol         = IRMP_NOKIA_PROTOCOL;      // change protocol\r
+                                irmp_param.address_offset   = NOKIA_ADDRESS_OFFSET;\r
+                                irmp_param.address_end      = NOKIA_ADDRESS_OFFSET + NOKIA_ADDRESS_LEN;\r
+                                irmp_param.command_offset   = NOKIA_COMMAND_OFFSET;\r
+                                irmp_param.command_end      = NOKIA_COMMAND_OFFSET + NOKIA_COMMAND_LEN;\r
+\r
+                                if (irmp_tmp_command & 0x300)\r
+                                {\r
+                                    irmp_tmp_address = (irmp_tmp_command >> 8);\r
+                                    irmp_tmp_command &= 0xFF;\r
+                                }\r
                             }\r
                         }\r
                         else\r
 #endif\r
-#if IRMP_SUPPORT_NOKIA_PROTOCOL == 1\r
-                        if (irmp_param.protocol == IRMP_NOKIA_PROTOCOL &&\r
-                            irmp_pause_time > 2 * GRUNDIG_OR_NOKIA_BIT_LEN_MAX && irmp_bit >= NOKIA_COMPLETE_DATA_LEN - 2 && !irmp_param.stop_bit)\r
-                        {                                                           // special Grundig/Nokia decoder\r
-                            got_light = TRUE;                                       // this is a lie, but generates a stop bit ;-)\r
-                            irmp_param.stop_bit = TRUE;                             // set flag\r
-                        }\r
-                        else\r
-#endif\r
-#if IRMP_SUPPORT_SIEMENS_PROTOCOL == 1\r
-                        if (irmp_param.protocol == IRMP_SIEMENS_PROTOCOL &&\r
-                            irmp_pause_time > 2 * SIEMENS_BIT_LEN_MAX && irmp_bit >= SIEMENS_COMPLETE_DATA_LEN - 2 && !irmp_param.stop_bit)\r
-                        {                                                       // special rc5 decoder\r
+#if IRMP_SUPPORT_MANCHESTER == 1\r
+                        if ((irmp_param.flags & IRMP_PARAM_FLAG_IS_MANCHESTER) &&\r
+                            irmp_pause_time > 2 * irmp_param.pause_1_len_max && irmp_bit >= irmp_param.complete_len - 2 && !irmp_param.stop_bit)\r
+                        {                                                       // special manchester decoder\r
                             got_light = TRUE;                                   // this is a lie, but generates a stop bit ;-)\r
                             irmp_param.stop_bit = TRUE;                         // set flag\r
                         }\r
                         else\r
-#endif\r
+#endif // IRMP_SUPPORT_MANCHESTER == 1\r
                         if (irmp_pause_time > IRMP_TIMEOUT_LEN)                 // timeout?\r
                         {                                                       // yes...\r
                             if (irmp_bit == irmp_param.complete_len - 1 && irmp_param.stop_bit == 0)\r
@@ -1767,6 +1866,7 @@ irmp_ISR (void)
                             else\r
                             {\r
                                 DEBUG_PRINTF ("error 2: pause %d after data bit %d too long\n", irmp_pause_time, irmp_bit);\r
+                                DEBUG_ONLY_NORMAL_PUTCHAR ('\n');\r
 \r
                                 irmp_start_bit_detected = 0;                    // wait for another start bit...\r
                                 irmp_pulse_time         = 0;\r
@@ -1784,183 +1884,68 @@ irmp_ISR (void)
                 {\r
                     DEBUG_PRINTF ("%8d [bit %2d: pulse = %3d, pause = %3d] ", time_counter, irmp_bit, irmp_pulse_time, irmp_pause_time);\r
 \r
-#if IRMP_SUPPORT_RC5_PROTOCOL == 1\r
-                    if (irmp_param.protocol == IRMP_RC5_PROTOCOL)               // special rc5 decoder\r
+#if IRMP_SUPPORT_MANCHESTER == 1\r
+                    if ((irmp_param.flags & IRMP_PARAM_FLAG_IS_MANCHESTER))                                     // manchester\r
                     {\r
-                        if (irmp_pulse_time > RC5_BIT_LEN_MAX && irmp_pulse_time <= 2 * RC5_BIT_LEN_MAX)\r
-                        {\r
-                            DEBUG_PUTCHAR ('1');\r
-                            irmp_store_bit (1);\r
-                            DEBUG_PUTCHAR ('0');\r
-                            DEBUG_PUTCHAR ('\n');\r
-                            irmp_store_bit (0);\r
-                            last_value = 0;\r
-                        }\r
-\r
-                        else // if (irmp_pulse_time >= RC5_BIT_LEN_MIN && irmp_pulse_time <= RC5_BIT_LEN_MAX)\r
+#if IRMP_SUPPORT_RC6_PROTOCOL == 1\r
+                        if (irmp_param.protocol == IRMP_RC6_PROTOCOL && irmp_bit >= 3 && irmp_bit <= 5)         // special bits of rc6\r
                         {\r
-                            uint8_t rc5_value;\r
-\r
-                            if (last_pause > RC5_BIT_LEN_MAX && last_pause <= 2 * RC5_BIT_LEN_MAX)\r
+                            if (irmp_pulse_time > RC6_TOGGLE_BIT_LEN_MAX && irmp_pause_time > RC6_TOGGLE_BIT_LEN_MAX)\r
                             {\r
-                                rc5_value = last_value ? 0 : 1;\r
-                                last_value  = rc5_value;\r
-                            }\r
-                            else\r
-                            {\r
-                                rc5_value = last_value;\r
+                                DEBUG_PUTCHAR ('1');\r
+                                irmp_store_bit (1);\r
                             }\r
 \r
-                            DEBUG_PUTCHAR (rc5_value + '0');\r
-                            DEBUG_PUTCHAR ('\n');\r
-                            irmp_store_bit (rc5_value);\r
-                        }\r
-\r
-                        last_pause = irmp_pause_time;\r
-                        wait_for_space = 0;\r
-                    }\r
-                    else\r
-#endif\r
-\r
-#if IRMP_SUPPORT_GRUNDIG_OR_NOKIA_PROTOCOL == 1\r
-                    if (irmp_param.protocol == IRMP_GRUNDIG_PROTOCOL ||             // special Grundig decoder\r
-                        irmp_param.protocol == IRMP_NOKIA_PROTOCOL)                 // special Nokia decoder\r
-                    {\r
-                        if (irmp_pulse_time > GRUNDIG_OR_NOKIA_BIT_LEN_MAX && irmp_pulse_time <= 2 * GRUNDIG_OR_NOKIA_BIT_LEN_MAX)\r
-                        {\r
                             DEBUG_PUTCHAR ('0');\r
                             irmp_store_bit (0);\r
-                            DEBUG_PUTCHAR ('1');\r
-                            DEBUG_PUTCHAR ('\n');\r
-                            irmp_store_bit (1);\r
-                            last_value = 1;\r
+                            last_value = 0;\r
+                            DEBUG_NEWLINE ();\r
                         }\r
-\r
-                        else // if (irmp_pulse_time >= GRUNDIG_BIT_LEN_MIN && irmp_pulse_time <= GRUNDIG_OR_NOKIA_BIT_LEN_MAX)\r
+                        else\r
+#endif // IRMP_SUPPORT_RC6_PROTOCOL == 1\r
+                        if (irmp_pulse_time > irmp_param.pulse_1_len_max && irmp_pulse_time <= 2 * irmp_param.pulse_1_len_max)\r
                         {\r
-                            uint8_t grundig_value;\r
+                            DEBUG_PUTCHAR ((irmp_param.flags & IRMP_PARAM_FLAG_1ST_PULSE_IS_1) ? '0' : '1');\r
+                            irmp_store_bit ((irmp_param.flags & IRMP_PARAM_FLAG_1ST_PULSE_IS_1) ? 0  :  1 );\r
+                            DEBUG_PUTCHAR ((irmp_param.flags & IRMP_PARAM_FLAG_1ST_PULSE_IS_1) ? '1' : '0');\r
+                            irmp_store_bit ((irmp_param.flags & IRMP_PARAM_FLAG_1ST_PULSE_IS_1) ? 1 :   0 );\r
+                            DEBUG_NEWLINE ();\r
+                            last_value = (irmp_param.flags & IRMP_PARAM_FLAG_1ST_PULSE_IS_1) ? 1 : 0;\r
+                        }\r
+                        else // if (irmp_pulse_time >= irmp_param.pulse_1_len_max && irmp_pulse_time <= irmp_param.pulse_1_len_max)\r
+                        {\r
+                            uint8_t manchester_value;\r
 \r
-                            if (last_pause > GRUNDIG_OR_NOKIA_BIT_LEN_MAX && last_pause <= 2 * GRUNDIG_OR_NOKIA_BIT_LEN_MAX)\r
+                            if (last_pause > irmp_param.pause_1_len_max && last_pause <= 2 * irmp_param.pause_1_len_max)\r
                             {\r
-                                grundig_value = last_value ? 0 : 1;\r
-                                last_value  = grundig_value;\r
+                                manchester_value = last_value ? 0 : 1;\r
+                                last_value  = manchester_value;\r
                             }\r
                             else\r
                             {\r
-                                grundig_value = last_value;\r
+                                manchester_value = last_value;\r
                             }\r
 \r
-                            DEBUG_PUTCHAR (grundig_value + '0');\r
-                            DEBUG_PUTCHAR ('\n');\r
-                            irmp_store_bit (grundig_value);\r
-                        }\r
-\r
-                        last_pause = irmp_pause_time;\r
-                        wait_for_space = 0;\r
-                    }\r
-                    else\r
-#endif\r
-\r
+#if 0\r
 #if IRMP_SUPPORT_RC6_PROTOCOL == 1\r
-                    if (irmp_param.protocol == IRMP_RC6_PROTOCOL)               // special rc6 decoder\r
-                    {\r
-                        switch (irmp_bit)\r
-                        {                                                       // handle toggle bit, which is 2 times longer than other bits\r
-                            case 3:\r
-                            case 4:\r
-                            case 5:\r
-                                if (irmp_pulse_time > RC6_TOGGLE_BIT_LEN_MAX && irmp_pause_time > RC6_TOGGLE_BIT_LEN_MAX)\r
-                                {\r
-                                    DEBUG_PUTCHAR ('1');\r
-                                    irmp_store_bit (1);\r
-                                }\r
-\r
-                                DEBUG_PUTCHAR ('0');\r
-                                irmp_store_bit (0);\r
-                                last_value = 0;\r
-                                DEBUG_PUTCHAR ('\n');\r
-                                break;\r
-\r
-                            default:\r
-                                if (irmp_pulse_time > RC6_BIT_LEN_MAX && irmp_pulse_time <= 2 * RC6_BIT_LEN_MAX)\r
-                                {\r
-                                    DEBUG_PUTCHAR ('0');\r
-                                    irmp_store_bit (0);\r
-                                    DEBUG_PUTCHAR ('1');\r
-                                    DEBUG_PUTCHAR ('\n');\r
-                                    irmp_store_bit (1);\r
-                                    last_value = 1;\r
-                                }\r
-                                else // if (irmp_pulse_time >= RC6_BIT_LEN_MIN && irmp_pulse_time <= RC6_BIT_LEN_MAX)\r
-                                {\r
-                                    uint8_t rc5_value;\r
-\r
-                                    if (last_pause > RC6_BIT_LEN_MAX && last_pause <= 2 * RC6_BIT_LEN_MAX)\r
-                                    {\r
-                                        rc5_value = last_value ? 0 : 1;\r
-                                        last_value  = rc5_value;\r
-                                    }\r
-                                    else\r
-                                    {\r
-                                        rc5_value = last_value;\r
-                                    }\r
-\r
-                                    if (irmp_bit == 1 && rc5_value == 0)\r
-                                    {\r
-                                        irmp_param.complete_len = RC6_COMPLETE_DATA_LEN_LONG;\r
-                                    }\r
-\r
-                                    DEBUG_PUTCHAR (rc5_value + '0');\r
-                                    DEBUG_PUTCHAR ('\n');\r
-                                    irmp_store_bit (rc5_value);\r
-                                }\r
-\r
-                                last_pause = irmp_pause_time;\r
-                                break;\r
-                        } // switch\r
-\r
-                        wait_for_space = 0;\r
-                    }\r
-                    else\r
-#endif // IRMP_SUPPORT_RC6_PROTOCOL == 1\r
-\r
-#if IRMP_SUPPORT_SIEMENS_PROTOCOL == 1\r
-                    if (irmp_param.protocol == IRMP_SIEMENS_PROTOCOL)               // special siemens decoder\r
-                    {\r
-                        if (irmp_pulse_time > SIEMENS_BIT_LEN_MAX && irmp_pulse_time <= 2 * SIEMENS_BIT_LEN_MAX)\r
-                        {\r
-                            DEBUG_PUTCHAR ('0');\r
-                            irmp_store_bit (0);\r
-                            DEBUG_PUTCHAR ('1');\r
-                            DEBUG_PUTCHAR ('\n');\r
-                            irmp_store_bit (1);\r
-                            last_value = 1;\r
-                        }\r
-\r
-                        else // if (irmp_pulse_time >= SIEMENS_BIT_LEN_MIN && irmp_pulse_time <= SIEMENS_BIT_LEN_MAX)\r
-                        {\r
-                            uint8_t siemens_value;\r
-\r
-                            if (last_pause > SIEMENS_BIT_LEN_MAX && last_pause <= 2 * SIEMENS_BIT_LEN_MAX)\r
+                            if (irmp_param.protocol == IRMP_RC6_PROTOCOL && irmp_bit == 1 && manchester_value == 0)     // RC6 mode != 0 ???\r
                             {\r
-                                siemens_value = last_value ? 0 : 1;\r
-                                last_value  = siemens_value;\r
-                            }\r
-                            else\r
-                            {\r
-                                siemens_value = last_value;\r
+                                irmp_param.complete_len = RC6_COMPLETE_DATA_LEN_LONG;\r
                             }\r
+#endif // IRMP_SUPPORT_RC6_PROTOCOL == 1\r
+#endif // 0\r
 \r
-                            DEBUG_PUTCHAR (siemens_value + '0');\r
-                            DEBUG_PUTCHAR ('\n');\r
-                            irmp_store_bit (siemens_value);\r
+                            DEBUG_PUTCHAR (manchester_value + '0');\r
+                            DEBUG_NEWLINE ();\r
+                            irmp_store_bit (manchester_value);\r
                         }\r
 \r
-                        last_pause = irmp_pause_time;\r
-                        wait_for_space = 0;\r
+                        last_pause      = irmp_pause_time;\r
+                        wait_for_space  = 0;\r
                     }\r
                     else\r
-#endif\r
+#endif // IRMP_SUPPORT_MANCHESTER == 1\r
+\r
 \r
 #if IRMP_SUPPORT_SAMSUNG_PROTOCOL == 1\r
                     if (irmp_param.protocol == IRMP_SAMSUNG_PROTOCOL && irmp_bit == 16)       // Samsung: 16th bit\r
@@ -1983,14 +1968,14 @@ irmp_ISR (void)
                             if (irmp_pause_time >= SAMSUNG_1_PAUSE_LEN_MIN && irmp_pause_time <= SAMSUNG_1_PAUSE_LEN_MAX)\r
                             {\r
                                 DEBUG_PUTCHAR ('1');\r
-                                DEBUG_PUTCHAR ('\n');\r
+                                DEBUG_NEWLINE ();\r
                                 irmp_store_bit (1);\r
                                 wait_for_space = 0;\r
                             }\r
                             else\r
                             {\r
                                 DEBUG_PUTCHAR ('0');\r
-                                DEBUG_PUTCHAR ('\n');\r
+                                DEBUG_NEWLINE ();\r
                                 irmp_store_bit (0);\r
                                 wait_for_space = 0;\r
                             }\r
@@ -2000,6 +1985,7 @@ irmp_ISR (void)
                         else\r
                         {                                                           // timing incorrect!\r
                             DEBUG_PRINTF ("error 3 Samsung: timing not correct: data bit %d,  pulse: %d, pause: %d\n", irmp_bit, irmp_pulse_time, irmp_pause_time);\r
+                            DEBUG_ONLY_NORMAL_PUTCHAR ('\n');\r
                             irmp_start_bit_detected = 0;                            // reset flags and wait for next start bit\r
                             irmp_pause_time         = 0;\r
                         }\r
@@ -2024,6 +2010,7 @@ irmp_ISR (void)
                                 else\r
                                 {                                                   // timing incorrect!\r
                                     DEBUG_PRINTF ("error 3a B&O: timing not correct: data bit %d,  pulse: %d, pause: %d\n", irmp_bit, irmp_pulse_time, irmp_pause_time);\r
+                                    DEBUG_ONLY_NORMAL_PUTCHAR ('\n');\r
                                     irmp_start_bit_detected = 0;                    // reset flags and wait for next start bit\r
                                     irmp_pause_time         = 0;\r
                                 }\r
@@ -2040,6 +2027,7 @@ irmp_ISR (void)
                                 else\r
                                 {                                                   // timing incorrect!\r
                                     DEBUG_PRINTF ("error 3b B&O: timing not correct: data bit %d,  pulse: %d, pause: %d\n", irmp_bit, irmp_pulse_time, irmp_pause_time);\r
+                                    DEBUG_ONLY_NORMAL_PUTCHAR ('\n');\r
                                     irmp_start_bit_detected = 0;                    // reset flags and wait for next start bit\r
                                     irmp_pause_time         = 0;\r
                                 }\r
@@ -2049,7 +2037,7 @@ irmp_ISR (void)
                                 if (irmp_pause_time >= BANG_OLUFSEN_1_PAUSE_LEN_MIN && irmp_pause_time <= BANG_OLUFSEN_1_PAUSE_LEN_MAX)\r
                                 {                                                   // pulse & pause timings correct for "1"?\r
                                     DEBUG_PUTCHAR ('1');\r
-                                    DEBUG_PUTCHAR ('\n');\r
+                                    DEBUG_NEWLINE ();\r
                                     irmp_store_bit (1);\r
                                     last_value = 1;\r
                                     wait_for_space = 0;\r
@@ -2057,7 +2045,7 @@ irmp_ISR (void)
                                 else if (irmp_pause_time >= BANG_OLUFSEN_0_PAUSE_LEN_MIN && irmp_pause_time <= BANG_OLUFSEN_0_PAUSE_LEN_MAX)\r
                                 {                                                   // pulse & pause timings correct for "0"?\r
                                     DEBUG_PUTCHAR ('0');\r
-                                    DEBUG_PUTCHAR ('\n');\r
+                                    DEBUG_NEWLINE ();\r
                                     irmp_store_bit (0);\r
                                     last_value = 0;\r
                                     wait_for_space = 0;\r
@@ -2065,13 +2053,14 @@ irmp_ISR (void)
                                 else if (irmp_pause_time >= BANG_OLUFSEN_R_PAUSE_LEN_MIN && irmp_pause_time <= BANG_OLUFSEN_R_PAUSE_LEN_MAX)\r
                                 {\r
                                     DEBUG_PUTCHAR (last_value + '0');\r
-                                    DEBUG_PUTCHAR ('\n');\r
+                                    DEBUG_NEWLINE ();\r
                                     irmp_store_bit (last_value);\r
                                     wait_for_space = 0;\r
                                 }\r
                                 else\r
                                 {                                                   // timing incorrect!\r
                                     DEBUG_PRINTF ("error 3c B&O: timing not correct: data bit %d,  pulse: %d, pause: %d\n", irmp_bit, irmp_pulse_time, irmp_pause_time);\r
+                                    DEBUG_ONLY_NORMAL_PUTCHAR ('\n');\r
                                     irmp_start_bit_detected = 0;                    // reset flags and wait for next start bit\r
                                     irmp_pause_time         = 0;\r
                                 }\r
@@ -2080,6 +2069,7 @@ irmp_ISR (void)
                         else\r
                         {                                                           // timing incorrect!\r
                             DEBUG_PRINTF ("error 3d B&O: timing not correct: data bit %d,  pulse: %d, pause: %d\n", irmp_bit, irmp_pulse_time, irmp_pause_time);\r
+                            DEBUG_ONLY_NORMAL_PUTCHAR ('\n');\r
                             irmp_start_bit_detected = 0;                            // reset flags and wait for next start bit\r
                             irmp_pause_time         = 0;\r
                         }\r
@@ -2091,7 +2081,7 @@ irmp_ISR (void)
                         irmp_pause_time >= irmp_param.pause_1_len_min && irmp_pause_time <= irmp_param.pause_1_len_max)\r
                     {                                                               // pulse & pause timings correct for "1"?\r
                         DEBUG_PUTCHAR ('1');\r
-                        DEBUG_PUTCHAR ('\n');\r
+                        DEBUG_NEWLINE ();\r
                         irmp_store_bit (1);\r
                         wait_for_space = 0;\r
                     }\r
@@ -2099,13 +2089,14 @@ irmp_ISR (void)
                              irmp_pause_time >= irmp_param.pause_0_len_min && irmp_pause_time <= irmp_param.pause_0_len_max)\r
                     {                                                               // pulse & pause timings correct for "0"?\r
                         DEBUG_PUTCHAR ('0');\r
-                        DEBUG_PUTCHAR ('\n');\r
+                        DEBUG_NEWLINE ();\r
                         irmp_store_bit (0);\r
                         wait_for_space = 0;\r
                     }\r
                     else\r
                     {                                                               // timing incorrect!\r
                         DEBUG_PRINTF ("error 3: timing not correct: data bit %d,  pulse: %d, pause: %d\n", irmp_bit, irmp_pulse_time, irmp_pause_time);\r
+                        DEBUG_ONLY_NORMAL_PUTCHAR ('\n');\r
                         irmp_start_bit_detected = 0;                                // reset flags and wait for next start bit\r
                         irmp_pause_time         = 0;\r
                     }\r
@@ -2252,6 +2243,10 @@ irmp_ISR (void)
 \r
                     repetition_counter = 0;\r
                 }\r
+                else\r
+                {\r
+                    DEBUG_ONLY_NORMAL_PUTCHAR ('\n');\r
+                }\r
 \r
                 irmp_start_bit_detected = 0;                                        // and wait for next start bit\r
                 irmp_tmp_command        = 0;\r
@@ -2260,6 +2255,7 @@ irmp_ISR (void)
             }\r
         }\r
     }\r
+    return (irmp_ir_detected);\r
 }\r
 \r
 #ifdef DEBUG\r
@@ -2269,7 +2265,13 @@ irmp_ISR (void)
 // Compile it under linux with:\r
 // cc irmp.c -o irmp\r
 //\r
-// usage: ./irmp [-v|-s|-a|-p] < file\r
+// usage: ./irmp [-v|-s|-a|-l|-p] < file\r
+// options:\r
+//   -v verbose\r
+//   -s silent\r
+//   -a analyze\r
+//   -l list pulse/pauses\r
+//   -p print timings\r
 \r
 static void\r
 print_timings (void)\r
@@ -2312,50 +2314,80 @@ print_timings (void)
             GRUNDIG_OR_NOKIA_START_BIT_LEN_MIN, GRUNDIG_OR_NOKIA_START_BIT_LEN_MAX, GRUNDIG_OR_NOKIA_PRE_PAUSE_LEN_MIN, GRUNDIG_OR_NOKIA_PRE_PAUSE_LEN_MAX);\r
     printf ("SIEMENS        1               %3d - %3d           %3d - %3d\n",\r
             SIEMENS_START_BIT_LEN_MIN, SIEMENS_START_BIT_LEN_MAX, SIEMENS_START_BIT_LEN_MIN, SIEMENS_START_BIT_LEN_MAX);\r
-    printf ("FDC            1               %3d - %3d           %3d - %3d\n",\r
-            FDC_START_BIT_PULSE_LEN_MIN, FDC_START_BIT_PULSE_LEN_MAX, FDC_START_BIT_PAUSE_LEN_MIN, FDC_START_BIT_PAUSE_LEN_MAX);\r
+    printf ("FDC1           1               %3d - %3d           %3d - %3d\n",\r
+            FDC1_START_BIT_PULSE_LEN_MIN, FDC1_START_BIT_PULSE_LEN_MAX, FDC1_START_BIT_PAUSE_LEN_MIN, FDC1_START_BIT_PAUSE_LEN_MAX);\r
+    printf ("FDC2           1               %3d - %3d           %3d - %3d\n",\r
+            FDC2_START_BIT_PULSE_LEN_MIN, FDC2_START_BIT_PULSE_LEN_MAX, FDC2_START_BIT_PAUSE_LEN_MIN, FDC2_START_BIT_PAUSE_LEN_MAX);\r
+    printf ("RCCAR          1               %3d - %3d           %3d - %3d\n",\r
+            RCCAR_START_BIT_PULSE_LEN_MIN, RCCAR_START_BIT_PULSE_LEN_MAX, RCCAR_START_BIT_PAUSE_LEN_MIN, RCCAR_START_BIT_PAUSE_LEN_MAX);\r
+}\r
+\r
+void\r
+print_spectrum (char * text, int * buf)\r
+{\r
+    int     i;\r
+    int     j;\r
+    int     max = 0;\r
+    int     value;\r
+    int     sum = 0;\r
+    int     counter = 0;\r
+    double  average = 0;\r
+\r
+    puts ("--------------------------------------------------------------------------------------------------------------");\r
+    printf ("%s:\n", text);\r
+\r
+    for (i = 0; i < 256; i++)\r
+    {\r
+        if (buf[i] > max)\r
+        {\r
+            max = buf[i];\r
+        }\r
+    }\r
+\r
+    for (i = 0; i < 100; i++)\r
+    {\r
+        if (buf[i] > 0)\r
+        {\r
+            printf ("%3d ", i);\r
+            value = (buf[i] * 100) / max;\r
+\r
+            for (j = 0; j < value; j++)\r
+            {\r
+                putchar ('o');\r
+            }\r
+            printf (" %d\n", buf[i]);\r
+\r
+            sum += i * buf[i];\r
+            counter += buf[i];\r
+        }\r
+        else\r
+        {\r
+            if (counter > 0)\r
+            {\r
+                average = (float) sum / (float) counter;\r
+                printf ("average: %0.2f = %0.2f usec\n", average, (1000000. * average) / (float) F_INTERRUPTS);\r
+            }\r
+            counter = 0;\r
+            sum = 0;\r
+        }\r
+    }\r
 }\r
 \r
 int\r
 main (int argc, char ** argv)\r
 {\r
     int         i;\r
-    int         verbose = FALSE;\r
     int         analyze = FALSE;\r
+    int         list = FALSE;\r
     int         ch;\r
     int         last_ch = 0;\r
     int         pulse = 0;\r
     int         pause = 0;\r
 \r
-    int         min_pulse_long = 100000;\r
-    int         max_pulse_long = 0;\r
-    int         sum_pulses_long = 0;\r
-    int         n_pulses_long = 0;\r
-\r
-    int         min_pulse_short = 100000;\r
-    int         max_pulse_short = 0;\r
-    int         sum_pulses_short = 0;\r
-    int         n_pulses_short = 0;\r
-\r
-    int         min_pause_long = 100000;\r
-    int         max_pause_long = 0;\r
-    int         sum_pauses_long = 0;\r
-    int         n_pauses_long = 0;\r
-\r
-    int         min_pause_short = 100000;\r
-    int         max_pause_short = 0;\r
-    int         sum_pauses_short = 0;\r
-    int         n_pauses_short = 0;\r
-\r
-    int         min_start_pulse = 100000;\r
-    int         max_start_pulse = 0;\r
-    int         sum_start_pulses = 0;\r
-    int         n_start_pulses = 0;\r
-\r
-    int         min_start_pause = 100000;\r
-    int         max_start_pause = 0;\r
-    int         sum_start_pauses = 0;\r
-    int         n_start_pauses = 0;\r
+    int         start_pulses[256];\r
+    int         start_pauses[256];\r
+    int         pulses[256];\r
+    int         pauses[256];\r
 \r
     int         first_pulse = TRUE;\r
     int         first_pause = TRUE;\r
@@ -2368,10 +2400,13 @@ main (int argc, char ** argv)
         {\r
             verbose = TRUE;\r
         }\r
+        else if (! strcmp (argv[1], "-l"))\r
+        {\r
+            list = TRUE;\r
+        }\r
         else if (! strcmp (argv[1], "-a"))\r
         {\r
             analyze = TRUE;\r
-            verbose = TRUE;\r
         }\r
         else if (! strcmp (argv[1], "-s"))\r
         {\r
@@ -2384,6 +2419,14 @@ main (int argc, char ** argv)
         }\r
     }\r
 \r
+    for (i = 0; i < 256; i++)\r
+    {\r
+        start_pulses[i] = 0;\r
+        start_pauses[i] = 0;\r
+        pulses[i] = 0;\r
+        pauses[i] = 0;\r
+    }\r
+\r
     IRMP_PIN = 0xFF;\r
 \r
     while ((ch = getchar ()) != EOF)\r
@@ -2392,59 +2435,29 @@ main (int argc, char ** argv)
         {\r
             if (last_ch != ch)\r
             {\r
-                if (verbose && pause > 0)\r
+                if (pause > 0)\r
                 {\r
-                    printf ("pause: %d\n", pause);\r
-\r
-                    if (first_pause)\r
+                    if (list)\r
                     {\r
-                        if (min_start_pause > pause)\r
-                        {\r
-                            min_start_pause = pause;\r
-                        }\r
-                        if (max_start_pause < pause)\r
-                        {\r
-                            max_start_pause = pause;\r
-                        }\r
-                        n_start_pauses++;\r
-                        sum_start_pauses += pause;\r
-                        first_pause = FALSE;\r
+                        printf ("pause: %d\n", pause);\r
                     }\r
-                    else\r
+\r
+                    if (analyze)\r
                     {\r
-                        if (pause >= 10)\r
+                        if (first_pause)\r
                         {\r
-                            if (pause > 100)                                        // perhaps repetition frame follows\r
+                            if (pause < 256)\r
                             {\r
-                                first_pulse = TRUE;\r
-                                first_pause = TRUE;\r
-                            }\r
-                            else\r
-                            {\r
-                                if (min_pause_long > pause)\r
-                                {\r
-                                    min_pause_long = pause;\r
-                                }\r
-                                if (max_pause_long < pause)\r
-                                {\r
-                                    max_pause_long = pause;\r
-                                }\r
-                                n_pauses_long++;\r
-                                sum_pauses_long += pause;\r
+                                start_pauses[pause]++;\r
                             }\r
+                            first_pause = FALSE;\r
                         }\r
                         else\r
                         {\r
-                            if (min_pause_short > pause)\r
-                            {\r
-                                min_pause_short = pause;\r
-                            }\r
-                            if (max_pause_short < pause)\r
+                            if (pause < 256)\r
                             {\r
-                                max_pause_short = pause;\r
+                                pauses[pause]++;\r
                             }\r
-                            n_pauses_short++;\r
-                            sum_pauses_short += pause;\r
                         }\r
                     }\r
                 }\r
@@ -2457,56 +2470,32 @@ main (int argc, char ** argv)
         {\r
             if (last_ch != ch)\r
             {\r
-                if (verbose)\r
+                if (list)\r
                 {\r
                     printf ("pulse: %d ", pulse);\r
+                }\r
 \r
+                if (analyze)\r
+                {\r
                     if (first_pulse)\r
                     {\r
-                        if (min_start_pulse > pulse)\r
-                        {\r
-                            min_start_pulse = pulse;\r
-                        }\r
-                        if (max_start_pulse < pulse)\r
+                        if (pulse < 256)\r
                         {\r
-                            max_start_pulse = pulse;\r
+                            start_pulses[pulse]++;\r
                         }\r
-                        n_start_pulses++;\r
-                        sum_start_pulses += pulse;\r
                         first_pulse = FALSE;\r
                     }\r
                     else\r
                     {\r
-                        if (pulse >= 10)\r
+                        if (pulse < 256)\r
                         {\r
-                            if (min_pulse_long > pulse)\r
-                            {\r
-                                min_pulse_long = pulse;\r
-                            }\r
-                            if (max_pulse_long < pulse)\r
-                            {\r
-                                max_pulse_long = pulse;\r
-                            }\r
-                            n_pulses_long++;\r
-                            sum_pulses_long += pulse;\r
-                        }\r
-                        else\r
-                        {\r
-                            if (min_pulse_short > pulse)\r
-                            {\r
-                                min_pulse_short = pulse;\r
-                            }\r
-                            if (max_pulse_short < pulse)\r
-                            {\r
-                                max_pulse_short = pulse;\r
-                            }\r
-                            n_pulses_short++;\r
-                            sum_pulses_short += pulse;\r
+                            pulses[pulse]++;\r
                         }\r
                     }\r
                 }\r
                 pulse = 0;\r
             }\r
+\r
             pause++;\r
             IRMP_PIN = 0xff;\r
         }\r
@@ -2514,7 +2503,7 @@ main (int argc, char ** argv)
         {\r
             IRMP_PIN = 0xff;\r
 \r
-            if (verbose && pause > 0)\r
+            if (list && pause > 0)\r
             {\r
                 printf ("pause: %d\n", pause);\r
             }\r
@@ -2522,9 +2511,9 @@ main (int argc, char ** argv)
 \r
             if (! analyze)\r
             {\r
-                for (i = 0; i < 8000; i++)                                              // newline: long pause of 800 msec\r
+                for (i = 0; i < (int) ((8000.0 * F_INTERRUPTS) / 10000); i++)                                  // newline: long pause of 800 msec\r
                 {\r
-                    irmp_ISR ();\r
+                    (void) irmp_ISR ();\r
                 }\r
             }\r
             first_pulse = TRUE;\r
@@ -2532,85 +2521,52 @@ main (int argc, char ** argv)
         }\r
         else if (ch == '#')\r
         {\r
-            puts ("-------------------------------------------------------------------");\r
-            putchar (ch);\r
-\r
-            while ((ch = getchar()) != '\n' && ch != EOF)\r
+            if (analyze)\r
             {\r
-                if (ch != '\r')                                                         // ignore CR in DOS/Windows files\r
+                while ((ch = getchar()) != '\n' && ch != EOF)\r
                 {\r
-                    putchar (ch);\r
+                    ;\r
                 }\r
             }\r
-            putchar ('\n');\r
+            else\r
+            {\r
+                puts ("-------------------------------------------------------------------");\r
+                putchar (ch);\r
+\r
+                while ((ch = getchar()) != '\n' && ch != EOF)\r
+                {\r
+                    if (ch != '\r')                                                         // ignore CR in DOS/Windows files\r
+                    {\r
+                        putchar (ch);\r
+                    }\r
+                }\r
+                putchar ('\n');\r
+            }\r
+\r
         }\r
 \r
         last_ch = ch;\r
 \r
-        if (! analyze)\r
+        if (! analyze && ! list)\r
         {\r
-            irmp_ISR ();\r
-        }\r
+            (void) irmp_ISR ();\r
 \r
-        if (irmp_get_data (&irmp_data))\r
-        {\r
-            printf ("protcol = %d, address = 0x%04x, code = 0x%04x, flags = 0x%02x\n",\r
-                    irmp_data.protocol, irmp_data.address, irmp_data.command, irmp_data.flags);\r
+            if (irmp_get_data (&irmp_data))\r
+            {\r
+                DEBUG_ONLY_NORMAL_PUTCHAR (' ');\r
+                printf ("p = %2d, a = 0x%04x, c = 0x%04x, f = 0x%02x\n",\r
+                        irmp_data.protocol, irmp_data.address, irmp_data.command, irmp_data.flags);\r
+            }\r
         }\r
     }\r
 \r
     if (analyze)\r
     {\r
-        printf ("\nSTATITSTICS:\n");\r
-        printf ("---------------------------------\n");\r
-        printf ("number of start pulses:     %d\n", n_start_pulses);\r
-        printf ("minimum start pulse length: %d usec\n", (1000000 * min_start_pulse) / F_INTERRUPTS);\r
-        printf ("maximum start pulse length: %d usec\n", (1000000 * max_start_pulse) / F_INTERRUPTS);\r
-        if (n_start_pulses > 0)\r
-        {\r
-            printf ("average start pulse length: %d usec\n", ((1000000 * sum_start_pulses) / n_start_pulses) / F_INTERRUPTS);\r
-        }\r
-        putchar ('\n');\r
-        printf ("number of start pauses:     %d\n", n_start_pauses);\r
-        if (n_start_pauses > 0)\r
-        {\r
-            printf ("minimum start pause length: %d usec\n", (1000000 * min_start_pause) / F_INTERRUPTS);\r
-            printf ("maximum start pause length: %d usec\n", (1000000 * max_start_pause) / F_INTERRUPTS);\r
-            printf ("average start pause length: %d usec\n", ((1000000 * sum_start_pauses) / n_start_pauses) / F_INTERRUPTS);\r
-        }\r
-        putchar ('\n');\r
-        printf ("number of long pulses:     %d\n", n_pulses_long);\r
-        if (n_pulses_long > 0)\r
-        {\r
-            printf ("minimum long pulse length: %d usec\n", (1000000 * min_pulse_long) / F_INTERRUPTS);\r
-            printf ("maximum long pulse length: %d usec\n", (1000000 * max_pulse_long) / F_INTERRUPTS);\r
-            printf ("average long pulse length: %d usec\n", ((1000000 * sum_pulses_long) / n_pulses_long) / F_INTERRUPTS);\r
-        }\r
-        putchar ('\n');\r
-        printf ("number of short pulses:     %d\n", n_pulses_short);\r
-        if (n_pulses_short > 0)\r
-        {\r
-            printf ("minimum short pulse length: %d usec\n", (1000000 * min_pulse_short) / F_INTERRUPTS);\r
-            printf ("maximum short pulse length: %d usec\n", (1000000 * max_pulse_short) / F_INTERRUPTS);\r
-            printf ("average short pulse length: %d usec\n", ((1000000 * sum_pulses_short) / n_pulses_short) / F_INTERRUPTS);\r
-\r
-        }\r
-        putchar ('\n');\r
-        printf ("number of long pauses:     %d\n", n_pauses_long);\r
-        if (n_pauses_long > 0)\r
-        {\r
-            printf ("minimum long pause length: %d usec\n", (1000000 * min_pause_long) / F_INTERRUPTS);\r
-            printf ("maximum long pause length: %d usec\n", (1000000 * max_pause_long) / F_INTERRUPTS);\r
-            printf ("average long pause length: %d usec\n", ((1000000 * sum_pauses_long) / n_pauses_long) / F_INTERRUPTS);\r
-        }\r
-        putchar ('\n');\r
-        printf ("number of short pauses:     %d\n", n_pauses_short);\r
-        if (n_pauses_short > 0)\r
-        {\r
-            printf ("minimum short pause length: %d usec\n", (1000000 * min_pause_short) / F_INTERRUPTS);\r
-            printf ("maximum short pause length: %d usec\n", (1000000 * max_pause_short) / F_INTERRUPTS);\r
-            printf ("average short pause length: %d usec\n", ((1000000 * sum_pauses_short) / n_pauses_short) / F_INTERRUPTS);\r
-        }\r
+        print_spectrum ("START PULSES", start_pulses);\r
+        print_spectrum ("START PAUSES", start_pauses);\r
+        print_spectrum ("PULSES", pulses);\r
+        print_spectrum ("PAUSES", pauses);\r
+        puts ("--------------------------------------------------------------------------------------------------------------");\r
     }\r
     return 0;\r
 }\r