rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-02 10:24:11 +01:00
Code Issues Releases Activity

OP-122 Flight: Same changes regarding 62 byte limit applied to the receiving code on the device.

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1405 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
peabody124 2010-08-25 05:32:56 +00:00 committed by peabody124
parent dd491160c5
commit 8dd81443be
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
flight/PiOS/STM32F10x/pios_usb_hid.c
View File

@ -271,19 +271,7 @@ int32_t PIOS_USB_HID_TxBufferPutMore(uint8_t id, const uint8_t *buffer, uint16_t
*/ */
int32_t PIOS_USB_HID_RxBufferGet(uint8_t id) int32_t PIOS_USB_HID_RxBufferGet(uint8_t id)
{ {
if(rx_buffer_new_data_ctr == 0) { return bufferGetFromFront(&rxBuffer);
/* Nothing new in buffer */
return -1;
}
/* There is still data in the buffer */
uint8_t b = rx_buffer[rx_buffer_ix++];
if(--rx_buffer_new_data_ctr == 0) {
rx_buffer_ix = 2; //the two bytes are report ID and valid data length respectively
}
/* Return received byte */
return b;
} }
/** /**
@ -294,7 +282,7 @@ int32_t PIOS_USB_HID_RxBufferGet(uint8_t id)
*/ */
int32_t PIOS_USB_HID_RxBufferUsed(uint8_t id) int32_t PIOS_USB_HID_RxBufferUsed(uint8_t id)
{ {
return rx_buffer_new_data_ctr; return bufferBufferedData(&rxBuffer);
} }
@ -317,11 +305,13 @@ void PIOS_USB_HID_EP1_OUT_Callback(void)
/* Read received data (63 bytes) */ /* Read received data (63 bytes) */
/* Get the number of received data on the selected Endpoint */ /* Get the number of received data on the selected Endpoint */
DataLength = GetEPRxCount(ENDP1 & 0x7F); DataLength = GetEPRxCount(ENDP1 & 0x7F);
/* Use the memory interface function to write to the selected endpoint */ /* Use the memory interface function to write to the selected endpoint */
PMAToUserBufferCopy((uint8_t *) rx_buffer, GetEPRxAddr(ENDP1 & 0x7F), DataLength); PMAToUserBufferCopy((uint8_t *) rx_buffer, GetEPRxAddr(ENDP1 & 0x7F), DataLength);
/* We now have data waiting */ /* The first byte is report ID (not checked), the second byte is the valid data length */
rx_buffer_new_data_ctr = rx_buffer[1]; bufferAddChunkToEnd(&rxBuffer, &rx_buffer[2], rx_buffer[1]);
SetEPRxStatus(ENDP1, EP_RX_VALID); SetEPRxStatus(ENDP1, EP_RX_VALID);
} }