test merge Merge branch 'solo-playground' of https://github.com/MISTLab/ROSBuzz
This commit is contained in:
commit
7d24e03af5
@ -16,7 +16,7 @@ TARGET_ALTITUDE = 2.0
|
||||
|
||||
# Lennard-Jones parameters
|
||||
TARGET = 10.0 #0.000001001
|
||||
EPSILON = 0.05 #0.001
|
||||
EPSILON = 10.0 #0.001
|
||||
|
||||
# Lennard-Jones interaction magnitude
|
||||
function lj_magnitude(dist, target, epsilon) {
|
||||
@ -109,7 +109,7 @@ function takeoff() {
|
||||
barrier_set(ROBOTS,hexagon)
|
||||
barrier_ready()
|
||||
}
|
||||
if( flight.status !=3){
|
||||
else if( flight.status !=3){
|
||||
log("Altitude: ", TARGET_ALTITUDE)
|
||||
neighbors.broadcast("cmd", 22)
|
||||
uav_takeoff(TARGET_ALTITUDE)
|
||||
|
Loading…
Reference in New Issue
Block a user