Version 2.6.2: port to PIC 12F1840

[irmp.git] / irmp.c

diff --git a/irmp.c b/irmp.c
index cd12f2921d569ac0d1fd01cdb097aaa64977733a..5b25eea0f57d6693fcbf4103bcc0fc84866c5d25 100644 (file)
--- a/irmp.c
+++ b/irmp.c
@@ -1,9 +1,9 @@
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
  * irmp.c - infrared multi-protocol decoder, supports several remote control protocols\r
  *\r
- * Copyright (c) 2009-2013 Frank Meyer - frank(at)fli4l.de\r
+ * Copyright (c) 2009-2014 Frank Meyer - frank(at)fli4l.de\r
  *\r
- * $Id: irmp.c,v 1.158 2014/07/09 15:03:49 fm Exp $\r
+ * $Id: irmp.c,v 1.161 2014/07/21 08:58:58 fm Exp $\r
  *\r
  * ATMEGA88 @ 8 MHz\r
  *\r
@@ -498,7 +498,7 @@ static void                                     (*irmp_callback_ptr) (uint8_t);
  *---------------------------------------------------------------------------------------------------------------------------------------------------\r
  */\r
 #if defined(UNIX_OR_WINDOWS) || IRMP_PROTOCOL_NAMES == 1\r
-char *\r
+const char *\r
 irmp_protocol_names[IRMP_N_PROTOCOLS + 1] =\r
 {\r
     "UNKNOWN",\r
@@ -2302,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
@@ -3721,7 +3724,6 @@ irmp_ISR (void)
                             ANALYZE_PRINTF ("SYNC\n");\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