Rev 2198 | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | SVN | RSS feed
| Rev 2198 | Rev 2199 | ||
|---|---|---|---|
| Line 689... | Line 689... | ||
| 689 | cli(); |
689 | cli(); |
| 690 | irRxChannel[channel].newData = FALSE; |
690 | irRxChannel[channel].newData = FALSE; |
| 691 | sei(); |
691 | sei(); |
| 692 | 692 | ||
| 693 | /* Let protocol driver parse and then send on CAN. */ |
693 | /* Let protocol driver parse and then send on CAN. */ |
| 694 | uint8_t res2 = parseProtocol(irRxChannel[channel].rxbuf, irRxChannel[channel].rxlen, &irRxChannel[channel].proto); |
694 | uint8_t res2 = parseProtocol(irRxChannel[channel].rxbuf, irRxChannel[channel].rxlen, 0, &irRxChannel[channel].proto); |
| 695 | if (res2 == IR_OK && irRxChannel[channel].proto.protocol != IR_PROTO_UNKNOWN) { |
695 | if (res2 == IR_OK && irRxChannel[channel].proto.protocol != IR_PROTO_UNKNOWN) { |
| 696 | irTxMsg.Data[0] = 0xf&CAN_MODULE_ENUM_PHYSICAL_IR_STATUS_PRESSED; |
696 | irTxMsg.Data[0] = 0xf&CAN_MODULE_ENUM_PHYSICAL_IR_STATUS_PRESSED; |
| 697 | irTxMsg.Data[0] |= channel<<4; |
697 | irTxMsg.Data[0] |= channel<<4; |
| 698 | irTxMsg.Data[1] = irRxChannel[channel].proto.protocol; |
698 | irTxMsg.Data[1] = irRxChannel[channel].proto.protocol; |
| 699 | irTxMsg.Data[2] = (irRxChannel[channel].proto.data>>40)&0xff; |
699 | irTxMsg.Data[2] = (irRxChannel[channel].proto.data>>40)&0xff; |