corrected modulation frequency for denon protocol in irsnd.c, corrected #if for toggl...

[irmp.git] / irmp.h

diff --git a/irmp.h b/irmp.h
index 21ff7dbfa2f3e0eac7d571919265b193f4f6dff0..5ee45710a3357085e47cf47c852da037ce96b8ce 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.43 2010/08/31 15:22:24 fm Exp $\r
+ * $Id: irmp.h,v 1.45 2011/01/18 13:02:15 fm Exp $\r
  *\r
  * ATMEGA88 @ 8 MHz\r
  *\r
@@ -29,11 +29,18 @@ extern "C"
 #define IRMP_TIMEOUT_TIME                       16500.0e-6                  // timeout after 16.5 ms darkness\r
 #define IRMP_TIMEOUT_TIME_MS                    16500L                      // timeout after 16.5 ms darkness\r
 \r
+#if IRMP_SUPPORT_NIKON_PROTOCOL == 1\r
+#define IRMP_TIMEOUT_NIKON_TIME                 29500.0e-6                  // 2nd timeout after 29.5 ms darkness (only for NIKON!)\r
+#define IRMP_TIMEOUT_NIKON_TIME_MS              29500L                      // 2nd timeout after 29.5 ms darkness\r
+typedef uint16_t    PAUSE_LEN;\r
+#define IRMP_TIMEOUT_NIKON_LEN                  (PAUSE_LEN)(F_INTERRUPTS * IRMP_TIMEOUT_NIKON_TIME + 0.5)\r
+#else\r
 #if (F_INTERRUPTS * IRMP_TIMEOUT_TIME_MS) / 1000000 >= 254\r
 typedef uint16_t    PAUSE_LEN;\r
 #else\r
 typedef uint8_t     PAUSE_LEN;\r
 #endif\r
+#endif\r
 \r
 #define IRMP_TIMEOUT_LEN                        (PAUSE_LEN)(F_INTERRUPTS * IRMP_TIMEOUT_TIME + 0.5)\r
 \r
@@ -48,7 +55,7 @@ typedef uint8_t     PAUSE_LEN;
 #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_DENON_PROTOCOL                      8              // Denon, Sharp\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
@@ -62,6 +69,7 @@ typedef uint8_t     PAUSE_LEN;
 #define IRMP_RCCAR_PROTOCOL                     19              // RC Car\r
 #define IRMP_JVC_PROTOCOL                       20              // JVC\r
 #define IRMP_RC6A_PROTOCOL                      21              // RC6A, e.g. Kathrein, XBOX\r
+#define IRMP_NIKON_PROTOCOL                     22              // Nikon\r
 \r
 // some flags of struct IRMP_PARAMETER:\r
 #define IRMP_PARAM_FLAG_IS_MANCHESTER           0x01\r
@@ -183,9 +191,9 @@ typedef uint8_t     PAUSE_LEN;
 #define RC5_LSB                                 0                               // MSB...LSB\r
 #define RC5_FLAGS                               IRMP_PARAM_FLAG_IS_MANCHESTER   // flags\r
 \r
-#define DENON_PULSE_TIME                        275.0e-6                        //  275 usec pulse\r
-#define DENON_1_PAUSE_TIME                      1900.0e-6                       // 1900 usec pause\r
-#define DENON_0_PAUSE_TIME                       775.0e-6                       //  775 usec pause\r
+#define DENON_PULSE_TIME                         310.0e-6                       //  310 usec pulse in practice,  275 in theory\r
+#define DENON_1_PAUSE_TIME                      1780.0e-6                       // 1780 usec pause in practice, 1900 in theory\r
+#define DENON_0_PAUSE_TIME                       745.0e-6                       //  745 usec pause in practice,  775 in theory\r
 #define DENON_FRAMES                            2                               // DENON sends each frame 2 times\r
 #define DENON_AUTO_REPETITION_PAUSE_TIME          65.0e-3                       // inverted repetition after 65ms\r
 #define DENON_FRAME_REPEAT_PAUSE_TIME             65.0e-3                       // frame repeat after 65ms\r
@@ -297,7 +305,7 @@ typedef uint8_t     PAUSE_LEN;
 #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                     7                               // read 7 command bits\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
@@ -348,6 +356,21 @@ typedef uint8_t     PAUSE_LEN;
 #define JVC_LSB                                 1                               // LSB...MSB\r
 #define JVC_FLAGS                               0                               // flags\r
 \r
+#define NIKON_START_BIT_PULSE_TIME              2200.0e-6                       //  2200 usec pulse\r
+#define NIKON_START_BIT_PAUSE_TIME             27100.0e-6                       // 27100 usec pause\r
+#define NIKON_PULSE_TIME                         500.0e-6                       //   520 usec pulse\r
+#define NIKON_1_PAUSE_TIME                      3500.0e-6                       //  3500 usec pause\r
+#define NIKON_0_PAUSE_TIME                      1500.0e-6                       //  1500 usec pause\r
+#define NIKON_FRAME_REPEAT_PAUSE_TIME             60.0e-3                       // frame repeat after 60ms\r
+#define NIKON_ADDRESS_OFFSET                    0                               // skip 0 bits\r
+#define NIKON_ADDRESS_LEN                       0                               // read 0 address bits\r
+#define NIKON_COMMAND_OFFSET                    0                               // skip 0 bits\r
+#define NIKON_COMMAND_LEN                       2                               // read 2 bits\r
+#define NIKON_COMPLETE_DATA_LEN                 2                               // complete length\r
+#define NIKON_STOP_BIT                          1                               // has stop bit\r
+#define NIKON_LSB                               0                               // LSB...MSB\r
+#define NIKON_FLAGS                             0                               // 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