]> cloudbase.mooo.com Git - irmp.git/blobdiff - irmp.c
Version 2.4.0:
[irmp.git] / irmp.c
diff --git a/irmp.c b/irmp.c
index 3f313de0487916c2ab77ccddee9b6b09f7ca301e..60ffe4bdd09a9237c492372ebdaf30378d8d1645 100644 (file)
--- a/irmp.c
+++ b/irmp.c
@@ -3,7 +3,7 @@
  *\r
  * Copyright (c) 2009-2013 Frank Meyer - frank(at)fli4l.de\r
  *\r
- * $Id: irmp.c,v 1.141 2013/04/09 11:55:39 fm Exp $\r
+ * $Id: irmp.c,v 1.145 2014/02/20 14:55:17 fm Exp $\r
  *\r
  * ATMEGA88 @ 8 MHz\r
  *\r
 #define ROOMBA_START_BIT_PULSE_LEN_MAX          ((uint8_t)(F_INTERRUPTS * ROOMBA_START_BIT_PULSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
 #define ROOMBA_START_BIT_PAUSE_LEN_MIN          ((uint8_t)(F_INTERRUPTS * ROOMBA_START_BIT_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
 #define ROOMBA_START_BIT_PAUSE_LEN_MAX          ((uint8_t)(F_INTERRUPTS * ROOMBA_START_BIT_PAUSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
-#define ROOMBA_1_PAUSE_LEN                      ((uint8_t)(F_INTERRUPTS * ROOMBA_1_PAUSE_TIME))\r
+#define ROOMBA_1_PAUSE_LEN_EXACT                ((uint8_t)(F_INTERRUPTS * ROOMBA_1_PAUSE_TIME + 0.5))\r
 #define ROOMBA_1_PULSE_LEN_MIN                  ((uint8_t)(F_INTERRUPTS * ROOMBA_1_PULSE_TIME * MIN_TOLERANCE_20 + 0.5) - 1)\r
 #define ROOMBA_1_PULSE_LEN_MAX                  ((uint8_t)(F_INTERRUPTS * ROOMBA_1_PULSE_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
 #define ROOMBA_1_PAUSE_LEN_MIN                  ((uint8_t)(F_INTERRUPTS * ROOMBA_1_PAUSE_TIME * MIN_TOLERANCE_20 + 0.5) - 1)\r
 #define ROOMBA_0_PAUSE_LEN_MIN                  ((uint8_t)(F_INTERRUPTS * ROOMBA_0_PAUSE_TIME * MIN_TOLERANCE_20 + 0.5) - 1)\r
 #define ROOMBA_0_PAUSE_LEN_MAX                  ((uint8_t)(F_INTERRUPTS * ROOMBA_0_PAUSE_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
 \r
+#define RCMM32_START_BIT_PULSE_LEN_MIN            ((uint8_t)(F_INTERRUPTS * RCMM32_START_BIT_PULSE_TIME * MIN_TOLERANCE_05 + 0.5) - 1)\r
+#define RCMM32_START_BIT_PULSE_LEN_MAX            ((uint8_t)(F_INTERRUPTS * RCMM32_START_BIT_PULSE_TIME * MAX_TOLERANCE_05 + 0.5) + 1)\r
+#define RCMM32_START_BIT_PAUSE_LEN_MIN            ((uint8_t)(F_INTERRUPTS * RCMM32_START_BIT_PAUSE_TIME * MIN_TOLERANCE_05 + 0.5) - 1)\r
+#define RCMM32_START_BIT_PAUSE_LEN_MAX            ((uint8_t)(F_INTERRUPTS * RCMM32_START_BIT_PAUSE_TIME * MAX_TOLERANCE_05 + 0.5) + 1)\r
+#define RCMM32_BIT_PULSE_LEN_MIN                  ((uint8_t)(F_INTERRUPTS * RCMM32_PULSE_TIME * MIN_TOLERANCE_05 + 0.5) - 1)\r
+#define RCMM32_BIT_PULSE_LEN_MAX                  ((uint8_t)(F_INTERRUPTS * RCMM32_PULSE_TIME * MAX_TOLERANCE_05 + 0.5) + 1)\r
+#define RCMM32_BIT_00_PAUSE_LEN_MIN               ((uint8_t)(F_INTERRUPTS * RCMM32_00_PAUSE_TIME * MIN_TOLERANCE_05 + 0.5) - 1)\r
+#define RCMM32_BIT_00_PAUSE_LEN_MAX               ((uint8_t)(F_INTERRUPTS * RCMM32_00_PAUSE_TIME * MAX_TOLERANCE_05 + 0.5) + 1)\r
+#define RCMM32_BIT_01_PAUSE_LEN_MIN               ((uint8_t)(F_INTERRUPTS * RCMM32_01_PAUSE_TIME * MIN_TOLERANCE_05 + 0.5) - 1)\r
+#define RCMM32_BIT_01_PAUSE_LEN_MAX               ((uint8_t)(F_INTERRUPTS * RCMM32_01_PAUSE_TIME * MAX_TOLERANCE_05 + 0.5) + 1)\r
+#define RCMM32_BIT_10_PAUSE_LEN_MIN               ((uint8_t)(F_INTERRUPTS * RCMM32_10_PAUSE_TIME * MIN_TOLERANCE_05 + 0.5) - 1)\r
+#define RCMM32_BIT_10_PAUSE_LEN_MAX               ((uint8_t)(F_INTERRUPTS * RCMM32_10_PAUSE_TIME * MAX_TOLERANCE_05 + 0.5) + 1)\r
+#define RCMM32_BIT_11_PAUSE_LEN_MIN               ((uint8_t)(F_INTERRUPTS * RCMM32_11_PAUSE_TIME * MIN_TOLERANCE_05 + 0.5) - 1)\r
+#define RCMM32_BIT_11_PAUSE_LEN_MAX               ((uint8_t)(F_INTERRUPTS * RCMM32_11_PAUSE_TIME * MAX_TOLERANCE_05 + 0.5) + 1)\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
@@ -489,7 +504,10 @@ irmp_protocol_names[IRMP_N_PROTOCOLS + 1] =
     "A1TVBOX",\r
     "ORTEK",\r
     "TELEFUNKEN",\r
-    "ROOMBA"\r
+    "ROOMBA",\r
+    "RCMM32",\r
+    "RCMM24",\r
+    "RCMM12"\r
 };\r
 \r
 #endif\r
@@ -1500,6 +1518,32 @@ static const PROGMEM IRMP_PARAMETER roomba_param =
 \r
 #endif\r
 \r
+#if IRMP_SUPPORT_RCMM_PROTOCOL == 1\r
+\r
+static const PROGMEM IRMP_PARAMETER rcmm_param =\r
+{\r
+    IRMP_RCMM32_PROTOCOL,                                                 // protocol:        ir protocol\r
+   \r
+    RCMM32_BIT_PULSE_LEN_MIN,                                             // pulse_1_len_min: here: minimum length of short pulse\r
+    RCMM32_BIT_PULSE_LEN_MAX,                                             // pulse_1_len_max: here: maximum length of short pulse\r
+    0,                                                                  // pause_1_len_min: here: minimum length of short pause\r
+    0,                                                                  // pause_1_len_max: here: maximum length of short pause\r
+    RCMM32_BIT_PULSE_LEN_MIN,                                             // pulse_0_len_min: here: not used\r
+    RCMM32_BIT_PULSE_LEN_MAX,                                             // 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
+    RCMM32_ADDRESS_OFFSET,                                                // address_offset:  address offset\r
+    RCMM32_ADDRESS_OFFSET + RCMM32_ADDRESS_LEN,                             // address_end:     end of address\r
+    RCMM32_COMMAND_OFFSET,                                                // command_offset:  command offset\r
+    RCMM32_COMMAND_OFFSET + RCMM32_COMMAND_LEN,                             // command_end:     end of command\r
+    RCMM32_COMPLETE_DATA_LEN,                                             // complete_len:    complete length of frame\r
+    RCMM32_STOP_BIT,                                                      // stop_bit:        flag: frame has stop bit\r
+    RCMM32_LSB,                                                           // lsb_first:       flag: LSB first\r
+    RCMM32_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
@@ -1719,6 +1763,7 @@ irmp_get_data (IRMP_DATA * irmp_data_p)
                 break;\r
             }\r
 #endif\r
+\r
             default:\r
             {\r
                 rtc = TRUE;\r
@@ -2546,8 +2591,19 @@ irmp_ISR (void)
                         parity      = 0;\r
                     }\r
                     else\r
-#endif // IRMP_SUPPORT_A1TVBOX_PROTOCOL == 1\r
+#endif // IRMP_SUPPORT_ORTEK_PROTOCOL == 1\r
 \r
+#if IRMP_SUPPORT_RCMM_PROTOCOL == 1\r
+                    if (irmp_pulse_time >= RCMM32_START_BIT_PULSE_LEN_MIN && irmp_pulse_time <= RCMM32_START_BIT_PULSE_LEN_MAX &&\r
+                        irmp_pause_time >= RCMM32_START_BIT_PAUSE_LEN_MIN && irmp_pause_time <= RCMM32_START_BIT_PAUSE_LEN_MAX)\r
+                    {                                                           // it's RCMM\r
+                        ANALYZE_PRINTF ("protocol = RCMM, start bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
+                                        RCMM32_START_BIT_PULSE_LEN_MIN, RCMM32_START_BIT_PULSE_LEN_MAX,\r
+                                        RCMM32_START_BIT_PAUSE_LEN_MIN, RCMM32_START_BIT_PAUSE_LEN_MAX);\r
+                        irmp_param_p = (IRMP_PARAMETER *) &rcmm_param;\r
+                    }\r
+                    else\r
+#endif // IRMP_SUPPORT_RCMM_PROTOCOL == 1\r
                     {\r
                         ANALYZE_PRINTF ("protocol = UNKNOWN\n");\r
 //                      irmp_busy_flag = FALSE;\r
@@ -2831,7 +2887,7 @@ irmp_ISR (void)
                                 irmp_tmp_address <<= 2;\r
                                 irmp_tmp_address |= (irmp_tmp_command >> 6);\r
                                 irmp_tmp_command &= 0x003F;\r
-                                irmp_tmp_command <<= 4;\r
+//                              irmp_tmp_command <<= 4;\r
                                 irmp_tmp_command |= last_value;\r
                             }\r
                         }\r
@@ -2839,11 +2895,11 @@ irmp_ISR (void)
 #endif\r
 #if IRMP_SUPPORT_ROOMBA_PROTOCOL == 1\r
                         if (irmp_param.protocol == IRMP_ROOMBA_PROTOCOL &&                          // Roomba has no stop bit\r
-                            irmp_bit >= ROOMBA_COMPLETE_DATA_LEN - 1)                               // it's the last datab bit...\r
+                            irmp_bit >= ROOMBA_COMPLETE_DATA_LEN - 1)                               // it's the last data bit...\r
                         {                                                                           // break and close this frame\r
                             if (irmp_pulse_time >= ROOMBA_1_PULSE_LEN_MIN && irmp_pulse_time <= ROOMBA_1_PULSE_LEN_MAX)\r
                             {\r
-                                irmp_pause_time = ROOMBA_1_PAUSE_LEN;\r
+                                irmp_pause_time = ROOMBA_1_PAUSE_LEN_EXACT;\r
                             }\r
                             else if (irmp_pulse_time >= ROOMBA_0_PULSE_LEN_MIN && irmp_pulse_time <= ROOMBA_0_PULSE_LEN_MAX)\r
                             {\r
@@ -2914,6 +2970,26 @@ irmp_ISR (void)
                             }\r
 #endif // IRMP_SUPPORT_JVC_PROTOCOL == 1\r
 #endif // IRMP_SUPPORT_NEC42_PROTOCOL == 1\r
+#if IRMP_SUPPORT_RCMM_PROTOCOL == 1\r
+                            else if (irmp_param.protocol == IRMP_RCMM32_PROTOCOL && (irmp_bit == 12 || irmp_bit == 24))  // it was a RCMM stop bit\r
+                            {\r
+                                if (irmp_bit == 12)\r
+                                {\r
+                                    irmp_tmp_command = (irmp_tmp_address & 0xFF);                   // set command: lower 8 bits are command bits\r
+                                    irmp_tmp_address >>= 8;                                         // upper 4 bits are address bits\r
+\r
+                                    ANALYZE_PRINTF ("Switching to RCMM12 protocol, irmp_bit = %d\n", irmp_bit);\r
+                                    irmp_param.protocol     = IRMP_RCMM12_PROTOCOL;                 // switch protocol\r
+                                }\r
+                                else // if ((irmp_bit == 24)\r
+                                {\r
+                                    ANALYZE_PRINTF ("Switching to RCMM24 protocol, irmp_bit = %d\n", irmp_bit);\r
+                                    irmp_param.protocol     = IRMP_RCMM24_PROTOCOL;                 // switch protocol\r
+                                }\r
+                                irmp_param.stop_bit     = TRUE;                                     // set flag\r
+                                irmp_param.complete_len = irmp_bit;                                 // patch length\r
+                            }\r
+#endif // IRMP_SUPPORT_RCMM_PROTOCOL == 1\r
                             else\r
                             {\r
                                 ANALYZE_PRINTF ("error 2: pause %d after data bit %d too long\n", irmp_pause_time, irmp_bit);\r
@@ -3319,6 +3395,43 @@ irmp_ISR (void)
                     else\r
 #endif // IRMP_SUPPORT_BANG_OLUFSEN_PROTOCOL\r
 \r
+#if IRMP_SUPPORT_RCMM_PROTOCOL == 1\r
+                    if (irmp_param.protocol == IRMP_RCMM32_PROTOCOL)\r
+                    {\r
+                        if (irmp_pause_time >= RCMM32_BIT_00_PAUSE_LEN_MIN && irmp_pause_time <= RCMM32_BIT_00_PAUSE_LEN_MAX)\r
+                        {\r
+                            ANALYZE_PUTCHAR ('0');\r
+                            ANALYZE_PUTCHAR ('0');\r
+                            irmp_store_bit (0);\r
+                            irmp_store_bit (0);\r
+                        }\r
+                        else if (irmp_pause_time >= RCMM32_BIT_01_PAUSE_LEN_MIN && irmp_pause_time <= RCMM32_BIT_01_PAUSE_LEN_MAX)\r
+                        {\r
+                            ANALYZE_PUTCHAR ('0');\r
+                            ANALYZE_PUTCHAR ('1');\r
+                            irmp_store_bit (0);\r
+                            irmp_store_bit (1);\r
+                        }\r
+                        else if (irmp_pause_time >= RCMM32_BIT_10_PAUSE_LEN_MIN && irmp_pause_time <= RCMM32_BIT_10_PAUSE_LEN_MAX)\r
+                        {\r
+                            ANALYZE_PUTCHAR ('1');\r
+                            ANALYZE_PUTCHAR ('0');\r
+                            irmp_store_bit (1);\r
+                            irmp_store_bit (0);\r
+                        }\r
+                        else if (irmp_pause_time >= RCMM32_BIT_11_PAUSE_LEN_MIN && irmp_pause_time <= RCMM32_BIT_11_PAUSE_LEN_MAX)\r
+                        {\r
+                            ANALYZE_PUTCHAR ('1');\r
+                            ANALYZE_PUTCHAR ('1');\r
+                            irmp_store_bit (1);\r
+                            irmp_store_bit (1);\r
+                        }\r
+                        ANALYZE_PRINTF ("\n");\r
+                        wait_for_space = 0;\r
+                    }\r
+                    else\r
+#endif\r
\r
                     if (irmp_pulse_time >= irmp_param.pulse_1_len_min && irmp_pulse_time <= irmp_param.pulse_1_len_max &&\r
                         irmp_pause_time >= irmp_param.pause_1_len_min && irmp_pause_time <= irmp_param.pause_1_len_max)\r
                     {                                                               // pulse & pause timings correct for "1"?\r
@@ -3810,6 +3923,19 @@ print_timings (void)
             LEGO_PULSE_LEN_MIN, LEGO_PULSE_LEN_MAX, LEGO_0_PAUSE_LEN_MIN, LEGO_0_PAUSE_LEN_MAX,\r
             LEGO_PULSE_LEN_MIN, LEGO_PULSE_LEN_MAX, LEGO_1_PAUSE_LEN_MIN, LEGO_1_PAUSE_LEN_MAX);\r
 \r
+    printf ("\n");\r
+    printf ("PROTOCOL       S  S-PULSE    S-PAUSE    PULSE      PAUSE-00   PAUSE-01   PAUSE-10   PAUSE-11\n");\r
+    printf ("================================================================================================\n");\r
+    printf ("RCMM           1   %3d        %3d        %3d        %3d        %3d        %3d        %3d\n",\r
+            (uint8_t)(F_INTERRUPTS * RCMM32_START_BIT_PULSE_TIME), (uint8_t)(F_INTERRUPTS * RCMM32_START_BIT_PAUSE_TIME),\r
+            (uint8_t)(F_INTERRUPTS * RCMM32_PULSE_TIME),\r
+            (uint8_t)(F_INTERRUPTS * RCMM32_00_PAUSE_TIME), (uint8_t)(F_INTERRUPTS * RCMM32_01_PAUSE_TIME),\r
+            (uint8_t)(F_INTERRUPTS * RCMM32_10_PAUSE_TIME), (uint8_t)(F_INTERRUPTS * RCMM32_11_PAUSE_TIME));\r
+    printf ("RCMM           1  %3d - %3d  %3d - %3d  %3d - %3d  %3d - %3d  %3d - %3d  %3d - %3d  %3d - %3d\n",\r
+            RCMM32_START_BIT_PULSE_LEN_MIN, RCMM32_START_BIT_PULSE_LEN_MAX, RCMM32_START_BIT_PAUSE_LEN_MIN, RCMM32_START_BIT_PAUSE_LEN_MAX,\r
+            RCMM32_BIT_PULSE_LEN_MIN, RCMM32_BIT_PULSE_LEN_MAX, RCMM32_BIT_00_PAUSE_LEN_MIN, RCMM32_BIT_00_PAUSE_LEN_MAX,\r
+            RCMM32_BIT_01_PAUSE_LEN_MIN, RCMM32_BIT_01_PAUSE_LEN_MAX, RCMM32_BIT_10_PAUSE_LEN_MIN, RCMM32_BIT_10_PAUSE_LEN_MAX,\r
+            RCMM32_BIT_11_PAUSE_LEN_MIN, RCMM32_BIT_11_PAUSE_LEN_MAX);\r
 }\r
 \r
 void\r