Version 2.8.1: added PENTAX protocol

[irmp.git] / irmpprotocols.h

diff --git a/irmpprotocols.h b/irmpprotocols.h
index 134aa4af2399c6b36c1bbaa01685335ebe809cab..763e2b5c07f18343fa5923622366e816e3b6265c 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.31 2015/02/26 15:42:53 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
@@ -67,10 +67,10 @@
 #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                    43              // Radio protocol (experimental status), do not use it yet!\r
-\r
-#define IRMP_N_PROTOCOLS                        43              // number of supported protocols\r
+#define IRMP_N_PROTOCOLS                        44              // number of supported protocols\r
 \r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
  * timing constants:\r
@@ -772,7 +772,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
@@ -780,26 +780,45 @@ 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
  * 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