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

View File

@ -127,7 +127,7 @@ intval._startBwd = function () {
intval._pause = function () {
intval._pin.fwd.writeSync(0)
intval._pin.bwd.writeSync(0)
log.info('_pause', 'frame paused')
//log.info('_pause', 'frame paused')
}
/**
* Stop motor by setting both motor pins to 0 (LOW)
@ -206,7 +206,7 @@ intval._watchRelease = function (err, val) {
if (err) {
return log.error(err)
}
log.info(`Release switch val: ${val}`)
//log.info(`Release switch val: ${val}`)
if (val === 0) {
//closed
if (intval._releaseClosedState(now)) {
@ -222,7 +222,7 @@ intval._watchRelease = function (err, val) {
} else if (press >= intval._release.seq) {
intval.sequence()
}
log.info(`Release closed for ${press}ms`)
//log.info(`Release closed for ${press}ms`)
intval._state.release.time = 0
intval._state.release.active = false
}
@ -296,16 +296,16 @@ intval.frame = function (dir = null, time = null) {
intval._state.frame.paused = true
setTimeout(intval._pause, intval._state.frame.open)
if (dir) {
log.info('frame', { pausing : time + intval._state.frame.open })
//log.info('frame', { pausing : time + intval._state.frame.open })
setTimeout( () => {
log.info('frame', 'restarting')
//log.info('frame', 'restarting')
intval._state.frame.paused = false
intval._startFwd()
}, time + intval._state.frame.closed)
} else {
log.info('frame', { pausing : time + intval._state.frame.open })
setTimeout( () => {
log.info('frame', 'restarting')
//log.info('frame', 'restarting')
intval._state.frame.paused = false
intval._startBwd()
}, time + intval._state.frame.closed)