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

fix merge

This commit is contained in:
David St-Onge 2017-03-15 17:36:19 -04:00
parent 7c4c41dbb6
commit 68ef2451fb
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/testflockfev.bzz
View File

@ -86,21 +86,12 @@ function barrier_wait(threshold, transf) {
if(barrier.size() >= threshold) { if(barrier.size() >= threshold) {
barrier = nil barrier = nil
transf() transf()
<<<<<<< HEAD
} else if(timeW>=WAIT_TIMEOUT) { } else if(timeW>=WAIT_TIMEOUT) {
barrier = nil barrier = nil
statef=land statef=land
timeW=0 timeW=0
} }
timeW = timeW+1 timeW = timeW+1
=======
} else if(timeW>=WAIT_TIMEOUT) {
barrier = nil
statef=hexagon #idle
timeW=0
}
timeW = timeW+1
>>>>>>> 141f05807d744ec9db040287ff04b06db10d6e8e
} }
# flight status # flight status