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

Modified F0: testbrd, CDC, pl2303 and HID

Browse Source
This commit is contained in:
eddyem
2020-04-08 14:53:18 +03:00
parent 10ad505bda
commit 100885c113
18 changed files with 235 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
F1-nolib/USB_HID/usb_lib.c
View File

@@ -350,10 +350,10 @@ static uint16_t lastaddr = LASTADDR_DEFAULT;
* @param type - EP type (EP_TYPE_BULK, EP_TYPE_CONTROL, EP_TYPE_ISO, EP_TYPE_INTERRUPT)
* @param txsz - transmission buffer size @ USB/CAN buffer
* @param rxsz - reception buffer size @ USB/CAN buffer
* @param uint16_t (*func)(ep_t *ep) - EP handler function
* @param void (*func)() - EP handler function
* @return 0 if all OK
*/
int EP_Init(uint8_t number, uint8_t type, uint16_t txsz, uint16_t rxsz, void (*func)(ep_t ep)){
int EP_Init(uint8_t number, uint8_t type, uint16_t txsz, uint16_t rxsz, void (*func)()){
if(number >= STM32ENDPOINTS) return 4; // out of configured amount
if(txsz > USB_BTABLE_SIZE || rxsz > USB_BTABLE_SIZE) return 1; // buffer too large
if(lastaddr + txsz + rxsz >= USB_BTABLE_SIZE) return 2; // out of btable
@@ -415,7 +415,7 @@ void usb_lp_can_rx0_isr(){
}else{ // IN interrupt - transmit data, only CTR_TX == 1
// enumeration end could be here (if EP0)
}
if(endpoints[n].func) endpoints[n].func(endpoints[n]);
if(endpoints[n].func) endpoints[n].func();
}
if(USB->ISTR & USB_ISTR_SUSP){ // suspend -> still no connection, may sleep
usbON = 0;

5
F1-nolib/USB_HID/usb_lib.h
View File

@@ -93,8 +93,7 @@
typedef enum{
USB_STATE_DEFAULT,
USB_STATE_ADDRESSED,
USB_STATE_CONFIGURED,
USB_STATE_CONNECTED
USB_STATE_CONFIGURED
} USB_state;
// EP types
@@ -157,7 +156,7 @@ extern uint8_t usbON;
void USB_Init();
void USB_ResetState();
int EP_Init(uint8_t number, uint8_t type, uint16_t txsz, uint16_t rxsz, void (*func)(ep_t ep));
int EP_Init(uint8_t number, uint8_t type, uint16_t txsz, uint16_t rxsz, void (*func)());
void EP_WriteIRQ(uint8_t number, const uint8_t *buf, uint16_t size);
void EP_Write(uint8_t number, const uint8_t *buf, uint16_t size);
int EP_Read(uint8_t number, uint16_t *buf);

BIN
F1-nolib/USB_HID/usbhid103.bin
View File

Binary file not shown.