canon_ble #82
|
|
@ -101,8 +101,6 @@ class Devices {
|
||||||
let connectSuccess;
|
let connectSuccess;
|
||||||
let verifySuccess;
|
let verifySuccess;
|
||||||
let device;
|
let device;
|
||||||
let exposure;
|
|
||||||
let parts;
|
|
||||||
//this.log.info(`distinguish() ${serial}`)
|
//this.log.info(`distinguish() ${serial}`)
|
||||||
try {
|
try {
|
||||||
connectSuccess = await this.arduino.connect('connect', serial, true);
|
connectSuccess = await this.arduino.connect('connect', serial, true);
|
||||||
|
|
@ -137,19 +135,6 @@ class Devices {
|
||||||
catch (err) {
|
catch (err) {
|
||||||
this.log.error('Error checking state capability', err);
|
this.log.error('Error checking state capability', err);
|
||||||
}
|
}
|
||||||
if (this.arduino.hasState[device]) {
|
|
||||||
if (device.indexOf('camera') !== -1) {
|
|
||||||
parts = this.arduino.stateStr[device].split('G');
|
|
||||||
if (parts.length > 1) {
|
|
||||||
parts = parts[1].split('H');
|
|
||||||
exposure = parseInt(parts[0]);
|
|
||||||
if (!isNaN(exposure)) {
|
|
||||||
this.log.info(`Timing for [${device}] = ${exposure}`);
|
|
||||||
this.ui.send('timing', { c: 'c', ms: exposure });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return device;
|
return device;
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
|
|
@ -460,6 +445,8 @@ class Devices {
|
||||||
let ps = {};
|
let ps = {};
|
||||||
let capper = {};
|
let capper = {};
|
||||||
let checklist = [];
|
let checklist = [];
|
||||||
|
let exposure;
|
||||||
|
let parts;
|
||||||
this.connected = {
|
this.connected = {
|
||||||
projector: false,
|
projector: false,
|
||||||
camera: false,
|
camera: false,
|
||||||
|
|
@ -495,6 +482,17 @@ class Devices {
|
||||||
await this.fakeCamera();
|
await this.fakeCamera();
|
||||||
}
|
}
|
||||||
else if (this.arduino.hasState['camera']) {
|
else if (this.arduino.hasState['camera']) {
|
||||||
|
if (device.indexOf('camera') !== -1) {
|
||||||
|
parts = this.arduino.stateStr[device].split('G');
|
||||||
|
if (parts.length > 1) {
|
||||||
|
parts = parts[1].split('H');
|
||||||
|
exposure = parseInt(parts[0]);
|
||||||
|
if (!isNaN(exposure)) {
|
||||||
|
this.log.info(`Timing for [${device}] = ${exposure}`);
|
||||||
|
this.ui.send('timing', { c: 'c', ms: exposure });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
c.state = true;
|
c.state = true;
|
||||||
c.exposure = true;
|
c.exposure = true;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -40,7 +40,7 @@ class Timing {
|
||||||
ipcRenderer.on('timing', this.timing.bind(this));
|
ipcRenderer.on('timing', this.timing.bind(this));
|
||||||
}
|
}
|
||||||
timing(event, arg) {
|
timing(event, arg) {
|
||||||
if (arg.c) {
|
if (typeof arg.c !== 'undefined') {
|
||||||
this.update(arg.c, parseInt(arg.ms), true);
|
this.update(arg.c, parseInt(arg.ms), true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -80,6 +80,7 @@ class Timing {
|
||||||
this.updateUI('#proj_time', proj);
|
this.updateUI('#proj_time', proj);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
log.info('reset');
|
||||||
}
|
}
|
||||||
restore(timing) {
|
restore(timing) {
|
||||||
this.data = timing;
|
this.data = timing;
|
||||||
|
|
@ -88,8 +89,11 @@ class Timing {
|
||||||
update(c, ms, force = false) {
|
update(c, ms, force = false) {
|
||||||
let cmd = this.fromArduino[c];
|
let cmd = this.fromArduino[c];
|
||||||
let id;
|
let id;
|
||||||
|
log.info(c);
|
||||||
|
log.info(cmd);
|
||||||
if (typeof cmd !== 'undefined' && typeof this.data[cmd] !== 'undefined') {
|
if (typeof cmd !== 'undefined' && typeof this.data[cmd] !== 'undefined') {
|
||||||
if (force) {
|
if (force) {
|
||||||
|
log.info(`Forcing update of timing, ${ms}`);
|
||||||
this.data[cmd] = ms;
|
this.data[cmd] = ms;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
@ -98,6 +102,15 @@ class Timing {
|
||||||
id = `#${cmd}_time`;
|
id = `#${cmd}_time`;
|
||||||
this.updateUI(id, this.data[cmd]);
|
this.updateUI(id, this.data[cmd]);
|
||||||
}
|
}
|
||||||
|
else if (typeof cmd !== 'undefined' && force) {
|
||||||
|
//first update
|
||||||
|
setTimeout(function () {
|
||||||
|
log.info(`Forcing update of timing, ${ms}`);
|
||||||
|
this.data[cmd] = ms;
|
||||||
|
id = `#${cmd}_time`;
|
||||||
|
this.updateUI(id, this.data[cmd]);
|
||||||
|
}.bind(this), 5000);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
updateUI(id, ms) {
|
updateUI(id, ms) {
|
||||||
if ($(id).length) {
|
if ($(id).length) {
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
{"version":3,"file":"timing.js","sourceRoot":"","sources":["../../src/lib/ui/timing.ts"],"names":[],"mappings":"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"}
|
{"version":3,"file":"timing.js","sourceRoot":"","sources":["../../src/lib/ui/timing.ts"],"names":[],"mappings":"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"}
|
||||||
|
|
@ -53,7 +53,7 @@ class Timing {
|
||||||
}
|
}
|
||||||
|
|
||||||
private timing (event : any, arg : any) {
|
private timing (event : any, arg : any) {
|
||||||
if (arg.c) {
|
if (typeof arg.c !== 'undefined') {
|
||||||
this.update(arg.c, parseInt(arg.ms), true);
|
this.update(arg.c, parseInt(arg.ms), true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -94,6 +94,7 @@ class Timing {
|
||||||
this.updateUI('#proj_time', proj);
|
this.updateUI('#proj_time', proj);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
log.info('reset')
|
||||||
}
|
}
|
||||||
|
|
||||||
public restore (timing : TimingData) {
|
public restore (timing : TimingData) {
|
||||||
|
|
@ -104,14 +105,25 @@ class Timing {
|
||||||
public update (c : string, ms : number, force : boolean = false) {
|
public update (c : string, ms : number, force : boolean = false) {
|
||||||
let cmd : string = this.fromArduino[c];
|
let cmd : string = this.fromArduino[c];
|
||||||
let id : string;
|
let id : string;
|
||||||
|
log.info(c)
|
||||||
|
log.info(cmd)
|
||||||
if (typeof cmd !== 'undefined' && typeof this.data[cmd] !== 'undefined') {
|
if (typeof cmd !== 'undefined' && typeof this.data[cmd] !== 'undefined') {
|
||||||
if (force) {
|
if (force) {
|
||||||
|
log.info(`Forcing update of timing, ${ms}`);
|
||||||
this.data[cmd] = ms;
|
this.data[cmd] = ms;
|
||||||
} else {
|
} else {
|
||||||
this.data[cmd] = Math.round((this.data[cmd] + ms) / 2);
|
this.data[cmd] = Math.round((this.data[cmd] + ms) / 2);
|
||||||
}
|
}
|
||||||
id = `#${cmd}_time`;
|
id = `#${cmd}_time`;
|
||||||
this.updateUI(id, this.data[cmd]);
|
this.updateUI(id, this.data[cmd]);
|
||||||
|
} else if (typeof cmd !== 'undefined' && force) {
|
||||||
|
//first update
|
||||||
|
setTimeout(function () {
|
||||||
|
log.info(`Forcing update of timing, ${ms}`);
|
||||||
|
this.data[cmd] = ms;
|
||||||
|
id = `#${cmd}_time`;
|
||||||
|
this.updateUI(id, this.data[cmd]);
|
||||||
|
}.bind(this), 5000);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -111,8 +111,7 @@ class Devices {
|
||||||
let connectSuccess : any
|
let connectSuccess : any
|
||||||
let verifySuccess : any
|
let verifySuccess : any
|
||||||
let device : any
|
let device : any
|
||||||
let exposure : number
|
|
||||||
let parts : string[]
|
|
||||||
//this.log.info(`distinguish() ${serial}`)
|
//this.log.info(`distinguish() ${serial}`)
|
||||||
try {
|
try {
|
||||||
connectSuccess = await this.arduino.connect('connect', serial, true)
|
connectSuccess = await this.arduino.connect('connect', serial, true)
|
||||||
|
|
@ -153,20 +152,6 @@ class Devices {
|
||||||
this.log.error('Error checking state capability', err)
|
this.log.error('Error checking state capability', err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.arduino.hasState[device]) {
|
|
||||||
if (device.indexOf('camera') !== -1) {
|
|
||||||
parts = this.arduino.stateStr[device].split('G')
|
|
||||||
if (parts.length > 1) {
|
|
||||||
parts = parts[1].split('H')
|
|
||||||
exposure = parseInt(parts[0])
|
|
||||||
if (!isNaN(exposure)) {
|
|
||||||
this.log.info(`Timing for [${device}] = ${exposure}`)
|
|
||||||
this.ui.send('timing', { c : 'c', ms : exposure })
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return device
|
return device
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
|
|
@ -445,6 +430,8 @@ class Devices {
|
||||||
let ps : any = {}
|
let ps : any = {}
|
||||||
let capper : any = {}
|
let capper : any = {}
|
||||||
let checklist : any[] = []
|
let checklist : any[] = []
|
||||||
|
let exposure : number
|
||||||
|
let parts : string[]
|
||||||
|
|
||||||
this.connected = {
|
this.connected = {
|
||||||
projector : false,
|
projector : false,
|
||||||
|
|
@ -482,6 +469,17 @@ class Devices {
|
||||||
if (!this.connected.camera) {
|
if (!this.connected.camera) {
|
||||||
await this.fakeCamera()
|
await this.fakeCamera()
|
||||||
} else if (this.arduino.hasState['camera']) {
|
} else if (this.arduino.hasState['camera']) {
|
||||||
|
if (device.indexOf('camera') !== -1) {
|
||||||
|
parts = this.arduino.stateStr[device].split('G')
|
||||||
|
if (parts.length > 1) {
|
||||||
|
parts = parts[1].split('H')
|
||||||
|
exposure = parseInt(parts[0])
|
||||||
|
if (!isNaN(exposure)) {
|
||||||
|
this.log.info(`Timing for [${device}] = ${exposure}`)
|
||||||
|
this.ui.send('timing', { c : 'c', ms : exposure })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
c.state = true
|
c.state = true
|
||||||
c.exposure = true
|
c.exposure = true
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue