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

ringbuffer and device detection to USB-CAN-relay

Browse Source
This commit is contained in:
Edward Emelianov
2024-08-02 11:58:40 +03:00
parent 9470b22c88
commit 0cb9b5f3c8
30 changed files with 1440 additions and 733 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
F0:F030,F042,F072/usbcan_relay/main.c
View File

@@ -25,6 +25,8 @@
#include "usb.h"
#include "usb_lib.h"
#define MAXSTRLEN 128
volatile uint32_t Tms = 0;
/* Called when systick fires */
@@ -32,43 +34,10 @@ void sys_tick_handler(void){
++Tms;
}
#define USBBUF 63
// usb getline
static char *get_USB(){
static char tmpbuf[USBBUF+1], *curptr = tmpbuf;
static int rest = USBBUF;
uint8_t x = USB_receive((uint8_t*)curptr);
if(!x) return NULL;
curptr[x] = 0;
if(x == 1 && *curptr == 0x7f){ // backspace
if(curptr > tmpbuf){
--curptr;
USND("\b \b");
}
return NULL;
}
USB_sendstr(curptr); // echo
if(curptr[x-1] == '\n'){ // || curptr[x-1] == '\r'){
curptr = tmpbuf;
rest = USBBUF;
// omit empty lines
if(tmpbuf[0] == '\n') return NULL;
// and wrong empty lines
if(tmpbuf[0] == '\r' && tmpbuf[1] == '\n') return NULL;
return tmpbuf;
}
curptr += x; rest -= x;
if(rest <= 0){ // buffer overflow
curptr = tmpbuf;
rest = USBBUF;
}
return NULL;
}
int main(void){
char inbuff[MAXSTRLEN];
uint8_t ctr, len;
CAN_message *can_mesg;
char *txt;
sysreset();
SysTick_Config(6000, 1);
gpio_setup();
@@ -84,10 +53,8 @@ int main(void){
process_keys();
custom_buttons_process();
can_proc();
usb_proc();
if(CAN_get_status() == CAN_FIFO_OVERRUN){
SEND("CAN bus fifo overrun occured!\n");
sendbuf();
USND("CAN bus fifo overrun occured!");
}
while((can_mesg = CAN_messagebuf_pop())){
if(can_mesg && isgood(can_mesg->ID)){
@@ -95,20 +62,20 @@ int main(void){
IWDG->KR = IWDG_REFRESH;
len = can_mesg->length;
printu(Tms);
SEND(" #");
USB_sendstr(" #");
printuhex(can_mesg->ID);
for(ctr = 0; ctr < len; ++ctr){
SEND(" ");
USB_putbyte(' ');
printuhex(can_mesg->data[ctr]);
}
newline(); sendbuf();
newline();
}
}
}
if((txt = get_USB())){
IWDG->KR = IWDG_REFRESH;
cmd_parser(txt);
}
int l = USB_receivestr(inbuff, MAXSTRLEN);
IWDG->KR = IWDG_REFRESH;
if(l < 0) USB_sendstr("ERROR: USB buffer overflow or string was too long\n");
else if(l) cmd_parser(inbuff);
}
return 0;
}