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 3 additions and 1 deletions
Showing only changes of commit 02aea27ff9 - Show all commits

View File

@ -485,14 +485,16 @@ function seq () {
let dir = intval._state.frame.dir let dir = intval._state.frame.dir
let exposure = intval._state.frame.exposure let exposure = intval._state.frame.exposure
let delay = intval._state.frame.delay let delay = intval._state.frame.delay
if (intval._state.sequence && sequence._state.active) { if (intval._state.sequence && sequence._state.active) {
log.info('sequence', { method : 'release' , stop: true })
return sequence.setStop(() => { return sequence.setStop(() => {
intval._state.sequence = false intval._state.sequence = false
return cb() return cb()
}) })
} else { } else {
console.time('sequence time') console.time('sequence time')
log.info('sequence', { method : 'release', start : true })
intval._state.sequence = true intval._state.sequence = true
sequence.start({ sequence.start({
loop : [ (next) => { loop : [ (next) => {