Version 2.6.0: added SAMSUNG48 protocol (yet only in IRMP).

[irmp.git] / irmp.c

diff --git a/irmp.c b/irmp.c
index 0753e0d7ccb4784dc8e343577432607ce165a46d..cd12f2921d569ac0d1fd01cdb097aaa64977733a 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.155 2014/07/01 09:43:13 fm Exp $\r
+ * $Id: irmp.c,v 1.158 2014/07/09 15:03:49 fm Exp $\r
  *\r
  * ATMEGA88 @ 8 MHz\r
  *\r
@@ -542,6 +542,7 @@ irmp_protocol_names[IRMP_N_PROTOCOLS + 1] =
     "RCMM12",\r
     "SPEAKER",\r
     "LGAIR",\r
+    "SAMSG48",\r
     "RADIO1"\r
 };\r
 \r
@@ -1827,7 +1828,15 @@ irmp_get_data (IRMP_DATA * irmp_data_p)
                     rtc = TRUE;\r
                 }\r
                 break;\r
+\r
+#if IRMP_SUPPORT_SAMSUNG48_PROTOCOL == 1\r
+            case IRMP_SAMSUNG48_PROTOCOL:\r
+                irmp_command = (irmp_command & 0x00FF) | ((irmp_id & 0x00FF) << 8);\r
+                rtc = TRUE;\r
+                break;\r
+#endif\r
 #endif\r
+\r
 #if IRMP_SUPPORT_NEC_PROTOCOL == 1\r
             case IRMP_NEC_PROTOCOL:\r
                 if ((irmp_command >> 8) == (~irmp_command & 0x00FF))\r
@@ -2001,7 +2010,7 @@ irmp_set_callback_ptr (void (*cb)(uint8_t))
 static uint16_t irmp_tmp_address;                                                       // ir address\r
 static uint16_t irmp_tmp_command;                                                       // ir command\r
 \r
-#if IRMP_SUPPORT_RC5_PROTOCOL == 1 && (IRMP_SUPPORT_FDC_PROTOCOL == 1 || IRMP_SUPPORT_RCCAR_PROTOCOL == 1) || IRMP_SUPPORT_NEC42_PROTOCOL == 1\r
+#if (IRMP_SUPPORT_RC5_PROTOCOL == 1 && (IRMP_SUPPORT_FDC_PROTOCOL == 1 || IRMP_SUPPORT_RCCAR_PROTOCOL == 1)) || IRMP_SUPPORT_NEC42_PROTOCOL == 1\r
 static uint16_t irmp_tmp_address2;                                                      // ir address\r
 static uint16_t irmp_tmp_command2;                                                      // ir command\r
 #endif\r
@@ -2097,7 +2106,16 @@ irmp_store_bit (uint8_t value)
     {\r
         if (irmp_param.lsb_first)\r
         {\r
-            irmp_tmp_command |= (((uint16_t) (value)) << (irmp_bit - irmp_param.command_offset));   // CV wants cast\r
+#if IRMP_SUPPORT_SAMSUNG48_PROTOCOL == 1\r
+            if (irmp_param.protocol == IRMP_SAMSUNG48_PROTOCOL && irmp_bit >= 32)\r
+            {\r
+                irmp_tmp_id |= (((uint16_t) (value)) << (irmp_bit - 32));   // CV wants cast\r
+            }\r
+            else\r
+#endif\r
+            {\r
+                irmp_tmp_command |= (((uint16_t) (value)) << (irmp_bit - irmp_param.command_offset));   // CV wants cast\r
+            }\r
         }\r
         else\r
         {\r
@@ -2314,8 +2332,8 @@ irmp_ISR (void)
                             {\r
 #ifdef ANALYZE\r
                                 ANALYZE_PRINTF ("%8.3fms warning: did not receive inverted command repetition\n",\r
-#endif // ANALYZE\r
                                                 (double) (time_counter * 1000) / F_INTERRUPTS);\r
+#endif // ANALYZE\r
                                 last_irmp_denon_command = 0;\r
                                 denon_repetition_len = 0xFFFF;\r
                             }\r
@@ -3358,6 +3376,20 @@ irmp_ISR (void)
                             }\r
 #endif // IRMP_SUPPORT_JVC_PROTOCOL == 1\r
 #endif // IRMP_SUPPORT_NEC42_PROTOCOL == 1\r
+\r
+#if IRMP_SUPPORT_SAMSUNG48_PROTOCOL == 1\r
+                            else if (irmp_param.protocol == IRMP_SAMSUNG48_PROTOCOL && irmp_bit == 32)          // it was a SAMSUNG32 stop bit\r
+                            {\r
+#ifdef ANALYZE\r
+                                ANALYZE_PRINTF ("Switching to SAMSUNG32 protocol\n");\r
+#endif // ANALYZE\r
+                                irmp_param.protocol         = IRMP_SAMSUNG32_PROTOCOL;\r
+                                irmp_param.command_offset   = SAMSUNG32_COMMAND_OFFSET;\r
+                                irmp_param.command_end      = SAMSUNG32_COMMAND_OFFSET + SAMSUNG32_COMMAND_LEN;\r
+                                irmp_param.complete_len     = SAMSUNG32_COMPLETE_DATA_LEN;\r
+                            }\r
+#endif // IRMP_SUPPORT_SAMSUNG_PROTOCOL == 1\r
+\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
@@ -3694,11 +3726,23 @@ irmp_ISR (void)
                         }\r
                         else  if (irmp_pulse_time >= SAMSUNG_PULSE_LEN_MIN && irmp_pulse_time <= SAMSUNG_PULSE_LEN_MAX)\r
                         {\r
+#if IRMP_SUPPORT_SAMSUNG48_PROTOCOL == 1\r
+#ifdef ANALYZE\r
+                            ANALYZE_PRINTF ("Switching to SAMSUNG48 protocol ");\r
+#endif // ANALYZE\r
+                            irmp_param.protocol         = IRMP_SAMSUNG48_PROTOCOL;\r
+                            irmp_param.command_offset   = SAMSUNG48_COMMAND_OFFSET;\r
+                            irmp_param.command_end      = SAMSUNG48_COMMAND_OFFSET + SAMSUNG48_COMMAND_LEN;\r
+                            irmp_param.complete_len     = SAMSUNG48_COMPLETE_DATA_LEN;\r
+#else\r
+#ifdef ANALYZE\r
+                            ANALYZE_PRINTF ("Switching to SAMSUNG32 protocol ");\r
+#endif // ANALYZE\r
                             irmp_param.protocol         = IRMP_SAMSUNG32_PROTOCOL;\r
                             irmp_param.command_offset   = SAMSUNG32_COMMAND_OFFSET;\r
                             irmp_param.command_end      = SAMSUNG32_COMMAND_OFFSET + SAMSUNG32_COMMAND_LEN;\r
                             irmp_param.complete_len     = SAMSUNG32_COMPLETE_DATA_LEN;\r
-\r
+#endif\r
                             if (irmp_pause_time >= SAMSUNG_1_PAUSE_LEN_MIN && irmp_pause_time <= SAMSUNG_1_PAUSE_LEN_MAX)\r
                             {\r
 #ifdef ANALYZE\r
@@ -3717,10 +3761,6 @@ irmp_ISR (void)
                                 irmp_store_bit (0);\r
                                 wait_for_space = 0;\r
                             }\r
-\r
-#ifdef ANALYZE\r
-                            ANALYZE_PRINTF ("Switching to SAMSUNG32 protocol\n");\r
-#endif // ANALYZE\r
                         }\r
                         else\r
                         {                                                           // timing incorrect!\r
@@ -4032,11 +4072,11 @@ irmp_ISR (void)
 #endif\r
 \r
 #if IRMP_SUPPORT_SAMSUNG_PROTOCOL == 1\r
-                // if SAMSUNG32 protocol and the code will be repeated within 50 ms, we will ignore every 2nd frame\r
-                if (irmp_param.protocol == IRMP_SAMSUNG32_PROTOCOL && (repetition_frame_number & 0x01))\r
+                // if SAMSUNG32 or SAMSUNG48 protocol and the code will be repeated within 50 ms, we will ignore every 2nd frame\r
+                if ((irmp_param.protocol == IRMP_SAMSUNG32_PROTOCOL || irmp_param.protocol == IRMP_SAMSUNG48_PROTOCOL) && (repetition_frame_number & 0x01))\r
                 {\r
 #ifdef ANALYZE\r
-                    ANALYZE_PRINTF ("code skipped: SAMSUNG32 auto repetition frame #%d, counter = %d, auto repetition len = %d\n",\r
+                    ANALYZE_PRINTF ("code skipped: SAMSUNG32/SAMSUNG48 auto repetition frame #%d, counter = %d, auto repetition len = %d\n",\r
                                     repetition_frame_number + 1, key_repetition_len, AUTO_FRAME_REPETITION_LEN);\r
 #endif // ANALYZE\r
                     key_repetition_len = 0;\r