From 4997ad91150ea9ea2ebbf79b66462a21a4a77a37 Mon Sep 17 00:00:00 2001 From: Craig Schardt Date: Fri, 6 Dec 2024 16:21:05 -0600 Subject: [PATCH] Fix formating errors that are in master (#1627) A few files with format mistakes were merged into master and they cause spotless and wpiformat to fail. This PR fixes those files. --- .../docs/advanced-installation/sw_install/windows-pc.md | 2 +- photon-lib/py/photonlibpy/simulation/photonCameraSim.py | 5 ++--- photon-lib/py/photonlibpy/simulation/simCameraProperties.py | 2 -- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/docs/source/docs/advanced-installation/sw_install/windows-pc.md b/docs/source/docs/advanced-installation/sw_install/windows-pc.md index ce9e74303..d152cef33 100644 --- a/docs/source/docs/advanced-installation/sw_install/windows-pc.md +++ b/docs/source/docs/advanced-installation/sw_install/windows-pc.md @@ -12,7 +12,7 @@ Bonjour provides more stable networking when using Windows PCs. Install [Bonjour ## Installing Java -PhotonVision requires a JDK installed and on the system path. **JDK 17 is needed. Windows Users must use the JDK that ships with WPILib.** [Download and install it from here.](https://github.com/wpilibsuite/allwpilib/releases/tag/v2025.1.1-beta-2) Either ensure the only Java on your PATH is the WPILIB Java or specify it to gradle with `-Dorg.gradle.java.home=C:\Users\Public\wpilib\2025\jdk`: +PhotonVision requires a JDK installed and on the system path. **JDK 17 is needed. Windows Users must use the JDK that ships with WPILib.** [Download and install it from here.](https://github.com/wpilibsuite/allwpilib/releases/tag/v2025.1.1-beta-2) Either ensure the only Java on your PATH is the WPILIB Java or specify it to gradle with `-Dorg.gradle.java.home=C:\Users\Public\wpilib\2025\jdk`: ``` > ./gradlew run "-Dorg.gradle.java.home=C:\Users\Public\wpilib\2025\jdk" diff --git a/photon-lib/py/photonlibpy/simulation/photonCameraSim.py b/photon-lib/py/photonlibpy/simulation/photonCameraSim.py index e4e899184..a2e712198 100644 --- a/photon-lib/py/photonlibpy/simulation/photonCameraSim.py +++ b/photon-lib/py/photonlibpy/simulation/photonCameraSim.py @@ -60,9 +60,8 @@ class PhotonCameraSim: self.videoSimRawEnabled: bool = False self.videoSimWireframeEnabled: bool = False self.videoSimWireframeResolution: float = 0.1 - self.videoSimProcEnabled: bool = ( - False # TODO switch this back to default True when the functionality is enabled - ) + # TODO switch this back to default True when the functionality is enabled + self.videoSimProcEnabled: bool = False self.heartbeatCounter: int = 0 self.nextNtEntryTime = wpilib.Timer.getFPGATimestamp() self.tagLayout = AprilTagFieldLayout.loadField(AprilTagField.k2024Crescendo) diff --git a/photon-lib/py/photonlibpy/simulation/simCameraProperties.py b/photon-lib/py/photonlibpy/simulation/simCameraProperties.py index cdd675a1c..b2bb20b6b 100644 --- a/photon-lib/py/photonlibpy/simulation/simCameraProperties.py +++ b/photon-lib/py/photonlibpy/simulation/simCameraProperties.py @@ -80,7 +80,6 @@ class SimCameraProperties: newCamIntrinsics: np.ndarray, newDistCoeffs: np.ndarray, ) -> None: - self.resWidth = width self.resHeight = height self.camIntrinsics = newCamIntrinsics @@ -355,7 +354,6 @@ class SimCameraProperties: # find intersections for i, normal in enumerate(self.viewplanes): - # // we want to know the value of t when the line intercepts this plane # // parametrized: v = t * ab + a, where v lies on the plane # // we can find the projection of a onto the plane normal