This commit is contained in:
parent
4d41dcb7b5
commit
93e399536c
89
index.js
89
index.js
|
@ -257,6 +257,7 @@ async function rSequence (req, res, next) {
|
||||||
let dir = true
|
let dir = true
|
||||||
let exposure = 0
|
let exposure = 0
|
||||||
let delay = 0
|
let delay = 0
|
||||||
|
let options = {}
|
||||||
|
|
||||||
if (intval._state.frame.dir !== true) {
|
if (intval._state.frame.dir !== true) {
|
||||||
dir = false
|
dir = false
|
||||||
|
@ -303,13 +304,44 @@ async function rSequence (req, res, next) {
|
||||||
delay = req.query.delay
|
delay = req.query.delay
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (req.body && typeof req.body.delay!== 'undefined') {
|
if (req.body && typeof req.body.delay !== 'undefined') {
|
||||||
if (typeof req.body.delay === 'string') {
|
if (typeof req.body.delay === 'string') {
|
||||||
delay = parseInt(req.body.delay)
|
delay = parseInt(req.body.delay)
|
||||||
} else {
|
} else {
|
||||||
delay = req.body.delay
|
delay = req.body.delay
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (req.query && typeof req.query.len !== 'undefined') {
|
||||||
|
if (typeof req.query.len === 'string') {
|
||||||
|
options.len = parseInt(req.query.len)
|
||||||
|
} else {
|
||||||
|
options.len = req.query.len
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (req.body && typeof req.body.len !== 'undefined') {
|
||||||
|
if (typeof req.body.len === 'string') {
|
||||||
|
options.len = parseInt(req.body.len)
|
||||||
|
} else {
|
||||||
|
options.len = req.body.len
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (req.query && typeof req.query.multiple !== 'undefined') {
|
||||||
|
if (typeof req.query.multiple === 'string') {
|
||||||
|
options.multiple = parseInt(req.query.multiple)
|
||||||
|
} else {
|
||||||
|
options.multiple = req.query.multiple
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (req.body && typeof req.body.multiple !== 'undefined') {
|
||||||
|
if (typeof req.body.multiple === 'string') {
|
||||||
|
options.multiple = parseInt(req.body.multiple)
|
||||||
|
} else {
|
||||||
|
options.multiple = req.body.multiple
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (intval._state.sequence && sequence.active) {
|
if (intval._state.sequence && sequence.active) {
|
||||||
intval._state.sequence = false
|
intval._state.sequence = false
|
||||||
sequence.stop()
|
sequence.stop()
|
||||||
|
@ -319,7 +351,7 @@ async function rSequence (req, res, next) {
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
intval._state.sequence = true
|
intval._state.sequence = true
|
||||||
sequence.start()
|
sequence.start(options)
|
||||||
res.send({ started : true })
|
res.send({ started : true })
|
||||||
|
|
||||||
return next()
|
return next()
|
||||||
|
@ -468,6 +500,7 @@ function bSequence (obj, cb) {
|
||||||
let dir = true
|
let dir = true
|
||||||
let exposure = 0
|
let exposure = 0
|
||||||
let delay = 0
|
let delay = 0
|
||||||
|
let options = {}
|
||||||
|
|
||||||
if (intval._state.frame.dir !== true) {
|
if (intval._state.frame.dir !== true) {
|
||||||
dir = false
|
dir = false
|
||||||
|
@ -493,6 +526,21 @@ function bSequence (obj, cb) {
|
||||||
exposure = obj.exposure
|
exposure = obj.exposure
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (typeof obj.len !== 'undefined') {
|
||||||
|
if (typeof obj.len === 'string') {
|
||||||
|
options.len = parseInt(obj.len)
|
||||||
|
} else {
|
||||||
|
options.len = obj.len
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (typeof obj.multiple !== 'undefined') {
|
||||||
|
if (typeof obj.multiple === 'string') {
|
||||||
|
options.multiple = parseInt(obj.multiple)
|
||||||
|
} else {
|
||||||
|
options.multiple = obj.multiple
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (intval._state.sequence && sequence._state.active) {
|
if (intval._state.sequence && sequence._state.active) {
|
||||||
//should not occur with single client
|
//should not occur with single client
|
||||||
intval._state.sequence = false
|
intval._state.sequence = false
|
||||||
|
@ -501,16 +549,15 @@ function bSequence (obj, cb) {
|
||||||
return cb()
|
return cb()
|
||||||
} else {
|
} else {
|
||||||
intval._state.sequence = true
|
intval._state.sequence = true
|
||||||
sequence.start()
|
sequence.start(options)
|
||||||
log.info('sequence start', { method : 'ble' })
|
log.info('sequence start', { method : 'ble' })
|
||||||
return cb()
|
return cb()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function bSequenceStop (obj, cb) {
|
function bSequenceStop (obj, cb) {
|
||||||
//
|
if (intval._state.sequence && sequence.active) {
|
||||||
if (intval._state.sequence && sequence._state.active) {
|
sequence.stop()
|
||||||
sequence.setStop()
|
|
||||||
intval._state.sequence = false
|
intval._state.sequence = false
|
||||||
log.info('sequence stop', { method : 'ble' })
|
log.info('sequence stop', { method : 'ble' })
|
||||||
return cb()
|
return cb()
|
||||||
|
@ -545,36 +592,6 @@ function bRestart (obj, cb) {
|
||||||
}, 20)
|
}, 20)
|
||||||
}
|
}
|
||||||
|
|
||||||
function seq () {
|
|
||||||
let dir = intval._state.frame.dir
|
|
||||||
let exposure = intval._state.frame.exposure
|
|
||||||
let delay = intval._state.frame.delay
|
|
||||||
|
|
||||||
if (intval._state.sequence && sequence._state.active) {
|
|
||||||
log.info('sequence', { method : 'release' , stop: true })
|
|
||||||
sequence.setStop()
|
|
||||||
intval._state.sequence = false
|
|
||||||
return cb()
|
|
||||||
} else {
|
|
||||||
console.time('sequence time')
|
|
||||||
log.info('sequence', { method : 'release', start : true })
|
|
||||||
intval._state.sequence = true
|
|
||||||
sequence.start({
|
|
||||||
loop : [ (next) => {
|
|
||||||
intval.frame(dir, exposure, (len) => {
|
|
||||||
next()
|
|
||||||
})
|
|
||||||
}, (next) => {
|
|
||||||
setTimeout(() => {
|
|
||||||
next()
|
|
||||||
}, delay)
|
|
||||||
}]
|
|
||||||
}, (seq) => {
|
|
||||||
console.timeEnd('sequence time')
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function index (req, res, next) {
|
function index (req, res, next) {
|
||||||
fs.readFile(INDEXPATH, 'utf8', (err, data) => {
|
fs.readFile(INDEXPATH, 'utf8', (err, data) => {
|
||||||
if (err) {
|
if (err) {
|
||||||
|
|
Loading…
Reference in New Issue