]> cloudbase.mooo.com Git - irmp.git/blobdiff - irsnd.c
corrected additional bit handling in SIRCS protocol
[irmp.git] / irsnd.c
diff --git a/irsnd.c b/irsnd.c
index b50054222e4569928f8c52a81d45acd99a1d1fd8..efae8e4e6288adb2afeb1a397f961e2547799960 100644 (file)
--- a/irsnd.c
+++ b/irsnd.c
@@ -3,7 +3,7 @@
  *\r
  * Copyright (c) 2010 Frank Meyer - frank(at)fli4l.de\r
  *\r
- * $Id: irsnd.c,v 1.26 2010/11/09 21:14:31 fm Exp $\r
+ * $Id: irsnd.c,v 1.28 2011/01/13 15:54:57 fm Exp $\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
@@ -315,6 +315,10 @@ bitsrevervse (uint16_t x, uint8_t len)
 }\r
 \r
 \r
+#if IRSND_SUPPORT_SIRCS_PROTOCOL == 1\r
+static uint8_t  sircs_additional_bitlen;\r
+#endif // IRSND_SUPPORT_SIRCS_PROTOCOL == 1\r
+\r
 uint8_t\r
 irsnd_send_data (IRMP_DATA * irmp_data_p, uint8_t do_wait)\r
 {\r
@@ -326,6 +330,9 @@ irsnd_send_data (IRMP_DATA * irmp_data_p, uint8_t do_wait)
 #endif\r
 #if IRSND_SUPPORT_RC5_PROTOCOL == 1\r
     static uint8_t  toggle_bit_rc5;\r
+#endif\r
+#if IRSND_SUPPORT_RC5_PROTOCOL == 1\r
+    static uint8_t  toggle_bit_rc6;\r
 #endif\r
     uint16_t        address;\r
     uint16_t        command;\r
@@ -350,10 +357,33 @@ irsnd_send_data (IRMP_DATA * irmp_data_p, uint8_t do_wait)
 #if IRSND_SUPPORT_SIRCS_PROTOCOL == 1\r
         case IRMP_SIRCS_PROTOCOL:\r
         {\r
-            command = bitsrevervse (irmp_data_p->command, SIRCS_MINIMUM_DATA_LEN);\r
+            uint8_t  sircs_additional_command_len;\r
+            uint8_t  sircs_additional_address_len;\r
+\r
+            sircs_additional_bitlen = (irmp_data_p->address & 0xFF00) >> 8;                             // additional bitlen\r
+\r
+            if (sircs_additional_bitlen > 15 - SIRCS_MINIMUM_DATA_LEN)\r
+            {\r
+                sircs_additional_command_len = 15 - SIRCS_MINIMUM_DATA_LEN;\r
+                sircs_additional_address_len = sircs_additional_bitlen - (15 - SIRCS_MINIMUM_DATA_LEN);\r
+            }\r
+            else\r
+            {\r
+                sircs_additional_command_len = sircs_additional_bitlen;\r
+                sircs_additional_address_len = 0;\r
+            }\r
 \r
-            irsnd_buffer[0] = (command & 0x0FF0) >> 4;                                                         // CCCCCCCC\r
-            irsnd_buffer[1] = (command & 0x000F) << 4;                                                         // CCCC0000\r
+            command = bitsrevervse (irmp_data_p->command, 15);\r
+\r
+            irsnd_buffer[0] = (command & 0x7F80) >> 7;                                                  // CCCCCCCC\r
+            irsnd_buffer[1] = (command & 0x007F) << 1;                                                  // CCCC****\r
+\r
+            if (sircs_additional_address_len > 0)\r
+            {\r
+                address = bitsrevervse (irmp_data_p->address, 5);\r
+                irsnd_buffer[1] |= (address & 0x0010) >> 4;\r
+                irsnd_buffer[2] =  (address & 0x000F) << 4;\r
+            }\r
             irsnd_busy      = TRUE;\r
             break;\r
         }\r
@@ -495,6 +525,32 @@ irsnd_send_data (IRMP_DATA * irmp_data_p, uint8_t do_wait)
             break;\r
         }\r
 #endif\r
+#if IRSND_SUPPORT_RC6_PROTOCOL == 1\r
+        case IRMP_RC6_PROTOCOL:\r
+        {\r
+            toggle_bit_rc6 = toggle_bit_rc6 ? 0x00 : 0x08;\r
+\r
+            irsnd_buffer[0] = 0x80 | toggle_bit_rc6 | ((irmp_data_p->address & 0x00E0) >> 5);                   // 1MMMTAAA, MMM = 000\r
+            irsnd_buffer[1] = ((irmp_data_p->address & 0x001F) << 3) | ((irmp_data_p->command & 0xE0) >> 5);    // AAAAACCC\r
+            irsnd_buffer[2] = (irmp_data_p->command & 0x1F) << 3;                                               // CCCCC\r
+            irsnd_busy      = TRUE;\r
+            break;\r
+        }\r
+#endif\r
+#if IRSND_SUPPORT_RC6A_PROTOCOL == 1\r
+        case IRMP_RC6A_PROTOCOL:\r
+        {\r
+            toggle_bit_rc6 = toggle_bit_rc6 ? 0x00 : 0x08;\r
+\r
+            irsnd_buffer[0] = 0x80 | 0x60 | ((irmp_data_p->address & 0x3000) >> 12);                                                // 1MMMT0AA, MMM = 110\r
+            irsnd_buffer[1] = ((irmp_data_p->address & 0x0FFF) >> 4) ;                                                              // AAAAAAAA\r
+            irsnd_buffer[2] = ((irmp_data_p->address & 0x000F) << 4) | ((irmp_data_p->command & 0xF000) >> 12) | toggle_bit_rc6;    // AAAACCCC\r
+            irsnd_buffer[3] = (irmp_data_p->command & 0x0FF0) >> 4;                                                                 // CCCCCCCC\r
+            irsnd_buffer[4] = (irmp_data_p->command & 0x000F) << 4;                                                                 // CCCC\r
+            irsnd_busy      = TRUE;\r
+            break;\r
+        }\r
+#endif\r
 #if IRSND_SUPPORT_DENON_PROTOCOL == 1\r
         case IRMP_DENON_PROTOCOL:\r
         {\r
@@ -745,7 +801,7 @@ irsnd_ISR (void)
                         pulse_0_len                 = SIRCS_0_PULSE_LEN;\r
                         pause_0_len                 = SIRCS_PAUSE_LEN;\r
                         has_stop_bit                = SIRCS_STOP_BIT;\r
-                        complete_data_len           = SIRCS_MINIMUM_DATA_LEN;\r
+                        complete_data_len           = SIRCS_MINIMUM_DATA_LEN + sircs_additional_bitlen;\r
                         n_auto_repetitions          = (repeat_counter == 0) ? SIRCS_FRAMES : 1;     // 3 frames auto repetition if first frame\r
                         auto_repetition_pause_len   = SIRCS_AUTO_REPETITION_PAUSE_LEN;              // 25ms pause\r
                         repeat_frame_pause_len      = SIRCS_FRAME_REPEAT_PAUSE_LEN;\r
@@ -904,6 +960,38 @@ irsnd_ISR (void)
                         break;\r
                     }\r
 #endif\r
+#if IRSND_SUPPORT_RC6_PROTOCOL == 1\r
+                    case IRMP_RC6_PROTOCOL:\r
+                    {\r
+                        startbit_pulse_len          = RC6_START_BIT_PULSE_LEN;\r
+                        startbit_pause_len          = RC6_START_BIT_PAUSE_LEN;\r
+                        pulse_len                   = RC6_BIT_LEN;\r
+                        pause_len                   = RC6_BIT_LEN;\r
+                        has_stop_bit                = RC6_STOP_BIT;\r
+                        complete_data_len           = RC6_COMPLETE_DATA_LEN_SHORT;\r
+                        n_auto_repetitions          = 1;                                            // 1 frame\r
+                        auto_repetition_pause_len   = 0;\r
+                        repeat_frame_pause_len      = RC6_FRAME_REPEAT_PAUSE_LEN;\r
+                        irsnd_set_freq (IRSND_FREQ_36_KHZ);\r
+                        break;\r
+                    }\r
+#endif\r
+#if IRSND_SUPPORT_RC6A_PROTOCOL == 1\r
+                    case IRMP_RC6A_PROTOCOL:\r
+                    {\r
+                        startbit_pulse_len          = RC6_START_BIT_PULSE_LEN;\r
+                        startbit_pause_len          = RC6_START_BIT_PAUSE_LEN;\r
+                        pulse_len                   = RC6_BIT_LEN;\r
+                        pause_len                   = RC6_BIT_LEN;\r
+                        has_stop_bit                = RC6_STOP_BIT;\r
+                        complete_data_len           = RC6_COMPLETE_DATA_LEN_LONG;\r
+                        n_auto_repetitions          = 1;                                            // 1 frame\r
+                        auto_repetition_pause_len   = 0;\r
+                        repeat_frame_pause_len      = RC6_FRAME_REPEAT_PAUSE_LEN;\r
+                        irsnd_set_freq (IRSND_FREQ_36_KHZ);\r
+                        break;\r
+                    }\r
+#endif\r
 #if IRSND_SUPPORT_DENON_PROTOCOL == 1\r
                     case IRMP_DENON_PROTOCOL:\r
                     {\r
@@ -1297,6 +1385,12 @@ irsnd_ISR (void)
 #if IRSND_SUPPORT_RC5_PROTOCOL == 1\r
                 case IRMP_RC5_PROTOCOL:\r
 #endif\r
+#if IRSND_SUPPORT_RC6_PROTOCOL == 1\r
+                case IRMP_RC6_PROTOCOL:\r
+#endif\r
+#if IRSND_SUPPORT_RC6A_PROTOCOL == 1\r
+                case IRMP_RC6A_PROTOCOL:\r
+#endif\r
 #if IRSND_SUPPORT_SIEMENS_PROTOCOL == 1\r
                 case IRMP_SIEMENS_PROTOCOL:\r
 #endif\r
@@ -1307,7 +1401,8 @@ irsnd_ISR (void)
                 case IRMP_NOKIA_PROTOCOL:\r
 #endif\r
 \r
-#if IRSND_SUPPORT_RC5_PROTOCOL == 1 || IRSND_SUPPORT_SIEMENS_PROTOCOL == 1 || IRSND_SUPPORT_GRUNDIG_PROTOCOL == 1 || IRSND_SUPPORT_NOKIA_PROTOCOL == 1\r
+#if IRSND_SUPPORT_RC5_PROTOCOL == 1 || IRSND_SUPPORT_RC6_PROTOCOL == 1 || IRSND_SUPPORT_RC6A_PROTOCOL == 1 || IRSND_SUPPORT_SIEMENS_PROTOCOL == 1 || \\r
+    IRSND_SUPPORT_GRUNDIG_PROTOCOL == 1 || IRSND_SUPPORT_NOKIA_PROTOCOL == 1\r
                 {\r
                     if (pulse_counter == pulse_len && pause_counter == pause_len)\r
                     {\r
@@ -1374,15 +1469,51 @@ irsnd_ISR (void)
                                 first_pulse = (irsnd_buffer[current_bit / 8] & (1<<(7-(current_bit % 8)))) ? TRUE : FALSE;\r
                             }\r
                         }\r
-                        else // if (irsnd_protocol == IRMP_RC5_PROTOCOL || irsnd_protocol == IRMP_SIEMENS_PROTOCOL)\r
+                        else // if (irsnd_protocol == IRMP_RC5_PROTOCOL || irsnd_protocol == IRMP_RC6_PROTOCOL || irsnd_protocol == IRMP_RC6A_PROTOCOL ||\r
+                             //     irsnd_protocol == IRMP_SIEMENS_PROTOCOL)\r
 #endif\r
                         {\r
                             if (current_bit == 0xFF)                                                    // 1 start bit\r
                             {\r
+#if IRSND_SUPPORT_RC6_PROTOCOL == 1 || IRSND_SUPPORT_RC6A_PROTOCOL == 1\r
+                                if (irsnd_protocol == IRMP_RC6_PROTOCOL || irsnd_protocol == IRMP_RC6A_PROTOCOL)\r
+                                {\r
+                                    pulse_len = startbit_pulse_len;\r
+                                    pause_len = startbit_pause_len;\r
+                                }\r
+#endif\r
                                 first_pulse = TRUE;\r
                             }\r
                             else                                                                        // send n'th bit\r
                             {\r
+#if IRSND_SUPPORT_RC6_PROTOCOL == 1 || IRSND_SUPPORT_RC6A_PROTOCOL == 1\r
+                                if (irsnd_protocol == IRMP_RC6_PROTOCOL || irsnd_protocol == IRMP_RC6A_PROTOCOL)\r
+                                {\r
+                                    pulse_len = RC6_BIT_LEN;\r
+                                    pause_len = RC6_BIT_LEN;\r
+\r
+                                    if (irsnd_protocol == IRMP_RC6_PROTOCOL)\r
+                                    {\r
+                                        if (current_bit == 4)                                           // toggle bit (double len)\r
+                                        {\r
+                                            pulse_len = 2 * RC6_BIT_LEN;\r
+                                            pause_len = 2 * RC6_BIT_LEN;\r
+                                        }\r
+                                    }\r
+                                    else // if (irsnd_protocol == IRMP_RC6A_PROTOCOL)\r
+                                    {\r
+                                        if (current_bit == 4)                                           // toggle bit (double len)\r
+                                        {\r
+                                            pulse_len = 2 * RC6_BIT_LEN + RC6_BIT_LEN;                  // hack!\r
+                                            pause_len = 2 * RC6_BIT_LEN;\r
+                                        }\r
+                                        else if (current_bit == 5)                                      // toggle bit (double len)\r
+                                        {\r
+                                            pause_len = 2 * RC6_BIT_LEN;\r
+                                        }\r
+                                    }\r
+                                }\r
+#endif\r
                                 first_pulse = (irsnd_buffer[current_bit / 8] & (1<<(7-(current_bit % 8)))) ? TRUE : FALSE;\r
                             }\r
 \r
@@ -1433,7 +1564,8 @@ irsnd_ISR (void)
                     }\r
                     break;\r
                 }\r
-#endif // IRSND_SUPPORT_RC5_PROTOCOL == 1 || IRSND_SUPPORT_SIEMENS_PROTOCOL == 1 || IRSND_SUPPORT_GRUNDIG_PROTOCOL == 1 || IRSND_SUPPORT_NOKIA_PROTOCOL == 1\r
+#endif // IRSND_SUPPORT_RC5_PROTOCOL == 1 || IRSND_SUPPORT_RC6_PROTOCOL == 1 || || IRSND_SUPPORT_RC6A_PROTOCOL == 1 || IRSND_SUPPORT_SIEMENS_PROTOCOL == 1 ||\r
+       // IRSND_SUPPORT_GRUNDIG_PROTOCOL == 1 || IRSND_SUPPORT_NOKIA_PROTOCOL == 1\r
 \r
                 default:\r
                 {\r