X-Git-Url: http://cloudbase.mooo.com/gitweb/irmp.git/blobdiff_plain/93570cd97cecf623cf97269629090259826f93ee..0f700c8ea4b0e9729805828c4fab5ab0fe2b6443:/irmp.h

diff --git a/irmp.h b/irmp.h
index b694e26..ccaee81 100644
--- a/irmp.h
+++ b/irmp.h
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2009-2011 Frank Meyer - frank(at)fli4l.de
  *
- * $Id: irmp.h,v 1.65 2011/09/08 13:22:16 fm Exp $
+ * $Id: irmp.h,v 1.68 2012/02/13 10:55:50 fm Exp $
  *
  * ATMEGA88 @ 8 MHz
  *
@@ -17,12 +17,18 @@
 #ifndef _WC_IRMP_H_
 #define _WC_IRMP_H_
 
+#if defined(__18CXX)                                                        // Microchip C18 declaration of missing typedef
+typedef unsigned char                           uint8_t;
+typedef unsigned int                            uint16_t;
+#endif //Microchip C18
+
 /*---------------------------------------------------------------------------------------------------------------------------------------------------
  * timing constants:
  *---------------------------------------------------------------------------------------------------------------------------------------------------
  */
-#define IRMP_TIMEOUT_TIME                       16500.0e-6                  // timeout after 16.5 ms darkness
-#define IRMP_TIMEOUT_TIME_MS                    16500L                      // timeout after 16.5 ms darkness
+// fm 22.09.2011: may not be more than 16000L, otherwise some JVC codes will not be accepted
+#define IRMP_TIMEOUT_TIME                       15500.0e-6                  // timeout after 15.5 ms darkness
+#define IRMP_TIMEOUT_TIME_MS                    15500L                      // timeout after 15.5 ms darkness
 
 #if IRMP_SUPPORT_NIKON_PROTOCOL == 1
 #define IRMP_TIMEOUT_NIKON_TIME                 29500.0e-6                  // 2nd timeout after 29.5 ms darkness (only for NIKON!)
@@ -130,8 +136,9 @@ typedef uint8_t     PAUSE_LEN;
 #define SAMSUNG_START_BIT_PULSE_TIME            4500.0e-6                       // 4500 usec pulse
 #define SAMSUNG_START_BIT_PAUSE_TIME            4500.0e-6                       // 4500 usec pause
 #define SAMSUNG_PULSE_TIME                       550.0e-6                       //  550 usec pulse
-#define SAMSUNG_1_PAUSE_TIME                    1450.0e-6                       // 1450 usec pause
-#define SAMSUNG_0_PAUSE_TIME                     450.0e-6                       //  450 usec pause
+#define SAMSUNG_1_PAUSE_TIME                    1650.0e-6                       // 1650 usec pause
+#define SAMSUNG_0_PAUSE_TIME                     550.0e-6                       //  550 usec pause
+
 #define SAMSUNG_FRAME_REPEAT_PAUSE_TIME           25.0e-3                       // frame repeat after 25ms
 #define SAMSUNG_ADDRESS_OFFSET                   0                              // skip 0 bits
 #define SAMSUNG_ADDRESS_LEN                     16                              // read 16 address bits
@@ -147,7 +154,7 @@ typedef uint8_t     PAUSE_LEN;
 #define SAMSUNG32_COMMAND_OFFSET                16                              // skip 16 bits
 #define SAMSUNG32_COMMAND_LEN                   16                              // read 16 command bits
 #define SAMSUNG32_COMPLETE_DATA_LEN             32                              // complete length
-#define SAMSUNG32_FRAMES                        2                               // SAMSUNG32 sends each frame 2 times
+#define SAMSUNG32_FRAMES                        1                               // SAMSUNG32 sends each frame 1 times
 #define SAMSUNG32_AUTO_REPETITION_PAUSE_TIME    47.0e-3                         // repetition after 47 ms
 #define SAMSUNG32_FRAME_REPEAT_PAUSE_TIME       47.0e-3                         // frame repeat after 40ms