]> cloudbase.mooo.com Git - irmp.git/blobdiff - irsnd.c
version 2.0.0-pre3: changed handling of double width pulses/pauses in manchester...
[irmp.git] / irsnd.c
diff --git a/irsnd.c b/irsnd.c
index efae8e4e6288adb2afeb1a397f961e2547799960..fb7e449a93ece0492393acb9811ea4416dd183a7 100644 (file)
--- a/irsnd.c
+++ b/irsnd.c
@@ -1,9 +1,9 @@
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
  * @file irsnd.c\r
  *\r
- * Copyright (c) 2010 Frank Meyer - frank(at)fli4l.de\r
+ * Copyright (c) 2010-2011 Frank Meyer - frank(at)fli4l.de\r
  *\r
- * $Id: irsnd.c,v 1.28 2011/01/13 15:54:57 fm Exp $\r
+ * $Id: irsnd.c,v 1.36 2011/04/20 09:09:48 fm Exp $\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
@@ -30,8 +30,8 @@
 #include <string.h>\r
 \r
 #define F_CPU 8000000L\r
-typedef unsigned char    uint8_t;\r
-typedef unsigned short    uint16_t;\r
+typedef unsigned char   uint8_t;\r
+typedef unsigned short  uint16_t;\r
 #define DEBUG\r
 \r
 #else\r
@@ -54,12 +54,83 @@ typedef unsigned short    uint16_t;
 #include "irsndconfig.h"\r
 #include "irsnd.h"\r
 \r
+/*---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ *  ATmega pin definition of OC2 / OC2A / OC2B\r
+ *---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ */\r
+#if defined (__AVR_ATmega8__)                           // ATmega8 uses OC2 = PB3\r
+#undef  IRSND_OC2                                       // has no OC2A / OC2B\r
+#define IRSND_OC2                               0       // magic: use OC2\r
+#define IRSND_PORT                              PORTB   // port B\r
+#define IRSND_DDR                               DDRB    // ddr B\r
+#define IRSND_BIT                               3       // OC2A\r
+\r
+#elif defined (__AVR_ATmega16__)    \\r
+  ||  defined (__AVR_ATmega32__)                        // ATmega16|32 uses OC2 = PD7\r
+#undef  IRSND_OC2                                       // has no OC2A / OC2B\r
+#define IRSND_OC2                               0       // magic: use OC2\r
+#define IRSND_PORT                              PORTD   // port D\r
+#define IRSND_DDR                               DDRD    // ddr D\r
+#define IRSND_BIT                               7       // OC2\r
+\r
+#elif defined (__AVR_ATmega162__)                       // ATmega162 uses OC2 = PB1\r
+#undef  IRSND_OC2                                       // has no OC2A / OC2B\r
+#define IRSND_OC2                               0       // magic: use OC2\r
+#define IRSND_PORT                              PORTB   // port B\r
+#define IRSND_DDR                               DDRB    // ddr B\r
+#define IRSND_BIT                               1       // OC2\r
+\r
+#elif defined (__AVR_ATmega164__)   \\r
+   || defined (__AVR_ATmega324__)   \\r
+   || defined (__AVR_ATmega644__)   \\r
+   || defined (__AVR_ATmega644P__)  \\r
+   || defined (__AVR_ATmega1284__)                      // ATmega164|324|644|644P|1284 uses OC2A = PD7 or OC2B = PD6\r
+#if IRSND_OC2 == 1                                      // OC2A\r
+#define IRSND_PORT                              PORTD   // port D\r
+#define IRSND_DDR                               DDRD    // ddr D\r
+#define IRSND_BIT                               7       // OC2A\r
+#elif IRSND_OC2 == 2                                    // OC2B\r
+#define IRSND_PORT                              PORTD   // port D\r
+#define IRSND_DDR                               DDRD    // ddr D\r
+#define IRSND_BIT                               6       // OC2B\r
+#else\r
+#error Wrong value for IRSND_OC2, choose 1 or 2 in irsndconfig.h\r
+#endif // IRSND_OC2\r
+\r
+#elif defined (__AVR_ATmega48__)    \\r
+   || defined (__AVR_ATmega88__)    \\r
+   || defined (__AVR_ATmega168__)   \\r
+   || defined (__AVR_ATmega168__)   \\r
+   || defined (__AVR_ATmega328__)   \\r
+   || defined (__AVR_ATmega328P__)                      // ATmega48|88|168|328P uses OC2A = PB3 or OC2B = PD3\r
+#if IRSND_OC2 == 1                                      // OC2A\r
+#define IRSND_PORT                              PORTB   // port B\r
+#define IRSND_DDR                               DDRB    // ddr B\r
+#define IRSND_BIT                               3       // OC2A\r
+#elif IRSND_OC2 == 2                                    // OC2B\r
+#define IRSND_PORT                              PORTD   // port D\r
+#define IRSND_DDR                               DDRD    // ddr D\r
+#define IRSND_BIT                               3       // OC2B\r
+#else\r
+#error Wrong value for IRSND_OC2, choose 1 or 2 in irsndconfig.h\r
+#endif // IRSND_OC2\r
+\r
+#else\r
+#if !defined (unix) && !defined (WIN32)\r
+#error OC2A/OC2B not defined, please fill in definitions here.\r
+#endif // unix, WIN32\r
+#endif // __AVR...\r
+\r
 #if IRSND_SUPPORT_NIKON_PROTOCOL == 1\r
 typedef uint16_t    IRSND_PAUSE_LEN;\r
 #else\r
 typedef uint8_t     IRSND_PAUSE_LEN;\r
 #endif\r
 \r
+/*---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ *  IR timings\r
+ *---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ */\r
 #define SIRCS_START_BIT_PULSE_LEN               (uint8_t)(F_INTERRUPTS * SIRCS_START_BIT_PULSE_TIME + 0.5)\r
 #define SIRCS_START_BIT_PAUSE_LEN               (uint8_t)(F_INTERRUPTS * SIRCS_START_BIT_PAUSE_TIME + 0.5)\r
 #define SIRCS_1_PULSE_LEN                       (uint8_t)(F_INTERRUPTS * SIRCS_1_PULSE_TIME + 0.5)\r
@@ -153,15 +224,15 @@ typedef uint8_t     IRSND_PAUSE_LEN;
 #define BANG_OLUFSEN_TRAILER_BIT_PAUSE_LEN      (uint8_t)(F_INTERRUPTS * BANG_OLUFSEN_TRAILER_BIT_PAUSE_TIME + 0.5)\r
 #define BANG_OLUFSEN_FRAME_REPEAT_PAUSE_LEN     (uint16_t)(F_INTERRUPTS * BANG_OLUFSEN_FRAME_REPEAT_PAUSE_TIME + 0.5)       // use uint16_t!\r
 \r
-#define GRUNDIG_OR_NOKIA_PRE_PAUSE_LEN          (uint8_t)(F_INTERRUPTS * GRUNDIG_OR_NOKIA_PRE_PAUSE_TIME + 0.5)\r
-#define GRUNDIG_OR_NOKIA_BIT_LEN                (uint8_t)(F_INTERRUPTS * GRUNDIG_OR_NOKIA_BIT_TIME + 0.5)\r
+#define GRUNDIG_NOKIA_IR60_PRE_PAUSE_LEN  (uint8_t)(F_INTERRUPTS * GRUNDIG_NOKIA_IR60_PRE_PAUSE_TIME + 0.5)\r
+#define GRUNDIG_NOKIA_IR60_BIT_LEN        (uint8_t)(F_INTERRUPTS * GRUNDIG_NOKIA_IR60_BIT_TIME + 0.5)\r
 #define GRUNDIG_AUTO_REPETITION_PAUSE_LEN       (uint16_t)(F_INTERRUPTS * GRUNDIG_AUTO_REPETITION_PAUSE_TIME + 0.5)         // use uint16_t!\r
 #define NOKIA_AUTO_REPETITION_PAUSE_LEN         (uint16_t)(F_INTERRUPTS * NOKIA_AUTO_REPETITION_PAUSE_TIME + 0.5)           // use uint16_t!\r
-#define GRUNDIG_OR_NOKIA_FRAME_REPEAT_PAUSE_LEN (uint16_t)(F_INTERRUPTS * GRUNDIG_OR_NOKIA_FRAME_REPEAT_PAUSE_TIME + 0.5)   // use uint16_t!\r
+#define GRUNDIG_NOKIA_IR60_FRAME_REPEAT_PAUSE_LEN (uint16_t)(F_INTERRUPTS * GRUNDIG_NOKIA_IR60_FRAME_REPEAT_PAUSE_TIME + 0.5)   // use uint16_t!\r
 \r
-#define SIEMENS_START_BIT_LEN                   (uint8_t)(F_INTERRUPTS * SIEMENS_BIT_TIME + 0.5)\r
-#define SIEMENS_BIT_LEN                         (uint8_t)(F_INTERRUPTS * SIEMENS_BIT_TIME + 0.5)\r
-#define SIEMENS_FRAME_REPEAT_PAUSE_LEN          (uint16_t)(F_INTERRUPTS * SIEMENS_FRAME_REPEAT_PAUSE_TIME + 0.5)            // use uint16_t!\r
+#define SIEMENS_START_BIT_LEN                   (uint8_t)(F_INTERRUPTS * SIEMENS_OR_RUWIDO_START_BIT_PULSE_TIME + 0.5)\r
+#define SIEMENS_BIT_LEN                         (uint8_t)(F_INTERRUPTS * SIEMENS_OR_RUWIDO_BIT_PULSE_TIME + 0.5)\r
+#define SIEMENS_FRAME_REPEAT_PAUSE_LEN          (uint16_t)(F_INTERRUPTS * SIEMENS_OR_RUWIDO_FRAME_REPEAT_PAUSE_TIME + 0.5)  // use uint16_t!\r
 \r
 #define IRSND_FREQ_32_KHZ                       (uint8_t) ((F_CPU / 32000 / 2) - 1)\r
 #define IRSND_FREQ_36_KHZ                       (uint8_t) ((F_CPU / 36000 / 2) - 1)\r
@@ -198,7 +269,15 @@ typedef uint8_t     IRSND_PAUSE_LEN;
 #define NIKON_PULSE_LEN                         (uint8_t)(F_INTERRUPTS * NIKON_PULSE_TIME + 0.5)\r
 #define NIKON_1_PAUSE_LEN                       (uint8_t)(F_INTERRUPTS * NIKON_1_PAUSE_TIME + 0.5)\r
 #define NIKON_0_PAUSE_LEN                       (uint8_t)(F_INTERRUPTS * NIKON_0_PAUSE_TIME + 0.5)\r
-#define NIKON_FRAME_REPEAT_PAUSE_LEN            (uint16_t)(F_INTERRUPTS * NIKON_FRAME_REPEAT_PAUSE_TIME + 0.5)                // use uint16_t!\r
+#define NIKON_FRAME_REPEAT_PAUSE_LEN            (uint16_t)(F_INTERRUPTS * NIKON_FRAME_REPEAT_PAUSE_TIME + 0.5)              // use uint16_t!\r
+\r
+#define LEGO_START_BIT_PULSE_LEN                (uint8_t)(F_INTERRUPTS * LEGO_START_BIT_PULSE_TIME + 0.5)\r
+#define LEGO_START_BIT_PAUSE_LEN                (uint8_t)(F_INTERRUPTS * LEGO_START_BIT_PAUSE_TIME + 0.5)\r
+#define LEGO_REPEAT_START_BIT_PAUSE_LEN         (uint8_t)(F_INTERRUPTS * LEGO_REPEAT_START_BIT_PAUSE_TIME + 0.5)\r
+#define LEGO_PULSE_LEN                          (uint8_t)(F_INTERRUPTS * LEGO_PULSE_TIME + 0.5)\r
+#define LEGO_1_PAUSE_LEN                        (uint8_t)(F_INTERRUPTS * LEGO_1_PAUSE_TIME + 0.5)\r
+#define LEGO_0_PAUSE_LEN                        (uint8_t)(F_INTERRUPTS * LEGO_0_PAUSE_TIME + 0.5)\r
+#define LEGO_FRAME_REPEAT_PAUSE_LEN             (uint16_t)(F_INTERRUPTS * LEGO_FRAME_REPEAT_PAUSE_TIME + 0.5)               // use uint16_t!\r
 \r
 static volatile uint8_t                         irsnd_busy;\r
 static volatile uint8_t                         irsnd_protocol;\r
@@ -206,6 +285,10 @@ static volatile uint8_t                         irsnd_buffer[6];
 static volatile uint8_t                         irsnd_repeat;\r
 static volatile uint8_t                         irsnd_is_on = FALSE;\r
 \r
+#if IRSND_USE_CALLBACK == 1\r
+static void                                     (*irsnd_callback_ptr) (uint8_t);\r
+#endif // IRSND_USE_CALLBACK == 1\r
+\r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
  *  Switch PWM on\r
  *  @details  Switches PWM on with a narrow spike on all 3 channels -> leds glowing\r
@@ -217,12 +300,22 @@ irsnd_on (void)
     if (! irsnd_is_on)\r
     {\r
 #ifndef DEBUG\r
-#if defined (__AVR_ATmega32__)\r
-        TCCR2 |= (1<<COM20)|(1<<WGM21);                 // = 0x42: toggle OC2A on compare match, clear Timer 2 at compare match OCR2A\r
-#else\r
-        TCCR2A |= (1<<COM2A0)|(1<<WGM21);               // = 0x42: toggle OC2A on compare match, clear Timer 2 at compare match OCR2A\r
-#endif  // __AVR...\r
+#if   IRSND_OC2 == 0                                    // use OC2\r
+        TCCR2 |= (1<<COM20)|(1<<WGM21);                 // toggle OC2 on compare match, clear Timer 2 at compare match OCR2\r
+#elif IRSND_OC2 == 1                                    // use OC2A\r
+        TCCR2A |= (1<<COM2A0)|(1<<WGM21);               // toggle OC2A on compare match, clear Timer 2 at compare match OCR2A\r
+#else                                                   // use OC2B\r
+        TCCR2A |= (1<<COM2B0)|(1<<WGM21);               // toggle OC2B on compare match, clear Timer 2 at compare match OCR2A (yes: A, not B!)\r
+#endif // IRSND_OC2\r
 #endif // DEBUG\r
+\r
+#if IRSND_USE_CALLBACK == 1\r
+        if (irsnd_callback_ptr)\r
+        {\r
+            (*irsnd_callback_ptr) (TRUE);\r
+        }\r
+#endif // IRSND_USE_CALLBACK == 1\r
+\r
         irsnd_is_on = TRUE;\r
     }\r
 }\r
@@ -238,13 +331,23 @@ irsnd_off (void)
     if (irsnd_is_on)\r
     {\r
 #ifndef DEBUG\r
-#if defined (__AVR_ATmega32__)\r
-        TCCR2 &= ~(1<<COM20);                                                           // normal port operation, OC2A disconnected.\r
-#else\r
-        TCCR2A &= ~(1<<COM2A0);                                                         // normal port operation, OC2A disconnected.\r
-#endif  // __AVR...\r
-        IRSND_PORT  &= ~(1<<IRSND_BIT);                                                 // set IRSND_BIT to low\r
+#if   IRSND_OC2 == 0                                    // use OC2\r
+        TCCR2 &= ~(1<<COM20);                           // normal port operation, OC2 disconnected.\r
+#elif IRSND_OC2 == 1                                    // use OC2A\r
+        TCCR2A &= ~(1<<COM2A0);                         // normal port operation, OC2A disconnected.\r
+#else                                                   // use OC2B\r
+        TCCR2A &= ~(1<<COM2B0);                         // normal port operation, OC2B disconnected.\r
+#endif // IRSND_OC2\r
+        IRSND_PORT  &= ~(1<<IRSND_BIT);                 // set IRSND_BIT to low\r
 #endif // DEBUG\r
+\r
+#if IRSND_USE_CALLBACK == 1\r
+        if (irsnd_callback_ptr)\r
+        {\r
+           (*irsnd_callback_ptr) (FALSE);\r
+        }\r
+#endif // IRSND_USE_CALLBACK == 1\r
+\r
         irsnd_is_on = FALSE;\r
     }\r
 }\r
@@ -258,11 +361,11 @@ static void
 irsnd_set_freq (uint8_t freq)\r
 {\r
 #ifndef DEBUG\r
-#if defined (__AVR_ATmega32__)\r
-    OCR2 = freq;\r
+#if IRSND_OC2 == 0\r
+    OCR2 = freq;                                                                        // use register OCR2 for OC2\r
 #else\r
-    OCR2A = freq;\r
-#endif  // __AVR...\r
+    OCR2A = freq;                                                                       // use register OCR2A for OC2A and OC2B!\r
+#endif\r
 #endif // DEBUG\r
 }\r
 \r
@@ -290,6 +393,14 @@ irsnd_init (void)
 #endif // DEBUG\r
 }\r
 \r
+#if IRSND_USE_CALLBACK == 1\r
+void\r
+irsnd_set_callback_ptr (void (*cb)(uint8_t))\r
+{\r
+    irsnd_callback_ptr = cb;\r
+}\r
+#endif // IRSND_USE_CALLBACK == 1\r
+\r
 uint8_t\r
 irsnd_is_busy (void)\r
 {\r
@@ -331,7 +442,7 @@ irsnd_send_data (IRMP_DATA * irmp_data_p, uint8_t do_wait)
 #if IRSND_SUPPORT_RC5_PROTOCOL == 1\r
     static uint8_t  toggle_bit_rc5;\r
 #endif\r
-#if IRSND_SUPPORT_RC5_PROTOCOL == 1\r
+#if IRSND_SUPPORT_RC6_PROTOCOL == 1 || IRSND_SUPPORT_RC6A_PROTOCOL == 1\r
     static uint8_t  toggle_bit_rc6;\r
 #endif\r
     uint16_t        address;\r
@@ -671,6 +782,19 @@ irsnd_send_data (IRMP_DATA * irmp_data_p, uint8_t do_wait)
             irsnd_busy      = TRUE;\r
             break;\r
         }\r
+#endif\r
+#if IRSND_SUPPORT_LEGO_PROTOCOL == 1\r
+        case IRMP_LEGO_PROTOCOL:\r
+        {\r
+            uint8_t crc = 0x0F ^ ((irmp_data_p->command & 0x0F00) >> 8) ^ ((irmp_data_p->command & 0x00F0) >> 4) ^ (irmp_data_p->command & 0x000F);\r
+\r
+            irsnd_buffer[0] = (irmp_data_p->command & 0x0FF0) >> 4;                                             // CCCCCCCC\r
+            irsnd_buffer[1] = ((irmp_data_p->command & 0x000F) << 4) | crc;                                     // CCCCcccc\r
+\r
+            irsnd_protocol = IRMP_LEGO_PROTOCOL;\r
+            irsnd_busy      = TRUE;\r
+            break;\r
+        }\r
 #endif\r
         default:\r
         {\r
@@ -795,11 +919,11 @@ irsnd_ISR (void)
                     case IRMP_SIRCS_PROTOCOL:\r
                     {\r
                         startbit_pulse_len          = SIRCS_START_BIT_PULSE_LEN;\r
-                        startbit_pause_len          = SIRCS_START_BIT_PAUSE_LEN;\r
+                        startbit_pause_len          = SIRCS_START_BIT_PAUSE_LEN - 1;\r
                         pulse_1_len                 = SIRCS_1_PULSE_LEN;\r
-                        pause_1_len                 = SIRCS_PAUSE_LEN;\r
+                        pause_1_len                 = SIRCS_PAUSE_LEN - 1;\r
                         pulse_0_len                 = SIRCS_0_PULSE_LEN;\r
-                        pause_0_len                 = SIRCS_PAUSE_LEN;\r
+                        pause_0_len                 = SIRCS_PAUSE_LEN - 1;\r
                         has_stop_bit                = SIRCS_STOP_BIT;\r
                         complete_data_len           = SIRCS_MINIMUM_DATA_LEN + sircs_additional_bitlen;\r
                         n_auto_repetitions          = (repeat_counter == 0) ? SIRCS_FRAMES : 1;     // 3 frames auto repetition if first frame\r
@@ -816,19 +940,19 @@ irsnd_ISR (void)
 \r
                         if (repeat_counter > 0)\r
                         {\r
-                            startbit_pause_len      = NEC_REPEAT_START_BIT_PAUSE_LEN;\r
+                            startbit_pause_len      = NEC_REPEAT_START_BIT_PAUSE_LEN - 1;\r
                             complete_data_len       = 0;\r
                         }\r
                         else\r
                         {\r
-                            startbit_pause_len      = NEC_START_BIT_PAUSE_LEN;\r
+                            startbit_pause_len      = NEC_START_BIT_PAUSE_LEN - 1;\r
                             complete_data_len       = NEC_COMPLETE_DATA_LEN;\r
                         }\r
 \r
                         pulse_1_len                 = NEC_PULSE_LEN;\r
-                        pause_1_len                 = NEC_1_PAUSE_LEN;\r
+                        pause_1_len                 = NEC_1_PAUSE_LEN - 1;\r
                         pulse_0_len                 = NEC_PULSE_LEN;\r
-                        pause_0_len                 = NEC_0_PAUSE_LEN;\r
+                        pause_0_len                 = NEC_0_PAUSE_LEN - 1;\r
                         has_stop_bit                = NEC_STOP_BIT;\r
                         n_auto_repetitions          = 1;                                            // 1 frame\r
                         auto_repetition_pause_len   = 0;\r
@@ -841,11 +965,11 @@ irsnd_ISR (void)
                     case IRMP_SAMSUNG_PROTOCOL:\r
                     {\r
                         startbit_pulse_len          = SAMSUNG_START_BIT_PULSE_LEN;\r
-                        startbit_pause_len          = SAMSUNG_START_BIT_PAUSE_LEN;\r
+                        startbit_pause_len          = SAMSUNG_START_BIT_PAUSE_LEN - 1;\r
                         pulse_1_len                 = SAMSUNG_PULSE_LEN;\r
-                        pause_1_len                 = SAMSUNG_1_PAUSE_LEN;\r
+                        pause_1_len                 = SAMSUNG_1_PAUSE_LEN - 1;\r
                         pulse_0_len                 = SAMSUNG_PULSE_LEN;\r
-                        pause_0_len                 = SAMSUNG_0_PAUSE_LEN;\r
+                        pause_0_len                 = SAMSUNG_0_PAUSE_LEN - 1;\r
                         has_stop_bit                = SAMSUNG_STOP_BIT;\r
                         complete_data_len           = SAMSUNG_COMPLETE_DATA_LEN;\r
                         n_auto_repetitions          = 1;                                            // 1 frame\r
@@ -858,11 +982,11 @@ irsnd_ISR (void)
                     case IRMP_SAMSUNG32_PROTOCOL:\r
                     {\r
                         startbit_pulse_len          = SAMSUNG_START_BIT_PULSE_LEN;\r
-                        startbit_pause_len          = SAMSUNG_START_BIT_PAUSE_LEN;\r
+                        startbit_pause_len          = SAMSUNG_START_BIT_PAUSE_LEN - 1;\r
                         pulse_1_len                 = SAMSUNG_PULSE_LEN;\r
-                        pause_1_len                 = SAMSUNG_1_PAUSE_LEN;\r
+                        pause_1_len                 = SAMSUNG_1_PAUSE_LEN - 1;\r
                         pulse_0_len                 = SAMSUNG_PULSE_LEN;\r
-                        pause_0_len                 = SAMSUNG_0_PAUSE_LEN;\r
+                        pause_0_len                 = SAMSUNG_0_PAUSE_LEN - 1;\r
                         has_stop_bit                = SAMSUNG_STOP_BIT;\r
                         complete_data_len           = SAMSUNG32_COMPLETE_DATA_LEN;\r
                         n_auto_repetitions          = SAMSUNG32_FRAMES;                             // 2 frames\r
@@ -876,11 +1000,11 @@ irsnd_ISR (void)
                     case IRMP_MATSUSHITA_PROTOCOL:\r
                     {\r
                         startbit_pulse_len          = MATSUSHITA_START_BIT_PULSE_LEN;\r
-                        startbit_pause_len          = MATSUSHITA_START_BIT_PAUSE_LEN;\r
+                        startbit_pause_len          = MATSUSHITA_START_BIT_PAUSE_LEN - 1;\r
                         pulse_1_len                 = MATSUSHITA_PULSE_LEN;\r
-                        pause_1_len                 = MATSUSHITA_1_PAUSE_LEN;\r
+                        pause_1_len                 = MATSUSHITA_1_PAUSE_LEN - 1;\r
                         pulse_0_len                 = MATSUSHITA_PULSE_LEN;\r
-                        pause_0_len                 = MATSUSHITA_0_PAUSE_LEN;\r
+                        pause_0_len                 = MATSUSHITA_0_PAUSE_LEN - 1;\r
                         has_stop_bit                = MATSUSHITA_STOP_BIT;\r
                         complete_data_len           = MATSUSHITA_COMPLETE_DATA_LEN;\r
                         n_auto_repetitions          = 1;                                            // 1 frame\r
@@ -894,11 +1018,11 @@ irsnd_ISR (void)
                     case IRMP_KASEIKYO_PROTOCOL:\r
                     {\r
                         startbit_pulse_len          = KASEIKYO_START_BIT_PULSE_LEN;\r
-                        startbit_pause_len          = KASEIKYO_START_BIT_PAUSE_LEN;\r
+                        startbit_pause_len          = KASEIKYO_START_BIT_PAUSE_LEN - 1;\r
                         pulse_1_len                 = KASEIKYO_PULSE_LEN;\r
-                        pause_1_len                 = KASEIKYO_1_PAUSE_LEN;\r
+                        pause_1_len                 = KASEIKYO_1_PAUSE_LEN - 1;\r
                         pulse_0_len                 = KASEIKYO_PULSE_LEN;\r
-                        pause_0_len                 = KASEIKYO_0_PAUSE_LEN;\r
+                        pause_0_len                 = KASEIKYO_0_PAUSE_LEN - 1;\r
                         has_stop_bit                = KASEIKYO_STOP_BIT;\r
                         complete_data_len           = KASEIKYO_COMPLETE_DATA_LEN;\r
                         n_auto_repetitions          = (repeat_counter == 0) ? KASEIKYO_FRAMES : 1;  // 2 frames auto repetition if first frame\r
@@ -912,11 +1036,11 @@ irsnd_ISR (void)
                     case IRMP_RECS80_PROTOCOL:\r
                     {\r
                         startbit_pulse_len          = RECS80_START_BIT_PULSE_LEN;\r
-                        startbit_pause_len          = RECS80_START_BIT_PAUSE_LEN;\r
+                        startbit_pause_len          = RECS80_START_BIT_PAUSE_LEN - 1;\r
                         pulse_1_len                 = RECS80_PULSE_LEN;\r
-                        pause_1_len                 = RECS80_1_PAUSE_LEN;\r
+                        pause_1_len                 = RECS80_1_PAUSE_LEN - 1;\r
                         pulse_0_len                 = RECS80_PULSE_LEN;\r
-                        pause_0_len                 = RECS80_0_PAUSE_LEN;\r
+                        pause_0_len                 = RECS80_0_PAUSE_LEN - 1;\r
                         has_stop_bit                = RECS80_STOP_BIT;\r
                         complete_data_len           = RECS80_COMPLETE_DATA_LEN;\r
                         n_auto_repetitions          = 1;                                            // 1 frame\r
@@ -930,11 +1054,11 @@ irsnd_ISR (void)
                     case IRMP_RECS80EXT_PROTOCOL:\r
                     {\r
                         startbit_pulse_len          = RECS80EXT_START_BIT_PULSE_LEN;\r
-                        startbit_pause_len          = RECS80EXT_START_BIT_PAUSE_LEN;\r
+                        startbit_pause_len          = RECS80EXT_START_BIT_PAUSE_LEN - 1;\r
                         pulse_1_len                 = RECS80EXT_PULSE_LEN;\r
-                        pause_1_len                 = RECS80EXT_1_PAUSE_LEN;\r
+                        pause_1_len                 = RECS80EXT_1_PAUSE_LEN - 1;\r
                         pulse_0_len                 = RECS80EXT_PULSE_LEN;\r
-                        pause_0_len                 = RECS80EXT_0_PAUSE_LEN;\r
+                        pause_0_len                 = RECS80EXT_0_PAUSE_LEN - 1;\r
                         has_stop_bit                = RECS80EXT_STOP_BIT;\r
                         complete_data_len           = RECS80EXT_COMPLETE_DATA_LEN;\r
                         n_auto_repetitions          = 1;                                            // 1 frame\r
@@ -964,7 +1088,7 @@ irsnd_ISR (void)
                     case IRMP_RC6_PROTOCOL:\r
                     {\r
                         startbit_pulse_len          = RC6_START_BIT_PULSE_LEN;\r
-                        startbit_pause_len          = RC6_START_BIT_PAUSE_LEN;\r
+                        startbit_pause_len          = RC6_START_BIT_PAUSE_LEN - 1;\r
                         pulse_len                   = RC6_BIT_LEN;\r
                         pause_len                   = RC6_BIT_LEN;\r
                         has_stop_bit                = RC6_STOP_BIT;\r
@@ -980,7 +1104,7 @@ irsnd_ISR (void)
                     case IRMP_RC6A_PROTOCOL:\r
                     {\r
                         startbit_pulse_len          = RC6_START_BIT_PULSE_LEN;\r
-                        startbit_pause_len          = RC6_START_BIT_PAUSE_LEN;\r
+                        startbit_pause_len          = RC6_START_BIT_PAUSE_LEN - 1;\r
                         pulse_len                   = RC6_BIT_LEN;\r
                         pause_len                   = RC6_BIT_LEN;\r
                         has_stop_bit                = RC6_STOP_BIT;\r
@@ -998,15 +1122,15 @@ irsnd_ISR (void)
                         startbit_pulse_len          = 0x00;\r
                         startbit_pause_len          = 0x00;\r
                         pulse_1_len                 = DENON_PULSE_LEN;\r
-                        pause_1_len                 = DENON_1_PAUSE_LEN;\r
+                        pause_1_len                 = DENON_1_PAUSE_LEN - 1;\r
                         pulse_0_len                 = DENON_PULSE_LEN;\r
-                        pause_0_len                 = DENON_0_PAUSE_LEN;\r
+                        pause_0_len                 = DENON_0_PAUSE_LEN - 1;\r
                         has_stop_bit                = DENON_STOP_BIT;\r
                         complete_data_len           = DENON_COMPLETE_DATA_LEN;\r
                         n_auto_repetitions          = DENON_FRAMES;                                 // 2 frames, 2nd with inverted command\r
                         auto_repetition_pause_len   = DENON_AUTO_REPETITION_PAUSE_LEN;              // 65 ms pause after 1st frame\r
                         repeat_frame_pause_len      = DENON_FRAME_REPEAT_PAUSE_LEN;\r
-                        irsnd_set_freq (IRSND_FREQ_32_KHZ);\r
+                        irsnd_set_freq (IRSND_FREQ_36_KHZ);                                         // in theory 32kHz, in practice 36kHz is better\r
                         break;\r
                     }\r
 #endif\r
@@ -1014,11 +1138,11 @@ irsnd_ISR (void)
                     case IRMP_NUBERT_PROTOCOL:\r
                     {\r
                         startbit_pulse_len          = NUBERT_START_BIT_PULSE_LEN;\r
-                        startbit_pause_len          = NUBERT_START_BIT_PAUSE_LEN;\r
+                        startbit_pause_len          = NUBERT_START_BIT_PAUSE_LEN - 1;\r
                         pulse_1_len                 = NUBERT_1_PULSE_LEN;\r
-                        pause_1_len                 = NUBERT_1_PAUSE_LEN;\r
+                        pause_1_len                 = NUBERT_1_PAUSE_LEN - 1;\r
                         pulse_0_len                 = NUBERT_0_PULSE_LEN;\r
-                        pause_0_len                 = NUBERT_0_PAUSE_LEN;\r
+                        pause_0_len                 = NUBERT_0_PAUSE_LEN - 1;\r
                         has_stop_bit                = NUBERT_STOP_BIT;\r
                         complete_data_len           = NUBERT_COMPLETE_DATA_LEN;\r
                         n_auto_repetitions          = NUBERT_FRAMES;                                // 2 frames\r
@@ -1032,11 +1156,11 @@ irsnd_ISR (void)
                     case IRMP_BANG_OLUFSEN_PROTOCOL:\r
                     {\r
                         startbit_pulse_len          = BANG_OLUFSEN_START_BIT1_PULSE_LEN;\r
-                        startbit_pause_len          = BANG_OLUFSEN_START_BIT1_PAUSE_LEN;\r
+                        startbit_pause_len          = BANG_OLUFSEN_START_BIT1_PAUSE_LEN - 1;\r
                         pulse_1_len                 = BANG_OLUFSEN_PULSE_LEN;\r
-                        pause_1_len                 = BANG_OLUFSEN_1_PAUSE_LEN;\r
+                        pause_1_len                 = BANG_OLUFSEN_1_PAUSE_LEN - 1;\r
                         pulse_0_len                 = BANG_OLUFSEN_PULSE_LEN;\r
-                        pause_0_len                 = BANG_OLUFSEN_0_PAUSE_LEN;\r
+                        pause_0_len                 = BANG_OLUFSEN_0_PAUSE_LEN - 1;\r
                         has_stop_bit                = BANG_OLUFSEN_STOP_BIT;\r
                         complete_data_len           = BANG_OLUFSEN_COMPLETE_DATA_LEN;\r
                         n_auto_repetitions          = 1;                                            // 1 frame\r
@@ -1050,15 +1174,15 @@ irsnd_ISR (void)
 #if IRSND_SUPPORT_GRUNDIG_PROTOCOL == 1\r
                     case IRMP_GRUNDIG_PROTOCOL:\r
                     {\r
-                        startbit_pulse_len          = GRUNDIG_OR_NOKIA_BIT_LEN;\r
-                        startbit_pause_len          = GRUNDIG_OR_NOKIA_PRE_PAUSE_LEN;\r
-                        pulse_len                   = GRUNDIG_OR_NOKIA_BIT_LEN;\r
-                        pause_len                   = GRUNDIG_OR_NOKIA_BIT_LEN;\r
-                        has_stop_bit                = GRUNDIG_OR_NOKIA_STOP_BIT;\r
+                        startbit_pulse_len          = GRUNDIG_NOKIA_IR60_BIT_LEN;\r
+                        startbit_pause_len          = GRUNDIG_NOKIA_IR60_PRE_PAUSE_LEN - 1;\r
+                        pulse_len                   = GRUNDIG_NOKIA_IR60_BIT_LEN;\r
+                        pause_len                   = GRUNDIG_NOKIA_IR60_BIT_LEN;\r
+                        has_stop_bit                = GRUNDIG_NOKIA_IR60_STOP_BIT;\r
                         complete_data_len           = GRUNDIG_COMPLETE_DATA_LEN;\r
                         n_auto_repetitions          = GRUNDIG_FRAMES;                               // 2 frames\r
                         auto_repetition_pause_len   = GRUNDIG_AUTO_REPETITION_PAUSE_LEN;            // 20m sec pause\r
-                        repeat_frame_pause_len      = GRUNDIG_OR_NOKIA_FRAME_REPEAT_PAUSE_LEN;      // 117 msec pause\r
+                        repeat_frame_pause_len      = GRUNDIG_NOKIA_IR60_FRAME_REPEAT_PAUSE_LEN;      // 117 msec pause\r
                         irsnd_set_freq (IRSND_FREQ_38_KHZ);\r
 \r
                         break;\r
@@ -1067,15 +1191,15 @@ irsnd_ISR (void)
 #if IRSND_SUPPORT_NOKIA_PROTOCOL == 1\r
                     case IRMP_NOKIA_PROTOCOL:\r
                     {\r
-                        startbit_pulse_len          = GRUNDIG_OR_NOKIA_BIT_LEN;\r
-                        startbit_pause_len          = GRUNDIG_OR_NOKIA_PRE_PAUSE_LEN;\r
-                        pulse_len                   = GRUNDIG_OR_NOKIA_BIT_LEN;\r
-                        pause_len                   = GRUNDIG_OR_NOKIA_BIT_LEN;\r
-                        has_stop_bit                = GRUNDIG_OR_NOKIA_STOP_BIT;\r
+                        startbit_pulse_len          = GRUNDIG_NOKIA_IR60_BIT_LEN;\r
+                        startbit_pause_len          = GRUNDIG_NOKIA_IR60_PRE_PAUSE_LEN - 1;\r
+                        pulse_len                   = GRUNDIG_NOKIA_IR60_BIT_LEN;\r
+                        pause_len                   = GRUNDIG_NOKIA_IR60_BIT_LEN;\r
+                        has_stop_bit                = GRUNDIG_NOKIA_IR60_STOP_BIT;\r
                         complete_data_len           = NOKIA_COMPLETE_DATA_LEN;\r
-                        n_auto_repetitions          = NOKIA_FRAMES;                                 // 2 frames\r
-                        auto_repetition_pause_len   = NOKIA_AUTO_REPETITION_PAUSE_LEN;              // 20 msec pause\r
-                        repeat_frame_pause_len      = GRUNDIG_OR_NOKIA_FRAME_REPEAT_PAUSE_LEN;      // 117 msec pause\r
+                        n_auto_repetitions          = NOKIA_FRAMES;                                             // 2 frames\r
+                        auto_repetition_pause_len   = NOKIA_AUTO_REPETITION_PAUSE_LEN;                          // 20 msec pause\r
+                        repeat_frame_pause_len      = GRUNDIG_NOKIA_IR60_FRAME_REPEAT_PAUSE_LEN;                // 117 msec pause\r
                         irsnd_set_freq (IRSND_FREQ_38_KHZ);\r
                         break;\r
                     }\r
@@ -1087,7 +1211,7 @@ irsnd_ISR (void)
                         startbit_pause_len          = SIEMENS_BIT_LEN;\r
                         pulse_len                   = SIEMENS_BIT_LEN;\r
                         pause_len                   = SIEMENS_BIT_LEN;\r
-                        has_stop_bit                = SIEMENS_STOP_BIT;\r
+                        has_stop_bit                = SIEMENS_OR_RUWIDO_STOP_BIT;\r
                         complete_data_len           = SIEMENS_COMPLETE_DATA_LEN - 1;\r
                         n_auto_repetitions          = 1;                                            // 1 frame\r
                         auto_repetition_pause_len   = 0;\r
@@ -1100,12 +1224,12 @@ irsnd_ISR (void)
                     case IRMP_FDC_PROTOCOL:\r
                     {\r
                         startbit_pulse_len          = FDC_START_BIT_PULSE_LEN;\r
-                        startbit_pause_len          = FDC_START_BIT_PAUSE_LEN;\r
+                        startbit_pause_len          = FDC_START_BIT_PAUSE_LEN - 1;\r
                         complete_data_len           = FDC_COMPLETE_DATA_LEN;\r
                         pulse_1_len                 = FDC_PULSE_LEN;\r
-                        pause_1_len                 = FDC_1_PAUSE_LEN;\r
+                        pause_1_len                 = FDC_1_PAUSE_LEN - 1;\r
                         pulse_0_len                 = FDC_PULSE_LEN;\r
-                        pause_0_len                 = FDC_0_PAUSE_LEN;\r
+                        pause_0_len                 = FDC_0_PAUSE_LEN - 1;\r
                         has_stop_bit                = FDC_STOP_BIT;\r
                         n_auto_repetitions          = 1;                                            // 1 frame\r
                         auto_repetition_pause_len   = 0;\r
@@ -1118,12 +1242,12 @@ irsnd_ISR (void)
                     case IRMP_RCCAR_PROTOCOL:\r
                     {\r
                         startbit_pulse_len          = RCCAR_START_BIT_PULSE_LEN;\r
-                        startbit_pause_len          = RCCAR_START_BIT_PAUSE_LEN;\r
+                        startbit_pause_len          = RCCAR_START_BIT_PAUSE_LEN - 1;\r
                         complete_data_len           = RCCAR_COMPLETE_DATA_LEN;\r
                         pulse_1_len                 = RCCAR_PULSE_LEN;\r
-                        pause_1_len                 = RCCAR_1_PAUSE_LEN;\r
+                        pause_1_len                 = RCCAR_1_PAUSE_LEN - 1;\r
                         pulse_0_len                 = RCCAR_PULSE_LEN;\r
-                        pause_0_len                 = RCCAR_0_PAUSE_LEN;\r
+                        pause_0_len                 = RCCAR_0_PAUSE_LEN - 1;\r
                         has_stop_bit                = RCCAR_STOP_BIT;\r
                         n_auto_repetitions          = 1;                                            // 1 frame\r
                         auto_repetition_pause_len   = 0;\r
@@ -1141,12 +1265,12 @@ irsnd_ISR (void)
                         }\r
 \r
                         startbit_pulse_len          = JVC_START_BIT_PULSE_LEN;\r
-                        startbit_pause_len          = JVC_START_BIT_PAUSE_LEN;\r
+                        startbit_pause_len          = JVC_START_BIT_PAUSE_LEN - 1;\r
                         complete_data_len           = JVC_COMPLETE_DATA_LEN;\r
                         pulse_1_len                 = JVC_PULSE_LEN;\r
-                        pause_1_len                 = JVC_1_PAUSE_LEN;\r
+                        pause_1_len                 = JVC_1_PAUSE_LEN - 1;\r
                         pulse_0_len                 = JVC_PULSE_LEN;\r
-                        pause_0_len                 = JVC_0_PAUSE_LEN;\r
+                        pause_0_len                 = JVC_0_PAUSE_LEN - 1;\r
                         has_stop_bit                = JVC_STOP_BIT;\r
                         n_auto_repetitions          = 1;                                            // 1 frame\r
                         auto_repetition_pause_len   = 0;\r
@@ -1160,12 +1284,12 @@ irsnd_ISR (void)
                     case IRMP_NIKON_PROTOCOL:\r
                     {\r
                         startbit_pulse_len          = NIKON_START_BIT_PULSE_LEN;\r
-                        startbit_pause_len          = 271; // NIKON_START_BIT_PAUSE_LEN;\r
+                        startbit_pause_len          = 271 - 1; // NIKON_START_BIT_PAUSE_LEN;\r
                         complete_data_len           = NIKON_COMPLETE_DATA_LEN;\r
                         pulse_1_len                 = NIKON_PULSE_LEN;\r
-                        pause_1_len                 = NIKON_1_PAUSE_LEN;\r
+                        pause_1_len                 = NIKON_1_PAUSE_LEN - 1;\r
                         pulse_0_len                 = NIKON_PULSE_LEN;\r
-                        pause_0_len                 = NIKON_0_PAUSE_LEN;\r
+                        pause_0_len                 = NIKON_0_PAUSE_LEN - 1;\r
                         has_stop_bit                = NIKON_STOP_BIT;\r
                         n_auto_repetitions          = 1;                                            // 1 frame\r
                         auto_repetition_pause_len   = 0;\r
@@ -1175,6 +1299,24 @@ irsnd_ISR (void)
                         break;\r
                     }\r
 #endif\r
+#if IRSND_SUPPORT_LEGO_PROTOCOL == 1\r
+                    case IRMP_LEGO_PROTOCOL:\r
+                    {\r
+                        startbit_pulse_len          = LEGO_START_BIT_PULSE_LEN;\r
+                        startbit_pause_len          = LEGO_START_BIT_PAUSE_LEN - 1;\r
+                        complete_data_len           = LEGO_COMPLETE_DATA_LEN;\r
+                        pulse_1_len                 = LEGO_PULSE_LEN;\r
+                        pause_1_len                 = LEGO_1_PAUSE_LEN - 1;\r
+                        pulse_0_len                 = LEGO_PULSE_LEN;\r
+                        pause_0_len                 = LEGO_0_PAUSE_LEN - 1;\r
+                        has_stop_bit                = LEGO_STOP_BIT;\r
+                        n_auto_repetitions          = 1;                                            // 1 frame\r
+                        auto_repetition_pause_len   = 0;\r
+                        repeat_frame_pause_len      = LEGO_FRAME_REPEAT_PAUSE_LEN;\r
+                        irsnd_set_freq (IRSND_FREQ_38_KHZ);\r
+                        break;\r
+                    }\r
+#endif\r
                     default:\r
                     {\r
                         irsnd_busy = FALSE;\r
@@ -1233,12 +1375,15 @@ irsnd_ISR (void)
 #if IRSND_SUPPORT_NIKON_PROTOCOL == 1\r
                 case IRMP_NIKON_PROTOCOL:\r
 #endif\r
+#if IRSND_SUPPORT_LEGO_PROTOCOL == 1\r
+                case IRMP_LEGO_PROTOCOL:\r
+#endif\r
 \r
 \r
 #if IRSND_SUPPORT_SIRCS_PROTOCOL == 1  || IRSND_SUPPORT_NEC_PROTOCOL == 1 || IRSND_SUPPORT_SAMSUNG_PROTOCOL == 1 || IRSND_SUPPORT_MATSUSHITA_PROTOCOL == 1 ||   \\r
     IRSND_SUPPORT_KASEIKYO_PROTOCOL == 1 || IRSND_SUPPORT_RECS80_PROTOCOL == 1 || IRSND_SUPPORT_RECS80EXT_PROTOCOL == 1 || IRSND_SUPPORT_DENON_PROTOCOL == 1 || \\r
     IRSND_SUPPORT_NUBERT_PROTOCOL == 1 || IRSND_SUPPORT_BANG_OLUFSEN_PROTOCOL == 1 || IRSND_SUPPORT_FDC_PROTOCOL == 1 || IRSND_SUPPORT_RCCAR_PROTOCOL == 1 ||   \\r
-    IRSND_SUPPORT_JVC_PROTOCOL == 1 || IRSND_SUPPORT_NIKON_PROTOCOL == 1\r
+    IRSND_SUPPORT_JVC_PROTOCOL == 1 || IRSND_SUPPORT_NIKON_PROTOCOL == 1 || IRSND_SUPPORT_LEGO_PROTOCOL == 1 \r
                 {\r
                     if (pulse_counter == 0)\r
                     {\r
@@ -1256,12 +1401,12 @@ irsnd_ISR (void)
                                 {\r
                                     pulse_len = SAMSUNG_PULSE_LEN;\r
                                     pause_len = (irsnd_buffer[current_bit / 8] & (1<<(7-(current_bit % 8)))) ?\r
-                                                    SAMSUNG_1_PAUSE_LEN : SAMSUNG_0_PAUSE_LEN;\r
+                                                    (SAMSUNG_1_PAUSE_LEN - 1) : (SAMSUNG_0_PAUSE_LEN - 1);\r
                                 }\r
                                 else if (current_bit == SAMSUNG_ADDRESS_LEN)                        // send SYNC bit (16th bit)\r
                                 {\r
                                     pulse_len = SAMSUNG_PULSE_LEN;\r
-                                    pause_len = SAMSUNG_START_BIT_PAUSE_LEN;\r
+                                    pause_len = SAMSUNG_START_BIT_PAUSE_LEN - 1;\r
                                 }\r
                                 else if (current_bit < SAMSUNG_COMPLETE_DATA_LEN)                   // send n'th bit\r
                                 {\r
@@ -1269,7 +1414,7 @@ irsnd_ISR (void)
 \r
                                     pulse_len = SAMSUNG_PULSE_LEN;\r
                                     pause_len = (irsnd_buffer[cur_bit / 8] & (1<<(7-(cur_bit % 8)))) ?\r
-                                                    SAMSUNG_1_PAUSE_LEN : SAMSUNG_0_PAUSE_LEN;\r
+                                                    (SAMSUNG_1_PAUSE_LEN - 1) : (SAMSUNG_0_PAUSE_LEN - 1);\r
                                 }\r
                             }\r
                             else\r
@@ -1281,22 +1426,22 @@ irsnd_ISR (void)
                                 if (current_bit == 0)                                               // send 2nd start bit\r
                                 {\r
                                     pulse_len = BANG_OLUFSEN_START_BIT2_PULSE_LEN;\r
-                                    pause_len = BANG_OLUFSEN_START_BIT2_PAUSE_LEN;\r
+                                    pause_len = BANG_OLUFSEN_START_BIT2_PAUSE_LEN - 1;\r
                                 }\r
                                 else if (current_bit == 1)                                          // send 3rd start bit\r
                                 {\r
                                     pulse_len = BANG_OLUFSEN_START_BIT3_PULSE_LEN;\r
-                                    pause_len = BANG_OLUFSEN_START_BIT3_PAUSE_LEN;\r
+                                    pause_len = BANG_OLUFSEN_START_BIT3_PAUSE_LEN - 1;\r
                                 }\r
                                 else if (current_bit == 2)                                          // send 4th start bit\r
                                 {\r
                                     pulse_len = BANG_OLUFSEN_START_BIT2_PULSE_LEN;\r
-                                    pause_len = BANG_OLUFSEN_START_BIT2_PAUSE_LEN;\r
+                                    pause_len = BANG_OLUFSEN_START_BIT2_PAUSE_LEN - 1;\r
                                 }\r
                                 else if (current_bit == 19)                                          // send trailer bit\r
                                 {\r
                                     pulse_len = BANG_OLUFSEN_PULSE_LEN;\r
-                                    pause_len = BANG_OLUFSEN_TRAILER_BIT_PAUSE_LEN;\r
+                                    pause_len = BANG_OLUFSEN_TRAILER_BIT_PAUSE_LEN - 1;\r
                                 }\r
                                 else if (current_bit < BANG_OLUFSEN_COMPLETE_DATA_LEN)              // send n'th bit\r
                                 {\r
@@ -1305,11 +1450,11 @@ irsnd_ISR (void)
 \r
                                     if (cur_bit_value == last_bit_value)\r
                                     {\r
-                                        pause_len = BANG_OLUFSEN_R_PAUSE_LEN;\r
+                                        pause_len = BANG_OLUFSEN_R_PAUSE_LEN - 1;\r
                                     }\r
                                     else\r
                                     {\r
-                                        pause_len = cur_bit_value ? BANG_OLUFSEN_1_PAUSE_LEN : BANG_OLUFSEN_0_PAUSE_LEN;\r
+                                        pause_len = cur_bit_value ? (BANG_OLUFSEN_1_PAUSE_LEN - 1) : (BANG_OLUFSEN_0_PAUSE_LEN - 1);\r
                                         last_bit_value = cur_bit_value;\r
                                     }\r
                                 }\r
@@ -1419,7 +1564,7 @@ irsnd_ISR (void)
 \r
                                 if (repeat_counter > 0)\r
                                 {                                       // set 117 msec pause time\r
-                                    auto_repetition_pause_len = GRUNDIG_OR_NOKIA_FRAME_REPEAT_PAUSE_LEN;\r
+                                    auto_repetition_pause_len = GRUNDIG_NOKIA_IR60_FRAME_REPEAT_PAUSE_LEN;\r
                                 }\r
 \r
                                 if (repeat_counter < n_repeat_frames)       // tricky: repeat n info frames per auto repetition before sending last stop frame\r
@@ -1464,8 +1609,8 @@ irsnd_ISR (void)
                             }\r
                             else                                                                        // send n'th bit\r
                             {\r
-                                pulse_len = GRUNDIG_OR_NOKIA_BIT_LEN;\r
-                                pause_len = GRUNDIG_OR_NOKIA_BIT_LEN;\r
+                                pulse_len = GRUNDIG_NOKIA_IR60_BIT_LEN;\r
+                                pause_len = GRUNDIG_NOKIA_IR60_BIT_LEN;\r
                                 first_pulse = (irsnd_buffer[current_bit / 8] & (1<<(7-(current_bit % 8)))) ? TRUE : FALSE;\r
                             }\r
                         }\r