Skip to content

Commit

Permalink
Fix formating errors that are in master (#1627)
Browse files Browse the repository at this point in the history
A few files with format mistakes were merged into master and they cause
spotless and wpiformat to fail. This PR fixes those files.
  • Loading branch information
crschardt authored Dec 6, 2024
1 parent 857a30d commit 4997ad9
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 2 additions & 3 deletions photon-lib/py/photonlibpy/simulation/photonCameraSim.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,8 @@ def __init__(
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)
Expand Down
2 changes: 0 additions & 2 deletions photon-lib/py/photonlibpy/simulation/simCameraProperties.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ def setCalibrationFromIntrinsics(
newCamIntrinsics: np.ndarray,
newDistCoeffs: np.ndarray,
) -> None:

self.resWidth = width
self.resHeight = height
self.camIntrinsics = newCamIntrinsics
Expand Down Expand Up @@ -355,7 +354,6 @@ def getVisibleLine(

# 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
Expand Down

0 comments on commit 4997ad9

Please sign in to comment.