16mm
/
intval3
1
0
Fork 0
Code Issues 1 Pull Requests 9 Projects Releases Wiki Activity

Push dev work to master #2

Merged
sixteenmillimeter merged 416 commits from dev into master 2018-07-19 15:29:02 +00:00
Conversation 0 Commits 416 Files Changed 85 +10 -9
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0cb9f79756 - Show all commits

19
index.js
View File

@ -247,15 +247,6 @@ function rStatus (req, res, next) {
return next() return next()
} }
function rReset (req, res, next) {
log.info'/reset', {time : +new Date()})
intval.reset()
setTimeout(() => {
res.send(intval._state)
return next()
}, 10)
}
function rSequence (req, res, next) { function rSequence (req, res, next) {
let dir = true let dir = true
let exposure = 0 let exposure = 0
@ -345,6 +336,15 @@ function rSequence (req, res, next) {
} }
} }
function rReset (req, res, next) {
log.info(`/reset`, {time : +new Date()})
intval.reset()
setTimeout(() => {
res.send(intval._state)
return next()
}, 10)
}
function rUpdate (req, res, next) { function rUpdate (req, res, next) {
log.info(`/update`, { time : +new Date() }) log.info(`/update`, { time : +new Date() })
exec('sh ./scripts/update.sh', (err, stdio, stderr) => { exec('sh ./scripts/update.sh', (err, stdio, stderr) => {
@ -539,6 +539,7 @@ function bSequenceStop (obj, cb) {
} }
function bReset (obj, cb) { function bReset (obj, cb) {
log.info(`reset`, { time : +new Date() })
intval.reset() intval.reset()
setTimeout(cb, 10) setTimeout(cb, 10)
} }