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

change USB for common files

Browse Source
This commit is contained in:
Edward Emelianov
2023-06-13 19:49:35 +03:00
parent 54155fdca9
commit 00913a7e80
47 changed files with 1558 additions and 1249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
F1:F103/PL2303_ringbuffer/main.c
View File

@@ -21,7 +21,7 @@
#include "usart.h"
#include "usb.h"
#define USBBUFSZ 127
#define MAXSTRLEN RBINSZ
volatile uint32_t Tms = 0;
@@ -29,34 +29,16 @@ void sys_tick_handler(void){
++Tms;
}
// usb getline
char *get_USB(){
static char tmpbuf[USBBUFSZ+1], *curptr = tmpbuf;
static int rest = USBBUFSZ;
uint8_t x = USB_receive(curptr);
if(!x) return NULL;
curptr[x] = 0;
if(curptr[x-1] == '\n'){
curptr = tmpbuf;
rest = USBBUFSZ;
return tmpbuf;
}
curptr += x; rest -= x;
if(rest <= 0){ // buffer overflow
curptr = tmpbuf;
rest = USBBUFSZ;
USEND("USB buffer overflow\n");
}
return NULL;
}
int main(void){
char inbuff[MAXSTRLEN+1];
StartHSE();
hw_setup();
SysTick_Config(72000);
USBPU_OFF();
hw_setup();
usart_setup();
USB_setup();
USBPU_ON();
uint32_t ctr = Tms;
while(1){
@@ -66,12 +48,16 @@ int main(void){
LED_blink(LED0);
usart_transmit();
}
if(usartovr()){
usart_send("USART buffer overfull\n");
}
char *txt = NULL;
usb_proc();
if((txt = get_USB())){
int l = USB_receivestr(inbuff, MAXSTRLEN);
if(l < 0) USB_sendstr("ERROR: USB buffer overflow or string was too long\n");
else if(l){
USEND("Got USB data\n");
const char *ans = parse_cmd(txt);
if(ans) USB_send(ans);
const char *ans = parse_cmd(inbuff);
if(ans) USB_sendstr(ans);
}
if(usartrx()){
if(usart_getline(&txt)){