]> cloudbase.mooo.com Git - irmp.git/blobdiff - irmpprotocols.h
Merge branch 'libopencm3' of cu.loc:git/irmp into libopencm3
[irmp.git] / irmpprotocols.h
index ad0abb0e7739bbe50b3474e26ea9468d026773a3..72618d9587b88a3e734a3d2f7db06ea03e323716 100644 (file)
@@ -3,9 +3,9 @@
  *\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-2016 Frank Meyer - frank(at)fli4l.de\r
  *\r
- * $Id: irmpprotocols.h,v 1.24 2014/06/06 09:58:32 fm Exp $\r
+ * $Id: irmpprotocols.h,v 1.48 2017/02/17 09:13:06 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_RCMM12_PROTOCOL                    38              // Fujitsu-Siemens (Activy keyboard)\r
 #define IRMP_SPEAKER_PROTOCOL                   39              // Another loudspeaker protocol, similar to Nubert\r
 #define IRMP_LGAIR_PROTOCOL                     40              // LG air conditioner\r
-#define IRMP_RADIO1_PROTOCOL                    41              // Radio protocol (experimental status), do not use it yet!\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_FAN_PROTOCOL                       44              // FAN (ventilator), very similar to NUBERT, but last bit is data bit instead of stop bit\r
+#define IRMP_S100_PROTOCOL                      45              // very similar to RC5, but 14 instead of 13 data bits\r
+#define IRMP_ACP24_PROTOCOL                     46              // Stiebel Eltron ACP24 air conditioner\r
+#define IRMP_TECHNICS_PROTOCOL                  47              // Technics, similar to Matsushita, but 22 instead of 24 bits\r
+#define IRMP_PANASONIC_PROTOCOL                 48              // Panasonic (Beamer), start bits similar to KASEIKYO\r
+#define IRMP_MITSU_HEAVY_PROTOCOL               49              // Mitsubishi-Heavy Aircondition, similar timing as Panasonic beamer\r
+#define IRMP_VINCENT_PROTOCOL                   50              // Vincent\r
+#define IRMP_SAMSUNGAH_PROTOCOL                 51              // Vincent\r
 \r
-#define IRMP_N_PROTOCOLS                        41              // number of supported protocols\r
+#define IRMP_RADIO1_PROTOCOL                    52              // Radio protocol (experimental status), do not use it yet!\r
+\r
+#define IRMP_N_PROTOCOLS                        53              // number of supported protocols\r
 \r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
  * timing constants:\r
@@ -77,7 +89,7 @@
 #define IRMP_TIMEOUT_TIME                       15500.0e-6                  // timeout after 15.5 ms darkness\r
 #define IRMP_TIMEOUT_TIME_MS                    15500L                      // timeout after 15.5 ms darkness\r
 \r
-#if IRMP_SUPPORT_NIKON_PROTOCOL == 1\r
+#if defined(IRMP_SUPPORT_NIKON_PROTOCOL) && (IRMP_SUPPORT_NIKON_PROTOCOL == 1)\r
 #  define IRMP_TIMEOUT_NIKON_TIME               29500.0e-6                  // 2nd timeout after 29.5 ms darkness (only for NIKON!)\r
 #  define IRMP_TIMEOUT_NIKON_TIME_MS            29500L                      // 2nd timeout after 29.5 ms darkness\r
 typedef uint16_t    PAUSE_LEN;\r
@@ -161,7 +173,7 @@ typedef uint8_t     PAUSE_LEN;
 #define NEC16_COMPLETE_DATA_LEN                 16                              // complete length\r
 \r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
- * SAMSUNG & SAMSUNG32:\r
+ * SAMSUNG & SAMSUNG32 & SAMSUNG48:\r
  *---------------------------------------------------------------------------------------------------------------------------------------------------\r
  */\r
 #define SAMSUNG_START_BIT_PULSE_TIME            4500.0e-6                       // 4500 usec pulse\r
@@ -185,10 +197,36 @@ typedef uint8_t     PAUSE_LEN;
 #define SAMSUNG32_COMMAND_OFFSET                16                              // skip 16 bits\r
 #define SAMSUNG32_COMMAND_LEN                   16                              // read 16 command bits\r
 #define SAMSUNG32_COMPLETE_DATA_LEN             32                              // complete length\r
-#define SAMSUNG32_FRAMES                        1                               // SAMSUNG32 sends each frame 1 times\r
+#define SAMSUNG32_FRAMES                        1                               // SAMSUNG32 sends one frame\r
 #define SAMSUNG32_AUTO_REPETITION_PAUSE_TIME    47.0e-3                         // repetition after 47 ms\r
 #define SAMSUNG32_FRAME_REPEAT_PAUSE_TIME       47.0e-3                         // frame repeat after 47ms\r
 \r
+#define SAMSUNG48_COMMAND_OFFSET                16                              // skip 16 bits\r
+#define SAMSUNG48_COMMAND_LEN                   32                              // read 32 command bits\r
+#define SAMSUNG48_COMPLETE_DATA_LEN             48                              // complete length\r
+#define SAMSUNG48_FRAMES                        2                               // SAMSUNG48 sends each frame 2 times\r
+#define SAMSUNG48_AUTO_REPETITION_PAUSE_TIME    5.0e-3                          // repetition after 5 ms\r
+#define SAMSUNG48_FRAME_REPEAT_PAUSE_TIME       47.0e-3                         // frame repeat after 47ms\r
+\r
+/*---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ * SAMSUNGAH:\r
+ *---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ */\r
+#define SAMSUNGAH_START_BIT_PULSE_TIME          2500.0e-6                       // 2500 usec pulse\r
+#define SAMSUNGAH_START_BIT_PAUSE_TIME          1900.0e-6                       // 1900 usec pause\r
+#define SAMSUNGAH_PULSE_TIME                     450.0e-6                       //  450 usec pulse\r
+#define SAMSUNGAH_1_PAUSE_TIME                  1100.0e-6                       // 1100 usec pause\r
+#define SAMSUNGAH_0_PAUSE_TIME                   450.0e-6                       //  450 usec pause\r
+#define SAMSUNGAH_FRAME_REPEAT_PAUSE_TIME         40.0e-3                       // frame repeat after 40ms\r
+#define SAMSUNGAH_ADDRESS_OFFSET                 0                              // skip 0 bits\r
+#define SAMSUNGAH_ADDRESS_LEN                   16                              // read 16 address bits, ignore 17..31\r
+#define SAMSUNGAH_COMMAND_OFFSET                32                              // skip 32 bits\r
+#define SAMSUNGAH_COMMAND_LEN                   16                              // read 32 bits\r
+#define SAMSUNGAH_COMPLETE_DATA_LEN             48                              // complete length\r
+#define SAMSUNGAH_STOP_BIT                      1                               // has stop bit\r
+#define SAMSUNGAH_LSB                           1                               // LSB...MSB?\r
+#define SAMSUNGAH_FLAGS                         0                               // flags\r
+\r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
  * MATSUSHITA:\r
  *---------------------------------------------------------------------------------------------------------------------------------------------------\r
@@ -208,6 +246,14 @@ typedef uint8_t     PAUSE_LEN;
 #define MATSUSHITA_LSB                          1                               // LSB...MSB?\r
 #define MATSUSHITA_FLAGS                        0                               // flags\r
 \r
+/*---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ * TECHNICS: same timings as MATSUSHITA\r
+ *---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ */\r
+#define TECHNICS_ADDRESS_LEN                    0                               // read 0 address bits\r
+#define TECHNICS_COMMAND_LEN                    11                              // read 11 bits\r
+#define TECHNICS_COMPLETE_DATA_LEN              22                              // complete length\r
+\r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
  * KASEIKYO:\r
  *---------------------------------------------------------------------------------------------------------------------------------------------------\r
@@ -226,9 +272,70 @@ typedef uint8_t     PAUSE_LEN;
 #define KASEIKYO_COMPLETE_DATA_LEN              48                              // complete length\r
 #define KASEIKYO_STOP_BIT                       1                               // has stop bit\r
 #define KASEIKYO_LSB                            1                               // LSB...MSB?\r
-#define KASEIKYO_FRAMES                         2                               // KASEIKYO sends 1st frame 2 times\r
+#define KASEIKYO_FRAMES                         1                               // KASEIKYO sends 1 frame\r
 #define KASEIKYO_FLAGS                          0                               // flags\r
 \r
+/*---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ * PANASONIC (Beamer), start bit timings similar to KASEIKYO\r
+ *---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ */\r
+#define PANASONIC_START_BIT_PULSE_TIME           3600.0e-6                      // 3600 usec pulse\r
+#define PANASONIC_START_BIT_PAUSE_TIME           1600.0e-6                      // 1690 usec pause\r
+#define PANASONIC_PULSE_TIME                      565.0e-6                      //  565 usec pulse\r
+#define PANASONIC_1_PAUSE_TIME                   1140.0e-6                      // 1140 usec pause\r
+#define PANASONIC_0_PAUSE_TIME                    316.0e-6                      //  316 usec pause\r
+#define PANASONIC_AUTO_REPETITION_PAUSE_TIME       40.0e-3                      // repetition after 40 ms?\r
+#define PANASONIC_FRAME_REPEAT_PAUSE_TIME          40.0e-3                      // frame repeat after 40 ms\r
+#define PANASONIC_ADDRESS_OFFSET                 24                             // skip 24 bits: 010000000000010000000001\r
+#define PANASONIC_ADDRESS_LEN                    16                             // read 16 address bits\r
+#define PANASONIC_COMMAND_OFFSET                 40                             // skip 40 bits\r
+#define PANASONIC_COMMAND_LEN                    16                             // read 16 command bits\r
+#define PANASONIC_COMPLETE_DATA_LEN              56                             // complete length\r
+#define PANASONIC_STOP_BIT                       1                              // has stop bit\r
+#define PANASONIC_LSB                            1                              // LSB...MSB?\r
+#define PANASONIC_FRAMES                         1                              // PANASONIC sends 1 frame\r
+#define PANASONIC_FLAGS                          0                              // flags\r
+\r
+/*---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ * MITSUBISHI-Heavy Aircondition, timings similar to PANASONIC beamer\r
+ *---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ */\r
+#define MITSU_HEAVY_START_BIT_PULSE_TIME          3200.0e-6                     // 3600 usec pulse\r
+#define MITSU_HEAVY_START_BIT_PAUSE_TIME          1560.0e-6                     // 1690 usec pause\r
+#define MITSU_HEAVY_PULSE_TIME                     400.0e-6                     //  565 usec pulse\r
+#define MITSU_HEAVY_1_PAUSE_TIME                  1200.0e-6                     // 1140 usec pause\r
+#define MITSU_HEAVY_0_PAUSE_TIME                   430.0e-6                     //  316 usec pause\r
+#define MITSU_HEAVY_FRAME_REPEAT_PAUSE_TIME         40.0e-3                     // frame repeat after 40 ms\r
+#define MITSU_HEAVY_ADDRESS_OFFSET                 40                           // skip 24 bits: 010000000000010000000001\r
+#define MITSU_HEAVY_ADDRESS_LEN                    16                           // read 16 address bits\r
+#define MITSU_HEAVY_COMMAND_OFFSET                 56                           // skip 40 bits\r
+#define MITSU_HEAVY_COMMAND_LEN                    16                           // read 16 command bits\r
+#define MITSU_HEAVY_COMPLETE_DATA_LEN              88                           // complete length\r
+#define MITSU_HEAVY_STOP_BIT                       1                            // has stop bit\r
+#define MITSU_HEAVY_LSB                            0                            // LSB...MSB?\r
+#define MITSU_HEAVY_FRAMES                         1                            // PANASONIC sends 1 frame\r
+#define MITSU_HEAVY_FLAGS                          0                            // flags\r
+\r
+/*---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ * VINCENT\r
+ *---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ */\r
+#define VINCENT_START_BIT_PULSE_TIME            2500.0e-6                       // 2500 usec pulse\r
+#define VINCENT_START_BIT_PAUSE_TIME            4600.0e-6                       // 4600 usec pause\r
+#define VINCENT_PULSE_TIME                       550.0e-6                       //  550 usec pulse\r
+#define VINCENT_1_PAUSE_TIME                    1540.0e-6                       // 1540 usec pause\r
+#define VINCENT_0_PAUSE_TIME                     550.0e-6                       //  550 usec pause\r
+#define VINCENT_FRAME_REPEAT_PAUSE_TIME           40.0e-3                       // frame repeat after 40 ms ?\r
+#define VINCENT_ADDRESS_OFFSET                     0                            // skip 0 bits\r
+#define VINCENT_ADDRESS_LEN                       16                            // read 16 address bits\r
+#define VINCENT_COMMAND_OFFSET                    16                            // skip 16 bits\r
+#define VINCENT_COMMAND_LEN                       16                            // read 16 command bits\r
+#define VINCENT_COMPLETE_DATA_LEN                 32                            // complete length\r
+#define VINCENT_STOP_BIT                           1                            // has stop bit\r
+#define VINCENT_LSB                                0                            // LSB...MSB?\r
+#define VINCENT_FRAMES                             1                            // VINCENT sends 1 frame\r
+#define VINCENT_FLAGS                              0                            // flags\r
+\r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
  * RECS80:\r
  *---------------------------------------------------------------------------------------------------------------------------------------------------\r
@@ -253,7 +360,7 @@ typedef uint8_t     PAUSE_LEN;
  *---------------------------------------------------------------------------------------------------------------------------------------------------\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
@@ -264,6 +371,22 @@ typedef uint8_t     PAUSE_LEN;
 #define RC5_LSB                                 0                               // MSB...LSB\r
 #define RC5_FLAGS                               IRMP_PARAM_FLAG_IS_MANCHESTER   // flags\r
 \r
+/*---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ * S100: very similar to RC5, but 14 insted of 13 bits\r
+ *---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ */\r
+#define S100_BIT_TIME                             889.0e-6                       // 889 usec pulse/pause\r
+#define S100_FRAME_REPEAT_PAUSE_TIME               88.9e-3                       // frame repeat after 88.9ms\r
+\r
+#define S100_ADDRESS_OFFSET                      1                               // skip 1 bit (2nd start)\r
+#define S100_ADDRESS_LEN                         6                               // read 1 toggle bit (for key repetition detection) + 5 address bits\r
+#define S100_COMMAND_OFFSET                      7                               // skip 5 bits (2nd start + 1 toggle + 5 address)\r
+#define S100_COMMAND_LEN                         7                               // read 7 command bits\r
+#define S100_COMPLETE_DATA_LEN                   14                              // complete length\r
+#define S100_STOP_BIT                            0                               // has no stop bit\r
+#define S100_LSB                                 0                               // MSB...LSB\r
+#define S100_FLAGS                               IRMP_PARAM_FLAG_IS_MANCHESTER   // flags\r
+\r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
  * DENON:\r
  *---------------------------------------------------------------------------------------------------------------------------------------------------\r
@@ -272,8 +395,8 @@ typedef uint8_t     PAUSE_LEN;
 #define DENON_1_PAUSE_TIME                      1780.0e-6                       // 1780 usec pause in practice, 1900 in theory\r
 #define DENON_0_PAUSE_TIME                       745.0e-6                       //  745 usec pause in practice,  775 in theory\r
 #define DENON_FRAMES                            2                               // DENON sends each frame 2 times\r
-#define DENON_AUTO_REPETITION_PAUSE_TIME          65.0e-3                       // inverted repetition after 65ms\r
-#define DENON_FRAME_REPEAT_PAUSE_TIME            130.0e-3                       // frame repeat after 2 * 65ms\r
+#define DENON_AUTO_REPETITION_PAUSE_TIME          45.0e-3                       // inverted repetition after 45ms\r
+#define DENON_FRAME_REPEAT_PAUSE_TIME             45.0e-3                       // frame repeat after 45ms\r
 #define DENON_ADDRESS_OFFSET                    0                               // skip 0 bits\r
 #define DENON_ADDRESS_LEN                       5                               // read 5 address bits\r
 #define DENON_COMMAND_OFFSET                    5                               // skip 5\r
@@ -290,7 +413,9 @@ typedef uint8_t     PAUSE_LEN;
 #define RC6_START_BIT_PULSE_TIME                2666.0e-6                       // 2.666 msec pulse\r
 #define RC6_START_BIT_PAUSE_TIME                 889.0e-6                       // 889 usec pause\r
 #define RC6_TOGGLE_BIT_TIME                      889.0e-6                       // 889 msec pulse/pause\r
-#define RC6_BIT_TIME                             444.0e-6                       // 889 usec pulse/pause\r
+#define RC6_BIT_TIME                             444.0e-6                       // 444 usec pulse/pause\r
+#define RC6_BIT_2_TIME                           889.0e-6                       // 889 usec pulse/pause\r
+#define RC6_BIT_3_TIME                          1333.0e-6                       // 1333 usec pulse/pause\r
 #define RC6_FRAME_REPEAT_PAUSE_TIME               45.0e-3                       // frame repeat after 45ms\r
 #define RC6_ADDRESS_OFFSET                      5                               // skip "1" + 3 mode bits + 1 toggle bit\r
 #define RC6_ADDRESS_LEN                         8                               // read 8 address bits\r
@@ -343,17 +468,43 @@ typedef uint8_t     PAUSE_LEN;
 #define NUBERT_LSB                              0                               // MSB?\r
 #define NUBERT_FLAGS                            0                               // flags\r
 \r
+/*---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ * FAN: (ventilator)\r
+ *\r
+ * Similar to NUBERT, but\r
+ *   - has data bit instead of stop bit\r
+ *   - has NO frame repetition\r
+ *---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ */\r
+#define FAN_START_BIT_PULSE_TIME                1280.0e-6                       // 1280 usec pulse\r
+#define FAN_START_BIT_PAUSE_TIME                 380.0e-6                       //  380 usec pause\r
+#define FAN_1_PULSE_TIME                        1280.0e-6                       // 1280 usec pulse\r
+#define FAN_1_PAUSE_TIME                         380.0e-6                       //  380 usec pause\r
+#define FAN_0_PULSE_TIME                         380.0e-6                       //  380 usec pulse\r
+#define FAN_0_PAUSE_TIME                        1280.0e-6                       // 1280 usec pause\r
+#define FAN_FRAMES                              1                               // FAN sends only 1 frame (NUBERT sends 2)\r
+#define FAN_AUTO_REPETITION_PAUSE_TIME            6.6e-3                        // auto repetition after 6.6ms\r
+#define FAN_FRAME_REPEAT_PAUSE_TIME               6.6e-3                        // frame repeat after 6.6ms\r
+#define FAN_ADDRESS_OFFSET                      0                               // skip 0 bits\r
+#define FAN_ADDRESS_LEN                         0                               // read 0 address bits\r
+#define FAN_COMMAND_OFFSET                      0                               // skip 0 bits\r
+#define FAN_COMMAND_LEN                         11                              // read 10 bits\r
+#define FAN_COMPLETE_DATA_LEN                   11                              // complete length\r
+#define FAN_STOP_BIT                            0                               // has NO stop bit (fm: this seems to be wrong)\r
+#define FAN_LSB                                 0                               // MSB\r
+#define FAN_FLAGS                               0                               // flags\r
+\r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
  * SPEAKER:\r
  *---------------------------------------------------------------------------------------------------------------------------------------------------\r
  */\r
-#define SPEAKER_START_BIT_PULSE_TIME             440.0e-6                       // 1340 usec pulse\r
-#define SPEAKER_START_BIT_PAUSE_TIME            1250.0e-6                       //  340 usec pause\r
-#define SPEAKER_1_PULSE_TIME                    1250.0e-6                       // 1340 usec pulse\r
-#define SPEAKER_1_PAUSE_TIME                     440.0e-6                       //  340 usec pause\r
-#define SPEAKER_0_PULSE_TIME                     440.0e-6                       //  500 usec pulse\r
-#define SPEAKER_0_PAUSE_TIME                    1250.0e-6                       // 1300 usec pause\r
-#define SPEAKER_FRAMES                          2                               // Nubert sends 2 frames\r
+#define SPEAKER_START_BIT_PULSE_TIME             440.0e-6                       //  440 usec pulse\r
+#define SPEAKER_START_BIT_PAUSE_TIME            1250.0e-6                       // 1250 usec pause\r
+#define SPEAKER_1_PULSE_TIME                    1250.0e-6                       // 1250 usec pulse\r
+#define SPEAKER_1_PAUSE_TIME                     440.0e-6                       //  440 usec pause\r
+#define SPEAKER_0_PULSE_TIME                     440.0e-6                       //  440 usec pulse\r
+#define SPEAKER_0_PAUSE_TIME                    1250.0e-6                       // 1250 usec pause\r
+#define SPEAKER_FRAMES                          2                               // SPEAKER sends 2 frames\r
 #define SPEAKER_AUTO_REPETITION_PAUSE_TIME        35.0e-3                       // auto repetition after 35ms\r
 #define SPEAKER_FRAME_REPEAT_PAUSE_TIME           35.0e-3                       // frame repeat after 45ms\r
 #define SPEAKER_ADDRESS_OFFSET                  0                               // skip 0 bits\r
@@ -636,7 +787,9 @@ typedef uint8_t     PAUSE_LEN;
 #define BOSE_PULSE_TIME                          550.0e-6                       //  550 usec pulse\r
 #define BOSE_1_PAUSE_TIME                       1425.0e-6                       // 1425 usec pause\r
 #define BOSE_0_PAUSE_TIME                        437.0e-6                       //  437 usec pause\r
-#define BOSE_FRAME_REPEAT_PAUSE_TIME              40.0e-3                       // frame repeat after 40ms???\r
+#define BOSE_FRAMES                             1\r
+#define BOSE_AUTO_REPETITION_PAUSE_TIME           40.0e-3                       // repetition after 40ms?\r
+#define BOSE_FRAME_REPEAT_PAUSE_TIME              40.0e-3                       // frame repeat after 40ms?\r
 #define BOSE_ADDRESS_OFFSET                      0                              // skip 0 bits\r
 #define BOSE_ADDRESS_LEN                         0                              // read 16 address bits\r
 #define BOSE_COMMAND_OFFSET                      0                              // skip 16 bits (8 address + 8 /address)\r
@@ -671,6 +824,26 @@ typedef uint8_t     PAUSE_LEN;
 #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                         // 210 usec pulse\r
+#define MERLIN_START_BIT_PAUSE_TIME            420.0e-6                         // 429 usec pause\r
+#define MERLIN_BIT_PULSE_TIME                  210.0e-6                         // 210 usec pulse\r
+#define MERLIN_BIT_PAUSE_TIME                  210.0e-6                         // 210 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
@@ -723,7 +896,7 @@ typedef uint8_t     PAUSE_LEN;
 #define ROOMBA_COMMAND_OFFSET                    0                              // skip 0 bits\r
 #define ROOMBA_COMMAND_LEN                       7                              // read 7 bits\r
 #define ROOMBA_COMPLETE_DATA_LEN                 7                              // complete length\r
-#define ROOMBA_STOP_BIT                         0                               // has stop bit\r
+#define ROOMBA_STOP_BIT                         0                               // has stop bit (fm: sure?)\r
 #define ROOMBA_LSB                              0                               // MSB...LSB\r
 #define ROOMBA_FLAGS                            0                               // flags\r
 #define ROOMBA_FRAMES                           8                               // ROOMBA sends 8 frames (this is a lie, but more comfortable)\r
@@ -742,7 +915,7 @@ typedef uint8_t     PAUSE_LEN;
 \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
@@ -750,26 +923,64 @@ typedef uint8_t     PAUSE_LEN;
 #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
+ * ACP24: Stiebel Eltron ACP24 air conditioner\r
+ *---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ */\r
+#define ACP24_START_BIT_PULSE_TIME               390.0e-6                       //  390 usec pulse\r
+#define ACP24_START_BIT_PAUSE_TIME               950.0e-6                       //  950 usec pause\r
+#define ACP24_PULSE_TIME                         390.0e-6                       //  390 usec pulse\r
+#define ACP24_1_PAUSE_TIME                      1300.0e-6                       // 1300 usec pause\r
+#define ACP24_0_PAUSE_TIME                       950.0e-6                       //  950 usec pause\r
+#define ACP24_FRAME_REPEAT_PAUSE_TIME             22.0e-3                       // frame repeat after 22ms?\r
+#define ACP24_ADDRESS_OFFSET                     0                              // skip 0 bits\r
+#define ACP24_ADDRESS_LEN                        0                              // read 6 address bits\r
+#define ACP24_COMMAND_OFFSET                     0                              // skip 6 bits\r
+#define ACP24_COMMAND_LEN                        0                              // read 0 bits (70 bits will be read and compressed by special routine)\r
+#define ACP24_COMPLETE_DATA_LEN                 70                              // complete length\r
+#define ACP24_STOP_BIT                          1                               // has stop bit\r
+#define ACP24_LSB                               0                               // LSB...MSB\r
+#define ACP24_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