diff --git a/F0:F030,F042,F072/usbcan_ringbuffer/can.c b/F0:F030,F042,F072/usbcan_ringbuffer/can.c index 694e96a..108ca3f 100644 --- a/F0:F030,F042,F072/usbcan_ringbuffer/can.c +++ b/F0:F030,F042,F072/usbcan_ringbuffer/can.c @@ -372,7 +372,7 @@ static void can_process_fifo(uint8_t fifo_num){ } } if(CAN_messagebuf_push(&msg)) return; // error: buffer is full, try later - *RFxR |= CAN_RF0R_RFOM0; // release fifo for access to next message + *RFxR = CAN_RF0R_RFOM0; // release fifo for access to next message } //if(*RFxR & CAN_RF0R_FULL0) *RFxR &= ~CAN_RF0R_FULL0; *RFxR = 0; // clear FOVR & FULL @@ -380,11 +380,11 @@ static void can_process_fifo(uint8_t fifo_num){ void cec_can_isr(){ if(CAN->RF0R & CAN_RF0R_FOVR0){ // FIFO overrun - CAN->RF0R &= ~CAN_RF0R_FOVR0; + CAN->RF0R = CAN_RF0R_FOVR0; can_status = CAN_FIFO_OVERRUN; } if(CAN->RF1R & CAN_RF1R_FOVR1){ - CAN->RF1R &= ~CAN_RF1R_FOVR1; + CAN->RF1R = CAN_RF1R_FOVR1; can_status = CAN_FIFO_OVERRUN; } if(CAN->MSR & CAN_MSR_ERRI){ // Error diff --git a/F0:F030,F042,F072/usbcan_ringbuffer/usbcan.bin b/F0:F030,F042,F072/usbcan_ringbuffer/usbcan.bin index 3fe74fe..2f09925 100755 Binary files a/F0:F030,F042,F072/usbcan_ringbuffer/usbcan.bin and b/F0:F030,F042,F072/usbcan_ringbuffer/usbcan.bin differ diff --git a/F0:F030,F042,F072/usbcan_ringbuffer/version.inc b/F0:F030,F042,F072/usbcan_ringbuffer/version.inc index cf20f39..b735266 100644 --- a/F0:F030,F042,F072/usbcan_ringbuffer/version.inc +++ b/F0:F030,F042,F072/usbcan_ringbuffer/version.inc @@ -1,2 +1,2 @@ -#define BUILD_NUMBER "49" -#define BUILD_DATE "2024-09-02" +#define BUILD_NUMBER "50" +#define BUILD_DATE "2024-11-18" diff --git a/makefile.stm32 b/makefile.stm32 index 207b3c7..df54127 100644 --- a/makefile.stm32 +++ b/makefile.stm32 @@ -158,7 +158,7 @@ clean: flash: $(BIN) @echo " FLASH $(BIN)" - $(STFLASH) write $(BIN) 0x8000000 + $(STFLASH) --reset write $(BIN) 0x8000000 $(STFLASH) reset boot: $(BIN)