Version 2.8.0: port to AVR XMEGA

[irmp.git] / irmpprotocols.h

diff --git a/irmpprotocols.h b/irmpprotocols.h
index 05c009dd489077a9ab2f6cb5b7ad841aaec2c1fa..134aa4af2399c6b36c1bbaa01685335ebe809cab 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-2014 Frank Meyer - frank(at)fli4l.de\r
+ * Copyright (c) 2013-2015 Frank Meyer - frank(at)fli4l.de\r
  *\r
- * $Id: irmpprotocols.h,v 1.26 2014/07/21 08:58:58 fm Exp $\r
+ * $Id: irmpprotocols.h,v 1.31 2015/02/26 15:42:53 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
@@ -66,10 +66,11 @@
 #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
 \r
-#define IRMP_RADIO1_PROTOCOL                    42              // Radio protocol (experimental status), do not use it yet!\r
+#define IRMP_RADIO1_PROTOCOL                    43              // 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                        43              // number of supported protocols\r
 \r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
  * timing constants:\r
@@ -262,7 +263,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
@@ -680,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