]> cloudbase.mooo.com Git - irmp.git/blobdiff - irmp.c
version 2.0.0-pre3: changed handling of double width pulses/pauses in manchester...
[irmp.git] / irmp.c
diff --git a/irmp.c b/irmp.c
index 861836c4b1298e178d315ded08337679fa400a6c..1016dbc8469d08a6287b6bf3b5a00959b9a8ad20 100644 (file)
--- a/irmp.c
+++ b/irmp.c
@@ -1,31 +1,38 @@
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
  * irmp.c - infrared multi-protocol decoder, supports several remote control protocols\r
  *\r
- * Copyright (c) 2009-2010 Frank Meyer - frank(at)fli4l.de\r
+ * Copyright (c) 2009-2011 Frank Meyer - frank(at)fli4l.de\r
  *\r
- * $Id: irmp.c,v 1.75 2010/07/01 09:00:16 fm Exp $\r
+ * $Id: irmp.c,v 1.101 2011/04/20 09:09:48 fm Exp $\r
  *\r
  * ATMEGA88 @ 8 MHz\r
  *\r
  * Typical manufacturers:\r
  *\r
- * SIRCS      - Sony\r
- * NEC        - NEC, Yamaha, Canon, Tevion, Harman/Kardon, Hitachi, JVC, Pioneer, Toshiba, Xoro, Orion, and many other Japanese manufacturers\r
- * SAMSUNG    - Samsung\r
- * SAMSUNG32  - Samsung\r
- * MATSUSHITA - Matsushita\r
- * KASEIKYO   - Panasonic, Denon & other Japanese manufacturers (members of "Japan's Association for Electric Home Application")\r
- * RECS80     - Philips, Nokia, Thomson, Nordmende, Telefunken, Saba\r
- * RC5        - Philips and other European manufacturers\r
- * DENON      - Denon\r
- * RC6        - Philips and other European manufacturers\r
- * APPLE      - Apple\r
- * NUBERT     - Nubert Subwoofer System\r
- * B&O        - Bang & Olufsen\r
- * PANASONIC  - Panasonic (older, yet not implemented)\r
- * GRUNDIG    - Grundig\r
- * NOKIA      - Nokia\r
- * SIEMENS    - Siemens, e.g. Gigaset M740AV\r
+ * SIRCS        - Sony\r
+ * NEC          - NEC, Yamaha, Canon, Tevion, Harman/Kardon, Hitachi, JVC, Pioneer, Toshiba, Xoro, Orion, and many other Japanese manufacturers\r
+ * SAMSUNG      - Samsung\r
+ * SAMSUNG32    - Samsung\r
+ * MATSUSHITA   - Matsushita\r
+ * KASEIKYO     - Panasonic, Denon & other Japanese manufacturers (members of "Japan's Association for Electric Home Application")\r
+ * RECS80       - Philips, Nokia, Thomson, Nordmende, Telefunken, Saba\r
+ * RC5          - Philips and other European manufacturers\r
+ * DENON        - Denon, Sharp\r
+ * RC6          - Philips and other European manufacturers\r
+ * APPLE        - Apple\r
+ * NUBERT       - Nubert Subwoofer System\r
+ * B&O          - Bang & Olufsen\r
+ * PANASONIC    - Panasonic (older, yet not implemented)\r
+ * GRUNDIG      - Grundig\r
+ * NOKIA        - Nokia\r
+ * SIEMENS      - Siemens, e.g. Gigaset M740AV\r
+ * FDC          - FDC IR keyboard\r
+ * RCCAR        - IR remote control for RC cars\r
+ * JVC          - JVC\r
+ * NIKON        - Nikon cameras\r
+ * RUWIDO       - T-Home\r
+ * KATHREIN     - Kathrein\r
+ * LEGO         - Lego Power Functions RC\r
  *\r
  *---------------------------------------------------------------------------------------------------------------------------------------------------\r
  *\r
  *   frame: 0 start bits + 16 data bits + stop bit + 65ms pause + 16 inverted data bits + stop bit\r
  *   data:  5 address bits + 10 command bits\r
  *\r
+ *   Theory:\r
+ *\r
  *   data "0":                 data "1":\r
  *   ------________________    ------______________\r
  *   275us       775us         275us   1900us\r
  *\r
+ *   Practice:\r
+ *\r
+ *   data "0":                 data "1":\r
+ *   ------________________    ------______________\r
+ *   310us       745us         310us   1780us\r
+ *\r
  *---------------------------------------------------------------------------------------------------------------------------------------------------\r
  *\r
  *   RC6\r
  *   ---\r
  *\r
- *   RC6 frame:  1 start bit + 1 bit "1" + 3 mode bits + 1 toggle bit + 16 data bits + 2666 µs pause\r
+ *   RC6 frame:  1 start bit + 1 bit "1" + 3 mode bits + 1 toggle bit + 16 data bits + 2666 us pause\r
  *   RC6 data:   8 address bits + 8 command bits\r
  *\r
  *   start  bit               toggle bit "0":      toggle bit "1":     data/mode "0":      data/mode "1":\r
  *\r
  *---------------------------------------------------------------------------------------------------------------------------------------------------\r
  *\r
- *   SIEMENS:\r
- *   --------\r
+ *   SIEMENS or RUWIDO:\r
+ *   ------------------\r
  *\r
  *   SIEMENS frame:  1 start bit + 22 data bits + no stop bit\r
  *   SIEMENS data:   13 address bits + 1 repeat bit + 7 data bits + 1 unknown bit\r
@@ -325,33 +340,40 @@ typedef unsigned int16  uint16_t;
 #endif // windows\r
 #endif // unix\r
 \r
-#include "irmp.h"\r
 #ifndef IRMP_USE_AS_LIB\r
 #include "irmpconfig.h"\r
 #endif\r
+#include "irmp.h"\r
+\r
+#if IRMP_SUPPORT_GRUNDIG_PROTOCOL == 1 || IRMP_SUPPORT_NOKIA_PROTOCOL == 1 || IRMP_SUPPORT_IR60_PROTOCOL == 1\r
+#define IRMP_SUPPORT_GRUNDIG_NOKIA_IR60_PROTOCOL  1\r
+#else\r
+#define IRMP_SUPPORT_GRUNDIG_NOKIA_IR60_PROTOCOL  0\r
+#endif\r
 \r
-#if IRMP_SUPPORT_GRUNDIG_PROTOCOL == 1 || IRMP_SUPPORT_NOKIA_PROTOCOL == 1\r
-#define IRMP_SUPPORT_GRUNDIG_OR_NOKIA_PROTOCOL  1\r
+#if IRMP_SUPPORT_SIEMENS_PROTOCOL == 1 || IRMP_SUPPORT_RUWIDO_PROTOCOL == 1\r
+#define IRMP_SUPPORT_SIEMENS_OR_RUWIDO_PROTOCOL 1\r
 #else\r
-#define IRMP_SUPPORT_GRUNDIG_OR_NOKIA_PROTOCOL  0\r
+#define IRMP_SUPPORT_SIEMENS_OR_RUWIDO_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
+#if IRMP_SUPPORT_RC5_PROTOCOL == 1 ||                   \\r
+    IRMP_SUPPORT_RC6_PROTOCOL == 1 ||                   \\r
+    IRMP_SUPPORT_GRUNDIG_NOKIA_IR60_PROTOCOL == 1 ||    \\r
+    IRMP_SUPPORT_SIEMENS_OR_RUWIDO_PROTOCOL == 1 ||     \\r
+    IRMP_SUPPORT_IR60_PROTOCOL\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_TIME_MS                    16500L                      // timeout after 16.5 ms darkness\r
-\r
-#if (F_INTERRUPTS * IRMP_TIMEOUT_TIME_MS) / 1000000 >= 254\r
-typedef uint16_t    PAUSE_LEN;\r
+#if IRMP_SUPPORT_NETBOX_PROTOCOL == 1 ||                \\r
+    IRMP_SUPPORT_IMON_PROTOCOL == 1 \r
+#define IRMP_SUPPORT_SERIAL                     1\r
 #else\r
-typedef uint8_t     PAUSE_LEN;\r
+#define IRMP_SUPPORT_SERIAL                     0\r
 #endif\r
 \r
-#define IRMP_TIMEOUT_LEN                        (PAUSE_LEN)(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
 \r
 #define MIN_TOLERANCE_00                        1.0                           // -0%\r
@@ -381,10 +403,17 @@ typedef uint8_t     PAUSE_LEN;
 #define MIN_TOLERANCE_60                        0.4                           // -60%\r
 #define MAX_TOLERANCE_60                        1.6                           // +60%\r
 \r
+#define MIN_TOLERANCE_70                        0.3                           // -70%\r
+#define MAX_TOLERANCE_70                        1.7                           // +70%\r
+\r
 #define SIRCS_START_BIT_PULSE_LEN_MIN           ((uint8_t)(F_INTERRUPTS * SIRCS_START_BIT_PULSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
 #define SIRCS_START_BIT_PULSE_LEN_MAX           ((uint8_t)(F_INTERRUPTS * SIRCS_START_BIT_PULSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
 #define SIRCS_START_BIT_PAUSE_LEN_MIN           ((uint8_t)(F_INTERRUPTS * SIRCS_START_BIT_PAUSE_TIME * MIN_TOLERANCE_20 + 0.5) - 1)\r
-#define SIRCS_START_BIT_PAUSE_LEN_MAX           ((uint8_t)(F_INTERRUPTS * SIRCS_START_BIT_PAUSE_TIME * MAX_TOLERANCE_05 + 0.5) + 1) // only 5% to avoid conflict with RC6\r
+#if IRMP_SUPPORT_NETBOX_PROTOCOL                // only 5% to avoid conflict with NETBOX:\r
+#define SIRCS_START_BIT_PAUSE_LEN_MAX           ((uint8_t)(F_INTERRUPTS * SIRCS_START_BIT_PAUSE_TIME * MAX_TOLERANCE_05 + 0.5))\r
+#else                                           // only 5% + 1 to avoid conflict with RC6:\r
+#define SIRCS_START_BIT_PAUSE_LEN_MAX           ((uint8_t)(F_INTERRUPTS * SIRCS_START_BIT_PAUSE_TIME * MAX_TOLERANCE_05 + 0.5) + 1)\r
+#endif\r
 #define SIRCS_1_PULSE_LEN_MIN                   ((uint8_t)(F_INTERRUPTS * SIRCS_1_PULSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
 #define SIRCS_1_PULSE_LEN_MAX                   ((uint8_t)(F_INTERRUPTS * SIRCS_1_PULSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
 #define SIRCS_0_PULSE_LEN_MIN                   ((uint8_t)(F_INTERRUPTS * SIRCS_0_PULSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
@@ -439,9 +468,9 @@ typedef uint8_t     PAUSE_LEN;
 #define KASEIKYO_START_BIT_PAUSE_LEN_MIN        ((uint8_t)(F_INTERRUPTS * KASEIKYO_START_BIT_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
 #define KASEIKYO_START_BIT_PAUSE_LEN_MAX        ((uint8_t)(F_INTERRUPTS * KASEIKYO_START_BIT_PAUSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
 #define KASEIKYO_PULSE_LEN_MIN                  ((uint8_t)(F_INTERRUPTS * KASEIKYO_PULSE_TIME * MIN_TOLERANCE_50 + 0.5) - 1)\r
-#define KASEIKYO_PULSE_LEN_MAX                  ((uint8_t)(F_INTERRUPTS * KASEIKYO_PULSE_TIME * MAX_TOLERANCE_60 + 0.5) + 1)\r
-#define KASEIKYO_1_PAUSE_LEN_MIN                ((uint8_t)(F_INTERRUPTS * KASEIKYO_1_PAUSE_TIME * MIN_TOLERANCE_50 + 0.5) - 1)\r
-#define KASEIKYO_1_PAUSE_LEN_MAX                ((uint8_t)(F_INTERRUPTS * KASEIKYO_1_PAUSE_TIME * MAX_TOLERANCE_50 + 0.5) + 1)\r
+#define KASEIKYO_PULSE_LEN_MAX                  ((uint8_t)(F_INTERRUPTS * KASEIKYO_PULSE_TIME * MAX_TOLERANCE_50 + 0.5) + 1)\r
+#define KASEIKYO_1_PAUSE_LEN_MIN                ((uint8_t)(F_INTERRUPTS * KASEIKYO_1_PAUSE_TIME * MIN_TOLERANCE_30 + 0.5) - 1)\r
+#define KASEIKYO_1_PAUSE_LEN_MAX                ((uint8_t)(F_INTERRUPTS * KASEIKYO_1_PAUSE_TIME * MAX_TOLERANCE_30 + 0.5) + 1)\r
 #define KASEIKYO_0_PAUSE_LEN_MIN                ((uint8_t)(F_INTERRUPTS * KASEIKYO_0_PAUSE_TIME * MIN_TOLERANCE_50 + 0.5) - 1)\r
 #define KASEIKYO_0_PAUSE_LEN_MAX                ((uint8_t)(F_INTERRUPTS * KASEIKYO_0_PAUSE_TIME * MAX_TOLERANCE_50 + 0.5) + 1)\r
 \r
@@ -458,6 +487,7 @@ typedef uint8_t     PAUSE_LEN;
 \r
 #define RC5_START_BIT_LEN_MIN                   ((uint8_t)(F_INTERRUPTS * RC5_BIT_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
 #define RC5_START_BIT_LEN_MAX                   ((uint8_t)(F_INTERRUPTS * RC5_BIT_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
+\r
 #define RC5_BIT_LEN_MIN                         ((uint8_t)(F_INTERRUPTS * RC5_BIT_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
 #define RC5_BIT_LEN_MAX                         ((uint8_t)(F_INTERRUPTS * RC5_BIT_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
 \r
@@ -465,7 +495,11 @@ typedef uint8_t     PAUSE_LEN;
 #define DENON_PULSE_LEN_MAX                     ((uint8_t)(F_INTERRUPTS * DENON_PULSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
 #define DENON_1_PAUSE_LEN_MIN                   ((uint8_t)(F_INTERRUPTS * DENON_1_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
 #define DENON_1_PAUSE_LEN_MAX                   ((uint8_t)(F_INTERRUPTS * DENON_1_PAUSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
-#define DENON_0_PAUSE_LEN_MIN                   ((uint8_t)(F_INTERRUPTS * DENON_0_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
+#if IRMP_SUPPORT_SIEMENS_OR_RUWIDO_PROTOCOL == 1\r
+#define DENON_0_PAUSE_LEN_MIN                   ((uint8_t)(F_INTERRUPTS * DENON_0_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5))     // no -1, avoid conflict with RUWIDO\r
+#else\r
+#define DENON_0_PAUSE_LEN_MIN                   ((uint8_t)(F_INTERRUPTS * DENON_0_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1) // be more tolerant\r
+#endif\r
 #define DENON_0_PAUSE_LEN_MAX                   ((uint8_t)(F_INTERRUPTS * DENON_0_PAUSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
 \r
 #define RC6_START_BIT_PULSE_LEN_MIN             ((uint8_t)(F_INTERRUPTS * RC6_START_BIT_PULSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
@@ -474,8 +508,10 @@ typedef uint8_t     PAUSE_LEN;
 #define RC6_START_BIT_PAUSE_LEN_MAX             ((uint8_t)(F_INTERRUPTS * RC6_START_BIT_PAUSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
 #define RC6_TOGGLE_BIT_LEN_MIN                  ((uint8_t)(F_INTERRUPTS * RC6_TOGGLE_BIT_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
 #define RC6_TOGGLE_BIT_LEN_MAX                  ((uint8_t)(F_INTERRUPTS * RC6_TOGGLE_BIT_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
-#define RC6_BIT_LEN_MIN                         ((uint8_t)(F_INTERRUPTS * RC6_BIT_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
-#define RC6_BIT_LEN_MAX                         ((uint8_t)(F_INTERRUPTS * RC6_BIT_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
+#define RC6_BIT_PULSE_LEN_MIN                   ((uint8_t)(F_INTERRUPTS * RC6_BIT_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
+#define RC6_BIT_PULSE_LEN_MAX                   ((uint8_t)(F_INTERRUPTS * RC6_BIT_TIME * MAX_TOLERANCE_60 + 0.5) + 1)       // pulses: 300 - 800\r
+#define RC6_BIT_PAUSE_LEN_MIN                   ((uint8_t)(F_INTERRUPTS * RC6_BIT_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
+#define RC6_BIT_PAUSE_LEN_MAX                   ((uint8_t)(F_INTERRUPTS * RC6_BIT_TIME * MAX_TOLERANCE_20 + 0.5) + 1)       // pauses: 300 - 600\r
 \r
 #define RECS80EXT_START_BIT_PULSE_LEN_MIN       ((uint8_t)(F_INTERRUPTS * RECS80EXT_START_BIT_PULSE_TIME * MIN_TOLERANCE_00 + 0.5) - 1)\r
 #define RECS80EXT_START_BIT_PULSE_LEN_MAX       ((uint8_t)(F_INTERRUPTS * RECS80EXT_START_BIT_PULSE_TIME * MAX_TOLERANCE_00 + 0.5) + 1)\r
@@ -528,22 +564,27 @@ typedef uint8_t     PAUSE_LEN;
 #define BANG_OLUFSEN_TRAILER_BIT_PAUSE_LEN_MIN  ((uint8_t)(F_INTERRUPTS * BANG_OLUFSEN_TRAILER_BIT_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
 #define BANG_OLUFSEN_TRAILER_BIT_PAUSE_LEN_MAX  ((uint8_t)(F_INTERRUPTS * BANG_OLUFSEN_TRAILER_BIT_PAUSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
 \r
-#define GRUNDIG_OR_NOKIA_START_BIT_LEN_MIN      ((uint8_t)(F_INTERRUPTS * GRUNDIG_OR_NOKIA_BIT_TIME * MIN_TOLERANCE_20 + 0.5) - 1)\r
-#define GRUNDIG_OR_NOKIA_START_BIT_LEN_MAX      ((uint8_t)(F_INTERRUPTS * GRUNDIG_OR_NOKIA_BIT_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
-#define GRUNDIG_OR_NOKIA_BIT_LEN_MIN            ((uint8_t)(F_INTERRUPTS * GRUNDIG_OR_NOKIA_BIT_TIME * MIN_TOLERANCE_20 + 0.5) - 1)\r
-#define GRUNDIG_OR_NOKIA_BIT_LEN_MAX            ((uint8_t)(F_INTERRUPTS * GRUNDIG_OR_NOKIA_BIT_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
-#define GRUNDIG_OR_NOKIA_PRE_PAUSE_LEN_MIN      ((uint8_t)(F_INTERRUPTS * GRUNDIG_OR_NOKIA_PRE_PAUSE_TIME * MIN_TOLERANCE_20 + 0.5) + 1)\r
-#define GRUNDIG_OR_NOKIA_PRE_PAUSE_LEN_MAX      ((uint8_t)(F_INTERRUPTS * GRUNDIG_OR_NOKIA_PRE_PAUSE_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
-\r
-#define SIEMENS_START_BIT_LEN_MIN               ((uint8_t)(F_INTERRUPTS * SIEMENS_BIT_TIME * 1 + 0.5) - 1)\r
-#define SIEMENS_START_BIT_LEN_MAX               ((uint8_t)(F_INTERRUPTS * SIEMENS_BIT_TIME * 1 + 0.5) + 1)\r
-#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_10 + 0.5) - 1)\r
-#define FDC_START_BIT_PULSE_LEN_MAX             ((uint8_t)(F_INTERRUPTS * FDC_START_BIT_PULSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
-#define FDC_START_BIT_PAUSE_LEN_MIN             ((uint8_t)(F_INTERRUPTS * FDC_START_BIT_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
-#define FDC_START_BIT_PAUSE_LEN_MAX             ((uint8_t)(F_INTERRUPTS * FDC_START_BIT_PAUSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
+#define IR60_TIMEOUT_LEN                        ((uint8_t)(F_INTERRUPTS * IR60_TIMEOUT_TIME * 0.5))\r
+#define GRUNDIG_NOKIA_IR60_START_BIT_LEN_MIN    ((uint8_t)(F_INTERRUPTS * GRUNDIG_NOKIA_IR60_BIT_TIME * MIN_TOLERANCE_20 + 0.5) - 1)\r
+#define GRUNDIG_NOKIA_IR60_START_BIT_LEN_MAX    ((uint8_t)(F_INTERRUPTS * GRUNDIG_NOKIA_IR60_BIT_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
+#define GRUNDIG_NOKIA_IR60_BIT_LEN_MIN          ((uint8_t)(F_INTERRUPTS * GRUNDIG_NOKIA_IR60_BIT_TIME * MIN_TOLERANCE_20 + 0.5) - 1)\r
+#define GRUNDIG_NOKIA_IR60_BIT_LEN_MAX          ((uint8_t)(F_INTERRUPTS * GRUNDIG_NOKIA_IR60_BIT_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
+#define GRUNDIG_NOKIA_IR60_PRE_PAUSE_LEN_MIN    ((uint8_t)(F_INTERRUPTS * GRUNDIG_NOKIA_IR60_PRE_PAUSE_TIME * MIN_TOLERANCE_20 + 0.5) + 1)\r
+#define GRUNDIG_NOKIA_IR60_PRE_PAUSE_LEN_MAX    ((uint8_t)(F_INTERRUPTS * GRUNDIG_NOKIA_IR60_PRE_PAUSE_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
+\r
+#define SIEMENS_OR_RUWIDO_START_BIT_PULSE_LEN_MIN       ((uint8_t)(F_INTERRUPTS * SIEMENS_OR_RUWIDO_START_BIT_PULSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
+#define SIEMENS_OR_RUWIDO_START_BIT_PULSE_LEN_MAX       ((uint8_t)(F_INTERRUPTS * SIEMENS_OR_RUWIDO_START_BIT_PULSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
+#define SIEMENS_OR_RUWIDO_START_BIT_PAUSE_LEN_MIN       ((uint8_t)(F_INTERRUPTS * SIEMENS_OR_RUWIDO_START_BIT_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
+#define SIEMENS_OR_RUWIDO_START_BIT_PAUSE_LEN_MAX       ((uint8_t)(F_INTERRUPTS * SIEMENS_OR_RUWIDO_START_BIT_PAUSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
+#define SIEMENS_OR_RUWIDO_BIT_PULSE_LEN_MIN             ((uint8_t)(F_INTERRUPTS * SIEMENS_OR_RUWIDO_BIT_PULSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
+#define SIEMENS_OR_RUWIDO_BIT_PULSE_LEN_MAX             ((uint8_t)(F_INTERRUPTS * SIEMENS_OR_RUWIDO_BIT_PULSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
+#define SIEMENS_OR_RUWIDO_BIT_PAUSE_LEN_MIN             ((uint8_t)(F_INTERRUPTS * SIEMENS_OR_RUWIDO_BIT_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
+#define SIEMENS_OR_RUWIDO_BIT_PAUSE_LEN_MAX             ((uint8_t)(F_INTERRUPTS * SIEMENS_OR_RUWIDO_BIT_PAUSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
+\r
+#define FDC_START_BIT_PULSE_LEN_MIN             ((uint8_t)(F_INTERRUPTS * FDC_START_BIT_PULSE_TIME * MIN_TOLERANCE_05 + 0.5) - 1)   // 5%: avoid conflict with NETBOX\r
+#define FDC_START_BIT_PULSE_LEN_MAX             ((uint8_t)(F_INTERRUPTS * FDC_START_BIT_PULSE_TIME * MAX_TOLERANCE_05 + 0.5))\r
+#define FDC_START_BIT_PAUSE_LEN_MIN             ((uint8_t)(F_INTERRUPTS * FDC_START_BIT_PAUSE_TIME * MIN_TOLERANCE_05 + 0.5) - 1)\r
+#define FDC_START_BIT_PAUSE_LEN_MAX             ((uint8_t)(F_INTERRUPTS * FDC_START_BIT_PAUSE_TIME * MAX_TOLERANCE_05 + 0.5))\r
 #define FDC_PULSE_LEN_MIN                       ((uint8_t)(F_INTERRUPTS * FDC_PULSE_TIME * MIN_TOLERANCE_40 + 0.5) - 1)\r
 #define FDC_PULSE_LEN_MAX                       ((uint8_t)(F_INTERRUPTS * FDC_PULSE_TIME * MAX_TOLERANCE_50 + 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
@@ -566,6 +607,77 @@ typedef uint8_t     PAUSE_LEN;
 #define RCCAR_0_PAUSE_LEN_MIN                   ((uint8_t)(F_INTERRUPTS * RCCAR_0_PAUSE_TIME * MIN_TOLERANCE_30 + 0.5) - 1)\r
 #define RCCAR_0_PAUSE_LEN_MAX                   ((uint8_t)(F_INTERRUPTS * RCCAR_0_PAUSE_TIME * MAX_TOLERANCE_30 + 0.5) + 1)\r
 \r
+#define JVC_START_BIT_PULSE_LEN_MIN             ((uint8_t)(F_INTERRUPTS * JVC_START_BIT_PULSE_TIME * MIN_TOLERANCE_40 + 0.5) - 1)\r
+#define JVC_START_BIT_PULSE_LEN_MAX             ((uint8_t)(F_INTERRUPTS * JVC_START_BIT_PULSE_TIME * MAX_TOLERANCE_40 + 0.5) + 1)\r
+#define JVC_REPEAT_START_BIT_PAUSE_LEN_MIN      ((uint8_t)(F_INTERRUPTS * (JVC_FRAME_REPEAT_PAUSE_TIME - IRMP_TIMEOUT_TIME) * MIN_TOLERANCE_40 + 0.5) - 1)  // HACK!\r
+#define JVC_REPEAT_START_BIT_PAUSE_LEN_MAX      ((uint8_t)(F_INTERRUPTS * (JVC_FRAME_REPEAT_PAUSE_TIME - IRMP_TIMEOUT_TIME) * MAX_TOLERANCE_70 + 0.5) - 1)  // HACK!\r
+#define JVC_PULSE_LEN_MIN                       ((uint8_t)(F_INTERRUPTS * JVC_PULSE_TIME * MIN_TOLERANCE_40 + 0.5) - 1)\r
+#define JVC_PULSE_LEN_MAX                       ((uint8_t)(F_INTERRUPTS * JVC_PULSE_TIME * MAX_TOLERANCE_40 + 0.5) + 1)\r
+#define JVC_1_PAUSE_LEN_MIN                     ((uint8_t)(F_INTERRUPTS * JVC_1_PAUSE_TIME * MIN_TOLERANCE_40 + 0.5) - 1)\r
+#define JVC_1_PAUSE_LEN_MAX                     ((uint8_t)(F_INTERRUPTS * JVC_1_PAUSE_TIME * MAX_TOLERANCE_40 + 0.5) + 1)\r
+#define JVC_0_PAUSE_LEN_MIN                     ((uint8_t)(F_INTERRUPTS * JVC_0_PAUSE_TIME * MIN_TOLERANCE_40 + 0.5) - 1)\r
+#define JVC_0_PAUSE_LEN_MAX                     ((uint8_t)(F_INTERRUPTS * JVC_0_PAUSE_TIME * MAX_TOLERANCE_40 + 0.5) + 1)\r
+// autodetect JVC repetition frame within 50 msec:\r
+#define JVC_FRAME_REPEAT_PAUSE_LEN_MAX          (uint16_t)(F_INTERRUPTS * JVC_FRAME_REPEAT_PAUSE_TIME * MAX_TOLERANCE_20 + 0.5)\r
+\r
+#define NIKON_START_BIT_PULSE_LEN_MIN           ((uint8_t)(F_INTERRUPTS * NIKON_START_BIT_PULSE_TIME * MIN_TOLERANCE_20 + 0.5) - 1)\r
+#define NIKON_START_BIT_PULSE_LEN_MAX           ((uint8_t)(F_INTERRUPTS * NIKON_START_BIT_PULSE_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
+#define NIKON_START_BIT_PAUSE_LEN_MIN           ((uint16_t)(F_INTERRUPTS * NIKON_START_BIT_PAUSE_TIME * MIN_TOLERANCE_20 + 0.5) - 1)\r
+#define NIKON_START_BIT_PAUSE_LEN_MAX           ((uint16_t)(F_INTERRUPTS * NIKON_START_BIT_PAUSE_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
+#define NIKON_REPEAT_START_BIT_PAUSE_LEN_MIN    ((uint8_t)(F_INTERRUPTS * NIKON_REPEAT_START_BIT_PAUSE_TIME * MIN_TOLERANCE_20 + 0.5) - 1)\r
+#define NIKON_REPEAT_START_BIT_PAUSE_LEN_MAX    ((uint8_t)(F_INTERRUPTS * NIKON_REPEAT_START_BIT_PAUSE_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
+#define NIKON_PULSE_LEN_MIN                     ((uint8_t)(F_INTERRUPTS * NIKON_PULSE_TIME * MIN_TOLERANCE_20 + 0.5) - 1)\r
+#define NIKON_PULSE_LEN_MAX                     ((uint8_t)(F_INTERRUPTS * NIKON_PULSE_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
+#define NIKON_1_PAUSE_LEN_MIN                   ((uint8_t)(F_INTERRUPTS * NIKON_1_PAUSE_TIME * MIN_TOLERANCE_20 + 0.5) - 1)\r
+#define NIKON_1_PAUSE_LEN_MAX                   ((uint8_t)(F_INTERRUPTS * NIKON_1_PAUSE_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
+#define NIKON_0_PAUSE_LEN_MIN                   ((uint8_t)(F_INTERRUPTS * NIKON_0_PAUSE_TIME * MIN_TOLERANCE_20 + 0.5) - 1)\r
+#define NIKON_0_PAUSE_LEN_MAX                   ((uint8_t)(F_INTERRUPTS * NIKON_0_PAUSE_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
+#define NIKON_FRAME_REPEAT_PAUSE_LEN_MAX        (uint16_t)(F_INTERRUPTS * NIKON_FRAME_REPEAT_PAUSE_TIME * MAX_TOLERANCE_20 + 0.5)\r
+\r
+#define KATHREIN_START_BIT_PULSE_LEN_MIN        ((uint8_t)(F_INTERRUPTS * KATHREIN_START_BIT_PULSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
+#define KATHREIN_START_BIT_PULSE_LEN_MAX        ((uint8_t)(F_INTERRUPTS * KATHREIN_START_BIT_PULSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
+#define KATHREIN_START_BIT_PAUSE_LEN_MIN        ((uint8_t)(F_INTERRUPTS * KATHREIN_START_BIT_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
+#define KATHREIN_START_BIT_PAUSE_LEN_MAX        ((uint8_t)(F_INTERRUPTS * KATHREIN_START_BIT_PAUSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
+#define KATHREIN_1_PULSE_LEN_MIN                ((uint8_t)(F_INTERRUPTS * KATHREIN_1_PULSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
+#define KATHREIN_1_PULSE_LEN_MAX                ((uint8_t)(F_INTERRUPTS * KATHREIN_1_PULSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
+#define KATHREIN_1_PAUSE_LEN_MIN                ((uint8_t)(F_INTERRUPTS * KATHREIN_1_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
+#define KATHREIN_1_PAUSE_LEN_MAX                ((uint8_t)(F_INTERRUPTS * KATHREIN_1_PAUSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
+#define KATHREIN_0_PULSE_LEN_MIN                ((uint8_t)(F_INTERRUPTS * KATHREIN_0_PULSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
+#define KATHREIN_0_PULSE_LEN_MAX                ((uint8_t)(F_INTERRUPTS * KATHREIN_0_PULSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
+#define KATHREIN_0_PAUSE_LEN_MIN                ((uint8_t)(F_INTERRUPTS * KATHREIN_0_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
+#define KATHREIN_0_PAUSE_LEN_MAX                ((uint8_t)(F_INTERRUPTS * KATHREIN_0_PAUSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
+#define KATHREIN_SYNC_BIT_PAUSE_LEN_MIN         ((uint8_t)(F_INTERRUPTS * KATHREIN_SYNC_BIT_PAUSE_LEN_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
+#define KATHREIN_SYNC_BIT_PAUSE_LEN_MAX         ((uint8_t)(F_INTERRUPTS * KATHREIN_SYNC_BIT_PAUSE_LEN_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
+\r
+#define NETBOX_START_BIT_PULSE_LEN_MIN          ((uint8_t)(F_INTERRUPTS * NETBOX_START_BIT_PULSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
+#define NETBOX_START_BIT_PULSE_LEN_MAX          ((uint8_t)(F_INTERRUPTS * NETBOX_START_BIT_PULSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
+#define NETBOX_START_BIT_PAUSE_LEN_MIN          ((uint8_t)(F_INTERRUPTS * NETBOX_START_BIT_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
+#define NETBOX_START_BIT_PAUSE_LEN_MAX          ((uint8_t)(F_INTERRUPTS * NETBOX_START_BIT_PAUSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
+#define NETBOX_PULSE_LEN                        ((uint8_t)(F_INTERRUPTS * NETBOX_PULSE_TIME))\r
+#define NETBOX_PAUSE_LEN                        ((uint8_t)(F_INTERRUPTS * NETBOX_PAUSE_TIME))\r
+#define NETBOX_PULSE_REST_LEN                   ((uint8_t)(F_INTERRUPTS * NETBOX_PULSE_TIME / 4))\r
+#define NETBOX_PAUSE_REST_LEN                   ((uint8_t)(F_INTERRUPTS * NETBOX_PAUSE_TIME / 4))\r
+\r
+#define LEGO_START_BIT_PULSE_LEN_MIN            ((uint8_t)(F_INTERRUPTS * LEGO_START_BIT_PULSE_TIME * MIN_TOLERANCE_40 + 0.5) - 1)\r
+#define LEGO_START_BIT_PULSE_LEN_MAX            ((uint8_t)(F_INTERRUPTS * LEGO_START_BIT_PULSE_TIME * MAX_TOLERANCE_40 + 0.5) + 1)\r
+#define LEGO_START_BIT_PAUSE_LEN_MIN            ((uint8_t)(F_INTERRUPTS * LEGO_START_BIT_PAUSE_TIME * MIN_TOLERANCE_40 + 0.5) - 1)\r
+#define LEGO_START_BIT_PAUSE_LEN_MAX            ((uint8_t)(F_INTERRUPTS * LEGO_START_BIT_PAUSE_TIME * MAX_TOLERANCE_40 + 0.5) + 1)\r
+#define LEGO_PULSE_LEN_MIN                      ((uint8_t)(F_INTERRUPTS * LEGO_PULSE_TIME * MIN_TOLERANCE_40 + 0.5) - 1)\r
+#define LEGO_PULSE_LEN_MAX                      ((uint8_t)(F_INTERRUPTS * LEGO_PULSE_TIME * MAX_TOLERANCE_40 + 0.5) + 1)\r
+#define LEGO_1_PAUSE_LEN_MIN                    ((uint8_t)(F_INTERRUPTS * LEGO_1_PAUSE_TIME * MIN_TOLERANCE_40 + 0.5) - 1)\r
+#define LEGO_1_PAUSE_LEN_MAX                    ((uint8_t)(F_INTERRUPTS * LEGO_1_PAUSE_TIME * MAX_TOLERANCE_40 + 0.5) + 1)\r
+#define LEGO_0_PAUSE_LEN_MIN                    ((uint8_t)(F_INTERRUPTS * LEGO_0_PAUSE_TIME * MIN_TOLERANCE_40 + 0.5) - 1)\r
+#define LEGO_0_PAUSE_LEN_MAX                    ((uint8_t)(F_INTERRUPTS * LEGO_0_PAUSE_TIME * MAX_TOLERANCE_40 + 0.5) + 1)\r
+\r
+#define IMON_START_BIT_PULSE_LEN_MIN            ((uint8_t)(F_INTERRUPTS * IMON_START_BIT_PULSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
+#define IMON_START_BIT_PULSE_LEN_MAX            ((uint8_t)(F_INTERRUPTS * IMON_START_BIT_PULSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
+#define IMON_START_BIT_PAUSE_LEN_MIN            ((uint8_t)(F_INTERRUPTS * IMON_START_BIT_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
+#define IMON_START_BIT_PAUSE_LEN_MAX            ((uint8_t)(F_INTERRUPTS * IMON_START_BIT_PAUSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
+#define IMON_PULSE_LEN                          ((uint8_t)(F_INTERRUPTS * IMON_PULSE_TIME))\r
+#define IMON_PAUSE_LEN                          ((uint8_t)(F_INTERRUPTS * IMON_PAUSE_TIME))\r
+#define IMON_PULSE_REST_LEN                     ((uint8_t)(F_INTERRUPTS * IMON_PULSE_TIME / 4))\r
+#define IMON_PAUSE_REST_LEN                     ((uint8_t)(F_INTERRUPTS * IMON_PAUSE_TIME / 4))\r
+\r
 #define AUTO_FRAME_REPETITION_LEN               (uint16_t)(F_INTERRUPTS * AUTO_FRAME_REPETITION_TIME + 0.5)       // use uint16_t!\r
 \r
 #ifdef ANALYZE\r
@@ -604,6 +716,7 @@ static int      verbose;
 #endif\r
 #define UART0_TXEN_BIT_VALUE                    (1<<TXEN0)\r
 #define UART0_UDR                               UDR0\r
+#define UART0_U2X                               U2X0\r
 \r
 #else\r
 \r
@@ -622,6 +735,7 @@ static int      verbose;
 #endif\r
 #define UART0_TXEN_BIT_VALUE                    (1<<TXEN)\r
 #define UART0_UDR                               UDR\r
+#define UART0_U2X                               U2X\r
 \r
 #endif\r
 \r
@@ -637,9 +751,9 @@ irmp_uart_init (void)
     UART0_UBRRL = UBRRL_VALUE;\r
 \r
 #if USE_2X\r
-    UART0_UCSRA |= (1<<U2X);\r
+    UART0_UCSRA |= (1<<UART0_U2X);\r
 #else\r
-    UART0_UCSRA &= ~(1<<U2X);\r
+    UART0_UCSRA &= ~(1<<UART0_U2X);\r
 #endif\r
 \r
     UART0_UCSRC = UART0_UCSZ1_BIT_VALUE | UART0_UCSZ0_BIT_VALUE | UART0_URSEL_BIT_VALUE;\r
@@ -837,6 +951,31 @@ static PROGMEM IRMP_PARAMETER nec_rep_param =
 \r
 #endif\r
 \r
+#if IRMP_SUPPORT_NEC42_PROTOCOL == 1\r
+\r
+static PROGMEM IRMP_PARAMETER nec42_param =\r
+{\r
+    IRMP_NEC42_PROTOCOL,                                                // protocol:        ir protocol\r
+    NEC_PULSE_LEN_MIN,                                                  // pulse_1_len_min: minimum length of pulse with bit value 1\r
+    NEC_PULSE_LEN_MAX,                                                  // pulse_1_len_max: maximum length of pulse with bit value 1\r
+    NEC_1_PAUSE_LEN_MIN,                                                // pause_1_len_min: minimum length of pause with bit value 1\r
+    NEC_1_PAUSE_LEN_MAX,                                                // pause_1_len_max: maximum length of pause with bit value 1\r
+    NEC_PULSE_LEN_MIN,                                                  // pulse_0_len_min: minimum length of pulse with bit value 0\r
+    NEC_PULSE_LEN_MAX,                                                  // pulse_0_len_max: maximum length of pulse with bit value 0\r
+    NEC_0_PAUSE_LEN_MIN,                                                // pause_0_len_min: minimum length of pause with bit value 0\r
+    NEC_0_PAUSE_LEN_MAX,                                                // pause_0_len_max: maximum length of pause with bit value 0\r
+    NEC42_ADDRESS_OFFSET,                                               // address_offset:  address offset\r
+    NEC42_ADDRESS_OFFSET + NEC_ADDRESS_LEN,                             // address_end:     end of address\r
+    NEC42_COMMAND_OFFSET,                                               // command_offset:  command offset\r
+    NEC42_COMMAND_OFFSET + NEC_COMMAND_LEN,                             // command_end:     end of command\r
+    NEC42_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_FLAGS                                                           // flags:           some flags\r
+};\r
+\r
+#endif\r
+\r
 #if IRMP_SUPPORT_SAMSUNG_PROTOCOL == 1\r
 \r
 static PROGMEM IRMP_PARAMETER samsung_param =\r
@@ -942,14 +1081,14 @@ static PROGMEM IRMP_PARAMETER recs80_param =
 static PROGMEM IRMP_PARAMETER rc5_param =\r
 {\r
     IRMP_RC5_PROTOCOL,                                                  // protocol:        ir protocol\r
-    RC5_BIT_LEN_MIN,                                                    // pulse_1_len_min: minimum length of pulse with bit value 1\r
-    RC5_BIT_LEN_MAX,                                                    // pulse_1_len_max: maximum length of pulse with bit value 1\r
-    RC5_BIT_LEN_MIN,                                                    // pause_1_len_min: minimum length of pause with bit value 1\r
-    RC5_BIT_LEN_MAX,                                                    // pause_1_len_max: maximum length of pause with bit value 1\r
-    1,  // tricky: use this as stop bit length                          // pulse_0_len_min: minimum length of pulse with bit value 0\r
-    1,                                                                  // pulse_0_len_max: maximum length of pulse with bit value 0\r
-    1,                                                                  // pause_0_len_min: minimum length of pause with bit value 0\r
-    1,                                                                  // pause_0_len_max: maximum length of pause with bit value 0\r
+    RC5_BIT_LEN_MIN,                                                    // pulse_1_len_min: here: minimum length of short pulse\r
+    RC5_BIT_LEN_MAX,                                                    // pulse_1_len_max: here: maximum length of short pulse\r
+    RC5_BIT_LEN_MIN,                                                    // pause_1_len_min: here: minimum length of short pause\r
+    RC5_BIT_LEN_MAX,                                                    // pause_1_len_max: here: maximum length of short pause\r
+    0,                                                                  // pulse_0_len_min: here: not used\r
+    0,                                                                  // pulse_0_len_max: here: not used\r
+    0,                                                                  // pause_0_len_min: here: not used\r
+    0,                                                                  // pause_0_len_max: here: not used\r
     RC5_ADDRESS_OFFSET,                                                 // address_offset:  address offset\r
     RC5_ADDRESS_OFFSET + RC5_ADDRESS_LEN,                               // address_end:     end of address\r
     RC5_COMMAND_OFFSET,                                                 // command_offset:  command offset\r
@@ -992,14 +1131,15 @@ static PROGMEM IRMP_PARAMETER denon_param =
 static PROGMEM IRMP_PARAMETER rc6_param =\r
 {\r
     IRMP_RC6_PROTOCOL,                                                  // protocol:        ir protocol\r
-    RC6_BIT_LEN_MIN,                                                    // pulse_1_len_min: minimum length of pulse with bit value 1\r
-    RC6_BIT_LEN_MAX,                                                    // pulse_1_len_max: maximum length of pulse with bit value 1\r
-    RC6_BIT_LEN_MIN,                                                    // pause_1_len_min: minimum length of pause with bit value 1\r
-    RC6_BIT_LEN_MAX,                                                    // pause_1_len_max: maximum length of pause with bit value 1\r
-    1,  // tricky: use this as stop bit length                          // pulse_0_len_min: minimum length of pulse with bit value 0\r
-    1,                                                                  // pulse_0_len_max: maximum length of pulse with bit value 0\r
-    1,                                                                  // pause_0_len_min: minimum length of pause with bit value 0\r
-    1,                                                                  // pause_0_len_max: maximum length of pause with bit value 0\r
+\r
+    RC6_BIT_PULSE_LEN_MIN,                                              // pulse_1_len_min: here: minimum length of short pulse\r
+    RC6_BIT_PULSE_LEN_MAX,                                              // pulse_1_len_max: here: maximum length of short pulse\r
+    RC6_BIT_PAUSE_LEN_MIN,                                              // pause_1_len_min: here: minimum length of short pause\r
+    RC6_BIT_PAUSE_LEN_MAX,                                              // pause_1_len_max: here: maximum length of short pause\r
+    0,                                                                  // pulse_0_len_min: here: not used\r
+    0,                                                                  // pulse_0_len_max: here: not used\r
+    0,                                                                  // pause_0_len_min: here: not used\r
+    0,                                                                  // pause_0_len_max: here: not used\r
     RC6_ADDRESS_OFFSET,                                                 // address_offset:  address offset\r
     RC6_ADDRESS_OFFSET + RC6_ADDRESS_LEN,                               // address_end:     end of address\r
     RC6_COMMAND_OFFSET,                                                 // command_offset:  command offset\r
@@ -1087,52 +1227,55 @@ static PROGMEM IRMP_PARAMETER bang_olufsen_param =
 \r
 #endif\r
 \r
-#if IRMP_SUPPORT_GRUNDIG_OR_NOKIA_PROTOCOL == 1\r
+#if IRMP_SUPPORT_GRUNDIG_NOKIA_IR60_PROTOCOL == 1\r
+\r
+static uint8_t first_bit;\r
 \r
 static PROGMEM IRMP_PARAMETER grundig_param =\r
 {\r
     IRMP_GRUNDIG_PROTOCOL,                                              // protocol:        ir protocol\r
-    GRUNDIG_OR_NOKIA_BIT_LEN_MIN,                                       // pulse_1_len_min: minimum length of pulse with bit value 1\r
-    GRUNDIG_OR_NOKIA_BIT_LEN_MAX,                                       // pulse_1_len_max: maximum length of pulse with bit value 1\r
-    GRUNDIG_OR_NOKIA_BIT_LEN_MIN,                                       // pause_1_len_min: minimum length of pause with bit value 1\r
-    GRUNDIG_OR_NOKIA_BIT_LEN_MAX,                                       // pause_1_len_max: maximum length of pause with bit value 1\r
-    1,  // tricky: use this as stop bit length                          // pulse_0_len_min: minimum length of pulse with bit value 0\r
-    1,                                                                  // pulse_0_len_max: maximum length of pulse with bit value 0\r
-    1,                                                                  // pause_0_len_min: minimum length of pause with bit value 0\r
-    1,                                                                  // pause_0_len_max: maximum length of pause with bit value 0\r
+\r
+    GRUNDIG_NOKIA_IR60_BIT_LEN_MIN,                                     // pulse_1_len_min: here: minimum length of short pulse\r
+    GRUNDIG_NOKIA_IR60_BIT_LEN_MAX,                                     // pulse_1_len_max: here: maximum length of short pulse\r
+    GRUNDIG_NOKIA_IR60_BIT_LEN_MIN,                                     // pause_1_len_min: here: minimum length of short pause\r
+    GRUNDIG_NOKIA_IR60_BIT_LEN_MAX,                                     // pause_1_len_max: here: maximum length of short pause\r
+    0,                                                                  // pulse_0_len_min: here: not used\r
+    0,                                                                  // pulse_0_len_max: here: not used\r
+    0,                                                                  // pause_0_len_min: here: not used\r
+    0,                                                                  // pause_0_len_max: here: not used\r
     GRUNDIG_ADDRESS_OFFSET,                                             // address_offset:  address offset\r
     GRUNDIG_ADDRESS_OFFSET + GRUNDIG_ADDRESS_LEN,                       // address_end:     end of address\r
     GRUNDIG_COMMAND_OFFSET,                                             // command_offset:  command offset\r
     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_FLAGS                                              // flags:           some flags\r
+    GRUNDIG_NOKIA_IR60_STOP_BIT,                                        // stop_bit:        flag: frame has stop bit\r
+    GRUNDIG_NOKIA_IR60_LSB,                                             // lsb_first:       flag: LSB first\r
+    GRUNDIG_NOKIA_IR60_FLAGS                                            // flags:           some flags\r
 };\r
 \r
 #endif\r
 \r
-#if IRMP_SUPPORT_SIEMENS_PROTOCOL == 1\r
+#if IRMP_SUPPORT_SIEMENS_OR_RUWIDO_PROTOCOL == 1\r
 \r
-static PROGMEM IRMP_PARAMETER siemens_param =\r
+static PROGMEM IRMP_PARAMETER ruwido_param =\r
 {\r
-    IRMP_SIEMENS_PROTOCOL,                                              // protocol:        ir protocol\r
-    SIEMENS_BIT_LEN_MIN,                                                // pulse_1_len_min: minimum length of pulse with bit value 1\r
-    SIEMENS_BIT_LEN_MAX,                                                // pulse_1_len_max: maximum length of pulse with bit value 1\r
-    SIEMENS_BIT_LEN_MIN,                                                // pause_1_len_min: minimum length of pause with bit value 1\r
-    SIEMENS_BIT_LEN_MAX,                                                // pause_1_len_max: maximum length of pause with bit value 1\r
-    1,  // tricky: use this as stop bit length                          // pulse_0_len_min: minimum length of pulse with bit value 0\r
-    1,                                                                  // pulse_0_len_max: maximum length of pulse with bit value 0\r
-    1,                                                                  // pause_0_len_min: minimum length of pause with bit value 0\r
-    1,                                                                  // pause_0_len_max: maximum length of pause with bit value 0\r
-    SIEMENS_ADDRESS_OFFSET,                                             // address_offset:  address offset\r
-    SIEMENS_ADDRESS_OFFSET + SIEMENS_ADDRESS_LEN,                       // address_end:     end of address\r
-    SIEMENS_COMMAND_OFFSET,                                             // command_offset:  command offset\r
-    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_FLAGS                                                       // flags:           some flags\r
+    IRMP_RUWIDO_PROTOCOL,                                               // protocol:        ir protocol\r
+    SIEMENS_OR_RUWIDO_BIT_PULSE_LEN_MIN,                                // pulse_1_len_min: here: minimum length of short pulse\r
+    SIEMENS_OR_RUWIDO_BIT_PULSE_LEN_MAX,                                // pulse_1_len_max: here: maximum length of short pulse\r
+    SIEMENS_OR_RUWIDO_BIT_PAUSE_LEN_MIN,                                // pause_1_len_min: here: minimum length of short pause\r
+    SIEMENS_OR_RUWIDO_BIT_PAUSE_LEN_MAX,                                // pause_1_len_max: here: maximum length of short pause\r
+    0,                                                                  // pulse_0_len_min: here: not used\r
+    0,                                                                  // pulse_0_len_max: here: not used\r
+    0,                                                                  // pause_0_len_min: here: not used\r
+    0,                                                                  // pause_0_len_max: here: not used\r
+    RUWIDO_ADDRESS_OFFSET,                                              // address_offset:  address offset\r
+    RUWIDO_ADDRESS_OFFSET + RUWIDO_ADDRESS_LEN,                         // address_end:     end of address\r
+    RUWIDO_COMMAND_OFFSET,                                              // command_offset:  command offset\r
+    RUWIDO_COMMAND_OFFSET + RUWIDO_COMMAND_LEN,                         // command_end:     end of command\r
+    SIEMENS_COMPLETE_DATA_LEN,                                          // complete_len:    complete length of frame, here: SIEMENS instead of RUWIDO!\r
+    SIEMENS_OR_RUWIDO_STOP_BIT,                                         // stop_bit:        flag: frame has stop bit\r
+    SIEMENS_OR_RUWIDO_LSB,                                              // lsb_first:       flag: LSB first\r
+    SIEMENS_OR_RUWIDO_FLAGS                                             // flags:           some flags\r
 };\r
 \r
 #endif\r
@@ -1187,6 +1330,131 @@ static PROGMEM IRMP_PARAMETER rccar_param =
 \r
 #endif\r
 \r
+#if IRMP_SUPPORT_NIKON_PROTOCOL == 1\r
+\r
+static PROGMEM IRMP_PARAMETER nikon_param =\r
+{\r
+    IRMP_NIKON_PROTOCOL,                                                // protocol:        ir protocol\r
+    NIKON_PULSE_LEN_MIN,                                                // pulse_1_len_min: minimum length of pulse with bit value 1\r
+    NIKON_PULSE_LEN_MAX,                                                // pulse_1_len_max: maximum length of pulse with bit value 1\r
+    NIKON_1_PAUSE_LEN_MIN,                                              // pause_1_len_min: minimum length of pause with bit value 1\r
+    NIKON_1_PAUSE_LEN_MAX,                                              // pause_1_len_max: maximum length of pause with bit value 1\r
+    NIKON_PULSE_LEN_MIN,                                                // pulse_0_len_min: minimum length of pulse with bit value 0\r
+    NIKON_PULSE_LEN_MAX,                                                // pulse_0_len_max: maximum length of pulse with bit value 0\r
+    NIKON_0_PAUSE_LEN_MIN,                                              // pause_0_len_min: minimum length of pause with bit value 0\r
+    NIKON_0_PAUSE_LEN_MAX,                                              // pause_0_len_max: maximum length of pause with bit value 0\r
+    NIKON_ADDRESS_OFFSET,                                               // address_offset:  address offset\r
+    NIKON_ADDRESS_OFFSET + NIKON_ADDRESS_LEN,                           // address_end:     end of address\r
+    NIKON_COMMAND_OFFSET,                                               // command_offset:  command offset\r
+    NIKON_COMMAND_OFFSET + NIKON_COMMAND_LEN,                           // command_end:     end of command\r
+    NIKON_COMPLETE_DATA_LEN,                                            // complete_len:    complete length of frame\r
+    NIKON_STOP_BIT,                                                     // stop_bit:        flag: frame has stop bit\r
+    NIKON_LSB,                                                          // lsb_first:       flag: LSB first\r
+    NIKON_FLAGS                                                         // flags:           some flags\r
+};\r
+\r
+#endif\r
+\r
+#if IRMP_SUPPORT_KATHREIN_PROTOCOL == 1\r
+\r
+static PROGMEM IRMP_PARAMETER kathrein_param =\r
+{\r
+    IRMP_KATHREIN_PROTOCOL,                                             // protocol:        ir protocol\r
+    KATHREIN_1_PULSE_LEN_MIN,                                           // pulse_1_len_min: minimum length of pulse with bit value 1\r
+    KATHREIN_1_PULSE_LEN_MAX,                                           // pulse_1_len_max: maximum length of pulse with bit value 1\r
+    KATHREIN_1_PAUSE_LEN_MIN,                                           // pause_1_len_min: minimum length of pause with bit value 1\r
+    KATHREIN_1_PAUSE_LEN_MAX,                                           // pause_1_len_max: maximum length of pause with bit value 1\r
+    KATHREIN_0_PULSE_LEN_MIN,                                           // pulse_0_len_min: minimum length of pulse with bit value 0\r
+    KATHREIN_0_PULSE_LEN_MAX,                                           // pulse_0_len_max: maximum length of pulse with bit value 0\r
+    KATHREIN_0_PAUSE_LEN_MIN,                                           // pause_0_len_min: minimum length of pause with bit value 0\r
+    KATHREIN_0_PAUSE_LEN_MAX,                                           // pause_0_len_max: maximum length of pause with bit value 0\r
+    KATHREIN_ADDRESS_OFFSET,                                            // address_offset:  address offset\r
+    KATHREIN_ADDRESS_OFFSET + KATHREIN_ADDRESS_LEN,                     // address_end:     end of address\r
+    KATHREIN_COMMAND_OFFSET,                                            // command_offset:  command offset\r
+    KATHREIN_COMMAND_OFFSET + KATHREIN_COMMAND_LEN,                     // command_end:     end of command\r
+    KATHREIN_COMPLETE_DATA_LEN,                                         // complete_len:    complete length of frame\r
+    KATHREIN_STOP_BIT,                                                  // stop_bit:        flag: frame has stop bit\r
+    KATHREIN_LSB,                                                       // lsb_first:       flag: LSB first\r
+    KATHREIN_FLAGS                                                      // flags:           some flags\r
+};\r
+\r
+#endif\r
+\r
+#if IRMP_SUPPORT_NETBOX_PROTOCOL == 1\r
+\r
+static PROGMEM IRMP_PARAMETER netbox_param =\r
+{\r
+    IRMP_NETBOX_PROTOCOL,                                               // protocol:        ir protocol\r
+    NETBOX_PULSE_LEN,                                                   // pulse_1_len_min: minimum length of pulse with bit value 1, here: exact value\r
+    NETBOX_PULSE_REST_LEN,                                              // pulse_1_len_max: maximum length of pulse with bit value 1, here: rest value\r
+    NETBOX_PAUSE_LEN,                                                   // pause_1_len_min: minimum length of pause with bit value 1, here: exact value\r
+    NETBOX_PAUSE_REST_LEN,                                              // pause_1_len_max: maximum length of pause with bit value 1, here: rest value\r
+    NETBOX_PULSE_LEN,                                                   // pulse_0_len_min: minimum length of pulse with bit value 0, here: exact value\r
+    NETBOX_PULSE_REST_LEN,                                              // pulse_0_len_max: maximum length of pulse with bit value 0, here: rest value\r
+    NETBOX_PAUSE_LEN,                                                   // pause_0_len_min: minimum length of pause with bit value 0, here: exact value\r
+    NETBOX_PAUSE_REST_LEN,                                              // pause_0_len_max: maximum length of pause with bit value 0, here: rest value\r
+    NETBOX_ADDRESS_OFFSET,                                              // address_offset:  address offset\r
+    NETBOX_ADDRESS_OFFSET + NETBOX_ADDRESS_LEN,                         // address_end:     end of address\r
+    NETBOX_COMMAND_OFFSET,                                              // command_offset:  command offset\r
+    NETBOX_COMMAND_OFFSET + NETBOX_COMMAND_LEN,                         // command_end:     end of command\r
+    NETBOX_COMPLETE_DATA_LEN,                                           // complete_len:    complete length of frame\r
+    NETBOX_STOP_BIT,                                                    // stop_bit:        flag: frame has stop bit\r
+    NETBOX_LSB,                                                         // lsb_first:       flag: LSB first\r
+    NETBOX_FLAGS                                                        // flags:           some flags\r
+};\r
+\r
+#endif\r
+\r
+#if IRMP_SUPPORT_LEGO_PROTOCOL == 1\r
+\r
+static PROGMEM IRMP_PARAMETER lego_param =\r
+{\r
+    IRMP_LEGO_PROTOCOL,                                                 // protocol:        ir protocol\r
+    LEGO_PULSE_LEN_MIN,                                                 // pulse_1_len_min: minimum length of pulse with bit value 1\r
+    LEGO_PULSE_LEN_MAX,                                                 // pulse_1_len_max: maximum length of pulse with bit value 1\r
+    LEGO_1_PAUSE_LEN_MIN,                                               // pause_1_len_min: minimum length of pause with bit value 1\r
+    LEGO_1_PAUSE_LEN_MAX,                                               // pause_1_len_max: maximum length of pause with bit value 1\r
+    LEGO_PULSE_LEN_MIN,                                                 // pulse_0_len_min: minimum length of pulse with bit value 0\r
+    LEGO_PULSE_LEN_MAX,                                                 // pulse_0_len_max: maximum length of pulse with bit value 0\r
+    LEGO_0_PAUSE_LEN_MIN,                                               // pause_0_len_min: minimum length of pause with bit value 0\r
+    LEGO_0_PAUSE_LEN_MAX,                                               // pause_0_len_max: maximum length of pause with bit value 0\r
+    LEGO_ADDRESS_OFFSET,                                                // address_offset:  address offset\r
+    LEGO_ADDRESS_OFFSET + LEGO_ADDRESS_LEN,                             // address_end:     end of address\r
+    LEGO_COMMAND_OFFSET,                                                // command_offset:  command offset\r
+    LEGO_COMMAND_OFFSET + LEGO_COMMAND_LEN,                             // command_end:     end of command\r
+    LEGO_COMPLETE_DATA_LEN,                                             // complete_len:    complete length of frame\r
+    LEGO_STOP_BIT,                                                      // stop_bit:        flag: frame has stop bit\r
+    LEGO_LSB,                                                           // lsb_first:       flag: LSB first\r
+    LEGO_FLAGS                                                          // flags:           some flags\r
+};\r
+\r
+#endif\r
+\r
+#if IRMP_SUPPORT_IMON_PROTOCOL == 1\r
+\r
+static PROGMEM IRMP_PARAMETER imon_param =\r
+{\r
+    IRMP_IMON_PROTOCOL,                                                 // protocol:        ir protocol\r
+    IMON_PULSE_LEN,                                                     // pulse_1_len_min: minimum length of pulse with bit value 1\r
+    IMON_PULSE_REST_LEN,                                                // pulse_1_len_max: maximum length of pulse with bit value 1\r
+    IMON_PAUSE_LEN,                                                     // pause_1_len_min: minimum length of pause with bit value 1\r
+    IMON_PAUSE_REST_LEN,                                                // pause_1_len_max: maximum length of pause with bit value 1\r
+    IMON_PULSE_LEN,                                                     // pulse_0_len_min: minimum length of pulse with bit value 0\r
+    IMON_PULSE_REST_LEN,                                                // pulse_0_len_max: maximum length of pulse with bit value 0\r
+    IMON_PAUSE_LEN,                                                     // pause_0_len_min: minimum length of pause with bit value 0\r
+    IMON_PAUSE_REST_LEN,                                                // pause_0_len_max: maximum length of pause with bit value 0\r
+    IMON_ADDRESS_OFFSET,                                                // address_offset:  address offset\r
+    IMON_ADDRESS_OFFSET + IMON_ADDRESS_LEN,                             // address_end:     end of address\r
+    IMON_COMMAND_OFFSET,                                                // command_offset:  command offset\r
+    IMON_COMMAND_OFFSET + IMON_COMMAND_LEN,                             // command_end:     end of command\r
+    IMON_COMPLETE_DATA_LEN,                                             // complete_len:    complete length of frame\r
+    IMON_STOP_BIT,                                                      // stop_bit:        flag: frame has stop bit\r
+    IMON_LSB,                                                           // lsb_first:       flag: LSB first\r
+    IMON_FLAGS                                                          // flags:           some flags\r
+};\r
+\r
+#endif\r
+\r
 static uint8_t                              irmp_bit;                   // current bit position\r
 static IRMP_PARAMETER                       irmp_param;\r
 \r
@@ -1257,11 +1525,38 @@ irmp_get_data (IRMP_DATA * irmp_data_p)
                     irmp_command &= 0xff;\r
                     rtc = TRUE;\r
                 }\r
-                else if ((irmp_command & 0xFF00) == 0xD100)\r
+                else if (irmp_address == 0x87EE)\r
                 {\r
                     ANALYZE_PRINTF ("Switching to APPLE protocol\n");\r
                     irmp_protocol = IRMP_APPLE_PROTOCOL;\r
-                    irmp_command &= 0xff;\r
+                    irmp_address = (irmp_command & 0xFF00) >> 8;\r
+                    irmp_command &= 0x00FF;\r
+                    rtc = TRUE;\r
+                }\r
+                break;\r
+#endif\r
+#if IRMP_SUPPORT_SIEMENS_OR_RUWIDO_PROTOCOL == 1\r
+            case IRMP_SIEMENS_PROTOCOL:\r
+            case IRMP_RUWIDO_PROTOCOL:\r
+                if (((irmp_command >> 1) & 0x0001) == (~irmp_command & 0x0001))\r
+                {\r
+                    irmp_command >>= 1;\r
+                    rtc = TRUE;\r
+                }\r
+                break;\r
+#endif\r
+#if IRMP_SUPPORT_KATHREIN_PROTOCOL == 1\r
+            case IRMP_KATHREIN_PROTOCOL:\r
+                if (irmp_command != 0x0000)\r
+                {\r
+                    rtc = TRUE;\r
+                }\r
+                break;\r
+#endif\r
+#if IRMP_SUPPORT_IR60_PROTOCOL == 1\r
+            case IRMP_IR60_PROTOCOL:\r
+                if (irmp_command != 0x007d)                         // 0x007d (== 62<<1 + 1) is start instruction frame\r
+                {\r
                     rtc = TRUE;\r
                 }\r
                 break;\r
@@ -1277,6 +1572,53 @@ irmp_get_data (IRMP_DATA * irmp_data_p)
                                ((irmp_command & 0x0FF0) >> 4);  // D-Bits:          D7 D6 D5 D4 D3 D2 D1 D0\r
                 rtc = TRUE;                                     // Summe:  V  C1 C0 D7 D6 D5 D4 D3 D2 D1 D0\r
                 break;\r
+#endif\r
+#if 1 // squeeze code to 8 bit, upper bit indicates release-key\r
+#if IRMP_SUPPORT_NETBOX_PROTOCOL == 1\r
+            case IRMP_NETBOX_PROTOCOL:\r
+                if (irmp_command & 0x1000)                      // last bit set?\r
+                {\r
+                    if ((irmp_command & 0x1f) == 0x15)          // key pressed: 101 01 (LSB)\r
+                    {\r
+                        irmp_command >>= 5;\r
+                        irmp_command &= 0x7F;\r
+                        rtc = TRUE;\r
+                    }\r
+                    else if ((irmp_command & 0x1f) == 0x10)     // key released: 000 01 (LSB)\r
+                    {\r
+                        irmp_command >>= 5;\r
+                        irmp_command |= 0x80;\r
+                        rtc = TRUE;\r
+                    }\r
+                    else\r
+                    {\r
+                        ANALYZE_PRINTF("error NETBOX: bit6/7 must be 0/1\n");\r
+                    }\r
+                }\r
+                else\r
+                {\r
+                    ANALYZE_PRINTF("error NETBOX: last bit not set\n");\r
+                }\r
+                break;\r
+#endif\r
+#endif // 0\r
+#if IRMP_SUPPORT_LEGO_PROTOCOL == 1\r
+            case IRMP_LEGO_PROTOCOL:\r
+            {\r
+                uint8_t crc = 0x0F ^ ((irmp_command & 0xF000) >> 12) ^ ((irmp_command & 0x0F00) >> 8) ^ ((irmp_command & 0x00F0) >> 4);\r
+\r
+                if ((irmp_command & 0x000F) == crc)\r
+                {\r
+                    irmp_command >>= 4;\r
+                    rtc = TRUE;\r
+                }\r
+                else\r
+                {\r
+                    ANALYZE_PRINTF ("CRC error in LEGO protocol\n");\r
+                    rtc = TRUE;\r
+                }\r
+                break;\r
+            }\r
 #endif\r
             default:\r
                 rtc = TRUE;\r
@@ -1300,19 +1642,20 @@ irmp_get_data (IRMP_DATA * irmp_data_p)
 }\r
 \r
 // these statics must not be volatile, because they are only used by irmp_store_bit(), which is called by irmp_ISR()\r
-static uint16_t   irmp_tmp_address;                                                         // ir address\r
-static uint16_t   irmp_tmp_command;                                                         // ir command\r
+static uint16_t irmp_tmp_address;                                                       // ir address\r
+static uint16_t irmp_tmp_command;                                                       // ir command\r
 \r
-#if IRMP_SUPPORT_RC5_PROTOCOL == 1 && (IRMP_SUPPORT_FDC_PROTOCOL == 1 || IRMP_SUPPORT_RCCAR_PROTOCOL == 1)\r
-static uint16_t   irmp_tmp_address2;                                                         // ir address\r
-static uint16_t   irmp_tmp_command2;                                                         // ir command\r
+#if IRMP_SUPPORT_RC5_PROTOCOL == 1 && (IRMP_SUPPORT_FDC_PROTOCOL == 1 || IRMP_SUPPORT_RCCAR_PROTOCOL == 1) || IRMP_SUPPORT_NEC42_PROTOCOL == 1\r
+static uint16_t irmp_tmp_address2;                                                      // ir address\r
+static uint16_t irmp_tmp_command2;                                                      // ir command\r
 #endif\r
 \r
 #if IRMP_SUPPORT_SAMSUNG_PROTOCOL == 1\r
-static uint16_t   irmp_tmp_id;                                                              // ir id (only SAMSUNG)\r
+static uint16_t irmp_tmp_id;                                                            // ir id (only SAMSUNG)\r
+#endif\r
+#if IRMP_SUPPORT_KASEIKYO_PROTOCOL == 1\r
+static uint8_t  xor_check[6];                                                           // check kaseikyo "parity" bits\r
 #endif\r
-\r
-static uint8_t    irmp_bit;                                                                 // current bit position\r
 \r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
  *  store bit\r
@@ -1326,6 +1669,14 @@ static uint8_t    irmp_bit;
 static void\r
 irmp_store_bit (uint8_t value)\r
 {\r
+#if IRMP_SUPPORT_GRUNDIG_NOKIA_IR60_PROTOCOL == 1\r
+    if (irmp_bit == 0 && irmp_param.protocol == IRMP_GRUNDIG_PROTOCOL)\r
+    {\r
+        first_bit = value;\r
+    }\r
+    else\r
+#endif\r
+\r
     if (irmp_bit >= irmp_param.address_offset && irmp_bit < irmp_param.address_end)\r
     {\r
         if (irmp_param.lsb_first)\r
@@ -1350,12 +1701,41 @@ irmp_store_bit (uint8_t value)
             irmp_tmp_command |= value;\r
         }\r
     }\r
+\r
+#if IRMP_SUPPORT_NEC42_PROTOCOL == 1\r
+    else if (irmp_param.protocol == IRMP_NEC42_PROTOCOL && irmp_bit >= 13 && irmp_bit < 26)\r
+    {\r
+        irmp_tmp_address2 |= (((uint16_t) (value)) << (irmp_bit - 13));                             // CV wants cast\r
+    }\r
+#endif\r
+\r
 #if IRMP_SUPPORT_SAMSUNG_PROTOCOL == 1\r
     else if (irmp_param.protocol == IRMP_SAMSUNG_PROTOCOL && irmp_bit >= SAMSUNG_ID_OFFSET && irmp_bit < SAMSUNG_ID_OFFSET + SAMSUNG_ID_LEN)\r
     {\r
         irmp_tmp_id |= (((uint16_t) (value)) << (irmp_bit - SAMSUNG_ID_OFFSET));                    // store with LSB first\r
     }\r
 #endif\r
+\r
+#if IRMP_SUPPORT_KASEIKYO_PROTOCOL == 1\r
+    else if (irmp_param.protocol == IRMP_KASEIKYO_PROTOCOL && irmp_bit >= 20 && irmp_bit < 24)\r
+    {\r
+        irmp_tmp_command |= (((uint16_t) (value)) << (irmp_bit - 8));                   // store 4 system bits in upper nibble with LSB first\r
+    }\r
+\r
+    if (irmp_param.protocol == IRMP_KASEIKYO_PROTOCOL && irmp_bit < KASEIKYO_COMPLETE_DATA_LEN)\r
+    {\r
+        if (value)\r
+        {\r
+            xor_check[irmp_bit / 8] |= 1 << (irmp_bit % 8);\r
+        }\r
+        else\r
+        {\r
+            xor_check[irmp_bit / 8] &= ~(1 << (irmp_bit % 8));\r
+        }\r
+    }\r
+\r
+#endif\r
+\r
     irmp_bit++;\r
 }\r
 \r
@@ -1406,7 +1786,7 @@ irmp_ISR (void)
     static PAUSE_LEN    irmp_pause_time;                                        // count bit time for pause\r
     static uint16_t     last_irmp_address = 0xFFFF;                             // save last irmp address to recognize key repetition\r
     static uint16_t     last_irmp_command = 0xFFFF;                             // save last irmp command to recognize key repetition\r
-    static uint16_t     repetition_counter;                                     // SIRCS repeats frame 2-5 times with 45 ms pause\r
+    static uint16_t     repetition_len;                                         // SIRCS repeats frame 2-5 times with 45 ms pause\r
     static uint8_t      repetition_frame_number;\r
 #if IRMP_SUPPORT_DENON_PROTOCOL == 1\r
     static uint16_t     last_irmp_denon_command;                                // save last irmp command to recognize DENON frame repetition\r
@@ -1454,7 +1834,7 @@ irmp_ISR (void)
                     irmp_tmp_command        = 0;\r
                     irmp_tmp_address        = 0;\r
 \r
-#if IRMP_SUPPORT_RC5_PROTOCOL == 1 && (IRMP_SUPPORT_FDC_PROTOCOL == 1 || IRMP_SUPPORT_RCCAR_PROTOCOL == 1)\r
+#if IRMP_SUPPORT_RC5_PROTOCOL == 1 && (IRMP_SUPPORT_FDC_PROTOCOL == 1 || IRMP_SUPPORT_RCCAR_PROTOCOL == 1) || IRMP_SUPPORT_NEC42_PROTOCOL == 1\r
                     irmp_tmp_command2       = 0;\r
                     irmp_tmp_address2       = 0;\r
 #endif\r
@@ -1467,9 +1847,9 @@ irmp_ISR (void)
                 }\r
                 else\r
                 {\r
-                    if (repetition_counter < 0xFFFF)                            // avoid overflow of counter\r
+                    if (repetition_len < 0xFFFF)                                // avoid overflow of counter\r
                     {\r
-                        repetition_counter++;\r
+                        repetition_len++;\r
                     }\r
                 }\r
             }\r
@@ -1482,10 +1862,24 @@ irmp_ISR (void)
                 {                                                               // yes\r
                     irmp_pause_time++;                                          // increment counter\r
 \r
+#if IRMP_SUPPORT_NIKON_PROTOCOL == 1\r
+                    if (((irmp_pulse_time < NIKON_START_BIT_PULSE_LEN_MIN || irmp_pulse_time > NIKON_START_BIT_PULSE_LEN_MAX) && irmp_pause_time > IRMP_TIMEOUT_LEN) ||\r
+                         irmp_pause_time > IRMP_TIMEOUT_NIKON_LEN)\r
+#else\r
                     if (irmp_pause_time > IRMP_TIMEOUT_LEN)                     // timeout?\r
+#endif\r
                     {                                                           // yes...\r
-                        ANALYZE_PRINTF ("error 1: pause after start bit pulse %d too long: %d\n", irmp_pulse_time, irmp_pause_time);\r
-                        ANALYZE_ONLY_NORMAL_PUTCHAR ('\n');\r
+#if IRMP_SUPPORT_JVC_PROTOCOL == 1\r
+                        if (irmp_protocol == IRMP_JVC_PROTOCOL)                 // don't show eror if JVC protocol, irmp_pulse_time has been set below!\r
+                        {\r
+                            ;\r
+                        }\r
+                        else\r
+#endif // IRMP_SUPPORT_JVC_PROTOCOL == 1\r
+                        {\r
+                            ANALYZE_PRINTF ("%8d error 1: pause after start bit pulse %d too long: %d\n", time_counter, irmp_pulse_time, irmp_pause_time);\r
+                            ANALYZE_ONLY_NORMAL_PUTCHAR ('\n');\r
+                        }\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
@@ -1499,7 +1893,7 @@ irmp_ISR (void)
                     irmp_param2.protocol = 0;\r
 #endif\r
 \r
-                    ANALYZE_PRINTF ("start-bit: pulse = %d, pause = %d\n", irmp_pulse_time, irmp_pause_time);\r
+                    ANALYZE_PRINTF ("%8d [start-bit: pulse = %2d, pause = %2d]\n", time_counter, irmp_pulse_time, irmp_pause_time);\r
 \r
 #if IRMP_SUPPORT_SIRCS_PROTOCOL == 1\r
                     if (irmp_pulse_time >= SIRCS_START_BIT_PULSE_LEN_MIN && irmp_pulse_time <= SIRCS_START_BIT_PULSE_LEN_MAX &&\r
@@ -1513,14 +1907,35 @@ irmp_ISR (void)
                     else\r
 #endif // IRMP_SUPPORT_SIRCS_PROTOCOL == 1\r
 \r
+#if IRMP_SUPPORT_JVC_PROTOCOL == 1\r
+                    if (irmp_protocol == IRMP_JVC_PROTOCOL &&                                                       // last protocol was JVC, awaiting repeat frame\r
+                        irmp_pulse_time >= JVC_START_BIT_PULSE_LEN_MIN && irmp_pulse_time <= JVC_START_BIT_PULSE_LEN_MAX &&\r
+                        irmp_pause_time >= JVC_REPEAT_START_BIT_PAUSE_LEN_MIN && irmp_pause_time <= JVC_REPEAT_START_BIT_PAUSE_LEN_MAX)\r
+                    {\r
+                        ANALYZE_PRINTF ("protocol = NEC or JVC repeat frame, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
+                                        JVC_START_BIT_PULSE_LEN_MIN, JVC_START_BIT_PULSE_LEN_MAX,\r
+                                        JVC_REPEAT_START_BIT_PAUSE_LEN_MIN, JVC_REPEAT_START_BIT_PAUSE_LEN_MAX);\r
+                        irmp_param_p = (IRMP_PARAMETER *) &nec_param;\r
+                    }\r
+                    else\r
+#endif // IRMP_SUPPORT_JVC_PROTOCOL == 1\r
+\r
 #if IRMP_SUPPORT_NEC_PROTOCOL == 1\r
                     if (irmp_pulse_time >= NEC_START_BIT_PULSE_LEN_MIN && irmp_pulse_time <= NEC_START_BIT_PULSE_LEN_MAX &&\r
                         irmp_pause_time >= NEC_START_BIT_PAUSE_LEN_MIN && irmp_pause_time <= NEC_START_BIT_PAUSE_LEN_MAX)\r
                     {\r
+#if IRMP_SUPPORT_NEC42_PROTOCOL == 1\r
+                        ANALYZE_PRINTF ("protocol = NEC42, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
+                                        NEC_START_BIT_PULSE_LEN_MIN, NEC_START_BIT_PULSE_LEN_MAX,\r
+                                        NEC_START_BIT_PAUSE_LEN_MIN, NEC_START_BIT_PAUSE_LEN_MAX);\r
+                        irmp_param_p = (IRMP_PARAMETER *) &nec42_param;\r
+#else\r
                         ANALYZE_PRINTF ("protocol = NEC, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
                                         NEC_START_BIT_PULSE_LEN_MIN, NEC_START_BIT_PULSE_LEN_MAX,\r
                                         NEC_START_BIT_PAUSE_LEN_MIN, NEC_START_BIT_PAUSE_LEN_MAX);\r
                         irmp_param_p = (IRMP_PARAMETER *) &nec_param;\r
+#endif\r
+\r
                     }\r
                     else if (irmp_pulse_time >= NEC_START_BIT_PULSE_LEN_MIN        && irmp_pulse_time <= NEC_START_BIT_PULSE_LEN_MAX &&\r
                              irmp_pause_time >= NEC_REPEAT_START_BIT_PAUSE_LEN_MIN && irmp_pause_time <= NEC_REPEAT_START_BIT_PAUSE_LEN_MAX)\r
@@ -1534,6 +1949,18 @@ irmp_ISR (void)
                     else\r
 #endif // IRMP_SUPPORT_NEC_PROTOCOL == 1\r
 \r
+#if IRMP_SUPPORT_NIKON_PROTOCOL == 1\r
+                    if (irmp_pulse_time >= NIKON_START_BIT_PULSE_LEN_MIN && irmp_pulse_time <= NIKON_START_BIT_PULSE_LEN_MAX &&\r
+                        irmp_pause_time >= NIKON_START_BIT_PAUSE_LEN_MIN && irmp_pause_time <= NIKON_START_BIT_PAUSE_LEN_MAX)\r
+                    {\r
+                        ANALYZE_PRINTF ("protocol = NIKON, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
+                                        NIKON_START_BIT_PULSE_LEN_MIN, NIKON_START_BIT_PULSE_LEN_MAX,\r
+                                        NIKON_START_BIT_PAUSE_LEN_MIN, NIKON_START_BIT_PAUSE_LEN_MAX);\r
+                        irmp_param_p = (IRMP_PARAMETER *) &nikon_param;\r
+                    }\r
+                    else\r
+#endif // IRMP_SUPPORT_NIKON_PROTOCOL == 1\r
+\r
 #if IRMP_SUPPORT_SAMSUNG_PROTOCOL == 1\r
                     if (irmp_pulse_time >= SAMSUNG_START_BIT_PULSE_LEN_MIN && irmp_pulse_time <= SAMSUNG_START_BIT_PULSE_LEN_MAX &&\r
                         irmp_pause_time >= SAMSUNG_START_BIT_PAUSE_LEN_MIN && irmp_pause_time <= SAMSUNG_START_BIT_PAUSE_LEN_MAX)\r
@@ -1583,9 +2010,9 @@ irmp_ISR (void)
 #endif // IRMP_SUPPORT_RECS80_PROTOCOL == 1\r
 \r
 #if IRMP_SUPPORT_RC5_PROTOCOL == 1\r
-                    if (((irmp_pulse_time >= RC5_START_BIT_LEN_MIN && irmp_pulse_time <= RC5_START_BIT_LEN_MAX) ||\r
+                    if (((irmp_pulse_time >= RC5_START_BIT_LEN_MIN     && irmp_pulse_time <= RC5_START_BIT_LEN_MAX) ||\r
                          (irmp_pulse_time >= 2 * RC5_START_BIT_LEN_MIN && irmp_pulse_time <= 2 * RC5_START_BIT_LEN_MAX)) &&\r
-                        ((irmp_pause_time >= RC5_START_BIT_LEN_MIN && irmp_pause_time <= RC5_START_BIT_LEN_MAX) ||\r
+                        ((irmp_pause_time >= RC5_START_BIT_LEN_MIN     && irmp_pause_time <= RC5_START_BIT_LEN_MAX) ||\r
                          (irmp_pause_time >= 2 * RC5_START_BIT_LEN_MIN && irmp_pause_time <= 2 * RC5_START_BIT_LEN_MAX)))\r
                     {                                                           // it's RC5\r
 #if IRMP_SUPPORT_FDC_PROTOCOL == 1\r
@@ -1603,6 +2030,7 @@ irmp_ISR (void)
                         }\r
                         else\r
 #endif // IRMP_SUPPORT_FDC_PROTOCOL == 1\r
+\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
@@ -1619,9 +2047,11 @@ irmp_ISR (void)
                         else\r
 #endif // IRMP_SUPPORT_RCCAR_PROTOCOL == 1\r
                         {\r
-                            ANALYZE_PRINTF ("protocol = RC5, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
+                            ANALYZE_PRINTF ("protocol = RC5, start bit timings: pulse: %3d - %3d, pause: %3d - %3d or pulse: %3d - %3d, pause: %3d - %3d\n",\r
                                             RC5_START_BIT_LEN_MIN, RC5_START_BIT_LEN_MAX,\r
-                                            RC5_START_BIT_LEN_MIN, RC5_START_BIT_LEN_MAX);\r
+                                            2 * RC5_START_BIT_LEN_MIN, 2 * RC5_START_BIT_LEN_MAX,\r
+                                            RC5_START_BIT_LEN_MIN, RC5_START_BIT_LEN_MAX,\r
+                                            2 * RC5_START_BIT_LEN_MIN, 2 * RC5_START_BIT_LEN_MAX);\r
                         }\r
 \r
                         irmp_param_p = (IRMP_PARAMETER *) &rc5_param;\r
@@ -1664,7 +2094,7 @@ irmp_ISR (void)
                                         RC6_START_BIT_PAUSE_LEN_MIN, RC6_START_BIT_PAUSE_LEN_MAX);\r
                         irmp_param_p = (IRMP_PARAMETER *) &rc6_param;\r
                         last_pause = 0;\r
-                        last_value = 0;\r
+                        last_value = 1;\r
                     }\r
                     else\r
 #endif // IRMP_SUPPORT_RC6_PROTOCOL == 1\r
@@ -1716,35 +2146,38 @@ irmp_ISR (void)
                     else\r
 #endif // IRMP_SUPPORT_BANG_OLUFSEN_PROTOCOL == 1\r
 \r
-#if IRMP_SUPPORT_GRUNDIG_OR_NOKIA_PROTOCOL == 1\r
-                    if (irmp_pulse_time >= GRUNDIG_OR_NOKIA_START_BIT_LEN_MIN && irmp_pulse_time <= GRUNDIG_OR_NOKIA_START_BIT_LEN_MAX &&\r
-                        irmp_pause_time >= GRUNDIG_OR_NOKIA_PRE_PAUSE_LEN_MIN && irmp_pause_time <= GRUNDIG_OR_NOKIA_PRE_PAUSE_LEN_MAX)\r
+#if IRMP_SUPPORT_GRUNDIG_NOKIA_IR60_PROTOCOL == 1\r
+                    if (irmp_pulse_time >= GRUNDIG_NOKIA_IR60_START_BIT_LEN_MIN && irmp_pulse_time <= GRUNDIG_NOKIA_IR60_START_BIT_LEN_MAX &&\r
+                        irmp_pause_time >= GRUNDIG_NOKIA_IR60_PRE_PAUSE_LEN_MIN && irmp_pause_time <= GRUNDIG_NOKIA_IR60_PRE_PAUSE_LEN_MAX)\r
                     {                                                           // it's GRUNDIG\r
                         ANALYZE_PRINTF ("protocol = GRUNDIG, pre bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
-                                        GRUNDIG_OR_NOKIA_START_BIT_LEN_MIN, GRUNDIG_OR_NOKIA_START_BIT_LEN_MAX,\r
-                                        GRUNDIG_OR_NOKIA_PRE_PAUSE_LEN_MIN, GRUNDIG_OR_NOKIA_PRE_PAUSE_LEN_MAX);\r
+                                        GRUNDIG_NOKIA_IR60_START_BIT_LEN_MIN, GRUNDIG_NOKIA_IR60_START_BIT_LEN_MAX,\r
+                                        GRUNDIG_NOKIA_IR60_PRE_PAUSE_LEN_MIN, GRUNDIG_NOKIA_IR60_PRE_PAUSE_LEN_MAX);\r
                         irmp_param_p = (IRMP_PARAMETER *) &grundig_param;\r
                         last_pause = irmp_pause_time;\r
                         last_value  = 1;\r
                     }\r
                     else\r
-#endif // IRMP_SUPPORT_GRUNDIG_OR_NOKIA_PROTOCOL == 1\r
-\r
-#if IRMP_SUPPORT_SIEMENS_PROTOCOL == 1\r
-                    if (((irmp_pulse_time >= SIEMENS_START_BIT_LEN_MIN && irmp_pulse_time <= SIEMENS_START_BIT_LEN_MAX) ||\r
-                         (irmp_pulse_time >= 2 * SIEMENS_START_BIT_LEN_MIN && irmp_pulse_time <= 2 * SIEMENS_START_BIT_LEN_MAX)) &&\r
-                        ((irmp_pause_time >= SIEMENS_START_BIT_LEN_MIN && irmp_pause_time <= SIEMENS_START_BIT_LEN_MAX) ||\r
-                         (irmp_pause_time >= 2 * SIEMENS_START_BIT_LEN_MIN && irmp_pause_time <= 2 * SIEMENS_START_BIT_LEN_MAX)))\r
-                    {                                                           // it's SIEMENS\r
-                        ANALYZE_PRINTF ("protocol = SIEMENS, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
-                                        SIEMENS_START_BIT_LEN_MIN, SIEMENS_START_BIT_LEN_MAX,\r
-                                        SIEMENS_START_BIT_LEN_MIN, SIEMENS_START_BIT_LEN_MAX);\r
-                        irmp_param_p = (IRMP_PARAMETER *) &siemens_param;\r
+#endif // IRMP_SUPPORT_GRUNDIG_NOKIA_IR60_PROTOCOL == 1\r
+\r
+#if IRMP_SUPPORT_SIEMENS_OR_RUWIDO_PROTOCOL == 1\r
+                    if (((irmp_pulse_time >= SIEMENS_OR_RUWIDO_START_BIT_PULSE_LEN_MIN && irmp_pulse_time <= SIEMENS_OR_RUWIDO_START_BIT_PULSE_LEN_MAX) ||\r
+                         (irmp_pulse_time >= 2 * SIEMENS_OR_RUWIDO_START_BIT_PULSE_LEN_MIN && irmp_pulse_time <= 2 * SIEMENS_OR_RUWIDO_START_BIT_PULSE_LEN_MAX)) &&\r
+                        ((irmp_pause_time >= SIEMENS_OR_RUWIDO_START_BIT_PAUSE_LEN_MIN && irmp_pause_time <= SIEMENS_OR_RUWIDO_START_BIT_PAUSE_LEN_MAX) || \r
+                         (irmp_pause_time >= 2 * SIEMENS_OR_RUWIDO_START_BIT_PAUSE_LEN_MIN && irmp_pause_time <= 2 * SIEMENS_OR_RUWIDO_START_BIT_PAUSE_LEN_MAX)))\r
+                    {                                                           // it's RUWIDO or SIEMENS\r
+                        ANALYZE_PRINTF ("protocol = RUWIDO, start bit timings: pulse: %3d - %3d or %3d - %3d, pause: %3d - %3d or %3d - %3d\n",\r
+                                        SIEMENS_OR_RUWIDO_START_BIT_PULSE_LEN_MIN,   SIEMENS_OR_RUWIDO_START_BIT_PULSE_LEN_MAX,\r
+                                        2 * SIEMENS_OR_RUWIDO_START_BIT_PULSE_LEN_MIN, 2 * SIEMENS_OR_RUWIDO_START_BIT_PULSE_LEN_MAX,\r
+                                        SIEMENS_OR_RUWIDO_START_BIT_PAUSE_LEN_MIN,   SIEMENS_OR_RUWIDO_START_BIT_PAUSE_LEN_MAX,\r
+                                        2 * SIEMENS_OR_RUWIDO_START_BIT_PAUSE_LEN_MIN, 2 * SIEMENS_OR_RUWIDO_START_BIT_PAUSE_LEN_MAX);\r
+                        irmp_param_p = (IRMP_PARAMETER *) &ruwido_param;\r
                         last_pause = irmp_pause_time;\r
                         last_value  = 1;\r
                     }\r
                     else\r
-#endif // IRMP_SUPPORT_SIEMENS_PROTOCOL == 1\r
+#endif // IRMP_SUPPORT_SIEMENS_OR_RUWIDO_PROTOCOL == 1\r
+\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
@@ -1756,6 +2189,7 @@ irmp_ISR (void)
                     }\r
                     else\r
 #endif // IRMP_SUPPORT_FDC_PROTOCOL == 1\r
+\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
@@ -1767,6 +2201,55 @@ irmp_ISR (void)
                     }\r
                     else\r
 #endif // IRMP_SUPPORT_RCCAR_PROTOCOL == 1\r
+\r
+#if IRMP_SUPPORT_KATHREIN_PROTOCOL == 1\r
+                    if (irmp_pulse_time >= KATHREIN_START_BIT_PULSE_LEN_MIN && irmp_pulse_time <= KATHREIN_START_BIT_PULSE_LEN_MAX &&\r
+                        irmp_pause_time >= KATHREIN_START_BIT_PAUSE_LEN_MIN && irmp_pause_time <= KATHREIN_START_BIT_PAUSE_LEN_MAX)\r
+                    {                                                           // it's KATHREIN\r
+                        ANALYZE_PRINTF ("protocol = KATHREIN, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
+                                        KATHREIN_START_BIT_PULSE_LEN_MIN, KATHREIN_START_BIT_PULSE_LEN_MAX,\r
+                                        KATHREIN_START_BIT_PAUSE_LEN_MIN, KATHREIN_START_BIT_PAUSE_LEN_MAX);\r
+                        irmp_param_p = (IRMP_PARAMETER *) &kathrein_param;\r
+                    }\r
+                    else\r
+#endif // IRMP_SUPPORT_KATHREIN_PROTOCOL == 1\r
+\r
+#if IRMP_SUPPORT_NETBOX_PROTOCOL == 1\r
+                    if (irmp_pulse_time >= NETBOX_START_BIT_PULSE_LEN_MIN && irmp_pulse_time <= NETBOX_START_BIT_PULSE_LEN_MAX &&\r
+                        irmp_pause_time >= NETBOX_START_BIT_PAUSE_LEN_MIN && irmp_pause_time <= NETBOX_START_BIT_PAUSE_LEN_MAX)\r
+                    {                                                           // it's NETBOX\r
+                        ANALYZE_PRINTF ("protocol = NETBOX, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
+                                        NETBOX_START_BIT_PULSE_LEN_MIN, NETBOX_START_BIT_PULSE_LEN_MAX,\r
+                                        NETBOX_START_BIT_PAUSE_LEN_MIN, NETBOX_START_BIT_PAUSE_LEN_MAX);\r
+                        irmp_param_p = (IRMP_PARAMETER *) &netbox_param;\r
+                    }\r
+                    else\r
+#endif // IRMP_SUPPORT_NETBOX_PROTOCOL == 1\r
+\r
+#if IRMP_SUPPORT_LEGO_PROTOCOL == 1\r
+                    if (irmp_pulse_time >= LEGO_START_BIT_PULSE_LEN_MIN && irmp_pulse_time <= LEGO_START_BIT_PULSE_LEN_MAX &&\r
+                        irmp_pause_time >= LEGO_START_BIT_PAUSE_LEN_MIN && irmp_pause_time <= LEGO_START_BIT_PAUSE_LEN_MAX)\r
+                    {\r
+                        ANALYZE_PRINTF ("protocol = LEGO, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
+                                        LEGO_START_BIT_PULSE_LEN_MIN, LEGO_START_BIT_PULSE_LEN_MAX,\r
+                                        LEGO_START_BIT_PAUSE_LEN_MIN, LEGO_START_BIT_PAUSE_LEN_MAX);\r
+                        irmp_param_p = (IRMP_PARAMETER *) &lego_param;\r
+                    }\r
+                    else\r
+#endif // IRMP_SUPPORT_NEC_PROTOCOL == 1\r
+\r
+#if IRMP_SUPPORT_IMON_PROTOCOL == 1\r
+                    if (irmp_pulse_time >= IMON_START_BIT_PULSE_LEN_MIN && irmp_pulse_time <= IMON_START_BIT_PULSE_LEN_MAX &&\r
+                        irmp_pause_time >= IMON_START_BIT_PAUSE_LEN_MIN && irmp_pause_time <= IMON_START_BIT_PAUSE_LEN_MAX)\r
+                    {                                                           // it's IMON\r
+                        ANALYZE_PRINTF ("protocol = IMON, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
+                                        IMON_START_BIT_PULSE_LEN_MIN, IMON_START_BIT_PULSE_LEN_MAX,\r
+                                        IMON_START_BIT_PAUSE_LEN_MIN, IMON_START_BIT_PAUSE_LEN_MAX);\r
+                        irmp_param_p = (IRMP_PARAMETER *) &imon_param;\r
+                    }\r
+                    else\r
+#endif // IRMP_SUPPORT_IMON_PROTOCOL == 1\r
+\r
                     {\r
                         ANALYZE_PRINTF ("protocol = UNKNOWN\n");\r
                         irmp_start_bit_detected = 0;                            // wait for another start bit...\r
@@ -1785,9 +2268,9 @@ irmp_ISR (void)
                         else\r
                         {\r
                             ANALYZE_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
+                                            2 * irmp_param.pulse_1_len_min, 2 * irmp_param.pulse_1_len_max);\r
                             ANALYZE_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
+                                            2 * irmp_param.pause_1_len_min, 2 * irmp_param.pause_1_len_max);\r
                         }\r
 \r
 #if IRMP_SUPPORT_RC5_PROTOCOL == 1 && (IRMP_SUPPORT_FDC_PROTOCOL == 1 || IRMP_SUPPORT_RCCAR_PROTOCOL == 1)\r
@@ -1810,8 +2293,8 @@ irmp_ISR (void)
 \r
                         if (! (irmp_param.flags & IRMP_PARAM_FLAG_IS_MANCHESTER))\r
                         {\r
-                            ANALYZE_PRINTF ("pulse_0: %3d - %3d\n", irmp_param.pulse_0_len_min, irmp_param.pulse_0_len_max);\r
-                            ANALYZE_PRINTF ("pause_0: %3d - %3d\n", irmp_param.pause_0_len_min, irmp_param.pause_0_len_max);\r
+                            ANALYZE_PRINTF ("pulse_0: %3d - %3d\n", 2 * irmp_param.pulse_1_len_min, 2 * irmp_param.pulse_1_len_max);\r
+                            ANALYZE_PRINTF ("pause_0: %3d - %3d\n", 2 * irmp_param.pause_1_len_min, 2 * irmp_param.pause_1_len_max);\r
                         }\r
 \r
 #if IRMP_SUPPORT_BANG_OLUFSEN_PROTOCOL == 1\r
@@ -1832,7 +2315,9 @@ irmp_ISR (void)
                     irmp_bit = 0;\r
 \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
+                    if ((irmp_param.flags & IRMP_PARAM_FLAG_IS_MANCHESTER) &&\r
+                         irmp_param.protocol != IRMP_RUWIDO_PROTOCOL && // Manchester, but not RUWIDO\r
+                         irmp_param.protocol != IRMP_RC6_PROTOCOL)      // Manchester, but not RC6\r
                     {\r
                         if (irmp_pause_time > irmp_param.pulse_1_len_max && irmp_pause_time <= 2 * irmp_param.pulse_1_len_max)\r
                         {\r
@@ -1853,6 +2338,15 @@ irmp_ISR (void)
                     else\r
 #endif // IRMP_SUPPORT_MANCHESTER == 1\r
 \r
+#if IRMP_SUPPORT_SERIAL == 1\r
+                    if (irmp_param.flags & IRMP_PARAM_FLAG_IS_SERIAL)\r
+                    {\r
+                        ; // do nothing\r
+                    }\r
+                    else\r
+#endif // IRMP_SUPPORT_SERIAL == 1\r
+\r
+\r
 #if IRMP_SUPPORT_DENON_PROTOCOL == 1\r
                     if (irmp_param.protocol == IRMP_DENON_PROTOCOL)\r
                     {\r
@@ -1890,7 +2384,14 @@ irmp_ISR (void)
                 {                                                               // yes...\r
                     if (irmp_bit == irmp_param.complete_len && irmp_param.stop_bit == 1)\r
                     {\r
-                        if (irmp_pulse_time >= irmp_param.pulse_0_len_min && irmp_pulse_time <= irmp_param.pulse_0_len_max)\r
+                        if (\r
+#if IRMP_SUPPORT_MANCHESTER == 1\r
+                            (irmp_param.flags & IRMP_PARAM_FLAG_IS_MANCHESTER) ||\r
+#endif\r
+#if IRMP_SUPPORT_SERIAL == 1\r
+                            (irmp_param.flags & IRMP_PARAM_FLAG_IS_SERIAL) ||\r
+#endif\r
+                            (irmp_pulse_time >= irmp_param.pulse_0_len_min && irmp_pulse_time <= irmp_param.pulse_0_len_max))\r
                         {\r
 #ifdef ANALYZE\r
                             if (! (irmp_param.flags & IRMP_PARAM_FLAG_IS_MANCHESTER))\r
@@ -1902,7 +2403,7 @@ irmp_ISR (void)
                         }\r
                         else\r
                         {\r
-                            ANALYZE_PRINTF ("stop bit timing wrong\n");\r
+                            ANALYZE_PRINTF ("error: stop bit timing wrong\n");\r
 \r
                             irmp_start_bit_detected = 0;                        // wait for another start bit...\r
                             irmp_pulse_time         = 0;\r
@@ -1911,24 +2412,50 @@ irmp_ISR (void)
                     }\r
                     else\r
                     {\r
-                        irmp_pause_time++;                                      // increment counter\r
+                        irmp_pause_time++;                                                          // increment counter\r
 \r
 #if IRMP_SUPPORT_SIRCS_PROTOCOL == 1\r
-                        if (irmp_param.protocol == IRMP_SIRCS_PROTOCOL &&       // Sony has a variable number of bits:\r
-                            irmp_pause_time > SIRCS_PAUSE_LEN_MAX &&            // minimum is 12\r
-                            irmp_bit >= 12 - 1)                                 // pause too long?\r
-                        {                                                       // yes, break and close this frame\r
-                            irmp_param.complete_len = irmp_bit + 1;             // set new complete length\r
-                            got_light = TRUE;                                   // this is a lie, but helps (generates stop bit)\r
-                            irmp_param.command_end = irmp_param.command_offset + irmp_bit + 1;        // correct command length\r
-                            irmp_pause_time = SIRCS_PAUSE_LEN_MAX - 1;          // correct pause length\r
+                        if (irmp_param.protocol == IRMP_SIRCS_PROTOCOL &&                           // Sony has a variable number of bits:\r
+                            irmp_pause_time > SIRCS_PAUSE_LEN_MAX &&                                // minimum is 12\r
+                            irmp_bit >= 12 - 1)                                                     // pause too long?\r
+                        {                                                                           // yes, break and close this frame\r
+                            irmp_param.complete_len = irmp_bit + 1;                                 // set new complete length\r
+                            got_light = TRUE;                                                       // this is a lie, but helps (generates stop bit)\r
+                            irmp_tmp_address |= (irmp_bit - SIRCS_MINIMUM_DATA_LEN + 1) << 8;       // new: store number of additional bits in upper byte of address!\r
+                            irmp_param.command_end = irmp_param.command_offset + irmp_bit + 1;      // correct command length\r
+                            irmp_pause_time = SIRCS_PAUSE_LEN_MAX - 1;                              // correct pause length\r
+                        }\r
+                        else\r
+#endif\r
+#if IRMP_SUPPORT_SERIAL == 1\r
+                        // NETBOX generates no stop bit, here is the timeout condition:\r
+                        if ((irmp_param.flags & IRMP_PARAM_FLAG_IS_SERIAL) && irmp_param.protocol == IRMP_NETBOX_PROTOCOL &&\r
+                            irmp_pause_time >= NETBOX_PULSE_LEN * (NETBOX_COMPLETE_DATA_LEN - irmp_bit))\r
+                        {\r
+                            got_light = TRUE;                                                       // this is a lie, but helps (generates stop bit)\r
                         }\r
                         else\r
 #endif\r
-#if IRMP_SUPPORT_GRUNDIG_OR_NOKIA_PROTOCOL == 1\r
+#if IRMP_SUPPORT_GRUNDIG_NOKIA_IR60_PROTOCOL == 1\r
                         if (irmp_param.protocol == IRMP_GRUNDIG_PROTOCOL && !irmp_param.stop_bit)\r
                         {\r
-                            if (irmp_pause_time > 2 * irmp_param.pause_1_len_max && irmp_bit >= GRUNDIG_COMPLETE_DATA_LEN - 2)\r
+                            if (irmp_pause_time > IR60_TIMEOUT_LEN && irmp_bit == 6)\r
+                            {\r
+                                ANALYZE_PRINTF ("Switching to IR60 protocol\n");\r
+                                got_light = TRUE;                                       // this is a lie, but generates a stop bit ;-)\r
+                                irmp_param.stop_bit = TRUE;                             // set flag\r
+\r
+                                irmp_param.protocol         = IRMP_IR60_PROTOCOL;       // change protocol\r
+                                irmp_param.complete_len     = IR60_COMPLETE_DATA_LEN;   // correct complete len\r
+                                irmp_param.address_offset   = IR60_ADDRESS_OFFSET;\r
+                                irmp_param.address_end      = IR60_ADDRESS_OFFSET + IR60_ADDRESS_LEN;\r
+                                irmp_param.command_offset   = IR60_COMMAND_OFFSET;\r
+                                irmp_param.command_end      = IR60_COMMAND_OFFSET + IR60_COMMAND_LEN;\r
+\r
+                                irmp_tmp_command <<= 1;\r
+                                irmp_tmp_command |= first_bit;\r
+                            }\r
+                            else 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
@@ -1952,9 +2479,39 @@ irmp_ISR (void)
                         }\r
                         else\r
 #endif\r
+#if IRMP_SUPPORT_SIEMENS_OR_RUWIDO_PROTOCOL == 1\r
+                        if (irmp_param.protocol == IRMP_RUWIDO_PROTOCOL && !irmp_param.stop_bit)\r
+                        {\r
+                            if (irmp_pause_time >= 2 * irmp_param.pause_1_len_max && irmp_bit >= RUWIDO_COMPLETE_DATA_LEN - 2)\r
+                            {                                                           // special manchester decoder\r
+                                irmp_param.complete_len = RUWIDO_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 >= RUWIDO_COMPLETE_DATA_LEN)\r
+                            {\r
+                                ANALYZE_PRINTF ("Switching to SIEMENS protocol\n");\r
+                                irmp_param.protocol         = IRMP_SIEMENS_PROTOCOL;    // change protocol\r
+                                irmp_param.address_offset   = SIEMENS_ADDRESS_OFFSET;\r
+                                irmp_param.address_end      = SIEMENS_ADDRESS_OFFSET + SIEMENS_ADDRESS_LEN;\r
+                                irmp_param.command_offset   = SIEMENS_COMMAND_OFFSET;\r
+                                irmp_param.command_end      = SIEMENS_COMMAND_OFFSET + SIEMENS_COMMAND_LEN;\r
+\r
+                                //                   76543210\r
+                                // RUWIDO:  AAAAAAAAACCCCCCCp\r
+                                // SIEMENS: AAAAAAAAAAACCCCCCCCCCp\r
+                                irmp_tmp_address <<= 2;\r
+                                irmp_tmp_address |= (irmp_tmp_command >> 6);\r
+                                irmp_tmp_command &= 0x003F;\r
+                                irmp_tmp_command <<= 4;\r
+                                irmp_tmp_command |= last_value;\r
+                            }\r
+                        }\r
+                        else\r
+#endif\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
+                            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
@@ -1967,6 +2524,51 @@ irmp_ISR (void)
                             {\r
                                 irmp_bit++;\r
                             }\r
+#if IRMP_SUPPORT_JVC_PROTOCOL == 1\r
+                            else if (irmp_param.protocol == IRMP_NEC_PROTOCOL && (irmp_bit == 16 || irmp_bit == 17))      // it was a JVC stop bit\r
+                            {\r
+                                ANALYZE_PRINTF ("Switching to JVC protocol\n");\r
+                                irmp_param.stop_bit     = TRUE;                                     // set flag\r
+                                irmp_param.protocol     = IRMP_JVC_PROTOCOL;                        // switch protocol\r
+                                irmp_param.complete_len = irmp_bit;                                 // patch length: 16 or 17\r
+                                irmp_tmp_command        = (irmp_tmp_address >> 4);                  // set command: upper 12 bits are command bits\r
+                                irmp_tmp_address        = irmp_tmp_address & 0x000F;                // lower 4 bits are address bits\r
+                                irmp_start_bit_detected = 1;                                        // tricky: don't wait for another start bit...\r
+                            }\r
+#endif // IRMP_SUPPORT_JVC_PROTOCOL == 1\r
+\r
+#if IRMP_SUPPORT_NEC42_PROTOCOL == 1\r
+#if IRMP_SUPPORT_NEC_PROTOCOL == 1\r
+                            else if (irmp_param.protocol == IRMP_NEC42_PROTOCOL && irmp_bit == 32)  // it was a NEC stop bit\r
+                            {\r
+                                ANALYZE_PRINTF ("Switching to NEC protocol\n");\r
+                                irmp_param.stop_bit     = TRUE;                                     // set flag\r
+                                irmp_param.protocol     = IRMP_NEC_PROTOCOL;                        // switch protocol\r
+                                irmp_param.complete_len = irmp_bit;                                 // patch length: 16 or 17\r
+\r
+                                //        0123456789ABC0123456789ABC0123456701234567\r
+                                // NEC42: AAAAAAAAAAAAAaaaaaaaaaaaaaCCCCCCCCcccccccc\r
+                                // NEC:   AAAAAAAAaaaaaaaaCCCCCCCCcccccccc\r
+                                irmp_tmp_address        |= (irmp_tmp_address2 & 0x0007) << 12;\r
+                                irmp_tmp_command        = (irmp_tmp_address2 >> 3) | (irmp_tmp_command << 10);\r
+                            }\r
+#endif // IRMP_SUPPORT_NEC_PROTOCOL == 1\r
+#if IRMP_SUPPORT_JVC_PROTOCOL == 1\r
+                            else if (irmp_param.protocol == IRMP_NEC42_PROTOCOL && irmp_bit == 16)  // it was a JVC stop bit\r
+                            {\r
+                                ANALYZE_PRINTF ("Switching to JVC protocol\n");\r
+                                irmp_param.stop_bit     = TRUE;                                     // set flag\r
+                                irmp_param.protocol     = IRMP_JVC_PROTOCOL;                        // switch protocol\r
+                                irmp_param.complete_len = irmp_bit;                                 // patch length: 16 or 17\r
+\r
+                                //        0123456789ABC0123456789ABC0123456701234567\r
+                                // NEC42: AAAAAAAAAAAAAaaaaaaaaaaaaaCCCCCCCCcccccccc\r
+                                // JVC:   AAAACCCCCCCCCCCC\r
+                                irmp_tmp_command        = (irmp_tmp_address >> 4) | (irmp_tmp_address2 << 9);   // set command: upper 12 bits are command bits\r
+                                irmp_tmp_address        = irmp_tmp_address & 0x000F;                            // lower 4 bits are address bits\r
+                            }\r
+#endif // IRMP_SUPPORT_JVC_PROTOCOL == 1\r
+#endif // IRMP_SUPPORT_NEC42_PROTOCOL == 1\r
                             else\r
                             {\r
                                 ANALYZE_PRINTF ("error 2: pause %d after data bit %d too long\n", irmp_pause_time, irmp_bit);\r
@@ -1991,37 +2593,68 @@ irmp_ISR (void)
 #if IRMP_SUPPORT_MANCHESTER == 1\r
                     if ((irmp_param.flags & IRMP_PARAM_FLAG_IS_MANCHESTER))                                     // Manchester\r
                     {\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
+#if 1\r
+                        if (irmp_pulse_time > irmp_param.pulse_1_len_max /* && irmp_pulse_time <= 2 * irmp_param.pulse_1_len_max */)\r
+#else // better, but some IR-RCs use asymmetric timings :-/\r
+                        if (irmp_pulse_time > irmp_param.pulse_1_len_max && irmp_pulse_time <= 2 * irmp_param.pulse_1_len_max &&\r
+                            irmp_pause_time <= 2 * irmp_param.pause_1_len_max)\r
+#endif\r
                         {\r
-                            if (irmp_pulse_time > RC6_TOGGLE_BIT_LEN_MAX && irmp_pause_time > RC6_TOGGLE_BIT_LEN_MAX)\r
+#if IRMP_SUPPORT_RC6_PROTOCOL == 1\r
+                            if (irmp_param.protocol == IRMP_RC6_PROTOCOL && irmp_bit == 4 && irmp_pulse_time > RC6_TOGGLE_BIT_LEN_MIN)         // RC6 toggle bit\r
                             {\r
-                                ANALYZE_PUTCHAR ('1');\r
-                                irmp_store_bit (1);\r
+                                ANALYZE_PUTCHAR ('T');\r
+                                if (irmp_param.complete_len == RC6_COMPLETE_DATA_LEN_LONG)                      // RC6 mode 6A\r
+                                {\r
+                                    irmp_store_bit (1);\r
+                                    last_value = 1;\r
+                                }\r
+                                else                                                                            // RC6 mode 0\r
+                                {\r
+                                    irmp_store_bit (0);\r
+                                    last_value = 0;\r
+                                }\r
+                                ANALYZE_NEWLINE ();\r
                             }\r
+                            else\r
+#endif // IRMP_SUPPORT_RC6_PROTOCOL == 1\r
+                            {\r
+                                ANALYZE_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
 \r
-                            ANALYZE_PUTCHAR ('0');\r
-                            irmp_store_bit (0);\r
-                            last_value = 0;\r
-                            ANALYZE_NEWLINE ();\r
-                        }\r
-                        else\r
+#if IRMP_SUPPORT_RC6_PROTOCOL == 1\r
+                                if (irmp_param.protocol == IRMP_RC6_PROTOCOL && irmp_bit == 4 && irmp_pulse_time > RC6_TOGGLE_BIT_LEN_MIN)      // RC6 toggle bit\r
+                                {\r
+                                    ANALYZE_PUTCHAR ('T');\r
+                                    irmp_store_bit (1);\r
+\r
+                                    if (irmp_pause_time > 2 * irmp_param.pause_1_len_max)\r
+                                    {\r
+                                        last_value = 0;\r
+                                    }\r
+                                    else\r
+                                    {\r
+                                        last_value = 1;\r
+                                    }\r
+                                    ANALYZE_NEWLINE ();\r
+                                }\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
-                            ANALYZE_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
-                            ANALYZE_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
+                                {\r
+                                    ANALYZE_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
 #if IRMP_SUPPORT_RC5_PROTOCOL == 1 && (IRMP_SUPPORT_FDC_PROTOCOL == 1 || IRMP_SUPPORT_RCCAR_PROTOCOL == 1)\r
-                            if (! irmp_param2.protocol)\r
+                                    if (! irmp_param2.protocol)\r
 #endif\r
-                            {\r
-                                ANALYZE_NEWLINE ();\r
+                                    {\r
+                                        ANALYZE_NEWLINE ();\r
+                                    }\r
+                                    last_value = (irmp_param.flags & IRMP_PARAM_FLAG_1ST_PULSE_IS_1) ? 1 : 0;\r
+                                }\r
                             }\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_min && irmp_pulse_time <= irmp_param.pulse_1_len_max)\r
+                        else if (irmp_pulse_time >= irmp_param.pulse_1_len_min && irmp_pulse_time <= irmp_param.pulse_1_len_max\r
+                                 /* && irmp_pause_time <= 2 * irmp_param.pause_1_len_max */)\r
                         {\r
                             uint8_t manchester_value;\r
 \r
@@ -2035,22 +2668,28 @@ irmp_ISR (void)
                                 manchester_value = last_value;\r
                             }\r
 \r
-#if 0\r
-#if IRMP_SUPPORT_RC6_PROTOCOL == 1\r
-                            if (irmp_param.protocol == IRMP_RC6_PROTOCOL && irmp_bit == 1 && manchester_value == 0)     // RC6 mode != 0 ???\r
-                            {\r
-                                irmp_param.complete_len = RC6_COMPLETE_DATA_LEN_LONG;\r
-                            }\r
-#endif // IRMP_SUPPORT_RC6_PROTOCOL == 1\r
-#endif // 0\r
-\r
                             ANALYZE_PUTCHAR (manchester_value + '0');\r
+\r
 #if IRMP_SUPPORT_RC5_PROTOCOL == 1 && (IRMP_SUPPORT_FDC_PROTOCOL == 1 || IRMP_SUPPORT_RCCAR_PROTOCOL == 1)\r
                             if (! irmp_param2.protocol)\r
 #endif\r
                             {\r
                                 ANALYZE_NEWLINE ();\r
                             }\r
+\r
+#if IRMP_SUPPORT_RC6_PROTOCOL == 1\r
+                            if (irmp_param.protocol == IRMP_RC6_PROTOCOL && irmp_bit == 1 && manchester_value == 1)     // RC6 mode != 0 ???\r
+                            {\r
+                                ANALYZE_PRINTF ("Switching to RC6A protocol\n");\r
+                                irmp_param.complete_len = RC6_COMPLETE_DATA_LEN_LONG;\r
+                                irmp_param.address_offset = 5;\r
+                                irmp_param.address_end = irmp_param.address_offset + 15;\r
+                                irmp_param.command_offset = irmp_param.address_end + 1;                                 // skip 1 system bit, changes like a toggle bit\r
+                                irmp_param.command_end = irmp_param.command_offset + 16 - 1;\r
+                                irmp_tmp_address = 0;\r
+                            }\r
+#endif // IRMP_SUPPORT_RC6_PROTOCOL == 1\r
+\r
                             irmp_store_bit (manchester_value);\r
                         }\r
                         else\r
@@ -2080,7 +2719,7 @@ irmp_ISR (void)
                             {\r
                                 ANALYZE_PUTCHAR ('?');\r
                                 ANALYZE_NEWLINE ();\r
-                                ANALYZE_PRINTF ("error 3 RC5: timing not correct: data bit %d,  pulse: %d, pause: %d\n", irmp_bit, irmp_pulse_time, irmp_pause_time);\r
+                                ANALYZE_PRINTF ("error 3 manchester: timing not correct: data bit %d,  pulse: %d, pause: %d\n", irmp_bit, irmp_pulse_time, irmp_pause_time);\r
                                 ANALYZE_ONLY_NORMAL_PUTCHAR ('\n');\r
                                 irmp_start_bit_detected = 0;                            // reset flags and wait for next start bit\r
                                 irmp_pause_time         = 0;\r
@@ -2142,6 +2781,43 @@ irmp_ISR (void)
                     else\r
 #endif // IRMP_SUPPORT_MANCHESTER == 1\r
 \r
+#if IRMP_SUPPORT_SERIAL == 1\r
+                    if (irmp_param.flags & IRMP_PARAM_FLAG_IS_SERIAL)\r
+                    {\r
+                        while (irmp_bit < irmp_param.complete_len && irmp_pulse_time > irmp_param.pulse_1_len_max)\r
+                        {\r
+                            ANALYZE_PUTCHAR ('1');\r
+                            irmp_store_bit (1);\r
+\r
+                            if (irmp_pulse_time >= irmp_param.pulse_1_len_min)\r
+                            {\r
+                                irmp_pulse_time -= irmp_param.pulse_1_len_min;\r
+                            }\r
+                            else\r
+                            {\r
+                                irmp_pulse_time = 0;\r
+                            }\r
+                        }\r
+\r
+                        while (irmp_bit < irmp_param.complete_len && irmp_pause_time > irmp_param.pause_1_len_max)\r
+                        {\r
+                            ANALYZE_PUTCHAR ('0');\r
+                            irmp_store_bit (0);\r
+\r
+                            if (irmp_pause_time >= irmp_param.pause_1_len_min)\r
+                            {\r
+                                irmp_pause_time -= irmp_param.pause_1_len_min;\r
+                            }\r
+                            else\r
+                            {\r
+                                irmp_pause_time = 0;\r
+                            }\r
+                        }\r
+                        ANALYZE_NEWLINE ();\r
+                        wait_for_space = 0;\r
+                    }\r
+                    else\r
+#endif // IRMP_SUPPORT_SERIAL == 1\r
 \r
 #if IRMP_SUPPORT_SAMSUNG_PROTOCOL == 1\r
                     if (irmp_param.protocol == IRMP_SAMSUNG_PROTOCOL && irmp_bit == 16)       // Samsung: 16th bit\r
@@ -2189,6 +2865,27 @@ irmp_ISR (void)
                     else\r
 #endif // IRMP_SUPPORT_SAMSUNG_PROTOCOL\r
 \r
+#if IRMP_SUPPORT_NEC16_PROTOCOL\r
+#if IRMP_SUPPORT_NEC42_PROTOCOL == 1\r
+                    if (irmp_param.protocol == IRMP_NEC42_PROTOCOL &&\r
+#else // IRMP_SUPPORT_NEC_PROTOCOL instead\r
+                    if (irmp_param.protocol == IRMP_NEC_PROTOCOL &&\r
+#endif // IRMP_SUPPORT_NEC42_PROTOCOL == 1\r
+                        irmp_bit == 8 && irmp_pause_time >= NEC_START_BIT_PAUSE_LEN_MIN && irmp_pause_time <= NEC_START_BIT_PAUSE_LEN_MAX)\r
+                    {\r
+printf ("! %d %d !\n", irmp_pause_time, NEC_START_BIT_PAUSE_LEN_MAX);\r
+                        ANALYZE_PRINTF ("Switching to NEC16 protocol\n");\r
+                        irmp_param.protocol = IRMP_NEC16_PROTOCOL;\r
+                        irmp_param.address_offset   = NEC16_ADDRESS_OFFSET;\r
+                        irmp_param.address_end      = NEC16_ADDRESS_OFFSET + NEC16_ADDRESS_LEN;\r
+                        irmp_param.command_offset   = NEC16_COMMAND_OFFSET;\r
+                        irmp_param.command_end      = NEC16_COMMAND_OFFSET + NEC16_COMMAND_LEN;\r
+                        irmp_param.complete_len     = NEC16_COMPLETE_DATA_LEN;\r
+                        wait_for_space = 0;\r
+                    }\r
+                    else\r
+#endif // IRMP_SUPPORT_NEC16_PROTOCOL\r
+\r
 #if IRMP_SUPPORT_BANG_OLUFSEN_PROTOCOL == 1\r
                     if (irmp_param.protocol == IRMP_BANG_OLUFSEN_PROTOCOL)\r
                     {\r
@@ -2288,6 +2985,33 @@ irmp_ISR (void)
                         wait_for_space = 0;\r
                     }\r
                     else\r
+#if IRMP_SUPPORT_KATHREIN_PROTOCOL\r
+\r
+                    if (irmp_param.protocol == IRMP_KATHREIN_PROTOCOL &&\r
+                        irmp_pulse_time >= KATHREIN_1_PULSE_LEN_MIN && irmp_pulse_time <= KATHREIN_1_PULSE_LEN_MAX &&\r
+                        (((irmp_bit == 8 || irmp_bit == 6) &&\r
+                                irmp_pause_time >= KATHREIN_SYNC_BIT_PAUSE_LEN_MIN && irmp_pause_time <= KATHREIN_SYNC_BIT_PAUSE_LEN_MAX) ||\r
+                         (irmp_bit == 12 &&\r
+                                irmp_pause_time >= KATHREIN_START_BIT_PAUSE_LEN_MIN && irmp_pause_time <= KATHREIN_START_BIT_PAUSE_LEN_MAX)))\r
+\r
+                    {\r
+                        if (irmp_bit == 8)\r
+                        {\r
+                            irmp_bit++;\r
+                            ANALYZE_PUTCHAR ('S');\r
+                            ANALYZE_NEWLINE ();\r
+                            irmp_tmp_command <<= 1;\r
+                        }\r
+                        else\r
+                        {\r
+                            ANALYZE_PUTCHAR ('S');\r
+                            ANALYZE_NEWLINE ();\r
+                            irmp_store_bit (1);\r
+                        }\r
+                        wait_for_space = 0;\r
+                    }\r
+                    else\r
+#endif // IRMP_SUPPORT_KATHREIN_PROTOCOL\r
                     {                                                               // timing incorrect!\r
                         ANALYZE_PRINTF ("error 3: timing not correct: data bit %d,  pulse: %d, pause: %d\n", irmp_bit, irmp_pulse_time, irmp_pause_time);\r
                         ANALYZE_ONLY_NORMAL_PUTCHAR ('\n');\r
@@ -2313,7 +3037,7 @@ irmp_ISR (void)
 \r
             if (irmp_start_bit_detected && irmp_bit == irmp_param.complete_len && irmp_param.stop_bit == 0)    // enough bits received?\r
             {\r
-                if (last_irmp_command == irmp_tmp_command && repetition_counter < AUTO_FRAME_REPETITION_LEN)\r
+                if (last_irmp_command == irmp_tmp_command && repetition_len < AUTO_FRAME_REPETITION_LEN)\r
                 {\r
                     repetition_frame_number++;\r
                 }\r
@@ -2327,8 +3051,19 @@ irmp_ISR (void)
                 if (irmp_param.protocol == IRMP_SIRCS_PROTOCOL && (repetition_frame_number == 1 || repetition_frame_number == 2))\r
                 {\r
                     ANALYZE_PRINTF ("code skipped: SIRCS auto repetition frame #%d, counter = %d, auto repetition len = %d\n",\r
-                                    repetition_frame_number + 1, repetition_counter, AUTO_FRAME_REPETITION_LEN);\r
-                    repetition_counter = 0;\r
+                                    repetition_frame_number + 1, repetition_len, AUTO_FRAME_REPETITION_LEN);\r
+                    repetition_len = 0;\r
+                }\r
+                else\r
+#endif\r
+\r
+#if IRMP_SUPPORT_KASEIKYO_PROTOCOL == 1\r
+                // if KASEIKYO protocol and the code will be repeated within 50 ms, we will ignore 2nd repetition frame\r
+                if (irmp_param.protocol == IRMP_KASEIKYO_PROTOCOL && repetition_frame_number == 1)\r
+                {\r
+                    ANALYZE_PRINTF ("code skipped: KASEIKYO auto repetition frame #%d, counter = %d, auto repetition len = %d\n",\r
+                                    repetition_frame_number + 1, repetition_len, AUTO_FRAME_REPETITION_LEN);\r
+                    repetition_len = 0;\r
                 }\r
                 else\r
 #endif\r
@@ -2338,8 +3073,8 @@ irmp_ISR (void)
                 if (irmp_param.protocol == IRMP_SAMSUNG32_PROTOCOL && (repetition_frame_number & 0x01))\r
                 {\r
                     ANALYZE_PRINTF ("code skipped: SAMSUNG32 auto repetition frame #%d, counter = %d, auto repetition len = %d\n",\r
-                                    repetition_frame_number + 1, repetition_counter, AUTO_FRAME_REPETITION_LEN);\r
-                    repetition_counter = 0;\r
+                                    repetition_frame_number + 1, repetition_len, AUTO_FRAME_REPETITION_LEN);\r
+                    repetition_len = 0;\r
                 }\r
                 else\r
 #endif\r
@@ -2349,14 +3084,14 @@ irmp_ISR (void)
                 if (irmp_param.protocol == IRMP_NUBERT_PROTOCOL && (repetition_frame_number & 0x01))\r
                 {\r
                     ANALYZE_PRINTF ("code skipped: NUBERT auto repetition frame #%d, counter = %d, auto repetition len = %d\n",\r
-                                    repetition_frame_number + 1, repetition_counter, AUTO_FRAME_REPETITION_LEN);\r
-                    repetition_counter = 0;\r
+                                    repetition_frame_number + 1, repetition_len, AUTO_FRAME_REPETITION_LEN);\r
+                    repetition_len = 0;\r
                 }\r
                 else\r
 #endif\r
 \r
                 {\r
-                    ANALYZE_PRINTF ("code detected, length = %d\n", irmp_bit);\r
+                    ANALYZE_PRINTF ("%8d code detected, length = %d\n", time_counter, irmp_bit);\r
                     irmp_ir_detected = TRUE;\r
 \r
 #if IRMP_SUPPORT_DENON_PROTOCOL == 1\r
@@ -2401,22 +3136,56 @@ irmp_ISR (void)
 #if IRMP_SUPPORT_NEC_PROTOCOL == 1\r
                         if (irmp_param.protocol == IRMP_NEC_PROTOCOL && irmp_bit == 0)  // repetition frame\r
                         {\r
-                            if (repetition_counter < NEC_FRAME_REPEAT_PAUSE_LEN_MAX)\r
+                            if (repetition_len < NEC_FRAME_REPEAT_PAUSE_LEN_MAX)\r
                             {\r
-                                ANALYZE_PRINTF ("Detected NEC repetition frame, repetition_counter = %d\n", repetition_counter);\r
+                                ANALYZE_PRINTF ("Detected NEC repetition frame, repetition_len = %d\n", repetition_len);\r
                                 irmp_tmp_address = last_irmp_address;                   // address is last address\r
                                 irmp_tmp_command = last_irmp_command;                   // command is last command\r
                                 irmp_flags |= IRMP_FLAG_REPETITION;\r
-                                repetition_counter = 0;\r
+                                repetition_len = 0;\r
                             }\r
                             else\r
                             {\r
-                                ANALYZE_PRINTF ("Detected NEC repetition frame, ignoring it: timeout occured, repetition_counter = %d > %d\n",\r
-                                                repetition_counter, NEC_FRAME_REPEAT_PAUSE_LEN_MAX);\r
+                                ANALYZE_PRINTF ("Detected NEC repetition frame, ignoring it: timeout occured, repetition_len = %d > %d\n",\r
+                                                repetition_len, NEC_FRAME_REPEAT_PAUSE_LEN_MAX);\r
                                 irmp_ir_detected = FALSE;\r
                             }\r
                         }\r
 #endif // IRMP_SUPPORT_NEC_PROTOCOL\r
+\r
+#if IRMP_SUPPORT_KASEIKYO_PROTOCOL == 1\r
+                        if (irmp_param.protocol == IRMP_KASEIKYO_PROTOCOL)\r
+                        {\r
+                            uint8_t xor;\r
+                            // ANALYZE_PRINTF ("0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n",\r
+                            //                 xor_check[0], xor_check[1], xor_check[2], xor_check[3], xor_check[4], xor_check[5]);\r
+\r
+                            xor = (xor_check[0] & 0x0F) ^ ((xor_check[0] & 0xF0) >> 4) ^ (xor_check[1] & 0x0F) ^ ((xor_check[1] & 0xF0) >> 4);\r
+\r
+                            if (xor != (xor_check[2] & 0x0F))\r
+                            {\r
+                                ANALYZE_PRINTF ("error 4: wrong XOR check for customer id: 0x%1x 0x%1x\n", xor, xor_check[2] & 0x0F);\r
+                                irmp_ir_detected = FALSE;\r
+                            }\r
+\r
+                            xor = xor_check[2] ^ xor_check[3] ^ xor_check[4];\r
+\r
+                            if (xor != xor_check[5])\r
+                            {\r
+                                ANALYZE_PRINTF ("error 4: wrong XOR check for data bits: 0x%02x 0x%02x\n", xor, xor_check[5]);\r
+                                irmp_ir_detected = FALSE;\r
+                            }\r
+                        }\r
+#endif // IRMP_SUPPORT_KASEIKYO_PROTOCOL == 1\r
+\r
+#if IRMP_SUPPORT_RC6_PROTOCOL == 1\r
+                        if (irmp_param.protocol == IRMP_RC6_PROTOCOL && irmp_param.complete_len == RC6_COMPLETE_DATA_LEN_LONG)     // RC6 mode = 6?\r
+                        {\r
+                            irmp_protocol = IRMP_RC6A_PROTOCOL;\r
+                        }\r
+                        else\r
+#endif // IRMP_SUPPORT_RC6_PROTOCOL == 1\r
+\r
                         irmp_protocol = irmp_param.protocol;\r
 \r
 #if IRMP_SUPPORT_FDC_PROTOCOL == 1\r
@@ -2458,7 +3227,7 @@ irmp_ISR (void)
                 {\r
                     if (last_irmp_command == irmp_command &&\r
                         last_irmp_address == irmp_address &&\r
-                        repetition_counter < IRMP_KEY_REPETITION_LEN)\r
+                        repetition_len < IRMP_KEY_REPETITION_LEN)\r
                     {\r
                         irmp_flags |= IRMP_FLAG_REPETITION;\r
                     }\r
@@ -2466,7 +3235,7 @@ irmp_ISR (void)
                     last_irmp_address = irmp_tmp_address;                           // store as last address, too\r
                     last_irmp_command = irmp_tmp_command;                           // store as last command, too\r
 \r
-                    repetition_counter = 0;\r
+                    repetition_len = 0;\r
                 }\r
                 else\r
                 {\r
@@ -2477,6 +3246,13 @@ irmp_ISR (void)
                 irmp_tmp_command        = 0;\r
                 irmp_pulse_time         = 0;\r
                 irmp_pause_time         = 0;\r
+\r
+#if IRMP_SUPPORT_JVC_PROTOCOL == 1\r
+                if (irmp_protocol == IRMP_JVC_PROTOCOL)                             // the stop bit of JVC frame is also start bit of next frame\r
+                {                                                                   // set pulse time here!\r
+                    irmp_pulse_time = ((uint8_t)(F_INTERRUPTS * JVC_START_BIT_PULSE_TIME));\r
+                }\r
+#endif // IRMP_SUPPORT_JVC_PROTOCOL == 1\r
             }\r
         }\r
     }\r
@@ -2507,7 +3283,7 @@ irmp_ISR (void)
 static void\r
 print_timings (void)\r
 {\r
-    printf ("IRMP_TIMEOUT_LEN:        %d\n", IRMP_TIMEOUT_LEN);\r
+    printf ("IRMP_TIMEOUT_LEN:        %d [%d byte(s)]\n", IRMP_TIMEOUT_LEN, sizeof (PAUSE_LEN));\r
     printf ("IRMP_KEY_REPETITION_LEN  %d\n", IRMP_KEY_REPETITION_LEN);\r
     puts ("");\r
     printf ("PROTOCOL       S  S-PULSE    S-PAUSE    PULSE-0    PAUSE-0    PULSE-1    PAUSE-1\n");\r
@@ -2556,9 +3332,9 @@ print_timings (void)
             DENON_PULSE_LEN_MIN, DENON_PULSE_LEN_MAX, DENON_0_PAUSE_LEN_MIN, DENON_0_PAUSE_LEN_MAX,\r
             DENON_PULSE_LEN_MIN, DENON_PULSE_LEN_MAX, DENON_1_PAUSE_LEN_MIN, DENON_1_PAUSE_LEN_MAX);\r
 \r
-    printf ("RC6            1  %3d - %3d  %3d - %3d  %3d - %3d\n",\r
+    printf ("RC6            1  %3d - %3d  %3d - %3d  %3d - %3d  %3d - %3d\n",\r
             RC6_START_BIT_PULSE_LEN_MIN, RC6_START_BIT_PULSE_LEN_MAX, RC6_START_BIT_PAUSE_LEN_MIN, RC6_START_BIT_PAUSE_LEN_MAX,\r
-            RC6_BIT_LEN_MIN, RC6_BIT_LEN_MAX);\r
+            RC6_BIT_PULSE_LEN_MIN, RC6_BIT_PULSE_LEN_MAX, RC6_BIT_PAUSE_LEN_MIN, RC6_BIT_PAUSE_LEN_MAX);\r
 \r
     printf ("RECS80EXT      1  %3d - %3d  %3d - %3d  %3d - %3d  %3d - %3d  %3d - %3d  %3d - %3d\n",\r
             RECS80EXT_START_BIT_PULSE_LEN_MIN, RECS80EXT_START_BIT_PULSE_LEN_MAX, RECS80EXT_START_BIT_PAUSE_LEN_MIN, RECS80EXT_START_BIT_PAUSE_LEN_MAX,\r
@@ -2591,12 +3367,17 @@ print_timings (void)
             BANG_OLUFSEN_PULSE_LEN_MIN, BANG_OLUFSEN_PULSE_LEN_MAX, BANG_OLUFSEN_1_PAUSE_LEN_MIN, BANG_OLUFSEN_1_PAUSE_LEN_MAX);\r
 \r
     printf ("GRUNDIG/NOKIA  1  %3d - %3d  %3d - %3d  %3d - %3d\n",\r
-            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
-            GRUNDIG_OR_NOKIA_BIT_LEN_MIN, GRUNDIG_OR_NOKIA_BIT_LEN_MAX);\r
-\r
-    printf ("SIEMENS        1  %3d - %3d  %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
-            SIEMENS_BIT_LEN_MIN, SIEMENS_BIT_LEN_MAX);\r
+            GRUNDIG_NOKIA_IR60_START_BIT_LEN_MIN, GRUNDIG_NOKIA_IR60_START_BIT_LEN_MAX,\r
+            GRUNDIG_NOKIA_IR60_PRE_PAUSE_LEN_MIN, GRUNDIG_NOKIA_IR60_PRE_PAUSE_LEN_MAX,\r
+            GRUNDIG_NOKIA_IR60_BIT_LEN_MIN, GRUNDIG_NOKIA_IR60_BIT_LEN_MAX);\r
+\r
+    printf ("SIEMENS/RUWIDO 1  %3d - %3d  %3d - %3d  %3d - %3d  %3d - %3d  %3d - %3d  %3d - %3d\n",\r
+            SIEMENS_OR_RUWIDO_START_BIT_PULSE_LEN_MIN, SIEMENS_OR_RUWIDO_START_BIT_PULSE_LEN_MAX,\r
+            SIEMENS_OR_RUWIDO_START_BIT_PAUSE_LEN_MIN, SIEMENS_OR_RUWIDO_START_BIT_PAUSE_LEN_MAX,\r
+            SIEMENS_OR_RUWIDO_BIT_PULSE_LEN_MIN, SIEMENS_OR_RUWIDO_BIT_PULSE_LEN_MAX,\r
+            SIEMENS_OR_RUWIDO_BIT_PAUSE_LEN_MIN, SIEMENS_OR_RUWIDO_BIT_PAUSE_LEN_MAX,\r
+            2 * SIEMENS_OR_RUWIDO_BIT_PULSE_LEN_MIN, 2 * SIEMENS_OR_RUWIDO_BIT_PULSE_LEN_MAX,\r
+            2 * SIEMENS_OR_RUWIDO_BIT_PAUSE_LEN_MIN, 2 * SIEMENS_OR_RUWIDO_BIT_PAUSE_LEN_MAX);\r
 \r
     printf ("FDC            1  %3d - %3d  %3d - %3d  %3d - %3d  %3d - %3d  %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
@@ -2607,6 +3388,17 @@ print_timings (void)
             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
             RCCAR_PULSE_LEN_MIN, RCCAR_PULSE_LEN_MAX, RCCAR_0_PAUSE_LEN_MIN, RCCAR_0_PAUSE_LEN_MAX,\r
             RCCAR_PULSE_LEN_MIN, RCCAR_PULSE_LEN_MAX, RCCAR_1_PAUSE_LEN_MIN, RCCAR_1_PAUSE_LEN_MAX);\r
+\r
+    printf ("NIKON          1  %3d - %3d  %3d - %3d  %3d - %3d  %3d - %3d  %3d - %3d  %3d - %3d\n",\r
+            NIKON_START_BIT_PULSE_LEN_MIN, NIKON_START_BIT_PULSE_LEN_MAX, NIKON_START_BIT_PAUSE_LEN_MIN, NIKON_START_BIT_PAUSE_LEN_MAX,\r
+            NIKON_PULSE_LEN_MIN, NIKON_PULSE_LEN_MAX, NIKON_0_PAUSE_LEN_MIN, NIKON_0_PAUSE_LEN_MAX,\r
+            NIKON_PULSE_LEN_MIN, NIKON_PULSE_LEN_MAX, NIKON_1_PAUSE_LEN_MIN, NIKON_1_PAUSE_LEN_MAX);\r
+\r
+    printf ("LEGO           1  %3d - %3d  %3d - %3d  %3d - %3d  %3d - %3d  %3d - %3d  %3d - %3d\n",\r
+            LEGO_START_BIT_PULSE_LEN_MIN, LEGO_START_BIT_PULSE_LEN_MAX, LEGO_START_BIT_PAUSE_LEN_MIN, LEGO_START_BIT_PAUSE_LEN_MAX,\r
+            LEGO_PULSE_LEN_MIN, LEGO_PULSE_LEN_MAX, LEGO_0_PAUSE_LEN_MIN, LEGO_0_PAUSE_LEN_MAX,\r
+            LEGO_PULSE_LEN_MIN, LEGO_PULSE_LEN_MAX, LEGO_1_PAUSE_LEN_MIN, LEGO_1_PAUSE_LEN_MAX);\r
+\r
 }\r
 \r
 void\r
@@ -2634,7 +3426,7 @@ print_spectrum (char * text, int * buf, int is_pulse)
         }\r
     }\r
 \r
-    for (i = 0; i < 100; i++)\r
+    for (i = 1; i < 100; i++)\r
     {\r
         if (buf[i] > 0)\r
         {\r
@@ -2793,7 +3585,7 @@ get_fdc_key (uint16_t cmd)
                             case 0x000C: key = '\\';    break;\r
                             case 0x001C: key = '~';     break;\r
                             case 0x002D: key = '|';     break;\r
-                            case 0x0034: key = 'µ';     break;\r
+                            case 0x0034: key = 0xB5;    break; // Mu\r
                         }\r
                     }\r
                     else if (state & (STATE_LEFT_CTRL))\r
@@ -2825,12 +3617,96 @@ get_fdc_key (uint16_t cmd)
     return (key);\r
 }\r
 \r
+static int         analyze = FALSE;\r
+static int         list = FALSE;\r
+static IRMP_DATA   irmp_data;\r
+\r
+static void\r
+next_tick (void)\r
+{\r
+    if (! analyze && ! list)\r
+    {\r
+        (void) irmp_ISR ();\r
+\r
+        if (irmp_get_data (&irmp_data))\r
+        {\r
+            uint8_t key;\r
+\r
+            ANALYZE_ONLY_NORMAL_PUTCHAR (' ');\r
+\r
+            if (verbose)\r
+            {\r
+                printf ("%8d ", time_counter);\r
+            }\r
+\r
+            if (irmp_data.protocol == IRMP_FDC_PROTOCOL && (key = get_fdc_key (irmp_data.command)) != 0)\r
+            {\r
+                if ((key >= 0x20 && key < 0x7F) || key >= 0xA0)\r
+                {\r
+                    printf ("p = %2d, a = 0x%04x, c = 0x%04x, f = 0x%02x, asc = 0x%02x, key = '%c'\n",\r
+                            irmp_data.protocol, irmp_data.address, irmp_data.command, irmp_data.flags, key, key);\r
+                }\r
+                else if (key == '\r' || key == '\t' || key == KEY_ESCAPE || (key >= 0x80 && key <= 0x9F))                 // function keys\r
+                {\r
+                    char * p = (char *) NULL;\r
+\r
+                    switch (key)\r
+                    {\r
+                        case '\t'                : p = "TAB";           break;\r
+                        case '\r'                : p = "CR";            break;\r
+                        case KEY_ESCAPE          : p = "ESCAPE";        break;\r
+                        case KEY_MENUE           : p = "MENUE";         break;\r
+                        case KEY_BACK            : p = "BACK";          break;\r
+                        case KEY_FORWARD         : p = "FORWARD";       break;\r
+                        case KEY_ADDRESS         : p = "ADDRESS";       break;\r
+                        case KEY_WINDOW          : p = "WINDOW";        break;\r
+                        case KEY_1ST_PAGE        : p = "1ST_PAGE";      break;\r
+                        case KEY_STOP            : p = "STOP";          break;\r
+                        case KEY_MAIL            : p = "MAIL";          break;\r
+                        case KEY_FAVORITES       : p = "FAVORITES";     break;\r
+                        case KEY_NEW_PAGE        : p = "NEW_PAGE";      break;\r
+                        case KEY_SETUP           : p = "SETUP";         break;\r
+                        case KEY_FONT            : p = "FONT";          break;\r
+                        case KEY_PRINT           : p = "PRINT";         break;\r
+                        case KEY_ON_OFF          : p = "ON_OFF";        break;\r
+\r
+                        case KEY_INSERT          : p = "INSERT";        break;\r
+                        case KEY_DELETE          : p = "DELETE";        break;\r
+                        case KEY_LEFT            : p = "LEFT";          break;\r
+                        case KEY_HOME            : p = "HOME";          break;\r
+                        case KEY_END             : p = "END";           break;\r
+                        case KEY_UP              : p = "UP";            break;\r
+                        case KEY_DOWN            : p = "DOWN";          break;\r
+                        case KEY_PAGE_UP         : p = "PAGE_UP";       break;\r
+                        case KEY_PAGE_DOWN       : p = "PAGE_DOWN";     break;\r
+                        case KEY_RIGHT           : p = "RIGHT";         break;\r
+                        case KEY_MOUSE_1         : p = "KEY_MOUSE_1";   break;\r
+                        case KEY_MOUSE_2         : p = "KEY_MOUSE_2";   break;\r
+                        default                  : p = "<UNKNWON>";     break;\r
+                    }\r
+\r
+                    printf ("p = %2d, a = 0x%04x, c = 0x%04x, f = 0x%02x, asc = 0x%02x, key = %s\n",\r
+                            irmp_data.protocol, irmp_data.address, irmp_data.command, irmp_data.flags, key, p);\r
+                }\r
+                else\r
+                {\r
+                    printf ("p = %2d, a = 0x%04x, c = 0x%04x, f = 0x%02x, asc = 0x%02x\n",\r
+                            irmp_data.protocol, irmp_data.address, irmp_data.command, irmp_data.flags, key);\r
+                }\r
+            }\r
+            else\r
+            {\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
+\r
 int\r
 main (int argc, char ** argv)\r
 {\r
     int         i;\r
-    int         analyze = FALSE;\r
-    int         list = FALSE;\r
     int         ch;\r
     int         last_ch = 0;\r
     int         pulse = 0;\r
@@ -2844,8 +3720,6 @@ main (int argc, char ** argv)
     int         first_pulse = TRUE;\r
     int         first_pause = TRUE;\r
 \r
-    IRMP_DATA   irmp_data;\r
-\r
     if (argc == 2)\r
     {\r
         if (! strcmp (argv[1], "-v"))\r
@@ -2965,7 +3839,7 @@ main (int argc, char ** argv)
             {\r
                 for (i = 0; i < (int) ((8000.0 * F_INTERRUPTS) / 10000); i++)               // newline: long pause of 800 msec\r
                 {\r
-                    (void) irmp_ISR ();\r
+                    next_tick ();\r
                 }\r
             }\r
             first_pulse = TRUE;\r
@@ -2999,78 +3873,7 @@ main (int argc, char ** argv)
 \r
         last_ch = ch;\r
 \r
-        if (! analyze && ! list)\r
-        {\r
-            (void) irmp_ISR ();\r
-\r
-            if (irmp_get_data (&irmp_data))\r
-            {\r
-                uint8_t key;\r
-\r
-                ANALYZE_ONLY_NORMAL_PUTCHAR (' ');\r
-\r
-                if (irmp_data.protocol == IRMP_FDC_PROTOCOL && (key = get_fdc_key (irmp_data.command)) != 0)\r
-                {\r
-                    if ((key >= 0x20 && key < 0x7F) || key >= 0xA0)\r
-                    {\r
-                        printf ("p = %2d, a = 0x%04x, c = 0x%04x, f = 0x%02x, asc = 0x%02x, key = '%c'\n",\r
-                                irmp_data.protocol, irmp_data.address, irmp_data.command, irmp_data.flags, key, key);\r
-                    }\r
-                    else if (key == '\r' || key == '\t' || key == KEY_ESCAPE || (key >= 0x80 && key <= 0x9F))                 // function keys\r
-                    {\r
-                        char * p = (char *) NULL;\r
-\r
-                        switch (key)\r
-                        {\r
-                            case '\t'                : p = "TAB";           break;\r
-                            case '\r'                : p = "CR";            break;\r
-                            case KEY_ESCAPE          : p = "ESCAPE";        break;\r
-                            case KEY_MENUE           : p = "MENUE";         break;\r
-                            case KEY_BACK            : p = "BACK";          break;\r
-                            case KEY_FORWARD         : p = "FORWARD";       break;\r
-                            case KEY_ADDRESS         : p = "ADDRESS";       break;\r
-                            case KEY_WINDOW          : p = "WINDOW";        break;\r
-                            case KEY_1ST_PAGE        : p = "1ST_PAGE";      break;\r
-                            case KEY_STOP            : p = "STOP";          break;\r
-                            case KEY_MAIL            : p = "MAIL";          break;\r
-                            case KEY_FAVORITES       : p = "FAVORITES";     break;\r
-                            case KEY_NEW_PAGE        : p = "NEW_PAGE";      break;\r
-                            case KEY_SETUP           : p = "SETUP";         break;\r
-                            case KEY_FONT            : p = "FONT";          break;\r
-                            case KEY_PRINT           : p = "PRINT";         break;\r
-                            case KEY_ON_OFF          : p = "ON_OFF";        break;\r
-\r
-                            case KEY_INSERT          : p = "INSERT";        break;\r
-                            case KEY_DELETE          : p = "DELETE";        break;\r
-                            case KEY_LEFT            : p = "LEFT";          break;\r
-                            case KEY_HOME            : p = "HOME";          break;\r
-                            case KEY_END             : p = "END";           break;\r
-                            case KEY_UP              : p = "UP";            break;\r
-                            case KEY_DOWN            : p = "DOWN";          break;\r
-                            case KEY_PAGE_UP         : p = "PAGE_UP";       break;\r
-                            case KEY_PAGE_DOWN       : p = "PAGE_DOWN";     break;\r
-                            case KEY_RIGHT           : p = "RIGHT";         break;\r
-                            case KEY_MOUSE_1         : p = "KEY_MOUSE_1";   break;\r
-                            case KEY_MOUSE_2         : p = "KEY_MOUSE_2";   break;\r
-                            default                  : p = "<UNKNWON>";     break;\r
-                        }\r
-\r
-                        printf ("p = %2d, a = 0x%04x, c = 0x%04x, f = 0x%02x, asc = 0x%02x, key = %s\n",\r
-                                irmp_data.protocol, irmp_data.address, irmp_data.command, irmp_data.flags, key, p);\r
-                    }\r
-                    else\r
-                    {\r
-                        printf ("p = %2d, a = 0x%04x, c = 0x%04x, f = 0x%02x, asc = 0x%02x\n",\r
-                                irmp_data.protocol, irmp_data.address, irmp_data.command, irmp_data.flags, key);\r
-                    }\r
-                }\r
-                else\r
-                {\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
+        next_tick ();\r
     }\r
 \r
     if (analyze)\r