Did not complete previous commit

This commit is contained in:
mmcwilliams 2019-10-30 22:50:41 -04:00
parent a205f07bab
commit 4d41dcb7b5
2 changed files with 6 additions and 6 deletions

View File

@ -175,7 +175,7 @@ class Intval {
this._pin[p] = new Gpio(pin.pin, pin.dir); this._pin[p] = new Gpio(pin.pin, pin.dir);
log.info('_declarePins', { pin: pin.pin, dir: pin.dir, edge: pin.edge }); log.info('_declarePins', { pin: pin.pin, dir: pin.dir, edge: pin.edge });
} }
this._pin.release.watch(this._watchRelease); this._pin.release.watch(this._watchRelease.bind(this));
} }
/** /**
* (internal function) Undeclares all Gpio in event of uncaught error * (internal function) Undeclares all Gpio in event of uncaught error
@ -274,9 +274,9 @@ class Intval {
} }
} }
else if (val === 1 && this._state.frame.active) { else if (val === 1 && this._state.frame.active) {
if (this._state.micro.primed && !this._state.micro.paused && (now - this._state.frame.start) > this._frame.open) { if (this._micro.primed && !this._micro.paused && (now - this._state.frame.start) > this._frame.open) {
this._state.micro.primed = false; this._micro.primed = false;
this._state.micro.time = 0; this._micro.time = 0;
await delay_1.delay(this._micro.delay); await delay_1.delay(this._micro.delay);
this._stop(); this._stop();
} }
@ -422,7 +422,7 @@ class Intval {
this._state.frame.current.dir = dir; this._state.frame.current.dir = dir;
this._state.frame.start = +new Date(); this._state.frame.start = +new Date();
this._state.frame.active = true; this._state.frame.active = true;
this._pin.micro.watch(this._watchMicro); this._pin.micro.watch(this._watchMicro.bind(this));
log.info('frame', { dir: dir ? 'forward' : 'backward', exposure }); log.info('frame', { dir: dir ? 'forward' : 'backward', exposure });
if (dir) { if (dir) {
this._startFwd(); this._startFwd();

File diff suppressed because one or more lines are too long