]> cloudbase.mooo.com Git - irmp.git/blobdiff - irmp.c
Version 1.7.2: added timeout for NEC repetition frames
[irmp.git] / irmp.c
diff --git a/irmp.c b/irmp.c
index 9df07d33db85b7cb490e39ecc3b1451f4c80c54a..861836c4b1298e178d315ded08337679fa400a6c 100644 (file)
--- a/irmp.c
+++ b/irmp.c
@@ -3,7 +3,7 @@
  *\r
  * Copyright (c) 2009-2010 Frank Meyer - frank(at)fli4l.de\r
  *\r
- * $Id: irmp.c,v 1.62 2010/06/23 10:48:58 fm Exp $\r
+ * $Id: irmp.c,v 1.75 2010/07/01 09:00:16 fm Exp $\r
  *\r
  * ATMEGA88 @ 8 MHz\r
  *\r
  *\r
  *---------------------------------------------------------------------------------------------------------------------------------------------------\r
  *\r
+ *   SIEMENS:\r
+ *   --------\r
+ *\r
+ *   SIEMENS frame:  1 start bit + 22 data bits + no stop bit\r
+ *   SIEMENS data:   13 address bits + 1 repeat bit + 7 data bits + 1 unknown bit\r
+ *\r
+ *   start  bit           data "0":            data "1":\r
+ *   -------_______       _______-------       -------_______\r
+ *    250us  250us         250us  250us         250us  250us\r
+ *\r
+ *---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ *\r
  *   PANASONIC (older protocol, yet not implemented, see also MATSUSHITA, timing very similar)\r
  *   -----------------------------------------------------------------------------------------\r
  *\r
@@ -334,14 +346,13 @@ typedef unsigned int16  uint16_t;
 #define IRMP_TIMEOUT_TIME_MS                    16500L                      // timeout after 16.5 ms darkness\r
 \r
 #if (F_INTERRUPTS * IRMP_TIMEOUT_TIME_MS) / 1000000 >= 254\r
-#define IRMP_TIMEOUT_LEN                        (uint16_t)(F_INTERRUPTS * IRMP_TIMEOUT_TIME + 0.5)\r
 typedef uint16_t    PAUSE_LEN;\r
 #else\r
-#define IRMP_TIMEOUT_LEN                        (uint8_t)(F_INTERRUPTS * IRMP_TIMEOUT_TIME + 0.5)\r
 typedef uint8_t     PAUSE_LEN;\r
 #endif\r
 \r
-#define IRMP_KEY_REPETITION_LEN                 (uint16_t)(F_INTERRUPTS * 150.0e-3 + 0.5)  // autodetect key repetition within 150 msec\r
+#define IRMP_TIMEOUT_LEN                        (PAUSE_LEN)(F_INTERRUPTS * IRMP_TIMEOUT_TIME + 0.5)\r
+#define IRMP_KEY_REPETITION_LEN                 (uint16_t)(F_INTERRUPTS * 150.0e-3 + 0.5)           // autodetect key repetition within 150 msec\r
 \r
 #define MIN_TOLERANCE_00                        1.0                           // -0%\r
 #define MAX_TOLERANCE_00                        1.0                           // +0%\r
@@ -393,6 +404,13 @@ typedef uint8_t     PAUSE_LEN;
 #define NEC_1_PAUSE_LEN_MAX                     ((uint8_t)(F_INTERRUPTS * NEC_1_PAUSE_TIME * MAX_TOLERANCE_40 + 0.5) + 1)\r
 #define NEC_0_PAUSE_LEN_MIN                     ((uint8_t)(F_INTERRUPTS * NEC_0_PAUSE_TIME * MIN_TOLERANCE_40 + 0.5) - 1)\r
 #define NEC_0_PAUSE_LEN_MAX                     ((uint8_t)(F_INTERRUPTS * NEC_0_PAUSE_TIME * MAX_TOLERANCE_40 + 0.5) + 1)\r
+// autodetect nec repetition frame within 50 msec:\r
+// NEC seems to send the first repetition frame after 40ms, further repetition frames after 100 ms\r
+#if 0\r
+#define NEC_FRAME_REPEAT_PAUSE_LEN_MAX          (uint16_t)(F_INTERRUPTS * NEC_FRAME_REPEAT_PAUSE_TIME * MAX_TOLERANCE_20 + 0.5)\r
+#else\r
+#define NEC_FRAME_REPEAT_PAUSE_LEN_MAX          (uint16_t)(F_INTERRUPTS * 100.0e-3 * MAX_TOLERANCE_20 + 0.5)\r
+#endif\r
 \r
 #define SAMSUNG_START_BIT_PULSE_LEN_MIN         ((uint8_t)(F_INTERRUPTS * SAMSUNG_START_BIT_PULSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
 #define SAMSUNG_START_BIT_PULSE_LEN_MAX         ((uint8_t)(F_INTERRUPTS * SAMSUNG_START_BIT_PULSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
@@ -494,7 +512,7 @@ typedef uint8_t     PAUSE_LEN;
 #define BANG_OLUFSEN_START_BIT3_PULSE_LEN_MIN   ((uint8_t)(F_INTERRUPTS * BANG_OLUFSEN_START_BIT3_PULSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
 #define BANG_OLUFSEN_START_BIT3_PULSE_LEN_MAX   ((uint8_t)(F_INTERRUPTS * BANG_OLUFSEN_START_BIT3_PULSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
 #define BANG_OLUFSEN_START_BIT3_PAUSE_LEN_MIN   ((uint8_t)(F_INTERRUPTS * BANG_OLUFSEN_START_BIT3_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
-#define BANG_OLUFSEN_START_BIT3_PAUSE_LEN_MAX   ((uint8_t)(F_INTERRUPTS * BANG_OLUFSEN_START_BIT3_PAUSE_TIME * MAX_TOLERANCE_05 + 0.5) + 1) // 10% is too big (uint8_t)\r
+#define BANG_OLUFSEN_START_BIT3_PAUSE_LEN_MAX   ((PAUSE_LEN)(F_INTERRUPTS * BANG_OLUFSEN_START_BIT3_PAUSE_TIME * MAX_TOLERANCE_05 + 0.5) + 1) // value must be below IRMP_TIMEOUT\r
 #define BANG_OLUFSEN_START_BIT4_PULSE_LEN_MIN   ((uint8_t)(F_INTERRUPTS * BANG_OLUFSEN_START_BIT4_PULSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
 #define BANG_OLUFSEN_START_BIT4_PULSE_LEN_MAX   ((uint8_t)(F_INTERRUPTS * BANG_OLUFSEN_START_BIT4_PULSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
 #define BANG_OLUFSEN_START_BIT4_PAUSE_LEN_MIN   ((uint8_t)(F_INTERRUPTS * BANG_OLUFSEN_START_BIT4_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
@@ -619,9 +637,9 @@ irmp_uart_init (void)
     UART0_UBRRL = UBRRL_VALUE;\r
 \r
 #if USE_2X\r
-    UART0_UCSRA = (1<<U2X);\r
+    UART0_UCSRA |= (1<<U2X);\r
 #else\r
-    UART0_UCSRA = 0;\r
+    UART0_UCSRA &= ~(1<<U2X);\r
 #endif\r
 \r
     UART0_UCSRC = UART0_UCSZ1_BIT_VALUE | UART0_UCSZ0_BIT_VALUE | UART0_URSEL_BIT_VALUE;\r
@@ -1449,7 +1467,10 @@ irmp_ISR (void)
                 }\r
                 else\r
                 {\r
-                    repetition_counter++;\r
+                    if (repetition_counter < 0xFFFF)                            // avoid overflow of counter\r
+                    {\r
+                        repetition_counter++;\r
+                    }\r
                 }\r
             }\r
         }\r
@@ -2380,9 +2401,20 @@ irmp_ISR (void)
 #if IRMP_SUPPORT_NEC_PROTOCOL == 1\r
                         if (irmp_param.protocol == IRMP_NEC_PROTOCOL && irmp_bit == 0)  // repetition frame\r
                         {\r
-                            irmp_tmp_address = last_irmp_address;                   // address is last address\r
-                            irmp_tmp_command = last_irmp_command;                   // command is last command\r
-                            irmp_flags |= IRMP_FLAG_REPETITION;\r
+                            if (repetition_counter < NEC_FRAME_REPEAT_PAUSE_LEN_MAX)\r
+                            {\r
+                                ANALYZE_PRINTF ("Detected NEC repetition frame, repetition_counter = %d\n", repetition_counter);\r
+                                irmp_tmp_address = last_irmp_address;                   // address is last address\r
+                                irmp_tmp_command = last_irmp_command;                   // command is last command\r
+                                irmp_flags |= IRMP_FLAG_REPETITION;\r
+                                repetition_counter = 0;\r
+                            }\r
+                            else\r
+                            {\r
+                                ANALYZE_PRINTF ("Detected NEC repetition frame, ignoring it: timeout occured, repetition_counter = %d > %d\n",\r
+                                                repetition_counter, NEC_FRAME_REPEAT_PAUSE_LEN_MAX);\r
+                                irmp_ir_detected = FALSE;\r
+                            }\r
                         }\r
 #endif // IRMP_SUPPORT_NEC_PROTOCOL\r
                         irmp_protocol = irmp_param.protocol;\r
@@ -2453,22 +2485,31 @@ irmp_ISR (void)
 \r
 #ifdef ANALYZE\r
 \r
-// main function - for unix/linux + windows only!\r
-// AVR: see main.c!\r
-// Compile it under linux with:\r
-// cc irmp.c -o irmp\r
-//\r
-// usage: ./irmp [-v|-s|-a|-l|-p] < file\r
-// options:\r
-//   -v verbose\r
-//   -s silent\r
-//   -a analyze\r
-//   -l list pulse/pauses\r
-//   -p print timings\r
+/*---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ * main functions - for Unix/Linux + Windows only!\r
+ *\r
+ * AVR: see main.c!\r
+ *\r
+ * Compile it under linux with:\r
+ * cc irmp.c -o irmp\r
+ *\r
+ * usage: ./irmp [-v|-s|-a|-l|-p] < file\r
+ *\r
+ * options:\r
+ *   -v verbose\r
+ *   -s silent\r
+ *   -a analyze\r
+ *   -l list pulse/pauses\r
+ *   -p print timings\r
+ *---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ */\r
 \r
 static void\r
 print_timings (void)\r
 {\r
+    printf ("IRMP_TIMEOUT_LEN:        %d\n", IRMP_TIMEOUT_LEN);\r
+    printf ("IRMP_KEY_REPETITION_LEN  %d\n", IRMP_KEY_REPETITION_LEN);\r
+    puts ("");\r
     printf ("PROTOCOL       S  S-PULSE    S-PAUSE    PULSE-0    PAUSE-0    PULSE-1    PAUSE-1\n");\r
     printf ("====================================================================================\n");\r
     printf ("SIRCS          1  %3d - %3d  %3d - %3d  %3d - %3d  %3d - %3d  %3d - %3d  %3d - %3d\n",\r
@@ -2533,6 +2574,10 @@ print_timings (void)
             BANG_OLUFSEN_START_BIT1_PULSE_LEN_MIN, BANG_OLUFSEN_START_BIT1_PULSE_LEN_MAX,\r
             BANG_OLUFSEN_START_BIT1_PAUSE_LEN_MIN, BANG_OLUFSEN_START_BIT1_PAUSE_LEN_MAX);\r
 \r
+    printf ("BANG_OLUFSEN   2  %3d - %3d  %3d - %3d\n",\r
+            BANG_OLUFSEN_START_BIT2_PULSE_LEN_MIN, BANG_OLUFSEN_START_BIT2_PULSE_LEN_MAX,\r
+            BANG_OLUFSEN_START_BIT2_PAUSE_LEN_MIN, BANG_OLUFSEN_START_BIT2_PAUSE_LEN_MAX);\r
+\r
     printf ("BANG_OLUFSEN   3  %3d - %3d  %3d - %3d\n",\r
             BANG_OLUFSEN_START_BIT3_PULSE_LEN_MIN, BANG_OLUFSEN_START_BIT3_PULSE_LEN_MAX,\r
             BANG_OLUFSEN_START_BIT3_PAUSE_LEN_MIN, BANG_OLUFSEN_START_BIT3_PAUSE_LEN_MAX);\r
@@ -2660,21 +2705,24 @@ print_spectrum (char * text, int * buf, int is_pulse)
 #define KEY_STOP            0x86            // keycode = 0x0076\r
 #define KEY_MAIL            0x87            // keycode = 0x0077\r
 #define KEY_FAVORITES       0x88            // keycode = 0x0078\r
-#define KEY_NEW_PAGE        0x99            // keycode = 0x0079\r
-#define KEY_SETUP           0x9A            // keycode = 0x007a\r
-#define KEY_FONT            0x9B            // keycode = 0x007b\r
-#define KEY_ON_OFF          0x9C            // keycode = 0x007c\r
-\r
-#define KEY_INSERT          0xA0            // keycode = 0x004b\r
-#define KEY_DELETE          0xA1            // keycode = 0x004c\r
-#define KEY_LEFT            0xA2            // keycode = 0x004f\r
-#define KEY_HOME            0xA3            // keycode = 0x0050\r
-#define KEY_END             0xA4            // keycode = 0x0051\r
-#define KEY_UP              0xA5            // keycode = 0x0053\r
-#define KEY_DOWN            0xA6            // keycode = 0x0054\r
-#define KEY_PAGE_UP         0xA7            // keycode = 0x0055\r
-#define KEY_PAGE_DOWN       0xA8            // keycode = 0x0056\r
-#define KEY_RIGHT           0xA9            // keycode = 0x0059\r
+#define KEY_NEW_PAGE        0x89            // keycode = 0x0079\r
+#define KEY_SETUP           0x8A            // keycode = 0x007a\r
+#define KEY_FONT            0x8B            // keycode = 0x007b\r
+#define KEY_PRINT           0x8C            // keycode = 0x007c\r
+#define KEY_ON_OFF          0x8E            // keycode = 0x007c\r
+\r
+#define KEY_INSERT          0x90            // keycode = 0x004b\r
+#define KEY_DELETE          0x91            // keycode = 0x004c\r
+#define KEY_LEFT            0x92            // keycode = 0x004f\r
+#define KEY_HOME            0x93            // keycode = 0x0050\r
+#define KEY_END             0x94            // keycode = 0x0051\r
+#define KEY_UP              0x95            // keycode = 0x0053\r
+#define KEY_DOWN            0x96            // keycode = 0x0054\r
+#define KEY_PAGE_UP         0x97            // keycode = 0x0055\r
+#define KEY_PAGE_DOWN       0x98            // keycode = 0x0056\r
+#define KEY_RIGHT           0x99            // keycode = 0x0059\r
+#define KEY_MOUSE_1         0x9E            // keycode = 0x0400\r
+#define KEY_MOUSE_2         0x9F            // keycode = 0x0800\r
 \r
 static uint8_t\r
 get_fdc_key (uint16_t cmd)\r
@@ -2720,6 +2768,8 @@ get_fdc_key (uint16_t cmd)
         case 0x0055: key = KEY_PAGE_UP;             break;\r
         case 0x0056: key = KEY_PAGE_DOWN;           break;\r
         case 0x0059: key = KEY_RIGHT;               break;\r
+        case 0x0400: key = KEY_MOUSE_1;             break;\r
+        case 0x0800: key = KEY_MOUSE_2;             break;\r
 \r
         default:\r
         {\r
@@ -2752,6 +2802,10 @@ get_fdc_key (uint16_t cmd)
                         {\r
                             key = key_table[cmd] - 'a' + 1;\r
                         }\r
+                        else\r
+                        {\r
+                            key = key_table[cmd];\r
+                        }\r
                     }\r
                     else\r
                     {\r
@@ -2957,11 +3011,53 @@ main (int argc, char ** argv)
 \r
                 if (irmp_data.protocol == IRMP_FDC_PROTOCOL && (key = get_fdc_key (irmp_data.command)) != 0)\r
                 {\r
-                    if (key >= 32 && key < 0x7F)\r
+                    if ((key >= 0x20 && key < 0x7F) || key >= 0xA0)\r
                     {\r
-                        printf ("p = %2d, a = 0x%04x, c = 0x%04x, f = 0x%02x, asc = 0x%02x, key = %c\n",\r
+                        printf ("p = %2d, a = 0x%04x, c = 0x%04x, f = 0x%02x, asc = 0x%02x, key = '%c'\n",\r
                                 irmp_data.protocol, irmp_data.address, irmp_data.command, irmp_data.flags, key, key);\r
                     }\r
+                    else if (key == '\r' || key == '\t' || key == KEY_ESCAPE || (key >= 0x80 && key <= 0x9F))                 // function keys\r
+                    {\r
+                        char * p = (char *) NULL;\r
+\r
+                        switch (key)\r
+                        {\r
+                            case '\t'                : p = "TAB";           break;\r
+                            case '\r'                : p = "CR";            break;\r
+                            case KEY_ESCAPE          : p = "ESCAPE";        break;\r
+                            case KEY_MENUE           : p = "MENUE";         break;\r
+                            case KEY_BACK            : p = "BACK";          break;\r
+                            case KEY_FORWARD         : p = "FORWARD";       break;\r
+                            case KEY_ADDRESS         : p = "ADDRESS";       break;\r
+                            case KEY_WINDOW          : p = "WINDOW";        break;\r
+                            case KEY_1ST_PAGE        : p = "1ST_PAGE";      break;\r
+                            case KEY_STOP            : p = "STOP";          break;\r
+                            case KEY_MAIL            : p = "MAIL";          break;\r
+                            case KEY_FAVORITES       : p = "FAVORITES";     break;\r
+                            case KEY_NEW_PAGE        : p = "NEW_PAGE";      break;\r
+                            case KEY_SETUP           : p = "SETUP";         break;\r
+                            case KEY_FONT            : p = "FONT";          break;\r
+                            case KEY_PRINT           : p = "PRINT";         break;\r
+                            case KEY_ON_OFF          : p = "ON_OFF";        break;\r
+\r
+                            case KEY_INSERT          : p = "INSERT";        break;\r
+                            case KEY_DELETE          : p = "DELETE";        break;\r
+                            case KEY_LEFT            : p = "LEFT";          break;\r
+                            case KEY_HOME            : p = "HOME";          break;\r
+                            case KEY_END             : p = "END";           break;\r
+                            case KEY_UP              : p = "UP";            break;\r
+                            case KEY_DOWN            : p = "DOWN";          break;\r
+                            case KEY_PAGE_UP         : p = "PAGE_UP";       break;\r
+                            case KEY_PAGE_DOWN       : p = "PAGE_DOWN";     break;\r
+                            case KEY_RIGHT           : p = "RIGHT";         break;\r
+                            case KEY_MOUSE_1         : p = "KEY_MOUSE_1";   break;\r
+                            case KEY_MOUSE_2         : p = "KEY_MOUSE_2";   break;\r
+                            default                  : p = "<UNKNWON>";     break;\r
+                        }\r
+\r
+                        printf ("p = %2d, a = 0x%04x, c = 0x%04x, f = 0x%02x, asc = 0x%02x, key = %s\n",\r
+                                irmp_data.protocol, irmp_data.address, irmp_data.command, irmp_data.flags, key, p);\r
+                    }\r
                     else\r
                     {\r
                         printf ("p = %2d, a = 0x%04x, c = 0x%04x, f = 0x%02x, asc = 0x%02x\n",\r