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

Revert "Add checking of current and requested video_mode (#859)" #887

Merged
merged 1 commit into from
Jul 20, 2023
Merged

Revert "Add checking of current and requested video_mode (#859)" #887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
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.

2 changes: 1 addition & 1 deletion photon-core/src/main/java/org/photonvision/vision/processes/PipelineManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ public boolean getDriverMode() {
/**
* Sorts the pipeline list by index, and reassigns their indexes to match the new order. <br>
* <br>
* I don't like this but I have no other ideas, and it works so ¯\_(ツ)_/¯
* I don't like this but I have no other ideas, and it works so
*/
private void reassignIndexes() {
userPipelineSettings.sort(PipelineSettingsIndexComparator);
Expand Down
6 changes: 0 additions & 6 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,11 +63,6 @@ public void setVideoModeInternal(int index) {
}

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

logger.info(
"Setting video mode to "
+ "FPS: "
Expand Down
1 change: 1 addition & 0 deletions photon-lib/src/main/native/include/photonlib/SimPhotonCamera.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#pragma once

#include <algorithm>
#include <functional>
#include <memory>
#include <string>
#include <vector>
Expand Down
Loading