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

added individual waypoint selection to webcontrol

This commit is contained in:
dave 2018-11-07 12:01:40 -05:00
parent fa94467652
commit 12ff37965b
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buzz_scripts/include/act/barrier.bzz
View File

@ -87,7 +87,7 @@ function barrier_wait(threshold, transf, resumef, bc) {
function barrier_allgood(barrier, bc) { function barrier_allgood(barrier, bc) {
barriergood = 1 barriergood = 1
barrier.foreach(function(key, value, robot){ barrier.foreach(function(key, value, robot){
log("VS entry : ", key, " ", value, " ", robot) #log("VS entry : ", key, " ", value, " ", robot)
if(key == "d"){ if(key == "d"){
if(value == 1) if(value == 1)
return 1 return 1

2
buzz_scripts/include/act/states.bzz
View File

@ -100,7 +100,7 @@ function stop() {
wpreached = 1 wpreached = 1
function indiWP() { function indiWP() {
BVMSTATE = "INDIWP" BVMSTATE = "WAYPOINT"
check_rc_wp() check_rc_wp()
wpi = v_wp.get(id) wpi = v_wp.get(id)

2
buzz_scripts/main.bzz
View File

@ -72,7 +72,7 @@ function step() {
statef=launch_switch statef=launch_switch
else if(BVMSTATE=="GOHOME") # ends on AUTO_LAUNCH_STATE else if(BVMSTATE=="GOHOME") # ends on AUTO_LAUNCH_STATE
statef=goinghome statef=goinghome
else if(BVMSTATE=="INDIWP") else if(BVMSTATE=="WAYPOINT")
statef=indiWP statef=indiWP
else if(BVMSTATE=="IDLE") else if(BVMSTATE=="IDLE")
statef=idle statef=idle