eddy/stm32samples
1
0
Fork 0
mirror of https://github.com/eddyem/stm32samples.git synced 2025-12-06 18:55:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

add "incremental flooding" to CAN-USB based on STM32F0x2

Browse Source
This commit is contained in:
Edward Emelianov 2023-01-31 20:09:57 +03:00
parent 17eec9bf6f
commit fecadc71f7
5 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
F0:F030,F042,F072/usbcan_ringbuffer/can.c
View File

@ -26,7 +26,8 @@ static CAN_message messages[CAN_INMESSAGE_SIZE];
static uint8_t first_free_idx = 0; // index of first empty cell static uint8_t first_free_idx = 0; // index of first empty cell
static int8_t first_nonfree_idx = -1; // index of first data cell static int8_t first_nonfree_idx = -1; // index of first data cell
static uint16_t oldspeed = 100; // speed of last init static uint16_t oldspeed = 100; // speed of last init
uint32_t floodT = FLOOD_PERIOD_MS-1; // flood period in ms uint32_t floodT = FLOOD_PERIOD_MS; // flood period in ms
static uint8_t incrflood = 0; // ==1 for incremental flooding
static uint32_t last_err_code = 0; static uint32_t last_err_code = 0;
static CAN_status can_status = CAN_STOP; static CAN_status can_status = CAN_STOP;
@ -227,9 +228,13 @@ void can_proc(){
CAN_setup(0); CAN_setup(0);
} }
static uint32_t lastFloodTime = 0; static uint32_t lastFloodTime = 0;
if(flood_msg && (Tms - lastFloodTime) > (floodT)){ // flood every ~5ms static uint32_t incrmessagectr = 0;
if(flood_msg && (Tms - lastFloodTime) >= (floodT)){ // send message every floodT ms
lastFloodTime = Tms; lastFloodTime = Tms;
can_send(flood_msg->data, flood_msg->length, flood_msg->ID); can_send(flood_msg->data, flood_msg->length, flood_msg->ID);
}else if(incrflood && (Tms - lastFloodTime) >= floodT){ // incremental flood message
lastFloodTime = Tms;
if(CAN_OK == can_send((uint8_t*)&incrmessagectr, 4, flood_msg->ID)) ++incrmessagectr;
} }
} }
@ -287,7 +292,9 @@ CAN_status can_send(uint8_t *msg, uint8_t len, uint16_t target_id){
return CAN_OK; return CAN_OK;
} }
void set_flood(CAN_message *msg){ void set_flood(CAN_message *msg, int incr){
if(incr){ incrflood = 1; return; }
incrflood = 0;
if(!msg) flood_msg = NULL; if(!msg) flood_msg = NULL;
else{ else{
#ifdef EBUG #ifdef EBUG

2
F0:F030,F042,F072/usbcan_ringbuffer/can.h
View File

@ -56,4 +56,4 @@ void printCANerr();
CAN_message *CAN_messagebuf_pop(); CAN_message *CAN_messagebuf_pop();
void set_flood(CAN_message *msg); void set_flood(CAN_message *msg, int incr);

15
F0:F030,F042,F072/usbcan_ringbuffer/proto.c
View File

@ -24,7 +24,7 @@
extern volatile uint8_t canerror; extern volatile uint8_t canerror;
uint8_t ShowMsgs = 0; uint8_t ShowMsgs = 1;
uint16_t Ignore_IDs[IGN_SIZE]; uint16_t Ignore_IDs[IGN_SIZE];
uint8_t IgnSz = 0; uint8_t IgnSz = 0;
@ -325,11 +325,11 @@ TRUE_INLINE void setfloodt(char *s){
uint32_t N; uint32_t N;
s = omit_spaces(s); s = omit_spaces(s);
char *n = getnum(s, &N); char *n = getnum(s, &N);
if(s == n || N == 0){ if(s == n){
USB_sendstr("t="); printu(floodT); USB_putbyte('\n'); USB_sendstr("t="); printu(floodT); USB_putbyte('\n');
return; return;
} }
floodT = N - 1; floodT = N;
} }
/** /**
@ -434,6 +434,7 @@ const char *helpmsg =
"'e' - get CAN errcodes\n" "'e' - get CAN errcodes\n"
"'f' - add/delete filter, format: bank# FIFO# mode(M/I) num0 [num1 [num2 [num3]]]\n" "'f' - add/delete filter, format: bank# FIFO# mode(M/I) num0 [num1 [num2 [num3]]]\n"
"'F' - send/clear flood message: F ID byte0 ... byteN\n" "'F' - send/clear flood message: F ID byte0 ... byteN\n"
"'i' - send incremental flood message (ID == ID for `F`)\n"
"'I' - reinit CAN\n" "'I' - reinit CAN\n"
"'l' - list all active filters\n" "'l' - list all active filters\n"
"'o' - turn LEDs OFF\n" "'o' - turn LEDs OFF\n"
@ -442,7 +443,7 @@ const char *helpmsg =
"'P' - pause/resume in packets displaying\n" "'P' - pause/resume in packets displaying\n"
"'R' - software reset\n" "'R' - software reset\n"
"'s/S' - send data over CAN: s ID byte0 .. byteN\n" "'s/S' - send data over CAN: s ID byte0 .. byteN\n"
"'t' - change flood period (>=1ms)\n" "'t' - change flood period (>=0ms)\n"
"'T' - get time from start (ms)\n" "'T' - get time from start (ms)\n"
; ;
@ -482,7 +483,7 @@ void cmd_parser(char *txt){
goto eof; goto eof;
break; break;
case 'F': case 'F':
set_flood(parseCANmsg(txt)); set_flood(parseCANmsg(txt), 0);
goto eof; goto eof;
break; break;
case 's': case 's':
@ -511,6 +512,10 @@ void cmd_parser(char *txt){
USB_sendall(); USB_sendall();
Jump2Boot(); Jump2Boot();
break; break;
case 'i':
set_flood(NULL, 1);
USB_sendstr("Incremental flooding is ON ('F' to off)\n");
break;
case 'I': case 'I':
CAN_reinit(0); CAN_reinit(0);
break; break;

BIN
F0:F030,F042,F072/usbcan_ringbuffer/usbcan.bin
View File

Binary file not shown.

4
F0:F030,F042,F072/usbcan_ringbuffer/version.inc
View File

@ -1,2 +1,2 @@
#define BUILD_NUMBER "23" #define BUILD_NUMBER "26"
#define BUILD_DATE "2022-12-05" #define BUILD_DATE "2023-01-31"