Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump wpilib version and replace VideoMode equality #873

Closed
wants to merge 8 commits into from
Closed

Bump wpilib version and replace VideoMode equality #873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
566e0c1
Bump wpilib versionto fix mac test builds
mcm001 Jun 18, 2023
92caed6
Merge branch 'master' into mac-bump
mcm001 Jun 18, 2023
91d7855
Delete libphotonlibcamera.so
srimanachanta Jun 21, 2023
77bf92d
bump wpilib version
srimanachanta Jun 21, 2023
1022afe
Use VideoMode equals override
srimanachanta Jun 21, 2023
78e4fdc
Merge remote-tracking branch 'upstream/master' into mac-bump
mcm001 Jun 23, 2023
866f66b
Bump wpilib again
mcm001 Jun 23, 2023
66e8f87
Bump mac runner version
mcm001 Jun 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ jobs:

# Run Gradle Tests.
- name: Gradle Tests
run: ./gradlew testHeadless -i --max-workers 1 --stacktrace
run: ./gradlew testHeadless --debug --max-workers 1 --stacktrace

# Generate Coverage Report.
- name: Gradle Coverage
Expand Down Expand Up @@ -197,14 +197,14 @@ jobs:
# Building photonlib
photonlib-build-host:
env:
MACOSX_DEPLOYMENT_TARGET: 10.14
MACOSX_DEPLOYMENT_TARGET: 11
strategy:
fail-fast: false
matrix:
include:
- os: windows-2022
artifact-name: Win64
- os: macos-11
- os: macOS-12
artifact-name: macOS
- os: ubuntu-22.04
artifact-name: Linux
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ allprojects {
apply from: "versioningHelper.gradle"

ext {
wpilibVersion = "2023.4.2"
wpilibVersion = "2023.4.3-87-g90602cc"
opencvVersion = "4.6.0-4"
joglVersion = "2.4.0-rc-20200307"
pubVersion = versionString
Expand Down
33 changes: 0 additions & 33 deletions photon-core/src/main/java/org/photonvision/common/util/vision/OpenCvUtils.java
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions photon-core/src/main/java/org/photonvision/vision/processes/VisionSourceSettables.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import org.photonvision.common.configuration.CameraConfiguration;
import org.photonvision.common.logging.LogGroup;
import org.photonvision.common.logging.Logger;
import org.photonvision.common.util.vision.OpenCvUtils;
import org.photonvision.vision.calibration.CameraCalibrationCoefficients;
import org.photonvision.vision.frame.FrameStaticProperties;

Expand Down Expand Up @@ -64,7 +63,7 @@ public void setVideoModeInternal(int index) {
}

public void setVideoMode(VideoMode mode) {
if (OpenCvUtils.videoModeEquals(mode, getCurrentVideoMode())) {
if (getCurrentVideoMode().equals(mode)) {
logger.info("Requested video mode is already the current video mode");
return;
}
Expand Down
Loading