From 6c0f71dcc3000cabfc7e74fcdf991ee9f8fb7555 Mon Sep 17 00:00:00 2001 From: Edward Emelianov Date: Mon, 18 Nov 2024 17:19:04 +0300 Subject: [PATCH] usbcan ver.50 - fixed bug with error flags removing --- F0:F030,F042,F072/usbcan_ringbuffer/can.c | 6 +++--- .../usbcan_ringbuffer/usbcan.bin | Bin 11600 -> 11588 bytes .../usbcan_ringbuffer/version.inc | 4 ++-- makefile.stm32 | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) 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 3fe74fe9472b23833ed038fa18371c3773146cbd..2f0992564f56a1a0ec8e31b6c9eb3846a3091aa3 100755 GIT binary patch delta 2228 zcmbW3drTb19mi(?-)$)810SzD3@o=0z&ygkD5ijWyjGW6T%qEs7^rkAv>e9BSaPMv zO$<>J$yOctF;0wuv`%Om92_;};?!21il(;Qx@mO;ut*)%mvFvwgWW{6(_MVGyZvtB zKAis5{PEe}bLKZQzuCPDbY1L9CYgl)G?{QIlyDYsG$re3$+NWe7w79tl=FXTs*9)7 ztTM68x;aW4Dk^zWJe-(EKY7JJl(jQ8OSNyp>1XpqsAjqA^9l}NRehB3$xgfUo-eT}KJaI6hLrSG$DU+os$?H9 zJPtOresE+ZHvE>;t;^SA{CZtJqw>(-i}7&;*2`)RtaoF*rfw^(GnJ$+XQBQ==JJp( zUyj)kyBO;=rz}pHQx{jv8H+?n##!Nm&DqCNkd}rieB~zahnsJG|Sa ziGgl2nfHb}Q12d_N#9N1WLX)x&9e#>y2MJiZ4XXVDG%4fTId`K$l^(Ga`KOd^ zV$tRzqRWG8#jwW|{(vr*t2__A5f!IdB%A~Iz}csJ)*InvX#s5 z<|)QAM|n#4t>QoNUX=@oty4P0U?)k^<-aTE z+?uTFN0Alm92bq8n~ER4J5~C>l7fn{u}0z@o z=Xwx&i*f?`X`RQsTa_P#b=iOK@i2q$Cpy78UXSYXPSn%n+xo8Xh}7-7W+qEq+Uy^KD_{T0O+h+iPh%yJHtDExKt;ms6B}%(|5cjz=iZ zIvj=O4e)F7b@r5_pzt61(>Un<4@{GfN<*`LHalL%Z>iVan+5L_G^2wx8v$SDB$f6?UZ_Uo(K=a^CQ(8 z+AR%x9NzDG-W?>H$o!)bIWmOEezhaC3vwTu$+puWb}75Ec)MC0>VmIbEeP#^Y*X_> zose!dJJc$59@1o+_D$F>mYXBgm8-fOAEQEd)79`}c(t-4e~cW?dnn;tL_|(5qIaW` z@zMo;9BhUs9iG)_BeWFuWKQ7@HD=t+(OFIYNUd>`8#RdBi3LKHkRSg$_P$yUJMx)L zk~DcyEroqOb~RE0c`at#rA^STLYs*eL7Qi4&Lbm5_fL5aoiRFhm>ec^1%z7!Az-}H zuf9siDDvJ1J-`KjKDY=y71HQb1>|1HU69l0)EnR&H~@?rK+ydFbPm#G)VfWA2?U>` zT$_0qYif-i@n6clXtvZ;xT-3uHkVaamQ`-?KVRsKADOnJUi$xs?@Np^YB(H(3qCk@ zgu4Lems!9*jBCea^_cjJXqklj5E%YjIiJfv-M1gi?f&1v4<>vbPe-97;Q2zqx&NAU zJmWue?SsCRrIdcHmXzV|0)E3zf#YBlB$|>b-d30K$i%0e2SuP1)PpwA&JLDd{wFU& BH^2Y@ delta 2121 zcmbW2drVVT9LLWAp%p0<3qo5drB?*BXi!@rhE4n>t;hxff}B_q}S|bbrl1KKJ)LuiyEd z+_NR#5-mw0W*SG-ag?Yvpf1i>H+(&vdbnkLB#rkxjT|3NkFxBjtk`jVbfPWWOfsvZ zQt9IZo{ysL(>NPP)Wv#xp=Q9nL*lmC#P&KL27>pC`t=`?A=Bq4$} z^M$7ElP3!OhAb>>=I#0Y?B#`=t4THAn=+`^S{ zE<^sVR>E=27?YZ{5j!iV#H_U#g-%ygeuTHvRaekimLx=vGc46w5(Isv;?-By73kT# zm@4i@p!$TxA&Z>>bBrwR37Vm|1>Upk1sfVRCHR zv(GU3jNStN%6eJ!v-=4~{a3Jx=h9ppsQ3Pn=KLpDrtwi`SzOCf2BlJtO&*k+Y3~cS zlnBO3Lq2I;;HQX=>6;;hHyX-j2~CxARHU`cKNB-QVcP~Rp@&#(VoJe&iE<@;wnMiR z1(QbjC%|ee-NKXMr1e5~DQ`u7qx3GHk&{7Waba&J?0U((Mi$e1X|A$^+iYoK8ePUV zC+6iH$CVKqvD=0abMe*}V*QiSYORv8 zMz3@cYYdfESuP0mq^a1+E9c4TJ_oN+Qoc#j=iC`IQrpWI?fw~FjdW6YK$`gtToY;J z%L}`T-A8a%=|@LMl;xRxS22l}#Rt-H*rHsAtghllUdg#5dEk3E>Q&NJNjcbfX?KrO zoC6MBO-Q^cxA^xX?W!zQq8pxP3}d&FjJ3bW-}ucOwd`;_n-vm&k{eM(Vwuffn6=5j zaoSdlIVP96WYH-#K|d&Ohh8W(K>uFuf<8&w41K3;#=K*tPyMp!dA7{Y;A@Zx_Hn3B z7R#|-NbHdp`)h?cu4^jN5q4)C4sGg{f*r)aH=yQJ0B7^FqLt3ts7Uk1}N9OLAg$_9jwH)Iv~wT3lL)N z2iXog2@C-?Fagv68bQp*2N2RP4Q~W(L12Fec@)GWu2$NLYj?ISXcP2R*Q(H*UfXT2 zla6j$AuE^5^htE+j4qpNZiU&2Y*5Dv3-L*DI0?h>~vnJ2B-NlSn2bYRrnSO zrHeNEtKnJ2mM81`FAL7}ErwOYwk7Ln1#3yp&YT|1^p(Kp45s;JL-N5?Uom8UFxgim z6t4@3n$Y{O$1$CWqZw?BDLGjmM7#9~%G2?F-Bp077M}Zklc5b@OHJvs#emX=?js@5 z7tD2#ySa!w40wInkiWl*T@H?befzmhqC?`ZK`ZRez~!FdkR1V~BZfiqLfhAu0qr9D z%QTYau+$XY+)Joo7kCVmr?_`7A?r}bd%y*z!EXaz=w?Wz-V-3*kjo&CqTZ*#S+Ef( z_ZW@4yAC~`)up7W7Gd3@zGhEL%2|~rC(l00HYz8}mX~E4#|ne~A2n|= zMpbLaeb@aqXL;ucJp z1U`6U!At*|bWh?xbFGH%WD(YP@}jfw569nSKiCe|fv89=#VfNbpCNcHR*(b60tYAt JrEIzN+~2is2^0VT 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)