version 1.9.6: corrected RECS80 decoder

[irmp.git] / irmp.h

diff --git a/irmp.h b/irmp.h
index 421ef1e2ceb3bd2c8d482272d04c728eb02baf06..88e32327f74c98c716b25490c420b93f808b9f6d 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.53 2011/02/22 14:24:00 fm Exp $\r
+ * $Id: irmp.h,v 1.56 2011/02/25 09:19:54 fm Exp $\r
  *\r
  * ATMEGA88 @ 8 MHz\r
  *\r
@@ -73,10 +73,13 @@ typedef uint8_t     PAUSE_LEN;
 #define IRMP_RUWIDO_PROTOCOL                    23              // Ruwido, e.g. T-Home Mediareceiver\r
 #define IRMP_IR60_PROTOCOL                      24              // IR60 (SAB2008)\r
 #define IRMP_KATHREIN_PROTOCOL                  25              // Kathrein\r
+#define IRMP_NETBOX_PROTOCOL                    26              // Netbox keyboard (bitserial)\r
+#define IRMP_IMON_PROTOCOL                      27              // Imon (bitserial)\r
 \r
 // some flags of struct IRMP_PARAMETER:\r
 #define IRMP_PARAM_FLAG_IS_MANCHESTER           0x01\r
 #define IRMP_PARAM_FLAG_1ST_PULSE_IS_1          0x02\r
+#define IRMP_PARAM_FLAG_IS_SERIAL               0x04\r
 \r
 #define SIRCS_START_BIT_PULSE_TIME              2400.0e-6                       // 2400 usec pulse\r
 #define SIRCS_START_BIT_PAUSE_TIME               600.0e-6                       //  600 usec pause\r
@@ -174,13 +177,13 @@ typedef uint8_t     PAUSE_LEN;
 #define RECS80_1_PAUSE_TIME                     7432.0e-6                       // 7432 usec pause\r
 #define RECS80_0_PAUSE_TIME                     4902.0e-6                       // 4902 usec pause\r
 #define RECS80_FRAME_REPEAT_PAUSE_TIME            45.0e-3                       // frame repeat after 45ms\r
-#define RECS80_ADDRESS_OFFSET                   2                               // skip 2 bits (2nd start + 1 toggle)\r
+#define RECS80_ADDRESS_OFFSET                   1                               // skip 1 bit (toggle bit)\r
 #define RECS80_ADDRESS_LEN                      3                               // read 3 address bits\r
-#define RECS80_COMMAND_OFFSET                   5                               // skip 5 bits (2nd start + 1 toggle + 3 address)\r
+#define RECS80_COMMAND_OFFSET                   4                               // skip 4 bits (1 toggle + 3 address)\r
 #define RECS80_COMMAND_LEN                      6                               // read 6 command bits\r
-#define RECS80_COMPLETE_DATA_LEN                11                              // complete length\r
+#define RECS80_COMPLETE_DATA_LEN                10                              // complete length\r
 #define RECS80_STOP_BIT                         1                               // has stop bit\r
-#define RECS80_LSB                              0                               // MSB...LSB\r
+#define RECS80_LSB                              1                               // LSB...MSB\r
 #define RECS80_FLAGS                            0                               // flags\r
 \r
 #define RC5_BIT_TIME                             889.0e-6                       // 889 usec pulse/pause\r
@@ -232,12 +235,12 @@ typedef uint8_t     PAUSE_LEN;
 #define RECS80EXT_0_PAUSE_TIME                  4902.0e-6                       // 4902 usec pause\r
 #define RECS80EXT_FRAME_REPEAT_PAUSE_TIME         45.0e-3                       // frame repeat after 45ms\r
 #define RECS80EXT_ADDRESS_OFFSET                2                               // skip 2 bits (2nd start + 1 toggle)\r
-#define RECS80EXT_ADDRESS_LEN                   4                               // read 3 address bits\r
+#define RECS80EXT_ADDRESS_LEN                   4                               // read 4 address bits\r
 #define RECS80EXT_COMMAND_OFFSET                6                               // skip 6 bits (2nd start + 1 toggle + 4 address)\r
 #define RECS80EXT_COMMAND_LEN                   6                               // read 6 command bits\r
 #define RECS80EXT_COMPLETE_DATA_LEN             12                              // complete length\r
 #define RECS80EXT_STOP_BIT                      1                               // has stop bit\r
-#define RECS80EXT_LSB                           0                               // MSB...LSB\r
+#define RECS80EXT_LSB                           1                               // LSB...MSB\r
 #define RECS80EXT_FLAGS                         0                               // flags\r
 \r
 #define NUBERT_START_BIT_PULSE_TIME             1340.0e-6                       // 1340 usec pulse\r
@@ -413,6 +416,38 @@ typedef uint8_t     PAUSE_LEN;
 #define KATHREIN_LSB                            0                               // MSB\r
 #define KATHREIN_FLAGS                          0                               // flags\r
 \r
+#define NETBOX_START_BIT_PULSE_TIME             2400.0e-6                       // 2400 usec pulse\r
+#define NETBOX_START_BIT_PAUSE_TIME              800.0e-6                       //  800 usec pause\r
+#define NETBOX_PULSE_TIME                        800.0e-6                       //  800 usec pulse\r
+#define NETBOX_PAUSE_TIME                        800.0e-6                       //  800 usec pause\r
+#define NETBOX_FRAMES                           1                               // Netbox sends 1 frame\r
+#define NETBOX_AUTO_REPETITION_PAUSE_TIME       35.0e-3                         // auto repetition after 35ms\r
+#define NETBOX_FRAME_REPEAT_PAUSE_TIME          35.0e-3                         // frame repeat after 35ms\r
+#define NETBOX_ADDRESS_OFFSET                   0                               // skip 0 bits\r
+#define NETBOX_ADDRESS_LEN                      3                               // read 3 address bits\r
+#define NETBOX_COMMAND_OFFSET                   3                               // skip 3 bits\r
+#define NETBOX_COMMAND_LEN                      13                              // read 13 bits\r
+#define NETBOX_COMPLETE_DATA_LEN                16                              // complete length\r
+#define NETBOX_STOP_BIT                         0                               // has no stop bit\r
+#define NETBOX_LSB                              1                               // LSB\r
+#define NETBOX_FLAGS                            IRMP_PARAM_FLAG_IS_SERIAL       // flags\r
+\r
+#define IMON_START_BIT_PULSE_TIME               1333.0e-6                       // 1333 usec pulse\r
+#define IMON_START_BIT_PAUSE_TIME               1172.0e-6                       // 1333 usec pause\r
+#define IMON_PULSE_TIME                          500.0e-6                       //  500 usec pulse\r
+#define IMON_PAUSE_TIME                          500.0e-6                       //  500 usec pause\r
+#define IMON_FRAMES                             1                               // Imon sends 1 frame\r
+#define IMON_AUTO_REPETITION_PAUSE_TIME         35.0e-3                         // auto repetition after 35ms\r
+#define IMON_FRAME_REPEAT_PAUSE_TIME            35.0e-3                         // frame repeat after 35ms\r
+#define IMON_ADDRESS_OFFSET                     0                               // skip 0 bits\r
+#define IMON_ADDRESS_LEN                        0                               // read 0 address bits\r
+#define IMON_COMMAND_OFFSET                     26                              // skip 26 bits\r
+#define IMON_COMMAND_LEN                        16                              // read last 16 bits, ignore rest\r
+#define IMON_COMPLETE_DATA_LEN                  42                              // complete length, last is stop bit\r
+#define IMON_STOP_BIT                           1                               // has stop bit\r
+#define IMON_LSB                                1                               // LSB\r
+#define IMON_FLAGS                              IRMP_PARAM_FLAG_IS_SERIAL       // 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