*\r
* DO NOT INCLUDE THIS FILE, WILL BE INCLUDED BY IRMP.H or IRSND.H!\r
*\r
- * Copyright (c) 2013 Frank Meyer - frank(at)fli4l.de\r
+ * Copyright (c) 2013-2015 Frank Meyer - frank(at)fli4l.de\r
*\r
- * $Id: irmpprotocols.h,v 1.25 2014/07/09 14:45:56 fm Exp $\r
+ * $Id: irmpprotocols.h,v 1.32 2015/04/23 12:46:13 fm Exp $\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
#define IRMP_SPEAKER_PROTOCOL 39 // Another loudspeaker protocol, similar to Nubert\r
#define IRMP_LGAIR_PROTOCOL 40 // LG air conditioner\r
#define IRMP_SAMSUNG48_PROTOCOL 41 // air conditioner with SAMSUNG protocol (48 bits)\r
+#define IRMP_MERLIN_PROTOCOL 42 // Merlin (Pollin 620 185)\r
+#define IRMP_PENTAX_PROTOCOL 43 // Pentax camera\r
+#define IRMP_RADIO1_PROTOCOL 44 // Radio protocol (experimental status), do not use it yet!\r
\r
-#define IRMP_RADIO1_PROTOCOL 42 // Radio protocol (experimental status), do not use it yet!\r
-\r
-#define IRMP_N_PROTOCOLS 42 // number of supported protocols\r
+#define IRMP_N_PROTOCOLS 44 // number of supported protocols\r
\r
/*---------------------------------------------------------------------------------------------------------------------------------------------------\r
* timing constants:\r
*---------------------------------------------------------------------------------------------------------------------------------------------------\r
*/\r
#define RC5_BIT_TIME 889.0e-6 // 889 usec pulse/pause\r
-#define RC5_FRAME_REPEAT_PAUSE_TIME 45.0e-3 // frame repeat after 45ms\r
+#define RC5_FRAME_REPEAT_PAUSE_TIME 88.9e-3 // frame repeat after 88.9ms\r
\r
#define RC5_ADDRESS_OFFSET 1 // skip 1 bit (2nd start)\r
#define RC5_ADDRESS_LEN 6 // read 1 toggle bit (for key repetition detection) + 5 address bits\r
#define A1TVBOX_COMPLETE_DATA_LEN 17 // complete length incl. start bit\r
#define A1TVBOX_FRAME_REPEAT_PAUSE_TIME 50.0e-3 // 50 msec pause between frames, don't know if it is correct\r
\r
+/*---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ * MERLIN:\r
+ * See notes for A1TVBOX\r
+ *---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ */\r
+#define MERLIN_START_BIT_PULSE_TIME 210.0e-6 // 300 usec pulse\r
+#define MERLIN_START_BIT_PAUSE_TIME 420.0e-6 // 340 usec pause\r
+#define MERLIN_BIT_PULSE_TIME 210.0e-6 // 250 usec pulse\r
+#define MERLIN_BIT_PAUSE_TIME 210.0e-6 // 150 usec pulse\r
+#define MERLIN_STOP_BIT 0 // has no stop bit\r
+#define MERLIN_LSB 0 // MSB...LSB\r
+#define MERLIN_FLAGS (IRMP_PARAM_FLAG_IS_MANCHESTER | IRMP_PARAM_FLAG_1ST_PULSE_IS_1 ) // flags\r
+#define MERLIN_FRAMES 1 // MERLIN sends each frame 1 times\r
+#define MERLIN_ADDRESS_OFFSET 1 // skip 1 bits\r
+#define MERLIN_ADDRESS_LEN 8 // read 8 address bits\r
+#define MERLIN_COMMAND_OFFSET 8 // skip 9 bits (start bit + address)\r
+#define MERLIN_COMMAND_LEN 10 // read 8 command bits\r
+#define MERLIN_COMPLETE_DATA_LEN 19 // complete length incl. start bit\r
+#define MERLIN_FRAME_REPEAT_PAUSE_TIME 50.0e-3 // 50 msec pause between frames, don't know if it is correct\r
+\r
/*---------------------------------------------------------------------------------------------------------------------------------------------------\r
* ORTEK (Hama): 6 address bits + 2 frame type bits + 6 command bits + 1 parity bit + 1 unknown bit + "1" + "0"\r
*---------------------------------------------------------------------------------------------------------------------------------------------------\r
\r
#define RCMM32_FRAME_REPEAT_PAUSE_TIME 80.0e-3 // frame repeat after 80 ms\r
#define RCMM32_ADDRESS_OFFSET 0 // skip 0 bits\r
-#define RCMM32_ADDRESS_LEN 16 // read 16 address bits\r
+#define RCMM32_ADDRESS_LEN 16 // read 16 address bits\r
#define RCMM32_COMMAND_OFFSET 17 // skip 17 bits\r
#define RCMM32_COMMAND_LEN 15 // read 15 bits\r
#define RCMM32_COMPLETE_DATA_LEN 32 // complete length\r
#define RCMM32_LSB 0 // LSB...MSB\r
#define RCMM32_FLAGS 0 // flags\r
\r
+/*---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ * PENTAX:\r
+ *---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ */\r
+#define PENTAX_START_BIT_PULSE_TIME 13000.0e-6 // 13 msec pulse\r
+#define PENTAX_START_BIT_PAUSE_TIME 3000.0e-6 // 3 msec pause\r
+#define PENTAX_PULSE_TIME 1000.0e-6 // 1 msec pulse\r
+#define PENTAX_1_PAUSE_TIME 3000.0e-6 // 3 msec pause\r
+#define PENTAX_0_PAUSE_TIME 1000.0e-6 // 1 msec pause\r
+#define PENTAX_FRAME_REPEAT_PAUSE_TIME 60.0e-3 // frame repeat after 60ms\r
+#define PENTAX_ADDRESS_OFFSET 0 // skip 0 bits\r
+#define PENTAX_ADDRESS_LEN 0 // read 0 address bits\r
+#define PENTAX_COMMAND_OFFSET 0 // skip 0 bits\r
+#define PENTAX_COMMAND_LEN 6 // read 6 bits\r
+#define PENTAX_COMPLETE_DATA_LEN 6 // complete length\r
+#define PENTAX_STOP_BIT 1 // has stop bit\r
+#define PENTAX_LSB 0 // LSB...MSB\r
+#define PENTAX_FLAGS 0 // flags\r
+\r
/*---------------------------------------------------------------------------------------------------------------------------------------------------\r
* RADIO1 - e.g. Tevion\r
*---------------------------------------------------------------------------------------------------------------------------------------------------\r
*/\r
-#define RADIO1_START_BIT_PULSE_TIME 3000.0e-6 // 3000 usec pulse\r
-#define RADIO1_START_BIT_PAUSE_TIME 7000.0e-6 // 7000 usec pulse\r
-#define RADIO1_0_PULSE_TIME 500.0e-6 // 500 usec pulse\r
-#define RADIO1_0_PAUSE_TIME 1000.0e-6 // 1000 usec pause\r
-#define RADIO1_1_PULSE_TIME 1000.0e-6 // 1000 usec pulse\r
-#define RADIO1_1_PAUSE_TIME 500.0e-6 // 500 usec pause\r
-\r
-#define RADIO1_FRAME_REPEAT_PAUSE_TIME 25.0e-3 // frame repeat after 25ms\r
-#define RADIO1_ADDRESS_OFFSET 4 // skip 4 bits\r
-#define RADIO1_ADDRESS_LEN 16 // read 16 address bits\r
-#define RADIO1_COMMAND_OFFSET 20 // skip 4 + 16 bits\r
-#define RADIO1_COMMAND_LEN 3 // read 3 command bits\r
-#define RADIO1_COMPLETE_DATA_LEN 23 // complete length\r
-#define RADIO1_STOP_BIT 1 // has stop bit\r
-#define RADIO1_LSB 1 // LSB...MSB?\r
-#define RADIO1_FLAGS 0 // flags\r
+#define RADIO1_START_BIT_PULSE_TIME 3000.0e-6 // 3000 usec pulse\r
+#define RADIO1_START_BIT_PAUSE_TIME 7000.0e-6 // 7000 usec pulse\r
+#define RADIO1_0_PULSE_TIME 500.0e-6 // 500 usec pulse\r
+#define RADIO1_0_PAUSE_TIME 1000.0e-6 // 1000 usec pause\r
+#define RADIO1_1_PULSE_TIME 1000.0e-6 // 1000 usec pulse\r
+#define RADIO1_1_PAUSE_TIME 500.0e-6 // 500 usec pause\r
+\r
+#define RADIO1_FRAME_REPEAT_PAUSE_TIME 25.0e-3 // frame repeat after 25ms\r
+#define RADIO1_ADDRESS_OFFSET 4 // skip 4 bits\r
+#define RADIO1_ADDRESS_LEN 16 // read 16 address bits\r
+#define RADIO1_COMMAND_OFFSET 20 // skip 4 + 16 bits\r
+#define RADIO1_COMMAND_LEN 3 // read 3 command bits\r
+#define RADIO1_COMPLETE_DATA_LEN 23 // complete length\r
+#define RADIO1_STOP_BIT 1 // has stop bit\r
+#define RADIO1_LSB 1 // LSB...MSB?\r
+#define RADIO1_FLAGS 0 // flags\r
\r
/*---------------------------------------------------------------------------------------------------------------------------------------------------\r
* Frame Repetitions:\r