GitHub/candleLight_fw
1
0
Fork 0
mirror of https://github.com/candle-usb/candleLight_fw.git synced 2025-01-14 05:42:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

smaller optimizations

Browse Source
This commit is contained in:
Hubert Denkmair 2016-04-12 21:24:23 +02:00
parent 76de887142
commit d78ca87052
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main.c
View File

@ -16,6 +16,22 @@ static void MX_GPIO_Init(void);
CAN_HandleTypeDef hCAN;
USBD_HandleTypeDef hUSB;
queue_t *q_frame_pool;
queue_t *q_from_host;
queue_t *q_to_host;
bool send_to_host_or_enqueue(struct gs_host_frame *frame)
{
bool retval = false;
if (USBD_GS_CAN_Transmit(&hUSB, (uint8_t*)frame, sizeof(struct gs_host_frame))==USBD_OK) {
queue_push_back(q_frame_pool, frame);
retval = true;
} else {
queue_push_back(q_to_host, frame);
}
return retval;
}
int main(void)
{
@ -24,9 +40,9 @@ int main(void)
MX_GPIO_Init();
can_init(&hCAN, CAN);
queue_t *q_frame_pool = queue_create(CAN_QUEUE_SIZE);
queue_t *q_from_host = queue_create(CAN_QUEUE_SIZE);
queue_t *q_to_host = queue_create(CAN_QUEUE_SIZE);
q_frame_pool = queue_create(CAN_QUEUE_SIZE);
q_from_host = queue_create(CAN_QUEUE_SIZE);
q_to_host = queue_create(CAN_QUEUE_SIZE);
struct gs_host_frame *msgbuf = calloc(CAN_QUEUE_SIZE, sizeof(struct gs_host_frame));
for (unsigned i=0; i<CAN_QUEUE_SIZE; i++) {
@ -70,7 +86,7 @@ int main(void)
memcpy(tx_msg.Data, frame->data, tx_msg.DLC);
if (can_send(&hCAN, &tx_msg, 10)) {
queue_push_back(q_to_host, frame); // send echo frame back to host
send_to_host_or_enqueue(frame);
} else {
queue_push_front(q_from_host, frame); // retry later
}
@ -114,8 +130,7 @@ int main(void)
memcpy(frame->data, rx_msg.Data, frame->can_dlc);
queue_push_back(q_to_host, frame);
send_to_host_or_enqueue(frame);
} else {
queue_push_back(q_frame_pool, frame);

3
src/usbd_gs_can.c
View File

@ -14,7 +14,6 @@
typedef struct {
uint8_t ep0_buf[CAN_CMD_PACKET_SIZE];
uint8_t ep_in_buf[CAN_DATA_MAX_PACKET_SIZE];
__IO uint32_t TxState;
@ -352,7 +351,7 @@ bool USBD_GS_CAN_TxReady(USBD_HandleTypeDef *pdev)
uint8_t USBD_GS_CAN_Transmit(USBD_HandleTypeDef *pdev, uint8_t *buf, uint16_t len)
{
USBD_GS_CAN_HandleTypeDef *hcan = (USBD_GS_CAN_HandleTypeDef*)pdev->pClassData;
if (USBD_GS_CAN_TxReady(pdev)) {
if (hcan->TxState == 0) {
hcan->TxState = 1;
USBD_LL_Transmit(pdev, GSUSB_ENDPOINT_IN, buf, len);
return USBD_OK;