From bd7bd29cb80bf7dcbcb2852d122f8cc4d1eb6be9 Mon Sep 17 00:00:00 2001 From: Baku Hashimoto Date: Fri, 6 Oct 2023 19:50:34 +0900 Subject: [PATCH] Consolidate vendor-specific props begins with `vendor:` --- src/TethrPTPUSB/TethrSigma.ts | 8 ++++---- src/configs.ts | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/TethrPTPUSB/TethrSigma.ts b/src/TethrPTPUSB/TethrSigma.ts index 0a3cb2c..2585cf8 100644 --- a/src/TethrPTPUSB/TethrSigma.ts +++ b/src/TethrPTPUSB/TethrSigma.ts @@ -1963,14 +1963,14 @@ export class TethrSigma extends TethrPTPUSB { [0x05, 'incandescent'], [0x06, 'fluorescent'], [0x07, 'flash'], - [0x08, 'custom'], // Custom 1 + [0x08, 'vendor:custom'], // Custom 1 // [0x09, null], // CustomCapture 1 - [0x0a, 'custom2'], // Custom 2 + [0x0a, 'vendor:custom2'], // Custom 2 // [0x0b, null], // CustomCapture 2 - [0x0c, 'custom3'], // Custom 3 + [0x0c, 'vendor:custom3'], // Custom 3 // // [0x0d, null], // CustomCapture 3 [0x0e, 'manual'], // Custom Temperature - [0x0f, 'auto ambience'], // Auto (Light Source Priority) + [0x0f, 'vendor:auto ambience'], // Auto (Light Source Priority) ]) private whiteBalanceTableIFD = new Map([ diff --git a/src/configs.ts b/src/configs.ts index 892778c..8b5cb87 100644 --- a/src/configs.ts +++ b/src/configs.ts @@ -22,7 +22,7 @@ export type ExposureMode = | 'portrait' | 'video' | `C${1 | 2 | 3}` - | `vendor ${string}` + | `vendor:${string}` export type FlashMode = | 'auto' @@ -65,9 +65,8 @@ export type WhiteBalance = | 'tungsten' | 'flash' | 'underwater' - | `manual${'' | 2 | 3 | 4}` - | `custom${'' | 2 | 3 | 4}` - | `vendor ${string}` + | 'manual' + | `vendor:${string}` export type ConfigType = { aperture: Aperture // fNumber