rosbuzz dev enabled in sim, fixed testaloneWP in dev

This commit is contained in:
dave 2018-04-27 11:42:59 -04:00
parent 119206198f
commit a99d2a6496
2 changed files with 34 additions and 10 deletions

View File

@ -1,27 +1,51 @@
include "vec2.bzz"
include "update.bzz" include "update.bzz"
include "barrier.bzz" # don't use a stigmergy id=80 (auto-increment up) with this header. # don't use a stigmergy id=11 with this header, for barrier
include "uavstates.bzz" # require an 'action' function to be defined here. # it requires an 'action' function to be defined here.
include "act/states.bzz"
include "vstigenv.bzz"
#State launched after takeoff
AUTO_LAUNCH_STATE = "ACTION"
function action() { function action() {
BVMSTATE = "ACTION"
uav_storegoal(-1.0,-1.0,-1.0) uav_storegoal(-1.0,-1.0,-1.0)
set_goto(picture) goto_gps(picture)
} }
# Executed once at init time. # Executed once at init time.
function init() { function init() {
statef=turnedoff init_stig()
UAVSTATE = "TURNEDOFF" init_swarm()
TARGET_ALTITUDE = 15.0
# Starting state: TURNEDOFF to wait for user input.
BVMSTATE = "TURNEDOFF"
} }
# Executed at each time step. # Executed at each time step.
function step() { function step() {
uav_rccmd() rc_cmd_listen()
# update the vstig (status/net/batt/...)
# uav_updatestig()
#
# State machine
#
if(BVMSTATE=="TURNEDOFF")
statef=turnedoff
else if(BVMSTATE=="STOP") # ends on turnedoff
statef=stop
else if(BVMSTATE=="LAUNCH") # ends on AUTO_LAUNCH_STATE
statef=launch
else if(BVMSTATE=="IDLE")
statef=idle
else if(BVMSTATE=="ACTION")
statef=action
statef() statef()
log("Current state: ", UAVSTATE) log("Current state: ", BVMSTATE)
} }
# Executed once when the robot (or the simulator) is reset. # Executed once when the robot (or the simulator) is reset.

View File

@ -96,7 +96,7 @@ void setWPlist(string path)
/ set the absolute path for a csv list of waypoints / set the absolute path for a csv list of waypoints
----------------------------------------------------------- */ ----------------------------------------------------------- */
{ {
WPlistname = path + "include/graphs/waypointlist.csv"; WPlistname = path + "include/taskallocate/waypointlist.csv";
} }
float constrainAngle(float x) float constrainAngle(float x)