version 1.9.2: corrected RUWIDO protocol

[irmp.git] / irmp.h

diff --git a/irmp.h b/irmp.h
index 4e6629ee458d631e19e60ea13d6b21c818417879..d16da6013e0aa54348e253fe8c0456964df98540 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.47 2011/02/08 08:46:22 fm Exp $\r
+ * $Id: irmp.h,v 1.49 2011/02/21 11:49:37 fm Exp $\r
  *\r
  * ATMEGA88 @ 8 MHz\r
  *\r
@@ -302,16 +302,28 @@ typedef uint8_t     PAUSE_LEN;
 #define NOKIA_COMMAND_LEN                       8                               // read 8 command bits\r
 #define NOKIA_COMPLETE_DATA_LEN                 17                              // complete length: 1 start bit + 8 address bits + 8 command bits\r
 \r
-#define SIEMENS_BIT_TIME                        250.0e-6                        // 250 usec pulse/pause\r
-#define SIEMENS_FRAME_REPEAT_PAUSE_TIME          45.0e-3                        // frame repeat after 45ms\r
-#define SIEMENS_ADDRESS_OFFSET                  2                               // skip 2 start bits\r
-#define SIEMENS_ADDRESS_LEN                     12                              // read 12 address bits\r
-#define SIEMENS_COMMAND_OFFSET                  15                              // skip 15 bits (2 start bits + 12 address bits + 1 inverted bit)\r
-#define SIEMENS_COMMAND_LEN                     8                               // read 7 + 1 command bits, last bit is only check bit.\r
-#define SIEMENS_COMPLETE_DATA_LEN               23                              // complete length\r
-#define SIEMENS_STOP_BIT                        0                               // has no stop bit\r
-#define SIEMENS_LSB                             0                               // MSB...LSB\r
-#define SIEMENS_FLAGS                           (IRMP_PARAM_FLAG_IS_MANCHESTER | IRMP_PARAM_FLAG_1ST_PULSE_IS_1)  // flags\r
+#define SIEMENS_OR_RUWIDO_START_BIT_PULSE_TIME    275.0e-6                      //  275 usec pulse\r
+#define SIEMENS_OR_RUWIDO_START_BIT_PAUSE_TIME    550.0e-6                      //  550 usec pause\r
+#define SIEMENS_OR_RUWIDO_BIT_PULSE_TIME          275.0e-6                      //  275 usec short pulse\r
+#define SIEMENS_OR_RUWIDO_BIT_PULSE_TIME_2        550.0e-6                      //  550 usec long pulse\r
+#define SIEMENS_OR_RUWIDO_BIT_PAUSE_TIME          275.0e-6                      //  275 usec short pause\r
+#define SIEMENS_OR_RUWIDO_BIT_PAUSE_TIME_2        550.0e-6                      //  550 usec long pause\r
+#define SIEMENS_OR_RUWIDO_FRAME_REPEAT_PAUSE_TIME 45.0e-3                       // frame repeat after 45ms\r
+#define SIEMENS_OR_RUWIDO_STOP_BIT                0                             // has no stop bit\r
+#define SIEMENS_OR_RUWIDO_LSB                     0                             // MSB...LSB\r
+#define SIEMENS_OR_RUWIDO_FLAGS                   (IRMP_PARAM_FLAG_IS_MANCHESTER | IRMP_PARAM_FLAG_1ST_PULSE_IS_1)  // flags\r
+\r
+#define RUWIDO_ADDRESS_OFFSET                   0                               // skip 0 bits\r
+#define RUWIDO_ADDRESS_LEN                      9                               // read 9 address bits\r
+#define RUWIDO_COMMAND_OFFSET                   9                               // skip 9 bits\r
+#define RUWIDO_COMMAND_LEN                      8                               // read 7 + 1 command bits, last bit is only check bit\r
+#define RUWIDO_COMPLETE_DATA_LEN                17                              // complete length\r
+\r
+#define SIEMENS_ADDRESS_OFFSET                  0                               // skip 0 bits\r
+#define SIEMENS_ADDRESS_LEN                     11                              // read 11 bits\r
+#define SIEMENS_COMMAND_OFFSET                  11                              // skip 11 bits\r
+#define SIEMENS_COMMAND_LEN                     11                              // read 10 + 1 command bits, last bit is only check bit\r
+#define SIEMENS_COMPLETE_DATA_LEN               22                              // complete length\r
 \r
 #define FDC_START_BIT_PULSE_TIME                 2085.0e-6                      // 2085 usec pulse\r
 #define FDC_START_BIT_PAUSE_TIME                  966.0e-6                      //  966 usec pause\r
@@ -373,22 +385,6 @@ typedef uint8_t     PAUSE_LEN;
 #define NIKON_LSB                               0                               // LSB...MSB\r
 #define NIKON_FLAGS                             0                               // flags\r
 \r
-#define RUWIDO_START_BIT_PULSE_TIME              889.0e-6                       //  900 usec pulse\r
-#define RUWIDO_START_BIT_PAUSE_TIME             1400.0e-6                       // 1400 usec pause\r
-#define RUWIDO_BIT_PULSE_TIME                    889.0e-6                       //  889 usec short pulse\r
-#define RUWIDO_BIT_PULSE_TIME_2                 1622.0e-6                       // 1622 usec long pulse\r
-#define RUWIDO_BIT_PAUSE_TIME                    611.0e-6                       //  611 usec short pause\r
-#define RUWIDO_BIT_PAUSE_TIME_2                 1361.0e-6                       // 1361 usec long pause\r
-#define RUWIDO_FRAME_REPEAT_PAUSE_TIME            45.0e-3                       // frame repeat after 45ms\r
-#define RUWIDO_ADDRESS_OFFSET                   2                               // skip 2 start bits\r
-#define RUWIDO_ADDRESS_LEN                      8                               // read 8 address bits\r
-#define RUWIDO_COMMAND_OFFSET                   10                              // skip 10 bits (2 start + 8 address)\r
-#define RUWIDO_COMMAND_LEN                      7                               // read 7 command bits, ignore last parity bit\r
-#define RUWIDO_COMPLETE_DATA_LEN                18                              // complete length\r
-#define RUWIDO_STOP_BIT                         0                               // has no stop bit\r
-#define RUWIDO_LSB                              0                               // MSB...LSB\r
-#define RUWIDO_FLAGS                            (IRMP_PARAM_FLAG_IS_MANCHESTER | IRMP_PARAM_FLAG_1ST_PULSE_IS_1)  // flags\r
-\r
 #define AUTO_FRAME_REPETITION_TIME              80.0e-3                         // SIRCS/SAMSUNG32/NUBERT: automatic repetition after 25-50ms\r
                                                                                 // KASEIKYO: automatic repetition after 75ms\r
 \r