From b85cb27dc97335aac5a98eacfefdb6119ad8312e Mon Sep 17 00:00:00 2001 From: ukw Date: Tue, 19 Mar 2013 15:12:35 +0000 Subject: [PATCH] Version 2.3.9: added ORTEK and TELEFUNKEN protocol git-svn-id: svn://mikrocontroller.net/irmp@117 aeb2e35e-bfc4-4214-b83c-9e8de998ed28 --- IR-Data/telefunken-1560-20kHz.txt | 96 ++++++++++++++++++++++++++ IR-Data/test-suite.sh | 3 +- README.txt | 2 +- irmp.c | 108 +++++++++++++++++++++++++++++- irmpconfig.h | 4 +- irmpprotocols.h | 42 +++++++++++- 6 files changed, 247 insertions(+), 8 deletions(-) create mode 100644 IR-Data/telefunken-1560-20kHz.txt diff --git a/IR-Data/telefunken-1560-20kHz.txt b/IR-Data/telefunken-1560-20kHz.txt new file mode 100644 index 0000000..d611b36 --- /dev/null +++ b/IR-Data/telefunken-1560-20kHz.txt @@ -0,0 +1,96 @@ +# Rueck Modus A [34 (TELEFUNKEN) 0x0000 0x42e0] +0000000000001111111111111111111111111111110000000000001111111111111111111111111111110000000000001111111110000000000001111111110000000000001111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111000000000000011111111111111 +# Rueck Modus B [34 (TELEFUNKEN) 0x0000 0x4ae0] +0000000000001111111111111111111111111111110000000000001111111111111111111111111111110000000000001111111110000000000001111111110000000000001111111111111111111111111111111000000000001111111110000000000001111111111111111111111111111111000000000001111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111111111111 +# Vor Modus A [34 (TELEFUNKEN) 0x0000 0x4260] +000000000000011111111111111111111111111111100000000000011111111111111111111111111111100000000000011111111000000000000011111111100000000000011111111100000000000011111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111100000000000011111111111111111111111111111100000000000001111111111111111111111111111100000000000001111111100000000000001111111110000000000001111111110000000000001111111100000000000001111111100000000000001111111111111111111 +# Vor Modus B [34 (TELEFUNKEN) 0x0000 0x4a60] +0000000000001111111111111111111111111111110000000000001111111111111111111111111111111000000000001111111111000000000001111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111000000000000011111111000000000000011111111000000000000011111111111111 +# Aufn. (zus. mit Start) [34 (TELEFUNKEN) 0x0000 0x4233] +0000000000000111111111111111111111111111111000000000000111111111111111111111111111110000000000000111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111110000000000000111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000011111111000000000000011111111100000000000011111111111111111111111111111100000000000011111111111111111111111111111100000000000011111111111111111 +# Pause [34 (TELEFUNKEN) 0x0000 0x42b0] +0000000000001111111111111111111111111111110000000000001111111111111111111111111111111000000000000111111111000000000001111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111110000000000000111111100000000000000111111111111111111111111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111000000000000011111111100000000000011111111111111 +# Variab. Rueck [34 (TELEFUNKEN) 0x0000 0x42a8] +0000000000001111111111111111111111111111110000000000001111111111111111111111111111110000000000001111111110000000000001111111110000000000001111111111000000000000111111111000000000000111111111111111111111111111111000000000001111111111000000000001111111111111111111111111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111000000000000011111111111111 +# Variab. Vor [34 (TELEFUNKEN) 0x0000 0x4228] +000000000000111111111111111111111111111111000000000000111111111111111111111111111111100000000000111111111100000000000111111111100000000000111111111100000000000011111111000000000000011111111111111111111111111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111100000000000011111111110000000000011111111111111111111 +# Cass [34 (TELEFUNKEN) 0x0000 0x4220] +000000000000001111111111111111111111111111100000000000011111111111111111111111111111100000000000111111111100000000000011111111000000000000001111111100000000000011111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111111111111111111111111100000000000001111111100000000000001111111110000000000001111111110000000000001111111110000000000011111111110000000000001111111111111111 +# Start [34 (TELEFUNKEN) 0x0000 0x4230] +000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111100000000000111111111111111111111111111111000000000000011111111100000000000111111111100000000000011111111100000000000011111111111111111111111111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111111111111111 +# Ein-Aus [34 (TELEFUNKEN) 0x0000 0x42d0] +0000000000001111111111111111111111111111110000000000001111111111111111111111111111110000000000001111111110000000000001111111110000000000001111111110000000000001111111110000000000001111111111111111111111111111110000000000000111111110000000000001111111111111111111111111111111000000000001111111111111111111111111111111000000000001111111110000000000000111111111111111111111111111111000000000000111111111000000000000111111110000000000000111111111000000000000111111110000000000000111111111111111 +# Intervall [34 (TELEFUNKEN) 0x0000 0x4269] +0000000000001111111111111111111111111111110000000000001111111111111111111111111111110000000000001111111110000000000001111111110000000000001111111110000000000001111111110000000000001111111111111111111111111111110000000000001111111110000000000001111111111000000000001111111111111111111111111111111000000000001111111111111111111111111111111000000000001111111111000000000001111111111111111111111111111110000000000000111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111111111111 +# Stop [34 (TELEFUNKEN) 0x0000 0x42c0] +000000000000111111111111111111111111111111000000000000111111111111111111111111111111100000000000111111111100000000000111111111000000000000111111111100000000000011111111100000000000111111111111111111111111111111100000000000011111111100000000000011111111111111111111111111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111111111111111 +# Jog Ring nach links (Progr. Mode) [34 (TELEFUNKEN) 0x0000 0x4221] +000000000000111111111111111111111111111111100000000000111111111111111111111111111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111111111111111111111111110000000000011111111100000000000011111111100000000000011111111100000000000011111111111111111111111111111110000000000011111111110000000000011111111100000000000011111111110000000000011111111100000000000001111111111111111111111111111110000000000001111111111111111111 +# Jog Ring nach rechts (Progr. Mode) [34 (TELEFUNKEN) 0x0000 0x4201] +000000000000111111111111111111111111111111100000000000111111111111111111111111111111100000000000111111111100000000000111111111100000000000111111111100000000000011111111000000000000011111111111111111111111111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111111111111111111111111110000000000011111111111111111 +# Jog Rad nach links (Progr. Mode) [34 (TELEFUNKEN) 0x0000 0x4298] +000000000000011111111111111111111111111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111111111111111111111111110000000000011111111110000000000011111111111111111111111111111110000000000001111111110000000000001111111110000000000001111111111111111111111111111110000000000001111111111111111111111111111110000000000001111111110000000000001111111110000000000001111111110000000000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111000000000000111111111111111111111111111111100000000000111111111111111111111111111111100000000000111111111100000000000111111111100000000000011111111100000000000011111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111100000000000011111111111111111111111111111110000000000011111111111111111111111111111110000000000011111111110000000000011111111110000000000011111111110000000000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111110000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111100000000000111111111000000000000111111111111111111111111111111100000000000111111111100000000000111111111100000000000111111111111111111111111111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111111111111 +# Jog Rad nach links (Jog Mode) [34 (TELEFUNKEN) 0x0000 0x42f5] +0000000000000111111111111111111111111111111000000000000111111111111111111111111111111100000000000111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111100000000000111111111100000000000011111111111111111111111111111100000000000011111111111111111111111111111100000000000011111111111111111111111111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111111111111111111111111110000000000011111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111110000000000001111111111111111111111111111111000000000001111111111111111111111111111111000000000001111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111111111111111111111111100000000000111111111111111111111111111111100000000000111111111111111111111111111111100000000000111111111111111111111111111111100000000000111111111100000000000111111111111111111111111111111100000000000111111111100000000000011111111111111111111111111111100000000000011111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111110000000000001111111111111111111111111111110000000000001111111111111111111111111111110000000000001111111110000000000001111111110000000000001111111110000000000001111111110000000000001111111111111111111111111111111000000000001111111111000000000001111111111111111111111111111111000000000001111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111111111111111111111111100000000000111111111111111111 +# Timer 1-8 [34 (TELEFUNKEN) 0x0000 0x42ec] +0000000000001111111111111111111111111111110000000000001111111111111111111111111111110000000000001111111110000000000000111111110000000000001111111111000000000001111111111000000000001111111111111111111111111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111111111111111111111111100000000000111111111111111111111111111111100000000000011111111000000000000111111111100000000000111111111111111111111 +# Loeschen (Timer) [34 (TELEFUNKEN) 0x0000 0x426c] +0000000000001111111111111111111111111111110000000000001111111111111111111111111111110000000000001111111110000000000001111111110000000000001111111110000000000001111111110000000000001111111111111111111111111111111000000000001111111110000000000001111111110000000000001111111111111111111111111111111000000000001111111111111111111111111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111111111111 +# Bildschirm Display [34 (TELEFUNKEN) 0x0000 0x4278] +0000000000001111111111111111111111111111110000000000001111111111111111111111111111111000000000001111111111000000000000111111110000000000001111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111100000000000111111111111111111111111111111100000000000111111111000000000000111111111000000000000111111111000000000000111111111111111111 +# Audio Monitor [34 (TELEFUNKEN) 0x0000 0x42e8] +0000000000001111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111111111111111111111111100000000000111111111111111111111111111111100000000000111111111111111111111111111111100000000000111111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111111111111 +# Stellen - [34 (TELEFUNKEN) 0x0000 0x4218] +000000000000111111111111111111111111111111100000000000111111111111111111111111111111100000000000011111111100000000000011111111100000000000111111111100000000000011111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111111111111111111111111110000000000011111111111111111111111111111110000000000011111111100000000000011111111100000000000011111111110000000000011111111111111111111 +# Stellen + [34 (TELEFUNKEN) 0x0000 0x4298] +0000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111100000000000111111111000000000000111111111111111111111111111111100000000000111111111100000000000111111111100000000000011111111111111111111111111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111111111 +# Waehle [34 (TELEFUNKEN) 0x0000 0x423c] +0000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111100000000000011111111111111111111111111111100000000000011111111111111111111111111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111100000000000011111111111111111 +# Speichern [34 (TELEFUNKEN) 0x0000 0x427c] +0000000000001111111111111111111111111111110000000000001111111111111111111111111111110000000000001111111110000000000000111111110000000000001111111111000000000001111111111000000000001111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000011111111000000000000111111111000000000000111111111111111111111 +# Springen [34 (TELEFUNKEN) 0x0000 0x426c] +0000000000001111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111000000000000011111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111111111111111111111111100000000000111111111111111111111111111111100000000000011111111100000000000011111111100000000000011111111111111111 +# Kanal Suchlauf [34 (TELEFUNKEN) 0x0000 0x4266] +0000000000001111111111111111111111111111111000000000001111111111111111111111111111111000000000000111111111000000000000111111111000000000001111111111000000000001111111111000000000001111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111100000000000011111111100000000000111111111111111111 +# Display [34 (TELEFUNKEN) 0x0000 0x421c] +0000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111100000000000111111111100000000000111111111100000000000111111111100000000000111111111100000000000111111111111111111111111111111100000000000011111111111111111111111111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111100000000000011111111111111 +# SP/LP [34 (TELEFUNKEN) 0x0000 0x428c] +0000000000001111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111100000000000111111111111111111111111111111100000000000011111111000000000000111111111100000000000111111111111111 +# Memo [34 (TELEFUNKEN) 0x0000 0x427c] +0000000000001111111111111111111111111111110000000000001111111111111111111111111111110000000000001111111110000000000001111111110000000000001111111110000000000001111111110000000000001111111111111111111111111111110000000000001111111110000000000001111111110000000000001111111111111111111111111111111000000000001111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111111111111111 +# 00000 [34 (TELEFUNKEN) 0x0000 0x429c] +0000000000001111111111111111111111111111110000000000001111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111100000000000011111111100000000000011111111100000000000011111111111111111 +# Setzen [34 (TELEFUNKEN) 0x0000 0x42c9] +0000000000001111111111111111111111111111110000000000001111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111000000000000011111111000000000000011111111111111111111111111111100000000000011111111111111111 +# Loeschen [34 (TELEFUNKEN) 0x0000 0x4229] +0000000000001111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111100000000000011111111000000000000011111111111111111111111111111100000000000011111111100000000000011111111100000000000011111111111111111111111111111100000000000011111111111111 +# Index Seite - [34 (TELEFUNKEN) 0x0000 0x4289] +0000000000001111111111111111111111111111110000000000001111111111111111111111111111110000000000001111111110000000000000111111110000000000000111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111100000000000011111111111111 +# Index Seite + [34 (TELEFUNKEN) 0x0000 0x42e9] +0000000000001111111111111111111111111111110000000000001111111111111111111111111111110000000000001111111110000000000001111111110000000000000111111110000000000001111111110000000000001111111111111111111111111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111100000000000011111111111111111111 +# VTX [34 (TELEFUNKEN) 0x0000 0x42dc] +0000000000001111111111111111111111111111110000000000001111111111111111111111111111111000000000000111111110000000000000111111110000000000000111111110000000000000111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111111111111111111111111100000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000011111111000000000000011111111000000000000011111111111111111111 +# Menu/Text [34 (TELEFUNKEN) 0x0000 0x42c8] +0000000000001111111111111111111111111111110000000000000011111111111111111111111111111000000000001111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111100000000000111111111000000000000011111111000000000000111111111100000000000111111111111111 +# Rot [34 (TELEFUNKEN) 0x0000 0x42e0] +0000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111100000000000111111111000000000000011111111111111111111111111111100000000000011111111111111111111111111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111111111 +# Gruen [34 (TELEFUNKEN) 0x0000 0x42a8] +0000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111100000000000111111111000000000000011111111111111111111111111111100000000000111111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111111111 +# Gelb [34 (TELEFUNKEN) 0x0000 0x4228] +000000000000111111111111111111111111111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111111111111111111111111110000000000011111111100000000000011111111111111111111111111111110000000000011111111100000000000001111111100000000000001111111110000000000011111111111111111111 +# Blau [34 (TELEFUNKEN) 0x0000 0x4260] +000000000000111111111111111111111111111111100000000000111111111111111111111111111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111100000000000011111111111111111111111111111100000000000011111111111111111111111111111110000000000011111111100000000000001111111100000000000001111111100000000000011111111100000000000011111111110000000000011111111111111111111 +# Kontur [34 (TELEFUNKEN) 0x0000 0x42b5] +0000000000011111111111111111111111111111110000000000001111111111111111111111111111110000000000001111111110000000000001111111110000000000001111111110000000000001111111110000000000001111111111111111111111111111110000000000000111111110000000000001111111111111111111111111111111000000000001111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111111111111111 +# Ueberspielen A->B [34 (TELEFUNKEN) 0x0000 0x4ab3] +0000000000001111111111111111111111111111110000000000001111111111111111111111111111110000000000001111111110000000000001111111110000000000001111111111111111111111111111111000000000001111111110000000000001111111111111111111111111111111000000000001111111110000000000001111111111111111111111111111111000000000001111111111000000000001111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111100000000000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000000000011111111111111111111111111111100000000000011111111111111111111111111111110000000000011111111100000000000011111111110000000000011111111111111111111111111111110000000000011111111110000000000001111111111111111111111111111110000000000001111111110000000000001111111111111111111111111111110000000000001111111110000000000001111111111111111111111111111111000000000001111111111111111111111111111111000000000001111111110000000000001111111110000000000001111111111111111111111111111111000000000001111111111111111111111111111111000000000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111000000000000011111111111111111111111111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111111111111111111111111110000000000011111111100000000000011111111111111111111111111111110000000000011111111100000000000011111111111111111111111111111110000000000011111111111111111111111111111110000000000011111111110000000000001111111110000000000001111111111111111111111111111110000000000001111111111111111111111111111110000000000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111100000000000111111111000000000000111111111000000000000111111111111111111111111111111100000000000111111111100000000000111111111111111111111111111111100000000000111111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111111111111111111111111100000000000011111111111111111111111111111110000000000011111111100000000000011111111100000000000011111111111111111111111111111110000000000011111111111111111111111111111110000000000011111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111110000000000001111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111111111111111111111111100000000000111111111000000000000111111111111111111111111111111100000000000111111111000000000000111111111111111111111111111111100000000000111111111111111111111111111111100000000000111111111100000000000111111111100000000000111111111111111111111111111111100000000000011111111111111111111111111111100000000000011111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 +# Ueberspielen B->A [34 (TELEFUNKEN) 0x0000 0x42b3] +0000000000001111111111111111111111111111111000000000001111111111111111111111111111111000000000001111111111000000000001111111111000000000001111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111111111111111111111111100000000000111111111111111111111111111111100000000000111111111000000000000111111111000000000000111111111111111111111111111111100000000000111111111111111111111111111111100000000000011111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000000000001111111111111111111111111111110000000000001111111111111111111111111111110000000000001111111110000000000001111111110000000000001111111110000000000001111111110000000000001111111111111111111111111111111000000000001111111110000000000001111111111111111111111111111111000000000001111111111000000000001111111111111111111111111111111000000000001111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000000000011111111111111111111111111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111110000000000011111111110000000000011111111110000000000001111111111111111111111111111110000000000001111111110000000000001111111111111111111111111111110000000000001111111110000000000001111111111111111111111111111110000000000001111111111111111111111111111111000000000001111111110000000000001111111110000000000001111111111111111111111111111111000000000001111111111111111111111111111111000000000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111000000000000111111111111111111111111111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111111111111111111111111110000000000011111111100000000000011111111111111111111111111111110000000000011111111111111111111111111111110000000000011111111110000000000011111111110000000000011111111111111111111111111111110000000000001111111111111111111111111111110000000000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111100000000000111111111000000000000111111111000000000000111111111000000000000111111111000000000000011111111111111111111111111111100000000000111111111100000000000111111111111111111111111111111100000000000011111111100000000000011111111111111111111111111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111100000000000011111111111111111111111111111110000000000011111111111111111111111111111110000000000011111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 +# Start A->B [34 (TELEFUNKEN) 0x0000 0x4230] +0000000000001111111111111111111111111111111000000000001111111111111111111111111111111000000000001111111110000000000001111111111000000000001111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000000000011111111111111111111111111111110000000000001111111111111111111111111111110000000000001111111110000000000001111111110000000000001111111110000000000001111111110000000000001111111111111111111111111111111000000000001111111110000000000001111111110000000000001111111110000000000001111111111111111111111111111111000000000001111111111111111111111111111111000000000001111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111000000000000011111111111111111111111111111100000000000011111111111111111111111111111110000000000011111111100000000000011111111100000000000011111111100000000000011111111110000000000011111111111111111111111111111110000000000001111111110000000000011111111110000000000001111111110000000000001111111111111111111111111111110000000000001111111111111111111111111111110000000000001111111110000000000001111111110000000000001111111110000000000001111111110000000000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111000000000000111111111111111111111111111111100000000000111111111111111111111111111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111111111111111111111111110000000000011111111111111111111111111111110000000000011111111100000000000011111111110000000000001111111110000000000001111111110000000000011111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111100000000000111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111100000000000011111111100000000000111111111100000000000011111111100000000000011111111111111111111111111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 +# Start B->A [34 (TELEFUNKEN) 0x0000 0x4a30] +0000000000001111111111111111111111111111110000000000001111111111111111111111111111110000000000001111111110000000000001111111110000000000001111111111111111111111111111111000000000001111111110000000000001111111111111111111111111111111000000000001111111110000000000001111111110000000000001111111111000000000001111111111111111111111111111111000000000001111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000000000011111111111111111111111111111100000000000011111111111111111111111111111110000000000011111111100000000000011111111110000000000011111111111111111111111111111110000000000011111111110000000000001111111111111111111111111111110000000000001111111110000000000001111111110000000000001111111110000000000001111111111111111111111111111110000000000001111111111111111111111111111111000000000001111111110000000000001111111110000000000001111111110000000000001111111110000000000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000000000111111111111111111111111111111100000000000111111111111111111111111111111100000000000011111111100000000000011111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111111111111111111111111110000000000011111111100000000000011111111100000000000011111111100000000000011111111111111111111111111111110000000000011111111111111111111111111111110000000000011111111110000000000001111111110000000000001111111110000000000001111111110000000000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111110000000000000111111111111111111111111111111000000000000111111111111111111111111111111100000000000111111111000000000000111111111000000000000111111111111111111111111111111100000000000111111111100000000000111111111111111111111111111111100000000000111111111100000000000011111111100000000000011111111100000000000111111111111111111111111111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111110000000000001111111111111111111111111111111000000000001111111111111111111111111111111000000000001111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111100000000000111111111111111111111111111111100000000000111111111100000000000111111111000000000000111111111100000000000011111111100000000000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 +# Jog aktivieren im DUETT Modus A->B [34 (TELEFUNKEN) 0x0000 0x4ab0] +0000000000000111111111111111111111111111111000000000000011111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111000000000000011111111111111111111111111111100000000000011111111100000000000011111111111111111111111111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111110000000000001111111111111111111111111111110000000000001111111111111111111111111111110000000000000111111110000000000000111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000011111111000000000000011111111000000000000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111110000000000001111111111111111111111111111110000000000001111111111111111111111111111110000000000001111111110000000000001111111110000000000001111111111111111111111111111110000000000001111111110000000000001111111111111111111111111111110000000000001111111110000000000001111111111111111111111111111111000000000001111111110000000000001111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000000000011111111111111111111111111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111100000000000011111111111111111111111111111110000000000001111111110000000000001111111111111111111111111111110000000000001111111110000000000001111111111111111111111111111110000000000001111111110000000000001111111111111111111111111111110000000000001111111111111111111111111111110000000000001111111110000000000001111111110000000000001111111110000000000001111111110000000000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111000000000000111111111111111111111111111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111111111111111111111111110000000000011111111100000000000011111111111111111111111111111100000000000011111111111111111111111111111110000000000011111111110000000000001111111110000000000001111111110000000000001111111110000000000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 +# Jog aktivieren im DUETT Modus B->A [34 (TELEFUNKEN) 0x0000 0x42b0] +0000000000001111111111111111111111111111110000000000001111111111111111111111111111110000000000000111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111110000000000001111111111111111111111111111110000000000001111111111111111111111111111110000000000001111111110000000000001111111110000000000001111111110000000000001111111110000000000001111111111111111111111111111110000000000001111111110000000000001111111111111111111111111111111000000000000111111110000000000000111111111111111111111111111111000000000000111111111111111111111111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000000000011111111111111111111111111111100000000000011111111111111111111111111111100000000000011111111100000000000001111111100000000000001111111100000000000011111111110000000000011111111111111111111111111111110000000000001111111110000000000001111111111111111111111111111110000000000001111111110000000000001111111111111111111111111111110000000000001111111111111111111111111111110000000000001111111110000000000001111111110000000000001111111110000000000001111111110000000000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111000000000000111111111111111111111111111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111111111111111111111111110000000000011111111100000000000011111111111111111111111111111110000000000011111111111111111111111111111110000000000001111111110000000000001111111110000000000001111111110000000000001111111110000000000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111110000000000000111111111111111111111111111111000000000000111111111111111111111111111111100000000000111111111000000000000111111111000000000000111111111000000000000111111111000000000000111111111111111111111111111111100000000000011111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111111111111111111111111100000000000011111111111111111111111111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111100000000000011111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 diff --git a/IR-Data/test-suite.sh b/IR-Data/test-suite.sh index 1808f09..a59067d 100644 --- a/IR-Data/test-suite.sh +++ b/IR-Data/test-suite.sh @@ -126,7 +126,8 @@ for j in \ rc-car-20kHz.txt \ fdc-20kHz.txt \ fdc2-20kHz.txt \ - saa3004-20kHz.txt + saa3004-20kHz.txt \ + telefunken-1560-20kHz.txt do echo -n "testing $j ... " if tmpsrc/irmp-20kHz -v < $j | grep -q error diff --git a/README.txt b/README.txt index 4bc758f..f63c417 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,7 @@ IRMP - Infrared Multi Protocol Decoder -------------------------------------- -Version IRMP: 2.3.8 12.03.2013 +Version IRMP: 2.3.9 19.03.2013 Version IRSND: 2.3.8 12.03.2013 Dokumentation: diff --git a/irmp.c b/irmp.c index 29473eb..7d40b62 100644 --- a/irmp.c +++ b/irmp.c @@ -3,7 +3,7 @@ * * Copyright (c) 2009-2013 Frank Meyer - frank(at)fli4l.de * - * $Id: irmp.c,v 1.139 2013/03/12 12:49:59 fm Exp $ + * $Id: irmp.c,v 1.140 2013/03/19 15:11:55 fm Exp $ * * ATMEGA88 @ 8 MHz * @@ -43,7 +43,8 @@ IRMP_SUPPORT_GRUNDIG_NOKIA_IR60_PROTOCOL == 1 || \ IRMP_SUPPORT_SIEMENS_OR_RUWIDO_PROTOCOL == 1 || \ IRMP_SUPPORT_IR60_PROTOCOL == 1 || \ - IRMP_SUPPORT_A1TVBOX_PROTOCOL == 1 + IRMP_SUPPORT_A1TVBOX_PROTOCOL == 1 || \ + IRMP_SUPPORT_ORTEK_PROTOCOL == 1 # define IRMP_SUPPORT_MANCHESTER 1 #else # define IRMP_SUPPORT_MANCHESTER 0 @@ -382,6 +383,28 @@ #define A1TVBOX_BIT_PAUSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * A1TVBOX_BIT_PAUSE_TIME * MIN_TOLERANCE_30 + 0.5) - 1) #define A1TVBOX_BIT_PAUSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * A1TVBOX_BIT_PAUSE_TIME * MAX_TOLERANCE_30 + 0.5) + 1) +#define ORTEK_START_BIT_PULSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * ORTEK_START_BIT_PULSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1) +#define ORTEK_START_BIT_PULSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * ORTEK_START_BIT_PULSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1) +#define ORTEK_START_BIT_PAUSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * ORTEK_START_BIT_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1) +#define ORTEK_START_BIT_PAUSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * ORTEK_START_BIT_PAUSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1) +#define ORTEK_BIT_PULSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * ORTEK_BIT_TIME * MIN_TOLERANCE_30 + 0.5) - 1) +#define ORTEK_BIT_PULSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * ORTEK_BIT_TIME * MAX_TOLERANCE_30 + 0.5) + 1) +#define ORTEK_BIT_PAUSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * ORTEK_BIT_TIME * MIN_TOLERANCE_30 + 0.5) - 1) +#define ORTEK_BIT_PAUSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * ORTEK_BIT_TIME * MAX_TOLERANCE_30 + 0.5) + 1) + +#define TELEFUNKEN_START_BIT_PULSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * TELEFUNKEN_START_BIT_PULSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1) +#define TELEFUNKEN_START_BIT_PULSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * TELEFUNKEN_START_BIT_PULSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1) +#define TELEFUNKEN_START_BIT_PAUSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * (TELEFUNKEN_START_BIT_PAUSE_TIME) * MIN_TOLERANCE_10 + 0.5) - 1) +#define TELEFUNKEN_START_BIT_PAUSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * (TELEFUNKEN_START_BIT_PAUSE_TIME) * MAX_TOLERANCE_10 + 0.5) - 1) +#define TELEFUNKEN_PULSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * TELEFUNKEN_PULSE_TIME * MIN_TOLERANCE_30 + 0.5) - 1) +#define TELEFUNKEN_PULSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * TELEFUNKEN_PULSE_TIME * MAX_TOLERANCE_30 + 0.5) + 1) +#define TELEFUNKEN_1_PAUSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * TELEFUNKEN_1_PAUSE_TIME * MIN_TOLERANCE_30 + 0.5) - 1) +#define TELEFUNKEN_1_PAUSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * TELEFUNKEN_1_PAUSE_TIME * MAX_TOLERANCE_30 + 0.5) + 1) +#define TELEFUNKEN_0_PAUSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * TELEFUNKEN_0_PAUSE_TIME * MIN_TOLERANCE_30 + 0.5) - 1) +#define TELEFUNKEN_0_PAUSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * TELEFUNKEN_0_PAUSE_TIME * MAX_TOLERANCE_30 + 0.5) + 1) +// autodetect TELEFUNKEN repetition frame within 50 msec: +// #define TELEFUNKEN_FRAME_REPEAT_PAUSE_LEN_MAX (uint16_t)(F_INTERRUPTS * TELEFUNKEN_FRAME_REPEAT_PAUSE_TIME * MAX_TOLERANCE_20 + 0.5) + #define AUTO_FRAME_REPETITION_LEN (uint16_t)(F_INTERRUPTS * AUTO_FRAME_REPETITION_TIME + 0.5) // use uint16_t! #ifdef ANALYZE @@ -446,6 +469,8 @@ irmp_protocol_names[IRMP_N_PROTOCOLS + 1] = "THOMSON", "BOSE", "A1TVBOX", + "ORTEK", + "TELEFUNKEN" }; #endif @@ -874,6 +899,31 @@ static const PROGMEM IRMP_PARAMETER samsung_param = #endif +#if IRMP_SUPPORT_TELEFUNKEN_PROTOCOL == 1 + +static const PROGMEM IRMP_PARAMETER telefunken_param = +{ + IRMP_TELEFUNKEN_PROTOCOL, // protocol: ir protocol + TELEFUNKEN_PULSE_LEN_MIN, // pulse_1_len_min: minimum length of pulse with bit value 1 + TELEFUNKEN_PULSE_LEN_MAX, // pulse_1_len_max: maximum length of pulse with bit value 1 + TELEFUNKEN_1_PAUSE_LEN_MIN, // pause_1_len_min: minimum length of pause with bit value 1 + TELEFUNKEN_1_PAUSE_LEN_MAX, // pause_1_len_max: maximum length of pause with bit value 1 + TELEFUNKEN_PULSE_LEN_MIN, // pulse_0_len_min: minimum length of pulse with bit value 0 + TELEFUNKEN_PULSE_LEN_MAX, // pulse_0_len_max: maximum length of pulse with bit value 0 + TELEFUNKEN_0_PAUSE_LEN_MIN, // pause_0_len_min: minimum length of pause with bit value 0 + TELEFUNKEN_0_PAUSE_LEN_MAX, // pause_0_len_max: maximum length of pause with bit value 0 + TELEFUNKEN_ADDRESS_OFFSET, // address_offset: address offset + TELEFUNKEN_ADDRESS_OFFSET + TELEFUNKEN_ADDRESS_LEN, // address_end: end of address + TELEFUNKEN_COMMAND_OFFSET, // command_offset: command offset + TELEFUNKEN_COMMAND_OFFSET + TELEFUNKEN_COMMAND_LEN, // command_end: end of command + TELEFUNKEN_COMPLETE_DATA_LEN, // complete_len: complete length of frame + TELEFUNKEN_STOP_BIT, // stop_bit: flag: frame has stop bit + TELEFUNKEN_LSB, // lsb_first: flag: LSB first + TELEFUNKEN_FLAGS // flags: some flags +}; + +#endif + #if IRMP_SUPPORT_MATSUSHITA_PROTOCOL == 1 static const PROGMEM IRMP_PARAMETER matsushita_param = @@ -1379,6 +1429,32 @@ static const PROGMEM IRMP_PARAMETER a1tvbox_param = #endif +#if IRMP_SUPPORT_ORTEK_PROTOCOL == 1 + +static const PROGMEM IRMP_PARAMETER ortek_param = +{ + IRMP_ORTEK_PROTOCOL, // protocol: ir protocol + + ORTEK_BIT_PULSE_LEN_MIN, // pulse_1_len_min: here: minimum length of short pulse + ORTEK_BIT_PULSE_LEN_MAX, // pulse_1_len_max: here: maximum length of short pulse + ORTEK_BIT_PAUSE_LEN_MIN, // pause_1_len_min: here: minimum length of short pause + ORTEK_BIT_PAUSE_LEN_MAX, // pause_1_len_max: here: maximum length of short pause + 0, // pulse_0_len_min: here: not used + 0, // pulse_0_len_max: here: not used + 0, // pause_0_len_min: here: not used + 0, // pause_0_len_max: here: not used + ORTEK_ADDRESS_OFFSET, // address_offset: address offset + ORTEK_ADDRESS_OFFSET + ORTEK_ADDRESS_LEN, // address_end: end of address + ORTEK_COMMAND_OFFSET, // command_offset: command offset + ORTEK_COMMAND_OFFSET + ORTEK_COMMAND_LEN, // command_end: end of command + ORTEK_COMPLETE_DATA_LEN, // complete_len: complete length of frame + ORTEK_STOP_BIT, // stop_bit: flag: frame has stop bit + ORTEK_LSB, // lsb_first: flag: LSB first + ORTEK_FLAGS // flags: some flags +}; + +#endif + static uint8_t irmp_bit; // current bit position static IRMP_PARAMETER irmp_param; @@ -2017,6 +2093,18 @@ irmp_ISR (void) #endif // IRMP_SUPPORT_NEC_PROTOCOL == 1 +#if IRMP_SUPPORT_TELEFUNKEN_PROTOCOL == 1 + if (irmp_pulse_time >= TELEFUNKEN_START_BIT_PULSE_LEN_MIN && irmp_pulse_time <= TELEFUNKEN_START_BIT_PULSE_LEN_MAX && + irmp_pause_time >= TELEFUNKEN_START_BIT_PAUSE_LEN_MIN && irmp_pause_time <= TELEFUNKEN_START_BIT_PAUSE_LEN_MAX) + { + ANALYZE_PRINTF ("protocol = TELEFUNKEN, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n", + TELEFUNKEN_START_BIT_PULSE_LEN_MIN, TELEFUNKEN_START_BIT_PULSE_LEN_MAX, + TELEFUNKEN_START_BIT_PAUSE_LEN_MIN, TELEFUNKEN_START_BIT_PAUSE_LEN_MAX); + irmp_param_p = (IRMP_PARAMETER *) &telefunken_param; + } + else +#endif // IRMP_SUPPORT_TELEFUNKEN_PROTOCOL == 1 + #if IRMP_SUPPORT_NIKON_PROTOCOL == 1 if (irmp_pulse_time >= NIKON_START_BIT_PULSE_LEN_MIN && irmp_pulse_time <= NIKON_START_BIT_PULSE_LEN_MAX && irmp_pause_time >= NIKON_START_BIT_PAUSE_LEN_MIN && irmp_pause_time <= NIKON_START_BIT_PAUSE_LEN_MAX) @@ -2344,7 +2432,21 @@ irmp_ISR (void) last_value = 1; } else -#endif // IRMP_SUPPORT_RC6_PROTOCOL == 1 +#endif // IRMP_SUPPORT_A1TVBOX_PROTOCOL == 1 + +#if IRMP_SUPPORT_ORTEK_PROTOCOL == 1 + if (irmp_pulse_time >= ORTEK_START_BIT_PULSE_LEN_MIN && irmp_pulse_time <= ORTEK_START_BIT_PULSE_LEN_MAX && + irmp_pause_time >= ORTEK_START_BIT_PAUSE_LEN_MIN && irmp_pause_time <= ORTEK_START_BIT_PAUSE_LEN_MAX) + { // it's ORTEK (Hama) + ANALYZE_PRINTF ("protocol = ORTEK, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n", + ORTEK_START_BIT_PULSE_LEN_MIN, ORTEK_START_BIT_PULSE_LEN_MAX, + ORTEK_START_BIT_PAUSE_LEN_MIN, ORTEK_START_BIT_PAUSE_LEN_MAX); + irmp_param_p = (IRMP_PARAMETER *) &ortek_param; + last_pause = 0; + last_value = 1; + } + else +#endif // IRMP_SUPPORT_A1TVBOX_PROTOCOL == 1 { ANALYZE_PRINTF ("protocol = UNKNOWN\n"); diff --git a/irmpconfig.h b/irmpconfig.h index 48ab0ec..8e274c3 100644 --- a/irmpconfig.h +++ b/irmpconfig.h @@ -5,7 +5,7 @@ * * Copyright (c) 2009-2013 Frank Meyer - frank(at)fli4l.de * - * $Id: irmpconfig.h,v 1.98 2013/01/17 07:33:13 fm Exp $ + * $Id: irmpconfig.h,v 1.99 2013/03/19 15:11:55 fm Exp $ * * ATMEGA88 @ 8 MHz * @@ -78,6 +78,8 @@ #define IRMP_SUPPORT_THOMSON_PROTOCOL 0 // Thomson >= 10000 ~250 bytes #define IRMP_SUPPORT_NIKON_PROTOCOL 0 // NIKON camera >= 10000 ~250 bytes #define IRMP_SUPPORT_NETBOX_PROTOCOL 0 // Netbox keyboard >= 10000 ~400 bytes (PROTOTYPE!) +#define IRMP_SUPPORT_ORTEK_PROTOCOL 0 // ORTEK (Hama) >= 10000 ~150 bytes +#define IRMP_SUPPORT_TELEFUNKEN_PROTOCOL 0 // Telefunken 1560 >= 10000 ~150 bytes #define IRMP_SUPPORT_FDC_PROTOCOL 0 // FDC3402 keyboard >= 10000 (better 15000) ~150 bytes (~400 in combination with RC5) #define IRMP_SUPPORT_RCCAR_PROTOCOL 0 // RC Car >= 10000 (better 15000) ~150 bytes (~500 in combination with RC5) #define IRMP_SUPPORT_RUWIDO_PROTOCOL 0 // RUWIDO, T-Home >= 15000 ~550 bytes diff --git a/irmpprotocols.h b/irmpprotocols.h index 0f2f375..cff2059 100644 --- a/irmpprotocols.h +++ b/irmpprotocols.h @@ -5,7 +5,7 @@ * * Copyright (c) 2013 Frank Meyer - frank(at)fli4l.de * - * $Id: irmpprotocols.h,v 1.10 2013/01/17 07:33:13 fm Exp $ + * $Id: irmpprotocols.h,v 1.11 2013/03/19 15:11:55 fm Exp $ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -57,8 +57,10 @@ #define IRMP_THOMSON_PROTOCOL 30 // Thomson #define IRMP_BOSE_PROTOCOL 31 // BOSE #define IRMP_A1TVBOX_PROTOCOL 32 // A1 TV Box +#define IRMP_ORTEK_PROTOCOL 33 // ORTEK - Hama +#define IRMP_TELEFUNKEN_PROTOCOL 34 // Telefunken (1560) -#define IRMP_N_PROTOCOLS 32 // number of supported protocols +#define IRMP_N_PROTOCOLS 34 // number of supported protocols /*--------------------------------------------------------------------------------------------------------------------------------------------------- * timing constants: @@ -623,6 +625,42 @@ typedef uint8_t PAUSE_LEN; #define A1TVBOX_COMPLETE_DATA_LEN 17 // complete length incl. start bit #define A1TVBOX_FRAME_REPEAT_PAUSE_TIME 50.0e-3 // 50 msec pause between frames, don't know if it is correct +/*--------------------------------------------------------------------------------------------------------------------------------------------------- + * ORTEK (Hama): + *--------------------------------------------------------------------------------------------------------------------------------------------------- + */ +#define ORTEK_START_BIT_PULSE_TIME 2000.0e-6 // 2000 usec pulse +#define ORTEK_START_BIT_PAUSE_TIME 1000.0e-6 // 1000 usec pause +#define ORTEK_BIT_TIME 500.0e-6 // 500 usec pulse/pause +#define ORTEK_FRAME_REPEAT_PAUSE_TIME 45.0e-3 // frame repeat after 45ms +#define ORTEK_ADDRESS_OFFSET 0 // skip "1" + 3 unknown bits + 1 toggle bit +#define ORTEK_ADDRESS_LEN 6 // read 7 address bits +#define ORTEK_COMMAND_OFFSET 8 // skip 5 bits ("1" + 3 mode + 1 toggle bit) +#define ORTEK_COMMAND_LEN 6 // read 5 command bits +#define ORTEK_COMPLETE_DATA_LEN 18 // complete length +#define ORTEK_STOP_BIT 0 // has no stop bit +#define ORTEK_LSB 0 // MSB...LSB +#define ORTEK_FLAGS (IRMP_PARAM_FLAG_IS_MANCHESTER | IRMP_PARAM_FLAG_1ST_PULSE_IS_1) // flags + +/*--------------------------------------------------------------------------------------------------------------------------------------------------- + * TELEFUNKEN: + *--------------------------------------------------------------------------------------------------------------------------------------------------- + */ +#define TELEFUNKEN_START_BIT_PULSE_TIME 600.0e-6 // 600 usec pulse +#define TELEFUNKEN_START_BIT_PAUSE_TIME 1500.0e-6 // 1500 usec pause +#define TELEFUNKEN_PULSE_TIME 600.0e-6 // 600 usec pulse +#define TELEFUNKEN_1_PAUSE_TIME 1500.0e-6 // 1500 usec pause +#define TELEFUNKEN_0_PAUSE_TIME 600.0e-6 // 600 usec pause +#define TELEFUNKEN_FRAME_REPEAT_PAUSE_TIME 22.0e-3 // frame repeat after 22ms +#define TELEFUNKEN_ADDRESS_OFFSET 0 // skip 0 bits +#define TELEFUNKEN_ADDRESS_LEN 0 // read 0 address bits +#define TELEFUNKEN_COMMAND_OFFSET 0 // skip 0 bits +#define TELEFUNKEN_COMMAND_LEN 15 // read 15 bits +#define TELEFUNKEN_COMPLETE_DATA_LEN 15 // complete length +#define TELEFUNKEN_STOP_BIT 1 // has stop bit +#define TELEFUNKEN_LSB 0 // LSB...MSB +#define TELEFUNKEN_FLAGS 0 // flags + #define AUTO_FRAME_REPETITION_TIME 80.0e-3 // SIRCS/SAMSUNG32/NUBERT: automatic repetition after 25-50ms #endif // _IRMP_PROTOCOLS_H_ -- 2.39.2