16mm
/
intval3
1
0
Fork 0
Code Issues 1 Pull Requests 9 Projects Releases Wiki Activity

State object was re-structured. Watch() callbacks need to be bound to current object

This commit is contained in:
mmcwilliams 2019-10-30 22:49:15 -04:00
parent 6ae25134a2
commit a205f07bab
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/intval/index.ts
View File

@ -41,13 +41,13 @@ interface State {
} }
interface Entry { interface Entry {
start : number; start : number
stop : number; stop : number
len : number; len : number
dir : number; dir : number
exposure : number; exposure : number
counter : number; counter : number
sequence : number; sequence : number
} }
/** class representing the intval3 features */ /** class representing the intval3 features */
@ -81,7 +81,7 @@ export default class Intval {
public sequence : any; public sequence : any;
constructor() { constructor() {
this._init(); this._init()
} }
/** /**
@ -211,7 +211,7 @@ export default class Intval {
if (!pin.edge) this._pin[p] = new Gpio(pin.pin, pin.dir); if (!pin.edge) 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));
} }
/** /**
@ -327,9 +327,9 @@ export default class Intval {
log.info('Microswitch primed to stop motor'); log.info('Microswitch primed to stop motor');
} }
} 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(this._micro.delay) await delay(this._micro.delay)
this._stop(); this._stop();
} }
@ -491,7 +491,7 @@ export default class Intval {
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 });