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

minor fixes to graph

This commit is contained in:
dave 2017-06-26 15:03:58 -04:00
parent eb130be1bb
commit 82adb66f7b
3 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
script/Graph_drone.graph
View File

@ -1,9 +1,5 @@
0 -1 -1 -1 0 -1 -1 -1
1 0 1000.0 0.0 1 0 1000.0 0.0
2 0 1000.0 1.57 2 0 1000.0 1.57
<<<<<<< HEAD
3 0 1000.0 3.14 3 0 1000.0 3.14
4 0 1000.0 4.71 4 0 1000.0 4.71
=======
3 0 1000.0 3.14
>>>>>>> 8e5acd264dbf2b5fc3cafd00fb9a08a82a8095f7

4
script/graphform.bzz
View File

@ -88,7 +88,7 @@ step_cunt=0
v_tag = stigmergy.create(1) v_tag = stigmergy.create(1)
# Lennard-Jones parameters # Lennard-Jones parameters
EPSILON = 3.5 #3.5 EPSILON = 13.5 #3.5
# Lennard-Jones interaction magnitude # Lennard-Jones interaction magnitude
@ -705,7 +705,7 @@ if(m_nLabel>1){
log(";",m_nLabel,";",mypred1.range-m_vecNodes_fixed[m_nLabel].d1) log(";",m_nLabel,";",mypred1.range-m_vecNodes_fixed[m_nLabel].d1)
} }
#move #move
uav_moveto(m_navigation.x/100.0,m_navigation.y/100.0) uav_moveto(m_navigation.x,m_navigation.y)
} }
function action(){ function action(){

13
script/include/uavstates.bzz
View File

@ -50,11 +50,7 @@ function land() {
uav_land() uav_land()
} }
else { else {
<<<<<<< HEAD
barrier_set(ROBOTS,turnedoff,land) barrier_set(ROBOTS,turnedoff,land)
=======
barrier_set(ROBOTS,idle,land)
>>>>>>> 8e5acd264dbf2b5fc3cafd00fb9a08a82a8095f7
barrier_ready() barrier_ready()
timeW=0 timeW=0
#barrier = nil #barrier = nil
@ -62,7 +58,6 @@ function land() {
} }
} }
<<<<<<< HEAD
function follow() { function follow() {
if(size(targets)>0) { if(size(targets)>0) {
UAVSTATE = "FOLLOW" UAVSTATE = "FOLLOW"
@ -79,8 +74,6 @@ function follow() {
} }
} }
=======
>>>>>>> 8e5acd264dbf2b5fc3cafd00fb9a08a82a8095f7
function uav_rccmd() { function uav_rccmd() {
if(flight.rc_cmd==22) { if(flight.rc_cmd==22) {
log("cmd 22") log("cmd 22")
@ -97,17 +90,11 @@ function uav_rccmd() {
neighbors.broadcast("cmd", 21) neighbors.broadcast("cmd", 21)
} else if(flight.rc_cmd==16) { } else if(flight.rc_cmd==16) {
flight.rc_cmd=0 flight.rc_cmd=0
<<<<<<< HEAD
UAVSTATE = "FOLLOW" UAVSTATE = "FOLLOW"
log(rc_goto.latitude, " ", rc_goto.longitude) log(rc_goto.latitude, " ", rc_goto.longitude)
add_targetrb(0,rc_goto.latitude,rc_goto.longitude) add_targetrb(0,rc_goto.latitude,rc_goto.longitude)
statef = follow statef = follow
#uav_goto() #uav_goto()
=======
statef = idle
#uav_goto()
add_user_rb(10,rc_goto.latitude,rc_goto.longitude)
>>>>>>> 8e5acd264dbf2b5fc3cafd00fb9a08a82a8095f7
} else if(flight.rc_cmd==400) { } else if(flight.rc_cmd==400) {
flight.rc_cmd=0 flight.rc_cmd=0
uav_arm() uav_arm()