From 2b9c62df0eb8f72eb91bb3facc8fc2c5feba6b7f Mon Sep 17 00:00:00 2001 From: Ivan Svogor Date: Thu, 11 May 2017 01:57:41 +0000 Subject: [PATCH] update from solo - xbee fix --- launch/rosbuzz-solo.launch | 26 +++++++++++++++++++------- script/testflockfev.bdb | Bin 64884 -> 68074 bytes script/testflockfev.bo | Bin 3676 -> 3676 bytes script/testflockfev.bzz | 9 +++++---- script/testsolo.bdb | Bin 65144 -> 68524 bytes src/roscontroller.cpp | 16 +++++++++++----- 6 files changed, 35 insertions(+), 16 deletions(-) diff --git a/launch/rosbuzz-solo.launch b/launch/rosbuzz-solo.launch index 3564ce1..054d18b 100644 --- a/launch/rosbuzz-solo.launch +++ b/launch/rosbuzz-solo.launch @@ -20,23 +20,35 @@ - + + + + + + + + + + + + - + - - - - - + + + + + diff --git a/script/testflockfev.bdb b/script/testflockfev.bdb index 9eb35cf7a6917326c5e69a8d1e19e348c33c0907..76c007539283d5847bada16ccac08b5a6e331b8e 100644 GIT binary patch literal 68074 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 D9EHh~ literal 64884 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 KN1U6qTmKib#r{|T diff --git a/script/testflockfev.bo b/script/testflockfev.bo index 3cb83de1bcd58d79ddabd6bd34d7d4115e4f8bfe..44e24c101645b38d3aeb82e7f0452cec5e55f235 100644 GIT binary patch delta 48 xcmca3b4O-FIg9cF2MGlU1_lNNNgyGiAO$4l7#JKJB^0C~%mWUaXR#dO1OV{92_^sl delta 48 vcmca3b4O-FIg7G`gM@+v0|SGCB#@9$kOGo&K%S$7f;5CV!Ey5}mP4EX-ZThz diff --git a/script/testflockfev.bzz b/script/testflockfev.bzz index 463ca52..92a4fc0 100644 --- a/script/testflockfev.bzz +++ b/script/testflockfev.bzz @@ -1,6 +1,7 @@ # We need this for 2D vectors # Make sure you pass the correct include path to "bzzc -I ..." -include "vec2.bzz" +#include "vec2.bzz" +include "/home/ubuntu/buzz/src/include/vec2.bzz" #################################################################################################### # Updater related # This should be here for the updater to work, changing position of code will crash the updater @@ -11,12 +12,12 @@ function updated_neigh(){ neighbors.broadcast(updated, update_no) } -TARGET_ALTITUDE = 3.0 +TARGET_ALTITUDE = 5.0 CURSTATE = "TURNEDOFF" # Lennard-Jones parameters -TARGET = 10.0 #0.000001001 -EPSILON = 18.0 #0.001 +TARGET = 12.0 #0.000001001 +EPSILON = 6.0 #0.001 # Lennard-Jones interaction magnitude function lj_magnitude(dist, target, epsilon) { diff --git a/script/testsolo.bdb b/script/testsolo.bdb index d25ea48913a362e840bf458b3b0f8a48eb19684a..e3f057f93e9187ddb79beb03aa2646dcb0363b36 100644 GIT binary patch literal 68524 zcmb`PcbM1JvBnogutQYr;^Hog3ri8DC>BHz6$JzfdR58_QY{n%7)xX^m#V0MiD*Jm zKmiLjhzcs8kFY+9H-d?Z8c}1pw%D#l@0)YyeeOK|b-uiF{`u`c^Zw?{d}hv>vkNsl zmz2~k`M<@_ijvktuNXDB^|(RfE+0Ft^`LPRC$=6ly1MnS%d1C@yL52ts|Q!NZ8d1( z#Qk^;my|Ryn|{d zb0ydIO-EzHg0?5u`+t1)D`>kLNIt-9I@_lZzEQ3)SdfC;E0C)+uTIgu8@O9Z$sm(C zSeIK5xnU-=hc0&*>g*nqA$mgWdZH22yP`e$VHjLut~Ahh)QFEr_9m=YA`#IhN#-dal3q>jDW8H7Vv$+ykj#HHv2dIv`aowl$%RJ zRLVj0y(Saj-P^$DHIoa#=Uj&m_MKL4&bA}p$Nj>UT-)VBzURlzSl?scQ*9do-REKq zMKesU)IJ4#o`D>nC|KWu+!XBae)B3|#yT5BKW1_)Tfw`705{(h4%B1!r7$PG54gLU z3#gH_a^XG$aC62&`U=^uaD~BJb?*0`7(1UWaCOEDwvgOs5sG;h4cs5n66B^jk^>5( zk0UwY3jY}70>{0Z-Fyb+v~sEV%2feR`CQvcFsQQcD|-F?K&YUTfLUivJsQXhcu zrJ;q%3UYICVgwFUpMhk)Gz8Sy;{fDI+hjmt+~Uwfdrm7CpHk$GO^p3K*S5x?cW}Y) z{m`LDd~&~cKR0=uV&5yUGTu#IN9b~IxXJ4*U2fOd!gv{SBh0IS$?FbRXZ*t%Ar&_O z-@rj`777EEn^w^q!c#EdFKpJ0hkOj2Mc7QB! z+^Yl<_u6LJ@`TL(HkR27!QC+Pj9Dqv*o<%Tn+ zBDVxqy5WpF%e6fqwtN=5;VfYC{y7%VYG5?eat7tJ1O%Rk97jjyOpv=78uy!5?1F;a z`M7ZN5hUQZ>fhmB!Qbwpsil<**@1wJr%u4h-8FU$D?u8k*^YQ)65{?(r13$M3%FN2 z89O(9@6yN;$W3EY3@tl4H%)dF1yPhrcW9l1&?*Y+Twcc|GQl4%Lay%us! zOr}hidk1orCUcf9*Uc41!2SI$0Kx}_0Fu8(VLW7;WCsya@sukJk}Sy0L1DnbwAcl5 zA$t}EoSTr*v;&mv&q9Vv`h1^J!VKWotj(26-O80Ikc$;Z50Vnk)$OVpFZCq2~1we@1 z?a;X2HXCqaUWA(E6vvCF;N5zm3sj;D@aj&;a;x!N*9G|ZZ@IRsTo)*{$mZI5Rg zY#@`C5WZc2-ZYazBvrX#kYiy4pjQjIz`~dfmzLQk5k_^hKjGxy0|E;pH;o${whUCR zZF68-X72L<%(a~f+bXjydH{V1+pcC?)aS-H@cDi8S-|#2$gz1a6oT9tZp;jLGiVj=qg za+MaSp7tqtw-6{yGMNC#o^xqrGZVaKn09HjX)(|EeM;i z*$I%VHt$O9Q;<6ux#KfKD_yP~N^!Bt1e|XJ(JKP4@E779%RhrC`p>AJhV5|M87~C6 zygv-0I+!hv*tCS4O>_tZ5cL-1c+n5=t_z6zP26TLhf6a}j(uK;U3&-U{w6EP{Q+{z zOeWxpGYGstZgK&gY-jY@<4lg{TQ0L3-Q2)qI@h)}t_fxKz1UG&xwhZJmUn-gScPnR zA!cpNCZPN50raND$z1`tTTBkkBrO5GS0TsCdO%_P42{6cdR^et#Wsl_)5=Aljl-uX z0=L7q%D%7Yt^PZQ9&bpwK9}PT!m*RKLUMaMk^|b*67=Lr78PtVEy25gzlI00@&e?Z zGOuu}RK1%mAkfsMkv9Y(P@h7sx$TG~3vx?c8Us2=9mM@%^A5^s3Es8D4mq!M(&c7B z?m3eQD1ikai*1sx2f4*P9370ualmg1=K#=_wzHzg@>CF2VYb|ckh6o`a8jn{>{gev zfSc(E#2pT%#ZO_ga}oD;CdX>bMW8?GjiUn*$hCbAw!`gv8I@ey$H84kvkkalUXL(d zYI3XwA)y0Js~*UjN5JZk8noO*}1u#;xx9AArxFV&UEmH16p2{}qAcc4+ZD z#~78|R{Jm5cD2Ot?w4yjP^h5wLIs^0J11;ML5{W%;K#HCMt|ihDBueBI^^y)uXt|~ zyqgc?mzx}v(-P!r(S2VunE>y0cNGLM)5@iBv#X$@mzDOef{NM>0?B>NS6sIX`Mg1> zg68O_9KQLFnuSb$3AyIxKJSTw+?yo?9fyo7UR}WS2 zaGYFQ#Gfh|MO6(z&oLK@+CC545j$wx!ogjxhu~(&RhUe`0Qr@x zm4Nx=aGW~)Wmy2+^&O1?H^RAK=Q)cV2RVVpC7_YVB06?jxinr01D?Hw&8wo<@F5P+qNBr2$k|}~-hgxE zBgk=}4B)+|Lx3lzkhA^a(lpyF=LbRVUN=yJhO`8^&Cqz!WO(5e?1J>qx| z*zDU5Q2dyd;N6}8l+O$SgIz}ey2iX>Zxp;+j@vztC$O4UE}-LJKollq;V~i;5uky(^!9N55{d8%BUxzO<3qT-#<20on?HPJ`TF z%UQqy{2AmpCk8wf^u-SOR1k0%x*ojWYMTv+-TesIa+3>qDj4H<=RYzQGW$ozdzE=9 z$i0E%f(^0g=-3&x!da_mt$Yrm#+v&9)AKowsB%3jhk~eSCKE9JEdx<2Ob*Iv2|3$} zgl#k#oNKCFBOt(+2i_QR+t!;7AHtn$d$Pl)D0%~N5FKS(59lCYfW}{&TtEj|1&v82 z7eM1-U}k!pciSPy$B2Mt{<@so1+sbOiS=?Ja+iF$u!pG7UASxXEJQlf_LvYxWQ^#xq!BGY2+nY zaAg+chQ#gc0@OJN>T;76yqoN(;GbUzau3ChKNB2ehwGa?7*upOnW8tuQ{4!|){{%r zH$Z?hM?mRa=n!bCN9710Fx_N$hzJPW1i9Nx4u@x2g51N7sDRkL1)?^ZR{?#diyL7$ zdkC971c367F7abpxsY|jVa5@rt=S5$tN{u&CWDNoCCHUI$O7a(h6V>){;ops?f_5` zICE@++$M_|(10|Afhb^RxuH`y7qLN093QqRPxG{(dc&ilbfJ1M2Jt$Z-q{xcKx(C*dUC zN{{MC*G(Kz03@y4#&DJ+s!DF&asee@>EI5K`vP(c%{%5>pz$!k&5=Feh~MsNCBVDW zU9Ip@M%e7rm{)iWF8XkJ6Y7lf3Q~}k;L854eAx1G%cqMgpHp;Kc1QWNFqwdh&t_!=ZE)2X(9F-n*|5Ym8^C*GS3UvFd<_6S!o1^AlS{?NFyM|D_gveRsMQWT_`TPF zWd02&Z}qv~yA8H1rV9Ihp{N$Sd4+W@$lVz`V4UyJ3t(ju(0jsS7Erbipw+H3Ii^I2 z-6H}~zY&Of+Y!}FCu)f!s;Ms5(M@6je+56!0UGdoy<3p?z|pD30SZUc5{P;bfUY;0 z0Nx*Ufa1rra@*Fm0-$wpo{hKf<9$Mi%3#QGdhTqpg50cF1fFt}7+);}?<#P_ae5|E zxjE~DB$ru$n%HNq?RCg^f3qpd%4o34;Uu814srSJt>?QHT$*k&0l%)e6>_spju&hp z-`_xP;V0=d9hXCv}nW8MX{%hs;AOHEeT>}`m8s)uQ*>gq8RtwlWRLlpHK(PYs+KjwG%*PKMQWa zyfztHNQ%HwLz?T%!6p8rc|fZA(E^ zH%mQ_nq1rQZmL1oRq@#s37TLsh=wXR(&hVXUG8Pb)tF4FE_V!WAJgOH?tmPJBsiLu zP$hAE}ps}Z;@eB)vP`3L!8Uy$g2pFIhQG%arIZmN|4*=Xk>rSCF)y8BQKA+wrdbs zjz6gWv~q3BK=P?(1NRHru8f^^wgJ84&4oJlDP-gM*lFTspts7rf^u4dcjbtCcaz~} zb945eu;p-4G~b`VmV6zgZ{rb%Kr>zLZ6MIoWZ2JzAa{kvz&N=jkh{#}0uXos8V{Hp z_MMin*`v@w&M}#yL|u#yQf9VHV=j$NK@_jmlb@apFB%?2z)bT4QG z&N^2?jtf4iZ^wJUWo>jU@2^2_vIQJ8q$R}tI5#I9smtB%%7Hv-K{GY{OtNPKzo`D zdQ(~g0?W}hI87pbs@yoo`}w+DEvV#h8t~FK+wmT-*+Br5^Xied*<3(pIzWrU{iOpm z;2)8!c7XCA7Kl0nMDe+Ur6x8(^MY|fspSSFw@Rt0;2MU ztCfI1GVYA%OgHbU^vy1Er5Et4u3cT}p@XF*q~aLFpYIa^weln6YRxOwis0RV*h>Bj zhO=_>uINL39c+hvou9eoGuV}FrG0;{?FFv%`kJi}(IzOp7A6yLk2*QFRz?BtrRH70 z+x0-;^Nh&_98>Edx8CFeX1&)yBU8asFPDm)1R7t2EuRWl^10vp5yIHpLIC&E5@?)= z&V8-P1RMli9E~k??>2+Rz)9>6*dbpYKvG&l>^3+W+0+ENodu#c3Pjz8YYAU1iqg0y zc8dELaPx))Fx3RT>hK9T`0oThtIaELu6kEj$oD28-?t0-{tmW$rK-|Hu-4(je=jIh zP;Xqv_y|Cf1-VBcH`F#6a26g2q66pC6L4bjO#zOkm3xTHhwXl5!)urjs9iwgK_-VE z)5>+F76u)6(Do=dP@&WdeeZ184lo;@qq#m$L7NJkp3ZjI20RTMfnY@Yu*L?*ET1*lIQW5%j^Q!b~jf7 z?moj&wq+()X`i{S%t7g~O|$#t+FlYnj8&kLIRP}cZ3r|@b&Vn5Umm{eN-sceG-_q3 zZ8G3II}Ww-sLAmF5@I(5R6b*J0hRnWG<9Yc=%DA7VhhT zPvC6V9ow1li=7Gi9s?ThGdaXNEkSOh8^)UJa&I_%=v{6aN5Y`oTqxS#1^@w`va}VV z@;Mq32dYMTRBmuY1svX6fdI#QzUT>?{Sz8e;C!|zmZ(vnqRLVLN7KqB>R)Iofn(P| zK-T0Jt_X2o4>{fe0;afCI826`cLB%L>khJjJJ@^&8I;o!Vpr=R<8dX(?GDIz=P!Et zY=$i-G1Pflxq!9@pzJf)Q6bx(9NewURtUicM`I^l?mW;q&}0H8g4MBbH%6i+n0JTk zn_U5B0*AAGP#}xqVpk7j)tX#DC7*(8Asxy2P|sV?^+nEjo}1PmN! zg4r1+7f|mHLgP-8+ezQ-c;xOrlfi8#Eg==1T?qti_8m8KvOseo`x;d60v0gnO$HTw zItUo_{sFlu7H|Bh#{Db@8LLr9;{-Rk2iU6)2~HaCr0Jzf1wH<kh8atGd>;gUl|E<_afMQItVDA%{YBFSo#70Z2&4b)o}*NrDBXD z3SJc=Y71;R5wgGKe(%npkxv$F?0ba-UFP8CHUznikgGJWPSU;G=4cGK_$_uc29(}u z7*;sK@`%q(<1#ns5IrI8$Gbs?f0di-N?k`(z%$b(hd^f?fs1frbI@Vu76P>va>L9k z9wLHVIW+iAP^xeCK=6K#$pqZ4_e4e4nq0u$|4PU`V{!qPm(x)KOa*>SE0@{jFu25Q z0;rhp#t?SFTvv{AV@N;Gan|KQD0sIQa`%#L zmJL~uyUOt%a9k{Kkg>RPA#3X(Yim0cb~eXB7V!7J{|(5dm{$SUvOaDM3Ai*q=9t9@ zk(Lm<>#)Q7OeWxo@>G<-VnG7Zdf U5)YW0`Z{IuiNU&N(E82|tP literal 65144 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