diff --git a/.gitignore b/.gitignore index d343f30e..4db4998c 100644 --- a/.gitignore +++ b/.gitignore @@ -105,3 +105,4 @@ venv.bak/ .vscode/settings.json Server/tests.py Drone/test_animation/ +Drone/animation.csv diff --git a/.gitmodules b/.gitmodules index 2be8bcab..dee1d4bd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,7 @@ [submodule "Drone/FlightLib"] path = Drone/FlightLib url = https://github.com/artem30801/CleverFlightLib.git + #url = https://github.com/goldarte/CleverFlightLib.git [submodule "blender-csv-animation"] path = blender-csv-animation url = https://github.com/artem30801/blender-csv-animation diff --git a/Drone/animation.csv b/Drone/animation.csv deleted file mode 100644 index 0be91e74..00000000 --- a/Drone/animation.csv +++ /dev/null @@ -1,320 +0,0 @@ -1,0.0,0.0,1.5,1,0,255,0,0.0 -2,0.0009210034622810781,0.0,1.5,0.009210034622810781,0,254,0,0.0 -3,0.003692696802318096,0.0,1.5,0.02771693340037018,2,252,0,0.0 -4,0.008326655253767967,0.0,1.5,0.04633958451449871,6,248,0,0.0 -5,0.014832355082035065,0.0,1.5,0.06505699828267097,10,244,0,0.0 -6,0.02321694605052471,0.0,1.5,0.08384590968489647,16,238,0,0.0 -7,0.033485013991594315,0.0,1.5,0.10268067941069603,24,230,0,0.0 -8,0.04563836008310318,0.0,1.5,0.12153346091508865,32,222,0,0.0 -9,0.059675708413124084,0.0,1.5,0.14037348330020905,42,212,0,0.0 -10,0.07559249550104141,0.0,1.5,0.15916787087917328,53,201,0,0.0 -11,0.09338056296110153,0.0,1.5,0.1778806746006012,65,189,0,0.0 -12,0.1130278930068016,0.0,1.5,0.19647330045700073,78,176,0,0.0 -13,0.13451842963695526,0.0,1.5,0.21490536630153656,91,163,0,0.0 -14,0.157831609249115,0.0,1.5,0.2331317961215973,105,149,0,0.0 -15,0.18294233083724976,0.0,1.5,0.25110721588134766,120,134,0,0.0 -16,0.20982064306735992,0.0,1.5,0.2687831223011017,134,120,0,0.0 -17,0.23843136429786682,0.0,1.5,0.28610721230506897,149,105,0,0.0 -18,0.26873406767845154,0.0,1.5,0.30302703380584717,163,91,0,0.0 -19,0.30068275332450867,0.0,1.5,0.3194868564605713,176,78,0,0.0 -20,0.3342258930206299,0.0,1.5,0.33543139696121216,189,65,0,0.0 -21,0.3693060278892517,0.0,1.5,0.35080134868621826,201,53,0,0.0 -22,0.4058598279953003,0.0,1.5,0.36553800106048584,212,42,0,0.0 -23,0.44381824135780334,0.0,1.5,0.3795841336250305,222,32,0,0.0 -24,0.48310622572898865,0.0,1.5,0.392879843711853,230,24,0,0.0 -25,0.5236428380012512,0.0,1.5,0.40536612272262573,238,16,0,0.0 -26,0.565341591835022,0.0,1.5,0.4169875383377075,244,10,0,0.0 -27,0.6081106662750244,0.0,1.5,0.4276907444000244,248,6,0,0.0 -28,0.6518529057502747,0.0,1.5,0.43742239475250244,252,2,0,0.0 -29,0.6964662075042725,0.0,1.5,0.446133017539978,254,0,0,0.0 -30,0.7418442964553833,0.0,1.5,0.4537808895111084,255,0,0,0.0 -31,0.7878764271736145,0.0,1.5,0.460321307182312,254,0,0,0.0 -32,0.8344489336013794,0.0,1.5,0.4657250642776489,251,0,3,0.0 -33,0.8814448118209839,0.0,1.5,0.4699587821960449,246,0,8,0.0 -34,0.9287447929382324,0.0,1.5,0.47299981117248535,240,0,14,0.0 -35,0.9762277603149414,0.0,1.5,0.47482967376708984,232,0,22,0.0 -36,1.0237720012664795,0.0,1.5,0.47544240951538086,222,0,32,0.0 -37,1.0712552070617676,0.0,1.5,0.47483205795288086,211,0,44,0.0 -38,1.1185550689697266,0.0,1.5,0.47299861907958984,198,0,56,0.0 -39,1.165550947189331,0.0,1.5,0.4699587821960449,184,0,71,0.0 -40,1.2121233940124512,0.0,1.5,0.46572446823120117,169,0,86,0.0 -41,1.258155345916748,0.0,1.5,0.46031951904296875,154,0,102,0.0 -42,1.3035335540771484,0.0,1.5,0.4537820816040039,137,0,119,0.0 -43,1.3481470346450806,0.0,1.5,0.4461348056793213,121,0,135,0.0 -44,1.3918890953063965,0.0,1.5,0.4374206066131592,105,0,152,0.0 -45,1.4346582889556885,0.0,1.5,0.4276919364929199,89,0,168,0.0 -46,1.476357102394104,0.0,1.5,0.4169881343841553,74,0,183,0.0 -47,1.5168935060501099,0.0,1.5,0.4053640365600586,60,1,198,0.0 -48,1.5561814308166504,0.0,1.5,0.3928792476654053,47,1,210,0.0 -49,1.5941399335861206,0.0,1.5,0.37958502769470215,36,1,222,0.0 -50,1.6306936740875244,0.0,1.5,0.3655374050140381,26,1,232,0.0 -51,1.665773868560791,0.0,1.5,0.350801944732666,18,2,240,0.0 -52,1.6993169784545898,0.0,1.5,0.3354310989379883,12,2,246,0.0 -53,1.7312660217285156,0.0,1.5,0.3194904327392578,7,2,251,0.0 -54,1.7615686655044556,0.0,1.5,0.3030264377593994,4,2,254,0.0 -55,1.7901792526245117,0.0,1.5,0.2861058712005615,4,3,255,0.0 -56,1.8170576095581055,0.0,1.5,0.2687835693359375,4,4,254,0.0 -57,1.8421683311462402,0.0,1.5,0.25110721588134766,6,6,252,0.0 -58,1.8654816150665283,0.0,1.5,0.23313283920288086,8,10,248,0.0 -59,1.886972188949585,0.0,1.5,0.2149057388305664,12,15,243,0.0 -60,1.9066195487976074,0.0,1.5,0.1964735984802246,16,22,237,0.0 -61,1.9244072437286377,0.0,1.5,0.17787694931030273,22,30,229,0.0 -62,1.9403245449066162,0.0,1.5,0.15917301177978516,28,39,220,0.0 -63,1.9543616771697998,0.0,1.5,0.14037132263183594,36,50,210,0.0 -64,1.9665148258209229,0.0,1.5,0.12153148651123047,44,61,198,0.0 -65,1.9767827987670898,0.0,1.5,0.10267972946166992,53,74,186,0.0 -66,1.9851677417755127,0.0,1.5,0.08384943008422852,63,87,173,0.0 -67,1.991673231124878,0.0,1.5,0.06505489349365234,73,101,159,0.0 -68,1.996307134628296,0.0,1.5,0.04633903503417969,83,115,144,0.0 -69,1.9990792274475098,0.0,1.5,0.027720928192138672,94,130,130,0.0 -70,2.0,0.0,1.5,0.009207725524902344,104,145,115,0.0 -71,2.0,0.0008948460454121232,1.5,0.008948460454121232,115,159,101,0.0 -72,2.0,0.0035877127666026354,1.5,0.026928667211905122,125,173,87,0.0 -73,2.0,0.008089729584753513,1.5,0.04502016818150878,134,186,74,0.0 -74,2.0,0.014410044997930527,1.5,0.06320315413177013,143,198,61,0.0 -75,2.0,0.022555628791451454,1.5,0.08145583793520927,151,210,50,0.0 -76,2.0,0.03253103047609329,1.5,0.09975401684641838,159,220,40,0.0 -77,2.0,0.044338203966617584,1.5,0.11807173490524292,165,229,31,0.0 -78,2.0,0.057976216077804565,1.5,0.1363801211118698,171,237,23,0.0 -79,2.0,0.0734410285949707,1.5,0.15464812517166138,176,243,16,0.0 -80,2.0,0.09072526544332504,1.5,0.1728423684835434,179,248,11,0.0 -81,2.0,0.10981795936822891,1.5,0.1909269392490387,182,252,8,0.0 -82,2.0,0.13070426881313324,1.5,0.20886309444904327,183,254,6,0.0 -83,2.0,0.15336529910564423,1.5,0.22661030292510986,184,255,5,0.0 -84,2.0,0.17777779698371887,1.5,0.24412497878074646,184,255,5,0.0 -85,2.0,0.20391391217708588,1.5,0.26136115193367004,184,255,5,0.0 -86,2.0,0.2317410707473755,1.5,0.2782715857028961,184,255,5,0.0 -87,2.0,0.261221706867218,1.5,0.2948063611984253,184,255,5,0.0 -88,2.0,0.29231300950050354,1.5,0.3109130263328552,184,255,5,0.0 -89,2.0,0.3249669075012207,1.5,0.32653898000717163,184,255,5,0.0 -90,2.0,0.3591298758983612,1.5,0.34162968397140503,184,255,5,0.0 -91,2.0,0.3947429656982422,1.5,0.3561308979988098,184,255,5,0.0 -92,2.0,0.4317415952682495,1.5,0.36998629570007324,184,254,6,0.0 -93,2.0,0.47005558013916016,1.5,0.38313984870910645,186,254,10,0.0 -94,2.0,0.5096092224121094,1.5,0.3955364227294922,189,254,15,0.0 -95,2.0,0.5503215193748474,1.5,0.40712296962738037,194,254,23,0.0 -96,2.0,0.5921061635017395,1.5,0.4178464412689209,199,254,32,0.0 -97,2.0,0.6348720192909241,1.5,0.4276585578918457,204,254,44,0.0 -98,2.0,0.6785231232643127,1.5,0.4365110397338867,211,254,57,0.0 -99,2.0,0.722959041595459,1.5,0.4443591833114624,217,254,71,0.0 -100,2.0,0.7680755853652954,1.5,0.45116543769836426,225,254,87,0.0 -101,2.0,0.8137648105621338,1.5,0.4568922519683838,232,254,105,0.0 -102,2.0,0.8599162101745605,1.5,0.4615139961242676,238,253,123,0.0 -103,2.0,0.9064159989356995,1.5,0.46499788761138916,244,253,142,0.0 -104,2.0,0.953149676322937,1.5,0.4673367738723755,250,252,162,0.0 -105,2.0,1.0,1.5,0.4685032367706299,253,252,182,0.0 -106,2.0,1.046850562095642,1.5,0.4685056209564209,255,251,202,0.0 -107,2.0,1.0935838222503662,1.5,0.4673326015472412,192,135,234,0.0 -108,2.0,1.1400837898254395,1.5,0.4649996757507324,127,20,255,0.0 -109,2.0,1.1862350702285767,1.5,0.46151280403137207,123,23,255,0.0 -110,2.0,1.231924295425415,1.5,0.4568922519683838,120,28,255,0.0 -111,2.0,1.277040958404541,1.5,0.45116662979125977,119,35,255,0.0 -112,2.0,1.321476936340332,1.5,0.44435977935791016,118,42,255,0.0 -113,2.0,1.3651278018951416,1.5,0.4365086555480957,117,51,255,0.0 -114,2.0,1.4078938961029053,1.5,0.4276609420776367,116,59,255,0.0 -115,2.0,1.4496785402297974,1.5,0.4178464412689209,115,68,255,0.0 -116,2.0,1.4903907775878906,1.5,0.4071223735809326,115,77,255,0.0 -117,2.0,1.5299443006515503,1.5,0.3955352306365967,115,86,255,0.0 -118,2.0,1.56825852394104,1.5,0.38314223289489746,114,95,255,0.0 -119,2.0,1.6052569150924683,1.5,0.3699839115142822,114,104,255,0.0 -120,2.0,1.6408703327178955,1.5,0.35613417625427246,114,113,255,0.0 -121,2.0,1.6750332117080688,1.5,0.3416287899017334,114,122,255,0.0 -122,2.0,1.7076870203018188,1.5,0.3265380859375,114,131,255,0.0 -123,2.0,1.7387782335281372,1.5,0.3109121322631836,114,140,255,0.0 -124,2.0,1.7682589292526245,1.5,0.29480695724487305,113,148,255,0.0 -125,2.0,1.796086072921753,1.5,0.2782714366912842,113,156,255,0.0 -126,2.0,1.8222219944000244,1.5,0.26135921478271484,113,164,255,0.0 -127,2.0,1.8466346263885498,1.5,0.2441263198852539,113,171,255,0.0 -128,2.0,1.869295597076416,1.5,0.2266097068786621,112,178,255,0.0 -129,2.0,1.8901820182800293,1.5,0.2088642120361328,112,185,255,0.0 -130,2.0,1.9092748165130615,1.5,0.19092798233032227,111,192,255,0.0 -131,2.0,1.9265587329864502,1.5,0.17283916473388672,110,198,255,0.0 -132,2.0,1.942023515701294,1.5,0.1546478271484375,110,203,255,0.0 -133,2.0,1.9556615352630615,1.5,0.13638019561767578,109,208,255,0.0 -134,2.0,1.9674689769744873,1.5,0.11807441711425781,108,212,255,0.0 -135,2.0,1.9774444103240967,1.5,0.09975433349609375,107,216,254,0.0 -136,2.0,1.9855899810791016,1.5,0.08145570755004883,105,219,252,0.0 -137,2.0,1.9919102191925049,1.5,0.0632023811340332,104,223,249,0.0 -138,2.0,1.9964122772216797,1.5,0.04502058029174805,102,226,244,0.0 -139,2.0,1.9991049766540527,1.5,0.02692699432373047,100,230,238,0.0 -140,2.0,2.0,1.5,0.008950233459472656,99,233,231,0.0 -141,2.0,2.0,1.5012216567993164,0.012216567993164062,97,235,223,0.0019190717721357942 -142,2.0,2.0,1.5049092769622803,0.03687620162963867,95,238,213,0.00771155022084713 -143,2.0,2.0,1.5110845565795898,0.0617527961730957,93,240,203,0.017411580309271812 -144,2.0,2.0,1.5197502374649048,0.08665680885314941,91,243,191,0.031023535877466202 -145,2.0,2.0,1.5308860540390015,0.1113581657409668,88,245,179,0.04851561784744263 -146,2.0,2.0,1.5444444417953491,0.13558387756347656,86,246,166,0.06981320679187775 -147,2.0,2.0,1.5603466033935547,0.15902161598205566,84,248,153,0.09479217231273651 -148,2.0,2.0,1.5784779787063599,0.18131375312805176,82,249,140,0.12327291071414948 -149,2.0,2.0,1.5986857414245605,0.20207762718200684,80,250,126,0.1550152599811554 -150,2.0,2.0,1.6207765340805054,0.22090792655944824,78,251,113,0.1897154003381729 -151,2.0,2.0,1.6445159912109375,0.2373945713043213,76,252,100,0.22700536251068115 -152,2.0,2.0,1.669630765914917,0.2511477470397949,74,253,88,0.2664554715156555 -153,2.0,2.0,1.6958118677139282,0.2618110179901123,72,253,76,0.30758047103881836 -154,2.0,2.0,1.7227210998535156,0.269092321395874,71,254,66,0.34984952211380005 -155,2.0,2.0,1.75,0.27278900146484375,70,254,56,0.39269909262657166 -156,2.0,2.0,1.7772789001464844,0.27278900146484375,68,254,48,0.4355486035346985 -157,2.0,2.0,1.8041882514953613,0.26909351348876953,67,254,41,0.47781771421432495 -158,2.0,2.0,1.8303693532943726,0.2618110179901123,67,254,35,0.5189427137374878 -159,2.0,2.0,1.8554840087890625,0.2511465549468994,66,254,30,0.5583928823471069 -160,2.0,2.0,1.8792234659194946,0.2373945713043213,66,254,27,0.5956827998161316 -161,2.0,2.0,1.9013142585754395,0.22090792655944824,65,254,25,0.6303829550743103 -162,2.0,2.0,1.9215221405029297,0.20207881927490234,65,255,25,0.6621253490447998 -163,2.0,2.0,1.9396533966064453,0.18131256103515625,65,254,25,0.6906059980392456 -164,2.0,2.0,1.9555556774139404,0.15902280807495117,66,254,25,0.7155850529670715 -165,2.0,2.0,1.969114065170288,0.13558387756347656,67,254,25,0.7368826866149902 -166,2.0,2.0,1.9802498817443848,0.1113581657409668,68,254,25,0.7543747425079346 -167,2.0,2.0,1.9889154434204102,0.0866556167602539,70,254,25,0.7679866552352905 -168,2.0,2.0,1.9950904846191406,0.06175041198730469,72,254,25,0.777686595916748 -169,2.0,2.0,1.9987783432006836,0.03687858581542969,74,254,25,0.7834790945053101 -170,2.0,2.0,2.0,0.012216567993164062,77,254,26,0.7853981852531433 -171,1.999328851699829,2.0,2.0,0.006711483001708984,79,253,26,0.7853981852531433 -172,1.9973092079162598,2.0,2.0,0.02019643783569336,83,253,26,0.7853981852531433 -173,1.9939327239990234,2.0,2.0,0.03376483917236328,86,253,26,0.7853981852531433 -174,1.9891924858093262,2.0,2.0,0.047402381896972656,90,252,27,0.7853981852531433 -175,1.9830833673477173,2.0,2.0,0.06109118461608887,95,252,27,0.7853981852531433 -176,1.9756017923355103,2.0,2.0,0.07481575012207031,99,251,28,0.7853981852531433 -177,1.96674644947052,2.0,2.0,0.08855342864990234,104,251,28,0.7853981852531433 -178,1.9565178155899048,2.0,2.0,0.10228633880615234,109,250,29,0.7853981852531433 -179,1.944919228553772,2.0,2.0,0.11598587036132812,115,249,29,0.7853981852531433 -180,1.9319560527801514,2.0,2.0,0.12963175773620605,120,249,30,0.7853981852531433 -181,1.917636513710022,2.0,2.0,0.14319539070129395,126,248,30,0.7853981852531433 -182,1.9019718170166016,2.0,2.0,0.1566469669342041,132,247,31,0.7853981852531433 -183,1.8849760293960571,2.0,2.0,0.16995787620544434,138,246,31,0.7853981852531433 -184,1.8666667938232422,2.0,2.0,0.18309235572814941,144,245,32,0.7853981852531433 -185,1.84706449508667,2.0,2.0,0.19602298736572266,150,244,32,0.7853981852531433 -186,1.826194167137146,2.0,2.0,0.20870327949523926,157,242,33,0.7853981852531433 -187,1.8040837049484253,2.0,2.0,0.22110462188720703,163,241,33,0.7853981852531433 -188,1.7807652950286865,2.0,2.0,0.2331840991973877,169,240,34,0.7853981852531433 -189,1.7562748193740845,2.0,2.0,0.2449047565460205,176,238,35,0.7853981852531433 -190,1.7306525707244873,2.0,2.0,0.2562224864959717,182,236,35,0.7853981852531433 -191,1.7039427757263184,2.0,2.0,0.26709794998168945,188,235,36,0.7853981852531433 -192,1.6761938333511353,2.0,2.0,0.27748942375183105,194,233,36,0.7853981852531433 -193,1.6474583148956299,2.0,2.0,0.2873551845550537,200,231,37,0.7853981852531433 -194,1.6177932024002075,2.0,2.0,0.29665112495422363,205,229,37,0.7853981852531433 -195,1.5872589349746704,2.0,2.0,0.3053426742553711,211,227,38,0.7853981852531433 -196,1.5559203624725342,2.0,2.0,0.3133857250213623,216,225,38,0.7853981852531433 -197,1.523845911026001,2.0,2.0,0.32074451446533203,221,223,39,0.7853981852531433 -198,1.491107702255249,2.0,2.0,0.32738208770751953,225,221,39,0.7853981852531433 -199,1.4577807188034058,2.0,2.0,0.3332698345184326,229,218,39,0.7853981852531433 -200,1.423943281173706,2.0,2.0,0.33837437629699707,233,216,40,0.7853981852531433 -201,1.3896762132644653,2.0,2.0,0.3426706790924072,237,213,40,0.7853981852531433 -202,1.3550628423690796,2.0,2.0,0.3461337089538574,240,211,40,0.7853981852531433 -203,1.3201879262924194,2.0,2.0,0.34874916076660156,243,208,41,0.7853981852531433 -204,1.2851378917694092,2.0,2.0,0.35050034523010254,246,206,41,0.7853981852531433 -205,1.25,2.0,2.0,0.3513789176940918,248,203,41,0.7853981852531433 -206,1.2148621082305908,2.0,2.0,0.3513789176940918,250,200,41,0.7853981852531433 -207,1.1798120737075806,2.0,2.0,0.35050034523010254,252,197,41,0.7853981852531433 -208,1.1449371576309204,2.0,2.0,0.34874916076660156,253,194,42,0.7853981852531433 -209,1.1103236675262451,2.0,2.0,0.34613490104675293,254,191,42,0.7853981852531433 -210,1.076056718826294,2.0,2.0,0.3426694869995117,254,188,42,0.7853981852531433 -211,1.0422192811965942,2.0,2.0,0.33837437629699707,255,185,42,0.7853981852531433 -212,1.008892297744751,2.0,2.0,0.3332698345184326,254,182,42,0.7853981852531433 -213,0.9761541485786438,2.0,2.0,0.3273814916610718,254,179,41,0.7853981852531433 -214,0.944079577922821,2.0,2.0,0.32074570655822754,254,175,41,0.7853981852531433 -215,0.91274094581604,2.0,2.0,0.31338632106781006,253,171,41,0.7853981852531433 -216,0.8822067975997925,2.0,2.0,0.3053414821624756,253,167,40,0.7853981852531433 -217,0.8525416851043701,2.0,2.0,0.29665112495422363,252,162,40,0.7853981852531433 -218,0.8238060474395752,2.0,2.0,0.2873563766479492,251,157,39,0.7853981852531433 -219,0.7960571050643921,2.0,2.0,0.27748942375183105,249,152,38,0.7853981852531433 -220,0.7693471908569336,2.0,2.0,0.26709914207458496,248,146,37,0.7853981852531433 -221,0.7437249422073364,2.0,2.0,0.2562224864959717,246,140,36,0.7853981852531433 -222,0.7192347049713135,2.0,2.0,0.2449023723602295,245,134,35,0.7853981852531433 -223,0.6959160566329956,2.0,2.0,0.2331864833831787,243,128,33,0.7853981852531433 -224,0.6738057136535645,2.0,2.0,0.22110342979431152,241,122,32,0.7853981852531433 -225,0.652935266494751,2.0,2.0,0.20870447158813477,238,115,31,0.7853981852531433 -226,0.6333332061767578,2.0,2.0,0.19602060317993164,236,109,29,0.7853981852531433 -227,0.6150238513946533,2.0,2.0,0.18309354782104492,233,102,27,0.7853981852531433 -228,0.5980279445648193,2.0,2.0,0.16995906829833984,231,95,26,0.7853981852531433 -229,0.582363486289978,2.0,2.0,0.15664458274841309,228,88,24,0.7853981852531433 -230,0.5680438280105591,2.0,2.0,0.14319658279418945,225,82,22,0.7853981852531433 -231,0.5550806522369385,2.0,2.0,0.12963175773620605,221,75,21,0.7853981852531433 -232,0.5434823036193848,2.0,2.0,0.11598348617553711,218,68,19,0.7853981852531433 -233,0.5332534313201904,2.0,2.0,0.10228872299194336,215,62,17,0.7853981852531433 -234,0.5243983268737793,2.0,2.0,0.08855104446411133,211,56,15,0.7853981852531433 -235,0.5169167518615723,2.0,2.0,0.07481575012207031,208,50,14,0.7853981852531433 -236,0.5108075141906738,2.0,2.0,0.061092376708984375,205,44,12,0.7853981852531433 -237,0.5060672760009766,2.0,2.0,0.047402381896972656,201,38,11,0.7853981852531433 -238,0.5026907920837402,2.0,2.0,0.03376483917236328,197,33,9,0.7853981852531433 -239,0.5006709098815918,2.0,2.0,0.020198822021484375,194,28,8,0.7853981852531433 -240,0.5,2.0,2.0,0.006709098815917969,190,24,7,0.7853981852531433 -241,0.5,1.997556447982788,2.0,0.02443552017211914,187,20,5,0.7853981852531433 -242,0.5,1.99018132686615,2.0,0.07375121116638184,183,16,4,0.7853981852531433 -243,0.5,1.9778308868408203,2.0,0.1235044002532959,180,13,3,0.7853981852531433 -244,0.5,1.96049964427948,2.0,0.17331242561340332,176,10,2,0.7853981852531433 -245,0.5,1.9382280111312866,2.0,0.2227163314819336,173,7,2,0.7853981852531433 -246,0.5,1.9111111164093018,2.0,0.27116894721984863,169,5,1,0.7853981852531433 -247,0.5,1.8793069124221802,2.0,0.3180420398712158,166,3,0,0.7853981852531433 -248,0.5,1.8430440425872803,2.0,0.362628698348999,163,2,0,0.7853981852531433 -249,0.5,1.8026283979415894,2.0,0.4041564464569092,160,1,0,0.7853981852531433 -250,0.5,1.7584468126296997,2.0,0.4418158531188965,156,0,0,0.7853981852531433 -251,0.5,1.710967779159546,2.0,0.4747903347015381,153,0,0,0.7853981852531433 -252,0.5,1.6607383489608765,2.0,0.5022943019866943,150,0,0,0.7853981852531433 -253,0.5,1.608376383781433,2.0,0.5236196517944336,147,1,0,0.7853981852531433 -254,0.5,1.5545576810836792,2.0,0.5381870269775391,144,2,0,0.7853981852531433 -255,0.5,1.5,2.0,0.545576810836792,140,4,0,0.7853981852531433 -256,0.5,1.4454423189163208,2.0,0.545576810836792,136,6,0,0.7853981852531433 -257,0.5,1.391623616218567,2.0,0.5381870269775391,132,9,0,0.7853981852531433 -258,0.5,1.339261531829834,2.0,0.5236208438873291,128,12,0,0.7853981852531433 -259,0.5,1.289032220840454,2.0,0.5022931098937988,124,16,0,0.7853981852531433 -260,0.5,1.2415533065795898,2.0,0.4747891426086426,119,20,0,0.7853981852531433 -261,0.5,1.197371482849121,2.0,0.4418182373046875,115,25,0,0.7853981852531433 -262,0.5,1.1569559574127197,2.0,0.40415525436401367,110,30,0,0.7853981852531433 -263,0.5,1.1206932067871094,2.0,0.3626275062561035,105,35,0,0.7853981852531433 -264,0.5,1.0888890027999878,2.0,0.3180420398712158,100,41,1,0.7853981852531433 -265,0.5,1.0617718696594238,2.0,0.27117133140563965,95,47,1,0.7853981852531433 -266,0.5,1.03950035572052,2.0,0.22271513938903809,91,53,2,0.7853981852531433 -267,0.5,1.0221692323684692,2.0,0.1733112335205078,86,60,2,0.7853981852531433 -268,0.5,1.00981867313385,2.0,0.1235055923461914,81,67,3,0.7853981852531433 -269,0.5,1.0024433135986328,2.0,0.07375359535217285,76,73,3,0.7853981852531433 -270,0.5,1.0,2.0,0.024433135986328125,71,80,4,0.7853981852531433 -271,0.5,1.0,2.002755641937256,0.027556419372558594,67,87,5,0.7853981852531433 -272,0.5,1.0,2.01108455657959,0.08328914642333984,62,94,6,0.7853981852531433 -273,0.5,1.0,2.0250115394592285,0.13926982879638672,58,100,7,0.7853981852531433 -274,0.5,1.0,2.0444445610046387,0.19433021545410156,54,106,8,0.7853981852531433 -275,0.5,1.0,2.0691423416137695,0.2469778060913086,50,113,9,0.7853981852531433 -276,0.5,1.0,2.0986857414245605,0.29543399810791016,47,118,10,0.7853981852531433 -277,0.5,1.0,2.1324563026428223,0.3377056121826172,43,124,12,0.7853981852531433 -278,0.5,1.0,2.169630765914917,0.37174463272094727,40,129,13,0.7853981852531433 -279,0.5,1.0,2.209197521209717,0.39566755294799805,38,133,15,0.7853981852531433 -280,0.5,1.0,2.25,0.40802478790283203,35,138,16,0.7853981852531433 -281,0.5,1.0,2.290802478790283,0.40802478790283203,33,141,18,0.7853981852531433 -282,0.5,1.0,2.330369234085083,0.39566755294799805,31,144,20,0.7853981852531433 -283,0.5,1.0,2.3675436973571777,0.37174463272094727,30,147,22,0.7853981852531433 -284,0.5,1.0,2.4013142585754395,0.3377056121826172,28,149,24,0.7853981852531433 -285,0.5,1.0,2.4308576583862305,0.29543399810791016,27,151,26,0.7853981852531433 -286,0.5,1.0,2.4555556774139404,0.2469801902770996,27,152,28,0.7853981852531433 -287,0.5,1.0,2.4749884605407715,0.19432783126831055,26,153,30,0.7853981852531433 -288,0.5,1.0,2.48891544342041,0.13926982879638672,26,153,32,0.7853981852531433 -289,0.5,1.0,2.4972445964813232,0.08329153060913086,26,153,35,0.7853981852531433 -290,0.5,1.0,2.5,0.027554035186767578,27,153,38,0.7853981852531433 -291,0.5,1.0,2.4963347911834717,0.0366520881652832,28,153,41,0.7834791541099548 -292,0.5,1.0,2.48527193069458,0.11062860488891602,30,153,44,0.7776866555213928 -293,0.5,1.0,2.4667463302612305,0.1852560043334961,33,153,48,0.7679865956306458 -294,0.5,1.0,2.440749406814575,0.25996923446655273,36,153,52,0.754374623298645 -295,0.5,1.0,2.407341957092285,0.3340744972229004,39,153,57,0.7368825674057007 -296,0.5,1.0,2.366666555404663,0.4067540168762207,43,153,61,0.715584933757782 -297,0.5,1.0,2.318960428237915,0.47706127166748047,48,153,66,0.6906059980392456 -298,0.5,1.0,2.26456618309021,0.5439424514770508,52,153,72,0.662125289440155 -299,0.5,1.0,2.2039425373077393,0.606236457824707,57,153,77,0.6303829550743103 -300,0.5,1.0,2.1376702785491943,0.6627225875854492,63,153,82,0.5956827998161316 -301,0.5,1.0,2.0664515495300293,0.7121872901916504,68,153,88,0.5583928227424622 -302,0.5,1.0,1.9911075830459595,0.7534396648406982,74,153,93,0.5189427137374878 -303,0.5,1.0,1.9125645160675049,0.7854306697845459,80,153,99,0.47781771421432495 -304,0.5,1.0,1.8318367004394531,0.8072781562805176,86,153,104,0.43554866313934326 -305,0.5,1.0,1.75,0.8183670043945312,91,153,109,0.39269909262657166 -306,0.5,1.0,1.6681634187698364,0.8183658123016357,97,153,114,0.3498495817184448 -307,0.5,1.0,1.5874354839324951,0.8072793483734131,102,153,118,0.30758047103881836 -308,0.5,1.0,1.50889253616333,0.7854294776916504,106,153,122,0.2664554715156555 -309,0.5,1.0,1.4335483312606812,0.7534420490264893,111,153,126,0.22700533270835876 -310,0.5,1.0,1.3623297214508057,0.7121860980987549,115,153,129,0.18971538543701172 -311,0.5,1.0,1.2960573434829712,0.6627237796783447,118,153,132,0.155015230178833 -312,0.5,1.0,1.2354340553283691,0.6062328815460205,121,153,134,0.1232728362083435 -313,0.5,1.0,1.1810396909713745,0.5439436435699463,124,153,136,0.0947921872138977 -314,0.5,1.0,1.133333444595337,0.477062463760376,126,153,138,0.06981313228607178 -315,0.5,1.0,1.0926578044891357,0.4067564010620117,127,153,139,0.048515498638153076 -316,0.5,1.0,1.0592505931854248,0.3340721130371094,128,153,140,0.031023502349853516 -317,0.5,1.0,1.0332539081573486,0.2599668502807617,128,153,140,0.01741158962249756 -318,0.5,1.0,1.0147278308868408,0.18526077270507812,128,153,140,0.007711648941040039 -319,0.5,1.0,1.0036649703979492,0.11062860488891602,128,153,140,0.0019191503524780273 -320,0.5,1.0,1.0,0.03664970397949219,128,153,140,0.0 diff --git a/Drone/client.py b/Drone/client.py index a1781a5a..61fae246 100644 --- a/Drone/client.py +++ b/Drone/client.py @@ -120,6 +120,8 @@ def animation_player(running_event, stop_event): frames = play_animation.read_animation_file() rate = rospy.Rate(1000 / 125) play_animation.takeoff() + play_animation.animate_frame(frames[0]) #Reach first point at the same time with others + rospy.sleep(5) for frame in frames: running_event.wait() if stop_event.is_set(): diff --git a/Drone/client_config.ini b/Drone/client_config.ini index c121f7c0..c95d7620 100644 --- a/Drone/client_config.ini +++ b/Drone/client_config.ini @@ -1,6 +1,6 @@ [SERVER] port = 25000 -host = 192.168.43.168 +host = 192.168.1.2 buffer_size = 1024 [FILETRANSFER] @@ -11,8 +11,8 @@ host = ntp1.stratum2.ru port = 123 [COPTER] -id = default -takeoff_height = 1.75 +id = copter2 +takeoff_height = 1 takeoff_timeout = 7 use_leds = True animation_file = animation.csv diff --git a/Drone/play_animation.py b/Drone/play_animation.py index a66c2728..7fbabf7a 100644 --- a/Drone/play_animation.py +++ b/Drone/play_animation.py @@ -5,7 +5,7 @@ #FlightLib.init('SingleCleverFlight') from FlightLib.FlightLib import LedLib -animation_file_path = 'test_animation/test_1.csv' +animation_file_path = 'animation.csv' USE_LEDS = True diff --git a/Server/server_config.ini b/Server/server_config.ini index 061617e2..f7fa366b 100644 --- a/Server/server_config.ini +++ b/Server/server_config.ini @@ -6,6 +6,3 @@ buffer_size = 1024 host = ntp1.stratum2.ru port = 123 #pool.ntp.org - -[FILETRANSFER] -animation = animation.csv \ No newline at end of file