/*---------------------------------------------------------------------------------------------------------------------------------------------------\r
* irmp.c - infrared multi-protocol decoder, supports several remote control protocols\r
*\r
- * Copyright (c) 2009-2011 Frank Meyer - frank(at)fli4l.de\r
+ * Copyright (c) 2009-2012 Frank Meyer - frank(at)fli4l.de\r
*\r
- * $Id: irmp.c,v 1.115 2012/02/21 08:41:46 fm Exp $\r
+ * $Id: irmp.c,v 1.127 2012/07/11 13:13:50 fm Exp $\r
*\r
* ATMEGA88 @ 8 MHz\r
*\r
* Supported mikrocontrollers:\r
*\r
+ * ATtiny87, ATtiny167\r
* ATtiny45, ATtiny85\r
* ATtiny84\r
* ATmega8, ATmega16, ATmega32\r
* ATmega164, ATmega324, ATmega644, ATmega644P, ATmega1284\r
* ATmega88, ATmega88P, ATmega168, ATmega168P, ATmega328P\r
*\r
- * Typical manufacturers of remote controls:\r
- *\r
- * SIRCS - Sony\r
- * NEC - NEC, Yamaha, Canon, Tevion, Harman/Kardon, Hitachi, JVC, Pioneer, Toshiba, Xoro, Orion, and many other Japanese manufacturers\r
- * SAMSUNG - Samsung\r
- * SAMSUNG32 - Samsung\r
- * MATSUSHITA - Matsushita\r
- * KASEIKYO - Panasonic, Denon & other Japanese manufacturers (members of "Japan's Association for Electric Home Application")\r
- * RECS80 - Philips, Nokia, Thomson, Nordmende, Telefunken, Saba\r
- * RC5 - Philips and other European manufacturers\r
- * DENON - Denon, Sharp\r
- * RC6 - Philips and other European manufacturers\r
- * APPLE - Apple\r
- * NUBERT - Nubert Subwoofer System\r
- * B&O - Bang & Olufsen\r
- * PANASONIC - Panasonic (older, yet not implemented)\r
- * GRUNDIG - Grundig\r
- * NOKIA - Nokia\r
- * SIEMENS - Siemens, e.g. Gigaset M740AV\r
- * FDC - FDC IR keyboard\r
- * RCCAR - IR remote control for RC cars\r
- * JVC - JVC\r
- * THOMSON - Thomson\r
- * NIKON - Nikon cameras\r
- * RUWIDO - T-Home\r
- * KATHREIN - Kathrein\r
- * LEGO - Lego Power Functions RC\r
- *\r
- *---------------------------------------------------------------------------------------------------------------------------------------------------\r
- *\r
- * SIRCS\r
- * -----\r
- *\r
- * frame: 1 start bit + 12-20 data bits + no stop bit\r
- * data: 7 command bits + 5 address bits + 0 to 8 additional bits\r
- *\r
- * start bit: data "0": data "1": stop bit:\r
- * -----------------_________ ------_____ ------------______\r
- * 2400us 600us 600us 600us 1200us 600 us no stop bit\r
- *\r
- *---------------------------------------------------------------------------------------------------------------------------------------------------\r
- *\r
- * NEC + extended NEC\r
- * -------------------------\r
- *\r
- * frame: 1 start bit + 32 data bits + 1 stop bit\r
- * data NEC: 8 address bits + 8 inverted address bits + 8 command bits + 8 inverted command bits\r
- * data extended NEC: 16 address bits + 8 command bits + 8 inverted command bits\r
- *\r
- * start bit: data "0": data "1": stop bit:\r
- * -----------------_________ ------______ ------________________ ------______....\r
- * 9000us 4500us 560us 560us 560us 1690 us 560us\r
- *\r
- *\r
- * Repetition frame:\r
- *\r
- * -----------------_________------______ .... ~100ms Pause, then repeat\r
- * 9000us 2250us 560us\r
- *\r
- *---------------------------------------------------------------------------------------------------------------------------------------------------\r
- *\r
- * SAMSUNG\r
- * -------\r
- *\r
- * frame: 1 start bit + 16 data(1) bits + 1 sync bit + additional 20 data(2) bits + 1 stop bit\r
- * data(1): 16 address bits\r
- * data(2): 4 ID bits + 8 command bits + 8 inverted command bits\r
- *\r
- * start bit: data "0": data "1": sync bit: stop bit:\r
- * ----------______________ ------______ ------________________ ------______________ ------______....\r
- * 4500us 4500us 550us 450us 550us 1450us 550us 4500us 550us\r
- *\r
- *---------------------------------------------------------------------------------------------------------------------------------------------------\r
- *\r
- * SAMSUNG32\r
- * ----------\r
- *\r
- * frame: 1 start bit + 32 data bits + 1 stop bit\r
- * data: 16 address bits + 16 command bits\r
- *\r
- * start bit: data "0": data "1": stop bit:\r
- * ----------______________ ------______ ------________________ ------______....\r
- * 4500us 4500us 550us 450us 550us 1450us 550us\r
- *\r
- *---------------------------------------------------------------------------------------------------------------------------------------------------\r
- *\r
- * MATSUSHITA\r
- * ----------\r
- *\r
- * frame: 1 start bit + 24 data bits + 1 stop bit\r
- * data: 6 custom bits + 6 command bits + 12 address bits\r
- *\r
- * start bit: data "0": data "1": stop bit:\r
- * ----------_________ ------______ ------________________ ------______....\r
- * 3488us 3488us 872us 872us 872us 2616us 872us\r
- *\r
- *---------------------------------------------------------------------------------------------------------------------------------------------------\r
- *\r
- * KASEIKYO\r
- * --------\r
- *\r
- * frame: 1 start bit + 48 data bits + 1 stop bit\r
- * data: 16 manufacturer bits + 4 parity bits + 4 genre1 bits + 4 genre2 bits + 10 command bits + 2 id bits + 8 parity bits\r
- *\r
- * start bit: data "0": data "1": stop bit:\r
- * ----------______ ------______ ------________________ ------______....\r
- * 3380us 1690us 423us 423us 423us 1269us 423us\r
- *\r
- *---------------------------------------------------------------------------------------------------------------------------------------------------\r
- *\r
- * RECS80\r
- * ------\r
- *\r
- * frame: 2 start bits + 10 data bits + 1 stop bit\r
- * data: 1 toggle bit + 3 address bits + 6 command bits\r
- *\r
- * start bit: data "0": data "1": stop bit:\r
- * -----_____________________ -----____________ -----______________ ------_______....\r
- * 158us 7432us 158us 4902us 158us 7432us 158us\r
- *\r
- *---------------------------------------------------------------------------------------------------------------------------------------------------\r
- *\r
- * RECS80EXT\r
- * ---------\r
- *\r
- * frame: 2 start bits + 11 data bits + 1 stop bit\r
- * data: 1 toggle bit + 4 address bits + 6 command bits\r
- *\r
- * start bit: data "0": data "1": stop bit:\r
- * -----_____________________ -----____________ -----______________ ------_______....\r
- * 158us 3637us 158us 4902us 158us 7432us 158us\r
- *\r
- *---------------------------------------------------------------------------------------------------------------------------------------------------\r
- *\r
- * RC5 + RC5X\r
- * ----------\r
- *\r
- * RC5 frame: 2 start bits + 12 data bits + no stop bit\r
- * RC5 data: 1 toggle bit + 5 address bits + 6 command bits\r
- * RC5X frame: 1 start bit + 13 data bits + no stop bit\r
- * RC5X data: 1 inverted command bit + 1 toggle bit + 5 address bits + 6 command bits\r
- *\r
- * start bit: data "0": data "1":\r
- * ______----- ------______ ______------\r
- * 889us 889us 889us 889us 889us 889us\r
- *\r
- *---------------------------------------------------------------------------------------------------------------------------------------------------\r
- *\r
- * DENON\r
- * -----\r
- *\r
- * frame: 0 start bits + 16 data bits + stop bit + 65ms pause + 16 inverted data bits + stop bit\r
- * data: 5 address bits + 10 command bits\r
- *\r
- * Theory:\r
- *\r
- * data "0": data "1":\r
- * ------________________ ------______________\r
- * 275us 775us 275us 1900us\r
- *\r
- * Practice:\r
- *\r
- * data "0": data "1":\r
- * ------________________ ------______________\r
- * 310us 745us 310us 1780us\r
- *\r
- *---------------------------------------------------------------------------------------------------------------------------------------------------\r
- *\r
- * RC6\r
- * ---\r
- *\r
- * RC6 frame: 1 start bit + 1 bit "1" + 3 mode bits + 1 toggle bit + 16 data bits + 2666 us pause\r
- * RC6 data: 8 address bits + 8 command bits\r
- *\r
- * start bit toggle bit "0": toggle bit "1": data/mode "0": data/mode "1":\r
- * ____________------- _______------- -------_______ _______------- -------_______\r
- * 2666us 889us 889us 889us 889us 889us 444us 444us 444us 444us\r
- *\r
- *---------------------------------------------------------------------------------------------------------------------------------------------------\r
- *\r
- * APPLE\r
- * -----\r
- *\r
- * frame: 1 start bit + 32 data bits + 1 stop bit\r
- * data: 16 address bits + 11100000 + 8 command bits\r
- *\r
- * start bit: data "0": data "1": stop bit:\r
- * -----------------_________ ------______ ------________________ ------______....\r
- * 9000us 4500us 560us 560us 560us 1690 us 560us\r
- *\r
- *---------------------------------------------------------------------------------------------------------------------------------------------------\r
- *\r
- * NUBERT (subwoofer system)\r
- * -------------------------\r
- *\r
- * frame: 1 start bit + 10 data bits + 1 stop bit\r
- * data: 0 address bits + 10 command bits ?\r
- *\r
- * start bit: data "0": data "1": stop bit:\r
- * ----------_____ ------______ ------________________ ------______....\r
- * 1340us 340us 500us 1300us 1340us 340us 500us\r
- *\r
- *---------------------------------------------------------------------------------------------------------------------------------------------------\r
- *\r
- * BANG_OLUFSEN\r
- * ------------\r
- *\r
- * frame: 4 start bits + 16 data bits + 1 trailer bit + 1 stop bit\r
- * data: 0 address bits + 16 command bits\r
- *\r
- * 1st start bit: 2nd start bit: 3rd start bit: 4th start bit:\r
- * -----________ -----________ -----_____________ -----________\r
- * 210us 3000us 210us 3000us 210us 15000us 210us 3000us\r
- *\r
- * data "0": data "1": data "repeat bit": trailer bit: stop bit:\r
- * -----________ -----_____________ -----___________ -----_____________ -----____...\r
- * 210us 3000us 210us 9000us 210us 6000us 210us 12000us 210us\r
- *\r
- *---------------------------------------------------------------------------------------------------------------------------------------------------\r
- *\r
- * GRUNDIG\r
- * -------\r
- *\r
- * packet: 1 start frame + 19,968ms pause + N info frames + 117,76ms pause + 1 stop frame\r
- * frame: 1 pre bit + 1 start bit + 9 data bits + no stop bit\r
- * pause between info frames: 117,76ms\r
- *\r
- * data of start frame: 9 x 1\r
- * data of info frame: 9 command bits\r
- * data of stop frame: 9 x 1\r
- *\r
- * pre bit: start bit data "0": data "1":\r
- * ------____________ ------______ ______------ ------______ \r
- * 528us 2639us 528us 528us 528us 528us 528us 528us\r
- *\r
- *---------------------------------------------------------------------------------------------------------------------------------------------------\r
- *\r
- * NOKIA:\r
- * ------\r
- *\r
- * Timing similar to Grundig, but 16 data bits:\r
- * frame: 1 pre bit + 1 start bit + 8 command bits + 8 address bits + no stop bit\r
- *\r
- *---------------------------------------------------------------------------------------------------------------------------------------------------\r
- *\r
- * SIEMENS or RUWIDO:\r
- * ------------------\r
- *\r
- * SIEMENS frame: 1 start bit + 22 data bits + no stop bit\r
- * SIEMENS data: 13 address bits + 1 repeat bit + 7 data bits + 1 unknown bit\r
- *\r
- * start bit data "0": data "1":\r
- * -------_______ _______------- -------_______\r
- * 250us 250us 250us 250us 250us 250us\r
- *\r
- *---------------------------------------------------------------------------------------------------------------------------------------------------\r
- *\r
- * PANASONIC (older protocol, yet not implemented, see also MATSUSHITA, timing very similar)\r
- * -----------------------------------------------------------------------------------------\r
- *\r
- * frame: 1 start bit + 22 data bits + 1 stop bit\r
- * 22 data bits = 5 custom bits + 6 data bits + 5 inverted custom bits + 6 inverted data bits\r
- *\r
- * European version: T = 456us\r
- * USA & Canada version: T = 422us\r
- *\r
- * start bit: data "0": data "1": stop bit:\r
- * 8T 8T 2T 2T 2T 6T 2T\r
- * -------------____________ ------_____ ------_____________ ------_______....\r
- * 3648us 3648us 912us 912us 912us 2736us 912us (Europe)\r
- * 3376us 3376us 844us 844us 844us 2532us 844us (US)\r
- *\r
- *---------------------------------------------------------------------------------------------------------------------------------------------------\r
- *\r
* This program is free software; you can redistribute it and/or modify\r
* it under the terms of the GNU General Public License as published by\r
* the Free Software Foundation; either version 2 of the License, or\r
*---------------------------------------------------------------------------------------------------------------------------------------------------\r
*/\r
\r
-#if defined(__18CXX)\r
-#define PIC_C18 // Microchip C18 Compiler\r
-#endif\r
-\r
-#if defined(__PCM__) || defined(__PCB__) || defined(__PCH__) // CCS PIC Compiler instead of AVR\r
-#define PIC_CCS_COMPILER\r
-#endif\r
-\r
-#ifdef unix // test on linux/unix\r
-#include <stdio.h>\r
-#include <unistd.h>\r
-#include <stdlib.h>\r
-#include <string.h>\r
-#include <inttypes.h>\r
-\r
-#define ANALYZE\r
-#define PROGMEM\r
-#define memcpy_P memcpy\r
-\r
-#else // not unix:\r
-\r
-#ifdef WIN32\r
-#include <stdio.h>\r
-#include <string.h>\r
-typedef unsigned char uint8_t;\r
-typedef unsigned short uint16_t;\r
-#define ANALYZE\r
-#define PROGMEM\r
-#define memcpy_P memcpy\r
-\r
-#else\r
-\r
-#if defined (PIC_CCS_COMPILER) || defined(PIC_C18)\r
-\r
-#include <string.h>\r
-#define PROGMEM\r
-#define memcpy_P memcpy\r
-\r
-#if defined (PIC_CCS_COMPILER)\r
-typedef unsigned int8 uint8_t;\r
-typedef unsigned int16 uint16_t;\r
-#endif\r
-\r
-#else // AVR:\r
-\r
-#include <inttypes.h>\r
-#include <stdio.h>\r
-#include <string.h>\r
-#include <avr/io.h>\r
-#include <util/delay.h>\r
-#include <avr/pgmspace.h>\r
-\r
-#endif // PIC_CCS_COMPILER or PIC_C18\r
-\r
-#endif // windows\r
-#endif // unix\r
-\r
-#ifndef IRMP_USE_AS_LIB\r
-#include "irmpconfig.h"\r
-#endif\r
#include "irmp.h"\r
\r
#if IRMP_SUPPORT_GRUNDIG_PROTOCOL == 1 || IRMP_SUPPORT_NOKIA_PROTOCOL == 1 || IRMP_SUPPORT_IR60_PROTOCOL == 1\r
-#define IRMP_SUPPORT_GRUNDIG_NOKIA_IR60_PROTOCOL 1\r
+# define IRMP_SUPPORT_GRUNDIG_NOKIA_IR60_PROTOCOL 1\r
#else\r
-#define IRMP_SUPPORT_GRUNDIG_NOKIA_IR60_PROTOCOL 0\r
+# define IRMP_SUPPORT_GRUNDIG_NOKIA_IR60_PROTOCOL 0\r
#endif\r
\r
#if IRMP_SUPPORT_SIEMENS_PROTOCOL == 1 || IRMP_SUPPORT_RUWIDO_PROTOCOL == 1\r
-#define IRMP_SUPPORT_SIEMENS_OR_RUWIDO_PROTOCOL 1\r
+# define IRMP_SUPPORT_SIEMENS_OR_RUWIDO_PROTOCOL 1\r
#else\r
-#define IRMP_SUPPORT_SIEMENS_OR_RUWIDO_PROTOCOL 0\r
+# define IRMP_SUPPORT_SIEMENS_OR_RUWIDO_PROTOCOL 0\r
#endif\r
\r
#if IRMP_SUPPORT_RC5_PROTOCOL == 1 || \\r
IRMP_SUPPORT_RC6_PROTOCOL == 1 || \\r
IRMP_SUPPORT_GRUNDIG_NOKIA_IR60_PROTOCOL == 1 || \\r
IRMP_SUPPORT_SIEMENS_OR_RUWIDO_PROTOCOL == 1 || \\r
- IRMP_SUPPORT_GRUNDIG2_PROTOCOL == 1 || \\r
IRMP_SUPPORT_IR60_PROTOCOL\r
-#define IRMP_SUPPORT_MANCHESTER 1\r
+# define IRMP_SUPPORT_MANCHESTER 1\r
#else\r
-#define IRMP_SUPPORT_MANCHESTER 0\r
+# define IRMP_SUPPORT_MANCHESTER 0\r
#endif\r
\r
#if IRMP_SUPPORT_NETBOX_PROTOCOL == 1\r
-#define IRMP_SUPPORT_SERIAL 1\r
+# define IRMP_SUPPORT_SERIAL 1\r
#else\r
-#define IRMP_SUPPORT_SERIAL 0\r
+# define IRMP_SUPPORT_SERIAL 0\r
#endif\r
\r
#define IRMP_KEY_REPETITION_LEN (uint16_t)(F_INTERRUPTS * 150.0e-3 + 0.5) // autodetect key repetition within 150 msec\r
#define SIRCS_START_BIT_PULSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * SIRCS_START_BIT_PULSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
#define SIRCS_START_BIT_PAUSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * SIRCS_START_BIT_PAUSE_TIME * MIN_TOLERANCE_20 + 0.5) - 1)\r
#if IRMP_SUPPORT_NETBOX_PROTOCOL // only 5% to avoid conflict with NETBOX:\r
-#define SIRCS_START_BIT_PAUSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * SIRCS_START_BIT_PAUSE_TIME * MAX_TOLERANCE_05 + 0.5))\r
+# define SIRCS_START_BIT_PAUSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * SIRCS_START_BIT_PAUSE_TIME * MAX_TOLERANCE_05 + 0.5))\r
#else // only 5% + 1 to avoid conflict with RC6:\r
-#define SIRCS_START_BIT_PAUSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * SIRCS_START_BIT_PAUSE_TIME * MAX_TOLERANCE_05 + 0.5) + 1)\r
+# define SIRCS_START_BIT_PAUSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * SIRCS_START_BIT_PAUSE_TIME * MAX_TOLERANCE_05 + 0.5) + 1)\r
#endif\r
#define SIRCS_1_PULSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * SIRCS_1_PULSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
#define SIRCS_1_PULSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * SIRCS_1_PULSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
#define RECS80_0_PAUSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * RECS80_0_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
#define RECS80_0_PAUSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * RECS80_0_PAUSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
\r
+\r
+#if IRMP_SUPPORT_BOSE_PROTOCOL == 1 // BOSE conflicts with RC5, so keep tolerance for RC5 minimal here:\r
+#define RC5_START_BIT_LEN_MIN ((uint8_t)(F_INTERRUPTS * RC5_BIT_TIME * MIN_TOLERANCE_05 + 0.5) - 1)\r
+#define RC5_START_BIT_LEN_MAX ((uint8_t)(F_INTERRUPTS * RC5_BIT_TIME * MAX_TOLERANCE_05 + 0.5) + 1)\r
+#else\r
#define RC5_START_BIT_LEN_MIN ((uint8_t)(F_INTERRUPTS * RC5_BIT_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
#define RC5_START_BIT_LEN_MAX ((uint8_t)(F_INTERRUPTS * RC5_BIT_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
+#endif\r
\r
#define RC5_BIT_LEN_MIN ((uint8_t)(F_INTERRUPTS * RC5_BIT_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
#define RC5_BIT_LEN_MAX ((uint8_t)(F_INTERRUPTS * RC5_BIT_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
\r
#define DENON_PULSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * DENON_PULSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
-#define DENON_PULSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * DENON_PULSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
+#define DENON_PULSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * DENON_PULSE_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
#define DENON_1_PAUSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * DENON_1_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
#define DENON_1_PAUSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * DENON_1_PAUSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
-#if IRMP_SUPPORT_SIEMENS_OR_RUWIDO_PROTOCOL == 1\r
-#define DENON_0_PAUSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * DENON_0_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5)) // no -1, avoid conflict with RUWIDO\r
-#else\r
-#define DENON_0_PAUSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * DENON_0_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1) // be more tolerant\r
-#endif\r
+// RUWIDO (see t-home-mediareceiver-15kHz.txt) conflicts here with DENON\r
+#define DENON_0_PAUSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * DENON_0_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
#define DENON_0_PAUSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * DENON_0_PAUSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
+#define DENON_AUTO_REPETITION_PAUSE_LEN ((uint16_t)(F_INTERRUPTS * DENON_AUTO_REPETITION_PAUSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
\r
#define THOMSON_PULSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * THOMSON_PULSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
#define THOMSON_PULSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * THOMSON_PULSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
#define BANG_OLUFSEN_TRAILER_BIT_PAUSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * BANG_OLUFSEN_TRAILER_BIT_PAUSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
\r
#define IR60_TIMEOUT_LEN ((uint8_t)(F_INTERRUPTS * IR60_TIMEOUT_TIME * 0.5))\r
-#define GRUNDIG_NOKIA_IR60_START_BIT_LEN_MIN ((uint8_t)(F_INTERRUPTS * GRUNDIG_NOKIA_IR60_BIT_TIME * MIN_TOLERANCE_20 + 0.5) - 1)\r
-#define GRUNDIG_NOKIA_IR60_START_BIT_LEN_MAX ((uint8_t)(F_INTERRUPTS * GRUNDIG_NOKIA_IR60_BIT_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
-#define GRUNDIG_NOKIA_IR60_BIT_LEN_MIN ((uint8_t)(F_INTERRUPTS * GRUNDIG_NOKIA_IR60_BIT_TIME * MIN_TOLERANCE_20 + 0.5) - 1)\r
-#define GRUNDIG_NOKIA_IR60_BIT_LEN_MAX ((uint8_t)(F_INTERRUPTS * GRUNDIG_NOKIA_IR60_BIT_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
+#define GRUNDIG_NOKIA_IR60_START_BIT_LEN_MIN ((uint8_t)(F_INTERRUPTS * GRUNDIG_NOKIA_IR60_BIT_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
+#define GRUNDIG_NOKIA_IR60_START_BIT_LEN_MAX ((uint8_t)(F_INTERRUPTS * GRUNDIG_NOKIA_IR60_BIT_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
+#define GRUNDIG_NOKIA_IR60_BIT_LEN_MIN ((uint8_t)(F_INTERRUPTS * GRUNDIG_NOKIA_IR60_BIT_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
+#define GRUNDIG_NOKIA_IR60_BIT_LEN_MAX ((uint8_t)(F_INTERRUPTS * GRUNDIG_NOKIA_IR60_BIT_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
#define GRUNDIG_NOKIA_IR60_PRE_PAUSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * GRUNDIG_NOKIA_IR60_PRE_PAUSE_TIME * MIN_TOLERANCE_20 + 0.5) + 1)\r
#define GRUNDIG_NOKIA_IR60_PRE_PAUSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * GRUNDIG_NOKIA_IR60_PRE_PAUSE_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
\r
#define SIEMENS_OR_RUWIDO_BIT_PAUSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * SIEMENS_OR_RUWIDO_BIT_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
#define SIEMENS_OR_RUWIDO_BIT_PAUSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * SIEMENS_OR_RUWIDO_BIT_PAUSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
\r
-#define GRUNDIG2_START_BIT_PULSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * GRUNDIG2_START_BIT_PULSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
-#define GRUNDIG2_START_BIT_PULSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * GRUNDIG2_START_BIT_PULSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
-#define GRUNDIG2_START_BIT_PAUSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * GRUNDIG2_START_BIT_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
-#define GRUNDIG2_START_BIT_PAUSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * GRUNDIG2_START_BIT_PAUSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
-#define GRUNDIG2_BIT_PULSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * GRUNDIG2_BIT_PULSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
-#define GRUNDIG2_BIT_PULSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * GRUNDIG2_BIT_PULSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
-#define GRUNDIG2_BIT_PAUSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * GRUNDIG2_BIT_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
-#define GRUNDIG2_BIT_PAUSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * GRUNDIG2_BIT_PAUSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
-\r
#define FDC_START_BIT_PULSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * FDC_START_BIT_PULSE_TIME * MIN_TOLERANCE_05 + 0.5) - 1) // 5%: avoid conflict with NETBOX\r
#define FDC_START_BIT_PULSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * FDC_START_BIT_PULSE_TIME * MAX_TOLERANCE_05 + 0.5))\r
#define FDC_START_BIT_PAUSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * FDC_START_BIT_PAUSE_TIME * MIN_TOLERANCE_05 + 0.5) - 1)\r
#define LEGO_0_PAUSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * LEGO_0_PAUSE_TIME * MIN_TOLERANCE_40 + 0.5) - 1)\r
#define LEGO_0_PAUSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * LEGO_0_PAUSE_TIME * MAX_TOLERANCE_40 + 0.5) + 1)\r
\r
+#define BOSE_START_BIT_PULSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * BOSE_START_BIT_PULSE_TIME * MIN_TOLERANCE_30 + 0.5) - 1)\r
+#define BOSE_START_BIT_PULSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * BOSE_START_BIT_PULSE_TIME * MAX_TOLERANCE_30 + 0.5) + 1)\r
+#define BOSE_START_BIT_PAUSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * BOSE_START_BIT_PAUSE_TIME * MIN_TOLERANCE_30 + 0.5) - 1)\r
+#define BOSE_START_BIT_PAUSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * BOSE_START_BIT_PAUSE_TIME * MAX_TOLERANCE_30 + 0.5) + 1)\r
+#define BOSE_PULSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * BOSE_PULSE_TIME * MIN_TOLERANCE_30 + 0.5) - 1)\r
+#define BOSE_PULSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * BOSE_PULSE_TIME * MAX_TOLERANCE_30 + 0.5) + 1)\r
+#define BOSE_1_PAUSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * BOSE_1_PAUSE_TIME * MIN_TOLERANCE_30 + 0.5) - 1)\r
+#define BOSE_1_PAUSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * BOSE_1_PAUSE_TIME * MAX_TOLERANCE_30 + 0.5) + 1)\r
+#define BOSE_0_PAUSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * BOSE_0_PAUSE_TIME * MIN_TOLERANCE_30 + 0.5) - 1)\r
+#define BOSE_0_PAUSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * BOSE_0_PAUSE_TIME * MAX_TOLERANCE_30 + 0.5) + 1)\r
+#define BOSE_FRAME_REPEAT_PAUSE_LEN_MAX (uint16_t)(F_INTERRUPTS * 100.0e-3 * MAX_TOLERANCE_20 + 0.5)\r
+\r
#define AUTO_FRAME_REPETITION_LEN (uint16_t)(F_INTERRUPTS * AUTO_FRAME_REPETITION_TIME + 0.5) // use uint16_t!\r
\r
#ifdef ANALYZE\r
-#define ANALYZE_PUTCHAR(a) { if (! silent) { putchar (a); } }\r
-#define ANALYZE_ONLY_NORMAL_PUTCHAR(a) { if (! silent && !verbose) { putchar (a); } }\r
-#define ANALYZE_PRINTF(...) { if (verbose) { printf (__VA_ARGS__); } }\r
-#define ANALYZE_NEWLINE() { if (verbose) { putchar ('\n'); } }\r
+# define ANALYZE_PUTCHAR(a) { if (! silent) { putchar (a); } }\r
+# define ANALYZE_ONLY_NORMAL_PUTCHAR(a) { if (! silent && !verbose) { putchar (a); } }\r
+# define ANALYZE_PRINTF(...) { if (verbose) { printf (__VA_ARGS__); } }\r
+# define ANALYZE_NEWLINE() { if (verbose) { putchar ('\n'); } }\r
static int silent;\r
static int time_counter;\r
static int verbose;\r
#else\r
-#define ANALYZE_PUTCHAR(a)\r
-#define ANALYZE_ONLY_NORMAL_PUTCHAR(a)\r
-#define ANALYZE_PRINTF(...)\r
-#define ANALYZE_NEWLINE()\r
+# define ANALYZE_PUTCHAR(a)\r
+# define ANALYZE_ONLY_NORMAL_PUTCHAR(a)\r
+# define ANALYZE_PRINTF(...)\r
+# define ANALYZE_NEWLINE()\r
#endif\r
\r
#if IRMP_USE_CALLBACK == 1\r
"NEC16",\r
"NEC42",\r
"LEGO",\r
- "THOMSON"\r
+ "THOMSON",\r
+ "BOSE"\r
};\r
#endif\r
\r
\r
#endif\r
\r
-#if IRMP_SUPPORT_GRUNDIG2_PROTOCOL == 1\r
-\r
-static const PROGMEM IRMP_PARAMETER grundig2_param =\r
-{\r
- IRMP_GRUNDIG2_PROTOCOL, // protocol: ir protocol\r
- GRUNDIG2_BIT_PULSE_LEN_MIN, // pulse_1_len_min: here: minimum length of short pulse\r
- GRUNDIG2_BIT_PULSE_LEN_MAX, // pulse_1_len_max: here: maximum length of short pulse\r
- GRUNDIG2_BIT_PAUSE_LEN_MIN, // pause_1_len_min: here: minimum length of short pause\r
- GRUNDIG2_BIT_PAUSE_LEN_MAX, // pause_1_len_max: here: maximum length of short pause\r
- 0, // pulse_0_len_min: here: not used\r
- 0, // pulse_0_len_max: here: not used\r
- 0, // pause_0_len_min: here: not used\r
- 0, // pause_0_len_max: here: not used\r
- GRUNDIG2_ADDRESS_OFFSET, // address_offset: address offset\r
- GRUNDIG2_ADDRESS_OFFSET + GRUNDIG2_ADDRESS_LEN, // address_end: end of address\r
- GRUNDIG2_COMMAND_OFFSET, // command_offset: command offset\r
- GRUNDIG2_COMMAND_OFFSET + GRUNDIG2_COMMAND_LEN, // command_end: end of command\r
- GRUNDIG2_COMPLETE_DATA_LEN, // complete_len: complete length of frame\r
- GRUNDIG2_STOP_BIT, // stop_bit: flag: frame has stop bit\r
- GRUNDIG2_LSB, // lsb_first: flag: LSB first\r
- GRUNDIG2_FLAGS // flags: some flags\r
-};\r
-\r
-#endif\r
-\r
#if IRMP_SUPPORT_FDC_PROTOCOL == 1\r
\r
static const PROGMEM IRMP_PARAMETER fdc_param =\r
\r
#endif\r
\r
+#if IRMP_SUPPORT_BOSE_PROTOCOL == 1\r
+\r
+static const PROGMEM IRMP_PARAMETER bose_param =\r
+{\r
+ IRMP_BOSE_PROTOCOL, // protocol: ir protocol\r
+ BOSE_PULSE_LEN_MIN, // pulse_1_len_min: minimum length of pulse with bit value 1\r
+ BOSE_PULSE_LEN_MAX, // pulse_1_len_max: maximum length of pulse with bit value 1\r
+ BOSE_1_PAUSE_LEN_MIN, // pause_1_len_min: minimum length of pause with bit value 1\r
+ BOSE_1_PAUSE_LEN_MAX, // pause_1_len_max: maximum length of pause with bit value 1\r
+ BOSE_PULSE_LEN_MIN, // pulse_0_len_min: minimum length of pulse with bit value 0\r
+ BOSE_PULSE_LEN_MAX, // pulse_0_len_max: maximum length of pulse with bit value 0\r
+ BOSE_0_PAUSE_LEN_MIN, // pause_0_len_min: minimum length of pause with bit value 0\r
+ BOSE_0_PAUSE_LEN_MAX, // pause_0_len_max: maximum length of pause with bit value 0\r
+ BOSE_ADDRESS_OFFSET, // address_offset: address offset\r
+ BOSE_ADDRESS_OFFSET + BOSE_ADDRESS_LEN, // address_end: end of address\r
+ BOSE_COMMAND_OFFSET, // command_offset: command offset\r
+ BOSE_COMMAND_OFFSET + BOSE_COMMAND_LEN, // command_end: end of command\r
+ BOSE_COMPLETE_DATA_LEN, // complete_len: complete length of frame\r
+ BOSE_STOP_BIT, // stop_bit: flag: frame has stop bit\r
+ BOSE_LSB, // lsb_first: flag: LSB first\r
+ BOSE_FLAGS // flags: some flags\r
+};\r
+\r
+#endif\r
+\r
static uint8_t irmp_bit; // current bit position\r
static IRMP_PARAMETER irmp_param;\r
\r
static volatile uint16_t irmp_command;\r
static volatile uint16_t irmp_id; // only used for SAMSUNG protocol\r
static volatile uint8_t irmp_flags;\r
-// static volatile uint8_t irmp_busy_flag;\r
+// static volatile uint8_t irmp_busy_flag;\r
\r
#ifdef ANALYZE\r
+#define input(x) (x)\r
static uint8_t IRMP_PIN;\r
#endif\r
\r
void\r
irmp_init (void)\r
{\r
-#if !defined(PIC_CCS_COMPILER) && !defined(PIC_C18) // only AVR\r
+#if defined(PIC_CCS) || defined(PIC_C18) // PIC: do nothing\r
+#elif defined (ARM_STM32) // STM32\r
+ GPIO_InitTypeDef GPIO_InitStructure;\r
+\r
+ /* GPIOx clock enable */\r
+ #if defined (ARM_STM32L1XX)\r
+ RCC_AHBPeriphClockCmd(IRMP_PORT_RCC, ENABLE);\r
+ #elif defined (ARM_STM32F10X)\r
+ RCC_APB2PeriphClockCmd(IRMP_PORT_RCC, ENABLE);\r
+ #elif defined (ARM_STM32F4XX)\r
+ RCC_AHB1PeriphClockCmd(IRMP_PORT_RCC, ENABLE);\r
+ #endif\r
+\r
+ /* GPIO Configuration */\r
+ GPIO_InitStructure.GPIO_Pin = IRMP_BIT;\r
+ #if defined (ARM_STM32L1XX) || defined (ARM_STM32F4XX)\r
+ GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IN;\r
+ GPIO_InitStructure.GPIO_Speed = GPIO_Speed_2MHz;\r
+ GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;\r
+ GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_NOPULL;\r
+ #elif defined (ARM_STM32F10X)\r
+ GPIO_InitStructure.GPIO_Speed = GPIO_Speed_2MHz;\r
+ GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IN_FLOATING;\r
+ #endif\r
+ GPIO_Init(IRMP_PORT, &GPIO_InitStructure);\r
+#else // AVR\r
IRMP_PORT &= ~(1<<IRMP_BIT); // deactivate pullup\r
IRMP_DDR &= ~(1<<IRMP_BIT); // set pin to input\r
#endif\r
}\r
break;\r
#endif\r
-#if IRMP_SUPPORT_SIEMENS_OR_RUWIDO_PROTOCOL == 1\r
- case IRMP_SIEMENS_PROTOCOL:\r
- case IRMP_RUWIDO_PROTOCOL:\r
- if (((irmp_command >> 1) & 0x0001) == (~irmp_command & 0x0001))\r
+#if IRMP_SUPPORT_BOSE_PROTOCOL == 1\r
+ case IRMP_BOSE_PROTOCOL:\r
+ if ((irmp_command >> 8) == (~irmp_command & 0x00FF))\r
{\r
- irmp_command >>= 1;\r
+ irmp_command &= 0xff;\r
rtc = TRUE;\r
}\r
break;\r
#endif\r
-#if IRMP_SUPPORT_GRUNDIG2_PROTOCOL == 1\r
- case IRMP_GRUNDIG2_PROTOCOL:\r
- if (irmp_command & 0x0001)\r
+#if IRMP_SUPPORT_SIEMENS_OR_RUWIDO_PROTOCOL == 1\r
+ case IRMP_SIEMENS_PROTOCOL:\r
+ case IRMP_RUWIDO_PROTOCOL:\r
+ if (((irmp_command >> 1) & 0x0001) == (~irmp_command & 0x0001))\r
{\r
irmp_command >>= 1;\r
rtc = TRUE;\r
{\r
rtc = TRUE;\r
}\r
+ else\r
+ {\r
+ ANALYZE_PRINTF("Info IR60: got start instruction frame\n");\r
+ }\r
break;\r
#endif\r
#if IRMP_SUPPORT_RCCAR_PROTOCOL == 1\r
}\r
#endif\r
default:\r
+ {\r
rtc = TRUE;\r
+ break;\r
+ }\r
}\r
\r
if (rtc)\r
}\r
\r
#if IRMP_SUPPORT_NEC42_PROTOCOL == 1\r
- else if (irmp_param.protocol == IRMP_NEC42_PROTOCOL && irmp_bit >= 13 && irmp_bit < 26)\r
+ if (irmp_param.protocol == IRMP_NEC42_PROTOCOL && irmp_bit >= 13 && irmp_bit < 26)\r
{\r
irmp_tmp_address2 |= (((uint16_t) (value)) << (irmp_bit - 13)); // CV wants cast\r
}\r
+ else\r
#endif\r
\r
#if IRMP_SUPPORT_SAMSUNG_PROTOCOL == 1\r
- else if (irmp_param.protocol == IRMP_SAMSUNG_PROTOCOL && irmp_bit >= SAMSUNG_ID_OFFSET && irmp_bit < SAMSUNG_ID_OFFSET + SAMSUNG_ID_LEN)\r
+ if (irmp_param.protocol == IRMP_SAMSUNG_PROTOCOL && irmp_bit >= SAMSUNG_ID_OFFSET && irmp_bit < SAMSUNG_ID_OFFSET + SAMSUNG_ID_LEN)\r
{\r
irmp_tmp_id |= (((uint16_t) (value)) << (irmp_bit - SAMSUNG_ID_OFFSET)); // store with LSB first\r
}\r
+ else\r
#endif\r
\r
#if IRMP_SUPPORT_KASEIKYO_PROTOCOL == 1\r
- else if (irmp_param.protocol == IRMP_KASEIKYO_PROTOCOL)\r
+ if (irmp_param.protocol == IRMP_KASEIKYO_PROTOCOL)\r
{\r
if (irmp_bit >= 20 && irmp_bit < 24)\r
{\r
}\r
}\r
}\r
+ else\r
#endif\r
+ {\r
+ ;\r
+ }\r
\r
irmp_bit++;\r
}\r
if (repetition_len < 0xFFFF) // avoid overflow of counter\r
{\r
repetition_len++;\r
+\r
+#if IRMP_SUPPORT_DENON_PROTOCOL == 1\r
+ if (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
+ (double) (time_counter * 1000) / F_INTERRUPTS);\r
+ last_irmp_denon_command = 0;\r
+ }\r
+#endif // IRMP_SUPPORT_DENON_PROTOCOL == 1\r
}\r
}\r
}\r
else\r
#endif // IRMP_SUPPORT_THOMSON_PROTOCOL == 1\r
\r
+#if IRMP_SUPPORT_BOSE_PROTOCOL == 1\r
+ if (irmp_pulse_time >= BOSE_START_BIT_PULSE_LEN_MIN && irmp_pulse_time <= BOSE_START_BIT_PULSE_LEN_MAX &&\r
+ irmp_pause_time >= BOSE_START_BIT_PAUSE_LEN_MIN && irmp_pause_time <= BOSE_START_BIT_PAUSE_LEN_MAX)\r
+ {\r
+ ANALYZE_PRINTF ("protocol = BOSE, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
+ BOSE_START_BIT_PULSE_LEN_MIN, BOSE_START_BIT_PULSE_LEN_MAX,\r
+ BOSE_START_BIT_PAUSE_LEN_MIN, BOSE_START_BIT_PAUSE_LEN_MAX);\r
+ irmp_param_p = (IRMP_PARAMETER *) &bose_param;\r
+ }\r
+ else\r
+#endif // IRMP_SUPPORT_BOSE_PROTOCOL == 1\r
+\r
#if IRMP_SUPPORT_RC6_PROTOCOL == 1\r
if (irmp_pulse_time >= RC6_START_BIT_PULSE_LEN_MIN && irmp_pulse_time <= RC6_START_BIT_PULSE_LEN_MAX &&\r
irmp_pause_time >= RC6_START_BIT_PAUSE_LEN_MIN && irmp_pause_time <= RC6_START_BIT_PAUSE_LEN_MAX)\r
else\r
#endif // IRMP_SUPPORT_SIEMENS_OR_RUWIDO_PROTOCOL == 1\r
\r
-#if IRMP_SUPPORT_GRUNDIG2_PROTOCOL == 1\r
- if ((irmp_pulse_time >= GRUNDIG2_START_BIT_PULSE_LEN_MIN && irmp_pulse_time <= GRUNDIG2_START_BIT_PULSE_LEN_MAX) &&\r
- (irmp_pause_time >= GRUNDIG2_START_BIT_PAUSE_LEN_MIN && irmp_pause_time <= GRUNDIG2_START_BIT_PAUSE_LEN_MAX))\r
- { // it's GRUNDIG2\r
- ANALYZE_PRINTF ("protocol = GRUNDIG2, start bit timings: pulse: %3d - %3d or %3d - %3d, pause: %3d - %3d or %3d - %3d\n",\r
- GRUNDIG2_START_BIT_PULSE_LEN_MIN, GRUNDIG2_START_BIT_PULSE_LEN_MAX,\r
- 2 * GRUNDIG2_START_BIT_PULSE_LEN_MIN, 2 * GRUNDIG2_START_BIT_PULSE_LEN_MAX,\r
- GRUNDIG2_START_BIT_PAUSE_LEN_MIN, GRUNDIG2_START_BIT_PAUSE_LEN_MAX,\r
- 2 * GRUNDIG2_START_BIT_PAUSE_LEN_MIN, 2 * GRUNDIG2_START_BIT_PAUSE_LEN_MAX);\r
- irmp_param_p = (IRMP_PARAMETER *) &grundig2_param;\r
- last_pause = irmp_pause_time;\r
- last_value = 1;\r
- }\r
- else\r
-#endif // IRMP_SUPPORT_SIEMENS_OR_RUWIDO_PROTOCOL == 1\r
-\r
#if IRMP_SUPPORT_FDC_PROTOCOL == 1\r
if (irmp_pulse_time >= FDC_START_BIT_PULSE_LEN_MIN && irmp_pulse_time <= FDC_START_BIT_PULSE_LEN_MAX &&\r
irmp_pause_time >= FDC_START_BIT_PAUSE_LEN_MIN && irmp_pause_time <= FDC_START_BIT_PAUSE_LEN_MAX)\r
#if IRMP_SUPPORT_GRUNDIG_NOKIA_IR60_PROTOCOL == 1\r
if (irmp_param.protocol == IRMP_GRUNDIG_PROTOCOL && !irmp_param.stop_bit)\r
{\r
- if (irmp_pause_time > IR60_TIMEOUT_LEN && irmp_bit == 6)\r
+ if (irmp_pause_time > IR60_TIMEOUT_LEN && (irmp_bit == 5 || irmp_bit == 6))\r
{\r
ANALYZE_PRINTF ("Switching to IR60 protocol\n");\r
got_light = TRUE; // this is a lie, but generates a stop bit ;-)\r
if ((~irmp_tmp_command & 0x3FF) == last_irmp_denon_command) // command bits must be inverted\r
{\r
irmp_tmp_command = last_irmp_denon_command; // use command received before!\r
+ last_irmp_denon_command = 0;\r
\r
irmp_protocol = irmp_param.protocol; // store protocol\r
irmp_address = irmp_tmp_address; // store address\r
}\r
else\r
{\r
- ANALYZE_PRINTF ("waiting for inverted command repetition\n");\r
+ ANALYZE_PRINTF ("%8.3fms waiting for inverted command repetition\n", (double) (time_counter * 1000) / F_INTERRUPTS);\r
irmp_ir_detected = FALSE;\r
last_irmp_denon_command = irmp_tmp_command;\r
+ repetition_len = 0;\r
}\r
}\r
else\r
\r
if (xor != xor_check[5])\r
{\r
- ANALYZE_PRINTF ("error 4: wrong XOR check for data bits: 0x%02x 0x%02x\n", xor, xor_check[5]);\r
+ ANALYZE_PRINTF ("error 5: wrong XOR check for data bits: 0x%02x 0x%02x\n", xor, xor_check[5]);\r
irmp_ir_detected = FALSE;\r
}\r
\r
}\r
else\r
#endif // IRMP_SUPPORT_RC6_PROTOCOL == 1\r
-\r
- irmp_protocol = irmp_param.protocol;\r
+ {\r
+ irmp_protocol = irmp_param.protocol;\r
+ }\r
\r
#if IRMP_SUPPORT_FDC_PROTOCOL == 1\r
if (irmp_param.protocol == IRMP_FDC_PROTOCOL)\r
2 * SIEMENS_OR_RUWIDO_BIT_PULSE_LEN_MIN, 2 * SIEMENS_OR_RUWIDO_BIT_PULSE_LEN_MAX,\r
2 * SIEMENS_OR_RUWIDO_BIT_PAUSE_LEN_MIN, 2 * SIEMENS_OR_RUWIDO_BIT_PAUSE_LEN_MAX);\r
\r
- printf ("GRUNDIG2 1 %3d - %3d %3d - %3d %3d - %3d %3d - %3d %3d - %3d %3d - %3d\n",\r
- GRUNDIG2_START_BIT_PULSE_LEN_MIN, GRUNDIG2_START_BIT_PULSE_LEN_MAX,\r
- GRUNDIG2_START_BIT_PAUSE_LEN_MIN, GRUNDIG2_START_BIT_PAUSE_LEN_MAX,\r
- GRUNDIG2_BIT_PULSE_LEN_MIN, GRUNDIG2_BIT_PULSE_LEN_MAX,\r
- GRUNDIG2_BIT_PAUSE_LEN_MIN, GRUNDIG2_BIT_PAUSE_LEN_MAX,\r
- 2 * GRUNDIG2_BIT_PULSE_LEN_MIN, 2 * GRUNDIG2_BIT_PULSE_LEN_MAX,\r
- 2 * GRUNDIG2_BIT_PAUSE_LEN_MIN, 2 * GRUNDIG2_BIT_PAUSE_LEN_MAX);\r
-\r
printf ("FDC 1 %3d - %3d %3d - %3d %3d - %3d %3d - %3d %3d - %3d %3d - %3d\n",\r
FDC_START_BIT_PULSE_LEN_MIN, FDC_START_BIT_PULSE_LEN_MAX, FDC_START_BIT_PAUSE_LEN_MIN, FDC_START_BIT_PAUSE_LEN_MAX,\r
FDC_PULSE_LEN_MIN, FDC_PULSE_LEN_MAX, FDC_0_PAUSE_LEN_MIN, FDC_0_PAUSE_LEN_MAX,\r
\r
if (! analyze)\r
{\r
- for (i = 0; i < (int) ((8000.0 * F_INTERRUPTS) / 10000); i++) // newline: long pause of 800 msec\r
+ for (i = 0; i < (int) ((10000.0 * F_INTERRUPTS) / 10000); i++) // newline: long pause of 10000 msec\r
{\r
next_tick ();\r
}\r
projects / irmp.git / blobdiff