Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-07-03 03:01:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor Rubik OD code to generic TFLite OD code (#2516)

Browse Source
This commit is contained in:
Jade
2026-06-30 01:02:47 +08:00
committed by GitHub
parent bd8fa28ab7
commit 8f560e5b1f
7 changed files with 37 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
photon-server/build.gradle
View File

@@ -17,6 +17,10 @@ dependencies {
// Needed for Javalin Runtime Logging
implementation "org.slf4j:slf4j-simple:2.0.7"
implementation("org.photonvision:tflite_jni-java:$tfliteVersion") {
transitive = false
}
}
group = 'org.photonvision'

5
photon-server/src/main/java/org/photonvision/server/RequestHandler.java
View File

@@ -55,12 +55,13 @@ import org.photonvision.common.networking.NetworkManager;
import org.photonvision.common.util.ShellExec;
import org.photonvision.common.util.TimedTaskManager;
import org.photonvision.common.util.file.ProgramDirectoryUtilities;
import org.photonvision.tflite.TFLiteJNI.TFLiteSource;
import org.photonvision.vision.calibration.CameraCalibrationCoefficients;
import org.photonvision.vision.camera.CameraQuirk;
import org.photonvision.vision.camera.PVCameraInfo;
import org.photonvision.vision.objects.ObjectDetector;
import org.photonvision.vision.objects.RknnModel;
import org.photonvision.vision.objects.RubikModel;
import org.photonvision.vision.objects.TFLiteModel;
import org.photonvision.vision.processes.VisionSourceManager;
import org.zeroturnaround.zip.ZipUtil;
@@ -679,7 +680,7 @@ public class RequestHandler {
try {
objDetector =
switch (family) {
case RUBIK -> new RubikModel(modelProperties).load();
case RUBIK -> new TFLiteModel(modelProperties, TFLiteSource.RUBIK).load();
case RKNN -> new RknnModel(modelProperties).load();
};
} catch (RuntimeException e) {