Version 1.3.1: corrected command bitmask for SAMSUNG32 protocol, added GRUNDIG protoc...

[irmp.git] / irmp.h

diff --git a/irmp.h b/irmp.h
index 6f718f8fca0a03b18f6fd2b826a484d0365e7b5f..4233a6ff8eb9442821f79d167e7ffaa450051578 100644 (file)
--- a/irmp.h
+++ b/irmp.h
@@ -3,7 +3,7 @@
  *\r
  * Copyright (c) 2009-2010 Frank Meyer - frank(at)fli4l.de\r
  *\r
- * $Id: irmp.h,v 1.14 2010/05/15 17:13:07 fm Exp $\r
+ * $Id: irmp.h,v 1.15 2010/05/17 10:31:43 fm Exp $\r
  *\r
  * ATMEGA88 @ 8 MHz\r
  *\r
@@ -47,8 +47,8 @@ extern "C"
 #define SIRCS_1_PULSE_TIME                      1200.0e-6                     // 1200 usec pulse\r
 #define SIRCS_0_PULSE_TIME                       600.0e-6                     //  600 usec pulse\r
 #define SIRCS_PAUSE_TIME                         600.0e-6                     //  600 usec pause\r
-#define SIRCS_REPETITION_TIME                     45.0e-3                     // repetition after 45ms\r
-#define SIRCS_REPETITION_CNT                    3                             // SIRCS repeats each frame 3 times\r
+#define SIRCS_REPETITION_CNT                    3                             // SIRCS sends each frame 3 times\r
+#define SIRCS_REPETITION_TIME                     25.0e-3                     // repetition after 25ms\r
 #define SIRCS_ADDRESS_OFFSET                    15                            // skip 15 bits\r
 #define SIRCS_ADDRESS_LEN                       5                             // read up to 5 address bits\r
 #define SIRCS_COMMAND_OFFSET                    0                             // skip 0 bits\r
@@ -90,6 +90,8 @@ extern "C"
 #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_REPETITION_CNT                2                             // SAMSUNG32 sends each frame 2 times\r
+#define SAMSUNG32_REPETITION_TIME               47.0e-3                       // repetition after 47 ms\r
 \r
 #define MATSUSHITA_START_BIT_PULSE_TIME         3488.0e-6                     // 3488 usec pulse\r
 #define MATSUSHITA_START_BIT_PAUSE_TIME         3488.0e-6                     // 3488 usec pause\r
@@ -142,6 +144,7 @@ extern "C"
 #define DENON_PULSE_TIME                        275.0e-6                      //  275 usec pulse\r
 #define DENON_1_PAUSE_TIME                      1900.0e-6                     // 1900 usec pause\r
 #define DENON_0_PAUSE_TIME                      1050.0e-6                     // 1050 usec pause\r
+#define DENON_REPETITION_CNT                    2                             // DENON sends each frame 2 times\r
 #define DENON_REPETITION_TIME                     65.0e-3                     // inverted repetition after 65ms\r
 #define DENON_ADDRESS_OFFSET                    0                             // skip 0 bits\r
 #define DENON_ADDRESS_LEN                       5                             // read 5 address bits\r
@@ -183,6 +186,7 @@ extern "C"
 #define NUBERT_1_PAUSE_TIME                      340.0e-6                     //  340 usec pause\r
 #define NUBERT_0_PULSE_TIME                      500.0e-6                     //  500 usec pulse\r
 #define NUBERT_0_PAUSE_TIME                     1300.0e-6                     // 1300 usec pause\r
+#define NUBERT_REPETITION_CNT                   2                             // Nubert sends 2 frames\r
 #define NUBERT_REPETITION_TIME                  35.0e-3                       // repetition after 35ms\r
 #define NUBERT_ADDRESS_OFFSET                   0                             // skip 0 bits\r
 #define NUBERT_ADDRESS_LEN                      0                             // read 0 address bits\r
@@ -215,6 +219,8 @@ extern "C"
 \r
 #define GRUNDIG_BIT_TIME                        528.0e-6                      // 528 usec pulse/pause\r
 #define GRUNDIG_PRE_PAUSE_TIME                  2639.0e-6                     // 2639 usec pause after pre bit\r
+#define GRUNDIG_REPETITION_CNT                  2                             // SIRCS sends each frame 3 times\r
+#define GRUNDIG_REPETITION_TIME                   20.0e-3                     // repetition after 20ms\r
 #define GRUNDIG_ADDRESS_OFFSET                  0                             // skip 2 bits (2nd start + 1 toggle)\r
 #define GRUNDIG_ADDRESS_LEN                     0                             // read 5 address bits\r
 #define GRUNDIG_COMMAND_OFFSET                  1                             // skip 2 bits (1 start bit)\r
@@ -223,7 +229,7 @@ extern "C"
 #define GRUNDIG_STOP_BIT                        0                             // has no stop bit\r
 #define GRUNDIG_LSB                             1                             // MSB...LSB\r
 \r
-#define AUTO_REPETITION_TIME                    50.0e-3                       // SIRCS or SAMSUNG32: automatic repetition after 45-50ms\r
+#define AUTO_REPETITION_TIME                    50.0e-3                       // SIRCS/SAMSUNG32/NUBERT: automatic repetition after 45-50ms\r
 \r
 #define TRUE                                    1\r
 #define FALSE                                   0\r