Spiri
/
ROSBuzz_MISTLab
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge confilct manual resolution

This commit is contained in:
David St-Onge 2017-09-08 12:23:23 -04:00
parent 663bd5e4ed
commit f03b76c241
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buzz_scripts/graphform.bzz
View File

@ -797,11 +797,7 @@ function init() {
v_tag = stigmergy.create(m_lockstig) v_tag = stigmergy.create(m_lockstig)
uav_initstig() uav_initstig()
# go to diff. height since no collision avoidance implemented yet # go to diff. height since no collision avoidance implemented yet
<<<<<<< HEAD
TARGET_ALTITUDE = 4.5 #2.5 + id * 1.5
=======
TARGET_ALTITUDE = 7.5 #2.5 + id * 1.5 TARGET_ALTITUDE = 7.5 #2.5 + id * 1.5
>>>>>>> d587cdba4387b65bcc583671d26ce82fa4e25720
statef=turnedoff statef=turnedoff
UAVSTATE = "TURNEDOFF" UAVSTATE = "TURNEDOFF"
} }