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

View File

@ -539,13 +539,18 @@ function bSequenceStop (obj, cb) {
} }
function bReset (obj, cb) { function bReset (obj, cb) {
log.info(`reset`, { time : +new Date() }) log.info(`reset`, { method: 'ble' })
intval.reset() intval.reset()
setTimeout(cb, 10) setTimeout(cb, 10)
} }
function bUpdate (obj, cb) { function bUpdate (obj, cb) {
log.info('update', { method : 'ble' })
exec('sh ./scripts/update.sh', (err, stdio, stderr) => { exec('sh ./scripts/update.sh', (err, stdio, stderr) => {
if (err) {
log.error('update', err)
}
log.info('update', { stdio : stdio })
cb() cb()
setTimeout(() => { setTimeout(() => {
process.exit(0) process.exit(0)
@ -553,6 +558,7 @@ function bUpdate (obj, cb) {
}) })
} }
function bRestart (obj, cb) { function bRestart (obj, cb) {
log.info('restart', { method : 'ble' })
cb() cb()
setTimeout(() => { setTimeout(() => {
process.exit(0) process.exit(0)