From cc4e8ef2a3200dfd3df2a175d9bd4035c2853e3c Mon Sep 17 00:00:00 2001 From: ukw Date: Fri, 25 Feb 2011 09:20:16 +0000 Subject: [PATCH] version 1.9.6: corrected RECS80 decoder git-svn-id: svn://mikrocontroller.net/irmp@62 aeb2e35e-bfc4-4214-b83c-9e8de998ed28 --- IR-Data/test-suite.sh | 23 ++++++++++++----------- irmp.h | 10 +++++----- irmpconfig.h | 4 ++-- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/IR-Data/test-suite.sh b/IR-Data/test-suite.sh index 5a59c0d..93e23f6 100644 --- a/IR-Data/test-suite.sh +++ b/IR-Data/test-suite.sh @@ -70,9 +70,9 @@ do echo "testing $j ..." if tmpsrc/irmp -v < $j | grep -q error then - tmpsrc/irmp -v < $j | grep error - echo "test failed" - exit 1 + tmpsrc/irmp -v < $j | grep error + echo "test failed" + exit 1 fi done @@ -80,17 +80,18 @@ for j in \ Siemens-Gigaset-M740AV-15kHz.txt \ bo_beolink1000-15kHz.txt \ denon-15kHz.txt \ - irc-15kHz.txt \ - kathrein-15kHz.txt \ + irc-15kHz.txt \ + kathrein-15kHz.txt \ + recs80-15kHz.txt \ t-home-mediareceiver-15kHz.txt \ xbox360-15kHz.txt do echo "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 fi done @@ -102,9 +103,9 @@ 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 + tmpsrc/irmp-20kHz -v < $j | grep error + echo "test failed" + exit 1 fi done diff --git a/irmp.h b/irmp.h index 55a44c8..88e3232 100644 --- a/irmp.h +++ b/irmp.h @@ -3,7 +3,7 @@ * * Copyright (c) 2009-2010 Frank Meyer - frank(at)fli4l.de * - * $Id: irmp.h,v 1.55 2011/02/25 08:35:33 fm Exp $ + * $Id: irmp.h,v 1.56 2011/02/25 09:19:54 fm Exp $ * * ATMEGA88 @ 8 MHz * @@ -179,11 +179,11 @@ typedef uint8_t PAUSE_LEN; #define RECS80_FRAME_REPEAT_PAUSE_TIME 45.0e-3 // frame repeat after 45ms #define RECS80_ADDRESS_OFFSET 1 // skip 1 bit (toggle bit) #define RECS80_ADDRESS_LEN 3 // read 3 address bits -#define RECS80_COMMAND_OFFSET 4 // skip 5 bits (2nd start + 1 toggle + 3 address) +#define RECS80_COMMAND_OFFSET 4 // skip 4 bits (1 toggle + 3 address) #define RECS80_COMMAND_LEN 6 // read 6 command bits #define RECS80_COMPLETE_DATA_LEN 10 // complete length #define RECS80_STOP_BIT 1 // has stop bit -#define RECS80_LSB 0 // MSB...LSB +#define RECS80_LSB 1 // LSB...MSB #define RECS80_FLAGS 0 // flags #define RC5_BIT_TIME 889.0e-6 // 889 usec pulse/pause @@ -235,12 +235,12 @@ typedef uint8_t PAUSE_LEN; #define RECS80EXT_0_PAUSE_TIME 4902.0e-6 // 4902 usec pause #define RECS80EXT_FRAME_REPEAT_PAUSE_TIME 45.0e-3 // frame repeat after 45ms #define RECS80EXT_ADDRESS_OFFSET 2 // skip 2 bits (2nd start + 1 toggle) -#define RECS80EXT_ADDRESS_LEN 4 // read 3 address bits +#define RECS80EXT_ADDRESS_LEN 4 // read 4 address bits #define RECS80EXT_COMMAND_OFFSET 6 // skip 6 bits (2nd start + 1 toggle + 4 address) #define RECS80EXT_COMMAND_LEN 6 // read 6 command bits #define RECS80EXT_COMPLETE_DATA_LEN 12 // complete length #define RECS80EXT_STOP_BIT 1 // has stop bit -#define RECS80EXT_LSB 0 // MSB...LSB +#define RECS80EXT_LSB 1 // LSB...MSB #define RECS80EXT_FLAGS 0 // flags #define NUBERT_START_BIT_PULSE_TIME 1340.0e-6 // 1340 usec pulse diff --git a/irmpconfig.h b/irmpconfig.h index a19b46a..18aa060 100644 --- a/irmpconfig.h +++ b/irmpconfig.h @@ -3,7 +3,7 @@ * * Copyright (c) 2010 Frank Meyer - frank(at)fli4l.de * - * $Id: irmpconfig.h,v 1.57 2011/02/25 08:35:33 fm Exp $ + * $Id: irmpconfig.h,v 1.58 2011/02/25 09:19:54 fm Exp $ * * ATMEGA88 @ 8 MHz * @@ -66,7 +66,7 @@ #define IRMP_SUPPORT_SIEMENS_PROTOCOL 0 // Siemens Gigaset >= 15000 ~550 bytes #define IRMP_SUPPORT_RUWIDO_PROTOCOL 0 // RUWIDO, T-Home >= 15000 ~550 bytes #define IRMP_SUPPORT_RECS80_PROTOCOL 0 // RECS80 (SAA3004) >= 15000 ~50 bytes -#define IRMP_SUPPORT_RECS80EXT_PROTOCOL 0 // RECS80EXT >= 15000 ~50 bytes +#define IRMP_SUPPORT_RECS80EXT_PROTOCOL 0 // RECS80EXT (SAA3008) >= 15000 ~50 bytes /*--------------------------------------------------------------------------------------------------------------------------------------------------- * Change hardware pin here: -- 2.39.2