]> cloudbase.mooo.com Git - irmp.git/blobdiff - irmp.c
Version 2.6.0: added SAMSUNG48 protocol (in IRSND).
[irmp.git] / irmp.c
diff --git a/irmp.c b/irmp.c
index 0c4fcb1cd0da78bab4d144c862320025bc5409fa..851c270f63beb6976962bae3598495d92798815c 100644 (file)
--- a/irmp.c
+++ b/irmp.c
@@ -3,7 +3,7 @@
  *\r
  * Copyright (c) 2009-2013 Frank Meyer - frank(at)fli4l.de\r
  *\r
- * $Id: irmp.c,v 1.152 2014/07/01 08:33:10 fm Exp $\r
+ * $Id: irmp.c,v 1.159 2014/07/09 15:31:25 fm Exp $\r
  *\r
  * ATMEGA88 @ 8 MHz\r
  *\r
@@ -542,6 +542,7 @@ irmp_protocol_names[IRMP_N_PROTOCOLS + 1] =
     "RCMM12",\r
     "SPEAKER",\r
     "LGAIR",\r
+    "SAMSG48",\r
     "RADIO1"\r
 };\r
 \r
@@ -553,13 +554,24 @@ irmp_protocol_names[IRMP_N_PROTOCOLS + 1] =
  */\r
 #if IRMP_LOGGING == 1                                               // logging via UART\r
 \r
-#if IRMP_EXT_LOGGING == 1                                           // use external logging\r
-#include "irmpextlog.h"\r
-#else                                                               // normal UART log (IRMP_EXT_LOGGING == 0)\r
-#define BAUD                                    9600L\r
-#ifndef UNIX_OR_WINDOWS\r
-#include <util/setbaud.h>\r
-#endif\r
+#if defined(ARM_STM32F4XX)\r
+#  define  STM32_GPIO_CLOCK   RCC_AHB1Periph_GPIOA                    // per UART2 an PA2\r
+#  define  STM32_UART_CLOCK   RCC_APB1Periph_USART2\r
+#  define  STM32_GPIO_PORT    GPIOA\r
+#  define  STM32_GPIO_PIN     GPIO_Pin_2\r
+#  define  STM32_GPIO_SOURCE  GPIO_PinSource2\r
+#  define  STM32_UART_AF      GPIO_AF_USART2\r
+#  define  STM32_UART_COM     USART2\r
+#  define  STM32_UART_BAUD    115200                                  // mit 115200 Baud\r
+#  include "stm32f4xx_usart.h"\r
+#else\r
+#  if IRMP_EXT_LOGGING == 1                                           // use external logging\r
+#    include "irmpextlog.h"\r
+#  else                                                               // normal UART log (IRMP_EXT_LOGGING == 0)\r
+#    define BAUD                                    9600L\r
+#  ifndef UNIX_OR_WINDOWS\r
+#    include <util/setbaud.h>\r
+#  endif\r
 \r
 #ifdef UBRR0H\r
 \r
@@ -601,6 +613,7 @@ irmp_protocol_names[IRMP_N_PROTOCOLS + 1] =
 \r
 #endif //UBRR0H\r
 #endif //IRMP_EXT_LOGGING\r
+#endif //ARM_STM32F4XX\r
 \r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
  *  Initialize  UART\r
@@ -611,6 +624,45 @@ void
 irmp_uart_init (void)\r
 {\r
 #ifndef UNIX_OR_WINDOWS\r
+#if defined(ARM_STM32F4XX)\r
+    GPIO_InitTypeDef GPIO_InitStructure;\r
+    USART_InitTypeDef USART_InitStructure;\r
+\r
+    // Clock enable vom TX Pin\r
+    RCC_AHB1PeriphClockCmd(STM32_GPIO_CLOCK, ENABLE);\r
+\r
+    // Clock enable der UART\r
+    RCC_APB1PeriphClockCmd(STM32_UART_CLOCK, ENABLE);\r
+\r
+    // UART Alternative-Funktion mit dem IO-Pin verbinden\r
+    GPIO_PinAFConfig(STM32_GPIO_PORT,STM32_GPIO_SOURCE,STM32_UART_AF);\r
+\r
+    // UART als Alternative-Funktion mit PushPull\r
+    GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF;\r
+    GPIO_InitStructure.GPIO_Speed = GPIO_Speed_100MHz;\r
+    GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;\r
+    GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP;\r
+\r
+    // TX-Pin\r
+    GPIO_InitStructure.GPIO_Pin = STM32_GPIO_PIN;\r
+    GPIO_Init(STM32_GPIO_PORT, &GPIO_InitStructure);\r
+\r
+    // Oversampling\r
+    USART_OverSampling8Cmd(STM32_UART_COM, ENABLE);\r
+\r
+    // init mit Baudrate, 8Databits, 1Stopbit, keine Parität, kein RTS+CTS\r
+    USART_InitStructure.USART_BaudRate = STM32_UART_BAUD;\r
+    USART_InitStructure.USART_WordLength = USART_WordLength_8b;\r
+    USART_InitStructure.USART_StopBits = USART_StopBits_1;\r
+    USART_InitStructure.USART_Parity = USART_Parity_No;\r
+    USART_InitStructure.USART_HardwareFlowControl = USART_HardwareFlowControl_None;\r
+    USART_InitStructure.USART_Mode = USART_Mode_Tx;\r
+    USART_Init(STM32_UART_COM, &USART_InitStructure);\r
+\r
+    // UART enable\r
+    USART_Cmd(STM32_UART_COM, ENABLE);\r
+\r
+#else\r
 #if (IRMP_EXT_LOGGING == 0)                                                                         // use UART\r
     UART0_UBRRH = UBRRH_VALUE;                                                                      // set baud rate\r
     UART0_UBRRL = UBRRL_VALUE;\r
@@ -624,8 +676,9 @@ 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
+#endif //ARM_STM32F4XX\r
 #endif // UNIX_OR_WINDOWS\r
 }\r
 \r
@@ -639,16 +692,37 @@ void
 irmp_uart_putc (unsigned char ch)\r
 {\r
 #ifndef UNIX_OR_WINDOWS\r
+#if defined(ARM_STM32F4XX)\r
+    // warten bis altes Byte gesendet wurde\r
+    while (USART_GetFlagStatus(STM32_UART_COM, USART_FLAG_TXE) == RESET)\r
+    {\r
+        ;\r
+    }\r
+\r
+    USART_SendData(STM32_UART_COM, ch);\r
+\r
+    if (ch == '\n')\r
+    {\r
+        while (USART_GetFlagStatus(STM32_UART_COM, USART_FLAG_TXE) == RESET);\r
+        USART_SendData(STM32_UART_COM, '\r');\r
+    }\r
+\r
+#else\r
 #if (IRMP_EXT_LOGGING == 0)\r
+\r
     while (!(UART0_UCSRA & UART0_UDRE_BIT_VALUE))\r
     {\r
         ;\r
     }\r
 \r
     UART0_UDR = ch;\r
+\r
 #else\r
-    sendextlog(ch); //Use external log\r
-#endif\r
+\r
+    sendextlog(ch);                                                         // use external log\r
+\r
+#endif //IRMP_EXT_LOGGING\r
+#endif //ARM_STM32F4XX\r
 #else\r
     fputc (ch, stderr);\r
 #endif // UNIX_OR_WINDOWS\r
@@ -1754,7 +1828,15 @@ irmp_get_data (IRMP_DATA * irmp_data_p)
                     rtc = TRUE;\r
                 }\r
                 break;\r
+\r
+#if IRMP_SUPPORT_SAMSUNG48_PROTOCOL == 1\r
+            case IRMP_SAMSUNG48_PROTOCOL:\r
+                irmp_command = (irmp_command & 0x00FF) | ((irmp_id & 0x00FF) << 8);\r
+                rtc = TRUE;\r
+                break;\r
+#endif\r
 #endif\r
+\r
 #if IRMP_SUPPORT_NEC_PROTOCOL == 1\r
             case IRMP_NEC_PROTOCOL:\r
                 if ((irmp_command >> 8) == (~irmp_command & 0x00FF))\r
@@ -1766,7 +1848,7 @@ irmp_get_data (IRMP_DATA * irmp_data_p)
                 {\r
 #ifdef ANALYZE\r
                     ANALYZE_PRINTF ("Switching to APPLE protocol\n");\r
-#endif\r
+#endif // ANALYZE\r
                     irmp_protocol = IRMP_APPLE_PROTOCOL;\r
                     irmp_address = (irmp_command & 0xFF00) >> 8;\r
                     irmp_command &= 0x00FF;\r
@@ -1817,7 +1899,7 @@ irmp_get_data (IRMP_DATA * irmp_data_p)
                 {\r
 #ifdef ANALYZE\r
                     ANALYZE_PRINTF("Info IR60: got start instruction frame\n");\r
-#endif\r
+#endif // ANALYZE\r
                 }\r
                 break;\r
 #endif\r
@@ -1854,14 +1936,14 @@ irmp_get_data (IRMP_DATA * irmp_data_p)
                     {\r
 #ifdef ANALYZE\r
                         ANALYZE_PRINTF("error NETBOX: bit6/7 must be 0/1\n");\r
-#endif\r
+#endif // ANALYZE\r
                     }\r
                 }\r
                 else\r
                 {\r
 #ifdef ANALYZE\r
                     ANALYZE_PRINTF("error NETBOX: last bit not set\n");\r
-#endif\r
+#endif // ANALYZE\r
                 }\r
                 break;\r
 #endif\r
@@ -1879,7 +1961,7 @@ irmp_get_data (IRMP_DATA * irmp_data_p)
                 {\r
 #ifdef ANALYZE\r
                     ANALYZE_PRINTF ("CRC error in LEGO protocol\n");\r
-#endif\r
+#endif // ANALYZE\r
                     // rtc = TRUE;                              // don't accept codes with CRC errors\r
                 }\r
                 break;\r
@@ -1928,7 +2010,7 @@ irmp_set_callback_ptr (void (*cb)(uint8_t))
 static uint16_t irmp_tmp_address;                                                       // ir address\r
 static uint16_t irmp_tmp_command;                                                       // ir command\r
 \r
-#if IRMP_SUPPORT_RC5_PROTOCOL == 1 && (IRMP_SUPPORT_FDC_PROTOCOL == 1 || IRMP_SUPPORT_RCCAR_PROTOCOL == 1) || IRMP_SUPPORT_NEC42_PROTOCOL == 1\r
+#if (IRMP_SUPPORT_RC5_PROTOCOL == 1 && (IRMP_SUPPORT_FDC_PROTOCOL == 1 || IRMP_SUPPORT_RCCAR_PROTOCOL == 1)) || IRMP_SUPPORT_NEC42_PROTOCOL == 1\r
 static uint16_t irmp_tmp_address2;                                                      // ir address\r
 static uint16_t irmp_tmp_command2;                                                      // ir command\r
 #endif\r
@@ -2024,7 +2106,16 @@ irmp_store_bit (uint8_t value)
     {\r
         if (irmp_param.lsb_first)\r
         {\r
-            irmp_tmp_command |= (((uint16_t) (value)) << (irmp_bit - irmp_param.command_offset));   // CV wants cast\r
+#if IRMP_SUPPORT_SAMSUNG48_PROTOCOL == 1\r
+            if (irmp_param.protocol == IRMP_SAMSUNG48_PROTOCOL && irmp_bit >= 32)\r
+            {\r
+                irmp_tmp_id |= (((uint16_t) (value)) << (irmp_bit - 32));   // CV wants cast\r
+            }\r
+            else\r
+#endif\r
+            {\r
+                irmp_tmp_command |= (((uint16_t) (value)) << (irmp_bit - irmp_param.command_offset));   // CV wants cast\r
+            }\r
         }\r
         else\r
         {\r
@@ -2165,7 +2256,7 @@ irmp_ISR (void)
 \r
 #ifdef ANALYZE\r
     time_counter++;\r
-#endif\r
+#endif // ANALYZE\r
 \r
     irmp_input = input(IRMP_PIN);\r
 \r
@@ -2194,11 +2285,9 @@ irmp_ISR (void)
 #ifdef ANALYZE\r
                 if (! irmp_pulse_time)\r
                 {\r
-#ifdef ANALYZE\r
                     ANALYZE_PRINTF("%8.3fms [starting pulse]\n", (double) (time_counter * 1000) / F_INTERRUPTS);\r
-#endif\r
                 }\r
-#endif\r
+#endif // ANALYZE\r
                 irmp_pulse_time++;                                              // increment counter\r
             }\r
             else\r
@@ -2213,6 +2302,9 @@ irmp_ISR (void)
 #if IRMP_SUPPORT_KASEIKYO_PROTOCOL == 1\r
                     genre2                  = 0;\r
 #endif\r
+#if IRMP_SUPPORT_SAMSUNG_PROTOCOL == 1\r
+                    irmp_tmp_id = 0;\r
+#endif\r
 \r
 #if IRMP_SUPPORT_RC5_PROTOCOL == 1 && (IRMP_SUPPORT_FDC_PROTOCOL == 1 || IRMP_SUPPORT_RCCAR_PROTOCOL == 1) || IRMP_SUPPORT_NEC42_PROTOCOL == 1\r
                     irmp_tmp_command2       = 0;\r
@@ -2243,8 +2335,8 @@ irmp_ISR (void)
                             {\r
 #ifdef ANALYZE\r
                                 ANALYZE_PRINTF ("%8.3fms warning: did not receive inverted command repetition\n",\r
-#endif\r
                                                 (double) (time_counter * 1000) / F_INTERRUPTS);\r
+#endif // ANALYZE\r
                                 last_irmp_denon_command = 0;\r
                                 denon_repetition_len = 0xFFFF;\r
                             }\r
@@ -2280,9 +2372,9 @@ irmp_ISR (void)
 #ifdef ANALYZE\r
                             ANALYZE_PRINTF ("%8.3fms error 1: pause after start bit pulse %d too long: %d\n", (double) (time_counter * 1000) / F_INTERRUPTS, irmp_pulse_time, irmp_pause_time);\r
                             ANALYZE_ONLY_NORMAL_PUTCHAR ('\n');\r
-#endif\r
+#endif // ANALYZE\r
                         }\r
-//                      irmp_busy_flag = FALSE;\r
+\r
                         irmp_start_bit_detected = 0;                            // reset flags, let's wait for another start bit\r
                         irmp_pulse_time         = 0;\r
                         irmp_pause_time         = 0;\r
@@ -2298,7 +2390,7 @@ irmp_ISR (void)
 \r
 #ifdef ANALYZE\r
                     ANALYZE_PRINTF ("%8.3fms [start-bit: pulse = %2d, pause = %2d]\n", (double) (time_counter * 1000) / F_INTERRUPTS, irmp_pulse_time, irmp_pause_time);\r
-#endif\r
+#endif // ANALYZE\r
 \r
 #if IRMP_SUPPORT_SIRCS_PROTOCOL == 1\r
                     if (irmp_pulse_time >= SIRCS_START_BIT_PULSE_LEN_MIN && irmp_pulse_time <= SIRCS_START_BIT_PULSE_LEN_MAX &&\r
@@ -2308,7 +2400,7 @@ irmp_ISR (void)
                         ANALYZE_PRINTF ("protocol = SIRCS, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
                                         SIRCS_START_BIT_PULSE_LEN_MIN, SIRCS_START_BIT_PULSE_LEN_MAX,\r
                                         SIRCS_START_BIT_PAUSE_LEN_MIN, SIRCS_START_BIT_PAUSE_LEN_MAX);\r
-#endif\r
+#endif // ANALYZE\r
                         irmp_param_p = (IRMP_PARAMETER *) (IRMP_PARAMETER *) &sircs_param;\r
                     }\r
                     else\r
@@ -2323,7 +2415,7 @@ irmp_ISR (void)
                         ANALYZE_PRINTF ("protocol = NEC or JVC (type 1) repeat frame, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
                                         JVC_START_BIT_PULSE_LEN_MIN, JVC_START_BIT_PULSE_LEN_MAX,\r
                                         JVC_REPEAT_START_BIT_PAUSE_LEN_MIN, JVC_REPEAT_START_BIT_PAUSE_LEN_MAX);\r
-#endif\r
+#endif // ANALYZE\r
                         irmp_param_p = (IRMP_PARAMETER *) &nec_param;\r
                     }\r
                     else\r
@@ -2338,14 +2430,14 @@ irmp_ISR (void)
                         ANALYZE_PRINTF ("protocol = NEC42, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
                                         NEC_START_BIT_PULSE_LEN_MIN, NEC_START_BIT_PULSE_LEN_MAX,\r
                                         NEC_START_BIT_PAUSE_LEN_MIN, NEC_START_BIT_PAUSE_LEN_MAX);\r
-#endif\r
+#endif // ANALYZE\r
                         irmp_param_p = (IRMP_PARAMETER *) &nec42_param;\r
 #else\r
 #ifdef ANALYZE\r
                         ANALYZE_PRINTF ("protocol = NEC, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
                                         NEC_START_BIT_PULSE_LEN_MIN, NEC_START_BIT_PULSE_LEN_MAX,\r
                                         NEC_START_BIT_PAUSE_LEN_MIN, NEC_START_BIT_PAUSE_LEN_MAX);\r
-#endif\r
+#endif // ANALYZE\r
                         irmp_param_p = (IRMP_PARAMETER *) &nec_param;\r
 #endif\r
                     }\r
@@ -2359,7 +2451,7 @@ irmp_ISR (void)
                             ANALYZE_PRINTF ("protocol = JVC repeat frame type 2, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
                                             NEC_START_BIT_PULSE_LEN_MIN, NEC_START_BIT_PULSE_LEN_MAX,\r
                                             NEC_REPEAT_START_BIT_PAUSE_LEN_MIN, NEC_REPEAT_START_BIT_PAUSE_LEN_MAX);\r
-#endif\r
+#endif // ANALYZE\r
                             irmp_param_p = (IRMP_PARAMETER *) &nec_param;\r
                         }\r
                         else\r
@@ -2369,7 +2461,7 @@ irmp_ISR (void)
                             ANALYZE_PRINTF ("protocol = NEC (repetition frame), start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
                                             NEC_START_BIT_PULSE_LEN_MIN, NEC_START_BIT_PULSE_LEN_MAX,\r
                                             NEC_REPEAT_START_BIT_PAUSE_LEN_MIN, NEC_REPEAT_START_BIT_PAUSE_LEN_MAX);\r
-#endif\r
+#endif // ANALYZE\r
 \r
                             irmp_param_p = (IRMP_PARAMETER *) &nec_rep_param;\r
                         }\r
@@ -2385,7 +2477,7 @@ irmp_ISR (void)
                         ANALYZE_PRINTF ("protocol = JVC repeat frame type 3, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
                                         NEC_START_BIT_PULSE_LEN_MIN, NEC_START_BIT_PULSE_LEN_MAX,\r
                                         NEC_0_PAUSE_LEN_MIN, NEC_0_PAUSE_LEN_MAX);\r
-#endif\r
+#endif // ANALYZE\r
                         irmp_param_p = (IRMP_PARAMETER *) &nec_param;\r
                     }\r
                     else\r
@@ -2401,7 +2493,7 @@ irmp_ISR (void)
                         ANALYZE_PRINTF ("protocol = TELEFUNKEN, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
                                         TELEFUNKEN_START_BIT_PULSE_LEN_MIN, TELEFUNKEN_START_BIT_PULSE_LEN_MAX,\r
                                         TELEFUNKEN_START_BIT_PAUSE_LEN_MIN, TELEFUNKEN_START_BIT_PAUSE_LEN_MAX);\r
-#endif\r
+#endif // ANALYZE\r
                         irmp_param_p = (IRMP_PARAMETER *) &telefunken_param;\r
                     }\r
                     else\r
@@ -2415,7 +2507,7 @@ irmp_ISR (void)
                         ANALYZE_PRINTF ("protocol = ROOMBA, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
                                         ROOMBA_START_BIT_PULSE_LEN_MIN, ROOMBA_START_BIT_PULSE_LEN_MAX,\r
                                         ROOMBA_START_BIT_PAUSE_LEN_MIN, ROOMBA_START_BIT_PAUSE_LEN_MAX);\r
-#endif\r
+#endif // ANALYZE\r
                         irmp_param_p = (IRMP_PARAMETER *) &roomba_param;\r
                     }\r
                     else\r
@@ -2429,7 +2521,7 @@ irmp_ISR (void)
                         ANALYZE_PRINTF ("protocol = NIKON, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
                                         NIKON_START_BIT_PULSE_LEN_MIN, NIKON_START_BIT_PULSE_LEN_MAX,\r
                                         NIKON_START_BIT_PAUSE_LEN_MIN, NIKON_START_BIT_PAUSE_LEN_MAX);\r
-#endif\r
+#endif // ANALYZE\r
                         irmp_param_p = (IRMP_PARAMETER *) &nikon_param;\r
                     }\r
                     else\r
@@ -2443,7 +2535,7 @@ irmp_ISR (void)
                         ANALYZE_PRINTF ("protocol = SAMSUNG, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
                                         SAMSUNG_START_BIT_PULSE_LEN_MIN, SAMSUNG_START_BIT_PULSE_LEN_MAX,\r
                                         SAMSUNG_START_BIT_PAUSE_LEN_MIN, SAMSUNG_START_BIT_PAUSE_LEN_MAX);\r
-#endif\r
+#endif // ANALYZE\r
                         irmp_param_p = (IRMP_PARAMETER *) &samsung_param;\r
                     }\r
                     else\r
@@ -2457,7 +2549,7 @@ irmp_ISR (void)
                         ANALYZE_PRINTF ("protocol = MATSUSHITA, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
                                         MATSUSHITA_START_BIT_PULSE_LEN_MIN, MATSUSHITA_START_BIT_PULSE_LEN_MAX,\r
                                         MATSUSHITA_START_BIT_PAUSE_LEN_MIN, MATSUSHITA_START_BIT_PAUSE_LEN_MAX);\r
-#endif\r
+#endif // ANALYZE\r
                         irmp_param_p = (IRMP_PARAMETER *) &matsushita_param;\r
                     }\r
                     else\r
@@ -2471,7 +2563,7 @@ irmp_ISR (void)
                         ANALYZE_PRINTF ("protocol = KASEIKYO, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
                                         KASEIKYO_START_BIT_PULSE_LEN_MIN, KASEIKYO_START_BIT_PULSE_LEN_MAX,\r
                                         KASEIKYO_START_BIT_PAUSE_LEN_MIN, KASEIKYO_START_BIT_PAUSE_LEN_MAX);\r
-#endif\r
+#endif // ANALYZE\r
                         irmp_param_p = (IRMP_PARAMETER *) &kaseikyo_param;\r
                     }\r
                     else\r
@@ -2485,7 +2577,7 @@ irmp_ISR (void)
                         ANALYZE_PRINTF ("protocol = RADIO1, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
                                         RADIO1_START_BIT_PULSE_LEN_MIN, RADIO1_START_BIT_PULSE_LEN_MAX,\r
                                         RADIO1_START_BIT_PAUSE_LEN_MIN, RADIO1_START_BIT_PAUSE_LEN_MAX);\r
-#endif\r
+#endif // ANALYZE\r
                         irmp_param_p = (IRMP_PARAMETER *) &radio1_param;\r
                     }\r
                     else\r
@@ -2499,7 +2591,7 @@ irmp_ISR (void)
                         ANALYZE_PRINTF ("protocol = RECS80, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
                                         RECS80_START_BIT_PULSE_LEN_MIN, RECS80_START_BIT_PULSE_LEN_MAX,\r
                                         RECS80_START_BIT_PAUSE_LEN_MIN, RECS80_START_BIT_PAUSE_LEN_MAX);\r
-#endif\r
+#endif // ANALYZE\r
                         irmp_param_p = (IRMP_PARAMETER *) &recs80_param;\r
                     }\r
                     else\r
@@ -2523,7 +2615,7 @@ irmp_ISR (void)
                             ANALYZE_PRINTF ("RC5 start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
                                             RC5_START_BIT_LEN_MIN, RC5_START_BIT_LEN_MAX,\r
                                             RC5_START_BIT_LEN_MIN, RC5_START_BIT_LEN_MAX);\r
-#endif\r
+#endif // ANALYZE\r
                             memcpy_P (&irmp_param2, &fdc_param, sizeof (IRMP_PARAMETER));\r
                         }\r
                         else\r
@@ -2541,7 +2633,7 @@ irmp_ISR (void)
                             ANALYZE_PRINTF ("RC5 start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
                                             RC5_START_BIT_LEN_MIN, RC5_START_BIT_LEN_MAX,\r
                                             RC5_START_BIT_LEN_MIN, RC5_START_BIT_LEN_MAX);\r
-#endif\r
+#endif // ANALYZE\r
                             memcpy_P (&irmp_param2, &rccar_param, sizeof (IRMP_PARAMETER));\r
                         }\r
                         else\r
@@ -2553,7 +2645,7 @@ irmp_ISR (void)
                                             2 * RC5_START_BIT_LEN_MIN, 2 * RC5_START_BIT_LEN_MAX,\r
                                             RC5_START_BIT_LEN_MIN, RC5_START_BIT_LEN_MAX,\r
                                             2 * RC5_START_BIT_LEN_MIN, 2 * RC5_START_BIT_LEN_MAX);\r
-#endif\r
+#endif // ANALYZE\r
                         }\r
 \r
                         irmp_param_p = (IRMP_PARAMETER *) &rc5_param;\r
@@ -2583,7 +2675,7 @@ irmp_ISR (void)
                                         DENON_PULSE_LEN_MIN, DENON_PULSE_LEN_MAX,\r
                                         DENON_1_PAUSE_LEN_MIN, DENON_1_PAUSE_LEN_MAX,\r
                                         DENON_0_PAUSE_LEN_MIN, DENON_0_PAUSE_LEN_MAX);\r
-#endif\r
+#endif // ANALYZE\r
                         irmp_param_p = (IRMP_PARAMETER *) &denon_param;\r
                     }\r
                     else\r
@@ -2599,7 +2691,7 @@ irmp_ISR (void)
                                         THOMSON_PULSE_LEN_MIN, THOMSON_PULSE_LEN_MAX,\r
                                         THOMSON_1_PAUSE_LEN_MIN, THOMSON_1_PAUSE_LEN_MAX,\r
                                         THOMSON_0_PAUSE_LEN_MIN, THOMSON_0_PAUSE_LEN_MAX);\r
-#endif\r
+#endif // ANALYZE\r
                         irmp_param_p = (IRMP_PARAMETER *) &thomson_param;\r
                     }\r
                     else\r
@@ -2613,7 +2705,7 @@ irmp_ISR (void)
                         ANALYZE_PRINTF ("protocol = BOSE, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
                                         BOSE_START_BIT_PULSE_LEN_MIN, BOSE_START_BIT_PULSE_LEN_MAX,\r
                                         BOSE_START_BIT_PAUSE_LEN_MIN, BOSE_START_BIT_PAUSE_LEN_MAX);\r
-#endif\r
+#endif // ANALYZE\r
                         irmp_param_p = (IRMP_PARAMETER *) &bose_param;\r
                     }\r
                     else\r
@@ -2627,7 +2719,7 @@ irmp_ISR (void)
                         ANALYZE_PRINTF ("protocol = RC6, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
                                         RC6_START_BIT_PULSE_LEN_MIN, RC6_START_BIT_PULSE_LEN_MAX,\r
                                         RC6_START_BIT_PAUSE_LEN_MIN, RC6_START_BIT_PAUSE_LEN_MAX);\r
-#endif\r
+#endif // ANALYZE\r
                         irmp_param_p = (IRMP_PARAMETER *) &rc6_param;\r
                         last_pause = 0;\r
                         last_value = 1;\r
@@ -2643,7 +2735,7 @@ irmp_ISR (void)
                         ANALYZE_PRINTF ("protocol = RECS80EXT, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
                                         RECS80EXT_START_BIT_PULSE_LEN_MIN, RECS80EXT_START_BIT_PULSE_LEN_MAX,\r
                                         RECS80EXT_START_BIT_PAUSE_LEN_MIN, RECS80EXT_START_BIT_PAUSE_LEN_MAX);\r
-#endif\r
+#endif // ANALYZE\r
                         irmp_param_p = (IRMP_PARAMETER *) &recs80ext_param;\r
                     }\r
                     else\r
@@ -2657,7 +2749,7 @@ irmp_ISR (void)
                         ANALYZE_PRINTF ("protocol = NUBERT, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
                                         NUBERT_START_BIT_PULSE_LEN_MIN, NUBERT_START_BIT_PULSE_LEN_MAX,\r
                                         NUBERT_START_BIT_PAUSE_LEN_MIN, NUBERT_START_BIT_PAUSE_LEN_MAX);\r
-#endif\r
+#endif // ANALYZE\r
                         irmp_param_p = (IRMP_PARAMETER *) &nubert_param;\r
                     }\r
                     else\r
@@ -2671,7 +2763,7 @@ irmp_ISR (void)
                         ANALYZE_PRINTF ("protocol = SPEAKER, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
                                         SPEAKER_START_BIT_PULSE_LEN_MIN, SPEAKER_START_BIT_PULSE_LEN_MAX,\r
                                         SPEAKER_START_BIT_PAUSE_LEN_MIN, SPEAKER_START_BIT_PAUSE_LEN_MAX);\r
-#endif\r
+#endif // ANALYZE\r
                         irmp_param_p = (IRMP_PARAMETER *) &speaker_param;\r
                     }\r
                     else\r
@@ -2695,7 +2787,7 @@ irmp_ISR (void)
                         ANALYZE_PRINTF ("start bit 4 timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
                                         BANG_OLUFSEN_START_BIT4_PULSE_LEN_MIN, BANG_OLUFSEN_START_BIT4_PULSE_LEN_MAX,\r
                                         BANG_OLUFSEN_START_BIT4_PAUSE_LEN_MIN, BANG_OLUFSEN_START_BIT4_PAUSE_LEN_MAX);\r
-#endif\r
+#endif // ANALYZE\r
                         irmp_param_p = (IRMP_PARAMETER *) &bang_olufsen_param;\r
                         last_value = 0;\r
                     }\r
@@ -2710,7 +2802,7 @@ irmp_ISR (void)
                         ANALYZE_PRINTF ("protocol = GRUNDIG, pre bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
                                         GRUNDIG_NOKIA_IR60_START_BIT_LEN_MIN, GRUNDIG_NOKIA_IR60_START_BIT_LEN_MAX,\r
                                         GRUNDIG_NOKIA_IR60_PRE_PAUSE_LEN_MIN, GRUNDIG_NOKIA_IR60_PRE_PAUSE_LEN_MAX);\r
-#endif\r
+#endif // ANALYZE\r
                         irmp_param_p = (IRMP_PARAMETER *) &grundig_param;\r
                         last_pause = irmp_pause_time;\r
                         last_value  = 1;\r
@@ -2730,7 +2822,7 @@ irmp_ISR (void)
                                         2 * SIEMENS_OR_RUWIDO_START_BIT_PULSE_LEN_MIN, 2 * SIEMENS_OR_RUWIDO_START_BIT_PULSE_LEN_MAX,\r
                                         SIEMENS_OR_RUWIDO_START_BIT_PAUSE_LEN_MIN,   SIEMENS_OR_RUWIDO_START_BIT_PAUSE_LEN_MAX,\r
                                         2 * SIEMENS_OR_RUWIDO_START_BIT_PAUSE_LEN_MIN, 2 * SIEMENS_OR_RUWIDO_START_BIT_PAUSE_LEN_MAX);\r
-#endif\r
+#endif // ANALYZE\r
                         irmp_param_p = (IRMP_PARAMETER *) &ruwido_param;\r
                         last_pause = irmp_pause_time;\r
                         last_value  = 1;\r
@@ -2746,7 +2838,7 @@ irmp_ISR (void)
                         ANALYZE_PRINTF ("protocol = FDC, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
                                         FDC_START_BIT_PULSE_LEN_MIN, FDC_START_BIT_PULSE_LEN_MAX,\r
                                         FDC_START_BIT_PAUSE_LEN_MIN, FDC_START_BIT_PAUSE_LEN_MAX);\r
-#endif\r
+#endif // ANALYZE\r
                         irmp_param_p = (IRMP_PARAMETER *) &fdc_param;\r
                     }\r
                     else\r
@@ -2760,7 +2852,7 @@ irmp_ISR (void)
                         ANALYZE_PRINTF ("protocol = RCCAR, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
                                         RCCAR_START_BIT_PULSE_LEN_MIN, RCCAR_START_BIT_PULSE_LEN_MAX,\r
                                         RCCAR_START_BIT_PAUSE_LEN_MIN, RCCAR_START_BIT_PAUSE_LEN_MAX);\r
-#endif\r
+#endif // ANALYZE\r
                         irmp_param_p = (IRMP_PARAMETER *) &rccar_param;\r
                     }\r
                     else\r
@@ -2774,7 +2866,7 @@ irmp_ISR (void)
                         ANALYZE_PRINTF ("protocol = KATHREIN, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
                                         KATHREIN_START_BIT_PULSE_LEN_MIN, KATHREIN_START_BIT_PULSE_LEN_MAX,\r
                                         KATHREIN_START_BIT_PAUSE_LEN_MIN, KATHREIN_START_BIT_PAUSE_LEN_MAX);\r
-#endif\r
+#endif // ANALYZE\r
                         irmp_param_p = (IRMP_PARAMETER *) &kathrein_param;\r
                     }\r
                     else\r
@@ -2788,7 +2880,7 @@ irmp_ISR (void)
                         ANALYZE_PRINTF ("protocol = NETBOX, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
                                         NETBOX_START_BIT_PULSE_LEN_MIN, NETBOX_START_BIT_PULSE_LEN_MAX,\r
                                         NETBOX_START_BIT_PAUSE_LEN_MIN, NETBOX_START_BIT_PAUSE_LEN_MAX);\r
-#endif\r
+#endif // ANALYZE\r
                         irmp_param_p = (IRMP_PARAMETER *) &netbox_param;\r
                     }\r
                     else\r
@@ -2802,7 +2894,7 @@ irmp_ISR (void)
                         ANALYZE_PRINTF ("protocol = LEGO, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
                                         LEGO_START_BIT_PULSE_LEN_MIN, LEGO_START_BIT_PULSE_LEN_MAX,\r
                                         LEGO_START_BIT_PAUSE_LEN_MIN, LEGO_START_BIT_PAUSE_LEN_MAX);\r
-#endif\r
+#endif // ANALYZE\r
                         irmp_param_p = (IRMP_PARAMETER *) &lego_param;\r
                     }\r
                     else\r
@@ -2816,7 +2908,7 @@ irmp_ISR (void)
                         ANALYZE_PRINTF ("protocol = A1TVBOX, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
                                         A1TVBOX_START_BIT_PULSE_LEN_MIN, A1TVBOX_START_BIT_PULSE_LEN_MAX,\r
                                         A1TVBOX_START_BIT_PAUSE_LEN_MIN, A1TVBOX_START_BIT_PAUSE_LEN_MAX);\r
-#endif\r
+#endif // ANALYZE\r
                         irmp_param_p = (IRMP_PARAMETER *) &a1tvbox_param;\r
                         last_pause = 0;\r
                         last_value = 1;\r
@@ -2832,7 +2924,7 @@ irmp_ISR (void)
                         ANALYZE_PRINTF ("protocol = ORTEK, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
                                         ORTEK_START_BIT_PULSE_LEN_MIN, ORTEK_START_BIT_PULSE_LEN_MAX,\r
                                         ORTEK_START_BIT_PAUSE_LEN_MIN, ORTEK_START_BIT_PAUSE_LEN_MAX);\r
-#endif\r
+#endif // ANALYZE\r
                         irmp_param_p = (IRMP_PARAMETER *) &ortek_param;\r
                         last_pause  = 0;\r
                         last_value  = 1;\r
@@ -2849,7 +2941,7 @@ irmp_ISR (void)
                         ANALYZE_PRINTF ("protocol = RCMM, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
                                         RCMM32_START_BIT_PULSE_LEN_MIN, RCMM32_START_BIT_PULSE_LEN_MAX,\r
                                         RCMM32_START_BIT_PAUSE_LEN_MIN, RCMM32_START_BIT_PAUSE_LEN_MAX);\r
-#endif\r
+#endif // ANALYZE\r
                         irmp_param_p = (IRMP_PARAMETER *) &rcmm_param;\r
                     }\r
                     else\r
@@ -2857,8 +2949,7 @@ irmp_ISR (void)
                     {\r
 #ifdef ANALYZE\r
                         ANALYZE_PRINTF ("protocol = UNKNOWN\n");\r
-#endif\r
-//                      irmp_busy_flag = FALSE;\r
+#endif // ANALYZE\r
                         irmp_start_bit_detected = 0;                            // wait for another start bit...\r
                     }\r
 \r
@@ -2871,7 +2962,7 @@ irmp_ISR (void)
 #ifdef ANALYZE\r
                             ANALYZE_PRINTF ("pulse_1: %3d - %3d\n", irmp_param.pulse_1_len_min, irmp_param.pulse_1_len_max);\r
                             ANALYZE_PRINTF ("pause_1: %3d - %3d\n", irmp_param.pause_1_len_min, irmp_param.pause_1_len_max);\r
-#endif\r
+#endif // ANALYZE\r
                         }\r
                         else\r
                         {\r
@@ -2880,7 +2971,7 @@ irmp_ISR (void)
                                             2 * irmp_param.pulse_1_len_min, 2 * irmp_param.pulse_1_len_max);\r
                             ANALYZE_PRINTF ("pause: %3d - %3d or %3d - %3d\n", irmp_param.pause_1_len_min, irmp_param.pause_1_len_max,\r
                                             2 * irmp_param.pause_1_len_min, 2 * irmp_param.pause_1_len_max);\r
-#endif\r
+#endif // ANALYZE\r
                         }\r
 \r
 #if IRMP_SUPPORT_RC5_PROTOCOL == 1 && (IRMP_SUPPORT_FDC_PROTOCOL == 1 || IRMP_SUPPORT_RCCAR_PROTOCOL == 1)\r
@@ -2891,7 +2982,7 @@ irmp_ISR (void)
                             ANALYZE_PRINTF ("pause_0: %3d - %3d\n", irmp_param2.pause_0_len_min, irmp_param2.pause_0_len_max);\r
                             ANALYZE_PRINTF ("pulse_1: %3d - %3d\n", irmp_param2.pulse_1_len_min, irmp_param2.pulse_1_len_max);\r
                             ANALYZE_PRINTF ("pause_1: %3d - %3d\n", irmp_param2.pause_1_len_min, irmp_param2.pause_1_len_max);\r
-#endif\r
+#endif // ANALYZE\r
                         }\r
 #endif\r
 \r
@@ -2901,7 +2992,7 @@ irmp_ISR (void)
                         {\r
 #ifdef ANALYZE\r
                             ANALYZE_PRINTF ("pulse_toggle: %3d - %3d\n", RC6_TOGGLE_BIT_LEN_MIN, RC6_TOGGLE_BIT_LEN_MAX);\r
-#endif\r
+#endif // ANALYZE\r
                         }\r
 #endif\r
 \r
@@ -2910,7 +3001,7 @@ irmp_ISR (void)
 #ifdef ANALYZE\r
                             ANALYZE_PRINTF ("pulse_0: %3d - %3d\n", irmp_param.pulse_0_len_min, irmp_param.pulse_0_len_max);\r
                             ANALYZE_PRINTF ("pause_0: %3d - %3d\n", irmp_param.pause_0_len_min, irmp_param.pause_0_len_max);\r
-#endif\r
+#endif // ANALYZE\r
                         }\r
                         else\r
                         {\r
@@ -2919,20 +3010,18 @@ irmp_ISR (void)
                                             2 * irmp_param.pulse_0_len_min, 2 * irmp_param.pulse_0_len_max);\r
                             ANALYZE_PRINTF ("pause: %3d - %3d or %3d - %3d\n", irmp_param.pause_0_len_min, irmp_param.pause_0_len_max,\r
                                             2 * irmp_param.pause_0_len_min, 2 * irmp_param.pause_0_len_max);\r
-#endif\r
+#endif // ANALYZE\r
                         }\r
 \r
+#ifdef ANALYZE\r
 #if IRMP_SUPPORT_BANG_OLUFSEN_PROTOCOL == 1\r
                         if (irmp_param.protocol == IRMP_BANG_OLUFSEN_PROTOCOL)\r
                         {\r
-#ifdef ANALYZE\r
                             ANALYZE_PRINTF ("pulse_r: %3d - %3d\n", irmp_param.pulse_0_len_min, irmp_param.pulse_0_len_max);\r
                             ANALYZE_PRINTF ("pause_r: %3d - %3d\n", BANG_OLUFSEN_R_PAUSE_LEN_MIN, BANG_OLUFSEN_R_PAUSE_LEN_MAX);\r
-#endif\r
                         }\r
 #endif\r
 \r
-#ifdef ANALYZE\r
                         ANALYZE_PRINTF ("command_offset: %2d\n", irmp_param.command_offset);\r
                         ANALYZE_PRINTF ("command_len:    %3d\n", irmp_param.command_end - irmp_param.command_offset);\r
                         ANALYZE_PRINTF ("complete_len:   %3d\n", irmp_param.complete_len);\r
@@ -2953,7 +3042,7 @@ irmp_ISR (void)
                             ANALYZE_PRINTF ("%8.3fms [bit %2d: pulse = %3d, pause = %3d] ", (double) (time_counter * 1000) / F_INTERRUPTS, irmp_bit, irmp_pulse_time, irmp_pause_time);\r
                             ANALYZE_PUTCHAR ((irmp_param.flags & IRMP_PARAM_FLAG_1ST_PULSE_IS_1) ? '0' : '1');\r
                             ANALYZE_NEWLINE ();\r
-#endif\r
+#endif // ANALYZE\r
                             irmp_store_bit ((irmp_param.flags & IRMP_PARAM_FLAG_1ST_PULSE_IS_1) ? 0 : 1);\r
                         }\r
                         else if (! last_value)  // && irmp_pause_time >= irmp_param.pause_1_len_min && irmp_pause_time <= irmp_param.pause_1_len_max)\r
@@ -2962,7 +3051,7 @@ irmp_ISR (void)
                             ANALYZE_PRINTF ("%8.3fms [bit %2d: pulse = %3d, pause = %3d] ", (double) (time_counter * 1000) / F_INTERRUPTS, irmp_bit, irmp_pulse_time, irmp_pause_time);\r
                             ANALYZE_PUTCHAR ((irmp_param.flags & IRMP_PARAM_FLAG_1ST_PULSE_IS_1) ? '1' : '0');\r
                             ANALYZE_NEWLINE ();\r
-#endif\r
+#endif // ANALYZE\r
                             irmp_store_bit ((irmp_param.flags & IRMP_PARAM_FLAG_1ST_PULSE_IS_1) ? 1 : 0);\r
                         }\r
                     }\r
@@ -2983,14 +3072,14 @@ irmp_ISR (void)
                     {\r
 #ifdef ANALYZE\r
                         ANALYZE_PRINTF ("%8.3fms [bit %2d: pulse = %3d, pause = %3d] ", (double) (time_counter * 1000) / F_INTERRUPTS, irmp_bit, irmp_pulse_time, irmp_pause_time);\r
-#endif\r
+#endif // ANALYZE\r
 \r
                         if (irmp_pause_time >= DENON_1_PAUSE_LEN_MIN && irmp_pause_time <= DENON_1_PAUSE_LEN_MAX)\r
                         {                                                       // pause timings correct for "1"?\r
 #ifdef ANALYZE\r
                             ANALYZE_PUTCHAR ('1');                                  // yes, store 1\r
                             ANALYZE_NEWLINE ();\r
-#endif\r
+#endif // ANALYZE\r
                             irmp_store_bit (1);\r
                         }\r
                         else // if (irmp_pause_time >= DENON_0_PAUSE_LEN_MIN && irmp_pause_time <= DENON_0_PAUSE_LEN_MAX)\r
@@ -2998,7 +3087,7 @@ irmp_ISR (void)
 #ifdef ANALYZE\r
                             ANALYZE_PUTCHAR ('0');                                  // yes, store 0\r
                             ANALYZE_NEWLINE ();\r
-#endif\r
+#endif // ANALYZE\r
                             irmp_store_bit (0);\r
                         }\r
                     }\r
@@ -3009,14 +3098,14 @@ irmp_ISR (void)
                     {\r
 #ifdef ANALYZE\r
                         ANALYZE_PRINTF ("%8.3fms [bit %2d: pulse = %3d, pause = %3d] ", (double) (time_counter * 1000) / F_INTERRUPTS, irmp_bit, irmp_pulse_time, irmp_pause_time);\r
-#endif\r
+#endif // ANALYZE\r
 \r
                         if (irmp_pause_time >= THOMSON_1_PAUSE_LEN_MIN && irmp_pause_time <= THOMSON_1_PAUSE_LEN_MAX)\r
                         {                                                       // pause timings correct for "1"?\r
 #ifdef ANALYZE\r
                           ANALYZE_PUTCHAR ('1');                                  // yes, store 1\r
                           ANALYZE_NEWLINE ();\r
-#endif\r
+#endif // ANALYZE\r
                           irmp_store_bit (1);\r
                         }\r
                         else // if (irmp_pause_time >= THOMSON_0_PAUSE_LEN_MIN && irmp_pause_time <= THOMSON_0_PAUSE_LEN_MAX)\r
@@ -3024,7 +3113,7 @@ irmp_ISR (void)
 #ifdef ANALYZE\r
                           ANALYZE_PUTCHAR ('0');                                  // yes, store 0\r
                           ANALYZE_NEWLINE ();\r
-#endif\r
+#endif // ANALYZE\r
                           irmp_store_bit (0);\r
                         }\r
                     }\r
@@ -3059,21 +3148,17 @@ irmp_ISR (void)
 #ifdef ANALYZE\r
                             if (! (irmp_param.flags & IRMP_PARAM_FLAG_IS_MANCHESTER))\r
                             {\r
-#ifdef ANALYZE\r
                                 ANALYZE_PRINTF ("stop bit detected\n");\r
-#endif\r
                             }\r
-#endif\r
+#endif // ANALYZE\r
                             irmp_param.stop_bit = 0;\r
                         }\r
                         else\r
                         {\r
 #ifdef ANALYZE\r
                             ANALYZE_PRINTF ("error: stop bit timing wrong, irmp_bit = %d, irmp_pulse_time = %d, pulse_0_len_min = %d, pulse_0_len_max = %d\n",\r
-#endif\r
                                             irmp_bit, irmp_pulse_time, irmp_param.pulse_0_len_min, irmp_param.pulse_0_len_max);\r
-\r
-//                          irmp_busy_flag = FALSE;\r
+#endif // ANALYZE\r
                             irmp_start_bit_detected = 0;                        // wait for another start bit...\r
                             irmp_pulse_time         = 0;\r
                             irmp_pause_time         = 0;\r
@@ -3112,7 +3197,7 @@ irmp_ISR (void)
                             {\r
 #ifdef ANALYZE\r
                                 ANALYZE_PRINTF ("Switching to IR60 protocol\n");\r
-#endif\r
+#endif // ANALYZE\r
                                 got_light = TRUE;                                       // this is a lie, but generates a stop bit ;-)\r
                                 irmp_param.stop_bit = TRUE;                             // set flag\r
 \r
@@ -3136,7 +3221,7 @@ irmp_ISR (void)
                             {\r
 #ifdef ANALYZE\r
                                 ANALYZE_PRINTF ("Switching to NOKIA protocol\n");\r
-#endif\r
+#endif // ANALYZE\r
                                 irmp_param.protocol         = IRMP_NOKIA_PROTOCOL;      // change protocol\r
                                 irmp_param.address_offset   = NOKIA_ADDRESS_OFFSET;\r
                                 irmp_param.address_end      = NOKIA_ADDRESS_OFFSET + NOKIA_ADDRESS_LEN;\r
@@ -3165,7 +3250,7 @@ irmp_ISR (void)
                             {\r
 #ifdef ANALYZE\r
                                 ANALYZE_PRINTF ("Switching to SIEMENS protocol\n");\r
-#endif\r
+#endif // ANALYZE\r
                                 irmp_param.protocol         = IRMP_SIEMENS_PROTOCOL;    // change protocol\r
                                 irmp_param.address_offset   = SIEMENS_ADDRESS_OFFSET;\r
                                 irmp_param.address_end      = SIEMENS_ADDRESS_OFFSET + SIEMENS_ADDRESS_LEN;\r
@@ -3221,7 +3306,7 @@ irmp_ISR (void)
                             {\r
 #ifdef ANALYZE\r
                                 ANALYZE_PRINTF ("Switching to JVC protocol, irmp_bit = %d\n", irmp_bit);\r
-#endif\r
+#endif // ANALYZE\r
                                 irmp_param.stop_bit     = TRUE;                                     // set flag\r
                                 irmp_param.protocol     = IRMP_JVC_PROTOCOL;                        // switch protocol\r
                                 irmp_param.complete_len = irmp_bit;                                 // patch length: 16 or 17\r
@@ -3235,7 +3320,7 @@ irmp_ISR (void)
                             {\r
 #ifdef ANALYZE\r
                                 ANALYZE_PRINTF ("Switching to LGAIR protocol, irmp_bit = %d\n", irmp_bit);\r
-#endif\r
+#endif // ANALYZE\r
                                 irmp_param.stop_bit     = TRUE;                                     // set flag\r
                                 irmp_param.protocol     = IRMP_LGAIR_PROTOCOL;                      // switch protocol\r
                                 irmp_param.complete_len = irmp_bit;                                 // patch length: 16 or 17\r
@@ -3251,7 +3336,7 @@ irmp_ISR (void)
                             {\r
 #ifdef ANALYZE\r
                                 ANALYZE_PRINTF ("Switching to NEC protocol\n");\r
-#endif\r
+#endif // ANALYZE\r
                                 irmp_param.stop_bit     = TRUE;                                     // set flag\r
                                 irmp_param.protocol     = IRMP_NEC_PROTOCOL;                        // switch protocol\r
                                 irmp_param.complete_len = irmp_bit;                                 // patch length: 16 or 17\r
@@ -3268,7 +3353,7 @@ irmp_ISR (void)
                             {\r
 #ifdef ANALYZE\r
                                 ANALYZE_PRINTF ("Switching to LGAIR protocol\n");\r
-#endif\r
+#endif // ANALYZE\r
                                 irmp_param.stop_bit     = TRUE;                                     // set flag\r
                                 irmp_param.protocol     = IRMP_LGAIR_PROTOCOL;                      // switch protocol\r
                                 irmp_param.complete_len = irmp_bit;                                 // patch length: 16 or 17\r
@@ -3281,7 +3366,7 @@ irmp_ISR (void)
                             {\r
 #ifdef ANALYZE\r
                                 ANALYZE_PRINTF ("Switching to JVC protocol, irmp_bit = %d\n", irmp_bit);\r
-#endif\r
+#endif // ANALYZE\r
                                 irmp_param.stop_bit     = TRUE;                                     // set flag\r
                                 irmp_param.protocol     = IRMP_JVC_PROTOCOL;                        // switch protocol\r
                                 irmp_param.complete_len = irmp_bit;                                 // patch length: 16 or 17\r
@@ -3294,6 +3379,20 @@ irmp_ISR (void)
                             }\r
 #endif // IRMP_SUPPORT_JVC_PROTOCOL == 1\r
 #endif // IRMP_SUPPORT_NEC42_PROTOCOL == 1\r
+\r
+#if IRMP_SUPPORT_SAMSUNG48_PROTOCOL == 1\r
+                            else if (irmp_param.protocol == IRMP_SAMSUNG48_PROTOCOL && irmp_bit == 32)          // it was a SAMSUNG32 stop bit\r
+                            {\r
+#ifdef ANALYZE\r
+                                ANALYZE_PRINTF ("Switching to SAMSUNG32 protocol\n");\r
+#endif // ANALYZE\r
+                                irmp_param.protocol         = IRMP_SAMSUNG32_PROTOCOL;\r
+                                irmp_param.command_offset   = SAMSUNG32_COMMAND_OFFSET;\r
+                                irmp_param.command_end      = SAMSUNG32_COMMAND_OFFSET + SAMSUNG32_COMMAND_LEN;\r
+                                irmp_param.complete_len     = SAMSUNG32_COMPLETE_DATA_LEN;\r
+                            }\r
+#endif // IRMP_SUPPORT_SAMSUNG_PROTOCOL == 1\r
+\r
 #if IRMP_SUPPORT_RCMM_PROTOCOL == 1\r
                             else if (irmp_param.protocol == IRMP_RCMM32_PROTOCOL && (irmp_bit == 12 || irmp_bit == 24))  // it was a RCMM stop bit\r
                             {\r
@@ -3304,14 +3403,14 @@ irmp_ISR (void)
 \r
 #ifdef ANALYZE\r
                                     ANALYZE_PRINTF ("Switching to RCMM12 protocol, irmp_bit = %d\n", irmp_bit);\r
-#endif\r
+#endif // ANALYZE\r
                                     irmp_param.protocol     = IRMP_RCMM12_PROTOCOL;                 // switch protocol\r
                                 }\r
                                 else // if ((irmp_bit == 24)\r
                                 {\r
 #ifdef ANALYZE\r
                                     ANALYZE_PRINTF ("Switching to RCMM24 protocol, irmp_bit = %d\n", irmp_bit);\r
-#endif\r
+#endif // ANALYZE\r
                                     irmp_param.protocol     = IRMP_RCMM24_PROTOCOL;                 // switch protocol\r
                                 }\r
                                 irmp_param.stop_bit     = TRUE;                                     // set flag\r
@@ -3323,9 +3422,7 @@ irmp_ISR (void)
 #ifdef ANALYZE\r
                                 ANALYZE_PRINTF ("error 2: pause %d after data bit %d too long\n", irmp_pause_time, irmp_bit);\r
                                 ANALYZE_ONLY_NORMAL_PUTCHAR ('\n');\r
-#endif\r
-\r
-//                              irmp_busy_flag = FALSE;\r
+#endif // ANALYZE\r
                                 irmp_start_bit_detected = 0;                    // wait for another start bit...\r
                                 irmp_pulse_time         = 0;\r
                                 irmp_pause_time         = 0;\r
@@ -3342,7 +3439,7 @@ irmp_ISR (void)
                 {\r
 #ifdef ANALYZE\r
                     ANALYZE_PRINTF ("%8.3fms [bit %2d: pulse = %3d, pause = %3d] ", (double) (time_counter * 1000) / F_INTERRUPTS, irmp_bit, irmp_pulse_time, irmp_pause_time);\r
-#endif\r
+#endif // ANALYZE\r
 \r
 #if IRMP_SUPPORT_MANCHESTER == 1\r
                     if ((irmp_param.flags & IRMP_PARAM_FLAG_IS_MANCHESTER))                                     // Manchester\r
@@ -3359,7 +3456,7 @@ irmp_ISR (void)
                             {\r
 #ifdef ANALYZE\r
                                 ANALYZE_PUTCHAR ('T');\r
-#endif\r
+#endif // ANALYZE\r
                                 if (irmp_param.complete_len == RC6_COMPLETE_DATA_LEN_LONG)                      // RC6 mode 6A\r
                                 {\r
                                     irmp_store_bit (1);\r
@@ -3372,14 +3469,14 @@ irmp_ISR (void)
                                 }\r
 #ifdef ANALYZE\r
                                 ANALYZE_NEWLINE ();\r
-#endif\r
+#endif // ANALYZE\r
                             }\r
                             else\r
 #endif // IRMP_SUPPORT_RC6_PROTOCOL == 1\r
                             {\r
 #ifdef ANALYZE\r
                                 ANALYZE_PUTCHAR ((irmp_param.flags & IRMP_PARAM_FLAG_1ST_PULSE_IS_1) ? '0' : '1');\r
-#endif\r
+#endif // ANALYZE\r
                                 irmp_store_bit ((irmp_param.flags & IRMP_PARAM_FLAG_1ST_PULSE_IS_1) ? 0  :  1 );\r
 \r
 #if IRMP_SUPPORT_RC6_PROTOCOL == 1\r
@@ -3387,7 +3484,7 @@ irmp_ISR (void)
                                 {\r
 #ifdef ANALYZE\r
                                     ANALYZE_PUTCHAR ('T');\r
-#endif\r
+#endif // ANALYZE\r
                                     irmp_store_bit (1);\r
 \r
                                     if (irmp_pause_time > 2 * irmp_param.pause_1_len_max)\r
@@ -3400,14 +3497,14 @@ irmp_ISR (void)
                                     }\r
 #ifdef ANALYZE\r
                                     ANALYZE_NEWLINE ();\r
-#endif\r
+#endif // ANALYZE\r
                                 }\r
                                 else\r
 #endif // IRMP_SUPPORT_RC6_PROTOCOL == 1\r
                                 {\r
 #ifdef ANALYZE\r
                                     ANALYZE_PUTCHAR ((irmp_param.flags & IRMP_PARAM_FLAG_1ST_PULSE_IS_1) ? '1' : '0');\r
-#endif\r
+#endif // ANALYZE\r
                                     irmp_store_bit ((irmp_param.flags & IRMP_PARAM_FLAG_1ST_PULSE_IS_1) ? 1 :   0 );\r
 #if IRMP_SUPPORT_RC5_PROTOCOL == 1 && (IRMP_SUPPORT_FDC_PROTOCOL == 1 || IRMP_SUPPORT_RCCAR_PROTOCOL == 1)\r
                                     if (! irmp_param2.protocol)\r
@@ -3415,7 +3512,7 @@ irmp_ISR (void)
                                     {\r
 #ifdef ANALYZE\r
                                         ANALYZE_NEWLINE ();\r
-#endif\r
+#endif // ANALYZE\r
                                     }\r
                                     last_value = (irmp_param.flags & IRMP_PARAM_FLAG_1ST_PULSE_IS_1) ? 1 : 0;\r
                                 }\r
@@ -3438,7 +3535,7 @@ irmp_ISR (void)
 \r
 #ifdef ANALYZE\r
                             ANALYZE_PUTCHAR (manchester_value + '0');\r
-#endif\r
+#endif // ANALYZE\r
 \r
 #if IRMP_SUPPORT_RC5_PROTOCOL == 1 && (IRMP_SUPPORT_FDC_PROTOCOL == 1 || IRMP_SUPPORT_RCCAR_PROTOCOL == 1)\r
                             if (! irmp_param2.protocol)\r
@@ -3446,7 +3543,7 @@ irmp_ISR (void)
                             {\r
 #ifdef ANALYZE\r
                                 ANALYZE_NEWLINE ();\r
-#endif\r
+#endif // ANALYZE\r
                             }\r
 \r
 #if IRMP_SUPPORT_RC6_PROTOCOL == 1\r
@@ -3454,7 +3551,7 @@ irmp_ISR (void)
                             {\r
 #ifdef ANALYZE\r
                                 ANALYZE_PRINTF ("Switching to RC6A protocol\n");\r
-#endif\r
+#endif // ANALYZE\r
                                 irmp_param.complete_len = RC6_COMPLETE_DATA_LEN_LONG;\r
                                 irmp_param.address_offset = 5;\r
                                 irmp_param.address_end = irmp_param.address_offset + 15;\r
@@ -3476,7 +3573,7 @@ irmp_ISR (void)
                             {\r
 #ifdef ANALYZE\r
                                 ANALYZE_PUTCHAR ('?');\r
-#endif\r
+#endif // ANALYZE\r
                                 irmp_param.protocol = 0;                // switch to FDC, see below\r
                             }\r
                             else\r
@@ -3489,7 +3586,7 @@ irmp_ISR (void)
                             {\r
 #ifdef ANALYZE\r
                                 ANALYZE_PUTCHAR ('?');\r
-#endif\r
+#endif // ANALYZE\r
                                 irmp_param.protocol = 0;                // switch to RCCAR, see below\r
                             }\r
                             else\r
@@ -3500,8 +3597,7 @@ irmp_ISR (void)
                                 ANALYZE_NEWLINE ();\r
                                 ANALYZE_PRINTF ("error 3 manchester: timing not correct: data bit %d,  pulse: %d, pause: %d\n", irmp_bit, irmp_pulse_time, irmp_pause_time);\r
                                 ANALYZE_ONLY_NORMAL_PUTCHAR ('\n');\r
-#endif\r
-//                              irmp_busy_flag = FALSE;\r
+#endif // ANALYZE\r
                                 irmp_start_bit_detected = 0;                            // reset flags and wait for next start bit\r
                                 irmp_pause_time         = 0;\r
                             }\r
@@ -3514,14 +3610,14 @@ irmp_ISR (void)
                             {\r
 #ifdef ANALYZE\r
                                 ANALYZE_PRINTF ("   1 (FDC)\n");\r
-#endif\r
+#endif // ANALYZE\r
                                 irmp_store_bit2 (1);\r
                             }\r
                             else if (irmp_pause_time >= FDC_0_PAUSE_LEN_MIN && irmp_pause_time <= FDC_0_PAUSE_LEN_MAX)\r
                             {\r
 #ifdef ANALYZE\r
                                 ANALYZE_PRINTF ("   0 (FDC)\n");\r
-#endif\r
+#endif // ANALYZE\r
                                 irmp_store_bit2 (0);\r
                             }\r
 \r
@@ -3529,7 +3625,7 @@ irmp_ISR (void)
                             {\r
 #ifdef ANALYZE\r
                                 ANALYZE_PRINTF ("Switching to FDC protocol\n");\r
-#endif\r
+#endif // ANALYZE\r
                                 memcpy (&irmp_param, &irmp_param2, sizeof (IRMP_PARAMETER));\r
                                 irmp_param2.protocol = 0;\r
                                 irmp_tmp_address = irmp_tmp_address2;\r
@@ -3544,14 +3640,14 @@ irmp_ISR (void)
                             {\r
 #ifdef ANALYZE\r
                                 ANALYZE_PRINTF ("   1 (RCCAR)\n");\r
-#endif\r
+#endif // ANALYZE\r
                                 irmp_store_bit2 (1);\r
                             }\r
                             else if (irmp_pause_time >= RCCAR_0_PAUSE_LEN_MIN && irmp_pause_time <= RCCAR_0_PAUSE_LEN_MAX)\r
                             {\r
 #ifdef ANALYZE\r
                                 ANALYZE_PRINTF ("   0 (RCCAR)\n");\r
-#endif\r
+#endif // ANALYZE\r
                                 irmp_store_bit2 (0);\r
                             }\r
 \r
@@ -3559,7 +3655,7 @@ irmp_ISR (void)
                             {\r
 #ifdef ANALYZE\r
                                 ANALYZE_PRINTF ("Switching to RCCAR protocol\n");\r
-#endif\r
+#endif // ANALYZE\r
                                 memcpy (&irmp_param, &irmp_param2, sizeof (IRMP_PARAMETER));\r
                                 irmp_param2.protocol = 0;\r
                                 irmp_tmp_address = irmp_tmp_address2;\r
@@ -3581,7 +3677,7 @@ irmp_ISR (void)
                         {\r
 #ifdef ANALYZE\r
                             ANALYZE_PUTCHAR ('1');\r
-#endif\r
+#endif // ANALYZE\r
                             irmp_store_bit (1);\r
 \r
                             if (irmp_pulse_time >= irmp_param.pulse_1_len_min)\r
@@ -3598,7 +3694,7 @@ irmp_ISR (void)
                         {\r
 #ifdef ANALYZE\r
                             ANALYZE_PUTCHAR ('0');\r
-#endif\r
+#endif // ANALYZE\r
                             irmp_store_bit (0);\r
 \r
                             if (irmp_pause_time >= irmp_param.pause_1_len_min)\r
@@ -3612,7 +3708,7 @@ irmp_ISR (void)
                         }\r
 #ifdef ANALYZE\r
                         ANALYZE_NEWLINE ();\r
-#endif\r
+#endif // ANALYZE\r
                         wait_for_space = 0;\r
                     }\r
                     else\r
@@ -3626,24 +3722,35 @@ irmp_ISR (void)
                         {\r
 #ifdef ANALYZE\r
                             ANALYZE_PRINTF ("SYNC\n");\r
-#endif\r
+#endif // ANALYZE\r
                             wait_for_space = 0;\r
-                            irmp_tmp_id = 0;\r
                             irmp_bit++;\r
                         }\r
                         else  if (irmp_pulse_time >= SAMSUNG_PULSE_LEN_MIN && irmp_pulse_time <= SAMSUNG_PULSE_LEN_MAX)\r
                         {\r
+#if IRMP_SUPPORT_SAMSUNG48_PROTOCOL == 1\r
+#ifdef ANALYZE\r
+                            ANALYZE_PRINTF ("Switching to SAMSUNG48 protocol ");\r
+#endif // ANALYZE\r
+                            irmp_param.protocol         = IRMP_SAMSUNG48_PROTOCOL;\r
+                            irmp_param.command_offset   = SAMSUNG48_COMMAND_OFFSET;\r
+                            irmp_param.command_end      = SAMSUNG48_COMMAND_OFFSET + SAMSUNG48_COMMAND_LEN;\r
+                            irmp_param.complete_len     = SAMSUNG48_COMPLETE_DATA_LEN;\r
+#else\r
+#ifdef ANALYZE\r
+                            ANALYZE_PRINTF ("Switching to SAMSUNG32 protocol ");\r
+#endif // ANALYZE\r
                             irmp_param.protocol         = IRMP_SAMSUNG32_PROTOCOL;\r
                             irmp_param.command_offset   = SAMSUNG32_COMMAND_OFFSET;\r
                             irmp_param.command_end      = SAMSUNG32_COMMAND_OFFSET + SAMSUNG32_COMMAND_LEN;\r
                             irmp_param.complete_len     = SAMSUNG32_COMPLETE_DATA_LEN;\r
-\r
+#endif\r
                             if (irmp_pause_time >= SAMSUNG_1_PAUSE_LEN_MIN && irmp_pause_time <= SAMSUNG_1_PAUSE_LEN_MAX)\r
                             {\r
 #ifdef ANALYZE\r
                                 ANALYZE_PUTCHAR ('1');\r
                                 ANALYZE_NEWLINE ();\r
-#endif\r
+#endif // ANALYZE\r
                                 irmp_store_bit (1);\r
                                 wait_for_space = 0;\r
                             }\r
@@ -3652,22 +3759,17 @@ irmp_ISR (void)
 #ifdef ANALYZE\r
                                 ANALYZE_PUTCHAR ('0');\r
                                 ANALYZE_NEWLINE ();\r
-#endif\r
+#endif // ANALYZE\r
                                 irmp_store_bit (0);\r
                                 wait_for_space = 0;\r
                             }\r
-\r
-#ifdef ANALYZE\r
-                            ANALYZE_PRINTF ("Switching to SAMSUNG32 protocol\n");\r
-#endif\r
                         }\r
                         else\r
                         {                                                           // timing incorrect!\r
 #ifdef ANALYZE\r
                             ANALYZE_PRINTF ("error 3 Samsung: timing not correct: data bit %d,  pulse: %d, pause: %d\n", irmp_bit, irmp_pulse_time, irmp_pause_time);\r
                             ANALYZE_ONLY_NORMAL_PUTCHAR ('\n');\r
-#endif\r
-//                          irmp_busy_flag = FALSE;\r
+#endif // ANALYZE\r
                             irmp_start_bit_detected = 0;                            // reset flags and wait for next start bit\r
                             irmp_pause_time         = 0;\r
                         }\r
@@ -3685,7 +3787,7 @@ irmp_ISR (void)
                     {\r
 #ifdef ANALYZE\r
                         ANALYZE_PRINTF ("Switching to NEC16 protocol\n");\r
-#endif\r
+#endif // ANALYZE\r
                         irmp_param.protocol         = IRMP_NEC16_PROTOCOL;\r
                         irmp_param.address_offset   = NEC16_ADDRESS_OFFSET;\r
                         irmp_param.address_end      = NEC16_ADDRESS_OFFSET + NEC16_ADDRESS_LEN;\r
@@ -3708,7 +3810,7 @@ irmp_ISR (void)
                                 {\r
 #ifdef ANALYZE\r
                                     ANALYZE_PRINTF ("3rd start bit\n");\r
-#endif\r
+#endif // ANALYZE\r
                                     wait_for_space = 0;\r
                                     irmp_bit++;\r
                                 }\r
@@ -3717,8 +3819,7 @@ irmp_ISR (void)
 #ifdef ANALYZE\r
                                     ANALYZE_PRINTF ("error 3a B&O: timing not correct: data bit %d,  pulse: %d, pause: %d\n", irmp_bit, irmp_pulse_time, irmp_pause_time);\r
                                     ANALYZE_ONLY_NORMAL_PUTCHAR ('\n');\r
-#endif\r
-//                                  irmp_busy_flag = FALSE;\r
+#endif // ANALYZE\r
                                     irmp_start_bit_detected = 0;                    // reset flags and wait for next start bit\r
                                     irmp_pause_time         = 0;\r
                                 }\r
@@ -3729,7 +3830,7 @@ irmp_ISR (void)
                                 {\r
 #ifdef ANALYZE\r
                                     ANALYZE_PRINTF ("trailer bit\n");\r
-#endif\r
+#endif // ANALYZE\r
                                     wait_for_space = 0;\r
                                     irmp_bit++;\r
                                 }\r
@@ -3738,8 +3839,7 @@ irmp_ISR (void)
 #ifdef ANALYZE\r
                                     ANALYZE_PRINTF ("error 3b B&O: timing not correct: data bit %d,  pulse: %d, pause: %d\n", irmp_bit, irmp_pulse_time, irmp_pause_time);\r
                                     ANALYZE_ONLY_NORMAL_PUTCHAR ('\n');\r
-#endif\r
-//                                  irmp_busy_flag = FALSE;\r
+#endif // ANALYZE\r
                                     irmp_start_bit_detected = 0;                    // reset flags and wait for next start bit\r
                                     irmp_pause_time         = 0;\r
                                 }\r
@@ -3751,7 +3851,7 @@ irmp_ISR (void)
 #ifdef ANALYZE\r
                                     ANALYZE_PUTCHAR ('1');\r
                                     ANALYZE_NEWLINE ();\r
-#endif\r
+#endif // ANALYZE\r
                                     irmp_store_bit (1);\r
                                     last_value = 1;\r
                                     wait_for_space = 0;\r
@@ -3761,7 +3861,7 @@ irmp_ISR (void)
 #ifdef ANALYZE\r
                                     ANALYZE_PUTCHAR ('0');\r
                                     ANALYZE_NEWLINE ();\r
-#endif\r
+#endif // ANALYZE\r
                                     irmp_store_bit (0);\r
                                     last_value = 0;\r
                                     wait_for_space = 0;\r
@@ -3771,7 +3871,7 @@ irmp_ISR (void)
 #ifdef ANALYZE\r
                                     ANALYZE_PUTCHAR (last_value + '0');\r
                                     ANALYZE_NEWLINE ();\r
-#endif\r
+#endif // ANALYZE\r
                                     irmp_store_bit (last_value);\r
                                     wait_for_space = 0;\r
                                 }\r
@@ -3780,8 +3880,7 @@ irmp_ISR (void)
 #ifdef ANALYZE\r
                                     ANALYZE_PRINTF ("error 3c B&O: timing not correct: data bit %d,  pulse: %d, pause: %d\n", irmp_bit, irmp_pulse_time, irmp_pause_time);\r
                                     ANALYZE_ONLY_NORMAL_PUTCHAR ('\n');\r
-#endif\r
-//                                  irmp_busy_flag = FALSE;\r
+#endif // ANALYZE\r
                                     irmp_start_bit_detected = 0;                    // reset flags and wait for next start bit\r
                                     irmp_pause_time         = 0;\r
                                 }\r
@@ -3792,8 +3891,7 @@ irmp_ISR (void)
 #ifdef ANALYZE\r
                             ANALYZE_PRINTF ("error 3d B&O: timing not correct: data bit %d,  pulse: %d, pause: %d\n", irmp_bit, irmp_pulse_time, irmp_pause_time);\r
                             ANALYZE_ONLY_NORMAL_PUTCHAR ('\n');\r
-#endif\r
-//                          irmp_busy_flag = FALSE;\r
+#endif // ANALYZE\r
                             irmp_start_bit_detected = 0;                            // reset flags and wait for next start bit\r
                             irmp_pause_time         = 0;\r
                         }\r
@@ -3809,7 +3907,7 @@ irmp_ISR (void)
 #ifdef ANALYZE\r
                             ANALYZE_PUTCHAR ('0');\r
                             ANALYZE_PUTCHAR ('0');\r
-#endif\r
+#endif // ANALYZE\r
                             irmp_store_bit (0);\r
                             irmp_store_bit (0);\r
                         }\r
@@ -3818,7 +3916,7 @@ irmp_ISR (void)
 #ifdef ANALYZE\r
                             ANALYZE_PUTCHAR ('0');\r
                             ANALYZE_PUTCHAR ('1');\r
-#endif\r
+#endif // ANALYZE\r
                             irmp_store_bit (0);\r
                             irmp_store_bit (1);\r
                         }\r
@@ -3827,7 +3925,7 @@ irmp_ISR (void)
 #ifdef ANALYZE\r
                             ANALYZE_PUTCHAR ('1');\r
                             ANALYZE_PUTCHAR ('0');\r
-#endif\r
+#endif // ANALYZE\r
                             irmp_store_bit (1);\r
                             irmp_store_bit (0);\r
                         }\r
@@ -3836,13 +3934,13 @@ irmp_ISR (void)
 #ifdef ANALYZE\r
                             ANALYZE_PUTCHAR ('1');\r
                             ANALYZE_PUTCHAR ('1');\r
-#endif\r
+#endif // ANALYZE\r
                             irmp_store_bit (1);\r
                             irmp_store_bit (1);\r
                         }\r
 #ifdef ANALYZE\r
                         ANALYZE_PRINTF ("\n");\r
-#endif\r
+#endif // ANALYZE\r
                         wait_for_space = 0;\r
                     }\r
                     else\r
@@ -3854,7 +3952,7 @@ irmp_ISR (void)
 #ifdef ANALYZE\r
                         ANALYZE_PUTCHAR ('1');\r
                         ANALYZE_NEWLINE ();\r
-#endif\r
+#endif // ANALYZE\r
                         irmp_store_bit (1);\r
                         wait_for_space = 0;\r
                     }\r
@@ -3864,7 +3962,7 @@ irmp_ISR (void)
 #ifdef ANALYZE\r
                         ANALYZE_PUTCHAR ('0');\r
                         ANALYZE_NEWLINE ();\r
-#endif\r
+#endif // ANALYZE\r
                         irmp_store_bit (0);\r
                         wait_for_space = 0;\r
                     }\r
@@ -3885,7 +3983,7 @@ irmp_ISR (void)
 #ifdef ANALYZE\r
                             ANALYZE_PUTCHAR ('S');\r
                             ANALYZE_NEWLINE ();\r
-#endif\r
+#endif // ANALYZE\r
                             irmp_tmp_command <<= 1;\r
                         }\r
                         else\r
@@ -3893,7 +3991,7 @@ irmp_ISR (void)
 #ifdef ANALYZE\r
                             ANALYZE_PUTCHAR ('S');\r
                             ANALYZE_NEWLINE ();\r
-#endif\r
+#endif // ANALYZE\r
                             irmp_store_bit (1);\r
                         }\r
                         wait_for_space = 0;\r
@@ -3904,8 +4002,7 @@ irmp_ISR (void)
 #ifdef ANALYZE\r
                         ANALYZE_PRINTF ("error 3: timing not correct: data bit %d,  pulse: %d, pause: %d\n", irmp_bit, irmp_pulse_time, irmp_pause_time);\r
                         ANALYZE_ONLY_NORMAL_PUTCHAR ('\n');\r
-#endif\r
-//                      irmp_busy_flag = FALSE;\r
+#endif // ANALYZE\r
                         irmp_start_bit_detected = 0;                                // reset flags and wait for next start bit\r
                         irmp_pause_time         = 0;\r
                     }\r
@@ -3944,7 +4041,7 @@ irmp_ISR (void)
 #ifdef ANALYZE\r
                     ANALYZE_PRINTF ("code skipped: SIRCS auto repetition frame #%d, counter = %d, auto repetition len = %d\n",\r
                                     repetition_frame_number + 1, key_repetition_len, AUTO_FRAME_REPETITION_LEN);\r
-#endif\r
+#endif // ANALYZE\r
                     key_repetition_len = 0;\r
                 }\r
                 else\r
@@ -3957,7 +4054,7 @@ irmp_ISR (void)
 #ifdef ANALYZE\r
                     ANALYZE_PRINTF ("code skipped: ORTEK auto repetition frame #%d, counter = %d, auto repetition len = %d\n",\r
                                     repetition_frame_number + 1, key_repetition_len, AUTO_FRAME_REPETITION_LEN);\r
-#endif\r
+#endif // ANALYZE\r
                     key_repetition_len = 0;\r
                 }\r
                 else\r
@@ -3970,20 +4067,20 @@ irmp_ISR (void)
 #ifdef ANALYZE\r
                     ANALYZE_PRINTF ("code skipped: KASEIKYO auto repetition frame #%d, counter = %d, auto repetition len = %d\n",\r
                                     repetition_frame_number + 1, key_repetition_len, AUTO_FRAME_REPETITION_LEN);\r
-#endif\r
+#endif // ANALYZE\r
                     key_repetition_len = 0;\r
                 }\r
                 else\r
 #endif\r
 \r
 #if IRMP_SUPPORT_SAMSUNG_PROTOCOL == 1\r
-                // if SAMSUNG32 protocol and the code will be repeated within 50 ms, we will ignore every 2nd frame\r
-                if (irmp_param.protocol == IRMP_SAMSUNG32_PROTOCOL && (repetition_frame_number & 0x01))\r
+                // if SAMSUNG32 or SAMSUNG48 protocol and the code will be repeated within 50 ms, we will ignore every 2nd frame\r
+                if ((irmp_param.protocol == IRMP_SAMSUNG32_PROTOCOL || irmp_param.protocol == IRMP_SAMSUNG48_PROTOCOL) && (repetition_frame_number & 0x01))\r
                 {\r
 #ifdef ANALYZE\r
-                    ANALYZE_PRINTF ("code skipped: SAMSUNG32 auto repetition frame #%d, counter = %d, auto repetition len = %d\n",\r
+                    ANALYZE_PRINTF ("code skipped: SAMSUNG32/SAMSUNG48 auto repetition frame #%d, counter = %d, auto repetition len = %d\n",\r
                                     repetition_frame_number + 1, key_repetition_len, AUTO_FRAME_REPETITION_LEN);\r
-#endif\r
+#endif // ANALYZE\r
                     key_repetition_len = 0;\r
                 }\r
                 else\r
@@ -3996,7 +4093,7 @@ irmp_ISR (void)
 #ifdef ANALYZE\r
                     ANALYZE_PRINTF ("code skipped: NUBERT auto repetition frame #%d, counter = %d, auto repetition len = %d\n",\r
                                     repetition_frame_number + 1, key_repetition_len, AUTO_FRAME_REPETITION_LEN);\r
-#endif\r
+#endif // ANALYZE\r
                     key_repetition_len = 0;\r
                 }\r
                 else\r
@@ -4009,7 +4106,7 @@ irmp_ISR (void)
 #ifdef ANALYZE\r
                     ANALYZE_PRINTF ("code skipped: SPEAKER auto repetition frame #%d, counter = %d, auto repetition len = %d\n",\r
                                     repetition_frame_number + 1, key_repetition_len, AUTO_FRAME_REPETITION_LEN);\r
-#endif\r
+#endif // ANALYZE\r
                     key_repetition_len = 0;\r
                 }\r
                 else\r
@@ -4018,7 +4115,7 @@ irmp_ISR (void)
                 {\r
 #ifdef ANALYZE\r
                     ANALYZE_PRINTF ("%8.3fms code detected, length = %d\n", (double) (time_counter * 1000) / F_INTERRUPTS, irmp_bit);\r
-#endif\r
+#endif // ANALYZE\r
                     irmp_ir_detected = TRUE;\r
 \r
 #if IRMP_SUPPORT_DENON_PROTOCOL == 1\r
@@ -4039,7 +4136,7 @@ irmp_ISR (void)
                             {\r
 #ifdef ANALYZE\r
                                 ANALYZE_PRINTF ("%8.3fms info Denon: waiting for inverted command repetition\n", (double) (time_counter * 1000) / F_INTERRUPTS);\r
-#endif\r
+#endif // ANALYZE\r
                                 last_irmp_denon_command = irmp_tmp_command;\r
                                 denon_repetition_len = 0;\r
                                 irmp_ir_detected = FALSE;\r
@@ -4048,7 +4145,7 @@ irmp_ISR (void)
                             {\r
 #ifdef ANALYZE\r
                                 ANALYZE_PRINTF ("%8.3fms warning Denon: got unexpected inverted command, ignoring it\n", (double) (time_counter * 1000) / F_INTERRUPTS);\r
-#endif\r
+#endif // ANALYZE\r
                                 last_irmp_denon_command = 0;\r
                                 irmp_ir_detected = FALSE;\r
                             }\r
@@ -4062,7 +4159,7 @@ irmp_ISR (void)
                     {                                                               // Grundig start frame?\r
 #ifdef ANALYZE\r
                         ANALYZE_PRINTF ("Detected GRUNDIG start frame, ignoring it\n");\r
-#endif\r
+#endif // ANALYZE\r
                         irmp_ir_detected = FALSE;\r
                     }\r
                     else\r
@@ -4073,7 +4170,7 @@ irmp_ISR (void)
                     {                                                               // Nokia start frame?\r
 #ifdef ANALYZE\r
                         ANALYZE_PRINTF ("Detected NOKIA start frame, ignoring it\n");\r
-#endif\r
+#endif // ANALYZE\r
                         irmp_ir_detected = FALSE;\r
                     }\r
                     else\r
@@ -4087,7 +4184,7 @@ irmp_ISR (void)
 #ifdef ANALYZE\r
                                 ANALYZE_PRINTF ("Detected NEC repetition frame, key_repetition_len = %d\n", key_repetition_len);\r
                                 ANALYZE_ONLY_NORMAL_PRINTF("REPETETION FRAME                ");\r
-#endif\r
+#endif // ANALYZE\r
                                 irmp_tmp_address = last_irmp_address;                   // address is last address\r
                                 irmp_tmp_command = last_irmp_command;                   // command is last command\r
                                 irmp_flags |= IRMP_FLAG_REPETITION;\r
@@ -4097,8 +4194,8 @@ irmp_ISR (void)
                             {\r
 #ifdef ANALYZE\r
                                 ANALYZE_PRINTF ("Detected NEC repetition frame, ignoring it: timeout occured, key_repetition_len = %d > %d\n",\r
-#endif\r
                                                 key_repetition_len, NEC_FRAME_REPEAT_PAUSE_LEN_MAX);\r
+#endif // ANALYZE\r
                                 irmp_ir_detected = FALSE;\r
                             }\r
                         }\r
@@ -4115,7 +4212,7 @@ irmp_ISR (void)
                             {\r
 #ifdef ANALYZE\r
                                 ANALYZE_PRINTF ("error 4: wrong XOR check for customer id: 0x%1x 0x%1x\n", xor_value, xor_check[2] & 0x0F);\r
-#endif\r
+#endif // ANALYZE\r
                                 irmp_ir_detected = FALSE;\r
                             }\r
 \r
@@ -4125,7 +4222,7 @@ irmp_ISR (void)
                             {\r
 #ifdef ANALYZE\r
                                 ANALYZE_PRINTF ("error 5: wrong XOR check for data bits: 0x%02x 0x%02x\n", xor_value, xor_check[5]);\r
-#endif\r
+#endif // ANALYZE\r
                                 irmp_ir_detected = FALSE;\r
                             }\r
 \r
@@ -4140,7 +4237,7 @@ irmp_ISR (void)
                             {\r
 #ifdef ANALYZE\r
                                 ANALYZE_PRINTF ("error 6: parity check failed\n");\r
-#endif\r
+#endif // ANALYZE\r
                                 irmp_ir_detected = FALSE;\r
                             }\r
 \r
@@ -4148,7 +4245,7 @@ irmp_ISR (void)
                             {\r
 #ifdef ANALYZE\r
                                 ANALYZE_PRINTF ("code skipped: ORTEK end of transmission frame (key release)\n");\r
-#endif\r
+#endif // ANALYZE\r
                                 irmp_ir_detected = FALSE;\r
                             }\r
                             irmp_tmp_address >>= 2;\r
@@ -4222,10 +4319,9 @@ irmp_ISR (void)
                 {\r
 #ifdef ANALYZE\r
                     ANALYZE_ONLY_NORMAL_PUTCHAR ('\n');\r
-#endif\r
+#endif // ANALYZE\r
                 }\r
 \r
-//              irmp_busy_flag          = FALSE;\r
                 irmp_start_bit_detected = 0;                                        // and wait for next start bit\r
                 irmp_tmp_command        = 0;\r
                 irmp_pulse_time         = 0;\r
@@ -4649,9 +4745,7 @@ next_tick (void)
         {\r
             uint8_t key;\r
 \r
-#ifdef ANALYZE\r
             ANALYZE_ONLY_NORMAL_PUTCHAR (' ');\r
-#endif\r
 \r
             if (verbose)\r
             {\r