version 1.9.4: corrected irsnd_stop()

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

diff --git a/README.txt b/README.txt
index 7ce68f6777916ef697d7605e95256e964b85bbd7..1ab62a8081d25eb4eb56de3ca7ec1ecdb34c631a 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -2,7 +2,7 @@ IRMP - Infrared Multi Protocol Decoder
 --------------------------------------\r
 \r
 Version IRMP:  2.0.0-pre4 20.05.2010\r
-Version IRSND: 1.9.3      20.05.2010\r
+Version IRSND: 1.9.4      22.05.2010\r
 \r
 Dokumentation:\r
  \r

diff --git a/irmp.c b/irmp.c
index 0313571b07c3181bc1e03a1171a73c6d12b9d2da..7e958183072679258199bc652ef43868e09d61a1 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.103 2011/05/20 09:31:25 fm Exp $\r
+ * $Id: irmp.c,v 1.104 2011/05/22 21:40:52 fm Exp $\r
  *\r
  * ATMEGA88 @ 8 MHz\r
  *\r
@@ -1450,7 +1450,7 @@ static PROGMEM IRMP_PARAMETER lego_param =
 \r
 #if IRMP_SUPPORT_MERLIN_PROTOCOL == 1\r
 \r
-static PROGMEM IRMP_PARAMETER netbox_param =\r
+static PROGMEM IRMP_PARAMETER merlin_param =\r
 {\r
     IRMP_MERLIN_PROTOCOL,                                               // protocol:        ir protocol\r
     MERLIN_PULSE_LEN,                                                   // pulse_1_len_min: minimum length of pulse with bit value 1, here: exact value\r
@@ -2314,7 +2314,7 @@ irmp_ISR (void)
                         ANALYZE_PRINTF ("protocol = MERLIN, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
                                         MERLIN_START_BIT_PULSE_LEN_MIN, MERLIN_START_BIT_PULSE_LEN_MAX,\r
                                         MERLIN_START_BIT_PAUSE_LEN_MIN, MERLIN_START_BIT_PAUSE_LEN_MAX);\r
-                        irmp_param_p = (IRMP_PARAMETER *) &netbox_param;\r
+                        irmp_param_p = (IRMP_PARAMETER *) &merlin_param;\r
                     }\r
                     else\r
 #endif // IRMP_SUPPORT_MERLIN_PROTOCOL == 1\r

diff --git a/irsnd.c b/irsnd.c
index 214c93daf3057f9adab03a0f95761af6aed1590a..517986ce9ff05127ec5438470d3cb5cda3ea0bad 100644 (file)
--- a/irsnd.c
+++ b/irsnd.c
@@ -3,7 +3,7 @@
  *\r
  * Copyright (c) 2010-2011 Frank Meyer - frank(at)fli4l.de\r
  *\r
- * $Id: irsnd.c,v 1.37 2011/05/20 09:31:25 fm Exp $\r
+ * $Id: irsnd.c,v 1.38 2011/05/22 21:40:53 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
@@ -825,12 +825,10 @@ irsnd_send_data (IRMP_DATA * irmp_data_p, uint8_t do_wait)
     return irsnd_busy;\r
 }\r
 \r
-static volatile uint8_t  n_repeat_frames;                                                                       // number of repetition frames\r
-\r
 void\r
 irsnd_stop (void)\r
 {\r
-    n_repeat_frames = 0;\r
+    irsnd_repeat = 0;\r
 }\r
 \r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
@@ -853,6 +851,7 @@ irsnd_ISR (void)
     static uint8_t  has_stop_bit;\r
     static uint8_t  new_frame = TRUE;\r
     static uint8_t  complete_data_len;\r
+    static uint8_t  n_repeat_frames;                                                // number of repetition frames\r
     static uint8_t  n_auto_repetitions;                                             // number of auto_repetitions\r
     static uint8_t  auto_repetition_counter;                                        // auto_repetition counter\r
     static uint16_t auto_repetition_pause_len;                                      // pause before auto_repetition, uint16_t!\r