light9 Changeset - d5750b2aaa9e

Changeset - d5750b2aaa9e

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

drewp@bigasterisk.com - 8 months ago 2024-05-21 21:50:01
drewp@bigasterisk.com

minor cam edits

3 files changed with 10 insertions and 6 deletions:

web/calibrate/FindSafeExposure.ts

web/calibrate/Light9Calibrate.ts

web/calibrate/Light9Camera.ts

0 comments (0 inline, 0 general)

web/calibrate/FindSafeExposure.ts

➞

Show inline comments

@@ @@ -22,24 +22,25 @@ export class FindSafeExposure { @@
+  }
   async run() {
     while (true) {
       const currentOverexposed = await this.gatherSample();
       this.step(currentOverexposed);
       if (this.plot.data.length > 50 || Math.abs(this.expoStep) < 1) {
         this.expo = this.expoMin;
         await this.gatherSample();
         break;
+      }
+    }
     return this.expo;
+  }
   step(currentOverexposed: number) {
     const maxAllowedOverexposedPixels = 5;
     const turnaroundScale = 0.6;
     const stepsPerSide = 3;
     const overexposed = currentOverexposed > maxAllowedOverexposedPixels;
     if (this.expoStep > 0) {
       if (overexposed) {
         this.sameStateSteps += 1;
+      }

web/calibrate/Light9Calibrate.ts

➞

Show inline comments

@@ @@ -72,25 +72,25 @@ export class Light9Calibrate extends Lit @@
     await this.withButtonSpinner(ev, async () => {
       this.collector.updateSettings([
         /// device,attr,value
         [this.device, "http://light9.bigasterisk.com/color", "#ffffff"],
         [this.device, "http://light9.bigasterisk.com/white", 1],
       ]);
     });
+  }
   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) {
     await this.withButtonSpinner(ev, async () => {
       this.collector.updateSettings([
         [this.device, "http://light9.bigasterisk.com/color", "#000000"],
         [this.device, "http://light9.bigasterisk.com/white", 0],
       ]);
     });
+  }
   async markTare(ev: MouseEvent) {
     await this.withButtonSpinner(ev, async () => {});

web/calibrate/Light9Camera.ts

➞

Show inline comments

@@ @@ -76,30 +76,32 @@ export class Light9Camera extends LitEle @@
       video: {
         facingMode: { ideal: "environment" },
         frameRate: { max: 10 },
         width: 640,
         height: 480,
       },
     };
     const stream = await navigator.mediaDevices.getUserMedia(constraints);
     const t = stream.getVideoTracks()[0];
     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;
     this.videoEl.srcObject = stream;
     this.videoEl.play();
     this.videoSettings = this.vtrack.getSettings();
     this.redrawLoop();
+  }
   redrawLoop() {
     if (this.videoEl.videoWidth !== 0 && this.videoEl.videoHeight !== 0) {
@@ @@ -146,24 +148,25 @@ export class Light9CameraSettingsTable e @@
     css`
       table {
         border-collapse: collapse;
+      }
       td {
         border: 1px solid gray;
         padding: 1px 6px;
+      }
     `,
   ];
   boring = [
     "autoGainControl",
     "aspectRatio",
     "backgroundBlur",
     "channelCount",
     "deviceId",
     "displaySurface",
     "echoCancellation",
     "eyeGazeCorrection",
     "faceFraming",
     "groupId",
     "latency",
     "noiseSuppression",
     "pointsOfInterest",
@@ @@ -192,37 +195,37 @@ export class Light9CameraSettingsTable e @@
   render() {
     const rows: TemplateResult<1>[] = [];
     for (const key of Object.keys(this.supportedByBrowser)) {
       if (!this.boring.includes(key)) {
         this.renderRow(key, rows);
+      }
+    }
     return html`<table>
       ${rows}
     </table>`;
+  }
-  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]);
+    }
     let adjuster = html``;
     let conf = this.adjustable[key];
     if (conf !== undefined) {
       adjuster = html`
         <input type="range" min="${conf.min}" max="${conf.max}" value="${this.videoSettings[key]}" data-param="${key}" @input=${this.setFromSlider} />
       `;
+    }
-    rows.push(
+    out.push(
       html`<tr>
         <td>${key}</td>
         <td>${valueDisplay}</td>
         <td>${adjuster}</td>
       </tr>`
     );
+  }
   async setFromSlider(ev: InputEvent) {
     const el = ev.target as HTMLInputElement;
     await this.cam.set(el.dataset.param as string, parseFloat(el.value));
+  }

0 comments (0 inline, 0 general)