X-Git-Url: http://cloudbase.mooo.com/gitweb/irmp.git/blobdiff_plain/c7c9a4a1320292cd9a71e01ad571626cfa4a30d3..f613f7dc9ad2d963236b59e4f2d5ee9a88bd9564:/irmp.h

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