Removed support for IMON & Merlin keyboards

git-svn-id: svn://mikrocontroller.net/irmp@78 aeb2e35e-bfc4-4214-b83c-9e8de998ed28

1 files changed, 1 insertions, 36 deletions

diff --git a/irmp.h b/irmp.h
index 7504907..b694e26 100644
--- a/irmp.h
+++ b/irmp.h
@@ -73,11 +73,8 @@ typedef uint8_t     PAUSE_LEN;
 #define IRMP_NEC42_PROTOCOL                     28              // NEC with 42 bits

 #define IRMP_LEGO_PROTOCOL                      29              // LEGO Power Functions RC

 #define IRMP_THOMSON_PROTOCOL                   30              // Thomson

-#define IRMP_MERLIN_PROTOCOL                    31              // Pollin Merlin keyboard (bitserial)

 

-#define IRMP_N_PROTOCOLS                        31              // number of supported protocols

-

-#define IRMP_IMON_PROTOCOL                      99              // Imon (bitserial) PROTOTYPE!

+#define IRMP_N_PROTOCOLS                        30              // number of supported protocols

 

 // some flags of struct IRMP_PARAMETER:

 #define IRMP_PARAM_FLAG_IS_MANCHESTER           0x01

@@ -447,22 +444,6 @@ typedef uint8_t     PAUSE_LEN;
 #define NETBOX_LSB                              1                               // LSB

 #define NETBOX_FLAGS                            IRMP_PARAM_FLAG_IS_SERIAL       // flags

 

-#define MERLIN_START_BIT_PULSE_TIME              340.0e-6                       //  340 usec pulse

-#define MERLIN_START_BIT_PAUSE_TIME              300.0e-6                       //  300 usec pause

-#define MERLIN_PULSE_TIME                        380.0e-6                       //  380 usec pulse

-#define MERLIN_PAUSE_TIME                        310.0e-6                       //  310 usec pause

-#define MERLIN_FRAMES                           1                               // Merlin sends 1 frame

-#define MERLIN_AUTO_REPETITION_PAUSE_TIME       35.0e-3                         // auto repetition after 35ms

-#define MERLIN_FRAME_REPEAT_PAUSE_TIME          35.0e-3                         // frame repeat after 35ms

-#define MERLIN_ADDRESS_OFFSET                   0                               // skip 0 bits

-#define MERLIN_ADDRESS_LEN                      9                               // read 16 address bits

-#define MERLIN_COMMAND_OFFSET                   9                               // skip 16 bits

-#define MERLIN_COMMAND_LEN                      16                              // read 9 bits

-#define MERLIN_COMPLETE_DATA_LEN                25                              // complete length

-#define MERLIN_STOP_BIT                         0                               // has no stop bit

-#define MERLIN_LSB                              1                               // LSB

-#define MERLIN_FLAGS                            IRMP_PARAM_FLAG_IS_SERIAL       // flags

-

 #define LEGO_START_BIT_PULSE_TIME                158.0e-6                       //  158 usec pulse ( 6 x 1/38kHz)

 #define LEGO_START_BIT_PAUSE_TIME               1026.0e-6                       // 1026 usec pause (39 x 1/38kHz)

 #define LEGO_PULSE_TIME                          158.0e-6                       //  158 usec pulse ( 6 x 1/38kHz)

@@ -493,22 +474,6 @@ typedef uint8_t     PAUSE_LEN;
 #define THOMSON_LSB                             0                               // MSB...LSB

 #define THOMSON_FLAGS                           0                               // flags

 

-#define IMON_START_BIT_PULSE_TIME               1333.0e-6                       // 1333 usec pulse

-#define IMON_START_BIT_PAUSE_TIME               1172.0e-6                       // 1333 usec pause

-#define IMON_PULSE_TIME                          500.0e-6                       //  500 usec pulse

-#define IMON_PAUSE_TIME                          500.0e-6                       //  500 usec pause

-#define IMON_FRAMES                             1                               // Imon sends 1 frame

-#define IMON_AUTO_REPETITION_PAUSE_TIME         35.0e-3                         // auto repetition after 35ms

-#define IMON_FRAME_REPEAT_PAUSE_TIME            35.0e-3                         // frame repeat after 35ms

-#define IMON_ADDRESS_OFFSET                     0                               // skip 0 bits

-#define IMON_ADDRESS_LEN                        0                               // read 0 address bits

-#define IMON_COMMAND_OFFSET                     26                              // skip 26 bits

-#define IMON_COMMAND_LEN                        16                              // read last 16 bits, ignore rest

-#define IMON_COMPLETE_DATA_LEN                  42                              // complete length, last is stop bit

-#define IMON_STOP_BIT                           1                               // has stop bit

-#define IMON_LSB                                1                               // LSB

-#define IMON_FLAGS                              IRMP_PARAM_FLAG_IS_SERIAL       // flags

-

 #define AUTO_FRAME_REPETITION_TIME              80.0e-3                         // SIRCS/SAMSUNG32/NUBERT: automatic repetition after 25-50ms

                                                                                 // KASEIKYO: automatic repetition after 75ms