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

Fix camera matching (#87)

Browse Source 
* Add name matching

* Remove index matching

* Add name-only matching fallback

* Fix debug log location, fix name matching

* Apply LessSpot
This commit is contained in:
Banks T
2020-08-08 21:30:39 -04:00
committed by GitHub
parent ff58381056
commit 86ea661ed9
1 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
photon-server/src/main/java/org/photonvision/vision/processes/VisionSourceManager.java
View File

@@ -21,7 +21,6 @@ import edu.wpi.cscore.UsbCamera;
import edu.wpi.cscore.UsbCameraInfo;
import java.util.*;
import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
import org.photonvision.common.configuration.CameraConfiguration;
import org.photonvision.common.logging.LogGroup;
import org.photonvision.common.logging.Logger;
@@ -100,27 +99,29 @@ public class VisionSourceManager {
for (CameraConfiguration config : loadedUsbCamConfigs) {
UsbCameraInfo cameraInfo;
// Load by path vs by index -- if the path is numeric we'll match by index
if (StringUtils.isNumeric(config.path)) {
// match by index
var index = Integer.parseInt(config.path);
logger.debug(
"Trying to find a match for loaded camera " + config.baseName + " with index " + index);
// attempt matching by path and basename
logger.debug(
"Trying to find a match for loaded camera "
+ config.baseName
+ " with path "
+ config.path);
cameraInfo =
detectedCameraList.stream()
.filter(
usbCameraInfo ->
usbCameraInfo.path.equals(config.path)
&& cameraNameToBaseName(usbCameraInfo.name).equals(config.baseName))
.findFirst()
.orElse(null);
// if path based fails, attempt basename only match
if (cameraInfo == null) {
logger.debug("Failed to match by path and name, falling back to name-only match");
cameraInfo =
detectedCameraList.stream()
.filter(usbCameraInfo -> usbCameraInfo.dev == index)
.findFirst()
.orElse(null);
} else {
// matching by path
logger.debug(
"Trying to find a match for loaded camera "
+ config.baseName
+ " with path "
+ config.path);
cameraInfo =
detectedCameraList.stream()
.filter(usbCameraInfo -> usbCameraInfo.path.equals(config.path))
.filter(
usbCameraInfo ->
cameraNameToBaseName(usbCameraInfo.name).equals(config.baseName))
.findFirst()
.orElse(null);
}
@@ -139,9 +140,8 @@ public class VisionSourceManager {
"After matching loaded configs " + detectedCameraList.size() + " cameras were unmatched.");
for (UsbCameraInfo info : detectedCameraList) {
// create new camera config for all new cameras
String baseName =
info.name.replaceAll("[^\\x00-\\x7F]", ""); // Remove all non-ASCII characters
String uniqueName = baseName.replaceAll(" ", "_"); // Replace spaces with underscores;
String baseName = cameraNameToBaseName(info.name);
String uniqueName = baseNameToUniqueName(baseName);
int suffix = 0;
while (containsName(cameraConfigurations, uniqueName)) {
@@ -160,6 +160,16 @@ public class VisionSourceManager {
return cameraConfigurations;
}
// Remove all non-ASCII characters
private static String cameraNameToBaseName(String cameraName) {
return cameraName.replaceAll("[^\\x00-\\x7F]", "");
}
// Replace spaces with underscores
private static String baseNameToUniqueName(String baseName) {
return baseName.replaceAll(" ", "_");
}
private static List<VisionSource> loadVisionSourcesFromCamConfigs(
List<CameraConfiguration> camConfigs) {
List<VisionSource> usbCameraSources = new ArrayList<>();