From 94324edfe2e7c9a3f54a9eab21d95e43c7e19e13 Mon Sep 17 00:00:00 2001 From: Chris Date: Sun, 21 Jul 2024 08:41:33 -0500 Subject: [PATCH] aligned ts/vue --- .../components/cameras/CameraSettingsCard.vue | 30 +++++++++---------- photon-client/src/types/SettingTypes.ts | 13 ++++---- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/photon-client/src/components/cameras/CameraSettingsCard.vue b/photon-client/src/components/cameras/CameraSettingsCard.vue index 5c58b688be..100aac0c2e 100644 --- a/photon-client/src/components/cameras/CameraSettingsCard.vue +++ b/photon-client/src/components/cameras/CameraSettingsCard.vue @@ -13,32 +13,32 @@ const tempSettingsStruct = ref({ const arducamSelectWrapper = computed({ get: () => { - if (tempSettingsStruct.value.quirksToChange.ArduOV9281) return 1; - else if (tempSettingsStruct.value.quirksToChange.ArduOV2311) return 2; - else if (tempSettingsStruct.value.quirksToChange.ArduOV9782) return 3; + if (tempSettingsStruct.value.quirksToChange.ArduOV9281Controls) return 1; + else if (tempSettingsStruct.value.quirksToChange.ArduOV2311Controls) return 2; + else if (tempSettingsStruct.value.quirksToChange.ArduOV9782Controls) return 3; else return 0; }, set: (v) => { switch (v) { case 1: - tempSettingsStruct.value.quirksToChange.ArduOV9281 = true; - tempSettingsStruct.value.quirksToChange.ArduOV2311 = false; - tempSettingsStruct.value.quirksToChange.ArduOV9782 = false; + tempSettingsStruct.value.quirksToChange.ArduOV9281Controls = true; + tempSettingsStruct.value.quirksToChange.ArduOV2311Controls = false; + tempSettingsStruct.value.quirksToChange.ArduOV9782Controls = false; break; case 2: - tempSettingsStruct.value.quirksToChange.ArduOV9281 = false; - tempSettingsStruct.value.quirksToChange.ArduOV2311 = true; - tempSettingsStruct.value.quirksToChange.ArduOV9782 = false; + tempSettingsStruct.value.quirksToChange.ArduOV9281Controls = false; + tempSettingsStruct.value.quirksToChange.ArduOV2311Controls = true; + tempSettingsStruct.value.quirksToChange.ArduOV9782Controls = false; break; case 3: - tempSettingsStruct.value.quirksToChange.ArduOV9281 = false; - tempSettingsStruct.value.quirksToChange.ArduOV2311 = false; - tempSettingsStruct.value.quirksToChange.ArduOV9782 = true; + tempSettingsStruct.value.quirksToChange.ArduOV9281Controls = false; + tempSettingsStruct.value.quirksToChange.ArduOV2311Controls = false; + tempSettingsStruct.value.quirksToChange.ArduOV9782Controls = true; break; default: - tempSettingsStruct.value.quirksToChange.ArduOV9281 = false; - tempSettingsStruct.value.quirksToChange.ArduOV2311 = false; - tempSettingsStruct.value.quirksToChange.ArduOV9782 = false; + tempSettingsStruct.value.quirksToChange.ArduOV9281Controls = false; + tempSettingsStruct.value.quirksToChange.ArduOV2311Controls = false; + tempSettingsStruct.value.quirksToChange.ArduOV9782Controls = false; break; } } diff --git a/photon-client/src/types/SettingTypes.ts b/photon-client/src/types/SettingTypes.ts index 3f8b68be3d..8db529b85e 100644 --- a/photon-client/src/types/SettingTypes.ts +++ b/photon-client/src/types/SettingTypes.ts @@ -118,7 +118,7 @@ export interface CvPoint3 { x: number; y: number; z: number; -} +} export interface CvPoint { x: number; y: number; @@ -148,15 +148,18 @@ export interface CameraCalibrationResult { export enum ValidQuirks { AWBGain = "AWBGain", AdjustableFocus = "AdjustableFocus", - ArduOV9281 = "ArduOV9281", - ArduOV2311 = "ArduOV2311", - ArduOV9782 = "ArduOV9782", + ArduOV9281Controls = "ArduOV9281Controls", + ArduOV2311Controls = "ArduOV2311Controls", + ArduOV9782Controls = "ArduOV9782Controls", ArduCamCamera = "ArduCamCamera", CompletelyBroken = "CompletelyBroken", FPSCap100 = "FPSCap100", Gain = "Gain", PiCam = "PiCam", - StickyFPS = "StickyFPS" + StickyFPS = "StickyFPS", + LifeCamControls = "LifeCamControls", + PsEyeControls = "PsEyeControls" + } export interface QuirkyCamera {