Version 2.6.4: changed timing tolerance of KASEIKYO

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

diff --git a/IR-Data/test-suite.sh b/IR-Data/test-suite.sh
index 26d620071e64010a4f7f16c65609a838cd7c12b0..b4ed0efa2178da42da9a8c29c4ef80b0e21fc009 100644 (file)
--- a/IR-Data/test-suite.sh
+++ b/IR-Data/test-suite.sh
@@ -51,6 +51,7 @@ for j in                            \
     elta_radio.txt                  \
     fdc.txt                         \
     jvc.txt                         \
+    jvc-rm-rk250-10kHz.txt         \
     nec-repetition.txt              \
     nec-skymaster-dt500.txt         \
     nec.txt                         \
@@ -71,16 +72,16 @@ do
     echo -n "testing $j ... "
     if tmpsrc/irmp-10kHz -v < $j | grep -q error
     then
-        tmpsrc/irmp-10kHz -v < $j | grep error
-        echo "test failed"
-        exit 1
+       tmpsrc/irmp-10kHz -v < $j | grep error
+       echo "test failed"
+       exit 1
     else
-        if tmpsrc/irmp-10kHz -v < $j | grep -q checked
-        then
-            echo "checked!"
-        else
-            echo "successful"
-        fi
+       if tmpsrc/irmp-10kHz -v < $j | grep -q checked
+       then
+           echo "checked!"
+       else
+           echo "successful"
+       fi
     fi
 done
 
@@ -110,16 +111,16 @@ do
     echo -n "testing $j ... "
     if tmpsrc/irmp-15kHz -v < $j | grep -q error
     then
-        tmpsrc/irmp-15kHz -v < $j | grep error
-        echo "test failed"
-        exit 1
+       tmpsrc/irmp-15kHz -v < $j | grep error
+       echo "test failed"
+       exit 1
     else
-        if tmpsrc/irmp-15kHz -v < $j | grep -q checked
-        then
-            echo "checked!"
-        else
-            echo "successful"
-        fi
+       if tmpsrc/irmp-15kHz -v < $j | grep -q checked
+       then
+           echo "checked!"
+       else
+           echo "successful"
+       fi
     fi
 done
 
@@ -135,16 +136,16 @@ do
     echo -n "testing $j ... "
     if tmpsrc/irmp-20kHz -v < $j | grep -q error
     then
-        tmpsrc/irmp-20kHz -v < $j | grep error
-        echo "test failed"
-        exit 1
+       tmpsrc/irmp-20kHz -v < $j | grep error
+       echo "test failed"
+       exit 1
     else
-        if tmpsrc/irmp-20kHz -v < $j | grep -q checked
-        then
-            echo "checked!"
-        else
-            echo "successful"
-        fi
+       if tmpsrc/irmp-20kHz -v < $j | grep -q checked
+       then
+           echo "checked!"
+       else
+           echo "successful"
+       fi
     fi
 done
 

diff --git a/README.txt b/README.txt
index 4170dfba8f88ee3e8224d0c0a32db22d88ab868d..0e2c6e18eb885511022ca320fae23385b234f343 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -1,8 +1,8 @@
 IRMP - Infrared Multi Protocol Decoder\r
 --------------------------------------\r
 \r
-Version IRMP:  2.6.3 15.09.2014\r
-Version IRSND: 2.6.3 15.09.2014\r
+Version IRMP:  2.6.4 15.09.2014\r
+Version IRSND: 2.6.4 15.09.2014\r
 \r
 Dokumentation:\r
  \r

diff --git a/irmp.c b/irmp.c
index 18b523a8a66a332e1d4ee95b63954d9e3cae8c3e..018bb7fad36c2ad2af2738b0203102f67acdae8b 100644 (file)
--- a/irmp.c
+++ b/irmp.c
@@ -3,7 +3,7 @@
  *\r
  * Copyright (c) 2009-2014 Frank Meyer - frank(at)fli4l.de\r
  *\r
- * $Id: irmp.c,v 1.162 2014/09/15 10:27:37 fm Exp $\r
+ * $Id: irmp.c,v 1.164 2014/09/15 12:36:28 fm Exp $\r
  *\r
  * Supported AVR mikrocontrollers:\r
  *\r
@@ -143,10 +143,10 @@
 #define MATSUSHITA_0_PAUSE_LEN_MIN              ((uint8_t)(F_INTERRUPTS * MATSUSHITA_0_PAUSE_TIME * MIN_TOLERANCE_40 + 0.5) - 1)\r
 #define MATSUSHITA_0_PAUSE_LEN_MAX              ((uint8_t)(F_INTERRUPTS * MATSUSHITA_0_PAUSE_TIME * MAX_TOLERANCE_40 + 0.5) + 1)\r
 \r
-#define KASEIKYO_START_BIT_PULSE_LEN_MIN        ((uint8_t)(F_INTERRUPTS * KASEIKYO_START_BIT_PULSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
-#define KASEIKYO_START_BIT_PULSE_LEN_MAX        ((uint8_t)(F_INTERRUPTS * KASEIKYO_START_BIT_PULSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
-#define KASEIKYO_START_BIT_PAUSE_LEN_MIN        ((uint8_t)(F_INTERRUPTS * KASEIKYO_START_BIT_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
-#define KASEIKYO_START_BIT_PAUSE_LEN_MAX        ((uint8_t)(F_INTERRUPTS * KASEIKYO_START_BIT_PAUSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
+#define KASEIKYO_START_BIT_PULSE_LEN_MIN        ((uint8_t)(F_INTERRUPTS * KASEIKYO_START_BIT_PULSE_TIME * MIN_TOLERANCE_20 + 0.5) - 1)\r
+#define KASEIKYO_START_BIT_PULSE_LEN_MAX        ((uint8_t)(F_INTERRUPTS * KASEIKYO_START_BIT_PULSE_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
+#define KASEIKYO_START_BIT_PAUSE_LEN_MIN        ((uint8_t)(F_INTERRUPTS * KASEIKYO_START_BIT_PAUSE_TIME * MIN_TOLERANCE_20 + 0.5) - 1)\r
+#define KASEIKYO_START_BIT_PAUSE_LEN_MAX        ((uint8_t)(F_INTERRUPTS * KASEIKYO_START_BIT_PAUSE_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
 #define KASEIKYO_PULSE_LEN_MIN                  ((uint8_t)(F_INTERRUPTS * KASEIKYO_PULSE_TIME * MIN_TOLERANCE_50 + 0.5) - 1)\r
 #define KASEIKYO_PULSE_LEN_MAX                  ((uint8_t)(F_INTERRUPTS * KASEIKYO_PULSE_TIME * MAX_TOLERANCE_50 + 0.5) + 1)\r
 #define KASEIKYO_1_PAUSE_LEN_MIN                ((uint8_t)(F_INTERRUPTS * KASEIKYO_1_PAUSE_TIME * MIN_TOLERANCE_30 + 0.5) - 1)\r
@@ -538,6 +538,7 @@ static const char proto_rcmm12[]        PROGMEM = "RCMM12";
 static const char proto_speaker[]       PROGMEM = "SPEAKER";\r
 static const char proto_lgair[]         PROGMEM = "LGAIR";\r
 static const char proto_samsung48[]     PROGMEM = "SAMSG48";\r
+\r
 static const char proto_radio1[]        PROGMEM = "RADIO1";\r
 \r
 const char * const\r
@@ -585,6 +586,7 @@ irmp_protocol_names[IRMP_N_PROTOCOLS + 1] PROGMEM =
     proto_speaker,\r
     proto_lgair,\r
     proto_samsung48,\r
+\r
     proto_radio1\r
 };\r
 \r
@@ -1703,7 +1705,7 @@ static IRMP_PARAMETER                       irmp_param;
 static IRMP_PARAMETER                       irmp_param2;\r
 #endif\r
 \r
-static volatile uint8_t                     irmp_ir_detected;\r
+static volatile uint8_t                     irmp_ir_detected = FALSE;\r
 static volatile uint8_t                     irmp_protocol;\r
 static volatile uint16_t                    irmp_address;\r
 static volatile uint16_t                    irmp_command;\r
@@ -2349,7 +2351,8 @@ irmp_ISR (void)
                 }\r
                 else\r
                 {                                                               // receiving first data pulse!\r
-                    IRMP_PARAMETER * irmp_param_p = (IRMP_PARAMETER *) 0;\r
+                    IRMP_PARAMETER * irmp_param_p;\r
+                    irmp_param_p = (IRMP_PARAMETER *) 0;\r
 \r
 #if IRMP_SUPPORT_RC5_PROTOCOL == 1 && (IRMP_SUPPORT_FDC_PROTOCOL == 1 || IRMP_SUPPORT_RCCAR_PROTOCOL == 1)\r
                     irmp_param2.protocol = 0;\r

diff --git a/irmpconfig.h b/irmpconfig.h
index b9a73fdfa727669b0175ac5b854864088b61d779..6239e83683e982b6ea805fffbf0ca2264b33c9b7 100644 (file)
--- a/irmpconfig.h
+++ b/irmpconfig.h
@@ -6,7 +6,7 @@
  * Copyright (c) 2009-2014 Frank Meyer - frank(at)fli4l.de\r
  * Extensions for PIC 12F1820 W.Strobl 2014-07-20\r
  *\r
- * $Id: irmpconfig.h,v 1.119 2014/09/15 10:31:22 fm Exp $\r
+ * $Id: irmpconfig.h,v 1.121 2014/09/15 12:36:28 fm Exp $\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r

diff --git a/irmpprotocols.h b/irmpprotocols.h
index 05c009dd489077a9ab2f6cb5b7ad841aaec2c1fa..381fe0dfbd50c15b58a6fa147c1b2de8460dbae2 100644 (file)
--- a/irmpprotocols.h
+++ b/irmpprotocols.h
@@ -5,7 +5,7 @@
  *\r
  * Copyright (c) 2013-2014 Frank Meyer - frank(at)fli4l.de\r
  *\r
- * $Id: irmpprotocols.h,v 1.26 2014/07/21 08:58:58 fm Exp $\r
+ * $Id: irmpprotocols.h,v 1.28 2014/09/15 12:36:28 fm Exp $\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r