diff --git a/docs/source/docs/objectDetection/about-object-detection.md b/docs/source/docs/objectDetection/about-object-detection.md index 3b062c952f..2e90162519 100644 --- a/docs/source/docs/objectDetection/about-object-detection.md +++ b/docs/source/docs/objectDetection/about-object-detection.md @@ -4,7 +4,7 @@ PhotonVision supports object detection using neural network accelerator hardware, commonly known as an NPU. The two coprocessors currently supported are the {ref}`Orange Pi 5 ` and the {ref}`Rubik Pi 3 `. -PhotonVision currently ships with a model trained on the [COCO dataset](https://cocodataset.org/) by [Ultralytics](https://github.com/ultralytics/ultralytics) (this model is licensed under [AGPLv3](https://www.gnu.org/licenses/agpl-3.0.en.html)). This model is meant to be used for testing and other miscellaneous purposes. It is not meant to be used in competition. For the 2025 post-season, PhotonVision also ships with a pretrained ALGAE model. A model to detect coral is available in the PhotonVision discord, but will not be distributed with PhotonVision. +PhotonVision currently ships with a model trained on the [COCO dataset](https://cocodataset.org/) by [Ultralytics](https://github.com/ultralytics/ultralytics) (this model is licensed under [AGPLv3](https://www.gnu.org/licenses/agpl-3.0.en.html)). This model is meant to be used for testing and other miscellaneous purposes. It is not meant to be used in competition. For the 2026 season, PhotonVision ships with a model to detect FUEL, this is also licensed under AGPL. ## Tracking Objects diff --git a/photon-core/src/main/java/org/photonvision/common/configuration/NeuralNetworkModelManager.java b/photon-core/src/main/java/org/photonvision/common/configuration/NeuralNetworkModelManager.java index 2178695bcb..4c8eb722b6 100644 --- a/photon-core/src/main/java/org/photonvision/common/configuration/NeuralNetworkModelManager.java +++ b/photon-core/src/main/java/org/photonvision/common/configuration/NeuralNetworkModelManager.java @@ -149,16 +149,6 @@ private NeuralNetworkPropertyManager getShippedProperties(File modelsDirectory) "hair drier", // Typo in official COCO documentation "toothbrush")); - nnProps.addModelProperties( - new ModelProperties( - Path.of(modelsDirectory.getAbsolutePath(), "algaeV1-640-640-yolov8n.rknn"), - "Algae v8n", - new LinkedList(List.of("Algae")), - 640, - 480, - Family.RKNN, - Version.YOLOV8)); - nnProps.addModelProperties( new ModelProperties( Path.of(modelsDirectory.getAbsolutePath(), "yolov8nCOCO.rknn"), @@ -171,13 +161,13 @@ private NeuralNetworkPropertyManager getShippedProperties(File modelsDirectory) nnProps.addModelProperties( new ModelProperties( - Path.of(modelsDirectory.getAbsolutePath(), "algae-coral-yolov8s.tflite"), - "Algae Coral v8s", - new LinkedList(List.of("Algae", "Coral")), + Path.of(modelsDirectory.getAbsolutePath(), "fuelV1-yolo11n.rknn"), + "Fuel v11n", + new LinkedList(List.of("Fuel")), 640, 640, - Family.RUBIK, - Version.YOLOV8)); + Family.RKNN, + Version.YOLOV11)); nnProps.addModelProperties( new ModelProperties( @@ -189,6 +179,16 @@ private NeuralNetworkPropertyManager getShippedProperties(File modelsDirectory) Family.RUBIK, Version.YOLOV8)); + nnProps.addModelProperties( + new ModelProperties( + Path.of(modelsDirectory.getAbsolutePath(), "fuelV1-yolo11n.tflite"), + "Fuel v11n", + new LinkedList(List.of("Fuel")), + 640, + 640, + Family.RUBIK, + Version.YOLOV11)); + return nnProps; } diff --git a/photon-server/src/main/resources/models/fuelV1-yolo11n.rknn b/photon-server/src/main/resources/models/fuelV1-yolo11n.rknn new file mode 100644 index 0000000000..a1a92ecd49 Binary files /dev/null and b/photon-server/src/main/resources/models/fuelV1-yolo11n.rknn differ diff --git a/photon-server/src/main/resources/models/fuelV1-yolo11n.tflite b/photon-server/src/main/resources/models/fuelV1-yolo11n.tflite new file mode 100644 index 0000000000..fa34e40d88 Binary files /dev/null and b/photon-server/src/main/resources/models/fuelV1-yolo11n.tflite differ diff --git a/photon-server/src/main/resources/models/algae-coral-yolov8s.tflite b/test-resources/models/algae-coral-yolov8s.tflite similarity index 100% rename from photon-server/src/main/resources/models/algae-coral-yolov8s.tflite rename to test-resources/models/algae-coral-yolov8s.tflite diff --git a/photon-server/src/main/resources/models/algaeV1-640-640-yolov8n.rknn b/test-resources/models/algaeV1-640-640-yolov8n.rknn similarity index 100% rename from photon-server/src/main/resources/models/algaeV1-640-640-yolov8n.rknn rename to test-resources/models/algaeV1-640-640-yolov8n.rknn