From 8f89bdf93a54bbe5112142db5ce9b7075387fde7 Mon Sep 17 00:00:00 2001 From: Katya Date: Fri, 17 Nov 2023 15:56:14 +0300 Subject: [PATCH] friday commit --- 3xThermo1xHT/idiBusFiles/IDIBUS_IMPL_Custom.c | 4 ---- .../.vs/GccApplication1/v14/.atsuo | Bin 64512 -> 72192 bytes STM/Debug/makefile | 4 ++-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/3xThermo1xHT/idiBusFiles/IDIBUS_IMPL_Custom.c b/3xThermo1xHT/idiBusFiles/IDIBUS_IMPL_Custom.c index 79b5ee5..50da653 100644 --- a/3xThermo1xHT/idiBusFiles/IDIBUS_IMPL_Custom.c +++ b/3xThermo1xHT/idiBusFiles/IDIBUS_IMPL_Custom.c @@ -91,12 +91,9 @@ ISR(TIMER2_COMPA_vect) { case GEN_Send: { CurrentState = GEN_Wait; - // А НАДО ЛИ??????????????? TimerTime = 100; // Ограничение по времени - 150 мс - //_delay_ms(10); STMReset(); - //_delay_ms(10); if ((PINC)&(1<-f@nkfBU>TQ$rFPx$Dz4gq<|NM8-e6h5HZM#8)N1$J;xScF?2TNH3kcTgYWANf+olQoTOT-!xgNcWlHweHSIlZM-h^?Nrp zqSmQ~w29*3=ECK;WLz*Gt0d$|)3Qv<7HX;q7~fn+h$mB9c&=l(29T35C5P_jR(K{= z2i;r75spmV$C>2kh?6kNH}Z<*QH)MRVUBNxqqQWFgG{ZNhwJ8E9BHwgp-{VxZEE-j z0l$#6!71N2jfs6`b$;T*Q+bvOyi80rajT0}glDL(Y9wy4g#0fA=4R^t zd2T+3vnJ5Ak#}$=YJ|p`O_c-=gb%)yOS;BfN#K|8St^EJeHgwyE@Bf8{;j->*oeKB zSY2bToG)YCAH`T~L0rwfI|9G>vq0E@mtPJ+hX;IikC5KZ!P1L}slv;~5qSvc+ zTDQThk}HBiX>dqk4+=e5*$5-c=2cNM9byt40-0VZHR%=Yd5J`(`W1scnkJmq#qTv=z%ZZJ!{#(u_Q z=r@W?UPj_ns3fC)zfhK)9`e)oth=aA(U>4BtE8|{zFMszuKQsPg_y*-1ze%+wMW*3DMjkGG->$T?m za+fF%tS;i1nW$ejxJZ{Z~QU9YHOs_a04aB@MbH0Cca7Yxg_s~*0H-U20)yP)R9WVnIZ~NMybqp<9UuZFiWhMv2;OFyK3IVSq2Qz6yV`;j!3- zsK?kfPyV?a+Gp1T?$NJ%>g%5RKk6ybm+z^4XMey^e+7*NuFR&-ZKvSt+!g2_YH4WL zv%~udIPmeDeP?%brp7t&!-G|9)$`YCaXM26ISV#bO|HB9sQNTQBbROa@$oXa zd@#bsUU`lH-+?Z+>*e20Br5{rfK1bEY2Z z-;o1#H33h*$w$w^Fms6yFT9(9nX8?!=WHjt`aL%>^(zj1=Yj!hZmwhBIy*~%z7U&t zcvi0wrDnmPQ;oXam zvh`OE5ldG3!s8ITG{Sbzt>D1Nmu>7HuCFJMX%#rH55m9C<bCQXyI==07oDQuO(={>I0zN(9Ysf({fnI;TJO9xCK48VCH8g&d%Km>>bi9qZu z%6PQ7P#F|A5{<6gww~V+=qJ|~nevCBkqUxiVr2&U1A1+vP>%*^>l{U z4SiY`ZdW3 z!j9ZR1s@*}Su1E%{keMb4whWmlOsqBisTX;WJk6wqUR}zCl|Et_GeRA4h+dj>W!o@ z$va!}T4X+KZ)A@>ogd#ALx;Fxvz=-FX8tm9qN_Mx5lJRC#0NWyZ^vQ`HTsKN6p`f2 zAx8aU=yU*4T+cXphAE%(O^3Lor_SV6%@cWJ<5;z9WLp?dj{VF#PCghb(;rk{5sT0` z&r+k-q*jwJ(@(mcaB^DhoD?p(5)5o89``RI)AdBgomt-~A}dFNphWD?Zc&7ip}Ogx zfFU^vKPY!ab5jai1Y2#idgG}lDT0QhBU1AncaDKJK2ngwQe2*#E(Ut<96RC)6_Mes zA+vY;C(|8&`C;TLINJA9=|fHLv$AjYRGB7lL5a$_vupU}`O|e8&7+zuURj#rE6vqL z)#9T>I+irznCsYCK8nA#H}rk@eAt{OW~kH5dx<~al*gC18q{T5_Gz(|w_IW8BB$z1 zb&_xHROugXJKWnS-OK+r9X8pbn-<`~(!(;%*M?BeTF9QrjGC$3&UzF}de z&8fjZD_=~E_nwy6oVt)Z_J*nUUmBvkS0&$Ntle~E4VUbT%jgmt(AnMDxP=lPxt;vTExvi8P((MXXxMnJ?$qx z_QOIhId5cVAdjb>GxClT1&AVx>pIi;gCFDFnMB3dt%>)yC#jjYnusr-uj1UZcK)>8 z=&l|>)#{i)w8Y2TBRReGId_Rd2?y(l5($&4;VzRael}u}aGAvyPL?a#xM3(u+1$FI KXTBTrFZ~U?gbdIC diff --git a/STM/Debug/makefile b/STM/Debug/makefile index abe2fd0..f26d21e 100644 --- a/STM/Debug/makefile +++ b/STM/Debug/makefile @@ -60,8 +60,8 @@ all: main-build main-build: STM_gen.elf secondary-outputs # Tool invocations -STM_gen.elf STM_gen.map: $(OBJS) $(USER_OBJS) C:\Users\Katya\Desktop\29\ 09\STM32F407VETX_FLASH.ld makefile objects.list $(OPTIONAL_TOOL_DEPS) - arm-none-eabi-gcc -o "STM_gen.elf" @"objects.list" $(USER_OBJS) $(LIBS) -mcpu=cortex-m4 -T"C:\Users\Katya\Desktop\29 09\STM32F407VETX_FLASH.ld" --specs=nosys.specs -Wl,-Map="STM_gen.map" -Wl,--gc-sections -static --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Wl,--start-group -lc -lm -Wl,--end-group +STM_gen.elf STM_gen.map: $(OBJS) $(USER_OBJS) C:\Users\Katya\Desktop\GEN1\STM\STM32F407VETX_FLASH.ld makefile objects.list $(OPTIONAL_TOOL_DEPS) + arm-none-eabi-gcc -o "STM_gen.elf" @"objects.list" $(USER_OBJS) $(LIBS) -mcpu=cortex-m4 -T"C:\Users\Katya\Desktop\GEN1\STM\STM32F407VETX_FLASH.ld" --specs=nosys.specs -Wl,-Map="STM_gen.map" -Wl,--gc-sections -static --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Wl,--start-group -lc -lm -Wl,--end-group @echo 'Finished building target: $@' @echo ' '