Version 1.7.1: fixed #undefs for RECS80, RECS80EXT, SIEMENS

[irmp.git] / irmp.h

diff --git a/irmp.h b/irmp.h
index 909cc73f0f29c4ab9c472a581a4008b4de960836..5035f37d0f6e9f64f20ca386f9db6f091c898df7 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.34 2010/06/15 15:47:21 fm Exp $\r
+ * $Id: irmp.h,v 1.39 2010/06/25 13:18:36 fm Exp $\r
  *\r
  * ATMEGA88 @ 8 MHz\r
  *\r
@@ -26,25 +26,25 @@ extern "C"
  * IR protocols\r
  *---------------------------------------------------------------------------------------------------------------------------------------------------\r
  */\r
-#define IRMP_SIRCS_PROTOCOL                      1                              // Sony\r
-#define IRMP_NEC_PROTOCOL                        2                              // NEC, Pioneer, JVC, Toshiba, NoName etc.\r
-#define IRMP_SAMSUNG_PROTOCOL                    3                              // Samsung\r
-#define IRMP_MATSUSHITA_PROTOCOL                 4                              // Matsushita\r
-#define IRMP_KASEIKYO_PROTOCOL                   5                              // Kaseikyo (Panasonic etc)\r
-#define IRMP_RECS80_PROTOCOL                     6                              // Philips, Thomson, Nordmende, Telefunken, Saba\r
-#define IRMP_RC5_PROTOCOL                        7                              // Philips etc\r
-#define IRMP_DENON_PROTOCOL                      8                              // Denon\r
-#define IRMP_RC6_PROTOCOL                        9                              // Philips etc\r
-#define IRMP_SAMSUNG32_PROTOCOL                 10                              // Samsung32: no sync pulse at bit 16, length 32 instead of 37\r
-#define IRMP_APPLE_PROTOCOL                     11                              // Apple, very similar to NEC\r
-#define IRMP_RECS80EXT_PROTOCOL                 12                              // Philips, Technisat, Thomson, Nordmende, Telefunken, Saba\r
-#define IRMP_NUBERT_PROTOCOL                    13                              // Nubert\r
-#define IRMP_BANG_OLUFSEN_PROTOCOL              14                              // Bang & Olufsen\r
-#define IRMP_GRUNDIG_PROTOCOL                   15                              // Grundig\r
-#define IRMP_NOKIA_PROTOCOL                     16                              // Nokia\r
-#define IRMP_SIEMENS_PROTOCOL                   17                              // Siemens, e.g. Gigaset\r
-#define IRMP_FDC_PROTOCOL                       18                              // FDC keyboard\r
-#define IRMP_RCCAR_PROTOCOL                     19                              // RC Car\r
+#define IRMP_SIRCS_PROTOCOL                      1              // Sony\r
+#define IRMP_NEC_PROTOCOL                        2              // NEC, Pioneer, JVC, Toshiba, NoName etc.\r
+#define IRMP_SAMSUNG_PROTOCOL                    3              // Samsung\r
+#define IRMP_MATSUSHITA_PROTOCOL                 4              // Matsushita\r
+#define IRMP_KASEIKYO_PROTOCOL                   5              // Kaseikyo (Panasonic etc)\r
+#define IRMP_RECS80_PROTOCOL                     6              // Philips, Thomson, Nordmende, Telefunken, Saba\r
+#define IRMP_RC5_PROTOCOL                        7              // Philips etc\r
+#define IRMP_DENON_PROTOCOL                      8              // Denon\r
+#define IRMP_RC6_PROTOCOL                        9              // Philips etc\r
+#define IRMP_SAMSUNG32_PROTOCOL                 10              // Samsung32: no sync pulse at bit 16, length 32 instead of 37\r
+#define IRMP_APPLE_PROTOCOL                     11              // Apple, very similar to NEC\r
+#define IRMP_RECS80EXT_PROTOCOL                 12              // Philips, Technisat, Thomson, Nordmende, Telefunken, Saba\r
+#define IRMP_NUBERT_PROTOCOL                    13              // Nubert\r
+#define IRMP_BANG_OLUFSEN_PROTOCOL              14              // Bang & Olufsen\r
+#define IRMP_GRUNDIG_PROTOCOL                   15              // Grundig\r
+#define IRMP_NOKIA_PROTOCOL                     16              // Nokia\r
+#define IRMP_SIEMENS_PROTOCOL                   17              // Siemens, e.g. Gigaset\r
+#define IRMP_FDC_PROTOCOL                       18              // FDC keyboard\r
+#define IRMP_RCCAR_PROTOCOL                     19              // RC Car\r
 \r
 // some flags of struct IRMP_PARAMETER:\r
 #define IRMP_PARAM_FLAG_IS_MANCHESTER           0x01\r
@@ -284,16 +284,16 @@ extern "C"
 #define SIEMENS_LSB                             0                               // MSB...LSB\r
 #define SIEMENS_FLAGS                           (IRMP_PARAM_FLAG_IS_MANCHESTER | IRMP_PARAM_FLAG_1ST_PULSE_IS_1)  // flags\r
 \r
-#define FDC_START_BIT_PULSE_TIME                 2120.0e-6                      // 2120 usec pulse\r
-#define FDC_START_BIT_PAUSE_TIME                  900.0e-6                      //  900 usec pause\r
-#define FDC_PULSE_TIME                            360.0e-6                      //  360 usec pulse\r
-#define FDC_1_PAUSE_TIME                          650.0e-6                      //  650 usec pause\r
-#define FDC_0_PAUSE_TIME                          180.0e-6                      //  180 usec pause\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
+#define FDC_PULSE_TIME                            300.0e-6                      //  300 usec pulse\r
+#define FDC_1_PAUSE_TIME                          715.0e-6                      //  715 usec pause\r
+#define FDC_0_PAUSE_TIME                          220.0e-6                      //  220 usec pause\r
 #define FDC_FRAME_REPEAT_PAUSE_TIME                60.0e-3                      // frame repeat after 60ms\r
 #define FDC_ADDRESS_OFFSET                       0                              // skip 0 bits\r
-#define FDC_ADDRESS_LEN                          8                              // read 8 address bits\r
-#define FDC_COMMAND_OFFSET                      24                              // skip 24 bits (8 address bits + 12 status bits + 4 repeat bits)\r
-#define FDC_COMMAND_LEN                          8                              // read 8 bits\r
+#define FDC_ADDRESS_LEN                         14                              // read 14 address bits, but use only 6, shift 8 into command\r
+#define FDC_COMMAND_OFFSET                      20                              // skip 20 bits\r
+#define FDC_COMMAND_LEN                         12                              // read 12 bits\r
 #define FDC_COMPLETE_DATA_LEN                   40                              // complete length\r
 #define FDC_STOP_BIT                            1                               // has stop bit\r
 #define FDC_LSB                                 1                               // LSB...MSB\r