mirror of
https://github.com/eddyem/stm32samples.git
synced 2025-12-06 18:55:13 +03:00
Add SPI DMA Tx example
This commit is contained in:
eddyem
parent
864f8c58df
commit
a1f0824cef
Binary file not shown.
@ -55,6 +55,7 @@ void iwdg_setup(){
|
|||||||
}
|
}
|
||||||
|
|
||||||
char *parse_cmd(char *buf){
|
char *parse_cmd(char *buf){
|
||||||
|
IWDG->KR = IWDG_REFRESH;
|
||||||
if(buf[1] != '\n') return buf;
|
if(buf[1] != '\n') return buf;
|
||||||
switch(*buf){
|
switch(*buf){
|
||||||
case 'p':
|
case 'p':
|
||||||
|
|||||||
@ -53,7 +53,10 @@ int usart_getline(char **line){
|
|||||||
// transmit current tbuf and swap buffers
|
// transmit current tbuf and swap buffers
|
||||||
void transmit_tbuf(){
|
void transmit_tbuf(){
|
||||||
uint32_t tmout = 16000000;
|
uint32_t tmout = 16000000;
|
||||||
while(!txrdy){if(--tmout == 0) return;}; // wait for previos buffer transmission
|
while(!txrdy){ // wait for previos buffer transmission
|
||||||
|
IWDG->KR = IWDG_REFRESH;
|
||||||
|
if(--tmout == 0) return;
|
||||||
|
}
|
||||||
register int l = odatalen[tbufno];
|
register int l = odatalen[tbufno];
|
||||||
if(!l) return;
|
if(!l) return;
|
||||||
txrdy = 0;
|
txrdy = 0;
|
||||||
@ -109,7 +112,10 @@ void usart_setup(){
|
|||||||
// setup usart1
|
// setup usart1
|
||||||
USART1->BRR = 72000000 / 115200;
|
USART1->BRR = 72000000 / 115200;
|
||||||
USART1->CR1 = USART_CR1_TE | USART_CR1_RE | USART_CR1_UE; // 1start,8data,nstop; enable Rx,Tx,USART
|
USART1->CR1 = USART_CR1_TE | USART_CR1_RE | USART_CR1_UE; // 1start,8data,nstop; enable Rx,Tx,USART
|
||||||
while(!(USART1->SR & USART_SR_TC)){if(--tmout == 0) break;} // polling idle frame Transmission
|
while(!(USART1->SR & USART_SR_TC)){ // polling idle frame Transmission
|
||||||
|
IWDG->KR = IWDG_REFRESH;
|
||||||
|
if(--tmout == 0) break;
|
||||||
|
}
|
||||||
USART1->SR = 0; // clear flags
|
USART1->SR = 0; // clear flags
|
||||||
USART1->CR1 |= USART_CR1_RXNEIE; // allow Rx IRQ
|
USART1->CR1 |= USART_CR1_RXNEIE; // allow Rx IRQ
|
||||||
USART1->CR3 = USART_CR3_DMAT; // enable DMA Tx
|
USART1->CR3 = USART_CR3_DMAT; // enable DMA Tx
|
||||||
|
|||||||
@ -58,11 +58,11 @@ static uint16_t EP23_Handler(ep_t ep){
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
// end of transaction: clear DTOGs
|
// end of transaction: clear DTOGs
|
||||||
ep.status = CLEAR_DTOG_RX(ep.status);
|
//ep.status = CLEAR_DTOG_RX(ep.status);
|
||||||
ep.status = CLEAR_DTOG_TX(ep.status);
|
//ep.status = CLEAR_DTOG_TX(ep.status);
|
||||||
ep.status = SET_STALL_TX(ep.status);
|
//ep.status = SET_STALL_TX(ep.status);
|
||||||
}else if (ep.tx_flag){
|
}else if (ep.tx_flag){
|
||||||
ep.status = KEEP_STAT_TX(ep.status);
|
//ep.status = KEEP_STAT_TX(ep.status);
|
||||||
tx_succesfull = 1;
|
tx_succesfull = 1;
|
||||||
}
|
}
|
||||||
ep.status = SET_VALID_RX(ep.status);
|
ep.status = SET_VALID_RX(ep.status);
|
||||||
@ -81,21 +81,21 @@ void USB_setup(){
|
|||||||
USB->ISTR = 0;
|
USB->ISTR = 0;
|
||||||
USB->CNTR = USB_CNTR_RESETM | USB_CNTR_WKUPM; // allow only wakeup & reset interrupts
|
USB->CNTR = USB_CNTR_RESETM | USB_CNTR_WKUPM; // allow only wakeup & reset interrupts
|
||||||
NVIC_EnableIRQ(USB_LP_CAN1_RX0_IRQn);
|
NVIC_EnableIRQ(USB_LP_CAN1_RX0_IRQn);
|
||||||
NVIC_EnableIRQ(USB_HP_CAN1_TX_IRQn );
|
//NVIC_EnableIRQ(USB_HP_CAN1_TX_IRQn );
|
||||||
}
|
}
|
||||||
|
|
||||||
void usb_proc(){
|
void usb_proc(){
|
||||||
switch(USB_Dev.USB_Status){
|
switch(USB_Dev.USB_Status){
|
||||||
case USB_CONFIGURE_STATE:
|
case USB_STATE_CONFIGURED:
|
||||||
// make new BULK endpoint
|
// make new BULK endpoint
|
||||||
// Buffer have 1024 bytes, but last 256 we use for CAN bus (30.2 of RM: USB main features)
|
// Buffer have 1024 bytes, but last 256 we use for CAN bus (30.2 of RM: USB main features)
|
||||||
EP_Init(1, EP_TYPE_INTERRUPT, USB_EP1BUFSZ, 0, EP1_Handler); // IN1 - transmit
|
EP_Init(1, EP_TYPE_INTERRUPT, USB_EP1BUFSZ, 0, EP1_Handler); // IN1 - transmit
|
||||||
EP_Init(2, EP_TYPE_BULK, 0, USB_RXBUFSZ, EP23_Handler); // OUT2 - receive data
|
EP_Init(2, EP_TYPE_BULK, 0, USB_RXBUFSZ, EP23_Handler); // OUT2 - receive data
|
||||||
EP_Init(3, EP_TYPE_BULK, USB_TXBUFSZ, 0, EP23_Handler); // IN3 - transmit data
|
EP_Init(3, EP_TYPE_BULK, USB_TXBUFSZ, 0, EP23_Handler); // IN3 - transmit data
|
||||||
USB_Dev.USB_Status = USB_CONNECTED_STATE;
|
USB_Dev.USB_Status = USB_STATE_CONNECTED;
|
||||||
break;
|
break;
|
||||||
case USB_DEFAULT_STATE:
|
case USB_STATE_DEFAULT:
|
||||||
case USB_ADRESSED_STATE:
|
case USB_STATE_ADDRESSED:
|
||||||
usbON = 0;
|
usbON = 0;
|
||||||
default:
|
default:
|
||||||
return;
|
return;
|
||||||
@ -112,8 +112,10 @@ void USB_send(const char *buf){
|
|||||||
tx_succesfull = 0;
|
tx_succesfull = 0;
|
||||||
EP_Write(3, (uint8_t*)&buf[ctr], s);
|
EP_Write(3, (uint8_t*)&buf[ctr], s);
|
||||||
uint32_t ctra = 1000000;
|
uint32_t ctra = 1000000;
|
||||||
while(--ctra && tx_succesfull == 0);
|
while(--ctra && tx_succesfull == 0){
|
||||||
if(tx_succesfull == 0){usbON = 0; DBG("USB disconnected"); return;} // usb is OFF?
|
IWDG->KR = IWDG_REFRESH;
|
||||||
|
}
|
||||||
|
if(tx_succesfull == 0){usbON = 0; DBG("USB transfer error"); return;} // usb is OFF?
|
||||||
l -= s;
|
l -= s;
|
||||||
ctr += s;
|
ctr += s;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -54,13 +54,14 @@ static const uint8_t USB_DeviceDescriptor[] = {
|
|||||||
bDeviceSubClass, // bDeviceSubClass
|
bDeviceSubClass, // bDeviceSubClass
|
||||||
bDeviceProtocol, // bDeviceProtocol
|
bDeviceProtocol, // bDeviceProtocol
|
||||||
USB_EP0_BUFSZ, // bMaxPacketSize
|
USB_EP0_BUFSZ, // bMaxPacketSize
|
||||||
/* 0x1915, 0x520f
|
// 0483:5740
|
||||||
0x15, 0x19, 0x0f, 0x52,*/
|
0x83, 0x04, 0x40, 0x57,
|
||||||
|
/*
|
||||||
0xae, // idVendor_L VID=0x25AE, PID=0x24AB
|
0xae, // idVendor_L VID=0x25AE, PID=0x24AB
|
||||||
0x25, // idVendor_H
|
0x25, // idVendor_H
|
||||||
0xab, // idProduct_L
|
0xab, // idProduct_L
|
||||||
0x24, // idProduct_H
|
0x24, // idProduct_H
|
||||||
|
*/
|
||||||
0x00, // bcdDevice_Ver_L
|
0x00, // bcdDevice_Ver_L
|
||||||
0x01, // bcdDevice_Ver_H
|
0x01, // bcdDevice_Ver_H
|
||||||
0x01, // iManufacturer
|
0x01, // iManufacturer
|
||||||
@ -175,10 +176,10 @@ static const uint8_t USB_ConfigDescriptor[] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
_USB_LANG_ID_(USB_StringLangDescriptor, LANG_US);
|
USB_LANG_ID(USB_StringLangDescriptor, LANG_US);
|
||||||
_USB_STRING_(USB_StringSerialDescriptor, u"000001");
|
USB_STRING(USB_StringSerialDescriptor, u"000001");
|
||||||
_USB_STRING_(USB_StringManufacturingDescriptor, u"Eddy @ SAO RAS");
|
USB_STRING(USB_StringManufacturingDescriptor, u"Eddy @ SAO RAS");
|
||||||
_USB_STRING_(USB_StringProdDescriptor, u"USB-Serial Controller");
|
USB_STRING(USB_StringProdDescriptor, u"USB-Serial Controller");
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -210,16 +211,16 @@ static uint16_t wr0(const uint8_t *buf, uint16_t size, uint16_t status){
|
|||||||
size -= l;
|
size -= l;
|
||||||
uint8_t needzlp = (l == endpoints[0].txbufsz) ? 1 : 0;
|
uint8_t needzlp = (l == endpoints[0].txbufsz) ? 1 : 0;
|
||||||
if(size || needzlp){ // send last data buffer
|
if(size || needzlp){ // send last data buffer
|
||||||
status = SET_NAK_RX(status);
|
USB->ISTR = 0;
|
||||||
|
//status = SET_NAK_RX(status);
|
||||||
status = SET_VALID_TX(status);
|
status = SET_VALID_TX(status);
|
||||||
status = KEEP_DTOG_TX(status);
|
status = KEEP_DTOG_TX(status);
|
||||||
status = KEEP_DTOG_RX(status);
|
status = KEEP_DTOG_RX(status);
|
||||||
status = CLEAR_CTR_RX(status);
|
status = CLEAR_CTR_RX(status);
|
||||||
status = CLEAR_CTR_TX(status);
|
status = CLEAR_CTR_TX(status);
|
||||||
USB->ISTR = 0;
|
|
||||||
USB->EPnR[0] = status;
|
USB->EPnR[0] = status;
|
||||||
uint32_t ctr = 1000000;
|
uint32_t ctr = 1000000;
|
||||||
while(--ctr && (USB->ISTR & USB_ISTR_CTR) == 0);
|
while(--ctr && (USB->ISTR & USB_ISTR_CTR) == 0){IWDG->KR = IWDG_REFRESH;};
|
||||||
if((USB->ISTR & USB_ISTR_CTR) == 0){
|
if((USB->ISTR & USB_ISTR_CTR) == 0){
|
||||||
return USB->EPnR[0];
|
return USB->EPnR[0];
|
||||||
}
|
}
|
||||||
@ -255,6 +256,7 @@ static inline uint16_t get_descriptor(uint16_t status){
|
|||||||
status = wr0(USB_DeviceQualifierDescriptor, USB_DeviceQualifierDescriptor[0], status);
|
status = wr0(USB_DeviceQualifierDescriptor, USB_DeviceQualifierDescriptor[0], status);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
DBG("WTF?");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return status;
|
return status;
|
||||||
@ -274,6 +276,7 @@ static inline uint16_t std_d2h_req(uint16_t status){
|
|||||||
EP_WriteIRQ(0, &configuration, 1);
|
EP_WriteIRQ(0, &configuration, 1);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
DBG("WTF?");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return status;
|
return status;
|
||||||
@ -287,10 +290,11 @@ static inline void std_h2d_req(){
|
|||||||
break;
|
break;
|
||||||
case SET_CONFIGURATION:
|
case SET_CONFIGURATION:
|
||||||
// Now device configured
|
// Now device configured
|
||||||
USB_Dev.USB_Status = USB_CONFIGURE_STATE;
|
USB_Dev.USB_Status = USB_STATE_CONFIGURED;
|
||||||
configuration = setup_packet.wValue;
|
configuration = setup_packet.wValue;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
DBG("WTF?");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -319,13 +323,13 @@ static uint16_t EP0_Handler(ep_t ep){
|
|||||||
std_h2d_req();
|
std_h2d_req();
|
||||||
EP_WriteIRQ(0, (uint8_t *)0, 0);
|
EP_WriteIRQ(0, (uint8_t *)0, 0);
|
||||||
}
|
}
|
||||||
epstatus = SET_NAK_RX(epstatus);
|
//epstatus = SET_NAK_RX(epstatus);
|
||||||
epstatus = SET_VALID_TX(epstatus);
|
epstatus = SET_VALID_TX(epstatus);
|
||||||
break;
|
break;
|
||||||
case STANDARD_ENDPOINT_REQUEST_TYPE: // standard endpoint request
|
case STANDARD_ENDPOINT_REQUEST_TYPE: // standard endpoint request
|
||||||
if(setup_packet.bRequest == CLEAR_FEATURE){
|
if(setup_packet.bRequest == CLEAR_FEATURE){
|
||||||
EP_WriteIRQ(0, (uint8_t *)0, 0);
|
EP_WriteIRQ(0, (uint8_t *)0, 0);
|
||||||
epstatus = SET_NAK_RX(epstatus);
|
//epstatus = SET_NAK_RX(epstatus);
|
||||||
epstatus = SET_VALID_TX(epstatus);
|
epstatus = SET_VALID_TX(epstatus);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@ -344,6 +348,7 @@ static uint16_t EP0_Handler(ep_t ep){
|
|||||||
break_handler();
|
break_handler();
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
DBG("WTF?");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
//if(!dev2host) EP_WriteIRQ(0, (uint8_t *)0, 0); // write acknowledgement
|
//if(!dev2host) EP_WriteIRQ(0, (uint8_t *)0, 0); // write acknowledgement
|
||||||
@ -353,6 +358,7 @@ static uint16_t EP0_Handler(ep_t ep){
|
|||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
EP_WriteIRQ(0, (uint8_t *)0, 0);
|
EP_WriteIRQ(0, (uint8_t *)0, 0);
|
||||||
|
DBG("WTF?");
|
||||||
epstatus = SET_NAK_RX(epstatus);
|
epstatus = SET_NAK_RX(epstatus);
|
||||||
epstatus = SET_VALID_TX(epstatus);
|
epstatus = SET_VALID_TX(epstatus);
|
||||||
}
|
}
|
||||||
@ -363,8 +369,8 @@ static uint16_t EP0_Handler(ep_t ep){
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Close transaction
|
// Close transaction
|
||||||
epstatus = CLEAR_DTOG_RX(epstatus);
|
//epstatus = CLEAR_DTOG_RX(epstatus);
|
||||||
epstatus = CLEAR_DTOG_TX(epstatus);
|
//epstatus = CLEAR_DTOG_TX(epstatus);
|
||||||
// wait for new data from host
|
// wait for new data from host
|
||||||
epstatus = SET_VALID_RX(epstatus);
|
epstatus = SET_VALID_RX(epstatus);
|
||||||
epstatus = SET_STALL_TX(epstatus);
|
epstatus = SET_STALL_TX(epstatus);
|
||||||
@ -373,11 +379,11 @@ static uint16_t EP0_Handler(ep_t ep){
|
|||||||
if ((USB->DADDR & USB_DADDR_ADD) != USB_Dev.USB_Addr){
|
if ((USB->DADDR & USB_DADDR_ADD) != USB_Dev.USB_Addr){
|
||||||
USB->DADDR = USB_DADDR_EF | USB_Dev.USB_Addr;
|
USB->DADDR = USB_DADDR_EF | USB_Dev.USB_Addr;
|
||||||
// change state to ADRESSED
|
// change state to ADRESSED
|
||||||
USB_Dev.USB_Status = USB_ADRESSED_STATE;
|
USB_Dev.USB_Status = USB_STATE_ADDRESSED;
|
||||||
}
|
}
|
||||||
// end of transaction
|
// end of transaction
|
||||||
epstatus = CLEAR_DTOG_RX(epstatus);
|
//epstatus = CLEAR_DTOG_RX(epstatus);
|
||||||
epstatus = CLEAR_DTOG_TX(epstatus);
|
//epstatus = CLEAR_DTOG_TX(epstatus);
|
||||||
epstatus = SET_VALID_RX(epstatus);
|
epstatus = SET_VALID_RX(epstatus);
|
||||||
epstatus = SET_VALID_TX(epstatus);
|
epstatus = SET_VALID_TX(epstatus);
|
||||||
}
|
}
|
||||||
@ -422,23 +428,23 @@ int EP_Init(uint8_t number, uint8_t type, uint16_t txsz, uint16_t rxsz, uint16_t
|
|||||||
|
|
||||||
//extern int8_t dump;
|
//extern int8_t dump;
|
||||||
// standard IRQ handler
|
// standard IRQ handler
|
||||||
void usb_isr(){
|
void usb_lp_can_rx0_isr(){
|
||||||
if (USB->ISTR & USB_ISTR_RESET){
|
if (USB->ISTR & USB_ISTR_RESET){
|
||||||
usbON = 0;
|
usbON = 0;
|
||||||
// Reinit registers
|
// Reinit registers
|
||||||
USB->CNTR = USB_CNTR_RESETM | USB_CNTR_CTRM;// | USB_CNTR_SUSPM;
|
USB->CNTR = USB_CNTR_RESETM | USB_CNTR_CTRM | USB_CNTR_SUSPM;
|
||||||
USB->ISTR = 0;
|
|
||||||
// Endpoint 0 - CONTROL
|
// Endpoint 0 - CONTROL
|
||||||
// ON USB LS size of EP0 may be 8 bytes, but on FS it should be 64 bytes!
|
// ON USB LS size of EP0 may be 8 bytes, but on FS it should be 64 bytes!
|
||||||
lastaddr = LASTADDR_DEFAULT;
|
lastaddr = LASTADDR_DEFAULT;
|
||||||
// clear address, leave only enable bit
|
// clear address, leave only enable bit
|
||||||
USB->DADDR = USB_DADDR_EF;
|
USB->DADDR = USB_DADDR_EF;
|
||||||
// state is default - wait for enumeration
|
// state is default - wait for enumeration
|
||||||
USB_Dev.USB_Status = USB_DEFAULT_STATE;
|
USB_Dev.USB_Status = USB_STATE_DEFAULT;
|
||||||
if(EP_Init(0, EP_TYPE_CONTROL, USB_EP0_BUFSZ, USB_EP0_BUFSZ, EP0_Handler)){
|
if(EP_Init(0, EP_TYPE_CONTROL, USB_EP0_BUFSZ, USB_EP0_BUFSZ, EP0_Handler)){
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}else if(USB->ISTR & USB_ISTR_CTR){
|
}
|
||||||
|
if(USB->ISTR & USB_ISTR_CTR){
|
||||||
// EP number
|
// EP number
|
||||||
uint8_t n = USB->ISTR & USB_ISTR_EPID;
|
uint8_t n = USB->ISTR & USB_ISTR_EPID;
|
||||||
// copy status register
|
// copy status register
|
||||||
@ -477,20 +483,13 @@ void usb_isr(){
|
|||||||
epstatus = CLEAR_CTR_TX(epstatus);
|
epstatus = CLEAR_CTR_TX(epstatus);
|
||||||
// refresh EPnR
|
// refresh EPnR
|
||||||
USB->EPnR[n] = epstatus;
|
USB->EPnR[n] = epstatus;
|
||||||
}else if(USB->ISTR & USB_ISTR_SUSP){ // suspend -> usb disconnected
|
}
|
||||||
// usbON = 0;
|
if(USB->ISTR & USB_ISTR_SUSP){ // suspend -> still no connection, may sleep
|
||||||
|
usbON = 0;
|
||||||
}
|
}
|
||||||
USB->ISTR = 0;
|
USB->ISTR = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void usb_lp_can_rx0_isr(){
|
|
||||||
usb_isr();
|
|
||||||
}
|
|
||||||
|
|
||||||
void usb_hp_can_tx_isr(){
|
|
||||||
usb_isr();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Write data to EP buffer (called from IRQ handler)
|
* Write data to EP buffer (called from IRQ handler)
|
||||||
* @param number - EP number
|
* @param number - EP number
|
||||||
@ -519,7 +518,7 @@ 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){
|
void EP_Write(uint8_t number, const uint8_t *buf, uint16_t size){
|
||||||
uint16_t status = USB->EPnR[number];
|
uint16_t status = USB->EPnR[number];
|
||||||
EP_WriteIRQ(number, buf, size);
|
EP_WriteIRQ(number, buf, size);
|
||||||
status = SET_NAK_RX(status);
|
//status = SET_NAK_RX(status);
|
||||||
status = SET_VALID_TX(status);
|
status = SET_VALID_TX(status);
|
||||||
status = KEEP_DTOG_TX(status);
|
status = KEEP_DTOG_TX(status);
|
||||||
status = KEEP_DTOG_RX(status);
|
status = KEEP_DTOG_RX(status);
|
||||||
|
|||||||
@ -100,10 +100,12 @@
|
|||||||
#define CLEAR_CTR_RX_TX(R) (R & (~(USB_EPnR_CTR_TX | USB_EPnR_CTR_RX)))
|
#define CLEAR_CTR_RX_TX(R) (R & (~(USB_EPnR_CTR_TX | USB_EPnR_CTR_RX)))
|
||||||
|
|
||||||
// USB state: uninitialized, addressed, ready for use
|
// USB state: uninitialized, addressed, ready for use
|
||||||
#define USB_DEFAULT_STATE 0
|
typedef enum{
|
||||||
#define USB_ADRESSED_STATE 1
|
USB_STATE_DEFAULT,
|
||||||
#define USB_CONFIGURE_STATE 2
|
USB_STATE_ADDRESSED,
|
||||||
#define USB_CONNECTED_STATE 3
|
USB_STATE_CONFIGURED,
|
||||||
|
USB_STATE_CONNECTED
|
||||||
|
} USB_state;
|
||||||
|
|
||||||
// EP types
|
// EP types
|
||||||
#define EP_TYPE_BULK 0x00
|
#define EP_TYPE_BULK 0x00
|
||||||
@ -113,7 +115,7 @@
|
|||||||
|
|
||||||
#define LANG_US (uint16_t)0x0409
|
#define LANG_US (uint16_t)0x0409
|
||||||
|
|
||||||
#define _USB_STRING_(name, str) \
|
#define USB_STRING(name, str) \
|
||||||
static const struct name \
|
static const struct name \
|
||||||
{ \
|
{ \
|
||||||
uint8_t bLength; \
|
uint8_t bLength; \
|
||||||
@ -123,7 +125,7 @@ static const struct name \
|
|||||||
} \
|
} \
|
||||||
name = {sizeof(name), 0x03, str}
|
name = {sizeof(name), 0x03, str}
|
||||||
|
|
||||||
#define _USB_LANG_ID_(name, lng_id) \
|
#define USB_LANG_ID(name, lng_id) \
|
||||||
\
|
\
|
||||||
static const struct name \
|
static const struct name \
|
||||||
{ \
|
{ \
|
||||||
|
|||||||
Binary file not shown.
139
F1-nolib/SPI/Makefile
Normal file
139
F1-nolib/SPI/Makefile
Normal file
@ -0,0 +1,139 @@
|
|||||||
|
BINARY = SPI
|
||||||
|
BOOTPORT ?= /dev/ttyUSB0
|
||||||
|
BOOTSPEED ?= 115200
|
||||||
|
# MCU FAMILY
|
||||||
|
FAMILY ?= F1
|
||||||
|
# MCU code
|
||||||
|
MCU ?= F103x8
|
||||||
|
# density (stm32f10x.h, lines 70-84)
|
||||||
|
DENSITY ?= MD
|
||||||
|
# change this linking script depending on particular MCU model,
|
||||||
|
LDSCRIPT ?= stm32f103x8.ld
|
||||||
|
# debug
|
||||||
|
DEFS = -DEBUG
|
||||||
|
|
||||||
|
INDEPENDENT_HEADERS=
|
||||||
|
|
||||||
|
FP_FLAGS ?= -msoft-float -mfloat-abi=soft
|
||||||
|
ASM_FLAGS ?= -mthumb -mcpu=cortex-m3 -mfix-cortex-m3-ldrd
|
||||||
|
ARCH_FLAGS = $(ASM_FLAGS) $(FP_FLAGS)
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
# Executables
|
||||||
|
#PREFIX ?= arm-none-eabi
|
||||||
|
# gcc from arm web site
|
||||||
|
PREFIX ?= /opt/bin/arm-none-eabi
|
||||||
|
TOOLCHLIB ?= /opt/arm-none-eabi/lib
|
||||||
|
RM := rm -f
|
||||||
|
RMDIR := rmdir
|
||||||
|
CC := $(PREFIX)-gcc
|
||||||
|
# don't replace ld with gcc: the binary size would be much greater!!
|
||||||
|
LD := $(PREFIX)-ld
|
||||||
|
AR := $(PREFIX)-ar
|
||||||
|
AS := $(PREFIX)-as
|
||||||
|
SIZE := $(PREFIX)-size
|
||||||
|
OBJCOPY := $(PREFIX)-objcopy
|
||||||
|
OBJDUMP := $(PREFIX)-objdump
|
||||||
|
GDB := $(PREFIX)-gdb
|
||||||
|
STFLASH := $(shell which st-flash)
|
||||||
|
STBOOT := $(shell which stm32flash)
|
||||||
|
DFUUTIL := $(shell which dfu-util)
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
# Source files
|
||||||
|
OBJDIR = mk
|
||||||
|
SRC := $(wildcard *.c)
|
||||||
|
OBJS := $(addprefix $(OBJDIR)/, $(SRC:%.c=%.o))
|
||||||
|
STARTUP = $(OBJDIR)/startup.o
|
||||||
|
OBJS += $(STARTUP)
|
||||||
|
# dependencies: we need them to recompile files if their headers-dependencies changed
|
||||||
|
DEPS := $(OBJS:.o=.d)
|
||||||
|
|
||||||
|
INC_DIR ?= ../inc
|
||||||
|
|
||||||
|
INCLUDE := -I$(INC_DIR)/Fx -I$(INC_DIR)/cm
|
||||||
|
LIB_DIR := $(INC_DIR)/ld
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
# C flags
|
||||||
|
CFLAGS += -O2 -g -D__thumb2__=1 -MD -Wl,--gc-sections
|
||||||
|
CFLAGS += -Wall -Werror -Wextra -Wshadow
|
||||||
|
CFLAGS += -fno-common -ffunction-sections -fdata-sections -fno-stack-protector
|
||||||
|
CFLAGS += $(ARCH_FLAGS)
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
# Linker flags
|
||||||
|
LDFLAGS += -nostartfiles --static -nostdlibs --gc-sections
|
||||||
|
LDFLAGS += -L$(LIB_DIR) -L$(TOOLCHLIB)
|
||||||
|
LDFLAGS += -T$(LDSCRIPT)
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
# Used libraries
|
||||||
|
LDLIBS += -lc $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
|
||||||
|
|
||||||
|
DEFS += -DSTM32$(FAMILY) -DSTM32$(MCU) -DSTM32F10X_$(DENSITY)
|
||||||
|
|
||||||
|
ELF := $(OBJDIR)/$(BINARY).elf
|
||||||
|
LIST := $(OBJDIR)/$(BINARY).list
|
||||||
|
BIN := $(BINARY).bin
|
||||||
|
HEX := $(BINARY).hex
|
||||||
|
|
||||||
|
all: bin list size
|
||||||
|
|
||||||
|
elf: $(ELF)
|
||||||
|
bin: $(BIN)
|
||||||
|
hex: $(HEX)
|
||||||
|
list: $(LIST)
|
||||||
|
|
||||||
|
ifneq ($(MAKECMDGOALS),clean)
|
||||||
|
-include $(DEPS)
|
||||||
|
endif
|
||||||
|
|
||||||
|
$(OBJDIR):
|
||||||
|
mkdir $(OBJDIR)
|
||||||
|
|
||||||
|
$(STARTUP): $(INC_DIR)/startup/vector.c
|
||||||
|
$(CC) $(CFLAGS) $(DEFS) $(INCLUDE) -o $@ -c $<
|
||||||
|
|
||||||
|
$(OBJDIR)/%.o: %.c
|
||||||
|
@echo " CC $<"
|
||||||
|
$(CC) $(CFLAGS) $(DEFS) $(INCLUDE) -o $@ -c $<
|
||||||
|
|
||||||
|
$(BIN): $(ELF)
|
||||||
|
@echo " OBJCOPY $(BIN)"
|
||||||
|
$(OBJCOPY) -Obinary $(ELF) $(BIN)
|
||||||
|
|
||||||
|
$(HEX): $(ELF)
|
||||||
|
@echo " OBJCOPY $(HEX)"
|
||||||
|
$(OBJCOPY) -Oihex $(ELF) $(HEX)
|
||||||
|
|
||||||
|
$(LIST): $(ELF)
|
||||||
|
@echo " OBJDUMP $(LIST)"
|
||||||
|
$(OBJDUMP) -S $(ELF) > $(LIST)
|
||||||
|
|
||||||
|
$(ELF): $(OBJDIR) $(OBJS)
|
||||||
|
@echo " LD $(ELF)"
|
||||||
|
$(LD) $(LDFLAGS) $(OBJS) $(LDLIBS) -o $(ELF)
|
||||||
|
|
||||||
|
size: $(ELF)
|
||||||
|
$(SIZE) $(ELF)
|
||||||
|
|
||||||
|
clean:
|
||||||
|
@echo " CLEAN"
|
||||||
|
$(RM) $(OBJS) $(DEPS) $(ELF) $(HEX) $(LIST)
|
||||||
|
@rmdir $(OBJDIR) 2>/dev/null || true
|
||||||
|
|
||||||
|
|
||||||
|
flash: $(BIN)
|
||||||
|
@echo " FLASH $(BIN)"
|
||||||
|
$(STFLASH) write $(BIN) 0x8000000
|
||||||
|
|
||||||
|
boot: $(BIN)
|
||||||
|
@echo " LOAD $(BIN) through bootloader"
|
||||||
|
$(STBOOT) -b$(BOOTSPEED) $(BOOTPORT) -w $(BIN)
|
||||||
|
|
||||||
|
dfuboot: $(BIN)
|
||||||
|
@echo " LOAD $(BIN) THROUGH DFU"
|
||||||
|
$(DFUUTIL) -a0 -D $(BIN) -s 0x08000000
|
||||||
|
|
||||||
|
.PHONY: clean flash boot
|
||||||
1
F1-nolib/SPI/Readme
Normal file
1
F1-nolib/SPI/Readme
Normal file
@ -0,0 +1 @@
|
|||||||
|
STM32F103 SPI DMA for "bluepill"
|
||||||
BIN
F1-nolib/SPI/SPI.bin
Executable file
BIN
F1-nolib/SPI/SPI.bin
Executable file
Binary file not shown.
48
F1-nolib/SPI/hardware.c
Normal file
48
F1-nolib/SPI/hardware.c
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
/*
|
||||||
|
* geany_encoding=koi8-r
|
||||||
|
* hardware.c - hardware-dependent macros & functions
|
||||||
|
*
|
||||||
|
* Copyright 2018 Edward V. Emelianov <eddy@sao.ru, edward.emelianoff@gmail.com>
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
|
||||||
|
* MA 02110-1301, USA.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "hardware.h"
|
||||||
|
#include "spi.h"
|
||||||
|
|
||||||
|
static inline void gpio_setup(){
|
||||||
|
// Enable clocks to the GPIO subsystems, turn on AFIO clocking to disable SWD/JTAG
|
||||||
|
RCC->APB2ENR |= RCC_APB2ENR_IOPAEN | RCC_APB2ENR_IOPBEN | RCC_APB2ENR_IOPCEN | RCC_APB2ENR_AFIOEN;
|
||||||
|
// Set led as opendrain output
|
||||||
|
GPIOC->CRH = CRH(13, CNF_ODOUTPUT|MODE_SLOW);
|
||||||
|
// turn off SWJ/JTAG (PA13 is in use)
|
||||||
|
// AFIO->MAPR = AFIO_MAPR_SWJ_CFG_DISABLE;
|
||||||
|
GPIOA->CRL = CRL(6, CNF_PPOUTPUT|MODE_SLOW); // test pin (MISO)
|
||||||
|
}
|
||||||
|
|
||||||
|
void hw_setup(){
|
||||||
|
gpio_setup();
|
||||||
|
spi_setup();
|
||||||
|
}
|
||||||
|
|
||||||
|
// SPI1 DMA Tx interrupt
|
||||||
|
void dma1_channel3_isr(){
|
||||||
|
if(DMA1->ISR & DMA_ISR_TCIF3){
|
||||||
|
DMA1->IFCR |= DMA_IFCR_CTCIF3; /* Clear TC flag */
|
||||||
|
SPI_status = SPI_READY;
|
||||||
|
}
|
||||||
|
}
|
||||||
60
F1-nolib/SPI/hardware.h
Normal file
60
F1-nolib/SPI/hardware.h
Normal file
@ -0,0 +1,60 @@
|
|||||||
|
/*
|
||||||
|
* geany_encoding=koi8-r
|
||||||
|
* hardware.h
|
||||||
|
*
|
||||||
|
* Copyright 2018 Edward V. Emelianov <eddy@sao.ru, edward.emelianoff@gmail.com>
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
|
||||||
|
* MA 02110-1301, USA.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
#pragma once
|
||||||
|
#ifndef __HARDWARE_H__
|
||||||
|
#define __HARDWARE_H__
|
||||||
|
|
||||||
|
#include "stm32f1.h"
|
||||||
|
|
||||||
|
// LED0 - PC13 (bluepill), blinking each second
|
||||||
|
#define LED0_port GPIOC
|
||||||
|
#define LED0_pin (1<<13)
|
||||||
|
|
||||||
|
// USB pullup (not present in bluepill) - PA15
|
||||||
|
#define USBPU_port GPIOA
|
||||||
|
#define USBPU_pin (1<<15)
|
||||||
|
#define USBPU_ON() pin_clear(USBPU_port, USBPU_pin)
|
||||||
|
#define USBPU_OFF() pin_set(USBPU_port, USBPU_pin)
|
||||||
|
|
||||||
|
#define LED_blink(x) pin_toggle(x ## _port, x ## _pin)
|
||||||
|
#define LED_on(x) pin_clear(x ## _port, x ## _pin)
|
||||||
|
#define LED_off(x) pin_set(x ## _port, x ## _pin)
|
||||||
|
|
||||||
|
// SPI DMA channel
|
||||||
|
#define DMA_SPI_Channel DMA1_Channel3
|
||||||
|
// SCREEN PINs: A,B - PB6,PB7; SCLK - PA6; nOE - PA13
|
||||||
|
#define A_port GPIOB
|
||||||
|
#define A_pin (1<<6)
|
||||||
|
#define B_port GPIOB
|
||||||
|
#define B_pin (1<<7)
|
||||||
|
#define SCLK_port GPIOA
|
||||||
|
#define SCLK_pin (1<<6)
|
||||||
|
#define nOE_port GPIOA
|
||||||
|
#define nOE_pin (1<<13)
|
||||||
|
#define SET(x) pin_set(x ## _port, x ## _pin)
|
||||||
|
#define CLEAR(x) pin_clear(x ## _port, x ## _pin)
|
||||||
|
#define TOGGLE(x) pin_toggle(x ## _port, x ## _pin)
|
||||||
|
|
||||||
|
void hw_setup();
|
||||||
|
|
||||||
|
#endif // __HARDWARE_H__
|
||||||
100
F1-nolib/SPI/main.c
Normal file
100
F1-nolib/SPI/main.c
Normal file
@ -0,0 +1,100 @@
|
|||||||
|
/*
|
||||||
|
* main.c
|
||||||
|
*
|
||||||
|
* Copyright 2017 Edward V. Emelianoff <eddy@sao.ru, edward.emelianoff@gmail.com>
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
|
||||||
|
* MA 02110-1301, USA.
|
||||||
|
*/
|
||||||
|
#include "hardware.h"
|
||||||
|
#include "spi.h"
|
||||||
|
#include "usb.h"
|
||||||
|
#include "usb_lib.h"
|
||||||
|
|
||||||
|
volatile uint32_t Tms = 0;
|
||||||
|
|
||||||
|
/* Called when systick fires */
|
||||||
|
void sys_tick_handler(void){
|
||||||
|
++Tms;
|
||||||
|
}
|
||||||
|
|
||||||
|
char *parse_cmd(char *buf){
|
||||||
|
const uint8_t array[] = {0xf0, 0xa5, 0x5a, 0x0f};
|
||||||
|
if(buf[1] != '\n') return buf;
|
||||||
|
switch(*buf){
|
||||||
|
case 'D':
|
||||||
|
if(SPI_transmit(array, 4)) USB_send("Error in DMA transmission\n");
|
||||||
|
else USB_send("Transmitted\n");
|
||||||
|
break;
|
||||||
|
case 'S':
|
||||||
|
if(SPI1->SR & SPI_SR_TXE){
|
||||||
|
*(uint8_t *)&(SPI1->DR) = 0xa5;
|
||||||
|
USB_send("sent 0xa5\n");
|
||||||
|
}else USB_send("SR_TXE isn't empty\n");
|
||||||
|
break;
|
||||||
|
default: // help
|
||||||
|
return
|
||||||
|
"'S' - send 0xa5 directly\n"
|
||||||
|
"'D' - send 4 bytes by DMA\n"
|
||||||
|
;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
// usb getline
|
||||||
|
char *get_USB(){
|
||||||
|
static char tmpbuf[512], *curptr = tmpbuf;
|
||||||
|
static int rest = 511;
|
||||||
|
int x = USB_receive(curptr, rest);
|
||||||
|
curptr[x] = 0;
|
||||||
|
if(!x) return NULL;
|
||||||
|
if(curptr[x-1] == '\n'){
|
||||||
|
curptr = tmpbuf;
|
||||||
|
rest = 511;
|
||||||
|
return tmpbuf;
|
||||||
|
}
|
||||||
|
curptr += x; rest -= x;
|
||||||
|
if(rest <= 0){ // buffer overflow
|
||||||
|
curptr = tmpbuf;
|
||||||
|
rest = 511;
|
||||||
|
}
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
int main(void){
|
||||||
|
uint32_t lastT = 0;
|
||||||
|
sysreset();
|
||||||
|
StartHSE();
|
||||||
|
SysTick_Config(72000);
|
||||||
|
hw_setup();
|
||||||
|
USB_setup();
|
||||||
|
|
||||||
|
while (1){
|
||||||
|
if(lastT > Tms || Tms - lastT > 499){
|
||||||
|
pin_toggle(GPIOA, (1<<6));
|
||||||
|
LED_blink(LED0);
|
||||||
|
lastT = Tms;
|
||||||
|
}
|
||||||
|
usb_proc();
|
||||||
|
char *txt, *ans;
|
||||||
|
if((txt = get_USB())){
|
||||||
|
ans = parse_cmd(txt);
|
||||||
|
if(ans) USB_send(ans);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
69
F1-nolib/SPI/spi.c
Normal file
69
F1-nolib/SPI/spi.c
Normal file
@ -0,0 +1,69 @@
|
|||||||
|
/*
|
||||||
|
* This file is part of the LED_screen project.
|
||||||
|
* Copyright 2019 Edward V. Emelianov <edward.emelianoff@gmail.com>.
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "spi.h"
|
||||||
|
#include "hardware.h"
|
||||||
|
|
||||||
|
spiStatus SPI_status = SPI_NOTREADY;
|
||||||
|
|
||||||
|
void spi_setup(){
|
||||||
|
// setup SPI GPIO - alternate function PP (PA5 - SCK, PA7 - MOSI)
|
||||||
|
GPIOA->CRL |= CRL(5, CNF_AFPP|MODE_FAST) | CRL(7, CNF_AFPP|MODE_FAST);
|
||||||
|
// configure SPI (transmit only)
|
||||||
|
/* Enable the peripheral clock SPI1 */
|
||||||
|
RCC->APB2ENR |= RCC_APB2ENR_SPI1EN;
|
||||||
|
/* Configure SPI1 in master */
|
||||||
|
/* (1) Master selection, BR: Fpclk/16
|
||||||
|
CPOL and CPHA at zero (rising first edge) */
|
||||||
|
/* (2) TX with DMA, slave select output disabled (software managed) */
|
||||||
|
/* (3) Enable SPI1 */
|
||||||
|
SPI1->CR1 = SPI_CR1_MSTR | SPI_CR1_BR_0 | SPI_CR1_BR_1 | SPI_CR1_SSM | SPI_CR1_SSI; /* (1) */
|
||||||
|
SPI1->CR2 = SPI_CR2_TXDMAEN; /* (2) */
|
||||||
|
// setup SPI1 DMA
|
||||||
|
/* Enable the peripheral clock DMA11 */
|
||||||
|
RCC->AHBENR |= RCC_AHBENR_DMA1EN;
|
||||||
|
/* DMA1 Channel3 SPI1_TX config */
|
||||||
|
/* (5) Peripheral address */
|
||||||
|
/* (7) Memory increment */
|
||||||
|
/* Memory to peripheral */
|
||||||
|
/* 8-bit transfer */
|
||||||
|
/* Transfer complete IRQ enable */
|
||||||
|
DMA_SPI_Channel->CPAR = (uint32_t)&(SPI1->DR); /* (5) */
|
||||||
|
DMA_SPI_Channel->CCR |= DMA_CCR_MINC | DMA_CCR_DIR | DMA_CCR_TCIE; /* (7) */
|
||||||
|
NVIC_SetPriority(DMA1_Channel3_IRQn, 0);
|
||||||
|
NVIC_EnableIRQ(DMA1_Channel3_IRQn);
|
||||||
|
SPI_status = SPI_READY;
|
||||||
|
SPI1->CR1 |= SPI_CR1_SPE; /* (3) */
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief SPI_transmit - transmit data over SPI DMA
|
||||||
|
* @param buf - data to transmit
|
||||||
|
* @param len - its length
|
||||||
|
* @return 0 if all OK
|
||||||
|
*/
|
||||||
|
uint8_t SPI_transmit(const uint8_t *buf, uint8_t len){
|
||||||
|
if(!buf || !len) return 1; // bad data format
|
||||||
|
if(SPI_status != SPI_READY) return 2; // spi not ready to transmit data
|
||||||
|
DMA_SPI_Channel->CCR &=~ DMA_CCR_EN;
|
||||||
|
DMA_SPI_Channel->CMAR = (uint32_t)buf;
|
||||||
|
DMA_SPI_Channel->CNDTR = len;
|
||||||
|
SPI_status = SPI_BUSY;
|
||||||
|
DMA_SPI_Channel->CCR |= DMA_CCR_EN;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
36
F1-nolib/SPI/spi.h
Normal file
36
F1-nolib/SPI/spi.h
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
/*
|
||||||
|
* This file is part of the LED_screen project.
|
||||||
|
* Copyright 2019 Edward V. Emelianov <edward.emelianoff@gmail.com>.
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
#ifndef SPI_H__
|
||||||
|
#define SPI_H__
|
||||||
|
|
||||||
|
#include "stm32f1.h"
|
||||||
|
|
||||||
|
typedef enum{
|
||||||
|
SPI_NOTREADY,
|
||||||
|
SPI_READY,
|
||||||
|
SPI_BUSY
|
||||||
|
} spiStatus;
|
||||||
|
|
||||||
|
extern spiStatus SPI_status;
|
||||||
|
|
||||||
|
void spi_setup();
|
||||||
|
uint8_t SPI_transmit(const uint8_t *buf, uint8_t len);
|
||||||
|
|
||||||
|
#endif // SPI_H__
|
||||||
165
F1-nolib/SPI/usb.c
Normal file
165
F1-nolib/SPI/usb.c
Normal file
@ -0,0 +1,165 @@
|
|||||||
|
/*
|
||||||
|
* geany_encoding=koi8-r
|
||||||
|
* usb.c - base functions for different USB types
|
||||||
|
*
|
||||||
|
* Copyright 2018 Edward V. Emelianov <eddy@sao.ru, edward.emelianoff@gmail.com>
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
|
||||||
|
* MA 02110-1301, USA.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
#include "usb.h"
|
||||||
|
#include "usb_lib.h"
|
||||||
|
|
||||||
|
// incoming buffer size
|
||||||
|
#define IDATASZ (256)
|
||||||
|
static uint8_t incoming_data[IDATASZ];
|
||||||
|
static uint8_t ovfl = 0;
|
||||||
|
static uint16_t idatalen = 0;
|
||||||
|
static volatile uint8_t tx_succesfull = 0;
|
||||||
|
static int8_t usbON = 0; // ==1 when USB fully configured
|
||||||
|
|
||||||
|
// interrupt IN handler (never used?)
|
||||||
|
static uint16_t EP1_Handler(ep_t ep){
|
||||||
|
if (ep.rx_flag){
|
||||||
|
ep.status = SET_VALID_TX(ep.status);
|
||||||
|
ep.status = KEEP_STAT_RX(ep.status);
|
||||||
|
}else if (ep.tx_flag){
|
||||||
|
ep.status = SET_VALID_RX(ep.status);
|
||||||
|
ep.status = SET_STALL_TX(ep.status);
|
||||||
|
}
|
||||||
|
return ep.status;
|
||||||
|
}
|
||||||
|
|
||||||
|
// data IN/OUT handler
|
||||||
|
static uint16_t EP23_Handler(ep_t ep){
|
||||||
|
if(ep.rx_flag){
|
||||||
|
int rd = ep.rx_cnt, rest = IDATASZ - idatalen;
|
||||||
|
if(rd){
|
||||||
|
if(rd <= rest){
|
||||||
|
idatalen += EP_Read(2, (uint16_t*)&incoming_data[idatalen]);
|
||||||
|
ovfl = 0;
|
||||||
|
}else{
|
||||||
|
ep.status = SET_NAK_RX(ep.status);
|
||||||
|
ovfl = 1;
|
||||||
|
return ep.status;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// end of transaction: clear DTOGs
|
||||||
|
ep.status = CLEAR_DTOG_RX(ep.status);
|
||||||
|
ep.status = CLEAR_DTOG_TX(ep.status);
|
||||||
|
ep.status = SET_STALL_TX(ep.status);
|
||||||
|
}else if (ep.tx_flag){
|
||||||
|
ep.status = KEEP_STAT_TX(ep.status);
|
||||||
|
tx_succesfull = 1;
|
||||||
|
}
|
||||||
|
ep.status = SET_VALID_RX(ep.status);
|
||||||
|
return ep.status;
|
||||||
|
}
|
||||||
|
|
||||||
|
void USB_setup(){
|
||||||
|
NVIC_DisableIRQ(USB_LP_CAN1_RX0_IRQn);
|
||||||
|
NVIC_DisableIRQ(USB_HP_CAN1_TX_IRQn);
|
||||||
|
RCC->APB1ENR |= RCC_APB1ENR_USBEN;
|
||||||
|
USB->CNTR = USB_CNTR_FRES; // Force USB Reset
|
||||||
|
for(uint32_t ctr = 0; ctr < 72000; ++ctr) nop(); // wait >1ms
|
||||||
|
//uint32_t ctr = 0;
|
||||||
|
USB->CNTR = 0;
|
||||||
|
USB->BTABLE = 0;
|
||||||
|
USB->DADDR = 0;
|
||||||
|
USB->ISTR = 0;
|
||||||
|
USB->CNTR = USB_CNTR_RESETM | USB_CNTR_WKUPM; // allow only wakeup & reset interrupts
|
||||||
|
NVIC_EnableIRQ(USB_LP_CAN1_RX0_IRQn);
|
||||||
|
NVIC_EnableIRQ(USB_HP_CAN1_TX_IRQn );
|
||||||
|
}
|
||||||
|
|
||||||
|
void usb_proc(){
|
||||||
|
if(USB_GetState() == USB_CONFIGURE_STATE){ // USB configured - activate other endpoints
|
||||||
|
if(!usbON){ // endpoints not activated
|
||||||
|
// make new BULK endpoint
|
||||||
|
// Buffer have 1024 bytes, but last 256 we use for CAN bus (30.2 of RM: USB main features)
|
||||||
|
EP_Init(1, EP_TYPE_INTERRUPT, 10, 0, EP1_Handler); // IN1 - transmit
|
||||||
|
EP_Init(2, EP_TYPE_BULK, 0, USB_RXBUFSZ, EP23_Handler); // OUT2 - receive data
|
||||||
|
EP_Init(3, EP_TYPE_BULK, USB_TXBUFSZ, 0, EP23_Handler); // IN3 - transmit data
|
||||||
|
usbON = 1;
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
usbON = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void USB_send(const char *buf){
|
||||||
|
if(!USB_configured()){
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
char tmpbuf[USB_TXBUFSZ];
|
||||||
|
uint16_t l = 0, ctr = 0;
|
||||||
|
const char *p = buf;
|
||||||
|
while(*p++) ++l;
|
||||||
|
while(l){
|
||||||
|
uint16_t proc = 0, s = (l > USB_TXBUFSZ - 1) ? USB_TXBUFSZ - 1: l;
|
||||||
|
for(int i = 0; i < s; ++i, ++proc){
|
||||||
|
char c = buf[ctr+proc];
|
||||||
|
/*
|
||||||
|
if(c == '\n' && the_conf.defflags & FLAG_STRENDRN){ // add '\r' before '\n'
|
||||||
|
tmpbuf[i++] = '\r';
|
||||||
|
if(i == s) ++s;
|
||||||
|
}*/
|
||||||
|
tmpbuf[i] = c;
|
||||||
|
}
|
||||||
|
tx_succesfull = 0;
|
||||||
|
EP_Write(3, (uint8_t*)tmpbuf, s);
|
||||||
|
uint32_t ctra = 1000000;
|
||||||
|
while(--ctra && tx_succesfull == 0);
|
||||||
|
l -= proc;
|
||||||
|
ctr += proc;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief USB_receive
|
||||||
|
* @param buf (i) - buffer for received data
|
||||||
|
* @param bufsize - its size
|
||||||
|
* @return amount of received bytes
|
||||||
|
*/
|
||||||
|
int USB_receive(char *buf, int bufsize){
|
||||||
|
if(!bufsize || !idatalen) return 0;
|
||||||
|
USB->CNTR = 0;
|
||||||
|
int sz = (idatalen > bufsize) ? bufsize : idatalen, rest = idatalen - sz;
|
||||||
|
for(int i = 0; i < sz; ++i) buf[i] = incoming_data[i];
|
||||||
|
if(rest > 0){
|
||||||
|
uint8_t *ptr = &incoming_data[sz];
|
||||||
|
for(int i = 0; i < rest; ++i) incoming_data[i] = *ptr++;
|
||||||
|
//memmove(incoming_data, &incoming_data[sz], rest); - hardfault on memcpy&memmove
|
||||||
|
idatalen = rest;
|
||||||
|
}else idatalen = 0;
|
||||||
|
if(ovfl){
|
||||||
|
EP23_Handler(endpoints[2]);
|
||||||
|
uint16_t epstatus = USB->EPnR[2];
|
||||||
|
epstatus = CLEAR_DTOG_RX(epstatus);
|
||||||
|
epstatus = SET_VALID_RX(epstatus);
|
||||||
|
USB->EPnR[2] = epstatus;
|
||||||
|
}
|
||||||
|
USB->CNTR = USB_CNTR_RESETM | USB_CNTR_CTRM;
|
||||||
|
return sz;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief USB_configured
|
||||||
|
* @return 1 if USB is in configured state
|
||||||
|
*/
|
||||||
|
int USB_configured(){
|
||||||
|
return usbON;
|
||||||
|
}
|
||||||
37
F1-nolib/SPI/usb.h
Normal file
37
F1-nolib/SPI/usb.h
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
/*
|
||||||
|
* geany_encoding=koi8-r
|
||||||
|
* usb.h
|
||||||
|
*
|
||||||
|
* Copyright 2018 Edward V. Emelianov <eddy@sao.ru, edward.emelianoff@gmail.com>
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
|
||||||
|
* MA 02110-1301, USA.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
#pragma once
|
||||||
|
#ifndef __USB_H__
|
||||||
|
#define __USB_H__
|
||||||
|
|
||||||
|
#include "hardware.h"
|
||||||
|
|
||||||
|
#define BUFFSIZE (64)
|
||||||
|
|
||||||
|
void USB_setup();
|
||||||
|
void usb_proc();
|
||||||
|
void USB_send(const char *buf);
|
||||||
|
int USB_receive(char *buf, int bufsize);
|
||||||
|
int USB_configured();
|
||||||
|
|
||||||
|
#endif // __USB_H__
|
||||||
117
F1-nolib/SPI/usb_defs.h
Normal file
117
F1-nolib/SPI/usb_defs.h
Normal file
@ -0,0 +1,117 @@
|
|||||||
|
/*
|
||||||
|
* geany_encoding=koi8-r
|
||||||
|
* usb_defs.h
|
||||||
|
*
|
||||||
|
* Copyright 2018 Edward V. Emelianov <eddy@sao.ru, edward.emelianoff@gmail.com>
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
|
||||||
|
* MA 02110-1301, USA.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
#ifndef __USB_DEFS_H__
|
||||||
|
#define __USB_DEFS_H__
|
||||||
|
|
||||||
|
#include <stm32f1.h>
|
||||||
|
|
||||||
|
// max endpoints number
|
||||||
|
#define STM32ENDPOINTS 8
|
||||||
|
/**
|
||||||
|
* Buffers size definition
|
||||||
|
**/
|
||||||
|
#define USB_BTABLE_SIZE 512
|
||||||
|
// first 64 bytes of USB_BTABLE are registers!
|
||||||
|
//#define USB_EP0_BASEADDR 64
|
||||||
|
// for USB FS EP0 buffers are from 8 to 64 bytes long (64 for PL2303)
|
||||||
|
#define USB_EP0_BUFSZ 64
|
||||||
|
// USB transmit buffer size (64 for PL2303)
|
||||||
|
#define USB_TXBUFSZ 64
|
||||||
|
// USB receive buffer size (64 for PL2303)
|
||||||
|
#define USB_RXBUFSZ 64
|
||||||
|
|
||||||
|
#define USB_BTABLE_BASE 0x40006000
|
||||||
|
#define USB_BASE ((uint32_t)0x40005C00)
|
||||||
|
#define USB ((USB_TypeDef *) USB_BASE)
|
||||||
|
|
||||||
|
#ifdef USB_BTABLE
|
||||||
|
#undef USB_BTABLE
|
||||||
|
#endif
|
||||||
|
#define USB_BTABLE ((USB_BtableDef *)(USB_BTABLE_BASE))
|
||||||
|
#define USB_ISTR_EPID 0x0000000F
|
||||||
|
#define USB_FNR_LSOF_0 0x00000800
|
||||||
|
#define USB_FNR_lSOF_1 0x00001000
|
||||||
|
#define USB_LPMCSR_BESL_0 0x00000010
|
||||||
|
#define USB_LPMCSR_BESL_1 0x00000020
|
||||||
|
#define USB_LPMCSR_BESL_2 0x00000040
|
||||||
|
#define USB_LPMCSR_BESL_3 0x00000080
|
||||||
|
#define USB_EPnR_CTR_RX 0x00008000
|
||||||
|
#define USB_EPnR_DTOG_RX 0x00004000
|
||||||
|
#define USB_EPnR_STAT_RX 0x00003000
|
||||||
|
#define USB_EPnR_STAT_RX_0 0x00001000
|
||||||
|
#define USB_EPnR_STAT_RX_1 0x00002000
|
||||||
|
#define USB_EPnR_SETUP 0x00000800
|
||||||
|
#define USB_EPnR_EP_TYPE 0x00000600
|
||||||
|
#define USB_EPnR_EP_TYPE_0 0x00000200
|
||||||
|
#define USB_EPnR_EP_TYPE_1 0x00000400
|
||||||
|
#define USB_EPnR_EP_KIND 0x00000100
|
||||||
|
#define USB_EPnR_CTR_TX 0x00000080
|
||||||
|
#define USB_EPnR_DTOG_TX 0x00000040
|
||||||
|
#define USB_EPnR_STAT_TX 0x00000030
|
||||||
|
#define USB_EPnR_STAT_TX_0 0x00000010
|
||||||
|
#define USB_EPnR_STAT_TX_1 0x00000020
|
||||||
|
#define USB_EPnR_EA 0x0000000F
|
||||||
|
#define USB_COUNTn_RX_BLSIZE 0x00008000
|
||||||
|
#define USB_COUNTn_NUM_BLOCK 0x00007C00
|
||||||
|
#define USB_COUNTn_RX 0x0000003F
|
||||||
|
|
||||||
|
#ifdef USB_TypeDef
|
||||||
|
#define USB_TypeDef USB_TypeDef_custom
|
||||||
|
#endif
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
__IO uint32_t EPnR[STM32ENDPOINTS];
|
||||||
|
__IO uint32_t RESERVED[STM32ENDPOINTS];
|
||||||
|
__IO uint32_t CNTR;
|
||||||
|
__IO uint32_t ISTR;
|
||||||
|
__IO uint32_t FNR;
|
||||||
|
__IO uint32_t DADDR;
|
||||||
|
__IO uint32_t BTABLE;
|
||||||
|
} USB_TypeDef;
|
||||||
|
|
||||||
|
/*
|
||||||
|
typedef struct{
|
||||||
|
__IO uint16_t USB_ADDR_TX;
|
||||||
|
__IO uint16_t res1;
|
||||||
|
__IO uint16_t USB_COUNT_TX;
|
||||||
|
__IO uint16_t res2;
|
||||||
|
__IO uint16_t USB_ADDR_RX;
|
||||||
|
__IO uint16_t res3;
|
||||||
|
__IO uint16_t USB_COUNT_RX;
|
||||||
|
__IO uint16_t res4;
|
||||||
|
} USB_EPDATA_TypeDef;*/
|
||||||
|
|
||||||
|
typedef struct{
|
||||||
|
__IO uint32_t USB_ADDR_TX;
|
||||||
|
__IO uint32_t USB_COUNT_TX;
|
||||||
|
__IO uint32_t USB_ADDR_RX;
|
||||||
|
__IO uint32_t USB_COUNT_RX;
|
||||||
|
} USB_EPDATA_TypeDef;
|
||||||
|
|
||||||
|
typedef struct{
|
||||||
|
__IO USB_EPDATA_TypeDef EP[STM32ENDPOINTS];
|
||||||
|
} USB_BtableDef;
|
||||||
|
|
||||||
|
#endif // __USB_DEFS_H__
|
||||||
522
F1-nolib/SPI/usb_lib.c
Normal file
522
F1-nolib/SPI/usb_lib.c
Normal file
@ -0,0 +1,522 @@
|
|||||||
|
/*
|
||||||
|
* geany_encoding=koi8-r
|
||||||
|
* usb_lib.c
|
||||||
|
*
|
||||||
|
* Copyright 2018 Edward V. Emelianov <eddy@sao.ru, edward.emelianoff@gmail.com>
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
|
||||||
|
* MA 02110-1301, USA.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
#include "usb_lib.h"
|
||||||
|
|
||||||
|
ep_t endpoints[STM32ENDPOINTS];
|
||||||
|
|
||||||
|
static usb_dev_t USB_Dev;
|
||||||
|
static usb_LineCoding lineCoding = {115200, 0, 0, 8};
|
||||||
|
config_pack_t setup_packet;
|
||||||
|
static uint8_t ep0databuf[EP0DATABUF_SIZE];
|
||||||
|
static uint8_t ep0dbuflen = 0;
|
||||||
|
|
||||||
|
usb_LineCoding getLineCoding(){return lineCoding;}
|
||||||
|
|
||||||
|
// definition of parts common for USB_DeviceDescriptor & USB_DeviceQualifierDescriptor
|
||||||
|
#define bcdUSB_L 0x10
|
||||||
|
#define bcdUSB_H 0x01
|
||||||
|
#define bDeviceClass 0
|
||||||
|
#define bDeviceSubClass 0
|
||||||
|
#define bDeviceProtocol 0
|
||||||
|
#define bNumConfigurations 1
|
||||||
|
|
||||||
|
static const uint8_t USB_DeviceDescriptor[] = {
|
||||||
|
18, // bLength
|
||||||
|
0x01, // bDescriptorType - Device descriptor
|
||||||
|
bcdUSB_L, // bcdUSB_L - 1.10
|
||||||
|
bcdUSB_H, // bcdUSB_H
|
||||||
|
bDeviceClass, // bDeviceClass - USB_COMM
|
||||||
|
bDeviceSubClass, // bDeviceSubClass
|
||||||
|
bDeviceProtocol, // bDeviceProtocol
|
||||||
|
USB_EP0_BUFSZ, // bMaxPacketSize
|
||||||
|
0x7b, // idVendor_L PL2303: VID=0x067b, PID=0x2303
|
||||||
|
0x06, // idVendor_H
|
||||||
|
0x03, // idProduct_L
|
||||||
|
0x23, // idProduct_H
|
||||||
|
0x00, // bcdDevice_Ver_L
|
||||||
|
0x03, // bcdDevice_Ver_H
|
||||||
|
0x01, // iManufacturer
|
||||||
|
0x02, // iProduct
|
||||||
|
0x00, // iSerialNumber
|
||||||
|
bNumConfigurations // bNumConfigurations
|
||||||
|
};
|
||||||
|
|
||||||
|
static const uint8_t USB_DeviceQualifierDescriptor[] = {
|
||||||
|
10, //bLength
|
||||||
|
0x06, // bDescriptorType - Device qualifier
|
||||||
|
bcdUSB_L, // bcdUSB_L
|
||||||
|
bcdUSB_H, // bcdUSB_H
|
||||||
|
bDeviceClass, // bDeviceClass
|
||||||
|
bDeviceSubClass, // bDeviceSubClass
|
||||||
|
bDeviceProtocol, // bDeviceProtocol
|
||||||
|
USB_EP0_BUFSZ, // bMaxPacketSize0
|
||||||
|
bNumConfigurations, // bNumConfigurations
|
||||||
|
0x00 // Reserved
|
||||||
|
};
|
||||||
|
|
||||||
|
static const uint8_t USB_ConfigDescriptor[] = {
|
||||||
|
/*Configuration Descriptor*/
|
||||||
|
0x09, /* bLength: Configuration Descriptor size */
|
||||||
|
0x02, /* bDescriptorType: Configuration */
|
||||||
|
39, /* wTotalLength:no of returned bytes */
|
||||||
|
0x00,
|
||||||
|
0x01, /* bNumInterfaces: 1 interface */
|
||||||
|
0x01, /* bConfigurationValue: Configuration value */
|
||||||
|
0x00, /* iConfiguration: Index of string descriptor describing the configuration */
|
||||||
|
0xa0, /* bmAttributes - Bus powered, Remote wakeup */
|
||||||
|
0x32, /* MaxPower 100 mA */
|
||||||
|
|
||||||
|
/*---------------------------------------------------------------------------*/
|
||||||
|
|
||||||
|
/*Interface Descriptor */
|
||||||
|
0x09, /* bLength: Interface Descriptor size */
|
||||||
|
0x04, /* bDescriptorType: Interface */
|
||||||
|
0x00, /* bInterfaceNumber: Number of Interface */
|
||||||
|
0x00, /* bAlternateSetting: Alternate setting */
|
||||||
|
0x03, /* bNumEndpoints: 3 endpoints used */
|
||||||
|
0xff, /* bInterfaceClass */
|
||||||
|
0x00, /* bInterfaceSubClass */
|
||||||
|
0x00, /* bInterfaceProtocol */
|
||||||
|
0x00, /* iInterface: */
|
||||||
|
///////////////////////////////////////////////////
|
||||||
|
/*Endpoint 1 Descriptor*/
|
||||||
|
0x07, /* bLength: Endpoint Descriptor size */
|
||||||
|
0x05, /* bDescriptorType: Endpoint */
|
||||||
|
0x81, /* bEndpointAddress IN1 */
|
||||||
|
0x03, /* bmAttributes: Interrupt */
|
||||||
|
0x0a, /* wMaxPacketSize LO: */
|
||||||
|
0x00, /* wMaxPacketSize HI: */
|
||||||
|
0x01, /* bInterval: */
|
||||||
|
|
||||||
|
/*Endpoint OUT2 Descriptor*/
|
||||||
|
0x07, /* bLength: Endpoint Descriptor size */
|
||||||
|
0x05, /* bDescriptorType: Endpoint */
|
||||||
|
0x02, /* bEndpointAddress: OUT2 */
|
||||||
|
0x02, /* bmAttributes: Bulk */
|
||||||
|
(USB_RXBUFSZ & 0xff), /* wMaxPacketSize: 64 */
|
||||||
|
(USB_RXBUFSZ >> 8),
|
||||||
|
0x00, /* bInterval: ignore for Bulk transfer */
|
||||||
|
|
||||||
|
/*Endpoint IN3 Descriptor*/
|
||||||
|
0x07, /* bLength: Endpoint Descriptor size */
|
||||||
|
0x05, /* bDescriptorType: Endpoint */
|
||||||
|
0x83, /* bEndpointAddress IN3 */
|
||||||
|
0x02, /* bmAttributes: Bulk */
|
||||||
|
(USB_TXBUFSZ & 0xff), /* wMaxPacketSize: 64 */
|
||||||
|
(USB_TXBUFSZ >> 8),
|
||||||
|
0x00, /* bInterval: ignore for Bulk transfer */
|
||||||
|
};
|
||||||
|
|
||||||
|
_USB_LANG_ID_(USB_StringLangDescriptor, LANG_US);
|
||||||
|
// these descriptors are not used in PL2303 emulator!
|
||||||
|
_USB_STRING_(USB_StringSerialDescriptor, u"0");
|
||||||
|
_USB_STRING_(USB_StringManufacturingDescriptor, u"Prolific Technology Inc.");
|
||||||
|
_USB_STRING_(USB_StringProdDescriptor, u"USB-Serial Controller");
|
||||||
|
|
||||||
|
/*
|
||||||
|
* default handlers
|
||||||
|
*/
|
||||||
|
// SET_LINE_CODING
|
||||||
|
void WEAK linecoding_handler(usb_LineCoding __attribute__((unused)) *lc){
|
||||||
|
}
|
||||||
|
|
||||||
|
// SET_CONTROL_LINE_STATE
|
||||||
|
void WEAK clstate_handler(uint16_t __attribute__((unused)) val){
|
||||||
|
}
|
||||||
|
|
||||||
|
// SEND_BREAK
|
||||||
|
void WEAK break_handler(){
|
||||||
|
}
|
||||||
|
|
||||||
|
// handler of vendor requests
|
||||||
|
void WEAK vendor_handler(config_pack_t *packet){
|
||||||
|
if(packet->bmRequestType & 0x80){ // read
|
||||||
|
uint8_t c;
|
||||||
|
switch(packet->wValue){
|
||||||
|
case 0x8484:
|
||||||
|
c = 2;
|
||||||
|
break;
|
||||||
|
case 0x0080:
|
||||||
|
c = 1;
|
||||||
|
break;
|
||||||
|
case 0x8686:
|
||||||
|
c = 0xaa;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
c = 0;
|
||||||
|
}
|
||||||
|
EP_WriteIRQ(0, &c, 1);
|
||||||
|
}else{ // write ZLP
|
||||||
|
EP_WriteIRQ(0, (uint8_t *)0, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void wr0(const uint8_t *buf, uint16_t size){
|
||||||
|
if(setup_packet.wLength < size) size = setup_packet.wLength;
|
||||||
|
EP_WriteIRQ(0, buf, size);
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void get_descriptor(){
|
||||||
|
switch(setup_packet.wValue){
|
||||||
|
case DEVICE_DESCRIPTOR:
|
||||||
|
wr0(USB_DeviceDescriptor, sizeof(USB_DeviceDescriptor));
|
||||||
|
break;
|
||||||
|
case CONFIGURATION_DESCRIPTOR:
|
||||||
|
wr0(USB_ConfigDescriptor, sizeof(USB_ConfigDescriptor));
|
||||||
|
break;
|
||||||
|
case STRING_LANG_DESCRIPTOR:
|
||||||
|
wr0((const uint8_t *)&USB_StringLangDescriptor, STRING_LANG_DESCRIPTOR_SIZE_BYTE);
|
||||||
|
break;
|
||||||
|
case STRING_MAN_DESCRIPTOR:
|
||||||
|
wr0((const uint8_t *)&USB_StringManufacturingDescriptor, USB_StringManufacturingDescriptor.bLength);
|
||||||
|
break;
|
||||||
|
case STRING_PROD_DESCRIPTOR:
|
||||||
|
wr0((const uint8_t *)&USB_StringProdDescriptor, USB_StringProdDescriptor.bLength);
|
||||||
|
break;
|
||||||
|
case STRING_SN_DESCRIPTOR:
|
||||||
|
wr0((const uint8_t *)&USB_StringSerialDescriptor, USB_StringSerialDescriptor.bLength);
|
||||||
|
break;
|
||||||
|
case DEVICE_QUALIFIER_DESCRIPTOR:
|
||||||
|
wr0(USB_DeviceQualifierDescriptor, USB_DeviceQualifierDescriptor[0]);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static uint8_t configuration = 0; // reply for GET_CONFIGURATION (==1 if configured)
|
||||||
|
static inline void std_d2h_req(){
|
||||||
|
uint16_t status = 0; // bus powered
|
||||||
|
switch(setup_packet.bRequest){
|
||||||
|
case GET_DESCRIPTOR:
|
||||||
|
get_descriptor();
|
||||||
|
break;
|
||||||
|
case GET_STATUS:
|
||||||
|
EP_WriteIRQ(0, (uint8_t *)&status, 2); // send status: Bus Powered
|
||||||
|
break;
|
||||||
|
case GET_CONFIGURATION:
|
||||||
|
EP_WriteIRQ(0, &configuration, 1);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void std_h2d_req(){
|
||||||
|
switch(setup_packet.bRequest){
|
||||||
|
case SET_ADDRESS:
|
||||||
|
// new address will be assigned later - after acknowlegement or request to host
|
||||||
|
USB_Dev.USB_Addr = setup_packet.wValue;
|
||||||
|
break;
|
||||||
|
case SET_CONFIGURATION:
|
||||||
|
// Now device configured
|
||||||
|
USB_Dev.USB_Status = USB_CONFIGURE_STATE;
|
||||||
|
configuration = setup_packet.wValue;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
bmRequestType: 76543210
|
||||||
|
7 direction: 0 - host->device, 1 - device->host
|
||||||
|
65 type: 0 - standard, 1 - class, 2 - vendor
|
||||||
|
4..0 getter: 0 - device, 1 - interface, 2 - endpoint, 3 - other
|
||||||
|
*/
|
||||||
|
/**
|
||||||
|
* Endpoint0 (control) handler
|
||||||
|
* @param ep - endpoint state
|
||||||
|
* @return data written to EP0R
|
||||||
|
*/
|
||||||
|
static uint16_t EP0_Handler(ep_t ep){
|
||||||
|
uint16_t epstatus = ep.status; // EP0R on input -> return this value after modifications
|
||||||
|
uint8_t reqtype = setup_packet.bmRequestType & 0x7f;
|
||||||
|
uint8_t dev2host = (setup_packet.bmRequestType & 0x80) ? 1 : 0;
|
||||||
|
if ((ep.rx_flag) && (ep.setup_flag)){
|
||||||
|
switch(reqtype){
|
||||||
|
case STANDARD_DEVICE_REQUEST_TYPE: // standard device request
|
||||||
|
if(dev2host){
|
||||||
|
std_d2h_req();
|
||||||
|
}else{
|
||||||
|
std_h2d_req();
|
||||||
|
EP_WriteIRQ(0, (uint8_t *)0, 0);
|
||||||
|
}
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case VENDOR_REQUEST_TYPE:
|
||||||
|
vendor_handler(&setup_packet);
|
||||||
|
epstatus = SET_NAK_RX(epstatus);
|
||||||
|
epstatus = SET_VALID_TX(epstatus);
|
||||||
|
break;
|
||||||
|
case CONTROL_REQUEST_TYPE:
|
||||||
|
switch(setup_packet.bRequest){
|
||||||
|
case GET_LINE_CODING:
|
||||||
|
EP_WriteIRQ(0, (uint8_t*)&lineCoding, sizeof(lineCoding));
|
||||||
|
break;
|
||||||
|
case SET_LINE_CODING: // omit this for next stage, when data will come
|
||||||
|
break;
|
||||||
|
case SET_CONTROL_LINE_STATE:
|
||||||
|
clstate_handler(setup_packet.wValue);
|
||||||
|
break;
|
||||||
|
case SEND_BREAK:
|
||||||
|
break_handler();
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
//if(!dev2host) EP_WriteIRQ(0, (uint8_t *)0, 0); // write acknowledgement <- DO WE NEED THIS? TODO!!!
|
||||||
|
// OR THIS: ???
|
||||||
|
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);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
EP_WriteIRQ(0, (uint8_t *)0, 0);
|
||||||
|
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){
|
||||||
|
//EP_WriteIRQ(0, (uint8_t *)0, 0);
|
||||||
|
if(setup_packet.bRequest == SET_LINE_CODING){
|
||||||
|
linecoding_handler((usb_LineCoding*)ep0databuf);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// wait for new data from host
|
||||||
|
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){
|
||||||
|
USB->DADDR = USB_DADDR_EF | USB_Dev.USB_Addr;
|
||||||
|
// change state to ADRESSED
|
||||||
|
USB_Dev.USB_Status = USB_ADRESSED_STATE;
|
||||||
|
}
|
||||||
|
// end of transaction
|
||||||
|
epstatus = CLEAR_DTOG_RX(epstatus);
|
||||||
|
epstatus = CLEAR_DTOG_TX(epstatus);
|
||||||
|
epstatus = SET_VALID_RX(epstatus);
|
||||||
|
epstatus = SET_VALID_TX(epstatus);
|
||||||
|
}
|
||||||
|
return epstatus;
|
||||||
|
}
|
||||||
|
|
||||||
|
static uint16_t lastaddr = LASTADDR_DEFAULT;
|
||||||
|
/**
|
||||||
|
* Endpoint initialisation
|
||||||
|
* @param number - EP num (0...7)
|
||||||
|
* @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
|
||||||
|
* @return 0 if all OK
|
||||||
|
*/
|
||||||
|
int EP_Init(uint8_t number, uint8_t type, uint16_t txsz, uint16_t rxsz, uint16_t (*func)(ep_t ep)){
|
||||||
|
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
|
||||||
|
USB->EPnR[number] = (type << 9) | (number & USB_EPnR_EA);
|
||||||
|
USB->EPnR[number] ^= USB_EPnR_STAT_RX | USB_EPnR_STAT_TX_1;
|
||||||
|
if(rxsz & 1 || rxsz > 512) return 3; // wrong rx buffer size
|
||||||
|
uint16_t countrx = 0;
|
||||||
|
if(rxsz < 64) countrx = rxsz / 2;
|
||||||
|
else{
|
||||||
|
if(rxsz & 0x1f) return 3; // should be multiple of 32
|
||||||
|
countrx = 31 + rxsz / 32;
|
||||||
|
}
|
||||||
|
USB_BTABLE->EP[number].USB_ADDR_TX = lastaddr;
|
||||||
|
endpoints[number].tx_buf = (uint16_t *)(USB_BTABLE_BASE + lastaddr*2);
|
||||||
|
lastaddr += txsz;
|
||||||
|
USB_BTABLE->EP[number].USB_COUNT_TX = 0;
|
||||||
|
USB_BTABLE->EP[number].USB_ADDR_RX = lastaddr;
|
||||||
|
endpoints[number].rx_buf = (uint16_t *)(USB_BTABLE_BASE + lastaddr*2);
|
||||||
|
lastaddr += rxsz;
|
||||||
|
USB_BTABLE->EP[number].USB_COUNT_RX = countrx << 10;
|
||||||
|
endpoints[number].func = func;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
//extern int8_t dump;
|
||||||
|
// standard IRQ handler
|
||||||
|
void usb_isr(){
|
||||||
|
if (USB->ISTR & USB_ISTR_RESET){
|
||||||
|
// Reinit registers
|
||||||
|
USB->CNTR = USB_CNTR_RESETM | USB_CNTR_CTRM;
|
||||||
|
USB->ISTR = 0;
|
||||||
|
// Endpoint 0 - CONTROL
|
||||||
|
// ON USB LS size of EP0 may be 8 bytes, but on FS it should be 64 bytes!
|
||||||
|
lastaddr = LASTADDR_DEFAULT;
|
||||||
|
// clear address, leave only enable bit
|
||||||
|
USB->DADDR = USB_DADDR_EF;
|
||||||
|
USB_Dev.USB_Status =USB_DEFAULT_STATE;
|
||||||
|
if(EP_Init(0, EP_TYPE_CONTROL, USB_EP0_BUFSZ, USB_EP0_BUFSZ, EP0_Handler)){
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(USB->ISTR & USB_ISTR_CTR){
|
||||||
|
// EP number
|
||||||
|
uint8_t n = USB->ISTR & USB_ISTR_EPID;
|
||||||
|
// copy status register
|
||||||
|
uint16_t epstatus = USB->EPnR[n];
|
||||||
|
// dump = 1;
|
||||||
|
// Calculate flags
|
||||||
|
endpoints[n].rx_flag = (epstatus & USB_EPnR_CTR_RX) ? 1 : 0;
|
||||||
|
endpoints[n].setup_flag = (epstatus & USB_EPnR_SETUP) ? 1 : 0;
|
||||||
|
endpoints[n].tx_flag = (epstatus & USB_EPnR_CTR_TX) ? 1 : 0;
|
||||||
|
// copy received bytes amount
|
||||||
|
endpoints[n].rx_cnt = USB_BTABLE->EP[n].USB_COUNT_RX & 0x3FF; // low 10 bits is counter
|
||||||
|
// check direction
|
||||||
|
if(USB->ISTR & USB_ISTR_DIR){ // OUT interrupt - receive data, CTR_RX==1 (if CTR_TX == 1 - two pending transactions: receive following by transmit)
|
||||||
|
if(n == 0){ // control endpoint
|
||||||
|
if(epstatus & USB_EPnR_SETUP){ // setup packet -> copy data to conf_pack
|
||||||
|
EP_Read(0, (uint16_t*)&setup_packet);
|
||||||
|
ep0dbuflen = 0;
|
||||||
|
// interrupt handler will be called later
|
||||||
|
}else if(epstatus & USB_EPnR_CTR_RX){ // data packet -> push received data to ep0databuf
|
||||||
|
ep0dbuflen = endpoints[0].rx_cnt;
|
||||||
|
EP_Read(0, (uint16_t*)&ep0databuf);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}else{ // IN interrupt - transmit data, only CTR_TX == 1
|
||||||
|
// enumeration end could be here (if EP0)
|
||||||
|
}
|
||||||
|
// prepare status field for EP handler
|
||||||
|
endpoints[n].status = epstatus;
|
||||||
|
// call EP handler (even if it will change EPnR, it should return new status)
|
||||||
|
epstatus = endpoints[n].func(endpoints[n]);
|
||||||
|
// keep DTOG state
|
||||||
|
epstatus = KEEP_DTOG_TX(epstatus);
|
||||||
|
epstatus = KEEP_DTOG_RX(epstatus);
|
||||||
|
// clear all RX/TX flags
|
||||||
|
epstatus = CLEAR_CTR_RX(epstatus);
|
||||||
|
epstatus = CLEAR_CTR_TX(epstatus);
|
||||||
|
// refresh EPnR
|
||||||
|
USB->EPnR[n] = epstatus;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
if (USB->ISTR & USB_ISTR_PMAOVR) {
|
||||||
|
MSG("PMAOVR\n");
|
||||||
|
// Handle PMAOVR status
|
||||||
|
}
|
||||||
|
if (USB->ISTR & USB_ISTR_SUSP) {
|
||||||
|
MSG("SUSP\n");
|
||||||
|
if (USB->DADDR & 0x7f) {
|
||||||
|
USB->DADDR = 0;
|
||||||
|
USB->CNTR &= ~ 0x800;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (USB->ISTR & USB_ISTR_ERR) {
|
||||||
|
MSG("ERR\n");
|
||||||
|
// Handle Error
|
||||||
|
}
|
||||||
|
if (USB->ISTR & USB_ISTR_WKUP) {
|
||||||
|
MSG("WKUP\n");
|
||||||
|
// Handle Wakeup
|
||||||
|
}
|
||||||
|
if (USB->ISTR & USB_ISTR_SOF) {
|
||||||
|
MSG("SOF\n");
|
||||||
|
// Handle SOF
|
||||||
|
}
|
||||||
|
if (USB->ISTR & USB_ISTR_ESOF) {
|
||||||
|
MSG("ESOF\n");
|
||||||
|
// Handle ESOF
|
||||||
|
}
|
||||||
|
USB->ISTR = 0;
|
||||||
|
*/
|
||||||
|
|
||||||
|
void usb_lp_can_rx0_isr(){
|
||||||
|
usb_isr();
|
||||||
|
}
|
||||||
|
|
||||||
|
void usb_hp_can_tx_isr(){
|
||||||
|
usb_isr();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Write data to EP buffer (called from IRQ handler)
|
||||||
|
* @param number - EP number
|
||||||
|
* @param *buf - array with data
|
||||||
|
* @param size - its size
|
||||||
|
*/
|
||||||
|
void EP_WriteIRQ(uint8_t number, const uint8_t *buf, uint16_t size){
|
||||||
|
uint8_t i;
|
||||||
|
if(size > USB_TXBUFSZ) size = USB_TXBUFSZ;
|
||||||
|
uint16_t N2 = (size + 1) >> 1;
|
||||||
|
// the buffer is 16-bit, so we should copy data as it would be uint16_t
|
||||||
|
uint16_t *buf16 = (uint16_t *)buf;
|
||||||
|
uint32_t *out = (uint32_t *)endpoints[number].tx_buf;
|
||||||
|
for(i = 0; i < N2; ++i, ++out){
|
||||||
|
*out = buf16[i];
|
||||||
|
}
|
||||||
|
USB_BTABLE->EP[number].USB_COUNT_TX = size;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Write data to EP buffer (called outside IRQ handler)
|
||||||
|
* @param number - EP number
|
||||||
|
* @param *buf - array with data
|
||||||
|
* @param size - its size
|
||||||
|
*/
|
||||||
|
void EP_Write(uint8_t number, const uint8_t *buf, uint16_t size){
|
||||||
|
uint16_t status = USB->EPnR[number];
|
||||||
|
EP_WriteIRQ(number, buf, size);
|
||||||
|
status = SET_NAK_RX(status);
|
||||||
|
status = SET_VALID_TX(status);
|
||||||
|
status = KEEP_DTOG_TX(status);
|
||||||
|
status = KEEP_DTOG_RX(status);
|
||||||
|
USB->EPnR[number] = status;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copy data from EP buffer into user buffer area
|
||||||
|
* @param *buf - user array for data
|
||||||
|
* @return amount of data read
|
||||||
|
*/
|
||||||
|
int EP_Read(uint8_t number, uint16_t *buf){
|
||||||
|
int n = (endpoints[number].rx_cnt + 1) >> 1;
|
||||||
|
uint32_t *in = (uint32_t *)endpoints[number].rx_buf;
|
||||||
|
if(n){
|
||||||
|
for(int i = 0; i < n; ++i, ++in)
|
||||||
|
buf[i] = *(uint16_t*)in;
|
||||||
|
}
|
||||||
|
return endpoints[number].rx_cnt;
|
||||||
|
}
|
||||||
|
|
||||||
|
// USB status
|
||||||
|
uint8_t USB_GetState(){
|
||||||
|
return USB_Dev.USB_Status;
|
||||||
|
}
|
||||||
202
F1-nolib/SPI/usb_lib.h
Normal file
202
F1-nolib/SPI/usb_lib.h
Normal file
@ -0,0 +1,202 @@
|
|||||||
|
/*
|
||||||
|
* geany_encoding=koi8-r
|
||||||
|
* usb_lib.h
|
||||||
|
*
|
||||||
|
* Copyright 2018 Edward V. Emelianov <eddy@sao.ru, edward.emelianoff@gmail.com>
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
|
||||||
|
* MA 02110-1301, USA.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
#ifndef __USB_LIB_H__
|
||||||
|
#define __USB_LIB_H__
|
||||||
|
|
||||||
|
#include <wchar.h>
|
||||||
|
#include "usb_defs.h"
|
||||||
|
|
||||||
|
#define EP0DATABUF_SIZE (64)
|
||||||
|
#define LASTADDR_DEFAULT (STM32ENDPOINTS * 8)
|
||||||
|
|
||||||
|
// Max EP amount (EP0 + other used)
|
||||||
|
//#define ENDPOINTS_NUM 4
|
||||||
|
// bmRequestType & 0x7f
|
||||||
|
#define STANDARD_DEVICE_REQUEST_TYPE 0
|
||||||
|
#define STANDARD_ENDPOINT_REQUEST_TYPE 2
|
||||||
|
#define VENDOR_REQUEST_TYPE 0x40
|
||||||
|
#define CONTROL_REQUEST_TYPE 0x21
|
||||||
|
// bRequest, standard; for bmRequestType == 0x80
|
||||||
|
#define GET_STATUS 0x00
|
||||||
|
#define GET_DESCRIPTOR 0x06
|
||||||
|
#define GET_CONFIGURATION 0x08
|
||||||
|
// for bmRequestType == 0
|
||||||
|
#define CLEAR_FEATURE 0x01
|
||||||
|
#define SET_FEATURE 0x03 // unused
|
||||||
|
#define SET_ADDRESS 0x05
|
||||||
|
#define SET_DESCRIPTOR 0x07 // unused
|
||||||
|
#define SET_CONFIGURATION 0x09
|
||||||
|
// for bmRequestType == 0x81, 1 or 0xB2
|
||||||
|
#define GET_INTERFACE 0x0A // unused
|
||||||
|
#define SET_INTERFACE 0x0B // unused
|
||||||
|
#define SYNC_FRAME 0x0C // unused
|
||||||
|
#define VENDOR_REQUEST 0x01 // unused
|
||||||
|
|
||||||
|
// Class-Specific Control Requests
|
||||||
|
#define SEND_ENCAPSULATED_COMMAND 0x00 // unused
|
||||||
|
#define GET_ENCAPSULATED_RESPONSE 0x01 // unused
|
||||||
|
#define SET_COMM_FEATURE 0x02 // unused
|
||||||
|
#define GET_COMM_FEATURE 0x03 // unused
|
||||||
|
#define CLEAR_COMM_FEATURE 0x04 // unused
|
||||||
|
#define SET_LINE_CODING 0x20
|
||||||
|
#define GET_LINE_CODING 0x21
|
||||||
|
#define SET_CONTROL_LINE_STATE 0x22
|
||||||
|
#define SEND_BREAK 0x23
|
||||||
|
|
||||||
|
// control line states
|
||||||
|
#define CONTROL_DTR 0x01
|
||||||
|
#define CONTROL_RTS 0x02
|
||||||
|
|
||||||
|
// wValue
|
||||||
|
#define DEVICE_DESCRIPTOR 0x100
|
||||||
|
#define CONFIGURATION_DESCRIPTOR 0x200
|
||||||
|
#define STRING_LANG_DESCRIPTOR 0x300
|
||||||
|
#define STRING_MAN_DESCRIPTOR 0x301
|
||||||
|
#define STRING_PROD_DESCRIPTOR 0x302
|
||||||
|
#define STRING_SN_DESCRIPTOR 0x303
|
||||||
|
#define DEVICE_QUALIFIER_DESCRIPTOR 0x600
|
||||||
|
|
||||||
|
// EPnR bits manipulation
|
||||||
|
#define CLEAR_DTOG_RX(R) (R & USB_EPnR_DTOG_RX) ? R : (R & (~USB_EPnR_DTOG_RX))
|
||||||
|
#define SET_DTOG_RX(R) (R & USB_EPnR_DTOG_RX) ? (R & (~USB_EPnR_DTOG_RX)) : R
|
||||||
|
#define TOGGLE_DTOG_RX(R) (R | USB_EPnR_DTOG_RX)
|
||||||
|
#define KEEP_DTOG_RX(R) (R & (~USB_EPnR_DTOG_RX))
|
||||||
|
#define CLEAR_DTOG_TX(R) (R & USB_EPnR_DTOG_TX) ? R : (R & (~USB_EPnR_DTOG_TX))
|
||||||
|
#define SET_DTOG_TX(R) (R & USB_EPnR_DTOG_TX) ? (R & (~USB_EPnR_DTOG_TX)) : R
|
||||||
|
#define TOGGLE_DTOG_TX(R) (R | USB_EPnR_DTOG_TX)
|
||||||
|
#define KEEP_DTOG_TX(R) (R & (~USB_EPnR_DTOG_TX))
|
||||||
|
#define SET_VALID_RX(R) ((R & USB_EPnR_STAT_RX) ^ USB_EPnR_STAT_RX) | (R & (~USB_EPnR_STAT_RX))
|
||||||
|
#define SET_NAK_RX(R) ((R & USB_EPnR_STAT_RX) ^ USB_EPnR_STAT_RX_1) | (R & (~USB_EPnR_STAT_RX))
|
||||||
|
#define SET_STALL_RX(R) ((R & USB_EPnR_STAT_RX) ^ USB_EPnR_STAT_RX_0) | (R & (~USB_EPnR_STAT_RX))
|
||||||
|
#define KEEP_STAT_RX(R) (R & (~USB_EPnR_STAT_RX))
|
||||||
|
#define SET_VALID_TX(R) ((R & USB_EPnR_STAT_TX) ^ USB_EPnR_STAT_TX) | (R & (~USB_EPnR_STAT_TX))
|
||||||
|
#define SET_NAK_TX(R) ((R & USB_EPnR_STAT_TX) ^ USB_EPnR_STAT_TX_1) | (R & (~USB_EPnR_STAT_TX))
|
||||||
|
#define SET_STALL_TX(R) ((R & USB_EPnR_STAT_TX) ^ USB_EPnR_STAT_TX_0) | (R & (~USB_EPnR_STAT_TX))
|
||||||
|
#define KEEP_STAT_TX(R) (R & (~USB_EPnR_STAT_TX))
|
||||||
|
#define CLEAR_CTR_RX(R) (R & (~USB_EPnR_CTR_RX))
|
||||||
|
#define CLEAR_CTR_TX(R) (R & (~USB_EPnR_CTR_TX))
|
||||||
|
#define CLEAR_CTR_RX_TX(R) (R & (~(USB_EPnR_CTR_TX | USB_EPnR_CTR_RX)))
|
||||||
|
|
||||||
|
// USB state: uninitialized, addressed, ready for use
|
||||||
|
#define USB_DEFAULT_STATE 0
|
||||||
|
#define USB_ADRESSED_STATE 1
|
||||||
|
#define USB_CONFIGURE_STATE 2
|
||||||
|
|
||||||
|
// EP types
|
||||||
|
#define EP_TYPE_BULK 0x00
|
||||||
|
#define EP_TYPE_CONTROL 0x01
|
||||||
|
#define EP_TYPE_ISO 0x02
|
||||||
|
#define EP_TYPE_INTERRUPT 0x03
|
||||||
|
|
||||||
|
#define LANG_US (uint16_t)0x0409
|
||||||
|
|
||||||
|
#define _USB_STRING_(name, str) \
|
||||||
|
static const struct name \
|
||||||
|
{ \
|
||||||
|
uint8_t bLength; \
|
||||||
|
uint8_t bDescriptorType; \
|
||||||
|
uint16_t bString[(sizeof(str) - 2) / 2]; \
|
||||||
|
\
|
||||||
|
} \
|
||||||
|
name = {sizeof(name), 0x03, str}
|
||||||
|
|
||||||
|
#define _USB_LANG_ID_(name, lng_id) \
|
||||||
|
\
|
||||||
|
static const struct name \
|
||||||
|
{ \
|
||||||
|
uint8_t bLength; \
|
||||||
|
uint8_t bDescriptorType; \
|
||||||
|
uint16_t bString; \
|
||||||
|
\
|
||||||
|
} \
|
||||||
|
name = {0x04, 0x03, lng_id}
|
||||||
|
#define STRING_LANG_DESCRIPTOR_SIZE_BYTE (4)
|
||||||
|
|
||||||
|
// EP0 configuration packet
|
||||||
|
typedef struct {
|
||||||
|
uint8_t bmRequestType;
|
||||||
|
uint8_t bRequest;
|
||||||
|
uint16_t wValue;
|
||||||
|
uint16_t wIndex;
|
||||||
|
uint16_t wLength;
|
||||||
|
} config_pack_t;
|
||||||
|
|
||||||
|
// endpoints state
|
||||||
|
typedef struct __ep_t{
|
||||||
|
uint16_t *tx_buf; // transmission buffer address
|
||||||
|
uint16_t *rx_buf; // reception buffer address
|
||||||
|
uint16_t (*func)(); // endpoint action function
|
||||||
|
uint16_t status; // status flags
|
||||||
|
unsigned rx_cnt : 10; // received data counter
|
||||||
|
unsigned tx_flag : 1; // transmission flag
|
||||||
|
unsigned rx_flag : 1; // reception flag
|
||||||
|
unsigned setup_flag : 1; // this is setup packet (only for EP0)
|
||||||
|
} ep_t;
|
||||||
|
|
||||||
|
// USB status & its address
|
||||||
|
typedef struct {
|
||||||
|
uint8_t USB_Status;
|
||||||
|
uint16_t USB_Addr;
|
||||||
|
}usb_dev_t;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
uint32_t dwDTERate;
|
||||||
|
uint8_t bCharFormat;
|
||||||
|
#define USB_CDC_1_STOP_BITS 0
|
||||||
|
#define USB_CDC_1_5_STOP_BITS 1
|
||||||
|
#define USB_CDC_2_STOP_BITS 2
|
||||||
|
uint8_t bParityType;
|
||||||
|
#define USB_CDC_NO_PARITY 0
|
||||||
|
#define USB_CDC_ODD_PARITY 1
|
||||||
|
#define USB_CDC_EVEN_PARITY 2
|
||||||
|
#define USB_CDC_MARK_PARITY 3
|
||||||
|
#define USB_CDC_SPACE_PARITY 4
|
||||||
|
uint8_t bDataBits;
|
||||||
|
} __attribute__ ((packed)) usb_LineCoding;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
uint8_t bmRequestType;
|
||||||
|
uint8_t bNotificationType;
|
||||||
|
uint16_t wValue;
|
||||||
|
uint16_t wIndex;
|
||||||
|
uint16_t wLength;
|
||||||
|
} __attribute__ ((packed)) usb_cdc_notification;
|
||||||
|
|
||||||
|
extern ep_t endpoints[];
|
||||||
|
|
||||||
|
void USB_Init();
|
||||||
|
uint8_t USB_GetState();
|
||||||
|
int EP_Init(uint8_t number, uint8_t type, uint16_t txsz, uint16_t rxsz, uint16_t (*func)(ep_t ep));
|
||||||
|
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);
|
||||||
|
usb_LineCoding getLineCoding();
|
||||||
|
|
||||||
|
void WEAK linecoding_handler(usb_LineCoding *lc);
|
||||||
|
void WEAK clstate_handler(uint16_t val);
|
||||||
|
void WEAK break_handler();
|
||||||
|
void WEAK vendor_handler(config_pack_t *packet);
|
||||||
|
|
||||||
|
#endif // __USB_LIB_H__
|
||||||
51
F1-nolib/chronometer_v1/kicad/chrono
Normal file
51
F1-nolib/chronometer_v1/kicad/chrono
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
,,,,,,
|
||||||
|
Ref,Qnty,Value,Cmp name,Footprint,,Vendor
|
||||||
|
"BZ1, ",1,Buzzer 3v3,Buzzer,Buzzer_Beeper:Buzzer_12x9.5RM7.6,,
|
||||||
|
"C2, C1, ",2,12,C,Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder,,
|
||||||
|
"C4, C13, ",2,47u,CP,Capacitor_Tantalum_SMD:CP_EIA-3216-18_Kemet-A_Pad1.58x1.35mm_HandSolder,,
|
||||||
|
"C7, ",1,100u,CP,Capacitor_THT:CP_Radial_D8.0mm_P3.50mm,,
|
||||||
|
"C10, ",1,10u,C,Capacitor_SMD:C_1206_3216Metric_Pad1.42x1.75mm_HandSolder,,
|
||||||
|
"C14, C15, C16, C17, C3, C9, C11, C8, C5, C6, C12, ",11,0.1,C,Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder,,
|
||||||
|
"D1, ",1,MM3Z7V5,D_Zener,Diode_SMD:D_0805_2012Metric_Pad1.15x1.40mm_HandSolder,,
|
||||||
|
"D2, D6, ",2,IN5819,D_Schottky,Diode_SMD:D_SOD-323,,
|
||||||
|
"D3, D4, D5, D10, D11, ",5,1N5819,D,Diode_SMD:D_SOD-323_HandSoldering,,
|
||||||
|
"D7, ",1,B340A,D,Diode_SMD:D_SMA_Handsoldering,,
|
||||||
|
"D8, ",1,LED0,LED-RESCUE-stm32,LED_THT:LED_D5.0mm,,
|
||||||
|
"D9, ",1,LED1,LED-RESCUE-stm32,LED_THT:LED_D5.0mm,,
|
||||||
|
"J1, ",1,Power 12V,Conn_01x02,"TerminalBlock_Phoenix:TerminalBlock_Phoenix_MKDS-1,5-2-5.08_1x02_P5.08mm_Horizontal",,
|
||||||
|
"J2, ",1,GPS_ext,Conn_01x05_Male,Connector_JST:JST_PH_B5B-PH-K_1x05_P2.00mm_Vertical,,
|
||||||
|
"J3, ",1,PPS,Conn_01x02,Connector_PinSocket_2.54mm:PinSocket_1x02_P2.54mm_Vertical,,
|
||||||
|
"J4, ",1,Ext_trig1,Conn_01x02,"TerminalBlock_Phoenix:TerminalBlock_Phoenix_MKDS-1,5-2-5.08_1x02_P5.08mm_Horizontal",,
|
||||||
|
"J5, ",1,Ext_trig0,Conn_01x02,"TerminalBlock_Phoenix:TerminalBlock_Phoenix_MKDS-1,5-2-5.08_1x02_P5.08mm_Horizontal",,
|
||||||
|
"J6, ",1,USB_B_Mini,USB_B_Mini,Connector_USB:USB_Mini-B_Lumberg_2486_01_Horizontal,,
|
||||||
|
"J7, ",1,Ext_trig2,Conn_01x02,"TerminalBlock_Phoenix:TerminalBlock_Phoenix_MKDS-1,5-2-5.08_1x02_P5.08mm_Horizontal",,
|
||||||
|
"J8, ",1,SPI,Conn_01x05_Female,Connector_PinSocket_2.54mm:PinSocket_1x05_P2.54mm_Vertical,,
|
||||||
|
"J9, ",1,I2C1,Conn_01x04_Female,Connector_PinSocket_2.54mm:PinSocket_1x04_P2.54mm_Vertical,,
|
||||||
|
"J10, ",1,LIDAR,Conn_01x04_Female,Connector_PinSocket_2.54mm:PinSocket_1x04_P2.54mm_Vertical,,
|
||||||
|
"J11, ",1,Bluetooth,Conn_01x06_Female,Connector_PinSocket_2.54mm:PinSocket_1x06_P2.54mm_Vertical,,
|
||||||
|
"J12, ",1,SWD,Conn_01x04_Female,Connector_PinSocket_2.54mm:PinSocket_1x04_P2.54mm_Vertical,,
|
||||||
|
"JP3, JP4, JP1, JP2, ",4,Jumper,Jumper,Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical,,
|
||||||
|
"L1, ",1,100u,L,Inductor_SMD:L_12x12mm_H4.5mm,,
|
||||||
|
"P1, ",1,USB_B,USB_A-RESCUE-stm32,Connectors_USB:USB_B_OST_USB-B1HSxx_Horizontal,,
|
||||||
|
"Q1, ",1,MMBTA42,Q_NPN_BEC,Package_TO_SOT_SMD:SOT-23_Handsoldering,,
|
||||||
|
"Q2, ",1,AO3407,Q_PMOS_GSD,Package_TO_SOT_SMD:SOT-23_Handsoldering,,
|
||||||
|
"Q3, ",1,SI2305,Q_PMOS_GSD,Package_TO_SOT_SMD:SOT-23_Handsoldering,,
|
||||||
|
"Q4, ",1,IRML2502,Q_NMOS_GSD,Package_TO_SOT_SMD:SOT-23_Handsoldering,,
|
||||||
|
"R2, ",1,2k2,R,Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder,,
|
||||||
|
"R3, R4, ",2,22,R,Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder,,
|
||||||
|
"R5, R19, R1, R23, R8, ",5,10k,R,Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder,,
|
||||||
|
"R9, ",1,1k5,R,Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder,,
|
||||||
|
"R11, R10, R12, R6, R20, ",5,1k,R,Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder,,
|
||||||
|
"R13, R21, ",2,100,R,Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder,,
|
||||||
|
"R14 (ÎÅ ÐÁÑÔØ), R24, ",2,47k,R,Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder,,
|
||||||
|
"R16, R17, R15, ",3,220,R,Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder,,
|
||||||
|
"R18, R7, ",2,510,R,Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder,,
|
||||||
|
"R22, ",1,100k,R,Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder,,
|
||||||
|
"U1, ",1,USBLC6-2SC6,USBLC6-2SC6,TO_SOT_Packages_SMD:SOT-23-6_Handsoldering,,
|
||||||
|
"U2, ",1,LM2576-5.0,LM2576HV,TO_SOT_Packages_THT:TO-220-5_P3.4x3.7mm_StaggerEven_Lead3.8mm_Vertical,,
|
||||||
|
"U3, (ÎÅ ÐÁÑÔØ)",1,4N25,4N25,Package_DIP:DIP-6_W7.62mm,,
|
||||||
|
"U4, ",1,LM1117-3.3,LM1117-3.3-RESCUE-stm32,TO_SOT_Packages_SMD:SOT-223,,
|
||||||
|
"U5, ",1,L80-R,L80-R,chrono:L80-R,,
|
||||||
|
"U6, ",1,STM32F103C6Tx,STM32F103C6Tx,Package_QFP:LQFP-48_7x7mm_P0.5mm,,
|
||||||
|
"U7, ",1,PC817,PC817,Package_DIP:DIP-4_W7.62mm,,
|
||||||
|
"Y1, ",1,8MHz,Crystal,Crystal:Crystal_HC49-U_Vertical,,
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,7 +1,7 @@
|
|||||||
(export (version D)
|
(export (version D)
|
||||||
(design
|
(design
|
||||||
(source /Big/Data/00__Electronics/STM32/F1-nolib/chronometer_v1/kicad/chrono.sch)
|
(source /Big/Data/00__Electronics/STM32/F1-nolib/chronometer_v1/kicad/chrono.sch)
|
||||||
(date "Ср 23 окт 2019 21:44:20")
|
(date "Чт 21 ноя 2019 20:34:55")
|
||||||
(tool "Eeschema 5.1.0")
|
(tool "Eeschema 5.1.0")
|
||||||
(sheet (number 1) (name /) (tstamps /)
|
(sheet (number 1) (name /) (tstamps /)
|
||||||
(title_block
|
(title_block
|
||||||
@ -210,7 +210,7 @@
|
|||||||
(sheetpath (names /) (tstamps /))
|
(sheetpath (names /) (tstamps /))
|
||||||
(tstamp 5D79C13C))
|
(tstamp 5D79C13C))
|
||||||
(comp (ref D2)
|
(comp (ref D2)
|
||||||
(value IN5819)
|
(value 1N5819)
|
||||||
(footprint Diode_SMD:D_SOD-323)
|
(footprint Diode_SMD:D_SOD-323)
|
||||||
(datasheet ~)
|
(datasheet ~)
|
||||||
(libsource (lib Device) (part D_Schottky) (description "Schottky diode"))
|
(libsource (lib Device) (part D_Schottky) (description "Schottky diode"))
|
||||||
@ -504,7 +504,7 @@
|
|||||||
(sheetpath (names /) (tstamps /))
|
(sheetpath (names /) (tstamps /))
|
||||||
(tstamp 5DC349EC))
|
(tstamp 5DC349EC))
|
||||||
(comp (ref D6)
|
(comp (ref D6)
|
||||||
(value IN5819)
|
(value 1N5819)
|
||||||
(footprint Diode_SMD:D_SOD-323)
|
(footprint Diode_SMD:D_SOD-323)
|
||||||
(datasheet ~)
|
(datasheet ~)
|
||||||
(libsource (lib Device) (part D_Schottky) (description "Schottky diode"))
|
(libsource (lib Device) (part D_Schottky) (description "Schottky diode"))
|
||||||
|
|||||||
@ -750,7 +750,7 @@ L Device:D_Schottky D2
|
|||||||
U 1 1 5D89B9B8
|
U 1 1 5D89B9B8
|
||||||
P 2375 3050
|
P 2375 3050
|
||||||
F 0 "D2" H 2350 2875 50 0000 C CNN
|
F 0 "D2" H 2350 2875 50 0000 C CNN
|
||||||
F 1 "IN5819" H 2375 2950 50 0000 C CNN
|
F 1 "1N5819" H 2375 2950 50 0000 C CNN
|
||||||
F 2 "Diode_SMD:D_SOD-323" H 2375 3050 50 0001 C CNN
|
F 2 "Diode_SMD:D_SOD-323" H 2375 3050 50 0001 C CNN
|
||||||
F 3 "~" H 2375 3050 50 0001 C CNN
|
F 3 "~" H 2375 3050 50 0001 C CNN
|
||||||
1 2375 3050
|
1 2375 3050
|
||||||
@ -1990,7 +1990,7 @@ L Device:D_Schottky D6
|
|||||||
U 1 1 5DC70777
|
U 1 1 5DC70777
|
||||||
P 3275 2325
|
P 3275 2325
|
||||||
F 0 "D6" V 3175 2250 50 0000 C CNN
|
F 0 "D6" V 3175 2250 50 0000 C CNN
|
||||||
F 1 "IN5819" H 3250 2425 50 0000 C CNN
|
F 1 "1N5819" H 3250 2425 50 0000 C CNN
|
||||||
F 2 "Diode_SMD:D_SOD-323" H 3275 2325 50 0001 C CNN
|
F 2 "Diode_SMD:D_SOD-323" H 3275 2325 50 0001 C CNN
|
||||||
F 3 "~" H 3275 2325 50 0001 C CNN
|
F 3 "~" H 3275 2325 50 0001 C CNN
|
||||||
1 3275 2325
|
1 3275 2325
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user