]> cloudbase.mooo.com Git - irmp.git/blobdiff - irmp.c
projects / irmp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Version 2.6.8: added merlin protocol
[irmp.git] / irmp.c
diff --git a/irmp.c b/irmp.c
index 03d198b48d8c4f166d9b4d9960f6eed65ba468e7..eaf769537991bce3e760074845879d6d99234017 100644 (file)
--- a/irmp.c
+++ b/irmp.c
@@ -3,7 +3,7 @@
  *\r
  * Copyright (c) 2009-2014 Frank Meyer - frank(at)fli4l.de\r
  *\r
- * $Id: irmp.c,v 1.166 2014/09/19 13:26:00 fm Exp $\r
+ * $Id: irmp.c,v 1.168 2015/01/19 10:54:37 fm Exp $\r
  *\r
  * Supported AVR mikrocontrollers:\r
  *\r
@@ -42,6 +42,7 @@
     IRMP_SUPPORT_SIEMENS_OR_RUWIDO_PROTOCOL == 1 ||     \\r
     IRMP_SUPPORT_IR60_PROTOCOL == 1 ||                  \\r
     IRMP_SUPPORT_A1TVBOX_PROTOCOL == 1 ||               \\r
+    IRMP_SUPPORT_MERLIN_PROTOCOL == 1 ||                \\r
     IRMP_SUPPORT_ORTEK_PROTOCOL == 1\r
 #  define IRMP_SUPPORT_MANCHESTER                   1\r
 #else\r
@@ -385,14 +386,23 @@
 #define BOSE_0_PAUSE_LEN_MAX                     ((uint8_t)(F_INTERRUPTS * BOSE_0_PAUSE_TIME * MAX_TOLERANCE_30 + 0.5) + 1)\r
 #define BOSE_FRAME_REPEAT_PAUSE_LEN_MAX          (uint16_t)(F_INTERRUPTS * 100.0e-3 * MAX_TOLERANCE_20 + 0.5)\r
 \r
-#define A1TVBOX_START_BIT_PULSE_LEN_MIN         ((uint8_t)(F_INTERRUPTS * A1TVBOX_START_BIT_PULSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
-#define A1TVBOX_START_BIT_PULSE_LEN_MAX         ((uint8_t)(F_INTERRUPTS * A1TVBOX_START_BIT_PULSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
-#define A1TVBOX_START_BIT_PAUSE_LEN_MIN         ((uint8_t)(F_INTERRUPTS * A1TVBOX_START_BIT_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
-#define A1TVBOX_START_BIT_PAUSE_LEN_MAX         ((uint8_t)(F_INTERRUPTS * A1TVBOX_START_BIT_PAUSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
-#define A1TVBOX_BIT_PULSE_LEN_MIN               ((uint8_t)(F_INTERRUPTS * A1TVBOX_BIT_PULSE_TIME * MIN_TOLERANCE_30 + 0.5) - 1)\r
-#define A1TVBOX_BIT_PULSE_LEN_MAX               ((uint8_t)(F_INTERRUPTS * A1TVBOX_BIT_PULSE_TIME * MAX_TOLERANCE_30 + 0.5) + 1)\r
-#define A1TVBOX_BIT_PAUSE_LEN_MIN               ((uint8_t)(F_INTERRUPTS * A1TVBOX_BIT_PAUSE_TIME * MIN_TOLERANCE_30 + 0.5) - 1)\r
-#define A1TVBOX_BIT_PAUSE_LEN_MAX               ((uint8_t)(F_INTERRUPTS * A1TVBOX_BIT_PAUSE_TIME * MAX_TOLERANCE_30 + 0.5) + 1)\r
+#define A1TVBOX_START_BIT_PULSE_LEN_MIN         ((uint8_t)(F_INTERRUPTS * A1TVBOX_START_BIT_PULSE_TIME * MIN_TOLERANCE_05 + 0.5) - 1)\r
+#define A1TVBOX_START_BIT_PULSE_LEN_MAX         ((uint8_t)(F_INTERRUPTS * A1TVBOX_START_BIT_PULSE_TIME * MAX_TOLERANCE_05 + 0.5) + 1)\r
+#define A1TVBOX_START_BIT_PAUSE_LEN_MIN         ((uint8_t)(F_INTERRUPTS * A1TVBOX_START_BIT_PAUSE_TIME * MIN_TOLERANCE_05 + 0.5) - 1)\r
+#define A1TVBOX_START_BIT_PAUSE_LEN_MAX         ((uint8_t)(F_INTERRUPTS * A1TVBOX_START_BIT_PAUSE_TIME * MAX_TOLERANCE_05 + 0.5) + 1)\r
+#define A1TVBOX_BIT_PULSE_LEN_MIN               ((uint8_t)(F_INTERRUPTS * A1TVBOX_BIT_PULSE_TIME * MIN_TOLERANCE_05 + 0.5) - 1)\r
+#define A1TVBOX_BIT_PULSE_LEN_MAX               ((uint8_t)(F_INTERRUPTS * A1TVBOX_BIT_PULSE_TIME * MAX_TOLERANCE_05 + 0.5) + 1)\r
+#define A1TVBOX_BIT_PAUSE_LEN_MIN               ((uint8_t)(F_INTERRUPTS * A1TVBOX_BIT_PAUSE_TIME * MIN_TOLERANCE_05 + 0.5) - 1)\r
+#define A1TVBOX_BIT_PAUSE_LEN_MAX               ((uint8_t)(F_INTERRUPTS * A1TVBOX_BIT_PAUSE_TIME * MAX_TOLERANCE_05 + 0.5) + 1)\r
+\r
+#define MERLIN_START_BIT_PULSE_LEN_MIN          ((uint8_t)(F_INTERRUPTS * MERLIN_START_BIT_PULSE_TIME * MIN_TOLERANCE_05 + 0.5) - 1)\r
+#define MERLIN_START_BIT_PULSE_LEN_MAX          ((uint8_t)(F_INTERRUPTS * MERLIN_START_BIT_PULSE_TIME * MAX_TOLERANCE_05 + 0.5) + 1)\r
+#define MERLIN_START_BIT_PAUSE_LEN_MIN          ((uint8_t)(F_INTERRUPTS * MERLIN_START_BIT_PAUSE_TIME * MIN_TOLERANCE_05 + 0.5) - 1)\r
+#define MERLIN_START_BIT_PAUSE_LEN_MAX          ((uint8_t)(F_INTERRUPTS * MERLIN_START_BIT_PAUSE_TIME * MAX_TOLERANCE_05 + 0.5) + 1)\r
+#define MERLIN_BIT_PULSE_LEN_MIN                ((uint8_t)(F_INTERRUPTS * MERLIN_BIT_PULSE_TIME * MIN_TOLERANCE_05 + 0.5) - 1)\r
+#define MERLIN_BIT_PULSE_LEN_MAX                ((uint8_t)(F_INTERRUPTS * MERLIN_BIT_PULSE_TIME * MAX_TOLERANCE_05 + 0.5) + 1)\r
+#define MERLIN_BIT_PAUSE_LEN_MIN                ((uint8_t)(F_INTERRUPTS * MERLIN_BIT_PAUSE_TIME * MIN_TOLERANCE_05 + 0.5) - 1)\r
+#define MERLIN_BIT_PAUSE_LEN_MAX                ((uint8_t)(F_INTERRUPTS * MERLIN_BIT_PAUSE_TIME * MAX_TOLERANCE_05 + 0.5) + 1)\r
 \r
 #define ORTEK_START_BIT_PULSE_LEN_MIN           ((uint8_t)(F_INTERRUPTS * ORTEK_START_BIT_PULSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
 #define ORTEK_START_BIT_PULSE_LEN_MAX           ((uint8_t)(F_INTERRUPTS * ORTEK_START_BIT_PULSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
@@ -538,6 +548,7 @@ static const char proto_rcmm12[]        PROGMEM = "RCMM12";
 static const char proto_speaker[]       PROGMEM = "SPEAKER";\r
 static const char proto_lgair[]         PROGMEM = "LGAIR";\r
 static const char proto_samsung48[]     PROGMEM = "SAMSG48";\r
+static const char proto_merlin[]        PROGMEM = "MERLIN";\r
 \r
 static const char proto_radio1[]        PROGMEM = "RADIO1";\r
 \r
@@ -586,6 +597,7 @@ irmp_protocol_names[IRMP_N_PROTOCOLS + 1] PROGMEM =
     proto_speaker,\r
     proto_lgair,\r
     proto_samsung48,\r
+    proto_merlin,\r
 \r
     proto_radio1\r
 };\r
@@ -610,7 +622,6 @@ irmp_protocol_names[IRMP_N_PROTOCOLS + 1] PROGMEM =
 #  include "stm32f4xx_usart.h"\r
 #elif defined(ARM_STM32F10X)\r
 #  define  STM32_UART_COM     USART3                                    // UART3 on PB10\r
-#  include "stm32f10x_usart.h"\r
 #else\r
 #  if IRMP_EXT_LOGGING == 1                                             // use external logging\r
 #    include "irmpextlog.h"\r
@@ -1631,6 +1642,32 @@ static const PROGMEM IRMP_PARAMETER a1tvbox_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
+\r
+    MERLIN_BIT_PULSE_LEN_MIN,                                           // pulse_1_len_min: here: minimum length of short pulse\r
+    MERLIN_BIT_PULSE_LEN_MAX,                                           // pulse_1_len_max: here: maximum length of short pulse\r
+    MERLIN_BIT_PAUSE_LEN_MIN,                                           // pause_1_len_min: here: minimum length of short pause\r
+    MERLIN_BIT_PAUSE_LEN_MAX,                                           // pause_1_len_max: here: maximum length of short pause\r
+    0,                                                                  // pulse_0_len_min: here: not used\r
+    0,                                                                  // pulse_0_len_max: here: not used\r
+    0,                                                                  // pause_0_len_min: here: not used\r
+    0,                                                                  // pause_0_len_max: here: not used\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_ORTEK_PROTOCOL == 1\r
 \r
 static const PROGMEM IRMP_PARAMETER ortek_param =\r
@@ -2922,6 +2959,22 @@ irmp_ISR (void)
                     else\r
 #endif // IRMP_SUPPORT_A1TVBOX_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
+#ifdef ANALYZE\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
+#endif // ANALYZE\r
+                        irmp_param_p = (IRMP_PARAMETER *) &merlin_param;\r
+                        last_pause = 0;\r
+                        last_value = 1;\r
+                    }\r
+                    else\r
+#endif // IRMP_SUPPORT_MERLIN_PROTOCOL == 1\r
+\r
 #if IRMP_SUPPORT_ORTEK_PROTOCOL == 1\r
                     if (irmp_pulse_time >= ORTEK_START_BIT_PULSE_LEN_MIN && irmp_pulse_time <= ORTEK_START_BIT_PULSE_LEN_MAX &&\r
                         irmp_pause_time >= ORTEK_START_BIT_PAUSE_LEN_MIN && irmp_pause_time <= ORTEK_START_BIT_PAUSE_LEN_MAX)\r
Clone of IRMP - Infrared Muliti Protocol Decoder (https://www.mikrocontroller.net/articles/IRMP)