Version 2.9.0: added MERLIN and FAN protocol

[irmp.git] / irmpprotocols.h

diff --git a/irmpprotocols.h b/irmpprotocols.h
index 763e2b5c07f18343fa5923622366e816e3b6265c..8b566feecc2972f84f64365aa423641c2b727d21 100644 (file)
--- a/irmpprotocols.h
+++ b/irmpprotocols.h
@@ -5,7 +5,7 @@
  *\r
  * Copyright (c) 2013-2015 Frank Meyer - frank(at)fli4l.de\r
  *\r
- * $Id: irmpprotocols.h,v 1.32 2015/04/23 12:46:13 fm Exp $\r
+ * $Id: irmpprotocols.h,v 1.33 2015/05/27 09:33:14 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
@@ -68,9 +68,10 @@
 #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
+#define IRMP_FAN_PROTOCOL                       44              // FAN (ventilator), very similar to NUBERT, but last bit is data bit instead of stop bit\r
+#define IRMP_RADIO1_PROTOCOL                    45              // Radio protocol (experimental status), do not use it yet!\r
 \r
-#define IRMP_N_PROTOCOLS                        44              // number of supported protocols\r
+#define IRMP_N_PROTOCOLS                        45              // number of supported protocols\r
 \r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
  * timing constants:\r
@@ -353,17 +354,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                1340.0e-6                       // 1340 usec pulse\r
+#define FAN_START_BIT_PAUSE_TIME                 340.0e-6                       //  340 usec pause\r
+#define FAN_1_PULSE_TIME                        1340.0e-6                       // 1340 usec pulse\r
+#define FAN_1_PAUSE_TIME                         340.0e-6                       //  340 usec pause\r
+#define FAN_0_PULSE_TIME                         500.0e-6                       //  500 usec pulse\r
+#define FAN_0_PAUSE_TIME                        1300.0e-6                       // 1300 usec pause\r
+#define FAN_FRAMES                              1                               // FAN sends only 1 frame (NUBERT sends 2)\r
+#define FAN_AUTO_REPETITION_PAUSE_TIME            35.0e-3                       // auto repetition after 35ms\r
+#define FAN_FRAME_REPEAT_PAUSE_TIME               35.0e-3                       // frame repeat after 45ms\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\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
@@ -686,10 +713,10 @@ typedef uint8_t     PAUSE_LEN;
  * 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_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