Mirrors/knx
1
0
Fork 0
mirror of https://github.com/thelsing/knx.git synced 2025-08-31 13:47:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

save work

Browse Source
This commit is contained in:
nanosonde 2019-11-26 15:53:11 +01:00
parent 4a2eb12ed3
commit 7beaf89654
1 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/knx/usb_tunnel_interface.cpp
View File

@ -48,6 +48,9 @@ void UsbTunnelInterface::loop()
delete buffer; delete buffer;
} }
// Check if we already a COMPLETE transport protocol packet
// A transport protocol packet might be split into multiple HID reports and
// need to be assembled again
if (rxHaveCompletePacket) if (rxHaveCompletePacket)
{ {
handleHidReportRxQueue(); handleHidReportRxQueue();
@ -258,6 +261,20 @@ void UsbTunnelInterface::loadNextRxBuffer(uint8_t** receiveBuffer, uint16_t* rec
_rx_queue.back = nullptr; _rx_queue.back = nullptr;
} }
delete rx_buffer; delete rx_buffer;
#ifdef DEBUG_RX_HID_REPORT
Serial1.print("RX HID report: len: ");
Serial1.println(*receiveBufferLength, DEC);
for (int i = 0; i < (*receiveBufferLength); i++)
{
if ((*receiveBuffer)[i] < 16)
Serial1.print("0");
Serial1.print((*receiveBuffer)[i], HEX);
Serial1.print(" ");
}
Serial1.println("");
#endif
} }
void UsbTunnelInterface::handleTransferProtocolPacket(uint8_t* data, uint16_t length) void UsbTunnelInterface::handleTransferProtocolPacket(uint8_t* data, uint16_t length)
@ -297,37 +314,32 @@ void UsbTunnelInterface::handleTransferProtocolPacket(uint8_t* data, uint16_t le
void UsbTunnelInterface::handleHidReportRxQueue() void UsbTunnelInterface::handleHidReportRxQueue()
{ {
uint8_t* data;
uint16_t bufSize;
if (isRxQueueEmpty()) if (isRxQueueEmpty())
{ {
Serial1.println("Error: RX HID report queue was empty!"); Serial1.println("Error: RX HID report queue was empty!");
return; return;
} }
uint8_t* data;
uint16_t bufSize;
loadNextRxBuffer(&data, &bufSize); loadNextRxBuffer(&data, &bufSize);
if (data[1] == 0x13) // PacketInfo must be 0x13 (SeqNo: 1, Type: 3) // Get KNX HID report header details
uint8_t seqNum = data[1] >> 4;
uint8_t packetType = data[1] & 0x07;
uint8_t packetLength = data[2];
// first RX buffer from queue should contain the first part of the transfer protocol packet
if ((seqNum != 1) || ((packetType & PACKET_TYPE_START) != PACKET_TYPE_START) )
{ {
uint8_t packetLength = data[2]; // if this is not the case, then dicard this packet and free the memory
delete data;
#ifdef DEBUG_RX_HID_REPORT return;
Serial1.print("RX HID report: len: ");
Serial1.println(packetLength, DEC);
for (int i = 0; i < (packetLength + HID_HEADER_SIZE); i++)
{
if (data[i] < 16)
Serial1.print("0");
Serial1.print(data[i], HEX);
Serial1.print(" ");
}
Serial1.println("");
#endif
handleTransferProtocolPacket(&data[3], packetLength);
} }
handleTransferProtocolPacket(&data[3], packetLength);
delete data; delete data;
} }