/*---------------------------------------------------------------------------------------------------------------------------------------------------\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-2013 Frank Meyer - frank(at)fli4l.de\r
*\r
- * $Id: irmp.c,v 1.108 2011/09/09 11:59:39 fm Exp $\r
+ * $Id: irmp.c,v 1.137 2013/01/17 07:33:13 fm Exp $\r
*\r
* ATMEGA88 @ 8 MHz\r
*\r
* Supported mikrocontrollers:\r
*\r
- * ATtiny84, ATtiny85\r
+ * ATtiny87, ATtiny167\r
+ * ATtiny45, ATtiny85\r
+ * ATtiny44, ATtiny84\r
* ATmega8, ATmega16, ATmega32\r
* ATmega162\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(__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
-#ifdef PIC_CCS_COMPILER\r
-\r
-#include <string.h>\r
-typedef unsigned int8 uint8_t;\r
-typedef unsigned int16 uint16_t;\r
-#define PROGMEM\r
-#define memcpy_P memcpy\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\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_IR60_PROTOCOL\r
-#define IRMP_SUPPORT_MANCHESTER 1\r
+ IRMP_SUPPORT_IR60_PROTOCOL == 1 || \\r
+ IRMP_SUPPORT_A1TVBOX_PROTOCOL == 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 SIRCS_PAUSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * SIRCS_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
#define SIRCS_PAUSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * SIRCS_PAUSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
\r
-#define NEC_START_BIT_PULSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * NEC_START_BIT_PULSE_TIME * MIN_TOLERANCE_40 + 0.5) - 1)\r
-#define NEC_START_BIT_PULSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * NEC_START_BIT_PULSE_TIME * MAX_TOLERANCE_40 + 0.5) + 1)\r
-#define NEC_START_BIT_PAUSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * NEC_START_BIT_PAUSE_TIME * MIN_TOLERANCE_40 + 0.5) - 1)\r
-#define NEC_START_BIT_PAUSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * NEC_START_BIT_PAUSE_TIME * MAX_TOLERANCE_40 + 0.5) + 1)\r
-#define NEC_REPEAT_START_BIT_PAUSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * NEC_REPEAT_START_BIT_PAUSE_TIME * MIN_TOLERANCE_40 + 0.5) - 1)\r
-#define NEC_REPEAT_START_BIT_PAUSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * NEC_REPEAT_START_BIT_PAUSE_TIME * MAX_TOLERANCE_40 + 0.5) + 1)\r
-#define NEC_PULSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * NEC_PULSE_TIME * MIN_TOLERANCE_40 + 0.5) - 1)\r
-#define NEC_PULSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * NEC_PULSE_TIME * MAX_TOLERANCE_40 + 0.5) + 1)\r
-#define NEC_1_PAUSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * NEC_1_PAUSE_TIME * MIN_TOLERANCE_40 + 0.5) - 1)\r
-#define NEC_1_PAUSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * NEC_1_PAUSE_TIME * MAX_TOLERANCE_40 + 0.5) + 1)\r
-#define NEC_0_PAUSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * NEC_0_PAUSE_TIME * MIN_TOLERANCE_40 + 0.5) - 1)\r
-#define NEC_0_PAUSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * NEC_0_PAUSE_TIME * MAX_TOLERANCE_40 + 0.5) + 1)\r
+#define NEC_START_BIT_PULSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * NEC_START_BIT_PULSE_TIME * MIN_TOLERANCE_30 + 0.5) - 1)\r
+#define NEC_START_BIT_PULSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * NEC_START_BIT_PULSE_TIME * MAX_TOLERANCE_30 + 0.5) + 1)\r
+#define NEC_START_BIT_PAUSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * NEC_START_BIT_PAUSE_TIME * MIN_TOLERANCE_30 + 0.5) - 1)\r
+#define NEC_START_BIT_PAUSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * NEC_START_BIT_PAUSE_TIME * MAX_TOLERANCE_30 + 0.5) + 1)\r
+#define NEC_REPEAT_START_BIT_PAUSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * NEC_REPEAT_START_BIT_PAUSE_TIME * MIN_TOLERANCE_30 + 0.5) - 1)\r
+#define NEC_REPEAT_START_BIT_PAUSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * NEC_REPEAT_START_BIT_PAUSE_TIME * MAX_TOLERANCE_30 + 0.5) + 1)\r
+#define NEC_PULSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * NEC_PULSE_TIME * MIN_TOLERANCE_30 + 0.5) - 1)\r
+#define NEC_PULSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * NEC_PULSE_TIME * MAX_TOLERANCE_30 + 0.5) + 1)\r
+#define NEC_1_PAUSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * NEC_1_PAUSE_TIME * MIN_TOLERANCE_30 + 0.5) - 1)\r
+#define NEC_1_PAUSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * NEC_1_PAUSE_TIME * MAX_TOLERANCE_30 + 0.5) + 1)\r
+#define NEC_0_PAUSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * NEC_0_PAUSE_TIME * MIN_TOLERANCE_30 + 0.5) - 1)\r
+#define NEC_0_PAUSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * NEC_0_PAUSE_TIME * MAX_TOLERANCE_30 + 0.5) + 1)\r
// autodetect nec repetition frame within 50 msec:\r
// NEC seems to send the first repetition frame after 40ms, further repetition frames after 100 ms\r
#if 0\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 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 A1TVBOX_START_BIT_PULSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * A1TVBOX_START_BIT_PULSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
+#define A1TVBOX_START_BIT_PULSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * A1TVBOX_START_BIT_PULSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
+#define A1TVBOX_START_BIT_PAUSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * A1TVBOX_START_BIT_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
+#define A1TVBOX_START_BIT_PAUSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * A1TVBOX_START_BIT_PAUSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
+#define A1TVBOX_BIT_PULSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * A1TVBOX_BIT_PULSE_TIME * MIN_TOLERANCE_30 + 0.5) - 1)\r
+#define A1TVBOX_BIT_PULSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * A1TVBOX_BIT_PULSE_TIME * MAX_TOLERANCE_30 + 0.5) + 1)\r
+#define A1TVBOX_BIT_PAUSE_LEN_MIN ((uint8_t)(F_INTERRUPTS * A1TVBOX_BIT_PAUSE_TIME * MIN_TOLERANCE_30 + 0.5) - 1)\r
+#define A1TVBOX_BIT_PAUSE_LEN_MAX ((uint8_t)(F_INTERRUPTS * A1TVBOX_BIT_PAUSE_TIME * MAX_TOLERANCE_30 + 0.5) + 1)\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_ONLY_NORMAL_PRINTF(...) { if (! silent && !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_ONLY_NORMAL_PRINTF(...)\r
+# define ANALYZE_NEWLINE()\r
#endif\r
\r
#if IRMP_USE_CALLBACK == 1\r
* Protocol names\r
*---------------------------------------------------------------------------------------------------------------------------------------------------\r
*/\r
-#if IRMP_PROTOCOL_NAMES == 1\r
+#if defined(UNIX_OR_WINDOWS) || IRMP_PROTOCOL_NAMES == 1\r
char *\r
irmp_protocol_names[IRMP_N_PROTOCOLS + 1] =\r
{\r
"NEC16",\r
"NEC42",\r
"LEGO",\r
- "THOMSON"\r
+ "THOMSON",\r
+ "BOSE",\r
+ "A1TVBOX",\r
};\r
#endif\r
\r
* Logging\r
*---------------------------------------------------------------------------------------------------------------------------------------------------\r
*/\r
-#if IRMP_LOGGING == 1\r
+#if IRMP_LOGGING == 1 // logging via UART\r
+\r
+#if IRMP_EXT_LOGGING == 1 // use external logging\r
+#include "irmpextlog.h"\r
+#else // normal UART log (IRMP_EXT_LOGGING == 0)\r
#define BAUD 9600L\r
+#ifndef UNIX_OR_WINDOWS\r
#include <util/setbaud.h>\r
+#endif\r
\r
#ifdef UBRR0H\r
\r
#define UART0_TXEN_BIT_VALUE (1<<TXEN0)\r
#define UART0_UDR UDR0\r
#define UART0_U2X U2X0\r
-\r
+ \r
#else\r
\r
#define UART0_UBRRH UBRRH\r
#define UART0_UDR UDR\r
#define UART0_U2X U2X\r
\r
-#endif\r
+#endif //UBRR0H\r
+#endif //IRMP_EXT_LOGGING\r
\r
/*---------------------------------------------------------------------------------------------------------------------------------------------------\r
* Initialize UART\r
void\r
irmp_uart_init (void)\r
{\r
+#ifndef UNIX_OR_WINDOWS\r
+#if (IRMP_EXT_LOGGING == 0) // use UART\r
UART0_UBRRH = UBRRH_VALUE; // set baud rate\r
UART0_UBRRL = UBRRL_VALUE;\r
\r
\r
UART0_UCSRC = UART0_UCSZ1_BIT_VALUE | UART0_UCSZ0_BIT_VALUE | UART0_URSEL_BIT_VALUE;\r
UART0_UCSRB |= UART0_TXEN_BIT_VALUE; // enable UART TX\r
+#else // other log method\r
+ initextlog(); \r
+#endif //IRMP_EXT_LOGGING\r
+#endif // UNIX_OR_WINDOWS\r
}\r
\r
/*---------------------------------------------------------------------------------------------------------------------------------------------------\r
void\r
irmp_uart_putc (unsigned char ch)\r
{\r
+#ifndef UNIX_OR_WINDOWS\r
+#if (IRMP_EXT_LOGGING == 0)\r
while (!(UART0_UCSRA & UART0_UDRE_BIT_VALUE))\r
{\r
;\r
}\r
\r
UART0_UDR = ch;\r
+#else\r
+ sendextlog(ch); //Use external log\r
+#endif\r
+#else\r
+ fputc (ch, stderr);\r
+#endif // UNIX_OR_WINDOWS\r
}\r
\r
/*---------------------------------------------------------------------------------------------------------------------------------------------------\r
#define ENDBITS 1000 // number of sequenced highbits to detect end\r
#define DATALEN 700 // log buffer size\r
\r
+#if 0 // old log routine\r
+\r
static void\r
irmp_log (uint8_t val)\r
{\r
}\r
}\r
\r
+#else // new log routine\r
+\r
+static void\r
+irmp_log (uint8_t val)\r
+{\r
+ static uint8_t buf[DATALEN]; // logging buffer\r
+ static uint16_t buf_idx; // index\r
+ static uint8_t startcycles; // current number of start-zeros\r
+ static uint16_t cnt; // counts sequenced highbits - to detect end\r
+ static uint8_t last_val = 1;\r
+\r
+ if (! val && (startcycles < STARTCYCLES) && !buf_idx) // prevent that single random zeros init logging\r
+ {\r
+ startcycles++;\r
+ }\r
+ else\r
+ {\r
+ startcycles = 0;\r
+\r
+ if (! val || buf_idx != 0) // start or continue logging on "0", "1" cannot init logging\r
+ {\r
+ if (last_val == val)\r
+ {\r
+ cnt++;\r
+\r
+ if (val && cnt > ENDBITS) // if high received then look at log-stop condition\r
+ { // if stop condition is true, output on uart\r
+ uint8_t i8;\r
+ uint16_t i;\r
+ uint16_t j;\r
+ uint8_t v = '1';\r
+ uint16_t d;\r
+\r
+ for (i8 = 0; i8 < STARTCYCLES; i8++)\r
+ {\r
+ irmp_uart_putc ('0'); // the ignored starting zeros\r
+ }\r
+\r
+ for (i = 0; i < buf_idx; i++)\r
+ {\r
+ d = buf[i];\r
+\r
+ if (d == 0xff)\r
+ {\r
+ i++;\r
+ d = buf[i];\r
+ i++;\r
+ d |= ((uint16_t) buf[i] << 8);\r
+ }\r
+\r
+ for (j = 0; j < d; j++)\r
+ {\r
+ irmp_uart_putc (v);\r
+ }\r
+\r
+ v = (v == '1') ? '0' : '1';\r
+ }\r
+\r
+ for (i8 = 0; i8 < 20; i8++)\r
+ {\r
+ irmp_uart_putc ('1');\r
+ }\r
+\r
+ irmp_uart_putc ('\n');\r
+ buf_idx = 0;\r
+ last_val = 1;\r
+ cnt = 0;\r
+ }\r
+ }\r
+ else if (buf_idx < DATALEN - 3)\r
+ {\r
+ if (cnt >= 0xff)\r
+ {\r
+ buf[buf_idx++] = 0xff;\r
+ buf[buf_idx++] = (cnt & 0xff);\r
+ buf[buf_idx] = (cnt >> 8);\r
+ }\r
+ else\r
+ {\r
+ buf[buf_idx] = cnt;\r
+ }\r
+\r
+ buf_idx++;\r
+ cnt = 1;\r
+ last_val = val;\r
+ }\r
+ }\r
+ }\r
+}\r
+\r
+#endif\r
+\r
#else\r
#define irmp_log(val)\r
-#endif\r
+#endif //IRMP_LOGGING\r
\r
typedef struct\r
{\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
+#if IRMP_SUPPORT_A1TVBOX_PROTOCOL == 1\r
+\r
+static const PROGMEM IRMP_PARAMETER a1tvbox_param =\r
+{\r
+ IRMP_A1TVBOX_PROTOCOL, // protocol: ir protocol\r
+\r
+ A1TVBOX_BIT_PULSE_LEN_MIN, // pulse_1_len_min: here: minimum length of short pulse\r
+ A1TVBOX_BIT_PULSE_LEN_MAX, // pulse_1_len_max: here: maximum length of short pulse\r
+ A1TVBOX_BIT_PAUSE_LEN_MIN, // pause_1_len_min: here: minimum length of short pause\r
+ A1TVBOX_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
+ A1TVBOX_ADDRESS_OFFSET, // address_offset: address offset\r
+ A1TVBOX_ADDRESS_OFFSET + A1TVBOX_ADDRESS_LEN, // address_end: end of address\r
+ A1TVBOX_COMMAND_OFFSET, // command_offset: command offset\r
+ A1TVBOX_COMMAND_OFFSET + A1TVBOX_COMMAND_LEN, // command_end: end of command\r
+ A1TVBOX_COMPLETE_DATA_LEN, // complete_len: complete length of frame\r
+ A1TVBOX_STOP_BIT, // stop_bit: flag: frame has stop bit\r
+ A1TVBOX_LSB, // lsb_first: flag: LSB first\r
+ A1TVBOX_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
-#ifndef PIC_CCS_COMPILER\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
+#elif defined(STELLARIS_ARM_CORTEX_M4)\r
+ // Enable the GPIO port\r
+ ROM_SysCtlPeripheralEnable(IRMP_PORT_PERIPH);\r
+\r
+ // Set as an input\r
+ ROM_GPIODirModeSet(IRMP_PORT_BASE, IRMP_PORT_PIN, GPIO_DIR_MODE_IN);\r
+ ROM_GPIOPadConfigSet(IRMP_PORT_BASE, IRMP_PORT_PIN,\r
+ GPIO_STRENGTH_2MA,\r
+ GPIO_PIN_TYPE_STD_WPU);\r
+#else // AVR\r
IRMP_PORT &= ~(1<<IRMP_BIT); // deactivate pullup\r
IRMP_DDR &= ~(1<<IRMP_BIT); // set pin to input\r
-#endif // PIC_CCS_COMPILER\r
+#endif\r
\r
#if IRMP_LOGGING == 1\r
irmp_uart_init ();\r
}\r
break;\r
#endif\r
+#if IRMP_SUPPORT_BOSE_PROTOCOL == 1\r
+ case IRMP_BOSE_PROTOCOL:\r
+ if ((irmp_command >> 8) == (~irmp_command & 0x00FF))\r
+ {\r
+ irmp_command &= 0xff;\r
+ rtc = TRUE;\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
{\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
else\r
{\r
ANALYZE_PRINTF ("CRC error in LEGO protocol\n");\r
- rtc = TRUE;\r
+ // rtc = TRUE; // don't accept codes with CRC errors\r
}\r
break;\r
}\r
#endif\r
default:\r
+ {\r
rtc = TRUE;\r
+ break;\r
+ }\r
}\r
\r
if (rtc)\r
#endif\r
#if IRMP_SUPPORT_KASEIKYO_PROTOCOL == 1\r
static uint8_t xor_check[6]; // check kaseikyo "parity" bits\r
+static uint8_t genre2; // save genre2 bits here, later copied to MSB in flags\r
#endif\r
\r
/*---------------------------------------------------------------------------------------------------------------------------------------------------\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 && irmp_bit >= 20 && irmp_bit < 24)\r
+ if (irmp_param.protocol == IRMP_KASEIKYO_PROTOCOL)\r
{\r
- irmp_tmp_command |= (((uint16_t) (value)) << (irmp_bit - 8)); // store 4 system bits in upper nibble with LSB first\r
- }\r
-\r
- if (irmp_param.protocol == IRMP_KASEIKYO_PROTOCOL && irmp_bit < KASEIKYO_COMPLETE_DATA_LEN)\r
- {\r
- if (value)\r
+ if (irmp_bit >= 20 && irmp_bit < 24)\r
{\r
- xor_check[irmp_bit / 8] |= 1 << (irmp_bit % 8);\r
+ irmp_tmp_command |= (((uint16_t) (value)) << (irmp_bit - 8)); // store 4 system bits (genre 1) in upper nibble with LSB first\r
}\r
- else\r
+ else if (irmp_bit >= 24 && irmp_bit < 28)\r
{\r
- xor_check[irmp_bit / 8] &= ~(1 << (irmp_bit % 8));\r
+ genre2 |= (((uint8_t) (value)) << (irmp_bit - 20)); // store 4 system bits (genre 2) in upper nibble with LSB first\r
}\r
- }\r
\r
+ if (irmp_bit < KASEIKYO_COMPLETE_DATA_LEN)\r
+ {\r
+ if (value)\r
+ {\r
+ xor_check[irmp_bit / 8] |= 1 << (irmp_bit % 8);\r
+ }\r
+ else\r
+ {\r
+ xor_check[irmp_bit / 8] &= ~(1 << (irmp_bit % 8));\r
+ }\r
+ }\r
+ }\r
+ else\r
#endif\r
+ {\r
+ ;\r
+ }\r
\r
irmp_bit++;\r
}\r
static PAUSE_LEN irmp_pause_time; // count bit time for pause\r
static uint16_t last_irmp_address = 0xFFFF; // save last irmp address to recognize key repetition\r
static uint16_t last_irmp_command = 0xFFFF; // save last irmp command to recognize key repetition\r
- static uint16_t repetition_len; // SIRCS repeats frame 2-5 times with 45 ms pause\r
+ static uint16_t key_repetition_len; // SIRCS repeats frame 2-5 times with 45 ms pause\r
static uint8_t repetition_frame_number;\r
#if IRMP_SUPPORT_DENON_PROTOCOL == 1\r
static uint16_t last_irmp_denon_command; // save last irmp command to recognize DENON frame repetition\r
+ static uint16_t denon_repetition_len = 0xFFFF; // denon repetition len of 2nd auto generated frame\r
#endif\r
#if IRMP_SUPPORT_RC5_PROTOCOL == 1\r
static uint8_t rc5_cmd_bit6; // bit 6 of RC5 command is the inverted 2nd start bit\r
#ifdef ANALYZE\r
if (! irmp_pulse_time)\r
{\r
- ANALYZE_PRINTF("%8d [starting pulse]\n", time_counter);\r
+ ANALYZE_PRINTF("%8.3fms [starting pulse]\n", (double) (time_counter * 1000) / F_INTERRUPTS);\r
}\r
#endif\r
irmp_pulse_time++; // increment counter\r
wait_for_space = 0;\r
irmp_tmp_command = 0;\r
irmp_tmp_address = 0;\r
+#if IRMP_SUPPORT_KASEIKYO_PROTOCOL == 1\r
+ genre2 = 0;\r
+#endif\r
\r
#if IRMP_SUPPORT_RC5_PROTOCOL == 1 && (IRMP_SUPPORT_FDC_PROTOCOL == 1 || IRMP_SUPPORT_RCCAR_PROTOCOL == 1) || IRMP_SUPPORT_NEC42_PROTOCOL == 1\r
irmp_tmp_command2 = 0;\r
}\r
else\r
{\r
- if (repetition_len < 0xFFFF) // avoid overflow of counter\r
+ if (key_repetition_len < 0xFFFF) // avoid overflow of counter\r
{\r
- repetition_len++;\r
+ key_repetition_len++;\r
+\r
+#if IRMP_SUPPORT_DENON_PROTOCOL == 1\r
+ if (denon_repetition_len < 0xFFFF) // avoid overflow of counter\r
+ {\r
+ denon_repetition_len++;\r
+\r
+ if (denon_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
+ denon_repetition_len = 0xFFFF;\r
+ }\r
+ }\r
+#endif // IRMP_SUPPORT_DENON_PROTOCOL == 1\r
}\r
}\r
}\r
else\r
#endif // IRMP_SUPPORT_JVC_PROTOCOL == 1\r
{\r
- ANALYZE_PRINTF ("%8d error 1: pause after start bit pulse %d too long: %d\n", time_counter, irmp_pulse_time, irmp_pause_time);\r
+ ANALYZE_PRINTF ("%8.3fms error 1: pause after start bit pulse %d too long: %d\n", (double) (time_counter * 1000) / F_INTERRUPTS, irmp_pulse_time, irmp_pause_time);\r
ANALYZE_ONLY_NORMAL_PUTCHAR ('\n');\r
}\r
// irmp_busy_flag = FALSE;\r
irmp_param2.protocol = 0;\r
#endif\r
\r
- ANALYZE_PRINTF ("%8d [start-bit: pulse = %2d, pause = %2d]\n", time_counter, irmp_pulse_time, irmp_pause_time);\r
+ ANALYZE_PRINTF ("%8.3fms [start-bit: pulse = %2d, pause = %2d]\n", (double) (time_counter * 1000) / F_INTERRUPTS, irmp_pulse_time, irmp_pause_time);\r
\r
#if IRMP_SUPPORT_SIRCS_PROTOCOL == 1\r
if (irmp_pulse_time >= SIRCS_START_BIT_PULSE_LEN_MIN && irmp_pulse_time <= SIRCS_START_BIT_PULSE_LEN_MAX &&\r
irmp_pulse_time >= JVC_START_BIT_PULSE_LEN_MIN && irmp_pulse_time <= JVC_START_BIT_PULSE_LEN_MAX &&\r
irmp_pause_time >= JVC_REPEAT_START_BIT_PAUSE_LEN_MIN && irmp_pause_time <= JVC_REPEAT_START_BIT_PAUSE_LEN_MAX)\r
{\r
- ANALYZE_PRINTF ("protocol = NEC or JVC repeat frame, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
+ ANALYZE_PRINTF ("protocol = NEC or JVC (type 1) repeat frame, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
JVC_START_BIT_PULSE_LEN_MIN, JVC_START_BIT_PULSE_LEN_MAX,\r
JVC_REPEAT_START_BIT_PAUSE_LEN_MIN, JVC_REPEAT_START_BIT_PAUSE_LEN_MAX);\r
irmp_param_p = (IRMP_PARAMETER *) &nec_param;\r
else if (irmp_pulse_time >= NEC_START_BIT_PULSE_LEN_MIN && irmp_pulse_time <= NEC_START_BIT_PULSE_LEN_MAX &&\r
irmp_pause_time >= NEC_REPEAT_START_BIT_PAUSE_LEN_MIN && irmp_pause_time <= NEC_REPEAT_START_BIT_PAUSE_LEN_MAX)\r
{ // it's NEC\r
- ANALYZE_PRINTF ("protocol = NEC (repetition frame), start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
- NEC_START_BIT_PULSE_LEN_MIN, NEC_START_BIT_PULSE_LEN_MAX,\r
- NEC_REPEAT_START_BIT_PAUSE_LEN_MIN, NEC_REPEAT_START_BIT_PAUSE_LEN_MAX);\r
+#if IRMP_SUPPORT_JVC_PROTOCOL == 1\r
+ if (irmp_protocol == IRMP_JVC_PROTOCOL) // last protocol was JVC, awaiting repeat frame\r
+ { // some jvc remote controls use nec repetition frame for jvc repetition frame\r
+ ANALYZE_PRINTF ("protocol = JVC repeat frame type 2, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
+ NEC_START_BIT_PULSE_LEN_MIN, NEC_START_BIT_PULSE_LEN_MAX,\r
+ NEC_REPEAT_START_BIT_PAUSE_LEN_MIN, NEC_REPEAT_START_BIT_PAUSE_LEN_MAX);\r
+ irmp_param_p = (IRMP_PARAMETER *) &nec_param;\r
+ }\r
+ else\r
+#endif // IRMP_SUPPORT_JVC_PROTOCOL == 1\r
+ {\r
+ ANALYZE_PRINTF ("protocol = NEC (repetition frame), start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
+ NEC_START_BIT_PULSE_LEN_MIN, NEC_START_BIT_PULSE_LEN_MAX,\r
+ NEC_REPEAT_START_BIT_PAUSE_LEN_MIN, NEC_REPEAT_START_BIT_PAUSE_LEN_MAX);\r
+\r
+ irmp_param_p = (IRMP_PARAMETER *) &nec_rep_param;\r
+ }\r
+ }\r
+ else\r
\r
- irmp_param_p = (IRMP_PARAMETER *) &nec_rep_param;\r
+#if IRMP_SUPPORT_JVC_PROTOCOL == 1\r
+ if (irmp_protocol == IRMP_JVC_PROTOCOL && // last protocol was JVC, awaiting repeat frame\r
+ irmp_pulse_time >= NEC_START_BIT_PULSE_LEN_MIN && irmp_pulse_time <= NEC_START_BIT_PULSE_LEN_MAX &&\r
+ irmp_pause_time >= NEC_0_PAUSE_LEN_MIN && irmp_pause_time <= NEC_0_PAUSE_LEN_MAX)\r
+ { // it's JVC repetition type 3\r
+ ANALYZE_PRINTF ("protocol = JVC repeat frame type 3, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
+ NEC_START_BIT_PULSE_LEN_MIN, NEC_START_BIT_PULSE_LEN_MAX,\r
+ NEC_0_PAUSE_LEN_MIN, NEC_0_PAUSE_LEN_MAX);\r
+ irmp_param_p = (IRMP_PARAMETER *) &nec_param;\r
}\r
else\r
+#endif // IRMP_SUPPORT_JVC_PROTOCOL == 1\r
+\r
#endif // IRMP_SUPPORT_NEC_PROTOCOL == 1\r
\r
#if IRMP_SUPPORT_NIKON_PROTOCOL == 1\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
irmp_param_p = (IRMP_PARAMETER *) &lego_param;\r
}\r
else\r
-#endif // IRMP_SUPPORT_NEC_PROTOCOL == 1\r
+#endif // IRMP_SUPPORT_LEGO_PROTOCOL == 1\r
+\r
+#if IRMP_SUPPORT_A1TVBOX_PROTOCOL == 1\r
+ if (irmp_pulse_time >= A1TVBOX_START_BIT_PULSE_LEN_MIN && irmp_pulse_time <= A1TVBOX_START_BIT_PULSE_LEN_MAX &&\r
+ irmp_pause_time >= A1TVBOX_START_BIT_PAUSE_LEN_MIN && irmp_pause_time <= A1TVBOX_START_BIT_PAUSE_LEN_MAX)\r
+ { // it's A1TVBOX\r
+ ANALYZE_PRINTF ("protocol = A1TVBOX, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
+ A1TVBOX_START_BIT_PULSE_LEN_MIN, A1TVBOX_START_BIT_PULSE_LEN_MAX,\r
+ A1TVBOX_START_BIT_PAUSE_LEN_MIN, A1TVBOX_START_BIT_PAUSE_LEN_MAX);\r
+ irmp_param_p = (IRMP_PARAMETER *) &a1tvbox_param;\r
+ last_pause = 0;\r
+ last_value = 1;\r
+ }\r
+ else\r
+#endif // IRMP_SUPPORT_RC6_PROTOCOL == 1\r
\r
{\r
ANALYZE_PRINTF ("protocol = UNKNOWN\n");\r
\r
if (! (irmp_param.flags & IRMP_PARAM_FLAG_IS_MANCHESTER))\r
{\r
- ANALYZE_PRINTF ("pulse_0: %3d - %3d\n", 2 * irmp_param.pulse_1_len_min, 2 * irmp_param.pulse_1_len_max);\r
- ANALYZE_PRINTF ("pause_0: %3d - %3d\n", 2 * irmp_param.pause_1_len_min, 2 * irmp_param.pause_1_len_max);\r
+ ANALYZE_PRINTF ("pulse_0: %3d - %3d\n", irmp_param.pulse_0_len_min, irmp_param.pulse_0_len_max);\r
+ ANALYZE_PRINTF ("pause_0: %3d - %3d\n", irmp_param.pause_0_len_min, irmp_param.pause_0_len_max);\r
+ }\r
+ else\r
+ {\r
+ ANALYZE_PRINTF ("pulse: %3d - %3d or %3d - %3d\n", irmp_param.pulse_0_len_min, irmp_param.pulse_0_len_max,\r
+ 2 * irmp_param.pulse_0_len_min, 2 * irmp_param.pulse_0_len_max);\r
+ ANALYZE_PRINTF ("pause: %3d - %3d or %3d - %3d\n", irmp_param.pause_0_len_min, irmp_param.pause_0_len_max,\r
+ 2 * irmp_param.pause_0_len_min, 2 * irmp_param.pause_0_len_max);\r
}\r
\r
#if IRMP_SUPPORT_BANG_OLUFSEN_PROTOCOL == 1\r
{\r
if (irmp_pause_time > irmp_param.pulse_1_len_max && irmp_pause_time <= 2 * irmp_param.pulse_1_len_max)\r
{\r
- ANALYZE_PRINTF ("%8d [bit %2d: pulse = %3d, pause = %3d] ", time_counter, irmp_bit, irmp_pulse_time, irmp_pause_time);\r
+ ANALYZE_PRINTF ("%8.3fms [bit %2d: pulse = %3d, pause = %3d] ", (double) (time_counter * 1000) / F_INTERRUPTS, irmp_bit, irmp_pulse_time, irmp_pause_time);\r
ANALYZE_PUTCHAR ((irmp_param.flags & IRMP_PARAM_FLAG_1ST_PULSE_IS_1) ? '0' : '1');\r
ANALYZE_NEWLINE ();\r
irmp_store_bit ((irmp_param.flags & IRMP_PARAM_FLAG_1ST_PULSE_IS_1) ? 0 : 1);\r
}\r
else if (! last_value) // && irmp_pause_time >= irmp_param.pause_1_len_min && irmp_pause_time <= irmp_param.pause_1_len_max)\r
{\r
- ANALYZE_PRINTF ("%8d [bit %2d: pulse = %3d, pause = %3d] ", time_counter, irmp_bit, irmp_pulse_time, irmp_pause_time);\r
+ ANALYZE_PRINTF ("%8.3fms [bit %2d: pulse = %3d, pause = %3d] ", (double) (time_counter * 1000) / F_INTERRUPTS, irmp_bit, irmp_pulse_time, irmp_pause_time);\r
\r
ANALYZE_PUTCHAR ((irmp_param.flags & IRMP_PARAM_FLAG_1ST_PULSE_IS_1) ? '1' : '0');\r
ANALYZE_NEWLINE ();\r
#if IRMP_SUPPORT_DENON_PROTOCOL == 1\r
if (irmp_param.protocol == IRMP_DENON_PROTOCOL)\r
{\r
- ANALYZE_PRINTF ("%8d [bit %2d: pulse = %3d, pause = %3d] ", time_counter, irmp_bit, irmp_pulse_time, irmp_pause_time);\r
+ ANALYZE_PRINTF ("%8.3fms [bit %2d: pulse = %3d, pause = %3d] ", (double) (time_counter * 1000) / F_INTERRUPTS, irmp_bit, irmp_pulse_time, irmp_pause_time);\r
\r
if (irmp_pause_time >= DENON_1_PAUSE_LEN_MIN && irmp_pause_time <= DENON_1_PAUSE_LEN_MAX)\r
{ // pause timings correct for "1"?\r
#if IRMP_SUPPORT_THOMSON_PROTOCOL == 1\r
if (irmp_param.protocol == IRMP_THOMSON_PROTOCOL)\r
{\r
- ANALYZE_PRINTF ("%8d [bit %2d: pulse = %3d, pause = %3d] ", time_counter, irmp_bit, irmp_pulse_time, irmp_pause_time);\r
+ ANALYZE_PRINTF ("%8.3fms [bit %2d: pulse = %3d, pause = %3d] ", (double) (time_counter * 1000) / F_INTERRUPTS, irmp_bit, irmp_pulse_time, irmp_pause_time);\r
\r
if (irmp_pause_time >= THOMSON_1_PAUSE_LEN_MIN && irmp_pause_time <= THOMSON_1_PAUSE_LEN_MAX)\r
{ // pause timings correct for "1"?\r
}\r
else\r
{\r
- ANALYZE_PRINTF ("error: stop bit timing wrong\n");\r
+ ANALYZE_PRINTF ("error: stop bit timing wrong, irmp_bit = %d, irmp_pulse_time = %d, pulse_0_len_min = %d, pulse_0_len_max = %d\n",\r
+ irmp_bit, irmp_pulse_time, irmp_param.pulse_0_len_min, irmp_param.pulse_0_len_max);\r
\r
// irmp_busy_flag = FALSE;\r
irmp_start_bit_detected = 0; // wait for another start bit...\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_SUPPORT_JVC_PROTOCOL == 1\r
else if (irmp_param.protocol == IRMP_NEC_PROTOCOL && (irmp_bit == 16 || irmp_bit == 17)) // it was a JVC stop bit\r
{\r
- ANALYZE_PRINTF ("Switching to JVC protocol\n");\r
+ ANALYZE_PRINTF ("Switching to JVC protocol, irmp_bit = %d\n", irmp_bit);\r
irmp_param.stop_bit = TRUE; // set flag\r
irmp_param.protocol = IRMP_JVC_PROTOCOL; // switch protocol\r
irmp_param.complete_len = irmp_bit; // patch length: 16 or 17\r
// 0123456789ABC0123456789ABC0123456701234567\r
// NEC42: AAAAAAAAAAAAAaaaaaaaaaaaaaCCCCCCCCcccccccc\r
// NEC: AAAAAAAAaaaaaaaaCCCCCCCCcccccccc\r
- irmp_tmp_address |= (irmp_tmp_address2 & 0x0007) << 12;\r
+ irmp_tmp_address |= (irmp_tmp_address2 & 0x0007) << 13; // fm 2012-02-13: 12 -> 13\r
irmp_tmp_command = (irmp_tmp_address2 >> 3) | (irmp_tmp_command << 10);\r
}\r
#endif // IRMP_SUPPORT_NEC_PROTOCOL == 1\r
#if IRMP_SUPPORT_JVC_PROTOCOL == 1\r
- else if (irmp_param.protocol == IRMP_NEC42_PROTOCOL && irmp_bit == 16) // it was a JVC stop bit\r
+ else if (irmp_param.protocol == IRMP_NEC42_PROTOCOL && (irmp_bit == 16 || irmp_bit == 17)) // it was a JVC stop bit\r
{\r
- ANALYZE_PRINTF ("Switching to JVC protocol\n");\r
+ ANALYZE_PRINTF ("Switching to JVC protocol, irmp_bit = %d\n", irmp_bit);\r
irmp_param.stop_bit = TRUE; // set flag\r
irmp_param.protocol = IRMP_JVC_PROTOCOL; // switch protocol\r
irmp_param.complete_len = irmp_bit; // patch length: 16 or 17\r
\r
if (got_light)\r
{\r
- ANALYZE_PRINTF ("%8d [bit %2d: pulse = %3d, pause = %3d] ", time_counter, irmp_bit, irmp_pulse_time, irmp_pause_time);\r
+ ANALYZE_PRINTF ("%8.3fms [bit %2d: pulse = %3d, pause = %3d] ", (double) (time_counter * 1000) / F_INTERRUPTS, irmp_bit, irmp_pulse_time, irmp_pause_time);\r
\r
#if IRMP_SUPPORT_MANCHESTER == 1\r
if ((irmp_param.flags & IRMP_PARAM_FLAG_IS_MANCHESTER)) // Manchester\r
\r
if (irmp_start_bit_detected && irmp_bit == irmp_param.complete_len && irmp_param.stop_bit == 0) // enough bits received?\r
{\r
- if (last_irmp_command == irmp_tmp_command && repetition_len < AUTO_FRAME_REPETITION_LEN)\r
+ if (last_irmp_command == irmp_tmp_command && key_repetition_len < AUTO_FRAME_REPETITION_LEN)\r
{\r
repetition_frame_number++;\r
}\r
if (irmp_param.protocol == IRMP_SIRCS_PROTOCOL && (repetition_frame_number == 1 || repetition_frame_number == 2))\r
{\r
ANALYZE_PRINTF ("code skipped: SIRCS auto repetition frame #%d, counter = %d, auto repetition len = %d\n",\r
- repetition_frame_number + 1, repetition_len, AUTO_FRAME_REPETITION_LEN);\r
- repetition_len = 0;\r
+ repetition_frame_number + 1, key_repetition_len, AUTO_FRAME_REPETITION_LEN);\r
+ key_repetition_len = 0;\r
}\r
else\r
#endif\r
if (irmp_param.protocol == IRMP_KASEIKYO_PROTOCOL && repetition_frame_number == 1)\r
{\r
ANALYZE_PRINTF ("code skipped: KASEIKYO auto repetition frame #%d, counter = %d, auto repetition len = %d\n",\r
- repetition_frame_number + 1, repetition_len, AUTO_FRAME_REPETITION_LEN);\r
- repetition_len = 0;\r
+ repetition_frame_number + 1, key_repetition_len, AUTO_FRAME_REPETITION_LEN);\r
+ key_repetition_len = 0;\r
}\r
else\r
#endif\r
if (irmp_param.protocol == IRMP_SAMSUNG32_PROTOCOL && (repetition_frame_number & 0x01))\r
{\r
ANALYZE_PRINTF ("code skipped: SAMSUNG32 auto repetition frame #%d, counter = %d, auto repetition len = %d\n",\r
- repetition_frame_number + 1, repetition_len, AUTO_FRAME_REPETITION_LEN);\r
- repetition_len = 0;\r
+ repetition_frame_number + 1, key_repetition_len, AUTO_FRAME_REPETITION_LEN);\r
+ key_repetition_len = 0;\r
}\r
else\r
#endif\r
if (irmp_param.protocol == IRMP_NUBERT_PROTOCOL && (repetition_frame_number & 0x01))\r
{\r
ANALYZE_PRINTF ("code skipped: NUBERT auto repetition frame #%d, counter = %d, auto repetition len = %d\n",\r
- repetition_frame_number + 1, repetition_len, AUTO_FRAME_REPETITION_LEN);\r
- repetition_len = 0;\r
+ repetition_frame_number + 1, key_repetition_len, AUTO_FRAME_REPETITION_LEN);\r
+ key_repetition_len = 0;\r
}\r
else\r
#endif\r
\r
{\r
- ANALYZE_PRINTF ("%8d code detected, length = %d\n", time_counter, irmp_bit);\r
+ ANALYZE_PRINTF ("%8.3fms code detected, length = %d\n", (double) (time_counter * 1000) / F_INTERRUPTS, irmp_bit);\r
irmp_ir_detected = TRUE;\r
\r
#if IRMP_SUPPORT_DENON_PROTOCOL == 1\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
- irmp_command = irmp_tmp_command ; // store command\r
+ irmp_command = irmp_tmp_command; // store command\r
}\r
else\r
{\r
- ANALYZE_PRINTF ("waiting for inverted command repetition\n");\r
- irmp_ir_detected = FALSE;\r
- last_irmp_denon_command = irmp_tmp_command;\r
+ if ((irmp_tmp_command & 0x03) == 0x00)\r
+ {\r
+ ANALYZE_PRINTF ("%8.3fms info Denon: waiting for inverted command repetition\n", (double) (time_counter * 1000) / F_INTERRUPTS);\r
+ last_irmp_denon_command = irmp_tmp_command;\r
+ denon_repetition_len = 0;\r
+ irmp_ir_detected = FALSE;\r
+ }\r
+ else if ((irmp_tmp_command & 0x03) == 0x03)\r
+ {\r
+ ANALYZE_PRINTF ("%8.3fms error Denon: got unexpected inverted command, ignoring it\n", (double) (time_counter * 1000) / F_INTERRUPTS);\r
+ last_irmp_denon_command = 0;\r
+ irmp_ir_detected = FALSE;\r
+ }\r
+ else // fm 2013-01-17: 0x01 or 0x10: there is no inverted command\r
+ {\r
+ irmp_protocol = irmp_param.protocol; // store protocol\r
+ irmp_address = irmp_tmp_address; // store address\r
+ irmp_command = irmp_tmp_command; // store command\r
+ }\r
}\r
}\r
else\r
#if IRMP_SUPPORT_NEC_PROTOCOL == 1\r
if (irmp_param.protocol == IRMP_NEC_PROTOCOL && irmp_bit == 0) // repetition frame\r
{\r
- if (repetition_len < NEC_FRAME_REPEAT_PAUSE_LEN_MAX)\r
+ if (key_repetition_len < NEC_FRAME_REPEAT_PAUSE_LEN_MAX)\r
{\r
- ANALYZE_PRINTF ("Detected NEC repetition frame, repetition_len = %d\n", repetition_len);\r
+ ANALYZE_PRINTF ("Detected NEC repetition frame, key_repetition_len = %d\n", key_repetition_len);\r
+ ANALYZE_ONLY_NORMAL_PRINTF("REPETETION FRAME ");\r
irmp_tmp_address = last_irmp_address; // address is last address\r
irmp_tmp_command = last_irmp_command; // command is last command\r
irmp_flags |= IRMP_FLAG_REPETITION;\r
- repetition_len = 0;\r
+ key_repetition_len = 0;\r
}\r
else\r
{\r
- ANALYZE_PRINTF ("Detected NEC repetition frame, ignoring it: timeout occured, repetition_len = %d > %d\n",\r
- repetition_len, NEC_FRAME_REPEAT_PAUSE_LEN_MAX);\r
+ ANALYZE_PRINTF ("Detected NEC repetition frame, ignoring it: timeout occured, key_repetition_len = %d > %d\n",\r
+ key_repetition_len, NEC_FRAME_REPEAT_PAUSE_LEN_MAX);\r
irmp_ir_detected = FALSE;\r
}\r
}\r
#if IRMP_SUPPORT_KASEIKYO_PROTOCOL == 1\r
if (irmp_param.protocol == IRMP_KASEIKYO_PROTOCOL)\r
{\r
- uint8_t xor;\r
+ uint8_t xor_value;\r
// ANALYZE_PRINTF ("0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n",\r
// xor_check[0], xor_check[1], xor_check[2], xor_check[3], xor_check[4], xor_check[5]);\r
\r
- xor = (xor_check[0] & 0x0F) ^ ((xor_check[0] & 0xF0) >> 4) ^ (xor_check[1] & 0x0F) ^ ((xor_check[1] & 0xF0) >> 4);\r
+ xor_value = (xor_check[0] & 0x0F) ^ ((xor_check[0] & 0xF0) >> 4) ^ (xor_check[1] & 0x0F) ^ ((xor_check[1] & 0xF0) >> 4);\r
\r
- if (xor != (xor_check[2] & 0x0F))\r
+ if (xor_value != (xor_check[2] & 0x0F))\r
{\r
- ANALYZE_PRINTF ("error 4: wrong XOR check for customer id: 0x%1x 0x%1x\n", xor, xor_check[2] & 0x0F);\r
+ ANALYZE_PRINTF ("error 4: wrong XOR check for customer id: 0x%1x 0x%1x\n", xor_value, xor_check[2] & 0x0F);\r
irmp_ir_detected = FALSE;\r
}\r
\r
- xor = xor_check[2] ^ xor_check[3] ^ xor_check[4];\r
+ xor_value = xor_check[2] ^ xor_check[3] ^ xor_check[4];\r
\r
- if (xor != xor_check[5])\r
+ if (xor_value != 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_value, xor_check[5]);\r
irmp_ir_detected = FALSE;\r
}\r
+\r
+ irmp_flags |= genre2; // write the genre2 bits into MSB of the flag byte\r
}\r
#endif // IRMP_SUPPORT_KASEIKYO_PROTOCOL == 1\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
{\r
if (last_irmp_command == irmp_tmp_command &&\r
last_irmp_address == irmp_tmp_address &&\r
- repetition_len < IRMP_KEY_REPETITION_LEN)\r
+ key_repetition_len < IRMP_KEY_REPETITION_LEN)\r
{\r
irmp_flags |= IRMP_FLAG_REPETITION;\r
}\r
last_irmp_address = irmp_tmp_address; // store as last address, too\r
last_irmp_command = irmp_tmp_command; // store as last command, too\r
\r
- repetition_len = 0;\r
+ key_repetition_len = 0;\r
}\r
else\r
{\r
}\r
}\r
}\r
+\r
+#if defined(STELLARIS_ARM_CORTEX_M4)\r
+ // Clear the timer interrupt\r
+ TimerIntClear(TIMER1_BASE, TIMER_TIMA_TIMEOUT);\r
+#endif\r
+\r
return (irmp_ir_detected);\r
}\r
\r
static int analyze = FALSE;\r
static int list = FALSE;\r
static IRMP_DATA irmp_data;\r
+static int expected_protocol;\r
+static int expected_address;\r
+static int expected_command;\r
+static int do_check_expected_values;\r
\r
static void\r
next_tick (void)\r
\r
if (verbose)\r
{\r
- printf ("%8d ", time_counter);\r
+ printf ("%8.3fms ", (double) (time_counter * 1000) / F_INTERRUPTS);\r
}\r
\r
if (irmp_data.protocol == IRMP_FDC_PROTOCOL && (key = get_fdc_key (irmp_data.command)) != 0)\r
{\r
if ((key >= 0x20 && key < 0x7F) || key >= 0xA0)\r
{\r
- printf ("p = %2d, a = 0x%04x, c = 0x%04x, f = 0x%02x, asc = 0x%02x, key = '%c'\n",\r
- irmp_data.protocol, irmp_data.address, irmp_data.command, irmp_data.flags, key, key);\r
+ printf ("p=%2d (%s), a=0x%04x, c=0x%04x, f=0x%02x, asc=0x%02x, key='%c'",\r
+ irmp_data.protocol, irmp_protocol_names[irmp_data.protocol], irmp_data.address, irmp_data.command, irmp_data.flags, key, key);\r
}\r
else if (key == '\r' || key == '\t' || key == KEY_ESCAPE || (key >= 0x80 && key <= 0x9F)) // function keys\r
{\r
default : p = "<UNKNWON>"; break;\r
}\r
\r
- printf ("p = %2d, a = 0x%04x, c = 0x%04x, f = 0x%02x, asc = 0x%02x, key = %s\n",\r
- irmp_data.protocol, irmp_data.address, irmp_data.command, irmp_data.flags, key, p);\r
+ printf ("p=%2d (%s), a=0x%04x, c=0x%04x, f=0x%02x, asc=0x%02x, key=%s",\r
+ irmp_data.protocol, irmp_protocol_names[irmp_data.protocol], irmp_data.address, irmp_data.command, irmp_data.flags, key, p);\r
}\r
else\r
{\r
- printf ("p = %2d, a = 0x%04x, c = 0x%04x, f = 0x%02x, asc = 0x%02x\n",\r
- irmp_data.protocol, irmp_data.address, irmp_data.command, irmp_data.flags, key);\r
+ printf ("p=%2d (%s), a=0x%04x, c=0x%04x, f=0x%02x, asc=0x%02x",\r
+ irmp_data.protocol, irmp_protocol_names[irmp_data.protocol], irmp_data.address, irmp_data.command, irmp_data.flags, key);\r
}\r
}\r
else\r
{\r
- printf ("p = %2d, a = 0x%04x, c = 0x%04x, f = 0x%02x\n",\r
- irmp_data.protocol, irmp_data.address, irmp_data.command, irmp_data.flags);\r
+ printf ("p=%2d (%s), a=0x%04x, c=0x%04x, f=0x%02x",\r
+ irmp_data.protocol, irmp_protocol_names[irmp_data.protocol], irmp_data.address, irmp_data.command, irmp_data.flags);\r
+ }\r
+\r
+ if (do_check_expected_values)\r
+ {\r
+ if (irmp_data.protocol != expected_protocol ||\r
+ irmp_data.address != expected_address ||\r
+ irmp_data.command != expected_command)\r
+ {\r
+ printf ("\nerror 7: expected values differ: p=%2d (%s), a=0x%04x, c=0x%04x\n",\r
+ expected_protocol, irmp_protocol_names[expected_protocol], expected_address, expected_command);\r
+ }\r
+ else\r
+ {\r
+ printf (" checked!\n");\r
+ }\r
+ do_check_expected_values = FALSE; // only check 1st frame in a line!\r
+ }\r
+ else\r
+ {\r
+ putchar ('\n');\r
}\r
}\r
}\r
else if (ch == '\n')\r
{\r
IRMP_PIN = 0xff;\r
+ time_counter = 0;\r
\r
if (list && pause > 0)\r
{\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
}\r
else if (ch == '#')\r
{\r
+ time_counter = 0;\r
+\r
if (analyze)\r
{\r
while ((ch = getchar()) != '\n' && ch != EOF)\r
}\r
else\r
{\r
+ char buf[1024];\r
+ char * p;\r
+ int idx = -1;\r
+\r
puts ("-------------------------------------------------------------------");\r
putchar (ch);\r
\r
+\r
while ((ch = getchar()) != '\n' && ch != EOF)\r
{\r
if (ch != '\r') // ignore CR in DOS/Windows files\r
{\r
+ if (ch == '[' && idx == -1)\r
+ {\r
+ idx = 0;\r
+ }\r
+ else if (idx >= 0)\r
+ {\r
+ if (ch == ']')\r
+ {\r
+ do_check_expected_values = FALSE;\r
+ buf[idx] = '\0';\r
+ idx = -1;\r
+\r
+ expected_protocol = atoi (buf);\r
+\r
+ if (expected_protocol > 0)\r
+ {\r
+ p = buf;\r
+ while (*p)\r
+ {\r
+ if (*p == 'x')\r
+ {\r
+ p++;\r
+\r
+ if (sscanf (p, "%x", &expected_address) == 1)\r
+ {\r
+ do_check_expected_values = TRUE;\r
+ }\r
+ break;\r
+ }\r
+ p++;\r
+ }\r
+\r
+ if (do_check_expected_values)\r
+ {\r
+ do_check_expected_values = FALSE;\r
+\r
+ while (*p)\r
+ {\r
+ if (*p == 'x')\r
+ {\r
+ p++;\r
+\r
+ if (sscanf (p, "%x", &expected_command) == 1)\r
+ {\r
+ do_check_expected_values = TRUE;\r
+ }\r
+ break;\r
+ }\r
+ p++;\r
+ }\r
+\r
+ if (do_check_expected_values)\r
+ {\r
+ // printf ("!%2d %04x %04x!\n", expected_protocol, expected_address, expected_command);\r
+ }\r
+ }\r
+ }\r
+ }\r
+ else if (idx < 1024 - 2)\r
+ {\r
+ buf[idx++] = ch;\r
+ }\r
+ }\r
putchar (ch);\r
}\r
}\r
projects / irmp.git / blobdiff