summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--IR-Data/test-suite.sh182
-rw-r--r--README.txt4
-rw-r--r--irmp.c10
-rw-r--r--makefile.lnx72
4 files changed, 135 insertions, 133 deletions
diff --git a/IR-Data/test-suite.sh b/IR-Data/test-suite.sh
index f9ce053..57817f4 100644
--- a/IR-Data/test-suite.sh
+++ b/IR-Data/test-suite.sh
@@ -1,91 +1,91 @@
-#! /bin/sh
-#----------------------------------------------------------------------------
-# test suite for IRMP
-#
-# usage:
-#
-# ./test-suite.sh
-#
-# Copyright (c) 2010 Frank Meyer - frank(at)fli4l.de
-#
-# $Id: test-suite.sh,v 1.11 2010/06/15 12:21:06 fm Exp $
-#----------------------------------------------------------------------------
-
-cd `dirname $0`
-
-for j in \
- Dbox.txt \
- DK_Digital.txt \
- Grundig_TP715.txt \
- Grundig_TP715_SatTV.txt \
- Grundig_TP715_Video.txt \
- Matsushita.txt \
- Nokia.txt \
- Panasonic-Blue-Ray.txt \
- RC5-Taste.txt \
- Samsung_DVD_Rec_00062C.txt \
- Samsung_TV.txt \
- Sony-RM-S-310.txt \
- sony-rm-s311.txt \
- Sony-RM-U305C.txt \
- Sony-RMT-D142P-DVD.txt \
- Sony-RMT-V406.txt \
- Sony_RM-S315_lange.txt \
- Sony_Bravia_RM-ED0009_new.txt \
- Yamaha-RAV388.txt \
- apple.txt \
- bo_beolink1000-10kHz.txt \
- denon.txt \
- elta_radio.txt \
- nec-repetition.txt \
- nec-skymaster-dt500.txt \
- nec.txt \
- nubert-subwoofer.txt \
- orion_vcr_07660BM070.txt \
- panasonic-scan.txt \
- rc5.txt \
- rc5x-79.txt \
- rc5x.txt \
- rc6-hold.txt \
- rc6.txt \
- sharp-denon.txt \
- sharp-denon2.txt
-do
- echo "testing $j ..."
- if ../irmp -v < $j | grep -q error
- then
- ../irmp -v < $j | grep error
- echo "test failed"
- exit 1
- fi
-done
-
-for j in \
- Siemens-Gigaset-M740AV-15kHz.txt \
- bo_beolink1000-15kHz.txt \
- denon-15kHz.txt
-do
- echo "testing $j ..."
- if ../irmp-15kHz -v < $j | grep -q error
- then
- ../irmp-15kHz -v < $j | grep error
- echo "test failed"
- exit 1
- fi
-done
-
-# for j in \
-# fdc-20kHz.txt
-# do
-# echo "testing $j ..."
-# if ../irmp-20kHz -v < $j | grep -q error
-# then
-# ../irmp-20kHz -v < $j | grep error
-# echo "test failed"
-# exit 1
-# fi
-# done
-
-
-echo "all tests successful"
-exit 0
+#! /bin/sh
+#----------------------------------------------------------------------------
+# test suite for IRMP
+#
+# usage:
+#
+# ./test-suite.sh
+#
+# Copyright (c) 2010 Frank Meyer - frank(at)fli4l.de
+#
+# $Id: test-suite.sh,v 1.10 2010/06/09 12:04:04 fm Exp $
+#----------------------------------------------------------------------------
+
+cd `dirname $0`
+
+for j in \
+ Dbox.txt \
+ DK_Digital.txt \
+ Grundig_TP715.txt \
+ Grundig_TP715_SatTV.txt \
+ Grundig_TP715_Video.txt \
+ Matsushita.txt \
+ Nokia.txt \
+ Panasonic-Blue-Ray.txt \
+ RC5-Taste.txt \
+ Samsung_DVD_Rec_00062C.txt \
+ Samsung_TV.txt \
+ Sony-RM-S-310.txt \
+ sony-rm-s311.txt \
+ Sony-RM-U305C.txt \
+ Sony-RMT-D142P-DVD.txt \
+ Sony-RMT-V406.txt \
+ Sony_RM-S315_lange.txt \
+ Sony_Bravia_RM-ED0009_new.txt \
+ Yamaha-RAV388.txt \
+ apple.txt \
+ bo_beolink1000-10kHz.txt \
+ denon.txt \
+ elta_radio.txt \
+ nec-repetition.txt \
+ nec-skymaster-dt500.txt \
+ nec.txt \
+ nubert-subwoofer.txt \
+ orion_vcr_07660BM070.txt \
+ panasonic-scan.txt \
+ rc5.txt \
+ rc5x-79.txt \
+ rc5x.txt \
+ rc6-hold.txt \
+ rc6.txt \
+ sharp-denon.txt \
+ sharp-denon2.txt
+do
+ echo "testing $j ..."
+ if ../irmp -v < $j | grep -q error
+ then
+ ../irmp -v < $j | grep error
+ echo "test failed"
+ exit 1
+ fi
+done
+
+for j in \
+ Siemens-Gigaset-M740AV-15kHz.txt \
+ bo_beolink1000-15kHz.txt \
+ denon-15kHz.txt
+do
+ echo "testing $j ..."
+ if ../irmp-15kHz -v < $j | grep -q error
+ then
+ ../irmp-15kHz -v < $j | grep error
+ echo "test failed"
+ exit 1
+ fi
+done
+
+# for j in \
+# fdc-20kHz.txt
+# do
+# echo "testing $j ..."
+# if ../irmp-20kHz -v < $j | grep -q error
+# then
+# ../irmp-20kHz -v < $j | grep error
+# echo "test failed"
+# exit 1
+# fi
+# done
+
+
+echo "all tests successful"
+exit 0
diff --git a/README.txt b/README.txt
index 4eb7581..08c9527 100644
--- a/README.txt
+++ b/README.txt
@@ -1,8 +1,8 @@
IRMP - Infrared Multi Protocol Decoder
--------------------------------------
-Version IRMP: 1.6.1 10.06.2010
-Version IRSND: 1.6.1 10.06.2010
+Version IRMP: 1.6.7 21.06.2010
+Version IRSND: 1.6.7 21.06.2010
Dokumentation:
diff --git a/irmp.c b/irmp.c
index 98bb00a..651cd5d 100644
--- a/irmp.c
+++ b/irmp.c
@@ -3,7 +3,7 @@
*
* Copyright (c) 2009-2010 Frank Meyer - frank(at)fli4l.de
*
- * $Id: irmp.c,v 1.52 2010/06/15 15:47:21 fm Exp $
+ * $Id: irmp.c,v 1.53 2010/06/21 08:27:09 fm Exp $
*
* ATMEGA88 @ 8 MHz
*
@@ -1747,7 +1747,11 @@ irmp_ISR (void)
irmp_store_bit (0);
}
}
+ else
#endif // IRMP_SUPPORT_DENON_PROTOCOL == 1
+ {
+ ; // else do nothing
+ }
irmp_pulse_time = 1; // set counter to 1, not 0
irmp_pause_time = 0;
@@ -1980,7 +1984,6 @@ irmp_ISR (void)
{
ANALYZE_PRINTF ("3rd start bit\n");
wait_for_space = 0;
- irmp_tmp_id = 0;
irmp_bit++;
}
else
@@ -1997,7 +2000,6 @@ irmp_ISR (void)
{
ANALYZE_PRINTF ("trailer bit\n");
wait_for_space = 0;
- irmp_tmp_id = 0;
irmp_bit++;
}
else
@@ -2093,7 +2095,7 @@ irmp_ISR (void)
}
}
- if (irmp_bit == irmp_param.complete_len && irmp_param.stop_bit == 0) // enough bits received?
+ if (irmp_start_bit_detected && irmp_bit == irmp_param.complete_len && irmp_param.stop_bit == 0) // enough bits received?
{
if (last_irmp_command == irmp_tmp_command && repetition_counter < AUTO_FRAME_REPETITION_LEN)
{
diff --git a/makefile.lnx b/makefile.lnx
index e003bc1..79a3a0d 100644
--- a/makefile.lnx
+++ b/makefile.lnx
@@ -1,36 +1,36 @@
-#----------------------------------------------------------------------------
-# Makefile for Linux
-#
-# usage:
-#
-# make -f makefile.lnx [irmp] [irsnd]
-#
-# Copyright (c) 2010 Frank Meyer - frank(at)fli4l.de
-#
-# $Id: makefile.lnx,v 1.7 2010/06/14 15:55:11 fm Exp $
-#----------------------------------------------------------------------------
-all: irmp irmp-15kHz irmp-20kHz irsnd irsnd-15kHz irsnd-20kHz
-
-irmp: irmp.c irmp.h irmpconfig.h
- cc -Wall -DF_INTERRUPTS=10000 irmp.c -o irmp
-
-irmp-15kHz: irmp.c irmp.h irmpconfig.h
- cc -Wall -DF_INTERRUPTS=15000 irmp.c -o irmp-15kHz
-
-irmp-20kHz: irmp.c irmp.h irmpconfig.h
- cc -Wall -DF_INTERRUPTS=20000 irmp.c -o irmp-20kHz
-
-irsnd: irsnd.c irsnd.h irmp.h irsndconfig.h
- cc -Wall -DF_INTERRUPTS=10000 irsnd.c -o irsnd
-
-irsnd-15kHz: irsnd.c irsnd.h irmp.h irsndconfig.h
- cc -Wall -DF_INTERRUPTS=15000 irsnd.c -o irsnd-15kHz
-
-irsnd-20kHz: irsnd.c irsnd.h irmp.h irsndconfig.h
- cc -Wall -DF_INTERRUPTS=20000 irsnd.c -o irsnd-20kHz
-
-test: all
- cd IR-Data && ./test-suite.sh
-
-clean:
- rm -f irmp irmp-15kHz irmp-20kHz irsnd irsnd-15kHz irsnd-20kHz
+#----------------------------------------------------------------------------
+# Makefile for Linux
+#
+# usage:
+#
+# make -f makefile.lnx [irmp] [irsnd]
+#
+# Copyright (c) 2010 Frank Meyer - frank(at)fli4l.de
+#
+# $Id: makefile.lnx,v 1.6 2010/06/11 14:47:24 fm Exp $
+#----------------------------------------------------------------------------
+all: irmp irmp-15kHz irmp-20kHz irsnd irsnd-15kHz irsnd-20kHz
+
+irmp: irmp.c irmp.h irmpconfig.h
+ cc -Wall -DF_INTERRUPTS=10000 irmp.c -o irmp
+
+irmp-15kHz: irmp.c irmp.h irmpconfig.h
+ cc -Wall -DF_INTERRUPTS=15000 irmp.c -o irmp-15kHz
+
+irmp-20kHz: irmp.c irmp.h irmpconfig.h
+ cc -Wall -DF_INTERRUPTS=20000 irmp.c -o irmp-20kHz
+
+irsnd: irsnd.c irsnd.h irmp.h irsndconfig.h
+ cc -Wall -DF_INTERRUPTS=10000 irsnd.c -o irsnd
+
+irsnd-15kHz: irsnd.c irsnd.h irmp.h irsndconfig.h
+ cc -Wall -DF_INTERRUPTS=15000 irsnd.c -o irsnd-15kHz
+
+irsnd-20kHz: irsnd.c irsnd.h irmp.h irsndconfig.h
+ cc -Wall -DF_INTERRUPTS=20000 irsnd.c -o irsnd-20kHz
+
+test: all
+ cd IR-Data && ./test-suite.sh
+
+clean:
+ rm -f irmp irmp-15kHz irmp-20kHz irsnd irsnd-15kHz irsnd-20kHz
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-21 14:12:09 +0000