Version 2.1.1: added GRUNDIG2 protocol

git-svn-id: svn://mikrocontroller.net/irmp@89 aeb2e35e-bfc4-4214-b83c-9e8de998ed28

diff --git a/irmp.c b/irmp.c
index 1496c6bbe9a7aa2c212b1280a18b4fad10a6ad86..ea36ed0e907a51b63c383180be810ef117e3ee5a 100644 (file)
--- a/irmp.c
+++ b/irmp.c
@@ -3,7 +3,7 @@
  *\r
  * Copyright (c) 2009-2011 Frank Meyer - frank(at)fli4l.de\r
  *\r
- * $Id: irmp.c,v 1.113 2012/02/16 10:40:07 fm Exp $\r
+ * $Id: irmp.c,v 1.115 2012/02/21 08:41:46 fm Exp $\r
  *\r
  * ATMEGA88 @ 8 MHz\r
  *\r
@@ -375,6 +375,7 @@ typedef unsigned int16  uint16_t;
     IRMP_SUPPORT_RC6_PROTOCOL == 1 ||                   \\r
     IRMP_SUPPORT_GRUNDIG_NOKIA_IR60_PROTOCOL == 1 ||    \\r
     IRMP_SUPPORT_SIEMENS_OR_RUWIDO_PROTOCOL == 1 ||     \\r
+    IRMP_SUPPORT_GRUNDIG2_PROTOCOL == 1 ||              \\r
     IRMP_SUPPORT_IR60_PROTOCOL\r
 #define IRMP_SUPPORT_MANCHESTER                 1\r
 #else\r
@@ -601,6 +602,15 @@ typedef unsigned int16  uint16_t;
 #define SIEMENS_OR_RUWIDO_BIT_PAUSE_LEN_MIN             ((uint8_t)(F_INTERRUPTS * SIEMENS_OR_RUWIDO_BIT_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
 #define SIEMENS_OR_RUWIDO_BIT_PAUSE_LEN_MAX             ((uint8_t)(F_INTERRUPTS * SIEMENS_OR_RUWIDO_BIT_PAUSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
 \r
+#define GRUNDIG2_START_BIT_PULSE_LEN_MIN        ((uint8_t)(F_INTERRUPTS * GRUNDIG2_START_BIT_PULSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
+#define GRUNDIG2_START_BIT_PULSE_LEN_MAX        ((uint8_t)(F_INTERRUPTS * GRUNDIG2_START_BIT_PULSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
+#define GRUNDIG2_START_BIT_PAUSE_LEN_MIN        ((uint8_t)(F_INTERRUPTS * GRUNDIG2_START_BIT_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
+#define GRUNDIG2_START_BIT_PAUSE_LEN_MAX        ((uint8_t)(F_INTERRUPTS * GRUNDIG2_START_BIT_PAUSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
+#define GRUNDIG2_BIT_PULSE_LEN_MIN              ((uint8_t)(F_INTERRUPTS * GRUNDIG2_BIT_PULSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
+#define GRUNDIG2_BIT_PULSE_LEN_MAX              ((uint8_t)(F_INTERRUPTS * GRUNDIG2_BIT_PULSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
+#define GRUNDIG2_BIT_PAUSE_LEN_MIN              ((uint8_t)(F_INTERRUPTS * GRUNDIG2_BIT_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
+#define GRUNDIG2_BIT_PAUSE_LEN_MAX              ((uint8_t)(F_INTERRUPTS * GRUNDIG2_BIT_PAUSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
+\r
 #define FDC_START_BIT_PULSE_LEN_MIN             ((uint8_t)(F_INTERRUPTS * FDC_START_BIT_PULSE_TIME * MIN_TOLERANCE_05 + 0.5) - 1)   // 5%: avoid conflict with NETBOX\r
 #define FDC_START_BIT_PULSE_LEN_MAX             ((uint8_t)(F_INTERRUPTS * FDC_START_BIT_PULSE_TIME * MAX_TOLERANCE_05 + 0.5))\r
 #define FDC_START_BIT_PAUSE_LEN_MIN             ((uint8_t)(F_INTERRUPTS * FDC_START_BIT_PAUSE_TIME * MIN_TOLERANCE_05 + 0.5) - 1)\r
@@ -782,7 +792,7 @@ irmp_protocol_names[IRMP_N_PROTOCOLS + 1] =
 #define UART0_TXEN_BIT_VALUE                    (1<<TXEN0)\r
 #define UART0_UDR                               UDR0\r
 #define UART0_U2X                               U2X0\r
-       \r
+        \r
 #else\r
 \r
 #define UART0_UBRRH                             UBRRH\r
@@ -826,7 +836,7 @@ irmp_uart_init (void)
     UART0_UCSRC = UART0_UCSZ1_BIT_VALUE | UART0_UCSZ0_BIT_VALUE | UART0_URSEL_BIT_VALUE;\r
     UART0_UCSRB |= UART0_TXEN_BIT_VALUE;                                                            // enable UART TX\r
 #else                                                                                               // other log method\r
-       initextlog();                                                         \r
+        initextlog();                                                         \r
 #endif //IRMP_EXT_LOGGING\r
 }\r
 \r
@@ -1354,6 +1364,31 @@ static const PROGMEM IRMP_PARAMETER ruwido_param =
 \r
 #endif\r
 \r
+#if IRMP_SUPPORT_GRUNDIG2_PROTOCOL == 1\r
+\r
+static const PROGMEM IRMP_PARAMETER grundig2_param =\r
+{\r
+    IRMP_GRUNDIG2_PROTOCOL,                                             // protocol:        ir protocol\r
+    GRUNDIG2_BIT_PULSE_LEN_MIN,                                         // pulse_1_len_min: here: minimum length of short pulse\r
+    GRUNDIG2_BIT_PULSE_LEN_MAX,                                         // pulse_1_len_max: here: maximum length of short pulse\r
+    GRUNDIG2_BIT_PAUSE_LEN_MIN,                                         // pause_1_len_min: here: minimum length of short pause\r
+    GRUNDIG2_BIT_PAUSE_LEN_MAX,                                         // pause_1_len_max: here: maximum length of short pause\r
+    0,                                                                  // pulse_0_len_min: here: not used\r
+    0,                                                                  // pulse_0_len_max: here: not used\r
+    0,                                                                  // pause_0_len_min: here: not used\r
+    0,                                                                  // pause_0_len_max: here: not used\r
+    GRUNDIG2_ADDRESS_OFFSET,                                            // address_offset:  address offset\r
+    GRUNDIG2_ADDRESS_OFFSET + GRUNDIG2_ADDRESS_LEN,                     // address_end:     end of address\r
+    GRUNDIG2_COMMAND_OFFSET,                                            // command_offset:  command offset\r
+    GRUNDIG2_COMMAND_OFFSET + GRUNDIG2_COMMAND_LEN,                     // command_end:     end of command\r
+    GRUNDIG2_COMPLETE_DATA_LEN,                                         // complete_len:    complete length of frame\r
+    GRUNDIG2_STOP_BIT,                                                  // stop_bit:        flag: frame has stop bit\r
+    GRUNDIG2_LSB,                                                       // lsb_first:       flag: LSB first\r
+    GRUNDIG2_FLAGS                                                      // flags:           some flags\r
+};\r
+\r
+#endif\r
+\r
 #if IRMP_SUPPORT_FDC_PROTOCOL == 1\r
 \r
 static const PROGMEM IRMP_PARAMETER fdc_param =\r
@@ -1620,6 +1655,15 @@ irmp_get_data (IRMP_DATA * irmp_data_p)
                 }\r
                 break;\r
 #endif\r
+#if IRMP_SUPPORT_GRUNDIG2_PROTOCOL == 1\r
+            case IRMP_GRUNDIG2_PROTOCOL:\r
+                if (irmp_command & 0x0001)\r
+                {\r
+                    irmp_command >>= 1;\r
+                    rtc = TRUE;\r
+                }\r
+                break;\r
+#endif\r
 #if IRMP_SUPPORT_KATHREIN_PROTOCOL == 1\r
             case IRMP_KATHREIN_PROTOCOL:\r
                 if (irmp_command != 0x0000)\r
@@ -1818,7 +1862,7 @@ irmp_store_bit (uint8_t value)
         {\r
             irmp_tmp_command |= (((uint16_t) (value)) << (irmp_bit - 8));       // store 4 system bits (genre 1) in upper nibble with LSB first\r
         }\r
-       else if (irmp_bit >= 24 && irmp_bit < 28)\r
+        else if (irmp_bit >= 24 && irmp_bit < 28)\r
         {\r
             genre2 |= (((uint8_t) (value)) << (irmp_bit - 20));                 // store 4 system bits (genre 2) in upper nibble with LSB first\r
         }\r
@@ -2337,6 +2381,22 @@ irmp_ISR (void)
                     else\r
 #endif // IRMP_SUPPORT_SIEMENS_OR_RUWIDO_PROTOCOL == 1\r
 \r
+#if IRMP_SUPPORT_GRUNDIG2_PROTOCOL == 1\r
+                    if ((irmp_pulse_time >= GRUNDIG2_START_BIT_PULSE_LEN_MIN && irmp_pulse_time <= GRUNDIG2_START_BIT_PULSE_LEN_MAX) &&\r
+                        (irmp_pause_time >= GRUNDIG2_START_BIT_PAUSE_LEN_MIN && irmp_pause_time <= GRUNDIG2_START_BIT_PAUSE_LEN_MAX))\r
+                    {                                                           // it's GRUNDIG2\r
+                        ANALYZE_PRINTF ("protocol = GRUNDIG2, start bit timings: pulse: %3d - %3d or %3d - %3d, pause: %3d - %3d or %3d - %3d\n",\r
+                                        GRUNDIG2_START_BIT_PULSE_LEN_MIN,   GRUNDIG2_START_BIT_PULSE_LEN_MAX,\r
+                                        2 * GRUNDIG2_START_BIT_PULSE_LEN_MIN, 2 * GRUNDIG2_START_BIT_PULSE_LEN_MAX,\r
+                                        GRUNDIG2_START_BIT_PAUSE_LEN_MIN,   GRUNDIG2_START_BIT_PAUSE_LEN_MAX,\r
+                                        2 * GRUNDIG2_START_BIT_PAUSE_LEN_MIN, 2 * GRUNDIG2_START_BIT_PAUSE_LEN_MAX);\r
+                        irmp_param_p = (IRMP_PARAMETER *) &grundig2_param;\r
+                        last_pause = irmp_pause_time;\r
+                        last_value  = 1;\r
+                    }\r
+                    else\r
+#endif // IRMP_SUPPORT_SIEMENS_OR_RUWIDO_PROTOCOL == 1\r
+\r
 #if IRMP_SUPPORT_FDC_PROTOCOL == 1\r
                     if (irmp_pulse_time >= FDC_START_BIT_PULSE_LEN_MIN && irmp_pulse_time <= FDC_START_BIT_PULSE_LEN_MAX &&\r
                         irmp_pause_time >= FDC_START_BIT_PAUSE_LEN_MIN && irmp_pause_time <= FDC_START_BIT_PAUSE_LEN_MAX)\r
@@ -3360,7 +3420,7 @@ irmp_ISR (void)
                                 irmp_ir_detected = FALSE;\r
                             }\r
 \r
-                            irmp_flags |= genre2;      // write the genre2 bits into MSB of the flag byte\r
+                            irmp_flags |= genre2;       // write the genre2 bits into MSB of the flag byte\r
                         }\r
 #endif // IRMP_SUPPORT_KASEIKYO_PROTOCOL == 1\r
 \r
@@ -3574,6 +3634,14 @@ print_timings (void)
             2 * SIEMENS_OR_RUWIDO_BIT_PULSE_LEN_MIN, 2 * SIEMENS_OR_RUWIDO_BIT_PULSE_LEN_MAX,\r
             2 * SIEMENS_OR_RUWIDO_BIT_PAUSE_LEN_MIN, 2 * SIEMENS_OR_RUWIDO_BIT_PAUSE_LEN_MAX);\r
 \r
+    printf ("GRUNDIG2       1  %3d - %3d  %3d - %3d  %3d - %3d  %3d - %3d  %3d - %3d  %3d - %3d\n",\r
+            GRUNDIG2_START_BIT_PULSE_LEN_MIN, GRUNDIG2_START_BIT_PULSE_LEN_MAX,\r
+            GRUNDIG2_START_BIT_PAUSE_LEN_MIN, GRUNDIG2_START_BIT_PAUSE_LEN_MAX,\r
+            GRUNDIG2_BIT_PULSE_LEN_MIN, GRUNDIG2_BIT_PULSE_LEN_MAX,\r
+            GRUNDIG2_BIT_PAUSE_LEN_MIN, GRUNDIG2_BIT_PAUSE_LEN_MAX,\r
+            2 * GRUNDIG2_BIT_PULSE_LEN_MIN, 2 * GRUNDIG2_BIT_PULSE_LEN_MAX,\r
+            2 * GRUNDIG2_BIT_PAUSE_LEN_MIN, 2 * GRUNDIG2_BIT_PAUSE_LEN_MAX);\r
+\r
     printf ("FDC            1  %3d - %3d  %3d - %3d  %3d - %3d  %3d - %3d  %3d - %3d  %3d - %3d\n",\r
             FDC_START_BIT_PULSE_LEN_MIN, FDC_START_BIT_PULSE_LEN_MAX, FDC_START_BIT_PAUSE_LEN_MIN, FDC_START_BIT_PAUSE_LEN_MAX,\r
             FDC_PULSE_LEN_MIN, FDC_PULSE_LEN_MAX, FDC_0_PAUSE_LEN_MIN, FDC_0_PAUSE_LEN_MAX,\r

diff --git a/irmp.h b/irmp.h
index ccaee8199c718e6c0e3e25fd78d396df43c95d4b..140c5a74ea7861dae1824542825e8cec7466e0d4 100644 (file)
--- a/irmp.h
+++ b/irmp.h
@@ -3,7 +3,7 @@
  *\r
  * Copyright (c) 2009-2011 Frank Meyer - frank(at)fli4l.de\r
  *\r
- * $Id: irmp.h,v 1.68 2012/02/13 10:55:50 fm Exp $\r
+ * $Id: irmp.h,v 1.70 2012/02/21 08:41:46 fm Exp $\r
  *\r
  * ATMEGA88 @ 8 MHz\r
  *\r
@@ -79,8 +79,9 @@ typedef uint8_t     PAUSE_LEN;
 #define IRMP_NEC42_PROTOCOL                     28              // NEC with 42 bits\r
 #define IRMP_LEGO_PROTOCOL                      29              // LEGO Power Functions RC\r
 #define IRMP_THOMSON_PROTOCOL                   30              // Thomson\r
+#define IRMP_GRUNDIG2_PROTOCOL                  31              // Grundig, e.g. TP400\r
 \r
-#define IRMP_N_PROTOCOLS                        30              // number of supported protocols\r
+#define IRMP_N_PROTOCOLS                        31              // number of supported protocols\r
 \r
 // some flags of struct IRMP_PARAMETER:\r
 #define IRMP_PARAM_FLAG_IS_MANCHESTER           0x01\r
@@ -156,7 +157,7 @@ typedef uint8_t     PAUSE_LEN;
 #define SAMSUNG32_COMPLETE_DATA_LEN             32                              // complete length\r
 #define SAMSUNG32_FRAMES                        1                               // SAMSUNG32 sends each frame 1 times\r
 #define SAMSUNG32_AUTO_REPETITION_PAUSE_TIME    47.0e-3                         // repetition after 47 ms\r
-#define SAMSUNG32_FRAME_REPEAT_PAUSE_TIME       47.0e-3                         // frame repeat after 40ms\r
+#define SAMSUNG32_FRAME_REPEAT_PAUSE_TIME       47.0e-3                         // frame repeat after 47ms\r
 \r
 #define MATSUSHITA_START_BIT_PULSE_TIME         3488.0e-6                       // 3488 usec pulse\r
 #define MATSUSHITA_START_BIT_PAUSE_TIME         3488.0e-6                       // 3488 usec pause\r
@@ -481,6 +482,20 @@ typedef uint8_t     PAUSE_LEN;
 #define THOMSON_LSB                             0                               // MSB...LSB\r
 #define THOMSON_FLAGS                           0                               // flags\r
 \r
+#define GRUNDIG2_START_BIT_PULSE_TIME            550.0e-6                       //   550 usec pulse\r
+#define GRUNDIG2_START_BIT_PAUSE_TIME           2700.0e-6                       //  2700 usec pause\r
+#define GRUNDIG2_BIT_PULSE_TIME                  550.0e-6                       //   550 usec short pulse\r
+#define GRUNDIG2_BIT_PAUSE_TIME                  550.0e-6                       //   550 usec short pause\r
+#define GRUNDIG2_FRAME_REPEAT_PAUSE_TIME         100.0e-3                       // frame repeat after 100ms\r
+#define GRUNDIG2_STOP_BIT                       0                               // has no stop bit\r
+#define GRUNDIG2_LSB                            1                               // MSB...LSB\r
+#define GRUNDIG2_FLAGS                          (IRMP_PARAM_FLAG_IS_MANCHESTER | IRMP_PARAM_FLAG_1ST_PULSE_IS_1)  // flags\r
+#define GRUNDIG2_ADDRESS_OFFSET                 0                               // skip 0 bits\r
+#define GRUNDIG2_ADDRESS_LEN                    0                               // read 0 bits\r
+#define GRUNDIG2_COMMAND_OFFSET                 0                               // skip 0 bits\r
+#define GRUNDIG2_COMMAND_LEN                    7                               // read 6 + 1 command bits, last bit is always 1\r
+#define GRUNDIG2_COMPLETE_DATA_LEN              7                               // complete length\r
+\r
 #define AUTO_FRAME_REPETITION_TIME              80.0e-3                         // SIRCS/SAMSUNG32/NUBERT: automatic repetition after 25-50ms\r
                                                                                 // KASEIKYO: automatic repetition after 75ms\r
 \r

diff --git a/irmpconfig.h b/irmpconfig.h
index a3037198381604e5cc841e726116b28b5d86a64a..225a0e4e91254707c3a740cb817a6e1b983e1af9 100644 (file)
--- a/irmpconfig.h
+++ b/irmpconfig.h
@@ -3,7 +3,7 @@
  *\r
  * Copyright (c) 2009-2011 Frank Meyer - frank(at)fli4l.de\r
  *\r
- * $Id: irmpconfig.h,v 1.78 2012/02/16 10:40:08 fm Exp $\r
+ * $Id: irmpconfig.h,v 1.80 2012/02/21 08:41:46 fm Exp $\r
  *\r
  * ATMEGA88 @ 8 MHz\r
  *\r
@@ -62,6 +62,7 @@
 #define IRMP_SUPPORT_NOKIA_PROTOCOL             0       // Nokia                >= 10000                 ~300 bytes\r
 \r
 // exotic protocols, enable here!               Enable  Remarks                 F_INTERRUPTS            Program Space\r
+#define IRMP_SUPPORT_GRUNDIG2_PROTOCOL          0       // Grundig TP400        >= 10000                 ~300 bytes\r
 #define IRMP_SUPPORT_KATHREIN_PROTOCOL          0       // Kathrein             >= 10000                 ~200 bytes\r
 #define IRMP_SUPPORT_NUBERT_PROTOCOL            0       // NUBERT               >= 10000                  ~50 bytes\r
 #define IRMP_SUPPORT_BANG_OLUFSEN_PROTOCOL      0       // Bang & Olufsen       >= 10000                 ~200 bytes\r

diff --git a/irsnd.c b/irsnd.c
index f08044f95a0ff1d769ff3fb9ae3a0b7ea84fc7a5..042737496ad85617649fd932b05edbca4ce85f0f 100644 (file)
--- a/irsnd.c
+++ b/irsnd.c
@@ -12,7 +12,7 @@
  * ATmega164, ATmega324, ATmega644,  ATmega644P, ATmega1284\r
  * ATmega88,  ATmega88P, ATmega168,  ATmega168P, ATmega328P\r
  *\r
- * $Id: irsnd.c,v 1.45 2012/02/13 11:02:29 fm Exp $\r
+ * $Id: irsnd.c,v 1.47 2012/02/16 12:37: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

diff --git a/irsnd.h b/irsnd.h
index a791ce558076832aea8b4bfa321f47599aa304f3..eb50d274d168aac0a142826e937227b0138cfb84 100644 (file)
--- a/irsnd.h
+++ b/irsnd.h
@@ -3,7 +3,7 @@
  *\r
  * Copyright (c) 2010-2011 Frank Meyer - frank(at)fli4l.de\r
  *\r
- * $Id: irsnd.h,v 1.5 2011/05/20 09:31:25 fm Exp $\r
+ * $Id: irsnd.h,v 1.7 2012/02/16 12:39:36 fm Exp $\r
  *\r
  * ATMEGA88 @ 8 MHz\r
  *\r
@@ -17,10 +17,10 @@
 #ifndef _WC_IRSND_H_\r
 #define _WC_IRSND_H_\r
 \r
-#if defined(__18CXX)                                       // Microchip C18 declaration of missing typedef\r
+#if defined(__18CXX)                                        // Microchip C18 declaration of missing typedef\r
 typedef unsigned char               uint8_t;\r
 typedef unsigned int                uint16_t;\r
-#endif \r
+#endif  \r
 \r
 #define IRSND_NO_REPETITIONS         0      // no repetitions\r
 #define IRSND_MAX_REPETITIONS       14      // max # of repetitions\r

diff --git a/irsndconfig.h b/irsndconfig.h
index b669221f25aab2c41e05bc5bb2df1b49d2523a0a..746f57a853708a85c99fa0b24c161d8c14dcc990 100644 (file)
--- a/irsndconfig.h
+++ b/irsndconfig.h
@@ -3,7 +3,7 @@
  *\r
  * Copyright (c) 2010-2011 Frank Meyer - frank(at)fli4l.de\r
  *\r
- * $Id: irsndconfig.h,v 1.27 2011/09/20 10:45:28 fm Exp $\r
+ * $Id: irsndconfig.h,v 1.29 2012/02/16 12:39:36 fm Exp $\r
  *\r
  * ATMEGA88 @ 8 MHz\r
  *\r
@@ -80,7 +80,7 @@
 #define IRSND_PIC_CCP1                          1       // PIC C18 RC2 = PWM1 module\r
 #define IRSND_PIC_CCP2                          2       // PIC C18 RC1 = PWM2 module\r
 \r
-#ifndef PIC_C18                                                                // AVR part\r
+#ifndef PIC_C18                                                                 // AVR part\r
 \r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
  * AVR\r
@@ -91,8 +91,8 @@
  *                                              IRSND_OC0  = OC0  on ATmegas         supporting OC0,  e.g. ATmega162\r
  *                                              IRSND_OC0A = OC0A on ATmegas/ATtinys supporting OC0A, e.g. ATtiny84, ATtiny85\r
  *                                              IRSND_OC0B = OC0B on ATmegas/ATtinys supporting OC0B, e.g. ATtiny84, ATtiny85\r
- *                                                                                             IRSND_PIC_CCP1 = RC2 on PIC 18F2550/18F4550, ...\r
- *                                                                                             IRSND_PIC_CCP2 = RC1 on PIC 18F2550/18F4550, ...\r
+ *                                                                                              IRSND_PIC_CCP1 = RC2 on PIC 18F2550/18F4550, ...\r
+ *                                                                                              IRSND_PIC_CCP2 = RC1 on PIC 18F2550/18F4550, ...\r
  *---------------------------------------------------------------------------------------------------------------------------------------------------\r
  */\r
 \r
@@ -102,12 +102,12 @@
  * PIC C18\r
  *\r
  * Change hardware pin here:                    IRSND_PIC_CCP1 = RC2 on PIC 18F2550/18F4550, ...\r
- *                                                                                             IRSND_PIC_CCP2 = RC1 on PIC 18F2550/18F4550, ...\r
+ *                                                                                              IRSND_PIC_CCP2 = RC1 on PIC 18F2550/18F4550, ...\r
  *---------------------------------------------------------------------------------------------------------------------------------------------------\r
  */\r
 \r
 #else\r
-#define IRSND_OCx                                  IRSND_PIC_CCP2      // Use PWMx for PIC\r
+#define IRSND_OCx                                   IRSND_PIC_CCP2      // Use PWMx for PIC\r
 \r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
  * PIC C18 - change other PIC specific settings - ignore it when using AVR\r
@@ -125,9 +125,9 @@
 #if IRSND_OCx == IRSND_PIC_CCP2        \r
 #define IRSND_PIN                               TRISCbits.TRISC1    // RC1 = PWM2\r
 \r
-#define SetDCPWM(x)                            SetDCPWM2(x)                    \r
-#define ClosePWM                                       ClosePWM2\r
-#define OpenPWM(x)                                     OpenPWM2(x) \r
+#define SetDCPWM(x)                             SetDCPWM2(x)                    \r
+#define ClosePWM                                        ClosePWM2\r
+#define OpenPWM(x)                                      OpenPWM2(x) \r
 #endif\r
 \r
 #if IRSND_OCx == IRSND_PIC_CCP1        \r