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 5 deletions
Showing only changes of commit 68dab59e6b - Show all commits

View File

@ -457,11 +457,10 @@ function bSequence (obj, cb) {
}
}
if (intval._state.sequence && sequence._state.active) {
return sequence.setStop(() => {
intval._state.sequence = false
log.info('sequence stop', { method : 'ble', id : seq_id })
return cb()
})
sequence.setStop()
intval._state.sequence = false
log.info('sequence stop', { method : 'ble', id : seq_id })
return cb()
} else {
console.time('sequence time')
intval._state.sequence = true