From 4d835abe4ec1e25a6ba3be34ec1ce3d0d97eeece Mon Sep 17 00:00:00 2001 From: Edward Emelianov Date: Mon, 2 Oct 2023 20:37:52 +0300 Subject: [PATCH] fixed a very stupid bug --- F0:F030,F042,F072/TSYS_controller/main.c | 2 +- F0:F030,F042,F072/TSYS_controller/proto.c | 14 +++++++++++++- F0:F030,F042,F072/TSYS_controller/tsys01.bin | Bin 21384 -> 21384 bytes F0:F030,F042,F072/TSYS_controller/usart.h | 2 +- F0:F030,F042,F072/TSYS_controller/version.inc | 6 +++--- 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/F0:F030,F042,F072/TSYS_controller/main.c b/F0:F030,F042,F072/TSYS_controller/main.c index 65296fd..1a007ad 100644 --- a/F0:F030,F042,F072/TSYS_controller/main.c +++ b/F0:F030,F042,F072/TSYS_controller/main.c @@ -133,7 +133,7 @@ int main(void){ #endif cmd_parser(txt, 0); } - if(lastTprint - Tms > 249){ // run `sendbuf` each 250ms + if(Tms - lastTprint > 249){ // run `sendbuf` each 250ms sendbuf(); } } diff --git a/F0:F030,F042,F072/TSYS_controller/proto.c b/F0:F030,F042,F072/TSYS_controller/proto.c index fdfb04c..eebffa6 100644 --- a/F0:F030,F042,F072/TSYS_controller/proto.c +++ b/F0:F030,F042,F072/TSYS_controller/proto.c @@ -77,9 +77,12 @@ void sendbuf(){ }else if(s != LINE_BUSY) break; #ifdef EBUG if(DMA1->ISR & DMA_ISR_TCIF2) USB_sendstr("DMA rdy\n"); - USB_sendstr(" sendbuf: line busy\n"); + USB_sendstr(" sendbuf(): line busy\n"); #endif } +#ifdef EBUG + USB_sendstr(" sent or not\n"); +#endif bptr = buff; blen = 0; lastTprint = Tms; @@ -90,6 +93,9 @@ void addtobuf(const char *txt){ IWDG->KR = IWDG_REFRESH; int l = strlen(txt); if(l > UARTBUFSZ){ +#ifdef EBUG + USB_sendstr("l>UARTBUFSZ -> sendbuf\n"); +#endif sendbuf(); // send prevoius data in buffer if(cmdsource == SRC_USB) USB_sendstr(txt); else for(int i = 0; i < WAITFOR; ++i){ @@ -106,6 +112,9 @@ void addtobuf(const char *txt){ } }else{ if(blen+l > UARTBUFSZ){ +#ifdef EBUG + USB_sendstr("blen+l>UARTBUFSZ -> sendbuf\n"); +#endif sendbuf(); } strcpy(bptr, txt); @@ -118,6 +127,9 @@ void addtobuf(const char *txt){ void bufputchar(char ch){ if(blen > UARTBUFSZ-1){ +#ifdef EBUG + USB_sendstr("bufputchar() -> sendbuf\n"); +#endif sendbuf(); } *bptr++ = ch; diff --git a/F0:F030,F042,F072/TSYS_controller/tsys01.bin b/F0:F030,F042,F072/TSYS_controller/tsys01.bin index b6c12425396515a892feae8856963f9b0c7a4b10..9dea7b44270459438c0ac7f4d23b53530288cbdd 100755 GIT binary patch delta 258 zcmeBJ&e*Y>al#*_86p$^nE}boW{hf#Kzec<(#LZ*<2d3DjF-eGQW@EPk zDcbDBv5kePLU{8po_nku2b6C!%yqK7HTi+iQbyj%ZNe%N2b5VDZZphqQoCg1HQDV_ z-UPP>ml>`Sw>BRV_F^(A*vjR@<@Gp^m0_|I*BwqzM&nc2kJC83MGJ1{1<0I8UYu62 z_y2dje~al#*_IXn~pnE}boW{hf#Kzec<(#LZ*<2d3DjG0E_3W@EPk zDcbDBv5kePhI{ibo_nku4a&0_<~mv4nfyR#DI@3PHenTs24xn8*$gwB)Na^#O?JDK zH^HsJWrnN7oy~`Yy_ifIlnS