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

3
lib/intval/index.js
View File

@ -239,10 +239,11 @@ intval._watchMicro = function (err, val) {
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) { 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')
} }
} else if (val === 1 && intval._state.frame.active) { } else if (val === 1 && intval._state.frame.active) {
if (intval._state.micro.primed && !intval._state.micro.paused && (now - intval._state.frame.start) > intval._frame.open) { if (intval._state.micro.primed && !intval._state.micro.paused && (now - intval._state.frame.start) > intval._frame.open) {