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

Remove blacklistedResIndices from HardwareConfig

Browse Source 
Matt says this was for mmal, and we use libcamera now, so this is unnecessary now. Also, the filtering logic that used blacklistedResIndices was completely broken.
This commit is contained in:
Gold856
2025-03-30 00:15:32 -04:00
committed by Matt Morley
parent 75dee20d77
commit 23d5e5b34f
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
photon-core/src/main/java/org/photonvision/common/configuration/HardwareConfig.java
View File

@@ -19,8 +19,6 @@ package org.photonvision.common.configuration;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@JsonIgnoreProperties(ignoreUnknown = true) @JsonIgnoreProperties(ignoreUnknown = true)
public record HardwareConfig( public record HardwareConfig(
@@ -49,8 +47,7 @@ public record HardwareConfig(
String diskUsageCommand, String diskUsageCommand,
// Device stuff // Device stuff
String restartHardwareCommand, String restartHardwareCommand,
double vendorFOV, // -1 for unmanaged double vendorFOV) { // -1 for unmanaged
List<Integer> blacklistedResIndices) { // this happens before the defaults are applied)
public HardwareConfig() { public HardwareConfig() {
this( this(
@@ -74,8 +71,7 @@ public record HardwareConfig(
"", // gpuMemUsageCommand "", // gpuMemUsageCommand
"", // diskUsageCommand "", // diskUsageCommand
"", // restartHardwareCommand "", // restartHardwareCommand
-1, // vendorFOV -1); // vendorFOV
Collections.emptyList()); // blacklistedResIndices
} }
/** /**

8
photon-core/src/main/java/org/photonvision/vision/camera/USBCameras/GenericUSBCameraSettables.java
View File

@@ -31,7 +31,6 @@ import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.photonvision.common.configuration.CameraConfiguration; import org.photonvision.common.configuration.CameraConfiguration;
import org.photonvision.common.configuration.ConfigManager;
import org.photonvision.vision.camera.CameraQuirk; import org.photonvision.vision.camera.CameraQuirk;
import org.photonvision.vision.processes.VisionSourceSettables; import org.photonvision.vision.processes.VisionSourceSettables;
@@ -306,13 +305,6 @@ public class GenericUSBCameraSettables extends VisionSourceSettables {
.collect(Collectors.toList()); .collect(Collectors.toList());
Collections.reverse(sortedList); Collections.reverse(sortedList);
// On vendor cameras, respect blacklisted indices
var indexBlacklist =
ConfigManager.getInstance().getConfig().getHardwareConfig().blacklistedResIndices();
for (int badIdx : indexBlacklist) {
sortedList.remove(badIdx);
}
for (VideoMode videoMode : sortedList) { for (VideoMode videoMode : sortedList) {
videoModes.put(sortedList.indexOf(videoMode), videoMode); videoModes.put(sortedList.indexOf(videoMode), videoMode);
} }