*\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.32 2011/02/22 17:05: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
#define BANG_OLUFSEN_TRAILER_BIT_PAUSE_LEN (uint8_t)(F_INTERRUPTS * BANG_OLUFSEN_TRAILER_BIT_PAUSE_TIME + 0.5)\r
#define BANG_OLUFSEN_FRAME_REPEAT_PAUSE_LEN (uint16_t)(F_INTERRUPTS * BANG_OLUFSEN_FRAME_REPEAT_PAUSE_TIME + 0.5) // use uint16_t!\r
\r
-#define GRUNDIG_OR_NOKIA_PRE_PAUSE_LEN (uint8_t)(F_INTERRUPTS * GRUNDIG_OR_NOKIA_PRE_PAUSE_TIME + 0.5)\r
-#define GRUNDIG_OR_NOKIA_BIT_LEN (uint8_t)(F_INTERRUPTS * GRUNDIG_OR_NOKIA_BIT_TIME + 0.5)\r
+#define GRUNDIG_NOKIA_IR60_PRE_PAUSE_LEN (uint8_t)(F_INTERRUPTS * GRUNDIG_NOKIA_IR60_PRE_PAUSE_TIME + 0.5)\r
+#define GRUNDIG_NOKIA_IR60_BIT_LEN (uint8_t)(F_INTERRUPTS * GRUNDIG_NOKIA_IR60_BIT_TIME + 0.5)\r
#define GRUNDIG_AUTO_REPETITION_PAUSE_LEN (uint16_t)(F_INTERRUPTS * GRUNDIG_AUTO_REPETITION_PAUSE_TIME + 0.5) // use uint16_t!\r
#define NOKIA_AUTO_REPETITION_PAUSE_LEN (uint16_t)(F_INTERRUPTS * NOKIA_AUTO_REPETITION_PAUSE_TIME + 0.5) // use uint16_t!\r
-#define GRUNDIG_OR_NOKIA_FRAME_REPEAT_PAUSE_LEN (uint16_t)(F_INTERRUPTS * GRUNDIG_OR_NOKIA_FRAME_REPEAT_PAUSE_TIME + 0.5) // use uint16_t!\r
+#define GRUNDIG_NOKIA_IR60_FRAME_REPEAT_PAUSE_LEN (uint16_t)(F_INTERRUPTS * GRUNDIG_NOKIA_IR60_FRAME_REPEAT_PAUSE_TIME + 0.5) // use uint16_t!\r
\r
-#define SIEMENS_START_BIT_LEN (uint8_t)(F_INTERRUPTS * SIEMENS_BIT_TIME + 0.5)\r
-#define SIEMENS_BIT_LEN (uint8_t)(F_INTERRUPTS * SIEMENS_BIT_TIME + 0.5)\r
-#define SIEMENS_FRAME_REPEAT_PAUSE_LEN (uint16_t)(F_INTERRUPTS * SIEMENS_FRAME_REPEAT_PAUSE_TIME + 0.5) // use uint16_t!\r
+#define SIEMENS_START_BIT_LEN (uint8_t)(F_INTERRUPTS * SIEMENS_OR_RUWIDO_START_BIT_PULSE_TIME + 0.5)\r
+#define SIEMENS_BIT_LEN (uint8_t)(F_INTERRUPTS * SIEMENS_OR_RUWIDO_BIT_PULSE_TIME + 0.5)\r
+#define SIEMENS_FRAME_REPEAT_PAUSE_LEN (uint16_t)(F_INTERRUPTS * SIEMENS_OR_RUWIDO_FRAME_REPEAT_PAUSE_TIME + 0.5) // use uint16_t!\r
\r
#define IRSND_FREQ_32_KHZ (uint8_t) ((F_CPU / 32000 / 2) - 1)\r
#define IRSND_FREQ_36_KHZ (uint8_t) ((F_CPU / 36000 / 2) - 1)\r
}\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
#endif\r
#if IRSND_SUPPORT_RC5_PROTOCOL == 1\r
static uint8_t toggle_bit_rc5;\r
+#endif\r
+#if IRSND_SUPPORT_RC6_PROTOCOL == 1 || IRSND_SUPPORT_RC6A_PROTOCOL == 1\r
+ static uint8_t toggle_bit_rc6;\r
#endif\r
uint16_t address;\r
uint16_t command;\r
#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
+ command = bitsrevervse (irmp_data_p->command, 15);\r
\r
- irsnd_buffer[0] = (command & 0x0FF0) >> 4; // CCCCCCCC\r
- irsnd_buffer[1] = (command & 0x000F) << 4; // CCCC0000\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
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
case IRMP_SIRCS_PROTOCOL:\r
{\r
startbit_pulse_len = SIRCS_START_BIT_PULSE_LEN;\r
- startbit_pause_len = SIRCS_START_BIT_PAUSE_LEN;\r
+ startbit_pause_len = SIRCS_START_BIT_PAUSE_LEN - 1;\r
pulse_1_len = SIRCS_1_PULSE_LEN;\r
- pause_1_len = SIRCS_PAUSE_LEN;\r
+ pause_1_len = SIRCS_PAUSE_LEN - 1;\r
pulse_0_len = SIRCS_0_PULSE_LEN;\r
- pause_0_len = SIRCS_PAUSE_LEN;\r
+ pause_0_len = SIRCS_PAUSE_LEN - 1;\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
\r
if (repeat_counter > 0)\r
{\r
- startbit_pause_len = NEC_REPEAT_START_BIT_PAUSE_LEN;\r
+ startbit_pause_len = NEC_REPEAT_START_BIT_PAUSE_LEN - 1;\r
complete_data_len = 0;\r
}\r
else\r
{\r
- startbit_pause_len = NEC_START_BIT_PAUSE_LEN;\r
+ startbit_pause_len = NEC_START_BIT_PAUSE_LEN - 1;\r
complete_data_len = NEC_COMPLETE_DATA_LEN;\r
}\r
\r
pulse_1_len = NEC_PULSE_LEN;\r
- pause_1_len = NEC_1_PAUSE_LEN;\r
+ pause_1_len = NEC_1_PAUSE_LEN - 1;\r
pulse_0_len = NEC_PULSE_LEN;\r
- pause_0_len = NEC_0_PAUSE_LEN;\r
+ pause_0_len = NEC_0_PAUSE_LEN - 1;\r
has_stop_bit = NEC_STOP_BIT;\r
n_auto_repetitions = 1; // 1 frame\r
auto_repetition_pause_len = 0;\r
case IRMP_SAMSUNG_PROTOCOL:\r
{\r
startbit_pulse_len = SAMSUNG_START_BIT_PULSE_LEN;\r
- startbit_pause_len = SAMSUNG_START_BIT_PAUSE_LEN;\r
+ startbit_pause_len = SAMSUNG_START_BIT_PAUSE_LEN - 1;\r
pulse_1_len = SAMSUNG_PULSE_LEN;\r
- pause_1_len = SAMSUNG_1_PAUSE_LEN;\r
+ pause_1_len = SAMSUNG_1_PAUSE_LEN - 1;\r
pulse_0_len = SAMSUNG_PULSE_LEN;\r
- pause_0_len = SAMSUNG_0_PAUSE_LEN;\r
+ pause_0_len = SAMSUNG_0_PAUSE_LEN - 1;\r
has_stop_bit = SAMSUNG_STOP_BIT;\r
complete_data_len = SAMSUNG_COMPLETE_DATA_LEN;\r
n_auto_repetitions = 1; // 1 frame\r
case IRMP_SAMSUNG32_PROTOCOL:\r
{\r
startbit_pulse_len = SAMSUNG_START_BIT_PULSE_LEN;\r
- startbit_pause_len = SAMSUNG_START_BIT_PAUSE_LEN;\r
+ startbit_pause_len = SAMSUNG_START_BIT_PAUSE_LEN - 1;\r
pulse_1_len = SAMSUNG_PULSE_LEN;\r
- pause_1_len = SAMSUNG_1_PAUSE_LEN;\r
+ pause_1_len = SAMSUNG_1_PAUSE_LEN - 1;\r
pulse_0_len = SAMSUNG_PULSE_LEN;\r
- pause_0_len = SAMSUNG_0_PAUSE_LEN;\r
+ pause_0_len = SAMSUNG_0_PAUSE_LEN - 1;\r
has_stop_bit = SAMSUNG_STOP_BIT;\r
complete_data_len = SAMSUNG32_COMPLETE_DATA_LEN;\r
n_auto_repetitions = SAMSUNG32_FRAMES; // 2 frames\r
case IRMP_MATSUSHITA_PROTOCOL:\r
{\r
startbit_pulse_len = MATSUSHITA_START_BIT_PULSE_LEN;\r
- startbit_pause_len = MATSUSHITA_START_BIT_PAUSE_LEN;\r
+ startbit_pause_len = MATSUSHITA_START_BIT_PAUSE_LEN - 1;\r
pulse_1_len = MATSUSHITA_PULSE_LEN;\r
- pause_1_len = MATSUSHITA_1_PAUSE_LEN;\r
+ pause_1_len = MATSUSHITA_1_PAUSE_LEN - 1;\r
pulse_0_len = MATSUSHITA_PULSE_LEN;\r
- pause_0_len = MATSUSHITA_0_PAUSE_LEN;\r
+ pause_0_len = MATSUSHITA_0_PAUSE_LEN - 1;\r
has_stop_bit = MATSUSHITA_STOP_BIT;\r
complete_data_len = MATSUSHITA_COMPLETE_DATA_LEN;\r
n_auto_repetitions = 1; // 1 frame\r
case IRMP_KASEIKYO_PROTOCOL:\r
{\r
startbit_pulse_len = KASEIKYO_START_BIT_PULSE_LEN;\r
- startbit_pause_len = KASEIKYO_START_BIT_PAUSE_LEN;\r
+ startbit_pause_len = KASEIKYO_START_BIT_PAUSE_LEN - 1;\r
pulse_1_len = KASEIKYO_PULSE_LEN;\r
- pause_1_len = KASEIKYO_1_PAUSE_LEN;\r
+ pause_1_len = KASEIKYO_1_PAUSE_LEN - 1;\r
pulse_0_len = KASEIKYO_PULSE_LEN;\r
- pause_0_len = KASEIKYO_0_PAUSE_LEN;\r
+ pause_0_len = KASEIKYO_0_PAUSE_LEN - 1;\r
has_stop_bit = KASEIKYO_STOP_BIT;\r
complete_data_len = KASEIKYO_COMPLETE_DATA_LEN;\r
n_auto_repetitions = (repeat_counter == 0) ? KASEIKYO_FRAMES : 1; // 2 frames auto repetition if first frame\r
case IRMP_RECS80_PROTOCOL:\r
{\r
startbit_pulse_len = RECS80_START_BIT_PULSE_LEN;\r
- startbit_pause_len = RECS80_START_BIT_PAUSE_LEN;\r
+ startbit_pause_len = RECS80_START_BIT_PAUSE_LEN - 1;\r
pulse_1_len = RECS80_PULSE_LEN;\r
- pause_1_len = RECS80_1_PAUSE_LEN;\r
+ pause_1_len = RECS80_1_PAUSE_LEN - 1;\r
pulse_0_len = RECS80_PULSE_LEN;\r
- pause_0_len = RECS80_0_PAUSE_LEN;\r
+ pause_0_len = RECS80_0_PAUSE_LEN - 1;\r
has_stop_bit = RECS80_STOP_BIT;\r
complete_data_len = RECS80_COMPLETE_DATA_LEN;\r
n_auto_repetitions = 1; // 1 frame\r
case IRMP_RECS80EXT_PROTOCOL:\r
{\r
startbit_pulse_len = RECS80EXT_START_BIT_PULSE_LEN;\r
- startbit_pause_len = RECS80EXT_START_BIT_PAUSE_LEN;\r
+ startbit_pause_len = RECS80EXT_START_BIT_PAUSE_LEN - 1;\r
pulse_1_len = RECS80EXT_PULSE_LEN;\r
- pause_1_len = RECS80EXT_1_PAUSE_LEN;\r
+ pause_1_len = RECS80EXT_1_PAUSE_LEN - 1;\r
pulse_0_len = RECS80EXT_PULSE_LEN;\r
- pause_0_len = RECS80EXT_0_PAUSE_LEN;\r
+ pause_0_len = RECS80EXT_0_PAUSE_LEN - 1;\r
has_stop_bit = RECS80EXT_STOP_BIT;\r
complete_data_len = RECS80EXT_COMPLETE_DATA_LEN;\r
n_auto_repetitions = 1; // 1 frame\r
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 - 1;\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 - 1;\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
startbit_pulse_len = 0x00;\r
startbit_pause_len = 0x00;\r
pulse_1_len = DENON_PULSE_LEN;\r
- pause_1_len = DENON_1_PAUSE_LEN;\r
+ pause_1_len = DENON_1_PAUSE_LEN - 1;\r
pulse_0_len = DENON_PULSE_LEN;\r
- pause_0_len = DENON_0_PAUSE_LEN;\r
+ pause_0_len = DENON_0_PAUSE_LEN - 1;\r
has_stop_bit = DENON_STOP_BIT;\r
complete_data_len = DENON_COMPLETE_DATA_LEN;\r
n_auto_repetitions = DENON_FRAMES; // 2 frames, 2nd with inverted command\r
auto_repetition_pause_len = DENON_AUTO_REPETITION_PAUSE_LEN; // 65 ms pause after 1st frame\r
repeat_frame_pause_len = DENON_FRAME_REPEAT_PAUSE_LEN;\r
- irsnd_set_freq (IRSND_FREQ_32_KHZ);\r
+ irsnd_set_freq (IRSND_FREQ_36_KHZ); // in theory 32kHz, in practice 36kHz is better\r
break;\r
}\r
#endif\r
case IRMP_NUBERT_PROTOCOL:\r
{\r
startbit_pulse_len = NUBERT_START_BIT_PULSE_LEN;\r
- startbit_pause_len = NUBERT_START_BIT_PAUSE_LEN;\r
+ startbit_pause_len = NUBERT_START_BIT_PAUSE_LEN - 1;\r
pulse_1_len = NUBERT_1_PULSE_LEN;\r
- pause_1_len = NUBERT_1_PAUSE_LEN;\r
+ pause_1_len = NUBERT_1_PAUSE_LEN - 1;\r
pulse_0_len = NUBERT_0_PULSE_LEN;\r
- pause_0_len = NUBERT_0_PAUSE_LEN;\r
+ pause_0_len = NUBERT_0_PAUSE_LEN - 1;\r
has_stop_bit = NUBERT_STOP_BIT;\r
complete_data_len = NUBERT_COMPLETE_DATA_LEN;\r
n_auto_repetitions = NUBERT_FRAMES; // 2 frames\r
case IRMP_BANG_OLUFSEN_PROTOCOL:\r
{\r
startbit_pulse_len = BANG_OLUFSEN_START_BIT1_PULSE_LEN;\r
- startbit_pause_len = BANG_OLUFSEN_START_BIT1_PAUSE_LEN;\r
+ startbit_pause_len = BANG_OLUFSEN_START_BIT1_PAUSE_LEN - 1;\r
pulse_1_len = BANG_OLUFSEN_PULSE_LEN;\r
- pause_1_len = BANG_OLUFSEN_1_PAUSE_LEN;\r
+ pause_1_len = BANG_OLUFSEN_1_PAUSE_LEN - 1;\r
pulse_0_len = BANG_OLUFSEN_PULSE_LEN;\r
- pause_0_len = BANG_OLUFSEN_0_PAUSE_LEN;\r
+ pause_0_len = BANG_OLUFSEN_0_PAUSE_LEN - 1;\r
has_stop_bit = BANG_OLUFSEN_STOP_BIT;\r
complete_data_len = BANG_OLUFSEN_COMPLETE_DATA_LEN;\r
n_auto_repetitions = 1; // 1 frame\r
#if IRSND_SUPPORT_GRUNDIG_PROTOCOL == 1\r
case IRMP_GRUNDIG_PROTOCOL:\r
{\r
- startbit_pulse_len = GRUNDIG_OR_NOKIA_BIT_LEN;\r
- startbit_pause_len = GRUNDIG_OR_NOKIA_PRE_PAUSE_LEN;\r
- pulse_len = GRUNDIG_OR_NOKIA_BIT_LEN;\r
- pause_len = GRUNDIG_OR_NOKIA_BIT_LEN;\r
- has_stop_bit = GRUNDIG_OR_NOKIA_STOP_BIT;\r
+ startbit_pulse_len = GRUNDIG_NOKIA_IR60_BIT_LEN;\r
+ startbit_pause_len = GRUNDIG_NOKIA_IR60_PRE_PAUSE_LEN - 1;\r
+ pulse_len = GRUNDIG_NOKIA_IR60_BIT_LEN;\r
+ pause_len = GRUNDIG_NOKIA_IR60_BIT_LEN;\r
+ has_stop_bit = GRUNDIG_NOKIA_IR60_STOP_BIT;\r
complete_data_len = GRUNDIG_COMPLETE_DATA_LEN;\r
n_auto_repetitions = GRUNDIG_FRAMES; // 2 frames\r
auto_repetition_pause_len = GRUNDIG_AUTO_REPETITION_PAUSE_LEN; // 20m sec pause\r
- repeat_frame_pause_len = GRUNDIG_OR_NOKIA_FRAME_REPEAT_PAUSE_LEN; // 117 msec pause\r
+ repeat_frame_pause_len = GRUNDIG_NOKIA_IR60_FRAME_REPEAT_PAUSE_LEN; // 117 msec pause\r
irsnd_set_freq (IRSND_FREQ_38_KHZ);\r
\r
break;\r
#if IRSND_SUPPORT_NOKIA_PROTOCOL == 1\r
case IRMP_NOKIA_PROTOCOL:\r
{\r
- startbit_pulse_len = GRUNDIG_OR_NOKIA_BIT_LEN;\r
- startbit_pause_len = GRUNDIG_OR_NOKIA_PRE_PAUSE_LEN;\r
- pulse_len = GRUNDIG_OR_NOKIA_BIT_LEN;\r
- pause_len = GRUNDIG_OR_NOKIA_BIT_LEN;\r
- has_stop_bit = GRUNDIG_OR_NOKIA_STOP_BIT;\r
+ startbit_pulse_len = GRUNDIG_NOKIA_IR60_BIT_LEN;\r
+ startbit_pause_len = GRUNDIG_NOKIA_IR60_PRE_PAUSE_LEN - 1;\r
+ pulse_len = GRUNDIG_NOKIA_IR60_BIT_LEN;\r
+ pause_len = GRUNDIG_NOKIA_IR60_BIT_LEN;\r
+ has_stop_bit = GRUNDIG_NOKIA_IR60_STOP_BIT;\r
complete_data_len = NOKIA_COMPLETE_DATA_LEN;\r
n_auto_repetitions = NOKIA_FRAMES; // 2 frames\r
auto_repetition_pause_len = NOKIA_AUTO_REPETITION_PAUSE_LEN; // 20 msec pause\r
- repeat_frame_pause_len = GRUNDIG_OR_NOKIA_FRAME_REPEAT_PAUSE_LEN; // 117 msec pause\r
+ repeat_frame_pause_len = GRUNDIG_NOKIA_IR60_FRAME_REPEAT_PAUSE_LEN; // 117 msec pause\r
irsnd_set_freq (IRSND_FREQ_38_KHZ);\r
break;\r
}\r
startbit_pause_len = SIEMENS_BIT_LEN;\r
pulse_len = SIEMENS_BIT_LEN;\r
pause_len = SIEMENS_BIT_LEN;\r
- has_stop_bit = SIEMENS_STOP_BIT;\r
+ has_stop_bit = SIEMENS_OR_RUWIDO_STOP_BIT;\r
complete_data_len = SIEMENS_COMPLETE_DATA_LEN - 1;\r
n_auto_repetitions = 1; // 1 frame\r
auto_repetition_pause_len = 0;\r
case IRMP_FDC_PROTOCOL:\r
{\r
startbit_pulse_len = FDC_START_BIT_PULSE_LEN;\r
- startbit_pause_len = FDC_START_BIT_PAUSE_LEN;\r
+ startbit_pause_len = FDC_START_BIT_PAUSE_LEN - 1;\r
complete_data_len = FDC_COMPLETE_DATA_LEN;\r
pulse_1_len = FDC_PULSE_LEN;\r
- pause_1_len = FDC_1_PAUSE_LEN;\r
+ pause_1_len = FDC_1_PAUSE_LEN - 1;\r
pulse_0_len = FDC_PULSE_LEN;\r
- pause_0_len = FDC_0_PAUSE_LEN;\r
+ pause_0_len = FDC_0_PAUSE_LEN - 1;\r
has_stop_bit = FDC_STOP_BIT;\r
n_auto_repetitions = 1; // 1 frame\r
auto_repetition_pause_len = 0;\r
case IRMP_RCCAR_PROTOCOL:\r
{\r
startbit_pulse_len = RCCAR_START_BIT_PULSE_LEN;\r
- startbit_pause_len = RCCAR_START_BIT_PAUSE_LEN;\r
+ startbit_pause_len = RCCAR_START_BIT_PAUSE_LEN - 1;\r
complete_data_len = RCCAR_COMPLETE_DATA_LEN;\r
pulse_1_len = RCCAR_PULSE_LEN;\r
- pause_1_len = RCCAR_1_PAUSE_LEN;\r
+ pause_1_len = RCCAR_1_PAUSE_LEN - 1;\r
pulse_0_len = RCCAR_PULSE_LEN;\r
- pause_0_len = RCCAR_0_PAUSE_LEN;\r
+ pause_0_len = RCCAR_0_PAUSE_LEN - 1;\r
has_stop_bit = RCCAR_STOP_BIT;\r
n_auto_repetitions = 1; // 1 frame\r
auto_repetition_pause_len = 0;\r
}\r
\r
startbit_pulse_len = JVC_START_BIT_PULSE_LEN;\r
- startbit_pause_len = JVC_START_BIT_PAUSE_LEN;\r
+ startbit_pause_len = JVC_START_BIT_PAUSE_LEN - 1;\r
complete_data_len = JVC_COMPLETE_DATA_LEN;\r
pulse_1_len = JVC_PULSE_LEN;\r
- pause_1_len = JVC_1_PAUSE_LEN;\r
+ pause_1_len = JVC_1_PAUSE_LEN - 1;\r
pulse_0_len = JVC_PULSE_LEN;\r
- pause_0_len = JVC_0_PAUSE_LEN;\r
+ pause_0_len = JVC_0_PAUSE_LEN - 1;\r
has_stop_bit = JVC_STOP_BIT;\r
n_auto_repetitions = 1; // 1 frame\r
auto_repetition_pause_len = 0;\r
case IRMP_NIKON_PROTOCOL:\r
{\r
startbit_pulse_len = NIKON_START_BIT_PULSE_LEN;\r
- startbit_pause_len = 271; // NIKON_START_BIT_PAUSE_LEN;\r
+ startbit_pause_len = 271 - 1; // NIKON_START_BIT_PAUSE_LEN;\r
complete_data_len = NIKON_COMPLETE_DATA_LEN;\r
pulse_1_len = NIKON_PULSE_LEN;\r
- pause_1_len = NIKON_1_PAUSE_LEN;\r
+ pause_1_len = NIKON_1_PAUSE_LEN - 1;\r
pulse_0_len = NIKON_PULSE_LEN;\r
- pause_0_len = NIKON_0_PAUSE_LEN;\r
+ pause_0_len = NIKON_0_PAUSE_LEN - 1;\r
has_stop_bit = NIKON_STOP_BIT;\r
n_auto_repetitions = 1; // 1 frame\r
auto_repetition_pause_len = 0;\r
{\r
pulse_len = SAMSUNG_PULSE_LEN;\r
pause_len = (irsnd_buffer[current_bit / 8] & (1<<(7-(current_bit % 8)))) ?\r
- SAMSUNG_1_PAUSE_LEN : SAMSUNG_0_PAUSE_LEN;\r
+ (SAMSUNG_1_PAUSE_LEN - 1) : (SAMSUNG_0_PAUSE_LEN - 1);\r
}\r
else if (current_bit == SAMSUNG_ADDRESS_LEN) // send SYNC bit (16th bit)\r
{\r
pulse_len = SAMSUNG_PULSE_LEN;\r
- pause_len = SAMSUNG_START_BIT_PAUSE_LEN;\r
+ pause_len = SAMSUNG_START_BIT_PAUSE_LEN - 1;\r
}\r
else if (current_bit < SAMSUNG_COMPLETE_DATA_LEN) // send n'th bit\r
{\r
\r
pulse_len = SAMSUNG_PULSE_LEN;\r
pause_len = (irsnd_buffer[cur_bit / 8] & (1<<(7-(cur_bit % 8)))) ?\r
- SAMSUNG_1_PAUSE_LEN : SAMSUNG_0_PAUSE_LEN;\r
+ (SAMSUNG_1_PAUSE_LEN - 1) : (SAMSUNG_0_PAUSE_LEN - 1);\r
}\r
}\r
else\r
if (current_bit == 0) // send 2nd start bit\r
{\r
pulse_len = BANG_OLUFSEN_START_BIT2_PULSE_LEN;\r
- pause_len = BANG_OLUFSEN_START_BIT2_PAUSE_LEN;\r
+ pause_len = BANG_OLUFSEN_START_BIT2_PAUSE_LEN - 1;\r
}\r
else if (current_bit == 1) // send 3rd start bit\r
{\r
pulse_len = BANG_OLUFSEN_START_BIT3_PULSE_LEN;\r
- pause_len = BANG_OLUFSEN_START_BIT3_PAUSE_LEN;\r
+ pause_len = BANG_OLUFSEN_START_BIT3_PAUSE_LEN - 1;\r
}\r
else if (current_bit == 2) // send 4th start bit\r
{\r
pulse_len = BANG_OLUFSEN_START_BIT2_PULSE_LEN;\r
- pause_len = BANG_OLUFSEN_START_BIT2_PAUSE_LEN;\r
+ pause_len = BANG_OLUFSEN_START_BIT2_PAUSE_LEN - 1;\r
}\r
else if (current_bit == 19) // send trailer bit\r
{\r
pulse_len = BANG_OLUFSEN_PULSE_LEN;\r
- pause_len = BANG_OLUFSEN_TRAILER_BIT_PAUSE_LEN;\r
+ pause_len = BANG_OLUFSEN_TRAILER_BIT_PAUSE_LEN - 1;\r
}\r
else if (current_bit < BANG_OLUFSEN_COMPLETE_DATA_LEN) // send n'th bit\r
{\r
\r
if (cur_bit_value == last_bit_value)\r
{\r
- pause_len = BANG_OLUFSEN_R_PAUSE_LEN;\r
+ pause_len = BANG_OLUFSEN_R_PAUSE_LEN - 1;\r
}\r
else\r
{\r
- pause_len = cur_bit_value ? BANG_OLUFSEN_1_PAUSE_LEN : BANG_OLUFSEN_0_PAUSE_LEN;\r
+ pause_len = cur_bit_value ? (BANG_OLUFSEN_1_PAUSE_LEN - 1) : (BANG_OLUFSEN_0_PAUSE_LEN - 1);\r
last_bit_value = cur_bit_value;\r
}\r
}\r
#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
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
\r
if (repeat_counter > 0)\r
{ // set 117 msec pause time\r
- auto_repetition_pause_len = GRUNDIG_OR_NOKIA_FRAME_REPEAT_PAUSE_LEN;\r
+ auto_repetition_pause_len = GRUNDIG_NOKIA_IR60_FRAME_REPEAT_PAUSE_LEN;\r
}\r
\r
if (repeat_counter < n_repeat_frames) // tricky: repeat n info frames per auto repetition before sending last stop frame\r
}\r
else // send n'th bit\r
{\r
- pulse_len = GRUNDIG_OR_NOKIA_BIT_LEN;\r
- pause_len = GRUNDIG_OR_NOKIA_BIT_LEN;\r
+ pulse_len = GRUNDIG_NOKIA_IR60_BIT_LEN;\r
+ pause_len = GRUNDIG_NOKIA_IR60_BIT_LEN;\r
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
}\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
projects / irmp.git / blobdiff