From 10a766453f49266e7d28c402fb19bb11a49bac39 Mon Sep 17 00:00:00 2001 From: fauresystems <34378695+fauresystems@users.noreply.github.com> Date: Fri, 26 Jun 2020 19:02:05 +0200 Subject: [PATCH] Fix library ARCH issues stm32duino / Arduino_Core_STM32 can't be compiled with Arduino Bridge/Ethernet/WiFi libraries. --- ArduinoProps.zip | Bin 952794 -> 953294 bytes .../BlinkOnBridgeProp/BlinkOnBridgeProp.ino | 1 + .../BlinkOnStm32Nucleo144Prop.ino | 4 +++- src/ArduinoProps.h | 10 ++++++---- src/BridgeProp.cpp | 5 +++++ src/BridgeProp.h | 5 +++++ src/EthernetProp.cpp | 6 ++++++ src/EthernetProp.h | 4 ++++ src/Prop.cpp | 3 +-- src/Prop.h | 6 ++++-- src/PropAction.cpp | 13 ++++++++++++- src/Stm32Millis.cpp | 4 ++-- src/Stm32Millis.h | 4 ++-- src/Stm32Nucleo144Prop.cpp | 3 +++ src/WifiProp.cpp | 5 +++++ src/WifiProp.h | 6 ++++-- 16 files changed, 63 insertions(+), 16 deletions(-) diff --git a/ArduinoProps.zip b/ArduinoProps.zip index ae7a8885bdadecace6f2fe2e89adbeb5c7f0976b..dd0f2b03a8a655f315e44cd2f6a11432b94ae97a 100644 GIT binary patch delta 12799 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 J3{8`T`G1B29Jv4h delta 12186 zcmaia1yo#359k8LVR3hgyK8~s?(XjHR#@Dju#_%RC{Wzpp+IqpyA>#2v_PTw+kX9i z>Hod+-aRKLCo`Gc+)VCFGMRCR&~mB}nwlcqGhD#02T8dWZ4(>LOgy9h3|koyOEqdi ztwiuavjhPESjPkaL{d|5m{R?S)j(v%;n_-MsUnSXkLPv_TKsRm`O3r!sf!Y8q9Js>F)?N zBtA%Qz}}TuXu(_F-OMs&x)U(;iV6;SQyWz*^?8U?Y=`XDlFj&VvR2B{@JouD5uLfuNu|LC@>p za`9cRvW$67j+ig25a=XdOJ1iC2_py?^+6Vu-B9tf4C|FNZchsJ;SmTq84hAuTcibR zkKZBk7WT{N9vGgjNFW&{@5u>N4f4D1y6*5@6%*K>`xXFqb*nuRU#Fo^MkQd8H#@l? zg!lo`hk8HVk{{c0J0x`!rEWW4AvETPeF3wgSOu63mn%a}oq<`UT}Am42ECN_d4*;y zshG?ca|)El@2>BPsy#u<+|B&S`FTltaF*{OmEl-g*Tm5`WscqFbXsDueGMs2))&zjo*y%UD;rklBb!k@QzT^o~Lm0w}2dVB6*f1_eTKW4izwS?~jS*edVD6Z$wR`s=SQb09EpsP@g zuU8AmOK(PZdOA7ny}i?DUcpTdSB={`x{0(&t+X`=?%0|_N6Z8C~3V!9-_W(dVYK+&c5s!#yp34 zp6(h)Ki5SCA~ZxtAPdmaEq(qr=6y^F&k2ViYs@TA$Ug(`#C zX3N==z%@$A`*$ndaX1A=@r-jD;|SXg`10XzFc|rdK^b;(H$gA6q^=^0L@Rm3ne*nj zzs|_zCDJtzSXW#!#|$GI1RkB5JyZEbJ zV@`Z79QT2$fM+C$*Z#-_!^noHW`gh}>w|7VsNjL@OHy!3hv+Wx`{<-93DoKA)x3wM zdCUa`kZ1`EDq_(v4veAUi$p1PFMDB@()cF7l#7r5SD$KE-R4s_w#myuN8%t#7q|ks5`GAzA8&WzGA;msPb7LHZkF z2#E7TX5^iVqt3IsmjTTrjqvV*^<->(0%EhqhK`L8RiyPUhJ%@quA(sbfcnPK&D>K7 zXU?qid9Bp)j7r{VA?1BB0yNOq1LcUz!;cLJLnbDmu*dM-MK5ms2so66X7Wkhz1mt@ z-lL}Y{Y2Tm1$yb~5@Qu=@27jLxok#MB!|1{%|GcAeqCd`#*CwcsIR&(a7zoL~00B{srSMI>jnR5tbjYwMdj z?tM>=3Y7T~D1P>ufakk}*FCRSvp?N&a2$kZr&24lIGmp3>@cB5Xf?aSy!^-?VTt8l zD(IJjQLUHaNyyT;SsL|_ZVJoIQCnWimAf{6vC>=-0OGgFfZ^UcyHkM)-=Co>sN*)=&VZbiK7`M z1O4U7NZL&=;rXXn3(ez`cyWTi5|4eQveK-30|FYKi&|fLFwalFZY;!uXM*&W zq71{{1dEu=lU4goyOmdA@nnWXrTY{T(1KuZ(5PKBmhk13`qkvVH*O?DND`?Q;!{^bGpi}2G)gCkLg=?grO*KL}s-?aBB6~=ELgw}>dfaR<1E&{*T$A6M4B)`1$JpRodb+4SR zG3jiC56fPx?qwmGU2#;A(Xv!SyCuwAg#l`HTIRG>YFtM>aKmm$5r>ZveQ<^H!Qr#d z=S!yww<~oF=Oc6QREc*9N))eR9qoD#Gfz|4^!>46-;kuuVr?c0X|Ne09g12lC~=hO z(`&`5HN?_0=ku_;z=bp%@>KFJ;;urRF&*3KdcR>3C&9&7HIYDs^7QJ(&2T(-3B&To7rO#DBHR9qW*`<_7S}U2YV5UV zq_Kh?2*tQy@2Fr`S*BfgycLx~kpG%X{Vpor=b3ZRUXSMbx@Umc_Z{*VQ}6CuhTjgU z4I*!qcT_Y`G#Rj!2sF>VTeJ=8`?;)Ab#OwRusi&$W>`-fta6-u_Ub;D6)&O!T^zS; z0z8dM5a^~$C#5QXeWDZlY0WWkD6~z(zE~E${Zc|xr064iP|4oX_E|8URY?e`r8Yxe$g9;8FSD(YMh*b!3+y$L%Otv` zzeyY_&VfHHPsCYyt$30en%6L=4I**8B=547@9CT_^gKfGM(Vl{DYltHRjvGr*M{iD zT~YR2#~O#L-)fr0aGqxGJ_~d#K2NJSICkeS=4c!Afv4;uO!3g6|0gq2)0rV-Ewx?j zH%Ye7X`g2!HsL!CI)mZJ1VkTd@(-5t92u_>=;)U@59M}fKiw8S_SRKcj#dp3d)a%9 zzeS$(yE~$bwI(EQY;}*h_IkavsBu~wr3s18h z;>Lydl1wd{Q%a&&Dsnrb2A4WCXMqI|I#02}~70Y%~-5CsJwIY>=d^%Do?7v>*g@66ounXphL6;ceyHE80PMtX5+ zuXts&MI)?X7k+npz!!ILYzyPR=C$X{8?Q8cYixVwt$jjyI3Rr!HH_!tCN%+Nsg zG4XvgEYgoh&dEl1;ZNdBddxbWRGWqP$tVcTOk>do1f;K7(kJdGTgO{-2Q#VODSHsu zCJ~1+5I;pI*8$LEM_mE*eci5p(NN8qM4RsWIRNK{h5m4j|+`s}#F zePHssePM&bh+;h5E9&KkR(lYLW_bCyeZ+9w_C1@)bHQ-?0kq?knDAJ3X^s4O`y}!u zl78tE^oJXmp$G&<3v53t6YB!>O`yyxJ-^jHZswRj29fNpw=d80HBN*R+*FYgzsyBG>N%Jyr6% zy#YE)NquJHN@_-6tuwj`C(APJ{z!Wf8w1S6SMt(6*aPWDRGMlH47(^+3mJM-u$psm zOohZmvg-2Mg%_CLjc1vFR-?us4XJdVQB!cUB@Fp_wVvJJB7tNNyb}EU8~2}+Xk1a| zY<1^)qj6y3=qenks+nT=PX!@MLK$ML(?1;Bg7`{88J<6>joOsVr+2p~?&lRnl-6Xv zYX*D8)wWkpofsGQrrXgU!Ib=Pk(oaqdiaWj8ZKEuV zYiHg2;_98nP%LtPy)OG%XCn5SG||;h--22@C>8Q;!a&$5JczDehIarB8NwZFOm;15 zGNPo3E)^ZTRQsZu+uL8+c^7wW)AF7gz@p~q_*EDGWB!1Eyb&I#^*vw#0II)!2`g`V z7YL~ekQAh)FySH$j?Jn z_|)=C2TR5TASaHvA0AMl_o04hA}LdgPnigWNxk!MHNdo{y7Pws+Co@=)Fql6kk zjKjC5K_ekTkf$Ho46Wd8ku-v{hY~BQkMJ z@m654Wap#V!9MyL)}a#`x?oZ}*BZ{`UN+Z2=f`%Lr~O;vgc~z?k@KLZc#k8J1kYC@ z?}L=0GZDE^#@pZO5s|=CD-7-O2AFCQ${P9%=zM4FKcdV;3OQQ#k#&x`fv3%cV`_;^ zwTpRx`O~}eq8BE4f0_5!l1~p(?{VqnK zOJki`^l%3TOq(sk>{*E2Ed{Hj^ka4BFIggwGcl_vHZtys{5SthwdE zzebQDeLbmX2RD)i?>UknQu@^jPF^pN!&?1lC@wgQyOAAs%jn2)uTKp`%>U@!)b%X6 z<}xX?D{-CBpwK+uUsaCJ4HqFP-_renXsig1NUYu3xFA#cq2QX|-x(Zu}>yQQsM%os5 zos7xSD#=@h#>&`Yxaq!BpDub`oFpqv+SKwq!;gP>+RB=D*ce5%#_#<^koltIOl|Ex z0kRJ(4xb;M@U$-_P~F2}Yaj7HCaq0hQp0rbe8UY*0>L-{01+fq7KjJQR0pDfTxVXQ zJyFD-n&BaXs~X5KLa#~~oI_FClA2!hNvdZWt<0QLwNmvf8IGrk*gL)KH3VOt}@gcDsFE2hi}VI`eqG z5SD)#v9V%{Ms0*ZW2+>sMI?d9XQ4p79rkE+GAAje<9N;o#gVp`@052 zTp3(bw$?G_u+#e-SBOPEvm98;)@_YS&aqHaak3I?ok5Ezd*#1+`wgWKGztr0N7{I? zT}9Jk8~A0_XB-Ip%ER$4jckGQJVqEj-4sP9dZ_DCV#WC-G0m%3hHf|*a#YM65>}$` z=xv3L*c-1saC$fyUKhP)$dh!aLA=||)40eum4e93GQ3oi6iXESI%a$6zNdMY^oFsb zG{(P%hZ-m8b>7vsm*05@9jJ%4Zcv}{#3$eDI=0Iw!$KPCOIztI7NW zz1SFZoK0MCT*{+nEsX@$yVeGQa~=GPZi$IQE~#>qJ$Ju>uS#??#GuGpJq*A7UUwLp zg^5_kH%z41DS?b1;+5nqn9T?*dM81;8+5VH92zioa2D{daI>#^c^G1Y?!xX$#dgR= zg{?U;ke`C@Fb!DmLn7X_#?Fq#*;wJ6?f-DHNo+fjJB!8sJ z+n-ibDsxlTj4q8KlmQtpB-)#@ew~~+&nM4d66%-aHn$l0>WNR1^%i~DY}eNklu~Q- z?fCPAxiN!lo+VD|_X@0T_yzT%?PHx!3YjEs%r_w9^;zR!enThzhqvOgzZN{S9HIA0& zX5*A8=<#1}ObA(;5yN?{ot)jg7hShh?6t3!z_I3(HFJv~axPn!!%Xdf?OjsA(gN!s z(S4O$*C=|+a^Zu{nxZxJ^@!8;i{hE3{l`vQ3^ukVIf^{3TCa1T#rjzR9x597Io93d zki6J}Gu_V&8T{{*Snwz5_`m$HwRC*iv@2u&d59tpD~Z=gZc=v0TF6=*akO&?u9!a^ zZ&TwYxdc*z7V2iv1J>N-se(z<+7oFYW#H4}j2j@0qZa$6==p@NFe>q3ox>Eb)hb;! z!m14FtGX`ceRUkqkGRZB*5nEirpIn|lQ`nLRSLZ_K~K-Aac@BqvV5U)FzuCHN+XrM zohwsAJd|%vl9EPeq{%hb3fW9maUH%-Gi3RUyxqS7Z5p8VULQ}(Q7kZMhs<~pauWwg zI+6HvSh4Y8E-AZhHa6mGC;HOw&!K%e-oD>K6^^QSG3hPRTJ||X!W5g^L0YQk)1p8$>AHza(_60}I z*OJasFhx~aa9MP7S$kz>>jDdm%!BT_Q@TFU282QQWA95!5KxZrSN236032wzHMX{R-WuSF? z60DGDP(5aUH>sD8-$(Ty4j4BYPk4Qt0}6mWi=|yeyj5;gXm_+Fw(_auAzH6jdj8op zp}()Y9I3gRrNYCpfF&K)e=Dqt+T|j*v9a{vI)JkobjY$F#dNTPRak#Pc7a)#SC=}K zZxBM@bD}<3=s(K9g8P}U1_irGT&@(EgQQ`TSV!Sg8nS*IhbB`f{hB9JenH=)#q2>& z&d<)7RM}Uw&y9M#d_;_cb9q@?`U0{8yTf~l{V)2r4^poueAn0Nw}%~ zgvA&bI}OWJJ#Aof&T#AlVRYDshBe;AN)JyKirLQX%30P1O{IFX9C+`zAiK|rWEZ*4 zLHk}jNUXYGJ2KeQbnDhuqWkR&i`sW+U9837o1nq+eh<;xU~Sh=l?+BNTD{P5*Fxu% zs?@@3mmJ`8#3O>Hvmd5#9o&_olwv|6vu09FRTS;RR^{$NulTRShN)T5YiL*^Af3G2i#{!FXZ9rq=YDtyyWk9 zLPc{%Sn)jC7aI28_jKYnAXc-pvA_2j$#80IBEk{0%qQ?XXjPp!)mq);eRa!4-u`q! zUE*e=zCC-QU3V>fSE43WZ=FYieH?Q;Z%7A9(488-873Sfm*g;-j7a)KZ$7W$Aa?^t zW%OX#tsgCYzS1*)#lYyYnuH4$ywt&VJcUcJ!g_-9(Q)ca8TIZxHr`w?ob@&5xfUKB zKa;(}SR^mByb0(6kLlZ4nIeCPb+FPQ8&bbKC;VC`8rS?@J!}=u_TsvHeUeTLjUNPB z8w2AEcih`8CKiP=OwYoxz*X{<$lBX8fE!%jSWmqq%T6I>&tXT7DS3RCn>T{wI;n_A z=QNnglCjs8oxfZ5?xp7)GOeYa!s-%{#vPm@dr-iek`7+_icGDG)$Y1!=UO(hRpuXM zq7kkr`Kb6vEbL9YK|kUC75QNz0bcVhtEC+iBKAR}>F>`V6ROZu@i7{R3bJ%_>(n%K zT;aeC#@H4kHDK^r{5p+~uw=0R2_>=sZCZq&U#O|yYIy%EZNAW_4cUB<_x zk1Hwf#)@!4NHn%!S5KqCW7aO|xECGv_xsbC3QYVR)H+lZzRPBnnnl`YdTt!pyEX*0DM-u0KF@bG$m~E zKG{8;a56k${|Gi74lS-ugw66O=A_+55^{JM?JLpj&s^+YLsH|FGlGkT(%zGaD7ktZ zp*;HQRVu1g<4r5LC#Mv7rlf7`4SYWihU47Fz0`!H#Pv7v5aatTeuCZ?aAe8u?SLw4+D;os_3JRZau3ESx+J3n=Vk5gcqYz`}VKxrln64~M-Fly! zmLS0u@2Hr1dE65)HMp7YgGR`5t;ysyc=@XP8tI~g(K^#ffbIY%Jj^YT{aj6IdB%vn z{v74P^yD+#pm8nDd6GgBW$C9z_nC>nY_{=eA^UH3WWGkiT#|Px0&JoWzRwNqX(-|JeD9TAFnd!k<+;}GV>&^}xqV>u2-{p|4D3QccMV@syCd5E zdJ9cQTOdJJKt|A*1N3|*;uPWIC$Py8X$2S;Ma7VzF!beG`~_@PLlgWhr+#U{Ms#(> zy_rY6%5*Syruh<=GN6kjkv2k8xYI;igHaxyA}Y2saA8F2OnC=!%&CRtU723-16fN0?uG!UPdvq zW8zns_&iKLU+>T|>Z4-Q%h1SHq=4Q=@NB_e`~!cWc~ z4=u2I9U5^S=+s~Hm$?ydek%ffpTDTm(YBfoCY^OA_<4M%*6uFO^tQ5s^=XpC{jTfM z_ANIZ{J37Gf(HW=xA8Sl+qwa772iWA1wr>Pfz$5VJPW(c+pEEmKB>9j#hG{Ie&K)s zEl$jci|4eJ8@@}yj^!IR$9t;m6Iz)L!bs@p%X?!K4Al6i5RuawnVAC6#bhM|EQSR* z(l??wmt`*BGp@xV!bw@iK!52pGGYqcbUcp zeELH0nEExp%e`A)Wx>*0biTp}jXu8nZG(pQHj7Ge4&?8$b8^T>L0)(FJRR+1Yhof8 zE*ezFYFxWYJF(_Y#JZkh8@9JZ^dC!^Ig!?jua}9sBRR&3Nq%xtwkUsG;rnQOJ-31f zq8Oz3*D8txK$BilGl6;OAqibXlVMY9cX1$;c0dwPvg)ssp8g5^Te7GC`7oLik$y3? z0*M~{+AorI!pium*)_tYaX;6_=n^X%2(BA0b{}?+op2Lm0p$(7KhXg5M#iR<#Ol<> zD#a5~-_&Ls>pv5-4fO$D+goDJzkgd>=f>=g%J`{Bla_O_%kwn1Rcloo{+BO};1MX} zqkzitlNK|wujP?v@h$b(Orl|5Y(71oOmugRLMKWmT4GQ>`y$i(4wZ-4&@->*&88o& z)HtZBfq^8JL$KDL)BWw13@L?U4y7}ZR7xg5s#MK0e;b~3M1h_t=zgwb6PjLJM%ffM z5=tsZJ@|B9^-b;^b4Rs)tVamW?F!&HNRgVP7W3j~?>RAyTK-7%x@&F3Py<`#INQ9c zVQ<;wrBLbQGLP)KVZFN0^|ihO+?P-oId-qR25Zxgxi1@~k$r3Ue{701=hy>NVSvBR znL8UfxDufze)#K1lNO|`y2XJBJ@o+*)`I|E zDE(*mzDEUll+UoctnPO^{awG>agoDp?*MV!_Trds%eA?8l($Ii9UTje9Zi~u&AlC2 zPS9Qvv_wx!%;ibwa|G=b6J(>-WtTKHamwR556>UljLflp!v!JM?LAT@O$%H|`*0dj zZfqi=JrKSpVk)GX%cm{f7|?HX-hE^1FGTj5E`>grdbrv!)a|^%F6b+HH$#EdCe|S-_>ahjq9+ zyhlpDNz!tJHL7RC0lac1u-2(_mH<$&nU2)IyoME=CWmLd4|zUpNdASmFxTNlz_b7S z4!`Cqd!;KR5IR>E&}Eh6SFn!@QFVrf6<}r8u$P!or*x0eu_oO-VU6^T%5rmWv{FJS zWW$cAQ#T~crg$2kI@?2tR~lm7Hr9M|mNN8p4tYobZ$B2pVNM`OHq_G`%S`j3kke)$ zDLqhs*a+T!cj8Hi9RPSQsnm*EBJ8Dsd;T20?pacPLArI^TYI84n-3p&Nu1G$@~E6Xm)Z-X zt_0%ba3oKWsCIxOnWS((5mhTWZW1{T8pc*ziP+W!Yi)YnO1BQYIvQIilmBsK~ z_|e|Y4zL?AZ9!tGmg8FgoiVA+2SLNcH6ELWWe-y-c-}vx9e=3h*67$rF1h>dNiw4b z6ZDFlf0R>kFREVol2Sa`%8clc zAx~(p-hVYnc>!giw^JaAUO-aVKK9?7svJ0wH7_8V6#A_yrVmuzr$NoXaI>6sTC2i5 zbVrBz`_qsB|G3ivpn=9bzaB~`U~~LSBnRY`HxLaE3=*UBf{OeX4n={|kZf-tE9^Mm zZ(de@WXPpAR8egH|1>!H0L@|XL?Plu=(vzAA84=iZzA=i0WGyq6c1wO3vJA7_=^MD zNDle-tHFEs_Yf67pe1bY)xQZu$haR+7fu=m1|qJFh654y2b#kjeEORb>4U+8lm`IO zAT$0z3AkoD*xy{t0YH5?qusx$nq63|UtB71KUtprX21vpn!t6X{!N7k0BNL4ozbIM=O9+&u3K9|m41k3xf`o=ZU4=Rn zs0sI)0r>mn@u5I-m=wryD9{1UnH31BVg*t{0>Yp|6xo1~1U6`$cMD3vkU+S?f%4FL zFeE4(>Mjzp5cdcm4x}m^h=v|;Vh;G_Dt}?fU^tK$*8Q)3N(gxbkelL<+A(yQqWHs2 zoFQ%zKsHI(9@mjIsDHh7xPkSC3Zs`-Ul**I`@`SEL8u~txWfNGS$~$G{#zqCNKYh? z16c6tw=%ym#4QSlPxSPkNgU{^HKhx{jmikCGOYlgjgUVL^~FUA!VSe({m5?tpCOTy^{Tr zoIC>n$p4T@YxQrLxKdVyzs3D8{%>)A#;E`R{U73DY<`KOgNVifF@OjN`yuU6?S5m3 zVH}VL7Srw*gYI8W@}F4je?2wB{%=op1|pL|PZ3c5T6F;c7yu!Fo-y$+|No64;_-jG g+#k`xA4-`!{#zOf@&7|qRXmUw0nZtFgAwq50F diff --git a/examples/BlinkOnStm32Nucleo144Prop/BlinkOnStm32Nucleo144Prop.ino b/examples/BlinkOnStm32Nucleo144Prop/BlinkOnStm32Nucleo144Prop.ino index 398765d..eaa2276 100644 --- a/examples/BlinkOnStm32Nucleo144Prop/BlinkOnStm32Nucleo144Prop.ino +++ b/examples/BlinkOnStm32Nucleo144Prop/BlinkOnStm32Nucleo144Prop.ino @@ -14,9 +14,10 @@ - STM32 Nucleo-144 borads require: STM32duino LwIP and STM32duino STM32Ethernet libraries */ +#if defined(ARDUINO_ARCH_STM32) #include #include -#include "Stm32Nucleo144Prop.h" +//#include "Stm32Nucleo144Prop.h" #include "ArduinoProps.h" #include "Stm32Millis.h" extern Stm32MillisClass Stm32Millis; @@ -119,3 +120,4 @@ void InboxMessage::run(String a) { prop.sendOmit(a); } } +#endif diff --git a/src/ArduinoProps.h b/src/ArduinoProps.h index 3746a9a..0ee99b8 100644 --- a/src/ArduinoProps.h +++ b/src/ArduinoProps.h @@ -10,8 +10,12 @@ #ifndef _ArduinoProps_h #define _ArduinoProps_h -#if !defined(STM32F4xx) && !defined(STM32F7xx) // tested with STM32F767 +#if defined(ARDUINO_ARCH_STM32) +// tested with STM32F767ZI +#include +#include "Stm32Nucleo144Prop.h" +#else #if defined(ARDUINO) && ARDUINO >= 100 #include "arduino.h" @@ -23,9 +27,7 @@ #include "EthernetProp.h" #include "WifiProp.h" -#else // !STM32F4xx && !STM32F7xx -#include -#endif // STM32F4 +#endif #include "PropAction.h" #include "PropData.h" diff --git a/src/BridgeProp.cpp b/src/BridgeProp.cpp index ef073c6..ca19fda 100644 --- a/src/BridgeProp.cpp +++ b/src/BridgeProp.cpp @@ -9,6 +9,10 @@ #include "BridgeProp.h" +#if defined(ARDUINO_ARCH_STM32) +// Don't compile Arduino Bridge library when compiling for STM32 ARCH +#else + BridgeProp::BridgeProp(const char* client_id, const char* in_box, const char* out_box, const char* broker, const int port) : Prop(client_id, in_box, out_box, broker, port) { @@ -26,3 +30,4 @@ void BridgeProp::setBrokerIpAddress(IPAddress ip, uint16_t port) _client.setServer(_brokerIpAddress, port); } +#endif diff --git a/src/BridgeProp.h b/src/BridgeProp.h index 2197f4d..439a33e 100644 --- a/src/BridgeProp.h +++ b/src/BridgeProp.h @@ -9,6 +9,10 @@ #ifndef BRIDGEPROP_H #define BRIDGEPROP_H +#if defined(ARDUINO_ARCH_STM32) +// Don't compile Arduino Bridge library when compiling for STM32 ARCH +#else + #include #include #include "Prop.h" @@ -25,3 +29,4 @@ class BridgeProp : public Prop }; #endif +#endif diff --git a/src/EthernetProp.cpp b/src/EthernetProp.cpp index 7e2eae4..aed2376 100644 --- a/src/EthernetProp.cpp +++ b/src/EthernetProp.cpp @@ -9,6 +9,10 @@ #include "EthernetProp.h" +#if defined(ARDUINO_ARCH_STM32) +// Don't compile Arduino Ethernet library when compiling for STM32 ARCH +#else + EthernetProp::EthernetProp(const char* client_id, const char* in_box, const char* out_box, const char* broker, const int port) : Prop(client_id, in_box, out_box, broker, port) { @@ -19,3 +23,5 @@ void EthernetProp::begin(void(*on_message)(String)) { if (on_message) onInboxMessageReceived = on_message; } + +#endif diff --git a/src/EthernetProp.h b/src/EthernetProp.h index b36d212..cc25d73 100644 --- a/src/EthernetProp.h +++ b/src/EthernetProp.h @@ -9,6 +9,9 @@ #ifndef ETHERNETPROP_H #define ETHERNETPROP_H +#if defined(ARDUINO_ARCH_STM32) +// Don't compile Arduino Ethernet library when compiling for STM32 ARCH +#else #include #include @@ -26,3 +29,4 @@ class EthernetProp : public Prop }; #endif +#endif diff --git a/src/Prop.cpp b/src/Prop.cpp index 5b4c75f..eba6cbf 100644 --- a/src/Prop.cpp +++ b/src/Prop.cpp @@ -8,7 +8,6 @@ */ #include "Prop.h" -//#include #if defined(__AVR__) #include #endif @@ -99,7 +98,7 @@ void Prop::checkDataChanges() void Prop::resetMcu() { -#if defined(ARDUINO_ARCH_SAMD) || defined(STM32F4xx) || defined(STM32F7xx) +#if defined(ARDUINO_ARCH_SAMD) || defined(ARDUINO_ARCH_STM32F0) || defined(ARDUINO_ARCH_STM32F1) || defined(ARDUINO_ARCH_STM32F3) || defined(ARDUINO_ARCH_STM32F4) || defined(ARDUINO_ARCH_STM32L4) || defined(ARDUINO_ARCH_STM32F7) NVIC_SystemReset(); #elif defined(ARDUINO_ARCH_AVR) || defined(__AVR__) wdt_enable(WDTO_15MS); diff --git a/src/Prop.h b/src/Prop.h index d8ce097..1df8c46 100644 --- a/src/Prop.h +++ b/src/Prop.h @@ -9,7 +9,9 @@ #ifndef PROP_H #define PROP_H -#if !defined(STM32F4xx) && !defined(STM32F7xx) // tested with STM32F767 +#if defined(ARDUINO_ARCH_STM32) +// tested with STM32F767ZI +#else #if defined(ARDUINO) && ARDUINO >= 100 #include "arduino.h" @@ -19,7 +21,7 @@ #include -#endif // !STM32F4xx && !STM32F7xx +#endif #include #include diff --git a/src/PropAction.cpp b/src/PropAction.cpp index 90dc22c..ca33696 100644 --- a/src/PropAction.cpp +++ b/src/PropAction.cpp @@ -9,8 +9,19 @@ #include "PropAction.h" -#if defined(STM32F4xx) || defined(STM32F7xx) +#if defined(ARDUINO_ARCH_STM32) +// tested with STM32F767ZI +#include #include "Stm32Millis.h" + +#else + +#if defined(ARDUINO) && ARDUINO >= 100 +#include "arduino.h" +#else +#include "WProgram.h" +#endif + #endif PropAction::PropAction() diff --git a/src/Stm32Millis.cpp b/src/Stm32Millis.cpp index 9599586..cd097bb 100644 --- a/src/Stm32Millis.cpp +++ b/src/Stm32Millis.cpp @@ -6,11 +6,11 @@ Implement millis() missing in STM32duino. */ -#if defined(STM32F4xx) || defined(STM32F7xx) +#if defined(ARDUINO_ARCH_STM32) #include "Stm32Millis.h" unsigned long Stm32MillisClass::milliseconds = 0; Stm32MillisClass Stm32Millis; -#endif // STM32F4xx|STM32F7xx +#endif diff --git a/src/Stm32Millis.h b/src/Stm32Millis.h index f259c73..9d67ab1 100644 --- a/src/Stm32Millis.h +++ b/src/Stm32Millis.h @@ -11,7 +11,7 @@ #ifndef STM32MILLIS_H #define STM32MILLIS_H -#if defined(STM32F4xx) || defined(STM32F7xx) +#if defined(ARDUINO_ARCH_STM32) #include @@ -44,5 +44,5 @@ class Stm32MillisClass { extern Stm32MillisClass Stm32Millis; -#endif // STM32F4xx|STM32F7xx +#endif // STM32 #endif diff --git a/src/Stm32Nucleo144Prop.cpp b/src/Stm32Nucleo144Prop.cpp index c588522..2a5b5e7 100644 --- a/src/Stm32Nucleo144Prop.cpp +++ b/src/Stm32Nucleo144Prop.cpp @@ -6,6 +6,7 @@ Prop for Arduino with Ethernet shield. */ +#if defined(ARDUINO_ARCH_STM32) #include "Stm32Nucleo144Prop.h" @@ -19,3 +20,5 @@ void Stm32Nucleo144Prop::begin(void(*on_message)(String)) { if (on_message) onInboxMessageReceived = on_message; } + +#endif diff --git a/src/WifiProp.cpp b/src/WifiProp.cpp index 99f5907..4f09596 100644 --- a/src/WifiProp.cpp +++ b/src/WifiProp.cpp @@ -9,6 +9,10 @@ #include "WifiProp.h" +#if defined(ARDUINO_ARCH_STM32) +// Don't compile Arduino WiFi libraries when compiling for STM32 ARCH +#else + #if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(ARDUINO_SAMD_MKRWIFI1010) || defined(ARDUINO_SAMD_NANO_33_IOT) || defined(ARDUINO_SAMD_MKRVIDOR4000) @@ -26,3 +30,4 @@ void WifiProp::begin(void(*on_message)(String)) #endif +#endif diff --git a/src/WifiProp.h b/src/WifiProp.h index b87157a..12757b3 100644 --- a/src/WifiProp.h +++ b/src/WifiProp.h @@ -9,6 +9,9 @@ #ifndef WIFIPROP_H #define WIFIPROP_H +#if defined(ARDUINO_ARCH_STM32) +// Don't compile Arduino WiFi libraries when compiling for STM32 ARCH +#else #if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(ARDUINO_SAMD_MKRWIFI1010) || defined(ARDUINO_SAMD_NANO_33_IOT) || defined(ARDUINO_SAMD_MKRVIDOR4000) @@ -30,6 +33,5 @@ private: }; #endif - - +#endif #endif