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 +2 -4
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a9414c6212 - Show all commits

6
lib/intval/index.js
View File

@ -236,11 +236,10 @@ intval._watchMicro = function (err, val) {
if (err) { if (err) {
log.error('_watchMicro', err) log.error('_watchMicro', err)
} }
log.info(`Microswitch val: ${val}`) //log.info(`Microswitch val: ${val}`)
//determine when to stop //determine when to stop
if (val === 0 && intval._state.frame.active) { if (val === 0 && intval._state.frame.active) {
//&& (now - intval._state.frame.start) > 100 if (!intval._state.micro.primed && (now - intval._state.frame.start) > 100) {
if (!intval._state.micro.primed) {
intval._state.micro.primed = true intval._state.micro.primed = true
intval._state.micro.time = now intval._state.micro.time = now
log.info('Microswitch primed to stop motor') log.info('Microswitch primed to stop motor')
@ -375,7 +374,6 @@ intval.frame = function (dir = null, exposure = null, cb = () => {}) {
log.info('frame', {dir : dir ? 'forward' : 'backward', exposure : exposure}) log.info('frame', {dir : dir ? 'forward' : 'backward', exposure : exposure})
intval._pause()
if (dir) { if (dir) {
intval._startFwd() intval._startFwd()
} else { } else {