version 1.9.9: some code corrections

[irmp.git] / irmp.h

diff --git a/irmp.h b/irmp.h
index e9f06efaa78acc8ccfd4eb93c02ddbafea591c09..5e0009226afc955f331c0d76d96265a37a0a48cd 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.54 2011/02/23 15:03:27 fm Exp $\r
+ * $Id: irmp.h,v 1.58 2011/02/25 15:24:06 fm Exp $\r
  *\r
  * ATMEGA88 @ 8 MHz\r
  *\r
@@ -74,7 +74,8 @@ typedef uint8_t     PAUSE_LEN;
 #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
+#define IRMP_NEC16_PROTOCOL                     27              // NEC with 16 bits\r
+#define IRMP_IMON_PROTOCOL                      99              // Imon (bitserial) PROTOTYPE!\r
 \r
 // some flags of struct IRMP_PARAMETER:\r
 #define IRMP_PARAM_FLAG_IS_MANCHESTER           0x01\r
@@ -115,6 +116,15 @@ typedef uint8_t     PAUSE_LEN;
 #define NEC_LSB                                 1                               // LSB...MSB\r
 #define NEC_FLAGS                               0                               // flags\r
 \r
+#define NEC16_ADDRESS_OFFSET                    0                               // skip 0 bits\r
+#define NEC16_ADDRESS_LEN                       8                               // read 8 address bits\r
+#define NEC16_COMMAND_OFFSET                    8                               // skip 8 bits (8 address)\r
+#define NEC16_COMMAND_LEN                       8                               // read 8 bits (8 command)\r
+#define NEC16_COMPLETE_DATA_LEN                 16                              // complete length\r
+#define NEC16_STOP_BIT                          1                               // has stop bit\r
+#define NEC16_LSB                               1                               // LSB...MSB\r
+#define NEC16_FLAGS                             0                               // flags\r
+\r
 #define SAMSUNG_START_BIT_PULSE_TIME            4500.0e-6                       // 4500 usec pulse\r
 #define SAMSUNG_START_BIT_PAUSE_TIME            4500.0e-6                       // 4500 usec pause\r
 #define SAMSUNG_PULSE_TIME                       550.0e-6                       //  550 usec pulse\r
@@ -177,11 +187,11 @@ 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_FLAGS                            0                               // flags\r
@@ -235,7 +245,7 @@ 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
@@ -416,10 +426,10 @@ typedef uint8_t     PAUSE_LEN;
 #define KATHREIN_LSB                            0                               // MSB\r
 #define KATHREIN_FLAGS                          0                               // flags\r
 \r
-#define NETBOX_START_BIT_PULSE_TIME             2500.0e-6                       // 2500 usec pulse\r
-#define NETBOX_START_BIT_PAUSE_TIME              833.0e-6                       //  833 usec pause\r
-#define NETBOX_PULSE_TIME                        833.0e-6                       //  833 usec pulse\r
-#define NETBOX_PAUSE_TIME                        833.0e-6                       //  833 usec pause\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
@@ -427,7 +437,7 @@ typedef uint8_t     PAUSE_LEN;
 #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, last is stop bit\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