Corrected Timer for ATTiny85

[irmp.git] / irmp.h

diff --git a/irmp.h b/irmp.h
index 619826380e0735ee9bac3c27e9036a9d058c1933..b694e26342ffbd99880a5037932c001a66ff98d6 100644 (file)
--- a/irmp.h
+++ b/irmp.h
@@ -3,7 +3,7 @@
  *\r
  * Copyright (c) 2009-2011 Frank Meyer - frank(at)fli4l.de\r
  *\r
- * $Id: irmp.h,v 1.64 2011/08/16 07:51:19 fm Exp $\r
+ * $Id: irmp.h,v 1.65 2011/09/08 13:22:16 fm Exp $\r
  *\r
  * ATMEGA88 @ 8 MHz\r
  *\r
@@ -17,11 +17,6 @@
 #ifndef _WC_IRMP_H_\r
 #define _WC_IRMP_H_\r
 \r
-#ifdef __cplusplus\r
-extern "C"\r
-{\r
-#endif\r
-\r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
  * timing constants:\r
  *---------------------------------------------------------------------------------------------------------------------------------------------------\r
@@ -78,8 +73,8 @@ typedef uint8_t     PAUSE_LEN;
 #define IRMP_NEC42_PROTOCOL                     28              // NEC with 42 bits\r
 #define IRMP_LEGO_PROTOCOL                      29              // LEGO Power Functions RC\r
 #define IRMP_THOMSON_PROTOCOL                   30              // Thomson\r
-#define IRMP_MERLIN_PROTOCOL                    31              // Pollin Merlin keyboard (bitserial)\r
-#define IRMP_IMON_PROTOCOL                      99              // Imon (bitserial) PROTOTYPE!\r
+\r
+#define IRMP_N_PROTOCOLS                        30              // number of supported protocols\r
 \r
 // some flags of struct IRMP_PARAMETER:\r
 #define IRMP_PARAM_FLAG_IS_MANCHESTER           0x01\r
@@ -449,22 +444,6 @@ typedef uint8_t     PAUSE_LEN;
 #define NETBOX_LSB                              1                               // LSB\r
 #define NETBOX_FLAGS                            IRMP_PARAM_FLAG_IS_SERIAL       // flags\r
 \r
-#define MERLIN_START_BIT_PULSE_TIME              340.0e-6                       //  340 usec pulse\r
-#define MERLIN_START_BIT_PAUSE_TIME              300.0e-6                       //  300 usec pause\r
-#define MERLIN_PULSE_TIME                        380.0e-6                       //  380 usec pulse\r
-#define MERLIN_PAUSE_TIME                        310.0e-6                       //  310 usec pause\r
-#define MERLIN_FRAMES                           1                               // Merlin sends 1 frame\r
-#define MERLIN_AUTO_REPETITION_PAUSE_TIME       35.0e-3                         // auto repetition after 35ms\r
-#define MERLIN_FRAME_REPEAT_PAUSE_TIME          35.0e-3                         // frame repeat after 35ms\r
-#define MERLIN_ADDRESS_OFFSET                   0                               // skip 0 bits\r
-#define MERLIN_ADDRESS_LEN                      9                               // read 16 address bits\r
-#define MERLIN_COMMAND_OFFSET                   9                               // skip 16 bits\r
-#define MERLIN_COMMAND_LEN                      16                              // read 9 bits\r
-#define MERLIN_COMPLETE_DATA_LEN                25                              // complete length\r
-#define MERLIN_STOP_BIT                         0                               // has no stop bit\r
-#define MERLIN_LSB                              1                               // LSB\r
-#define MERLIN_FLAGS                            IRMP_PARAM_FLAG_IS_SERIAL       // flags\r
-\r
 #define LEGO_START_BIT_PULSE_TIME                158.0e-6                       //  158 usec pulse ( 6 x 1/38kHz)\r
 #define LEGO_START_BIT_PAUSE_TIME               1026.0e-6                       // 1026 usec pause (39 x 1/38kHz)\r
 #define LEGO_PULSE_TIME                          158.0e-6                       //  158 usec pulse ( 6 x 1/38kHz)\r
@@ -495,22 +474,6 @@ typedef uint8_t     PAUSE_LEN;
 #define THOMSON_LSB                             0                               // MSB...LSB\r
 #define THOMSON_FLAGS                           0                               // flags\r
 \r
-#define IMON_START_BIT_PULSE_TIME               1333.0e-6                       // 1333 usec pulse\r
-#define IMON_START_BIT_PAUSE_TIME               1172.0e-6                       // 1333 usec pause\r
-#define IMON_PULSE_TIME                          500.0e-6                       //  500 usec pulse\r
-#define IMON_PAUSE_TIME                          500.0e-6                       //  500 usec pause\r
-#define IMON_FRAMES                             1                               // Imon sends 1 frame\r
-#define IMON_AUTO_REPETITION_PAUSE_TIME         35.0e-3                         // auto repetition after 35ms\r
-#define IMON_FRAME_REPEAT_PAUSE_TIME            35.0e-3                         // frame repeat after 35ms\r
-#define IMON_ADDRESS_OFFSET                     0                               // skip 0 bits\r
-#define IMON_ADDRESS_LEN                        0                               // read 0 address bits\r
-#define IMON_COMMAND_OFFSET                     26                              // skip 26 bits\r
-#define IMON_COMMAND_LEN                        16                              // read last 16 bits, ignore rest\r
-#define IMON_COMPLETE_DATA_LEN                  42                              // complete length, last is stop bit\r
-#define IMON_STOP_BIT                           1                               // has stop bit\r
-#define IMON_LSB                                1                               // LSB\r
-#define IMON_FLAGS                              IRMP_PARAM_FLAG_IS_SERIAL       // 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
@@ -527,29 +490,17 @@ typedef struct
   uint8_t               flags;                                                  // flags, e.g. repetition\r
 } IRMP_DATA;\r
 \r
+extern void                             irmp_init (void);\r
+extern uint8_t                          irmp_get_data (IRMP_DATA *);\r
+extern uint8_t                          irmp_is_busy (void);\r
+extern uint8_t                          irmp_ISR (void);\r
 \r
-/**\r
- *  Initialize IRMP decoder\r
- *  @details  Configures IRMP input pin\r
- */\r
-extern void                           irmp_init (void);\r
-\r
-/**\r
- *  Get IRMP data\r
- *  @details  gets decoded IRMP data\r
- *  @param    pointer in order to store IRMP data\r
- *  @return    TRUE: successful, FALSE: failed\r
- */\r
-extern uint8_t                        irmp_get_data (IRMP_DATA *);\r
-\r
-/**\r
- *  ISR routine\r
- *  @details  ISR routine, called 10000 times per second\r
- */\r
-extern uint8_t                        irmp_ISR (void);\r
-\r
-#ifdef __cplusplus\r
-}\r
+#if IRMP_PROTOCOL_NAMES == 1\r
+extern char *                           irmp_protocol_names[IRMP_N_PROTOCOLS + 1];\r
 #endif\r
 \r
+#if IRMP_USE_CALLBACK == 1\r
+extern void                             irmp_set_callback_ptr (void (*cb)(uint8_t));\r
+#endif // IRSND_USE_CALLBACK == 1\r
+\r
 #endif /* _WC_IRMP_H_ */\r