Version 2.3.7: changed detection of inverted Denon frames

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

diff --git a/README.txt b/README.txt
index b20d0a4a927181e7075ef8cb683c7fcc26e3a8a7..47c61cb9c1a0f8a44a7027245420b47233584a6e 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
 IRMP - Infrared Multi Protocol Decoder\r
 --------------------------------------\r
 \r
-Version IRMP:  2.3.6 17.01.2013\r
+Version IRMP:  2.3.7 21.01.2013\r
 Version IRSND: 2.3.6 17.01.2013\r
 \r
 Dokumentation:\r

diff --git a/irmp.c b/irmp.c
index 04f8eae182bc081f4b783d73ca46ecd472bc7038..2a0d65bdfb1041a57ab6d60c19a3eb0c9cda5e1a 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.137 2013/01/17 07:33:13 fm Exp $\r
+ * $Id: irmp.c,v 1.138 2013/01/21 11:11:54 fm Exp $\r
  *\r
  * ATMEGA88 @ 8 MHz\r
  *\r
@@ -1884,7 +1884,7 @@ irmp_ISR (void)
 \r
                             if (denon_repetition_len >= DENON_AUTO_REPETITION_PAUSE_LEN && last_irmp_denon_command != 0)\r
                             {\r
-                                ANALYZE_PRINTF ("%8.3fms error 6: did not receive inverted command repetition\n",\r
+                                ANALYZE_PRINTF ("%8.3fms warning: did not receive inverted command repetition\n",\r
                                                 (double) (time_counter * 1000) / F_INTERRUPTS);\r
                                 last_irmp_denon_command = 0;\r
                                 denon_repetition_len = 0xFFFF;\r
@@ -3241,25 +3241,19 @@ irmp_ISR (void)
                         }\r
                         else\r
                         {\r
-                            if ((irmp_tmp_command & 0x03) == 0x00)\r
+                            if ((irmp_tmp_command & 0x01) == 0x00)\r
                             {\r
                                 ANALYZE_PRINTF ("%8.3fms info Denon: waiting for inverted command repetition\n", (double) (time_counter * 1000) / F_INTERRUPTS);\r
                                 last_irmp_denon_command = irmp_tmp_command;\r
                                 denon_repetition_len = 0;\r
                                 irmp_ir_detected = FALSE;\r
                             }\r
-                            else if ((irmp_tmp_command & 0x03) == 0x03)\r
+                            else\r
                             {\r
-                                ANALYZE_PRINTF ("%8.3fms error Denon: got unexpected inverted command, ignoring it\n", (double) (time_counter * 1000) / F_INTERRUPTS);\r
+                                ANALYZE_PRINTF ("%8.3fms warning Denon: got unexpected inverted command, ignoring it\n", (double) (time_counter * 1000) / F_INTERRUPTS);\r
                                 last_irmp_denon_command = 0;\r
                                 irmp_ir_detected = FALSE;\r
                             }\r
-                            else    // fm 2013-01-17: 0x01 or 0x10: there is no inverted command\r
-                            {\r
-                                irmp_protocol = irmp_param.protocol;                // store protocol\r
-                                irmp_address = irmp_tmp_address;                    // store address\r
-                                irmp_command = irmp_tmp_command;                    // store command\r
-                            }\r
                         }\r
                     }\r
                     else\r