eddy/stm32samples
1
0
Fork 0
mirror of https://github.com/eddyem/stm32samples.git synced 2026-03-22 01:31:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed chronometer

Browse Source
This commit is contained in:
Edward Emelianov
2020-02-07 11:40:32 +03:00
parent 876eb82698
commit e8bc0aba21
114 changed files with 593 additions and 85341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
F1-nolib/chronometer_v2/chrono.bin Executable file → Normal file
View File

30
F1-nolib/chronometer_v2/usb_lib.c
View File

@@ -227,20 +227,20 @@ static uint16_t EP0_Handler(ep_t ep){
std_h2d_req();
EP_WriteIRQ(0, (uint8_t *)0, 0);
}
epstatus = SET_NAK_RX(epstatus);
epstatus = SET_VALID_TX(epstatus);
//epstatus = SET_NAK_RX(epstatus);
//epstatus = SET_VALID_TX(epstatus);
break;
case STANDARD_ENDPOINT_REQUEST_TYPE: // standard endpoint request
if(setup_packet.bRequest == CLEAR_FEATURE){
EP_WriteIRQ(0, (uint8_t *)0, 0);
epstatus = SET_NAK_RX(epstatus);
epstatus = SET_VALID_TX(epstatus);
//epstatus = SET_NAK_RX(epstatus);
//epstatus = SET_VALID_TX(epstatus);
}
break;
case VENDOR_REQUEST_TYPE:
vendor_handler(&setup_packet);
epstatus = SET_NAK_RX(epstatus);
epstatus = SET_VALID_TX(epstatus);
//epstatus = SET_NAK_RX(epstatus);
//epstatus = SET_VALID_TX(epstatus);
break;
case CONTROL_REQUEST_TYPE:
switch(setup_packet.bRequest){
@@ -262,13 +262,13 @@ static uint16_t EP0_Handler(ep_t ep){
//if(!dev2host)
if(setup_packet.bRequest != GET_LINE_CODING)
EP_WriteIRQ(0, (uint8_t *)0, 0); // write acknowledgement
epstatus = SET_VALID_RX(epstatus);
epstatus = SET_VALID_TX(epstatus);
//epstatus = SET_VALID_RX(epstatus);
//epstatus = SET_VALID_TX(epstatus);
break;
default:
EP_WriteIRQ(0, (uint8_t *)0, 0);
epstatus = SET_NAK_RX(epstatus);
epstatus = SET_VALID_TX(epstatus);
//epstatus = SET_NAK_RX(epstatus);
//epstatus = SET_VALID_TX(epstatus);
}
}else if (ep.rx_flag){ // got data over EP0 or host acknowlegement
if(ep.rx_cnt){
@@ -278,8 +278,8 @@ static uint16_t EP0_Handler(ep_t ep){
}
}
// wait for new data from host
epstatus = SET_VALID_RX(epstatus);
epstatus = SET_VALID_TX(epstatus);
//epstatus = SET_VALID_RX(epstatus);
//epstatus = SET_VALID_TX(epstatus);
} else if (ep.tx_flag){ // package transmitted
// now we can change address after enumeration
if ((USB->DADDR & USB_DADDR_ADD) != USB_Dev.USB_Addr){
@@ -290,9 +290,11 @@ static uint16_t EP0_Handler(ep_t ep){
// end of transaction
epstatus = CLEAR_DTOG_RX(epstatus);
epstatus = CLEAR_DTOG_TX(epstatus);
epstatus = SET_VALID_RX(epstatus);
epstatus = SET_VALID_TX(epstatus);
//epstatus = SET_VALID_RX(epstatus);
//epstatus = SET_VALID_TX(epstatus);
}
epstatus = SET_VALID_RX(epstatus);
epstatus = SET_VALID_TX(epstatus);
return epstatus;
}