From 6f75002072ad07fe60d9e57370d3980b5229f7f4 Mon Sep 17 00:00:00 2001 From: ukw Date: Tue, 22 Jun 2010 12:32:40 +0000 Subject: Version 1.6.8: fixed conflicts between RC5 and FDC/RCCAR protocol git-svn-id: svn://mikrocontroller.net/irmp@34 aeb2e35e-bfc4-4214-b83c-9e8de998ed28 --- IR-Data/fdc-20kHz.txt | 8 ++++---- IR-Data/test-suite.sh | 44 +++++++++++++++++++++++++++++--------------- 2 files changed, 33 insertions(+), 19 deletions(-) (limited to 'IR-Data') diff --git a/IR-Data/fdc-20kHz.txt b/IR-Data/fdc-20kHz.txt index 8b2bda7..5a89a59 100644 --- a/IR-Data/fdc-20kHz.txt +++ b/IR-Data/fdc-20kHz.txt @@ -52,13 +52,13 @@ 000000000000000000000000000000000000000000111111111111111111100000011111111111111100000011111111111111000000111111111111110000001111111111111110000001111111111111100000011111111111111000000111110000001111000000111110000001111000000111100000001111000000111100000011111000000111100000011111000000111100000011111000000111100000011110000000111100000011110000001111100000011110000001111111111111110000001111000000111100000001111111111111100000011110000001111100000011110000001111100000011110000001111111111111100000011111111111111100000011110000001111111111111100000001111111111111100000011111111111111000000111111111111111000000111111111111111111 # 9 000000000000000000000000000000000000000000111111111111111111100000011111111111111100000011111111111111000000111111111111110000001111111111111110000001111111111111100000011111111111111000000111110000001111000000111110000001111000000111110000001111000000111110000001111000000111100000011111000000111100000011111000000111100000011111000000111100000011111000000111100000011110000001111100000011111111111111000000111110000001111111111111100000011110000001111100000011110000001111100000011111111111111000000111110000001111111111111100000011110000001111111111111110000001111111111111100000011111111111111000000111111111111111000000111111111111111111 -# ss +# 0Ÿ 000000000000000000000000000000000000000001111111111111111111100000011111111111111000000111111111111110000001111111111111110000001111111111111100000011111111111111000000111111111111111000000111100000011111000000111100000011110000001111100000011110000001111100000011110000001111100000011110000001111100000011110000001111000000111110000001111000000111110000001111000000111110000001111111111111100000011111111111111000000111110000001111111111111100000011111000000111100000011110000001111100000011110000001111100000011111111111111000000111110000001111111111111100000011111111111111000000111111111111111000000111111111111110000001111111111111111111 -# ' +# ss 000000000000000000000000000000000000000001111111111111111111100000011111111111111000000111111111111110000001111111111111110000001111111111111100000011111111111111000000111111111111111000000111100000011111000000111100000011110000000111100000011110000001111100000011110000001111100000011110000001111100000011110000001111000000011110000001111000000111110000001111000000111110000001111000000111110000001111111111111100000011111111111111000000111110000001111000000111110000001111000000111111111111110000001111111111111110000001111000000111110000001111111111111100000011111111111111000000111111111111111000000111111111111110000001111111111111111111 -# Backspace +# Accent 000000000000000000000000000000000000000000111111111111111111100000011111111111111000000111111111111111000000111111111111110000001111111111111100000011111111111111100000011111111111111000000111100000011111000000111100000011111000000111100000011111000000111100000011110000001111100000011110000001111100000011110000001111100000011110000001111100000011110000001111000000111110000001111111111111100000011111000000111111111111110000001111111111111100000011111000000111100000011111000000111100000011111000000111111111111110000001111000000111110000001111111111111100000011111111111111000000111111111111111000000111111111111110000001111111111111111111 -# ????? +# Backspace 000000000000000000000000000000000000000000111111111111111111100000011111111111111000000111111111111111000000111111111111110000001111111111111100000011111111111111100000011111111111111000000111100000011111000000111100000011111000000111100000011111000000111100000011110000001111100000011110000001111100000011110000001111100000011110000001111100000011110000001111000000111110000001111111111111100000011111111111111100000011111111111111000000111111111111110000001111100000011110000001111100000011110000001111000000111110000001111000000111110000001111111111111100000011111111111111000000111111111111111000000111111111111110000001111111111111111111 # Tab 000000000000000000000000000000000000000001111111111111111111000000111111111111111000000111111111111110000001111111111111100000011111111111111100000011111111111111000000111111111111110000001111100000011110000001111100000011110000001111100000011110000001111000000111110000001111000000111110000001111000000111110000001111000000111110000001111000000111100000011111000000111100000011111000000111100000011111000000111100000011111111111111000000111110000001111000000111110000001111111111111100000011111111111111000000111111111111111000000111111111111110000001111100000011111111111111000000111111111111110000001111111111111110000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000000000000000000000000000000000000000011111111111111111110000001111111111111100000011111111111111100000011111111111111000000111111111111110000001111111111111110000001111111111111100000011111000000111100000011110000000111100000011110000001111100000011110000001111100000011110000001111100000011110000001111000000111110000001111000000111111111111111000000111111111111110000001111111111111100000011111111111111100000011110000001111100000011110000001111000000011111111111111000000111100000011111000000111100000011111111111111000000011111111111111000000111111111111110000001111111111111100000001111000000111111111111110000001111111111111110000001111111111111100000011111111111111111 diff --git a/IR-Data/test-suite.sh b/IR-Data/test-suite.sh index 57817f4..840b7ac 100644 --- a/IR-Data/test-suite.sh +++ b/IR-Data/test-suite.sh @@ -11,7 +11,16 @@ # $Id: test-suite.sh,v 1.10 2010/06/09 12:04:04 fm Exp $ #---------------------------------------------------------------------------- +set -e # exit on error cd `dirname $0` +mkdir -p tmpsrc +cp ../irmp.[ch] ../irmpconfig.h ../irsnd.[ch] ../irsndconfig.h ../makefile.lnx tmpsrc +cd tmpsrc +sed 's/#define \(IRMP_SUPPORT_[A-Z_0-9]* *\)[01]/#define \1 1/g' irmpconfig.new +mv irmpconfig.new irmpconfig.h +make -f makefile.lnx clean +make -f makefile.lnx all +cd .. for j in \ Dbox.txt \ @@ -37,12 +46,14 @@ for j in \ bo_beolink1000-10kHz.txt \ denon.txt \ elta_radio.txt \ + fdc.txt \ nec-repetition.txt \ nec-skymaster-dt500.txt \ nec.txt \ nubert-subwoofer.txt \ orion_vcr_07660BM070.txt \ panasonic-scan.txt \ + rc-car.txt \ rc5.txt \ rc5x-79.txt \ rc5x.txt \ @@ -52,9 +63,9 @@ for j in \ sharp-denon2.txt do echo "testing $j ..." - if ../irmp -v < $j | grep -q error + if tmpsrc/irmp -v < $j | grep -q error then - ../irmp -v < $j | grep error + tmpsrc/irmp -v < $j | grep error echo "test failed" exit 1 fi @@ -66,26 +77,29 @@ for j in \ denon-15kHz.txt do echo "testing $j ..." - if ../irmp-15kHz -v < $j | grep -q error + if tmpsrc/irmp-15kHz -v < $j | grep -q error then - ../irmp-15kHz -v < $j | grep error + tmpsrc/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 +for j in \ + rc-car-20kHz.txt \ + fdc-20kHz.txt \ + fdc2-20kHz.txt +do + echo "testing $j ..." + if tmpsrc/irmp-20kHz -v < $j | grep -q error + then + tmpsrc/irmp-20kHz -v < $j | grep error + echo "test failed" + exit 1 + fi +done +rm -rf tmpsrc echo "all tests successful" exit 0 -- cgit v1.2.3