Version 2.6.9: corrected some minor definition errors

[irmp.git] / irmpprotocols.h

diff --git a/irmpprotocols.h b/irmpprotocols.h
index a222be29f33d0a69068b512cac93879aee05c02d..c04fd436e8bb77b41b56e1a35e5f505fcc77758c 100644 (file)
--- a/irmpprotocols.h
+++ b/irmpprotocols.h
@@ -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-2014 Frank Meyer - frank(at)fli4l.de\r
  *\r
- * $Id: irmpprotocols.h,v 1.23 2014/06/05 21:00:06 fm Exp $\r
+ * $Id: irmpprotocols.h,v 1.29 2015/01/19 10:54:37 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
@@ -64,10 +64,13 @@
 #define IRMP_RCMM24_PROTOCOL                    37              // Fujitsu-Siemens (Activy keyboard)\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\r
-#define IRMP_RADIO1_PROTOCOL                    41              // Radio protocol (devel status), do not use it yet!\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
 \r
-#define IRMP_N_PROTOCOLS                        41              // number of supported protocols\r
+#define IRMP_RADIO1_PROTOCOL                    43              // Radio protocol (experimental status), do not use it yet!\r
+\r
+#define IRMP_N_PROTOCOLS                        43              // number of supported protocols\r
 \r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
  * timing constants:\r
@@ -161,7 +164,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 +188,17 @@ 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                        2                               // SAMSUNG32 sends each frame 2 times // fm: correct?\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
  * MATSUSHITA:\r
  *---------------------------------------------------------------------------------------------------------------------------------------------------\r
@@ -671,6 +681,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                         // 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