From 6902b6002003038fda237b09b1d9321f0d93eca4 Mon Sep 17 00:00:00 2001 From: Edward Emelianov Date: Wed, 22 Mar 2023 12:10:10 +0300 Subject: [PATCH] fixed pullup/pulldown for SWD --- F3:F303/NitrogenFlooding/hardware.c | 4 +-- F3:F303/NitrogenFlooding/nitrogen.bin | Bin 6220 -> 6180 bytes .../NitrogenFlooding/nitrogen.creator.user | 33 ++++++------------ F3:F303/NitrogenFlooding/version.inc | 4 +-- 4 files changed, 15 insertions(+), 26 deletions(-) diff --git a/F3:F303/NitrogenFlooding/hardware.c b/F3:F303/NitrogenFlooding/hardware.c index d03dc31..fdd6b9f 100644 --- a/F3:F303/NitrogenFlooding/hardware.c +++ b/F3:F303/NitrogenFlooding/hardware.c @@ -28,7 +28,7 @@ TRUE_INLINE void gpio_setup(){ // enable PWM timer TIM3 RCC->APB1ENR |= RCC_APB1ENR_TIM3EN; for(int i = 0; i < 10000; ++i) nop(); - // PORT A + // PORT A (PA13/14 - SWDIO/SWCLK - AF0) GPIOA->ODR = 0; GPIOA->AFR[0] = 0; GPIOA->AFR[1] = AFRf(4, 9) | AFRf(4, 10) | AFRf(14, 11) | AFRf(14,12); @@ -36,7 +36,7 @@ TRUE_INLINE void gpio_setup(){ MODER_AF(9) | MODER_AF(10) | MODER_AF(11) | MODER_AF(12) | MODER_AF(13) | MODER_AF(14); GPIOA->OSPEEDR = OSPEED_HI(9) | OSPEED_HI(10) | OSPEED_HI(11) | OSPEED_HI(12) | OSPEED_HI(13) | OSPEED_HI(14); GPIOA->OTYPER = 0; - GPIOA->PUPDR = 0; + GPIOA->PUPDR = PUPD_PU(13) | PUPD_PD(14); // SWDIO - pullup, SDCLK - pulldown // PORT B GPIOB->ODR = 0; diff --git a/F3:F303/NitrogenFlooding/nitrogen.bin b/F3:F303/NitrogenFlooding/nitrogen.bin index 97fffbb6a3795721e66e30a4bb8ba6dc754dc494..ec501e00be80b96137f614132f1f22fdf422d686 100755 GIT binary patch delta 4108 zcmb_feQ;A(cE9(1=))F9{F zyPn;)Pk?DPrcE4PvYmium#LG~A>9qOVY>`C@=il0+ody4G0qrFil#|MV5PfHi;N#O zwR)dOwlmp3b~>$Q&b#N{`#a~Jd+s^sUS0FP=@r3QVBcB{4AqD>e}lj`ei}w2ZCGoM z5`QT3O&x!vFaE)ze?;K_887~ycksV5$Y}n?dWNrEK6wIOg+%Cz#7iBx4?ZRx#qA>F z?&$0;?AhD1siTD7)bS&JQ+p>LRLpxnLEi}bV)vFFSI3|B=u%^>Zqd%d$G7nIHb=+L z_!s#kA58zIskhtJ^Fq(M_6_{HKt)S1O&7n#_wu&(&v@p3PElhwws>|A+0)oV-#0Z8 zd}-SWzL76&{{V5N0j^uJ5bKMhz>LxK=XoH5k5vKia2FszKx!k(B!TdVeH?IrSGxqK zf@590#uX^0wYl=a79tL!k9vd*PD9@i15Pc@?Bgr~a5$Cl5eq_FgujP5vro6+2x}2u zhs5mH$on%LStOGV`yL^Ggy&pu{R%mZ6W6my6H(zE}my{6p0KS5N^jz1w|TeeJBX9eu-yh8@Ay`{y=(qynB2tk%iJWifB& zrV6|sp>zC(S|qL46;qanNbh&y7*Ou60Cycr&i}it^@dg8z99o;dgYS@$of4jJ*V3w zUO_?Pfxr&DfCgp|0QOLG-9@sZY96oNcWdi7tYT!Wsx3xwR^f-2$&>+yl_T`#08oZj z$dngMPXOiMO1&K@2UaRM>me6oib6Zmr@a3FC<7}whzn-FZ7aZDH&xzNJ`Q%2MWNHl zmj{5T{K<-40LmBw_pBrnMJ;Fvj5`D?U!#cy9IITw@x}$L@nrYaL@qJ`P*XBO5IG#S zOr)K}>F!GjJ*UZN5+mIciJ+44)=hz^wkcIBC}>j(YOC)m4S#zcxO-%LfM5ajyi8Mn zaU-|E2Aud9jN7ZWOW)IP78@_u2I~b-{iOUPi^un>rh}lmP7Vq9J3z^-0{3DJo_4S_ zJJt-`Mwz{J+_qWX+`5@NpUUhiikjIn)^vXAj&c+@4=bSY?^KT+O4vJg7AQ|WsCNu9 zcD5+`scHx#GwXozt5sx*`>G7RK-vBPzC+LmIR9WOQ5Y;iF8*kFr*LxI+*Z`iBOm>8 z*^Or3Up|ZY%gdT$Pc1*Knsx!|w=rOUw5(2g%3u{AqWuyjz+gu-h)B60-^FT28Mmxw zi#}}<-et@;bpqVE&0ph(^&h674#wYQbh1)bsKUpF7&WF`2{i-P2($LndW7@%DL;JT zY6_AtKFW~to!{dYvi{c4*)?m_tjD`eYEwfISc_%-)3$_h2ZzTzG40-2uW{@3= z7PBujxlzlrE`Qy4Tg7@!-F`xa2QM=ZV#5r)$v5TBPYOo_+&{@r3KD~%-f7DOuPsy~ z{8JJTu+HW;_>mk1kjbM+PQ&+R@uI{KSplA%;J--l>}QG4#S(TMOR$-xA7o%f$^57g zu$^SiCUNY8Xs_^b**S*1wUxEAQ+GmiX6baaiq(3VrPnhw6PiLvfg%cDr(D?g>$jPo zM{U+x>zn0zc3%as4l~-uypw0F#}S9K^@2@gxpDa9zm{$D=d#Gc7fBT!mXL*mjPd3U zA-5dvfSTnTro!M!G`=GI0PS>zU&-!t1?_Y>yHntrzKhj_n)6zLYvzdklGlZ)IlIhk zsM&iVr#;vA)(R+u?3@84!vsuu@zJCoH*UsM5!R>XkWJbdMr%usWt`dpqSNYsNLi=M#Dlp1i74#2d$$HM}!c$J*lz<&=vCfQOfFs~=5k z!lY(I5DAdLvmn2j^6JRs3Ea4aNH*gCG510fHusy@HqVzg4l80~9h;l=L=SZnnFD=* zdO}7zDs$q%6I}2UU(Ro(G$RaAzXA!XW(EnXMFkmP;-m7TDBf+$dV0nB%ATr(g) zPHq`ZbrZ!mNYA;sXDW-8P;fL!;2*~DBw4Jf1JsYRdp3GTQw_SroVW7J#P-UC1aN5v z{Tvn0H{N)oT)Bu396wL8c_^-|mkQ!VNb-l8ZzZE?jo6VHWKfcC&xyHN{Jb&+Q4z>2 zHD*VlJ}tvDfJ)8lSMa6nyfzP_x!iuiGT}^z8K**Hpz6$oeqP^NNRzG2_r>q#(w%&$ z*{OK(<7v9{%*4F}H~{EZUdd#<7xTF@!mH<9>2RYEM#%JWM0EUzx2$SAhb#U zxaK7|Em`wwFt94^&hv>MsKB|F15!RqyR_PPMKz%waFw&PQ`2=p#a&bgN4DxY%K)f) zfY!5Q`(7QeuQLI|w-LcLz%WDtJ1XtXTROHyo+*D=c43hgJ8ljFA{F)%i@)&G3k?nj z?+}ir>8Fk=cIe=5>7h8W=)3!!eAMK*T;SFE(fm4Q% zg@umHl7cSDJ252L+uQe(L{5u#yt?Hp31gOn%m18>+hKHU+R+72xM@dvr~nvhQTu0z zzSX*eLq{6iIic#}lPVE@xyc=UnN^yCbML3XTDLr-g0r_(`TW)n^qod;B8Sq{%(|oB zXQLCpX!<4ME=k|dU)T4uq@H+l;@2uMT<5o4Qkvim{tPc+z zMh~J#Ngu+`h!dspa&p~lf17gvLr@1Qm6dbcBu3T7dIuo2Rqp*goW{>g97mM|)s-U_ z`Z?}cn%-mK%~Q{F)}ep7XT$+@NABYG57?>CV_kvFQX~^k(3Cl*Rj^3rW@5(JJK&3v zRJ&}X$k?9N4z4>Q=7%wqqr0ZX{wA^d5IqU)f{ZZ8pfw zt#~pFd@5#bR0(u-K8P{g0sf~62FY7OnWfH5?|_4POa3IGqdc;KvdO3@#~yE$BKZPF zxuck?%eKc1tB5FY=I}MGog)8AqK4xmS~1Hk`H=YSgq!P$bcHV_+*vV5Sv0ph3&%Hd z)<`bDk?Z2Wm*|a5E;fi8Kb}N|qjctQnm$tK$0*O-?K`-l$4p>-z=NVXvdSka0zSkY zU)`Uu1qj6b)#~2Fsx&yk)IVmxVk-?3R?JUVXvLLmI4vfYH`qpQbS9Tv!%e$kLVgAJE8-K0*C}e#hmwo zcKhSWK_`hyf%m78bBr6kUcPPn4stT~Ej)RG+^S+h2}cuo%afk0!}g&4;2n) zR<)}CpCFF@blaasBunoUA1-KX^4FsgfLg#dw6x^_sidSrdZJ`cvCmH1eO_NpwYR3) k=gZOLs_m2Sm9)U(LporHpvUGgqVFJHdwh>bYsz;0H>oeHCIA2c delta 4162 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 diff --git a/F3:F303/NitrogenFlooding/nitrogen.creator.user b/F3:F303/NitrogenFlooding/nitrogen.creator.user index aa79e75..4a03d2d 100644 --- a/F3:F303/NitrogenFlooding/nitrogen.creator.user +++ b/F3:F303/NitrogenFlooding/nitrogen.creator.user @@ -1,10 +1,10 @@ - + EnvironmentId - {7bd84e39-ca37-46d3-be9d-99ebea85bc0d} + {cf63021e-ef53-49b0-b03b-2f2570cdf3b6} ProjectExplorer.Project.ActiveTarget @@ -38,43 +38,32 @@ true 1 false - true + false false - 0 + 1 true true 0 8 true false - 1 + 2 true - false + true true *.md, *.MD, Makefile - false + true true ProjectExplorer.Project.PluginSettings - - true - false - true - true - true - true - - - 0 - true true true Builtin.DefaultTidyAndClazy - 2 + 4 @@ -88,12 +77,12 @@ Desktop Desktop Desktop - {65a14f9e-e008-4c1b-89df-4eaa4774b6e3} + {91347f2c-5221-46a7-80b1-0a054ca02f79} 0 0 0 - /Big/Data/00__Electronics/STM32/F303-nolib/blink + /home/eddy/Docs/SAO/ELECTRONICS/STM32/F3-srcs/NitrogenFlooding @@ -125,7 +114,7 @@ false - Default + По умолчанию GenericProjectManager.GenericBuildConfiguration 1 diff --git a/F3:F303/NitrogenFlooding/version.inc b/F3:F303/NitrogenFlooding/version.inc index 33f807c..f53810e 100644 --- a/F3:F303/NitrogenFlooding/version.inc +++ b/F3:F303/NitrogenFlooding/version.inc @@ -1,2 +1,2 @@ -#define BUILD_NUMBER "1" -#define BUILD_DATE "2023-03-20" +#define BUILD_NUMBER "2" +#define BUILD_DATE "2023-03-22"