Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-06-19 00:41:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: bump wpilib to 2025.3.2 and fix mypy errors (#1819)

Browse Source
This commit is contained in:
Sam Freund
2025-03-19 00:31:59 -05:00
committed by GitHub
parent abbf3f2820
commit 30645803e6
13 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@@ -4,7 +4,7 @@ plugins {
id "cpp"
id "com.diffplug.spotless" version "6.24.0"
id "edu.wpi.first.wpilib.repositories.WPILibRepositoriesPlugin" version "2020.2"
id "edu.wpi.first.GradleRIO" version "2025.3.1"
id "edu.wpi.first.GradleRIO" version "2025.3.2"
id 'edu.wpi.first.WpilibTools' version '1.3.0'
id 'com.google.protobuf' version '0.9.3' apply false
id 'edu.wpi.first.GradleJni' version '1.1.0'
@@ -33,7 +33,7 @@ ext.allOutputsFolder = file("$project.buildDir/outputs")
apply from: "versioningHelper.gradle"
ext {
wpilibVersion = "2025.3.1"
wpilibVersion = "2025.3.2"
wpimathVersion = wpilibVersion
openCVYear = "2025"
openCVversion = "4.10.0-3"

2
docs/source/docs/advanced-installation/sw_install/windows-pc.md
View File

@@ -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.3.1) 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.3.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"

4
photon-lib/py/photonlibpy/simulation/photonCameraSim.py
View File

@@ -477,11 +477,11 @@ class PhotonCameraSim:
intrinsics = self.prop.getIntrinsics()
intrinsicsView = intrinsics.flatten().tolist()
self.ts.cameraIntrinsicsPublisher.set(intrinsicsView, receiveTimestamp_us)
self.ts.cameraIntrinsicsPublisher.set(list(intrinsicsView), receiveTimestamp_us)
distortion = self.prop.getDistCoeffs()
distortionView = distortion.flatten().tolist()
self.ts.cameraDistortionPublisher.set(distortionView, receiveTimestamp_us)
self.ts.cameraDistortionPublisher.set(list(distortionView), receiveTimestamp_us)
self.ts.heartbeatPublisher.set(self.heartbeatCounter, receiveTimestamp_us)
self.heartbeatCounter += 1

10
photon-lib/py/setup.py
View File

@@ -61,11 +61,11 @@ setup(
version=versionString,
install_requires=[
"numpy~=2.1",
"wpilib<2026,>=2025.3.1",
"robotpy-wpimath<2026,>=2025.3.1",
"robotpy-apriltag<2026,>=2025.3.1",
"robotpy-cscore<2026,>=2025.3.1",
"pyntcore<2026,>=2025.3.1",
"wpilib<2026,>=2025.3.2",
"robotpy-wpimath<2026,>=2025.3.2",
"robotpy-apriltag<2026,>=2025.3.2",
"robotpy-cscore<2026,>=2025.3.2",
"pyntcore<2026,>=2025.3.2",
"opencv-python;platform_machine!='roborio'",
],
description=descriptionStr,

6
photonlib-cpp-examples/aimandrange/build.gradle
View File

@@ -1,7 +1,7 @@
plugins {
id "cpp"
id "google-test-test-suite"
id "edu.wpi.first.GradleRIO" version "2025.3.1"
id "edu.wpi.first.GradleRIO" version "2025.3.2"
}
repositories {
@@ -11,8 +11,8 @@ repositories {
wpi.maven.useLocal = false
wpi.maven.useDevelopment = false
wpi.versions.wpilibVersion = "2025.3.1"
wpi.versions.wpimathVersion = "2025.3.1"
wpi.versions.wpilibVersion = "2025.3.2"
wpi.versions.wpimathVersion = "2025.3.2"
// Define my targets (RoboRIO) and artifacts (deployable files)
// This is added by GradleRIO's backing project DeployUtils.

6
photonlib-cpp-examples/aimattarget/build.gradle
View File

@@ -1,7 +1,7 @@
plugins {
id "cpp"
id "google-test-test-suite"
id "edu.wpi.first.GradleRIO" version "2025.3.1"
id "edu.wpi.first.GradleRIO" version "2025.3.2"
}
repositories {
@@ -11,8 +11,8 @@ repositories {
wpi.maven.useLocal = false
wpi.maven.useDevelopment = false
wpi.versions.wpilibVersion = "2025.3.1"
wpi.versions.wpimathVersion = "2025.3.1"
wpi.versions.wpilibVersion = "2025.3.2"
wpi.versions.wpimathVersion = "2025.3.2"
// Define my targets (RoboRIO) and artifacts (deployable files)
// This is added by GradleRIO's backing project DeployUtils.

6
photonlib-cpp-examples/poseest/build.gradle
View File

@@ -1,7 +1,7 @@
plugins {
id "cpp"
id "google-test-test-suite"
id "edu.wpi.first.GradleRIO" version "2025.3.1"
id "edu.wpi.first.GradleRIO" version "2025.3.2"
}
repositories {
@@ -11,8 +11,8 @@ repositories {
wpi.maven.useLocal = false
wpi.maven.useDevelopment = false
wpi.versions.wpilibVersion = "2025.3.1"
wpi.versions.wpimathVersion = "2025.3.1"
wpi.versions.wpilibVersion = "2025.3.2"
wpi.versions.wpimathVersion = "2025.3.2"
// Define my targets (RoboRIO) and artifacts (deployable files)
// This is added by GradleRIO's backing project DeployUtils.

6
photonlib-java-examples/aimandrange/build.gradle
View File

@@ -1,6 +1,6 @@
plugins {
id "java"
id "edu.wpi.first.GradleRIO" version "2025.3.1"
id "edu.wpi.first.GradleRIO" version "2025.3.2"
}
sourceCompatibility = JavaVersion.VERSION_17
@@ -13,8 +13,8 @@ repositories {
}
wpi.maven.useDevelopment = true
wpi.versions.wpilibVersion = "2025.3.1"
wpi.versions.wpimathVersion = "2025.3.1"
wpi.versions.wpilibVersion = "2025.3.2"
wpi.versions.wpimathVersion = "2025.3.2"
// Define my targets (RoboRIO) and artifacts (deployable files)

6
photonlib-java-examples/aimattarget/build.gradle
View File

@@ -1,6 +1,6 @@
plugins {
id "java"
id "edu.wpi.first.GradleRIO" version "2025.3.1"
id "edu.wpi.first.GradleRIO" version "2025.3.2"
}
sourceCompatibility = JavaVersion.VERSION_17
@@ -9,8 +9,8 @@ targetCompatibility = JavaVersion.VERSION_17
def ROBOT_MAIN_CLASS = "frc.robot.Main"
wpi.maven.useDevelopment = true
wpi.versions.wpilibVersion = "2025.3.1"
wpi.versions.wpimathVersion = "2025.3.1"
wpi.versions.wpilibVersion = "2025.3.2"
wpi.versions.wpimathVersion = "2025.3.2"
// Define my targets (RoboRIO) and artifacts (deployable files)

6
photonlib-java-examples/poseest/build.gradle
View File

@@ -1,6 +1,6 @@
plugins {
id "java"
id "edu.wpi.first.GradleRIO" version "2025.3.1"
id "edu.wpi.first.GradleRIO" version "2025.3.2"
}
sourceCompatibility = JavaVersion.VERSION_17
@@ -9,8 +9,8 @@ targetCompatibility = JavaVersion.VERSION_17
def ROBOT_MAIN_CLASS = "frc.robot.Main"
wpi.maven.useDevelopment = true
wpi.versions.wpilibVersion = "2025.3.1"
wpi.versions.wpimathVersion = "2025.3.1"
wpi.versions.wpilibVersion = "2025.3.2"
wpi.versions.wpimathVersion = "2025.3.2"
// Define my targets (RoboRIO) and artifacts (deployable files)

2
photonlib-python-examples/aimandrange/pyproject.toml
View File

@@ -6,7 +6,7 @@
[tool.robotpy]
# Version of robotpy this project depends on
robotpy_version = "2025.3.1"
robotpy_version = "2025.3.2"
# Which extra RobotPy components should be installed
# -> equivalent to `pip install robotpy[extra1, ...]

2
photonlib-python-examples/aimattarget/pyproject.toml
View File

@@ -6,7 +6,7 @@
[tool.robotpy]
# Version of robotpy this project depends on
robotpy_version = "2025.3.1"
robotpy_version = "2025.3.2"
# Which extra RobotPy components should be installed
# -> equivalent to `pip install robotpy[extra1, ...]

2
photonlib-python-examples/poseest/pyproject.toml
View File

@@ -6,7 +6,7 @@
[tool.robotpy]
# Version of robotpy this project depends on
robotpy_version = "2025.3.1"
robotpy_version = "2025.3.2"
# Which extra RobotPy components should be installed
# -> equivalent to `pip install robotpy[extra1, ...]