]> cloudbase.mooo.com Git - irmp.git/blobdiff - irsnd.c
Version 1.4.0: Added Grundig + Nokia protocol
[irmp.git] / irsnd.c
diff --git a/irsnd.c b/irsnd.c
index eb3e29f27bc15be393b846bf31096ac9d161c957..86cc94f9fe25e69db5ed258e68766ef67b016508 100644 (file)
--- a/irsnd.c
+++ b/irsnd.c
@@ -3,7 +3,7 @@
  *\r
  * Copyright (c) 2010 Frank Meyer - frank(at)fli4l.de\r
  *\r
- * $Id: irsnd.c,v 1.10 2010/05/17 10:31:43 fm Exp $\r
+ * $Id: irsnd.c,v 1.12 2010/05/26 08:34:30 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
@@ -56,7 +56,7 @@ typedef unsigned short    uint16_t;
 #define SIRCS_1_PULSE_LEN                       (uint8_t)(F_INTERRUPTS * SIRCS_1_PULSE_TIME + 0.5)\r
 #define SIRCS_0_PULSE_LEN                       (uint8_t)(F_INTERRUPTS * SIRCS_0_PULSE_TIME + 0.5)\r
 #define SIRCS_PAUSE_LEN                         (uint8_t)(F_INTERRUPTS * SIRCS_PAUSE_TIME + 0.5)\r
-#define SIRCS_REPETITION_LEN                    (uint16_t)(F_INTERRUPTS * SIRCS_REPETITION_TIME + 0.5)              // use uint16_t!\r
+#define SIRCS_FRAME_REPETITION_LEN              (uint16_t)(F_INTERRUPTS * SIRCS_FRAME_REPETITION_TIME + 0.5)              // use uint16_t!\r
 \r
 #define NEC_START_BIT_PULSE_LEN                 (uint8_t)(F_INTERRUPTS * NEC_START_BIT_PULSE_TIME + 0.5)\r
 #define NEC_START_BIT_PAUSE_LEN                 (uint8_t)(F_INTERRUPTS * NEC_START_BIT_PAUSE_TIME + 0.5)\r
@@ -70,7 +70,7 @@ typedef unsigned short    uint16_t;
 #define SAMSUNG_1_PAUSE_LEN                     (uint8_t)(F_INTERRUPTS * SAMSUNG_1_PAUSE_TIME + 0.5)\r
 #define SAMSUNG_0_PAUSE_LEN                     (uint8_t)(F_INTERRUPTS * SAMSUNG_0_PAUSE_TIME + 0.5)\r
 \r
-#define SAMSUNG32_REPETITION_LEN                (uint16_t)(F_INTERRUPTS * SAMSUNG32_REPETITION_TIME + 0.5)          // use uint16_t!\r
+#define SAMSUNG32_FRAME_REPETITION_LEN          (uint16_t)(F_INTERRUPTS * SAMSUNG32_FRAME_REPETITION_TIME + 0.5)          // use uint16_t!\r
 \r
 #define MATSUSHITA_START_BIT_PULSE_LEN          (uint8_t)(F_INTERRUPTS * MATSUSHITA_START_BIT_PULSE_TIME + 0.5)\r
 #define MATSUSHITA_START_BIT_PAUSE_LEN          (uint8_t)(F_INTERRUPTS * MATSUSHITA_START_BIT_PAUSE_TIME + 0.5)\r
@@ -95,7 +95,7 @@ typedef unsigned short    uint16_t;
 #define DENON_PULSE_LEN                         (uint8_t)(F_INTERRUPTS * DENON_PULSE_TIME + 0.5)\r
 #define DENON_1_PAUSE_LEN                       (uint8_t)(F_INTERRUPTS * DENON_1_PAUSE_TIME + 0.5)\r
 #define DENON_0_PAUSE_LEN                       (uint8_t)(F_INTERRUPTS * DENON_0_PAUSE_TIME + 0.5)\r
-#define DENON_REPETITION_LEN                    (uint16_t)(F_INTERRUPTS * DENON_REPETITION_TIME + 0.5)       // use uint16_t!\r
+#define DENON_FRAME_REPETITION_LEN              (uint16_t)(F_INTERRUPTS * DENON_FRAME_REPETITION_TIME + 0.5)       // use uint16_t!\r
 \r
 #define RECS80EXT_START_BIT_PULSE_LEN           (uint8_t)(F_INTERRUPTS * RECS80EXT_START_BIT_PULSE_TIME + 0.5)\r
 #define RECS80EXT_START_BIT_PAUSE_LEN           (uint8_t)(F_INTERRUPTS * RECS80EXT_START_BIT_PAUSE_TIME + 0.5)\r
@@ -109,7 +109,7 @@ typedef unsigned short    uint16_t;
 #define NUBERT_1_PAUSE_LEN                      (uint8_t)(F_INTERRUPTS * NUBERT_1_PAUSE_TIME + 0.5)\r
 #define NUBERT_0_PULSE_LEN                      (uint8_t)(F_INTERRUPTS * NUBERT_0_PULSE_TIME + 0.5)\r
 #define NUBERT_0_PAUSE_LEN                      (uint8_t)(F_INTERRUPTS * NUBERT_0_PAUSE_TIME + 0.5)\r
-#define NUBERT_REPETITION_LEN                   (uint16_t)(F_INTERRUPTS * NUBERT_REPETITION_TIME + 0.5)       // use uint16_t!\r
+#define NUBERT_FRAME_REPETITION_LEN             (uint16_t)(F_INTERRUPTS * NUBERT_FRAME_REPETITION_TIME + 0.5)       // use uint16_t!\r
 \r
 #define BANG_OLUFSEN_START_BIT1_PULSE_LEN       (uint8_t)(F_INTERRUPTS * BANG_OLUFSEN_START_BIT1_PULSE_TIME + 0.5)\r
 #define BANG_OLUFSEN_START_BIT1_PAUSE_LEN       (uint8_t)(F_INTERRUPTS * BANG_OLUFSEN_START_BIT1_PAUSE_TIME + 0.5)\r
@@ -123,9 +123,10 @@ typedef unsigned short    uint16_t;
 #define BANG_OLUFSEN_R_PAUSE_LEN                (uint8_t)(F_INTERRUPTS * BANG_OLUFSEN_R_PAUSE_TIME + 0.5)\r
 #define BANG_OLUFSEN_TRAILER_BIT_PAUSE_LEN      (uint8_t)(F_INTERRUPTS * BANG_OLUFSEN_TRAILER_BIT_PAUSE_TIME + 0.5)\r
 \r
-#define GRUNDIG_PRE_PAUSE_LEN                   (uint8_t)(F_INTERRUPTS * GRUNDIG_PRE_PAUSE_TIME + 0.5)\r
-#define GRUNDIG_BIT_LEN                         (uint8_t)(F_INTERRUPTS * GRUNDIG_BIT_TIME + 0.5)\r
-#define GRUNDIG_REPETITION_LEN                  (uint16_t)(F_INTERRUPTS * GRUNDIG_REPETITION_TIME + 0.5)       // use uint16_t!\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_FRAME_REPETITION_LEN            (uint16_t)(F_INTERRUPTS * GRUNDIG_FRAME_REPETITION_TIME + 0.5)      // use uint16_t!\r
+#define NOKIA_FRAME_REPETITION_LEN              (uint16_t)(F_INTERRUPTS * NOKIA_FRAME_REPETITION_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
@@ -136,7 +137,7 @@ typedef unsigned short    uint16_t;
 \r
 static volatile uint8_t                         irsnd_busy;\r
 static volatile uint8_t                         irsnd_protocol;\r
-static volatile uint8_t                         irsnd_buffer[5];\r
+static volatile uint8_t                         irsnd_buffer[6];\r
 static volatile uint8_t                         irsnd_is_on = FALSE;\r
 \r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
@@ -387,10 +388,10 @@ irsnd_send_data (IRMP_DATA * irmp_data_p)
 #if IRSND_SUPPORT_DENON_PROTOCOL == 1\r
         case IRMP_DENON_PROTOCOL:\r
         {\r
-            irsnd_buffer[0] = ((irmp_data_p->address & 0x1F) << 3) | ((irmp_data_p->command & 0x0380) >> 7);    // AAAAACCC\r
-            irsnd_buffer[1] = (irmp_data_p->command & 0x7F) << 1;                                               // CCCCCCC0\r
-            irsnd_buffer[2] = ((irmp_data_p->address & 0x1F) << 3) | (((~irmp_data_p->command) & 0x0380) >> 7); // AAAAACCC\r
-            irsnd_buffer[3] = (~(irmp_data_p->command) & 0x7F) << 1;                                            // CCCCCCC0\r
+            irsnd_buffer[0] = ((irmp_data_p->address & 0x1F) << 3) | ((irmp_data_p->command & 0x0380) >> 7);    // AAAAACCC (1st frame)\r
+            irsnd_buffer[1] = (irmp_data_p->command & 0x7F) << 1;                                               // CCCCCCC\r
+            irsnd_buffer[2] = ((irmp_data_p->address & 0x1F) << 3) | (((~irmp_data_p->command) & 0x0380) >> 7); // AAAAACCC (2nd frame)\r
+            irsnd_buffer[3] = (~(irmp_data_p->command) & 0x7F) << 1;                                            // CCCCCCC\r
             irsnd_busy      = TRUE;\r
             break;\r
         }\r
@@ -419,10 +420,27 @@ irsnd_send_data (IRMP_DATA * irmp_data_p)
         {\r
             command = bitsrevervse (irmp_data_p->command, GRUNDIG_COMMAND_LEN);\r
 \r
-            irsnd_buffer[0] = 0xFF;                                                                             // S1111111\r
-            irsnd_buffer[1] = 0xC0;                                                                             // 11000000\r
-            irsnd_buffer[2] = 0x80 | (command >> 2);                                                            // SCCCCCCC\r
-            irsnd_buffer[3] = (command << 6) & 0xC0;                                                            // CC000000\r
+            irsnd_buffer[0] = 0xFF;                                                                             // S1111111 (1st frame)\r
+            irsnd_buffer[1] = 0xC0;                                                                             // 11\r
+            irsnd_buffer[2] = 0x80 | (command >> 2);                                                            // SCCCCCCC (2nd frame)\r
+            irsnd_buffer[3] = (command << 6) & 0xC0;                                                            // CC\r
+\r
+            irsnd_busy      = TRUE;\r
+            break;\r
+        }\r
+#endif\r
+#if IRSND_SUPPORT_NOKIA_PROTOCOL == 1\r
+        case IRMP_NOKIA_PROTOCOL:\r
+        {\r
+            address = bitsrevervse (irmp_data_p->address, NOKIA_ADDRESS_LEN);\r
+            command = bitsrevervse (irmp_data_p->command, NOKIA_COMMAND_LEN);\r
+\r
+            irsnd_buffer[0] = 0xBF;                                                                             // S0111111 (1st + 3rd frame)\r
+            irsnd_buffer[1] = 0xFF;                                                                             // 11111111\r
+            irsnd_buffer[2] = 0x80;                                                                             // 1\r
+            irsnd_buffer[3] = 0x80 | command >> 1;                                                              // SCCCCCCC (2nd frame)\r
+            irsnd_buffer[4] = (command << 7) | (address >> 1);                                                  // CAAAAAAA\r
+            irsnd_buffer[5] = (address << 7);                                                                   // A\r
 \r
             irsnd_busy      = TRUE;\r
             break;\r
@@ -459,7 +477,7 @@ irsnd_ISR (void)
     static uint8_t  complete_data_len;\r
     static uint8_t  n_frames;                                                       // number of repetitions\r
     static uint8_t  frame_counter;                                                  // repetition counter\r
-    static uint16_t repetition_pause;                                               // pause before repetition, uint16_t!\r
+    static uint16_t repetition_pause_len;                                           // pause before repetition, uint16_t!\r
     static uint16_t repetition_pause_counter;                                       // pause before repetition, uint16_t!\r
 #if IRSND_SUPPORT_BANG_OLUFSEN_PROTOCOL == 1\r
     static uint8_t  last_bit_value;\r
@@ -475,7 +493,7 @@ irsnd_ISR (void)
             {\r
                 repetition_pause_counter++;\r
 \r
-                if (repetition_pause_counter >= repetition_pause)\r
+                if (repetition_pause_counter >= repetition_pause_len)\r
                 {\r
                     repetition_pause_counter = 0;\r
 \r
@@ -489,6 +507,19 @@ irsnd_ISR (void)
                         current_bit = 15;\r
                         complete_data_len   = 16 + GRUNDIG_COMPLETE_DATA_LEN;\r
                     }\r
+                    else if (irsnd_protocol == IRMP_NOKIA_PROTOCOL)\r
+                    {\r
+                        if (frame_counter == 1)\r
+                        {\r
+                            current_bit = 23;\r
+                            complete_data_len   = 24 + NOKIA_COMPLETE_DATA_LEN;\r
+                        }\r
+                        else // if (frame_counter == 2)\r
+                        {\r
+                            current_bit = 0xFF;\r
+                            complete_data_len   = NOKIA_COMPLETE_DATA_LEN;\r
+                        }\r
+                    }\r
                 }\r
                 else\r
                 {\r
@@ -515,16 +546,16 @@ irsnd_ISR (void)
 #if IRSND_SUPPORT_SIRCS_PROTOCOL == 1\r
                     case IRMP_SIRCS_PROTOCOL:\r
                     {\r
-                        startbit_pulse_len  = SIRCS_START_BIT_PULSE_LEN;\r
-                        startbit_pause_len  = SIRCS_START_BIT_PAUSE_LEN;\r
-                        pulse_1_len         = SIRCS_1_PULSE_LEN;\r
-                        pause_1_len         = SIRCS_PAUSE_LEN;\r
-                        pulse_0_len         = SIRCS_0_PULSE_LEN;\r
-                        pause_0_len         = SIRCS_PAUSE_LEN;\r
-                        has_stop_bit        = SIRCS_STOP_BIT;\r
-                        complete_data_len   = SIRCS_MINIMUM_DATA_LEN;\r
-                        n_frames            = SIRCS_REPETITION_CNT;                     // 3 frames\r
-                        repetition_pause    = SIRCS_REPETITION_LEN;                     // 25ms pause\r
+                        startbit_pulse_len      = SIRCS_START_BIT_PULSE_LEN;\r
+                        startbit_pause_len      = SIRCS_START_BIT_PAUSE_LEN;\r
+                        pulse_1_len             = SIRCS_1_PULSE_LEN;\r
+                        pause_1_len             = SIRCS_PAUSE_LEN;\r
+                        pulse_0_len             = SIRCS_0_PULSE_LEN;\r
+                        pause_0_len             = SIRCS_PAUSE_LEN;\r
+                        has_stop_bit            = SIRCS_STOP_BIT;\r
+                        complete_data_len       = SIRCS_MINIMUM_DATA_LEN;\r
+                        n_frames                = SIRCS_FRAMES;                             // 3 frames\r
+                        repetition_pause_len    = SIRCS_FRAME_REPETITION_LEN;               // 25ms pause\r
                         irsnd_set_freq (IRSND_FREQ_40_KHZ);\r
                         break;\r
                     }\r
@@ -532,16 +563,16 @@ irsnd_ISR (void)
 #if IRSND_SUPPORT_NEC_PROTOCOL == 1\r
                     case IRMP_NEC_PROTOCOL:\r
                     {\r
-                        startbit_pulse_len  = NEC_START_BIT_PULSE_LEN;\r
-                        startbit_pause_len  = NEC_START_BIT_PAUSE_LEN;\r
-                        pulse_1_len         = NEC_PULSE_LEN;\r
-                        pause_1_len         = NEC_1_PAUSE_LEN;\r
-                        pulse_0_len         = NEC_PULSE_LEN;\r
-                        pause_0_len         = NEC_0_PAUSE_LEN;\r
-                        has_stop_bit        = NEC_STOP_BIT;\r
-                        complete_data_len   = NEC_COMPLETE_DATA_LEN;\r
-                        n_frames            = 1;                                        // 1 frame\r
-                        repetition_pause    = 0;\r
+                        startbit_pulse_len      = NEC_START_BIT_PULSE_LEN;\r
+                        startbit_pause_len      = NEC_START_BIT_PAUSE_LEN;\r
+                        pulse_1_len             = NEC_PULSE_LEN;\r
+                        pause_1_len             = NEC_1_PAUSE_LEN;\r
+                        pulse_0_len             = NEC_PULSE_LEN;\r
+                        pause_0_len             = NEC_0_PAUSE_LEN;\r
+                        has_stop_bit            = NEC_STOP_BIT;\r
+                        complete_data_len       = NEC_COMPLETE_DATA_LEN;\r
+                        n_frames                = 1;                                        // 1 frame\r
+                        repetition_pause_len    = 0;\r
                         irsnd_set_freq (IRSND_FREQ_38_KHZ);\r
                         break;\r
                     }\r
@@ -549,32 +580,32 @@ irsnd_ISR (void)
 #if IRSND_SUPPORT_SAMSUNG_PROTOCOL == 1\r
                     case IRMP_SAMSUNG_PROTOCOL:\r
                     {\r
-                        startbit_pulse_len  = SAMSUNG_START_BIT_PULSE_LEN;\r
-                        startbit_pause_len  = SAMSUNG_START_BIT_PAUSE_LEN;\r
-                        pulse_1_len         = SAMSUNG_PULSE_LEN;\r
-                        pause_1_len         = SAMSUNG_1_PAUSE_LEN;\r
-                        pulse_0_len         = SAMSUNG_PULSE_LEN;\r
-                        pause_0_len         = SAMSUNG_0_PAUSE_LEN;\r
-                        has_stop_bit        = SAMSUNG_STOP_BIT;\r
-                        complete_data_len   = SAMSUNG_COMPLETE_DATA_LEN;\r
-                        n_frames            = 1;                                        // 1 frame\r
-                        repetition_pause    = 0;\r
+                        startbit_pulse_len      = SAMSUNG_START_BIT_PULSE_LEN;\r
+                        startbit_pause_len      = SAMSUNG_START_BIT_PAUSE_LEN;\r
+                        pulse_1_len             = SAMSUNG_PULSE_LEN;\r
+                        pause_1_len             = SAMSUNG_1_PAUSE_LEN;\r
+                        pulse_0_len             = SAMSUNG_PULSE_LEN;\r
+                        pause_0_len             = SAMSUNG_0_PAUSE_LEN;\r
+                        has_stop_bit            = SAMSUNG_STOP_BIT;\r
+                        complete_data_len       = SAMSUNG_COMPLETE_DATA_LEN;\r
+                        n_frames                = 1;                                        // 1 frame\r
+                        repetition_pause_len    = 0;\r
                         irsnd_set_freq (IRSND_FREQ_38_KHZ);\r
                         break;\r
                     }\r
 \r
                     case IRMP_SAMSUNG32_PROTOCOL:\r
                     {\r
-                        startbit_pulse_len  = SAMSUNG_START_BIT_PULSE_LEN;\r
-                        startbit_pause_len  = SAMSUNG_START_BIT_PAUSE_LEN;\r
-                        pulse_1_len         = SAMSUNG_PULSE_LEN;\r
-                        pause_1_len         = SAMSUNG_1_PAUSE_LEN;\r
-                        pulse_0_len         = SAMSUNG_PULSE_LEN;\r
-                        pause_0_len         = SAMSUNG_0_PAUSE_LEN;\r
-                        has_stop_bit        = SAMSUNG_STOP_BIT;\r
-                        complete_data_len   = SAMSUNG32_COMPLETE_DATA_LEN;\r
-                        n_frames            = SAMSUNG32_REPETITION_CNT;                 // 2 frames\r
-                        repetition_pause    = SAMSUNG32_REPETITION_LEN;                 // 47 ms pause\r
+                        startbit_pulse_len      = SAMSUNG_START_BIT_PULSE_LEN;\r
+                        startbit_pause_len      = SAMSUNG_START_BIT_PAUSE_LEN;\r
+                        pulse_1_len             = SAMSUNG_PULSE_LEN;\r
+                        pause_1_len             = SAMSUNG_1_PAUSE_LEN;\r
+                        pulse_0_len             = SAMSUNG_PULSE_LEN;\r
+                        pause_0_len             = SAMSUNG_0_PAUSE_LEN;\r
+                        has_stop_bit            = SAMSUNG_STOP_BIT;\r
+                        complete_data_len       = SAMSUNG32_COMPLETE_DATA_LEN;\r
+                        n_frames                = SAMSUNG32_FRAMES;                         // 2 frames\r
+                        repetition_pause_len    = SAMSUNG32_FRAME_REPETITION_LEN;           // 47 ms pause\r
                         irsnd_set_freq (IRSND_FREQ_38_KHZ);\r
                         break;\r
                     }\r
@@ -582,16 +613,16 @@ irsnd_ISR (void)
 #if IRSND_SUPPORT_MATSUSHITA_PROTOCOL == 1\r
                     case IRMP_MATSUSHITA_PROTOCOL:\r
                     {\r
-                        startbit_pulse_len  = MATSUSHITA_START_BIT_PULSE_LEN;\r
-                        startbit_pause_len  = MATSUSHITA_START_BIT_PAUSE_LEN;\r
-                        pulse_1_len         = MATSUSHITA_PULSE_LEN;\r
-                        pause_1_len         = MATSUSHITA_1_PAUSE_LEN;\r
-                        pulse_0_len         = MATSUSHITA_PULSE_LEN;\r
-                        pause_0_len         = MATSUSHITA_0_PAUSE_LEN;\r
-                        has_stop_bit        = MATSUSHITA_STOP_BIT;\r
-                        complete_data_len   = MATSUSHITA_COMPLETE_DATA_LEN;\r
-                        n_frames            = 1;                                        // 1 frame\r
-                        repetition_pause    = 0;\r
+                        startbit_pulse_len      = MATSUSHITA_START_BIT_PULSE_LEN;\r
+                        startbit_pause_len      = MATSUSHITA_START_BIT_PAUSE_LEN;\r
+                        pulse_1_len             = MATSUSHITA_PULSE_LEN;\r
+                        pause_1_len             = MATSUSHITA_1_PAUSE_LEN;\r
+                        pulse_0_len             = MATSUSHITA_PULSE_LEN;\r
+                        pause_0_len             = MATSUSHITA_0_PAUSE_LEN;\r
+                        has_stop_bit            = MATSUSHITA_STOP_BIT;\r
+                        complete_data_len       = MATSUSHITA_COMPLETE_DATA_LEN;\r
+                        n_frames                = 1;                                        // 1 frame\r
+                        repetition_pause_len    = 0;\r
                         irsnd_set_freq (IRSND_FREQ_36_KHZ);\r
                         break;\r
                     }\r
@@ -599,16 +630,16 @@ irsnd_ISR (void)
 #if IRSND_SUPPORT_RECS80_PROTOCOL == 1\r
                     case IRMP_RECS80_PROTOCOL:\r
                     {\r
-                        startbit_pulse_len  = RECS80_START_BIT_PULSE_LEN;\r
-                        startbit_pause_len  = RECS80_START_BIT_PAUSE_LEN;\r
-                        pulse_1_len         = RECS80_PULSE_LEN;\r
-                        pause_1_len         = RECS80_1_PAUSE_LEN;\r
-                        pulse_0_len         = RECS80_PULSE_LEN;\r
-                        pause_0_len         = RECS80_0_PAUSE_LEN;\r
-                        has_stop_bit        = RECS80_STOP_BIT;\r
-                        complete_data_len   = RECS80_COMPLETE_DATA_LEN;\r
-                        n_frames            = 1;                                        // 1 frame\r
-                        repetition_pause    = 0;\r
+                        startbit_pulse_len      = RECS80_START_BIT_PULSE_LEN;\r
+                        startbit_pause_len      = RECS80_START_BIT_PAUSE_LEN;\r
+                        pulse_1_len             = RECS80_PULSE_LEN;\r
+                        pause_1_len             = RECS80_1_PAUSE_LEN;\r
+                        pulse_0_len             = RECS80_PULSE_LEN;\r
+                        pause_0_len             = RECS80_0_PAUSE_LEN;\r
+                        has_stop_bit            = RECS80_STOP_BIT;\r
+                        complete_data_len       = RECS80_COMPLETE_DATA_LEN;\r
+                        n_frames                = 1;                                        // 1 frame\r
+                        repetition_pause_len    = 0;\r
                         irsnd_set_freq (IRSND_FREQ_38_KHZ);\r
                         break;\r
                     }\r
@@ -616,16 +647,16 @@ irsnd_ISR (void)
 #if IRSND_SUPPORT_RECS80EXT_PROTOCOL == 1\r
                     case IRMP_RECS80EXT_PROTOCOL:\r
                     {\r
-                        startbit_pulse_len  = RECS80EXT_START_BIT_PULSE_LEN;\r
-                        startbit_pause_len  = RECS80EXT_START_BIT_PAUSE_LEN;\r
-                        pulse_1_len         = RECS80EXT_PULSE_LEN;\r
-                        pause_1_len         = RECS80EXT_1_PAUSE_LEN;\r
-                        pulse_0_len         = RECS80EXT_PULSE_LEN;\r
-                        pause_0_len         = RECS80EXT_0_PAUSE_LEN;\r
-                        has_stop_bit        = RECS80EXT_STOP_BIT;\r
-                        complete_data_len   = RECS80EXT_COMPLETE_DATA_LEN;\r
-                        n_frames            = 1;                                        // 1 frame\r
-                        repetition_pause    = 0;\r
+                        startbit_pulse_len      = RECS80EXT_START_BIT_PULSE_LEN;\r
+                        startbit_pause_len      = RECS80EXT_START_BIT_PAUSE_LEN;\r
+                        pulse_1_len             = RECS80EXT_PULSE_LEN;\r
+                        pause_1_len             = RECS80EXT_1_PAUSE_LEN;\r
+                        pulse_0_len             = RECS80EXT_PULSE_LEN;\r
+                        pause_0_len             = RECS80EXT_0_PAUSE_LEN;\r
+                        has_stop_bit            = RECS80EXT_STOP_BIT;\r
+                        complete_data_len       = RECS80EXT_COMPLETE_DATA_LEN;\r
+                        n_frames                = 1;                                        // 1 frame\r
+                        repetition_pause_len    = 0;\r
                         irsnd_set_freq (IRSND_FREQ_38_KHZ);\r
                         break;\r
                     }\r
@@ -633,16 +664,16 @@ irsnd_ISR (void)
 #if IRSND_SUPPORT_RC5_PROTOCOL == 1\r
                     case IRMP_RC5_PROTOCOL:\r
                     {\r
-                        startbit_pulse_len  = RC5_BIT_LEN;\r
-                        startbit_pause_len  = RC5_BIT_LEN;\r
-                        pulse_1_len         = RC5_BIT_LEN;\r
-                        pause_1_len         = RC5_BIT_LEN;\r
-                        pulse_0_len         = RC5_BIT_LEN;\r
-                        pause_0_len         = RC5_BIT_LEN;\r
-                        has_stop_bit        = RC5_STOP_BIT;\r
-                        complete_data_len   = RC5_COMPLETE_DATA_LEN;\r
-                        n_frames            = 1;                                        // 1 frame\r
-                        repetition_pause    = 0;\r
+                        startbit_pulse_len      = RC5_BIT_LEN;\r
+                        startbit_pause_len      = RC5_BIT_LEN;\r
+                        pulse_1_len             = RC5_BIT_LEN;\r
+                        pause_1_len             = RC5_BIT_LEN;\r
+                        pulse_0_len             = RC5_BIT_LEN;\r
+                        pause_0_len             = RC5_BIT_LEN;\r
+                        has_stop_bit            = RC5_STOP_BIT;\r
+                        complete_data_len       = RC5_COMPLETE_DATA_LEN;\r
+                        n_frames                = 1;                                        // 1 frame\r
+                        repetition_pause_len    = 0;\r
                         irsnd_set_freq (IRSND_FREQ_36_KHZ);\r
                         break;\r
                     }\r
@@ -650,16 +681,16 @@ irsnd_ISR (void)
 #if IRSND_SUPPORT_DENON_PROTOCOL == 1\r
                     case IRMP_DENON_PROTOCOL:\r
                     {\r
-                        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
-                        pulse_0_len         = DENON_PULSE_LEN;\r
-                        pause_0_len         = DENON_0_PAUSE_LEN;\r
-                        has_stop_bit        = DENON_STOP_BIT;\r
-                        complete_data_len   = DENON_COMPLETE_DATA_LEN;\r
-                        n_frames            = DENON_REPETITION_CNT;                     // 2 frames, 2nd with inverted command\r
-                        repetition_pause    = DENON_REPETITION_LEN;                     // 65 ms pause after 1st frame\r
+                        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
+                        pulse_0_len             = DENON_PULSE_LEN;\r
+                        pause_0_len             = DENON_0_PAUSE_LEN;\r
+                        has_stop_bit            = DENON_STOP_BIT;\r
+                        complete_data_len       = DENON_COMPLETE_DATA_LEN;\r
+                        n_frames                = DENON_FRAMES;                             // 2 frames, 2nd with inverted command\r
+                        repetition_pause_len    = DENON_FRAME_REPETITION_LEN;               // 65 ms pause after 1st frame\r
                         irsnd_set_freq (IRSND_FREQ_32_KHZ);\r
                         break;\r
                     }\r
@@ -667,16 +698,16 @@ irsnd_ISR (void)
 #if IRSND_SUPPORT_NUBERT_PROTOCOL == 1\r
                     case IRMP_NUBERT_PROTOCOL:\r
                     {\r
-                        startbit_pulse_len  = NUBERT_START_BIT_PULSE_LEN;\r
-                        startbit_pause_len  = NUBERT_START_BIT_PAUSE_LEN;\r
-                        pulse_1_len         = NUBERT_1_PULSE_LEN;\r
-                        pause_1_len         = NUBERT_1_PAUSE_LEN;\r
-                        pulse_0_len         = NUBERT_0_PULSE_LEN;\r
-                        pause_0_len         = NUBERT_0_PAUSE_LEN;\r
-                        has_stop_bit        = NUBERT_STOP_BIT;\r
-                        complete_data_len   = NUBERT_COMPLETE_DATA_LEN;\r
-                        n_frames            = NUBERT_REPETITION_CNT;                    // 2 frames\r
-                        repetition_pause    = NUBERT_REPETITION_LEN;                    // 35 ms pause\r
+                        startbit_pulse_len      = NUBERT_START_BIT_PULSE_LEN;\r
+                        startbit_pause_len      = NUBERT_START_BIT_PAUSE_LEN;\r
+                        pulse_1_len             = NUBERT_1_PULSE_LEN;\r
+                        pause_1_len             = NUBERT_1_PAUSE_LEN;\r
+                        pulse_0_len             = NUBERT_0_PULSE_LEN;\r
+                        pause_0_len             = NUBERT_0_PAUSE_LEN;\r
+                        has_stop_bit            = NUBERT_STOP_BIT;\r
+                        complete_data_len       = NUBERT_COMPLETE_DATA_LEN;\r
+                        n_frames                = NUBERT_FRAMES;                            // 2 frames\r
+                        repetition_pause_len    = NUBERT_FRAME_REPETITION_LEN;              // 35 ms pause\r
                         irsnd_set_freq (IRSND_FREQ_36_KHZ);\r
                         break;\r
                     }\r
@@ -684,17 +715,17 @@ irsnd_ISR (void)
 #if IRSND_SUPPORT_BANG_OLUFSEN_PROTOCOL == 1\r
                     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
-                        pulse_1_len         = BANG_OLUFSEN_PULSE_LEN;\r
-                        pause_1_len         = BANG_OLUFSEN_1_PAUSE_LEN;\r
-                        pulse_0_len         = BANG_OLUFSEN_PULSE_LEN;\r
-                        pause_0_len         = BANG_OLUFSEN_0_PAUSE_LEN;\r
-                        has_stop_bit        = BANG_OLUFSEN_STOP_BIT;\r
-                        complete_data_len   = BANG_OLUFSEN_COMPLETE_DATA_LEN;\r
-                        n_frames            = 1;                                        // 1 frame\r
-                        repetition_pause    = 0;\r
-                        last_bit_value      = 0;\r
+                        startbit_pulse_len      = BANG_OLUFSEN_START_BIT1_PULSE_LEN;\r
+                        startbit_pause_len      = BANG_OLUFSEN_START_BIT1_PAUSE_LEN;\r
+                        pulse_1_len             = BANG_OLUFSEN_PULSE_LEN;\r
+                        pause_1_len             = BANG_OLUFSEN_1_PAUSE_LEN;\r
+                        pulse_0_len             = BANG_OLUFSEN_PULSE_LEN;\r
+                        pause_0_len             = BANG_OLUFSEN_0_PAUSE_LEN;\r
+                        has_stop_bit            = BANG_OLUFSEN_STOP_BIT;\r
+                        complete_data_len       = BANG_OLUFSEN_COMPLETE_DATA_LEN;\r
+                        n_frames                = 1;                                        // 1 frame\r
+                        repetition_pause_len    = 0;\r
+                        last_bit_value          = 0;\r
                         irsnd_set_freq (IRSND_FREQ_455_KHZ);\r
                         break;\r
                     }\r
@@ -702,17 +733,34 @@ irsnd_ISR (void)
 #if IRSND_SUPPORT_GRUNDIG_PROTOCOL == 1\r
                     case IRMP_GRUNDIG_PROTOCOL:\r
                     {\r
-                        startbit_pulse_len  = GRUNDIG_BIT_LEN;\r
-                        startbit_pause_len  = GRUNDIG_PRE_PAUSE_LEN;\r
-                        pulse_1_len         = GRUNDIG_BIT_LEN;\r
-                        pause_1_len         = GRUNDIG_BIT_LEN;\r
-                        pulse_0_len         = GRUNDIG_BIT_LEN;\r
-                        pause_0_len         = GRUNDIG_BIT_LEN;\r
-                        has_stop_bit        = GRUNDIG_STOP_BIT;\r
-                        complete_data_len   = GRUNDIG_COMPLETE_DATA_LEN;\r
-                        n_frames            = GRUNDIG_REPETITION_CNT;           // 2 frames\r
-                        repetition_pause    = GRUNDIG_REPETITION_LEN;           // 20msec pause\r
-                        irsnd_set_freq (IRSND_FREQ_36_KHZ);\r
+                        startbit_pulse_len      = GRUNDIG_OR_NOKIA_BIT_LEN;\r
+                        startbit_pause_len      = GRUNDIG_OR_NOKIA_PRE_PAUSE_LEN;\r
+                        pulse_1_len             = GRUNDIG_OR_NOKIA_BIT_LEN;\r
+                        pause_1_len             = GRUNDIG_OR_NOKIA_BIT_LEN;\r
+                        pulse_0_len             = GRUNDIG_OR_NOKIA_BIT_LEN;\r
+                        pause_0_len             = GRUNDIG_OR_NOKIA_BIT_LEN;\r
+                        has_stop_bit            = GRUNDIG_OR_NOKIA_STOP_BIT;\r
+                        complete_data_len       = GRUNDIG_COMPLETE_DATA_LEN;\r
+                        n_frames                = GRUNDIG_FRAMES;                   // 2 frames\r
+                        repetition_pause_len    = GRUNDIG_FRAME_REPETITION_LEN;     // 20msec pause\r
+                        irsnd_set_freq (IRSND_FREQ_38_KHZ);\r
+                        break;\r
+                    }\r
+#endif\r
+#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_1_len             = GRUNDIG_OR_NOKIA_BIT_LEN;\r
+                        pause_1_len             = GRUNDIG_OR_NOKIA_BIT_LEN;\r
+                        pulse_0_len             = GRUNDIG_OR_NOKIA_BIT_LEN;\r
+                        pause_0_len             = GRUNDIG_OR_NOKIA_BIT_LEN;\r
+                        has_stop_bit            = GRUNDIG_OR_NOKIA_STOP_BIT;\r
+                        complete_data_len       = NOKIA_COMPLETE_DATA_LEN;\r
+                        n_frames                = NOKIA_FRAMES;                   // 2 frames\r
+                        repetition_pause_len    = NOKIA_FRAME_REPETITION_LEN;     // 20msec pause\r
+                        irsnd_set_freq (IRSND_FREQ_38_KHZ);\r
                         break;\r
                     }\r
 #endif\r
@@ -980,12 +1028,15 @@ irsnd_ISR (void)
                 }\r
 #endif // IRSND_SUPPORT_RC5_PROTOCOL\r
 \r
-#if IRSND_SUPPORT_GRUNDIG_PROTOCOL == 1\r
+#if IRSND_SUPPORT_GRUNDIG_PROTOCOL == 1 || IRSND_SUPPORT_NOKIA_PROTOCOL == 1\r
                 case IRMP_GRUNDIG_PROTOCOL:\r
+                case IRMP_NOKIA_PROTOCOL:\r
                 {\r
                     uint8_t next_bit = FALSE;\r
 \r
-                    if (current_bit == 0xFF || current_bit == 15)                         // start bit of 1st or 2nd frame\r
+                    if (current_bit == 0xFF ||                                                                  // start bit of 1st frame\r
+                        (irsnd_protocol == IRMP_GRUNDIG_PROTOCOL && current_bit == 15) ||                       // start bit of 2nd frame (Grundig)\r
+                        (irsnd_protocol == IRMP_NOKIA_PROTOCOL && (current_bit == 23 || current_bit == 47)))    // start bit of 2nd/3rd frame (Nokia)\r
                     {\r
                         if (pulse_counter == 0)\r
                         {\r
@@ -1024,7 +1075,7 @@ irsnd_ISR (void)
 \r
                         if (first_pulse)\r
                         {\r
-                            if (pulse_counter < GRUNDIG_BIT_LEN)\r
+                            if (pulse_counter < GRUNDIG_OR_NOKIA_BIT_LEN)\r
                             {\r
                                 if (pulse_counter == 0)\r
                                 {\r
@@ -1032,7 +1083,7 @@ irsnd_ISR (void)
                                 }\r
                                 pulse_counter++;\r
                             }\r
-                            else if (pause_counter < GRUNDIG_BIT_LEN)\r
+                            else if (pause_counter < GRUNDIG_OR_NOKIA_BIT_LEN)\r
                             {\r
                                 if (pause_counter == 0)\r
                                 {\r
@@ -1047,7 +1098,7 @@ irsnd_ISR (void)
                         }\r
                         else\r
                         {\r
-                            if (pause_counter < GRUNDIG_BIT_LEN)\r
+                            if (pause_counter < GRUNDIG_OR_NOKIA_BIT_LEN)\r
                             {\r
                                 if (pause_counter == 0)\r
                                 {\r
@@ -1055,7 +1106,7 @@ irsnd_ISR (void)
                                 }\r
                                 pause_counter++;\r
                             }\r
-                            else if (pulse_counter < GRUNDIG_BIT_LEN)\r
+                            else if (pulse_counter < GRUNDIG_OR_NOKIA_BIT_LEN)\r
                             {\r
                                 if (pulse_counter == 0)\r
                                 {\r
@@ -1094,7 +1145,7 @@ irsnd_ISR (void)
                     }\r
                     break;\r
                 }\r
-#endif // IRSND_SUPPORT_GRUNDIG_PROTOCOL\r
+#endif // IRSND_SUPPORT_GRUNDIG_PROTOCOL || IRSND_SUPPORT_NOKIA_PROTOCOL\r
 \r
                 default:\r
                 {\r