]> cloudbase.mooo.com Git - irmp.git/blobdiff - irsnd.c
Version 2.0.2: improved jvc decoder (type 2 and 3)
[irmp.git] / irsnd.c
diff --git a/irsnd.c b/irsnd.c
index 517986ce9ff05127ec5438470d3cb5cda3ea0bad..09fa29520945bbc4c8d59ded57ae8f99d07438e3 100644 (file)
--- a/irsnd.c
+++ b/irsnd.c
@@ -3,7 +3,16 @@
  *\r
  * Copyright (c) 2010-2011 Frank Meyer - frank(at)fli4l.de\r
  *\r
- * $Id: irsnd.c,v 1.38 2011/05/22 21:40:53 fm Exp $\r
+ * Supported mikrocontrollers:\r
+ *\r
+ * ATtiny45,  ATtiny85\r
+ * ATtiny84\r
+ * ATmega8,   ATmega16,  ATmega32\r
+ * ATmega162\r
+ * ATmega164, ATmega324, ATmega644,  ATmega644P, ATmega1284\r
+ * ATmega88,  ATmega88P, ATmega168,  ATmega168P, ATmega328P\r
+ *\r
+ * $Id: irsnd.c,v 1.41 2011/09/20 10:45:28 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
@@ -55,69 +64,128 @@ typedef unsigned short  uint16_t;
 #include "irsnd.h"\r
 \r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
- *  ATmega pin definition of OC2 / OC2A / OC2B\r
+ *  ATtiny pin definition of OC0A / OC0B\r
+ *  ATmega pin definition of OC2 / OC2A / OC2B / OC0 / OC0A / OC0B\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
+/*---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ *  ATtiny pin definition of OC0A / OC0B\r
+ *  ATmega pin definition of OC2 / OC2A / OC2B / OC0 / OC0A / OC0B\r
+ *---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ */\r
+#if defined (__AVR_ATtiny84__)                          // ATtiny84 uses OC0A = PB2 or OC0B = PA7\r
+#if IRSND_OCx == IRSND_OC0A                             // OC0A\r
 #define IRSND_PORT                              PORTB   // port B\r
 #define IRSND_DDR                               DDRB    // ddr B\r
-#define IRSND_BIT                               3       // OC2A\r
+#define IRSND_BIT                               2       // OC0A\r
+#elif IRSND_OCx == IRSND_OC0B                           // OC0B\r
+#define IRSND_PORT                              PORTA   // port A\r
+#define IRSND_DDR                               DDRA    // ddr A\r
+#define IRSND_BIT                               7       // OC0B\r
+#else\r
+#error Wrong value for IRSND_OCx, choose IRSND_OC0A or IRSND_OC0B in irsndconfig.h\r
+#endif // IRSND_OCx\r
+\r
+#elif defined (__AVR_ATtiny45__) || defined (__AVR_ATtiny85__)  // ATtiny45/85 uses OC0A = PB0 or OC0B = PB1\r
+#if IRSND_OCx == IRSND_OC0A                             // OC0A\r
+#define IRSND_PORT                              PORTB   // port B\r
+#define IRSND_DDR                               DDRB    // ddr B\r
+#define IRSND_BIT                               0       // OC0A\r
+#elif IRSND_OCx == IRSND_OC0B                           // OC0B\r
+#define IRSND_PORT                              PORTB   // port B\r
+#define IRSND_DDR                               DDRB    // ddr B\r
+#define IRSND_BIT                               1       // OC0B\r
+#else\r
+#error Wrong value for IRSND_OCx, choose IRSND_OC0A or IRSND_OC0B in irsndconfig.h\r
+#endif // IRSND_OCx\r
+\r
+#elif defined (__AVR_ATmega8__)                         // ATmega8 uses only OC2 = PB3\r
+#if IRSND_OCx == IRSND_OC2                              // OC0A\r
+#define IRSND_PORT                              PORTB   // port B\r
+#define IRSND_DDR                               DDRB    // ddr B\r
+#define IRSND_BIT                               3       // OC0A\r
+#else\r
+#error Wrong value for IRSND_OCx, choose IRSND_OC2 in irsndconfig.h\r
+#endif // IRSND_OCx\r
+\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
+#if IRSND_OCx == IRSND_OC2                              // OC2\r
 #define IRSND_PORT                              PORTD   // port D\r
 #define IRSND_DDR                               DDRD    // ddr D\r
 #define IRSND_BIT                               7       // OC2\r
+#else\r
+#error Wrong value for IRSND_OCx, choose IRSND_OC2 in irsndconfig.h\r
+#endif // IRSND_OCx\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
+#elif defined (__AVR_ATmega162__)                       // ATmega162 uses OC2 = PB1 or OC0 = PB0\r
+#if IRSND_OCx == IRSND_OC2                              // OC2\r
 #define IRSND_PORT                              PORTB   // port B\r
 #define IRSND_DDR                               DDRB    // ddr B\r
 #define IRSND_BIT                               1       // OC2\r
+#elif IRSND_OCx == IRSND_OC0                            // OC0\r
+#define IRSND_PORT                              PORTB   // port B\r
+#define IRSND_DDR                               DDRB    // ddr B\r
+#define IRSND_BIT                               0       // OC0\r
+#else\r
+#error Wrong value for IRSND_OCx, choose IRSND_OC2 or IRSND_OC0 in irsndconfig.h\r
+#endif // IRSND_OCx\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
+   || defined (__AVR_ATmega1284__)                      // ATmega164|324|644|644P|1284 uses OC2A = PD7 or OC2B = PD6 or OC0A = PB3 or OC0B = PB4\r
+#if IRSND_OCx == IRSND_OC2A                             // 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
+#elif IRSND_OCx == IRSND_OC2B                           // OC2B\r
 #define IRSND_PORT                              PORTD   // port D\r
 #define IRSND_DDR                               DDRD    // ddr D\r
 #define IRSND_BIT                               6       // OC2B\r
+#elif IRSND_OCx == IRSND_OC0A                           // OC0A\r
+#define IRSND_PORT                              PORTB   // port B\r
+#define IRSND_DDR                               DDRB    // ddr B\r
+#define IRSND_BIT                               3       // OC0A\r
+#elif IRSND_OCx == IRSND_OC0B                           // OC0B\r
+#define IRSND_PORT                              PORTB   // port B\r
+#define IRSND_DDR                               DDRB    // ddr B\r
+#define IRSND_BIT                               4       // OC0B\r
 #else\r
-#error Wrong value for IRSND_OC2, choose 1 or 2 in irsndconfig.h\r
-#endif // IRSND_OC2\r
+#error Wrong value for IRSND_OCx, choose IRSND_OC2A, IRSND_OC2B, IRSND_OC0A, or IRSND_OC0B in irsndconfig.h\r
+#endif // IRSND_OCx\r
 \r
 #elif defined (__AVR_ATmega48__)    \\r
    || defined (__AVR_ATmega88__)    \\r
+   || defined (__AVR_ATmega88P__)   \\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
+   || defined (__AVR_ATmega168P__)  \\r
+   || defined (__AVR_ATmega328P__)                      // ATmega48|88|168|168|328 uses OC2A = PB3 or OC2B = PD3 or OC0A = PD6 or OC0B = PD5\r
+#if IRSND_OCx == IRSND_OC2A                             // 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
+#elif IRSND_OCx == IRSND_OC2B                           // OC2B\r
 #define IRSND_PORT                              PORTD   // port D\r
 #define IRSND_DDR                               DDRD    // ddr D\r
 #define IRSND_BIT                               3       // OC2B\r
+#elif IRSND_OCx == IRSND_OC0A                           // OC0A\r
+#define IRSND_PORT                              PORTB   // port B\r
+#define IRSND_DDR                               DDRB    // ddr B\r
+#define IRSND_BIT                               6       // OC0A\r
+#elif IRSND_OCx == IRSND_OC0B                           // OC0B\r
+#define IRSND_PORT                              PORTD   // port D\r
+#define IRSND_DDR                               DDRD    // ddr D\r
+#define IRSND_BIT                               5       // OC0B\r
 #else\r
-#error Wrong value for IRSND_OC2, choose 1 or 2 in irsndconfig.h\r
-#endif // IRSND_OC2\r
+#error Wrong value for IRSND_OCx, choose IRSND_OC2A, IRSND_OC2B, IRSND_OC0A, or IRSND_OC0B in irsndconfig.h\r
+#endif // IRSND_OCx\r
 \r
 #else\r
 #if !defined (unix) && !defined (WIN32)\r
-#error OC2A/OC2B not defined, please fill in definitions here.\r
+#error mikrocontroller not defined, please fill in definitions here.\r
 #endif // unix, WIN32\r
 #endif // __AVR...\r
 \r
@@ -306,13 +374,21 @@ irsnd_on (void)
     if (! irsnd_is_on)\r
     {\r
 #ifndef DEBUG\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
+#if   IRSND_OCx == IRSND_OC2                            // use OC2\r
+        TCCR2 |= (1<<COM20)|(1<<WGM21);                 // toggle OC2 on compare match,  clear Timer 2 at compare match OCR2\r
+#elif IRSND_OCx == IRSND_OC2A                           // 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
+#elif IRSND_OCx == IRSND_OC2B                           // 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
+#elif IRSND_OCx == IRSND_OC0                            // use OC0\r
+        TCCR0 |= (1<<COM00)|(1<<WGM01);                 // toggle OC0 on compare match,  clear Timer 0 at compare match OCR0\r
+#elif IRSND_OCx == IRSND_OC0A                           // use OC0A\r
+        TCCR0A |= (1<<COM0A0)|(1<<WGM01);               // toggle OC0A on compare match, clear Timer 0 at compare match OCR0A\r
+#elif IRSND_OCx == IRSND_OC0B                           // use OC0B\r
+        TCCR0A |= (1<<COM0B0)|(1<<WGM01);               // toggle OC0B on compare match, clear Timer 0 at compare match OCR0A (yes: A, not B!)\r
+#else\r
+#error wrong value of IRSND_OCx\r
+#endif // IRSND_OCx\r
 #endif // DEBUG\r
 \r
 #if IRSND_USE_CALLBACK == 1\r
@@ -337,13 +413,21 @@ irsnd_off (void)
     if (irsnd_is_on)\r
     {\r
 #ifndef DEBUG\r
-#if   IRSND_OC2 == 0                                    // use OC2\r
+#if   IRSND_OCx == IRSND_OC2                                    // use OC2\r
         TCCR2 &= ~(1<<COM20);                           // normal port operation, OC2 disconnected.\r
-#elif IRSND_OC2 == 1                                    // use OC2A\r
+#elif IRSND_OCx == IRSND_OC2A                                    // use OC2A\r
         TCCR2A &= ~(1<<COM2A0);                         // normal port operation, OC2A disconnected.\r
-#else                                                   // use OC2B\r
+#elif IRSND_OCx == IRSND_OC2B                                    // use OC2B\r
         TCCR2A &= ~(1<<COM2B0);                         // normal port operation, OC2B disconnected.\r
-#endif // IRSND_OC2\r
+#elif IRSND_OCx == IRSND_OC0                                    // use OC0\r
+        TCCR0 &= ~(1<<COM00);                           // normal port operation, OC0 disconnected.\r
+#elif IRSND_OCx == IRSND_OC0A                                    // use OC0A\r
+        TCCR0A &= ~(1<<COM0A0);                         // normal port operation, OC0A disconnected.\r
+#elif IRSND_OCx == IRSND_OC0B                                    // use OC0B\r
+        TCCR0A &= ~(1<<COM0B0);                         // normal port operation, OC0B disconnected.\r
+#else\r
+#error wrong value of IRSND_OCx\r
+#endif // IRSND_OCx\r
         IRSND_PORT  &= ~(1<<IRSND_BIT);                 // set IRSND_BIT to low\r
 #endif // DEBUG\r
 \r
@@ -367,10 +451,20 @@ static void
 irsnd_set_freq (uint8_t freq)\r
 {\r
 #ifndef DEBUG\r
-#if IRSND_OC2 == 0\r
+#if IRSND_OCx == IRSND_OC2\r
     OCR2 = freq;                                                                        // use register OCR2 for OC2\r
-#else\r
+#elif IRSND_OCx == IRSND_OC2A                                                                    // use OC2A\r
+    OCR2A = freq;                                                                       // use register OCR2A for OC2A and OC2B!\r
+#elif IRSND_OCx == IRSND_OC2B                                                                    // use OC2B\r
     OCR2A = freq;                                                                       // use register OCR2A for OC2A and OC2B!\r
+#elif IRSND_OCx == IRSND_OC0                                                                    // use OC0\r
+    OCR0 = freq;                                                                        // use register OCR2 for OC2\r
+#elif IRSND_OCx == IRSND_OC0A                                                                    // use OC0A\r
+    OCR0A = freq;                                                                       // use register OCR0A for OC0A and OC0B!\r
+#elif IRSND_OCx == IRSND_OC0B                                                                    // use OC0B\r
+    OCR0A = freq;                                                                       // use register OCR0A for OC0A and OC0B!\r
+#else\r
+#error wrong value of IRSND_OCx\r
 #endif\r
 #endif // DEBUG\r
 }\r
@@ -387,13 +481,21 @@ irsnd_init (void)
     IRSND_PORT &= ~(1<<IRSND_BIT);                                                  // set IRSND_BIT to low\r
     IRSND_DDR |= (1<<IRSND_BIT);                                                    // set IRSND_BIT to output\r
 \r
-#if defined (__AVR_ATmega32__)\r
+#if IRSND_OCx == IRSND_OC2                                                                  // use OC2\r
     TCCR2 = (1<<WGM21);                                                             // CTC mode\r
     TCCR2 |= (1<<CS20);                                                             // 0x01, start Timer 2, no prescaling\r
-#else\r
+#elif IRSND_OCx == IRSND_OC2A || IRSND_OCx == IRSND_OC2B                                              // use OC2A or OC2B\r
     TCCR2A = (1<<WGM21);                                                            // CTC mode\r
     TCCR2B |= (1<<CS20);                                                            // 0x01, start Timer 2, no prescaling\r
-#endif  // __AVR...    \r
+#elif IRSND_OCx == IRSND_OC0                                                                // use OC0\r
+    TCCR0 = (1<<WGM01);                                                             // CTC mode\r
+    TCCR0 |= (1<<CS00);                                                             // 0x01, start Timer 0, no prescaling\r
+#elif IRSND_OCx == IRSND_OC0A || IRSND_OCx == IRSND_OC0B                                              // use OC0A or OC0B\r
+    TCCR0A = (1<<WGM01);                                                            // CTC mode\r
+    TCCR0B |= (1<<CS00);                                                            // 0x01, start Timer 0, no prescaling\r
+#else\r
+#error wrong value of IRSND_OCx\r
+#endif\r
 \r
     irsnd_set_freq (IRSND_FREQ_36_KHZ);                                             // default frequency\r
 #endif // DEBUG\r
@@ -519,11 +621,10 @@ irsnd_send_data (IRMP_DATA * irmp_data_p, uint8_t do_wait)
 \r
             irsnd_protocol = IRMP_NEC_PROTOCOL;                                                         // APPLE protocol is NEC with id instead of inverted command\r
 \r
-            irsnd_buffer[0] = (address & 0xFF00) >> 8;                                                  // AAAAAAAA\r
-            irsnd_buffer[1] = (address & 0x00FF);                                                       // AAAAAAAA\r
-            irsnd_buffer[2] = (command & 0xFF00) >> 8;                                                  // CCCCCCCC\r
-            irsnd_buffer[3] = (command & 0x00FF);                                                       // CCCCCCCC\r
-\r
+            irsnd_buffer[0] = (address & 0xFF00) >> 8;                                                          // AAAAAAAA\r
+            irsnd_buffer[1] = (address & 0x00FF);                                                               // AAAAAAAA\r
+            irsnd_buffer[2] = (command & 0xFF00) >> 8;                                                          // CCCCCCCC\r
+            irsnd_buffer[3] = 0x8B;                                                                             // 10001011 (id)\r
             irsnd_busy      = TRUE;\r
             break;\r
         }\r
@@ -535,13 +636,35 @@ irsnd_send_data (IRMP_DATA * irmp_data_p, uint8_t do_wait)
             irsnd_buffer[0] = (address & 0xFF00) >> 8;                                                          // AAAAAAAA\r
             irsnd_buffer[1] = (address & 0x00FF);                                                               // AAAAAAAA\r
             irsnd_buffer[2] = (command & 0xFF00) >> 8;                                                          // CCCCCCCC\r
+            irsnd_buffer[3] = ~((command & 0xFF00) >> 8);                                                       // cccccccc\r
+            irsnd_busy      = TRUE;\r
+            break;\r
+        }\r
+#endif\r
+#if IRSND_SUPPORT_NEC16_PROTOCOL == 1\r
+        case IRMP_NEC16_PROTOCOL:\r
+        {\r
+            address = bitsrevervse (irmp_data_p->address, NEC16_ADDRESS_LEN);\r
+            command = bitsrevervse (irmp_data_p->command, NEC16_COMMAND_LEN);\r
 \r
-            irsnd_protocol = IRMP_NEC_PROTOCOL; // APPLE protocol is NEC with fix bitmask instead of inverted command\r
-            irsnd_buffer[3] = 0x8B;                                                                         // 10001011\r
-            {\r
-                irsnd_buffer[3] = ~((command & 0xFF00) >> 8);                                                   // cccccccc\r
-            }\r
-\r
+            irsnd_buffer[0] = (address & 0x00FF);                                                               // AAAAAAAA\r
+            irsnd_buffer[1] = (command & 0x00FF);                                                               // CCCCCCCC\r
+            irsnd_busy      = TRUE;\r
+            break;\r
+        }\r
+#endif\r
+#if IRSND_SUPPORT_NEC42_PROTOCOL == 1\r
+        case IRMP_NEC42_PROTOCOL:\r
+        {\r
+            address = bitsrevervse (irmp_data_p->address, NEC42_ADDRESS_LEN);\r
+            command = bitsrevervse (irmp_data_p->command, NEC42_COMMAND_LEN);\r
+\r
+            irsnd_buffer[0] = ( (address & 0x1FE0) >> 5);                                                       // AAAAAAAA\r
+            irsnd_buffer[1] = ( (address & 0x001F) << 3) | ((~address & 0x1C00) >> 10);                          // AAAAAaaa\r
+            irsnd_buffer[2] =                              ((~address & 0x03FC) >> 2);                          // aaaaaaaa\r
+            irsnd_buffer[3] = ((~address & 0x0003) << 6) | ( (command & 0x00FC) >> 2);                          // aaCCCCCC\r
+            irsnd_buffer[4] = ( (command & 0x0003) << 6) | ((~command & 0x00FC) >> 2);                          // CCcccccc\r
+            irsnd_buffer[5] = ((~command & 0x0003) << 6);                                                       // cc\r
             irsnd_busy      = TRUE;\r
             break;\r
         }\r
@@ -997,6 +1120,42 @@ irsnd_ISR (void)
                         break;\r
                     }\r
 #endif\r
+#if IRSND_SUPPORT_NEC16_PROTOCOL == 1\r
+                    case IRMP_NEC16_PROTOCOL:\r
+                    {\r
+                        startbit_pulse_len          = NEC_START_BIT_PULSE_LEN;\r
+                        startbit_pause_len          = NEC_START_BIT_PAUSE_LEN - 1;\r
+                        pulse_1_len                 = NEC_PULSE_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 - 1;\r
+                        has_stop_bit                = NEC_STOP_BIT;\r
+                        complete_data_len           = NEC16_COMPLETE_DATA_LEN + 1;                  // 1 more: sync bit\r
+                        n_auto_repetitions          = 1;                                            // 1 frame\r
+                        auto_repetition_pause_len   = 0;\r
+                        repeat_frame_pause_len      = NEC_FRAME_REPEAT_PAUSE_LEN;\r
+                        irsnd_set_freq (IRSND_FREQ_38_KHZ);\r
+                        break;\r
+                    }\r
+#endif\r
+#if IRSND_SUPPORT_NEC42_PROTOCOL == 1\r
+                    case IRMP_NEC42_PROTOCOL:\r
+                    {\r
+                        startbit_pulse_len          = NEC_START_BIT_PULSE_LEN;\r
+                        startbit_pause_len          = NEC_START_BIT_PAUSE_LEN - 1;\r
+                        pulse_1_len                 = NEC_PULSE_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 - 1;\r
+                        has_stop_bit                = NEC_STOP_BIT;\r
+                        complete_data_len           = NEC42_COMPLETE_DATA_LEN;\r
+                        n_auto_repetitions          = 1;                                            // 1 frame\r
+                        auto_repetition_pause_len   = 0;\r
+                        repeat_frame_pause_len      = NEC_FRAME_REPEAT_PAUSE_LEN;\r
+                        irsnd_set_freq (IRSND_FREQ_38_KHZ);\r
+                        break;\r
+                    }\r
+#endif\r
 #if IRSND_SUPPORT_SAMSUNG_PROTOCOL == 1\r
                     case IRMP_SAMSUNG_PROTOCOL:\r
                     {\r
@@ -1392,6 +1551,12 @@ irsnd_ISR (void)
 #if IRSND_SUPPORT_NEC_PROTOCOL == 1\r
                 case IRMP_NEC_PROTOCOL:\r
 #endif\r
+#if IRSND_SUPPORT_NEC16_PROTOCOL == 1\r
+                case IRMP_NEC16_PROTOCOL:\r
+#endif\r
+#if IRSND_SUPPORT_NEC42_PROTOCOL == 1\r
+                case IRMP_NEC42_PROTOCOL:\r
+#endif\r
 #if IRSND_SUPPORT_SAMSUNG_PROTOCOL == 1\r
                 case IRMP_SAMSUNG_PROTOCOL:\r
                 case IRMP_SAMSUNG32_PROTOCOL:\r
@@ -1437,7 +1602,8 @@ irsnd_ISR (void)
 #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
+#if IRSND_SUPPORT_SIRCS_PROTOCOL == 1  || IRSND_SUPPORT_NEC_PROTOCOL == 1 || IRSND_SUPPORT_NEC16_PROTOCOL == 1 || IRSND_SUPPORT_NEC42_PROTOCOL == 1 || \\r
+    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 || IRSND_SUPPORT_LEGO_PROTOCOL == 1 || IRSND_SUPPORT_THOMSON_PROTOCOL == 1 \r
@@ -1477,6 +1643,32 @@ irsnd_ISR (void)
                             else\r
 #endif\r
 \r
+#if IRSND_SUPPORT_NEC16_PROTOCOL == 1\r
+                            if (irsnd_protocol == IRMP_NEC16_PROTOCOL)\r
+                            {\r
+                                if (current_bit < NEC16_ADDRESS_LEN)                                // send address bits\r
+                                {\r
+                                    pulse_len = NEC_PULSE_LEN;\r
+                                    pause_len = (irsnd_buffer[current_bit / 8] & (1<<(7-(current_bit % 8)))) ?\r
+                                                    (NEC_1_PAUSE_LEN - 1) : (NEC_0_PAUSE_LEN - 1);\r
+                                }\r
+                                else if (current_bit == NEC16_ADDRESS_LEN)                          // send SYNC bit (8th bit)\r
+                                {\r
+                                    pulse_len = NEC_PULSE_LEN;\r
+                                    pause_len = NEC_START_BIT_PAUSE_LEN - 1;\r
+                                }\r
+                                else if (current_bit < NEC16_COMPLETE_DATA_LEN + 1)                 // send n'th bit\r
+                                {\r
+                                    uint8_t cur_bit = current_bit - 1;                              // sync skipped, offset = -1 !\r
+\r
+                                    pulse_len = NEC_PULSE_LEN;\r
+                                    pause_len = (irsnd_buffer[cur_bit / 8] & (1<<(7-(cur_bit % 8)))) ?\r
+                                                    (NEC_1_PAUSE_LEN - 1) : (NEC_0_PAUSE_LEN - 1);\r
+                                }\r
+                            }\r
+                            else\r
+#endif\r
+\r
 #if IRSND_SUPPORT_BANG_OLUFSEN_PROTOCOL == 1\r
                             if (irsnd_protocol == IRMP_BANG_OLUFSEN_PROTOCOL)\r
                             {\r