Push dev work to master #2

Merged
sixteenmillimeter merged 416 commits from dev into master 2018-07-19 15:29:02 +00:00
1 changed files with 4 additions and 2 deletions
Showing only changes of commit fc99b9ff06 - Show all commits

View File

@ -293,6 +293,7 @@ function rSequence (req, res, next) {
return next() return next()
}) })
} else { } else {
console.time('sequence time')
return sequence.start({ return sequence.start({
loop : [ (next) => { loop : [ (next) => {
intval.frame(dir, exposure, (len) => { intval.frame(dir, exposure, (len) => {
@ -304,9 +305,10 @@ function rSequence (req, res, next) {
}, delay) }, delay)
}] }]
}, (seq) => { }, (seq) => {
res.send(seq) console.timeEnd('sequence time')
return next()
}) })
res.send({})
return next()
} }
} }