]> cloudbase.mooo.com Git - irmp.git/blobdiff - irmp.c
Removed support for IMON & Merlin keyboards
[irmp.git] / irmp.c
diff --git a/irmp.c b/irmp.c
index db87cc3ad6ad7cca69d659f6916afd5ca193e61d..13e7a1e701ee4c6c0b3f9f3f5ca9d53b67ad343f 100644 (file)
--- a/irmp.c
+++ b/irmp.c
@@ -373,9 +373,7 @@ typedef unsigned int16  uint16_t;
 #define IRMP_SUPPORT_MANCHESTER                 0\r
 #endif\r
 \r
-#if IRMP_SUPPORT_NETBOX_PROTOCOL == 1 ||                \\r
-    IRMP_SUPPORT_MERLIN_PROTOCOL == 1 ||                \\r
-    IRMP_SUPPORT_IMON_PROTOCOL == 1 \r
+#if IRMP_SUPPORT_NETBOX_PROTOCOL == 1\r
 #define IRMP_SUPPORT_SERIAL                     1\r
 #else\r
 #define IRMP_SUPPORT_SERIAL                     0\r
@@ -683,24 +681,6 @@ typedef unsigned int16  uint16_t;
 #define LEGO_0_PAUSE_LEN_MIN                    ((uint8_t)(F_INTERRUPTS * LEGO_0_PAUSE_TIME * MIN_TOLERANCE_40 + 0.5) - 1)\r
 #define LEGO_0_PAUSE_LEN_MAX                    ((uint8_t)(F_INTERRUPTS * LEGO_0_PAUSE_TIME * MAX_TOLERANCE_40 + 0.5) + 1)\r
 \r
-#define MERLIN_START_BIT_PULSE_LEN_MIN          ((uint8_t)(F_INTERRUPTS * MERLIN_START_BIT_PULSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
-#define MERLIN_START_BIT_PULSE_LEN_MAX          ((uint8_t)(F_INTERRUPTS * MERLIN_START_BIT_PULSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
-#define MERLIN_START_BIT_PAUSE_LEN_MIN          ((uint8_t)(F_INTERRUPTS * MERLIN_START_BIT_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
-#define MERLIN_START_BIT_PAUSE_LEN_MAX          ((uint8_t)(F_INTERRUPTS * MERLIN_START_BIT_PAUSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
-#define MERLIN_PULSE_LEN                        ((uint8_t)(F_INTERRUPTS * MERLIN_PULSE_TIME))\r
-#define MERLIN_PAUSE_LEN                        ((uint8_t)(F_INTERRUPTS * MERLIN_PAUSE_TIME))\r
-#define MERLIN_PULSE_REST_LEN                   ((uint8_t)(F_INTERRUPTS * MERLIN_PULSE_TIME / 4))\r
-#define MERLIN_PAUSE_REST_LEN                   ((uint8_t)(F_INTERRUPTS * MERLIN_PAUSE_TIME / 4))\r
-\r
-#define IMON_START_BIT_PULSE_LEN_MIN            ((uint8_t)(F_INTERRUPTS * IMON_START_BIT_PULSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
-#define IMON_START_BIT_PULSE_LEN_MAX            ((uint8_t)(F_INTERRUPTS * IMON_START_BIT_PULSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
-#define IMON_START_BIT_PAUSE_LEN_MIN            ((uint8_t)(F_INTERRUPTS * IMON_START_BIT_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
-#define IMON_START_BIT_PAUSE_LEN_MAX            ((uint8_t)(F_INTERRUPTS * IMON_START_BIT_PAUSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
-#define IMON_PULSE_LEN                          ((uint8_t)(F_INTERRUPTS * IMON_PULSE_TIME))\r
-#define IMON_PAUSE_LEN                          ((uint8_t)(F_INTERRUPTS * IMON_PAUSE_TIME))\r
-#define IMON_PULSE_REST_LEN                     ((uint8_t)(F_INTERRUPTS * IMON_PULSE_TIME / 4))\r
-#define IMON_PAUSE_REST_LEN                     ((uint8_t)(F_INTERRUPTS * IMON_PAUSE_TIME / 4))\r
-\r
 #define AUTO_FRAME_REPETITION_LEN               (uint16_t)(F_INTERRUPTS * AUTO_FRAME_REPETITION_TIME + 0.5)       // use uint16_t!\r
 \r
 #ifdef ANALYZE\r
@@ -760,8 +740,7 @@ irmp_protocol_names[IRMP_N_PROTOCOLS + 1] =
     "NEC16",\r
     "NEC42",\r
     "LEGO",\r
-    "THOMSON",\r
-    "MERLIN"\r
+    "THOMSON"\r
 };\r
 #endif\r
 \r
@@ -1504,31 +1483,6 @@ static const PROGMEM IRMP_PARAMETER lego_param =
 \r
 #endif\r
 \r
-#if IRMP_SUPPORT_MERLIN_PROTOCOL == 1\r
-\r
-static const PROGMEM IRMP_PARAMETER merlin_param =\r
-{\r
-    IRMP_MERLIN_PROTOCOL,                                               // protocol:        ir protocol\r
-    MERLIN_PULSE_LEN,                                                   // pulse_1_len_min: minimum length of pulse with bit value 1, here: exact value\r
-    MERLIN_PULSE_REST_LEN,                                              // pulse_1_len_max: maximum length of pulse with bit value 1, here: rest value\r
-    MERLIN_PAUSE_LEN,                                                   // pause_1_len_min: minimum length of pause with bit value 1, here: exact value\r
-    MERLIN_PAUSE_REST_LEN,                                              // pause_1_len_max: maximum length of pause with bit value 1, here: rest value\r
-    MERLIN_PULSE_LEN,                                                   // pulse_0_len_min: minimum length of pulse with bit value 0, here: exact value\r
-    MERLIN_PULSE_REST_LEN,                                              // pulse_0_len_max: maximum length of pulse with bit value 0, here: rest value\r
-    MERLIN_PAUSE_LEN,                                                   // pause_0_len_min: minimum length of pause with bit value 0, here: exact value\r
-    MERLIN_PAUSE_REST_LEN,                                              // pause_0_len_max: maximum length of pause with bit value 0, here: rest value\r
-    MERLIN_ADDRESS_OFFSET,                                              // address_offset:  address offset\r
-    MERLIN_ADDRESS_OFFSET + MERLIN_ADDRESS_LEN,                         // address_end:     end of address\r
-    MERLIN_COMMAND_OFFSET,                                              // command_offset:  command offset\r
-    MERLIN_COMMAND_OFFSET + MERLIN_COMMAND_LEN,                         // command_end:     end of command\r
-    MERLIN_COMPLETE_DATA_LEN,                                           // complete_len:    complete length of frame\r
-    MERLIN_STOP_BIT,                                                    // stop_bit:        flag: frame has stop bit\r
-    MERLIN_LSB,                                                         // lsb_first:       flag: LSB first\r
-    MERLIN_FLAGS                                                        // flags:           some flags\r
-};\r
-\r
-#endif\r
-\r
 #if IRMP_SUPPORT_THOMSON_PROTOCOL == 1\r
 \r
 static const PROGMEM IRMP_PARAMETER thomson_param =\r
@@ -1554,31 +1508,6 @@ static const PROGMEM IRMP_PARAMETER thomson_param =
 \r
 #endif\r
 \r
-#if IRMP_SUPPORT_IMON_PROTOCOL == 1\r
-\r
-static const PROGMEM IRMP_PARAMETER imon_param =\r
-{\r
-    IRMP_IMON_PROTOCOL,                                                 // protocol:        ir protocol\r
-    IMON_PULSE_LEN,                                                     // pulse_1_len_min: minimum length of pulse with bit value 1\r
-    IMON_PULSE_REST_LEN,                                                // pulse_1_len_max: maximum length of pulse with bit value 1\r
-    IMON_PAUSE_LEN,                                                     // pause_1_len_min: minimum length of pause with bit value 1\r
-    IMON_PAUSE_REST_LEN,                                                // pause_1_len_max: maximum length of pause with bit value 1\r
-    IMON_PULSE_LEN,                                                     // pulse_0_len_min: minimum length of pulse with bit value 0\r
-    IMON_PULSE_REST_LEN,                                                // pulse_0_len_max: maximum length of pulse with bit value 0\r
-    IMON_PAUSE_LEN,                                                     // pause_0_len_min: minimum length of pause with bit value 0\r
-    IMON_PAUSE_REST_LEN,                                                // pause_0_len_max: maximum length of pause with bit value 0\r
-    IMON_ADDRESS_OFFSET,                                                // address_offset:  address offset\r
-    IMON_ADDRESS_OFFSET + IMON_ADDRESS_LEN,                             // address_end:     end of address\r
-    IMON_COMMAND_OFFSET,                                                // command_offset:  command offset\r
-    IMON_COMMAND_OFFSET + IMON_COMMAND_LEN,                             // command_end:     end of command\r
-    IMON_COMPLETE_DATA_LEN,                                             // complete_len:    complete length of frame\r
-    IMON_STOP_BIT,                                                      // stop_bit:        flag: frame has stop bit\r
-    IMON_LSB,                                                           // lsb_first:       flag: LSB first\r
-    IMON_FLAGS                                                          // flags:           some flags\r
-};\r
-\r
-#endif\r
-\r
 static uint8_t                              irmp_bit;                   // current bit position\r
 static IRMP_PARAMETER                       irmp_param;\r
 \r
@@ -2399,18 +2328,6 @@ irmp_ISR (void)
                     else\r
 #endif // IRMP_SUPPORT_NETBOX_PROTOCOL == 1\r
 \r
-#if IRMP_SUPPORT_MERLIN_PROTOCOL == 1\r
-                    if (irmp_pulse_time >= MERLIN_START_BIT_PULSE_LEN_MIN && irmp_pulse_time <= MERLIN_START_BIT_PULSE_LEN_MAX &&\r
-                        irmp_pause_time >= MERLIN_START_BIT_PAUSE_LEN_MIN && irmp_pause_time <= MERLIN_START_BIT_PAUSE_LEN_MAX)\r
-                    {                                                           // it's MERLIN\r
-                        ANALYZE_PRINTF ("protocol = MERLIN, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
-                                        MERLIN_START_BIT_PULSE_LEN_MIN, MERLIN_START_BIT_PULSE_LEN_MAX,\r
-                                        MERLIN_START_BIT_PAUSE_LEN_MIN, MERLIN_START_BIT_PAUSE_LEN_MAX);\r
-                        irmp_param_p = (IRMP_PARAMETER *) &merlin_param;\r
-                    }\r
-                    else\r
-#endif // IRMP_SUPPORT_MERLIN_PROTOCOL == 1\r
-\r
 #if IRMP_SUPPORT_LEGO_PROTOCOL == 1\r
                     if (irmp_pulse_time >= LEGO_START_BIT_PULSE_LEN_MIN && irmp_pulse_time <= LEGO_START_BIT_PULSE_LEN_MAX &&\r
                         irmp_pause_time >= LEGO_START_BIT_PAUSE_LEN_MIN && irmp_pause_time <= LEGO_START_BIT_PAUSE_LEN_MAX)\r
@@ -2423,18 +2340,6 @@ irmp_ISR (void)
                     else\r
 #endif // IRMP_SUPPORT_NEC_PROTOCOL == 1\r
 \r
-#if IRMP_SUPPORT_IMON_PROTOCOL == 1\r
-                    if (irmp_pulse_time >= IMON_START_BIT_PULSE_LEN_MIN && irmp_pulse_time <= IMON_START_BIT_PULSE_LEN_MAX &&\r
-                        irmp_pause_time >= IMON_START_BIT_PAUSE_LEN_MIN && irmp_pause_time <= IMON_START_BIT_PAUSE_LEN_MAX)\r
-                    {                                                           // it's IMON\r
-                        ANALYZE_PRINTF ("protocol = IMON, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
-                                        IMON_START_BIT_PULSE_LEN_MIN, IMON_START_BIT_PULSE_LEN_MAX,\r
-                                        IMON_START_BIT_PAUSE_LEN_MIN, IMON_START_BIT_PAUSE_LEN_MAX);\r
-                        irmp_param_p = (IRMP_PARAMETER *) &imon_param;\r
-                    }\r
-                    else\r
-#endif // IRMP_SUPPORT_IMON_PROTOCOL == 1\r
-\r
                     {\r
                         ANALYZE_PRINTF ("protocol = UNKNOWN\n");\r
 //                      irmp_busy_flag = FALSE;\r
@@ -2642,15 +2547,6 @@ irmp_ISR (void)
                             got_light = TRUE;                                                       // this is a lie, but helps (generates stop bit)\r
                         }\r
                         else\r
-#if 1\r
-                        // MERLIN generates no stop bit, here is the timeout condition:\r
-                        if ((irmp_param.flags & IRMP_PARAM_FLAG_IS_SERIAL) && irmp_param.protocol == IRMP_MERLIN_PROTOCOL &&\r
-                            irmp_pause_time >= MERLIN_PULSE_LEN * (MERLIN_COMPLETE_DATA_LEN - irmp_bit))\r
-                        {\r
-                            got_light = TRUE;                                                       // this is a lie, but helps (generates stop bit)\r
-                        }\r
-                        else\r
-#endif\r
 #endif\r
 #if IRMP_SUPPORT_GRUNDIG_NOKIA_IR60_PROTOCOL == 1\r
                         if (irmp_param.protocol == IRMP_GRUNDIG_PROTOCOL && !irmp_param.stop_bit)\r