# HG changeset patch # User drewp@bigasterisk.com # Date 2024-05-21 21:50:01 # Node ID d5750b2aaa9e87d3107d4f01a15baa8e60b11003 # Parent e3af0ac507c84cfccfe974b309a018a6c47c1e3f minor cam edits diff --git a/web/calibrate/FindSafeExposure.ts b/web/calibrate/FindSafeExposure.ts --- a/web/calibrate/FindSafeExposure.ts +++ b/web/calibrate/FindSafeExposure.ts @@ -31,6 +31,7 @@ export class FindSafeExposure { break; } } + return this.expo; } step(currentOverexposed: number) { diff --git a/web/calibrate/Light9Calibrate.ts b/web/calibrate/Light9Calibrate.ts --- a/web/calibrate/Light9Calibrate.ts +++ b/web/calibrate/Light9Calibrate.ts @@ -81,7 +81,7 @@ export class Light9Calibrate extends Lit async findSafeExposure(ev: MouseEvent) { await this.withButtonSpinner(ev, async () => { const algo = new FindSafeExposure(this.cam!, this.plot!); - await algo.run(); + const expo = await algo.run(); }); } async setToZero(ev: MouseEvent) { diff --git a/web/calibrate/Light9Camera.ts b/web/calibrate/Light9Camera.ts --- a/web/calibrate/Light9Camera.ts +++ b/web/calibrate/Light9Camera.ts @@ -85,12 +85,14 @@ export class Light9Camera extends LitEle await t.applyConstraints({ brightness: 0, contrast: 32, - colorTemperature: 6600, + colorTemperature: 4600, exposureMode: "manual", exposureTime: 250, whiteBalanceMode: "manual", - focusMode: "manual", - focusDistance: 235, + // this could stop focus from moving around, but it also makes my cam + // click on every page reload + // focusMode: "manual", + // focusDistance: 235, } as MediaTrackConstraints); this.vtrack = t; @@ -155,6 +157,7 @@ export class Light9CameraSettingsTable e ]; boring = [ + "autoGainControl", "aspectRatio", "backgroundBlur", "channelCount", @@ -201,7 +204,7 @@ export class Light9CameraSettingsTable e `; } - private renderRow(key: string, rows: any[]) { + private renderRow(key: string, out: TemplateResult<1>[]) { let valueDisplay = ""; if (this.videoSettings[key] !== undefined) { valueDisplay = JSON.stringify(this.videoSettings[key]); @@ -213,7 +216,7 @@ export class Light9CameraSettingsTable e `; } - rows.push( + out.push( html` ${key} ${valueDisplay}