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

fix problems with CANbus, add USB-dump of error & command codes for CAN

Browse Source
This commit is contained in:
Edward Emelianov
2021-12-02 17:46:26 +03:00
parent b24111f884
commit 867abe359a
8 changed files with 123 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
F0-nolib/3steppersLB/main.c
View File

@@ -77,7 +77,7 @@ int main(void){
flashstorage_init(); // should be called before any other functions
gpio_setup();
USB_setup();
CAN_setup(DEFAULT_CAN_SPEED);
CAN_setup(the_conf.CANspeed);
adc_setup();
init_steppers();
RCC->CSR |= RCC_CSR_RMVF; // remove reset flags
@@ -102,19 +102,17 @@ int main(void){
process_steppers();
IWDG->KR = IWDG_REFRESH;
while((can_mesg = CAN_messagebuf_pop())){
if(can_mesg && isgood(can_mesg->ID)){
if(ShowMsgs){ // new data in buff
IWDG->KR = IWDG_REFRESH;
len = can_mesg->length;
printu(Tms);
SEND(" #");
printuhex(can_mesg->ID);
for(ctr = 0; ctr < len; ++ctr){
SEND(" ");
printuhex(can_mesg->data[ctr]);
}
newline(); sendbuf();
if(can_mesg && ShowMsgs && isgood(can_mesg->ID)){
IWDG->KR = IWDG_REFRESH;
len = can_mesg->length;
printu(Tms);
SEND(" #");
printuhex(can_mesg->ID);
for(ctr = 0; ctr < len; ++ctr){
SEND(" ");
printuhex(can_mesg->data[ctr]);
}
newline(); sendbuf();
}
}
IWDG->KR = IWDG_REFRESH;