diff --git a/cameraserver/src/main/java/edu/wpi/first/cameraserver/CameraServer.java b/cameraserver/src/main/java/edu/wpi/first/cameraserver/CameraServer.java
index 0ff47f8f5c..c245c06f8b 100644
--- a/cameraserver/src/main/java/edu/wpi/first/cameraserver/CameraServer.java
+++ b/cameraserver/src/main/java/edu/wpi/first/cameraserver/CameraServer.java
@@ -4,7 +4,6 @@
package edu.wpi.first.cameraserver;
-import edu.wpi.first.cscore.AxisCamera;
import edu.wpi.first.cscore.CameraServerJNI;
import edu.wpi.first.cscore.CvSink;
import edu.wpi.first.cscore.CvSource;
@@ -603,72 +602,6 @@ public final class CameraServer {
return server;
}
- /**
- * Adds an Axis IP camera.
- *
- *
This overload calls {@link #addAxisCamera(String, String)} with name "Axis Camera".
- *
- * @param host Camera host IP or DNS name (e.g. "10.x.y.11")
- * @return The Axis camera capturing images.
- * @deprecated Call startAutomaticCapture with a HttpCamera instead.
- */
- @Deprecated(forRemoval = true, since = "2025")
- @SuppressWarnings("removal")
- public static AxisCamera addAxisCamera(String host) {
- return addAxisCamera("Axis Camera", host);
- }
-
- /**
- * Adds an Axis IP camera.
- *
- *
This overload calls {@link #addAxisCamera(String, String[])} with name "Axis Camera".
- *
- * @param hosts Array of Camera host IPs/DNS names
- * @return The Axis camera capturing images.
- * @deprecated Call startAutomaticCapture with a HttpCamera instead.
- */
- @Deprecated(forRemoval = true, since = "2025")
- @SuppressWarnings("removal")
- public static AxisCamera addAxisCamera(String[] hosts) {
- return addAxisCamera("Axis Camera", hosts);
- }
-
- /**
- * Adds an Axis IP camera.
- *
- * @param name The name to give the camera
- * @param host Camera host IP or DNS name (e.g. "10.x.y.11")
- * @return The Axis camera capturing images.
- * @deprecated Call startAutomaticCapture with a HttpCamera instead.
- */
- @Deprecated(forRemoval = true, since = "2025")
- @SuppressWarnings("removal")
- public static AxisCamera addAxisCamera(String name, String host) {
- AxisCamera camera = new AxisCamera(name, host);
- // Create a passthrough MJPEG server for USB access
- startAutomaticCapture(camera);
- CameraServerSharedStore.getCameraServerShared().reportAxisCamera(camera.getHandle());
- return camera;
- }
-
- /**
- * Adds an Axis IP camera.
- *
- * @param name The name to give the camera
- * @param hosts Array of Camera host IPs/DNS names
- * @return The Axis camera capturing images.
- * @deprecated Call startAutomaticCapture with a HttpCamera instead.
- */
- @Deprecated(forRemoval = true, since = "2025")
- @SuppressWarnings("removal")
- public static AxisCamera addAxisCamera(String name, String[] hosts) {
- AxisCamera camera = new AxisCamera(name, hosts);
- // Create a passthrough MJPEG server for USB access
- startAutomaticCapture(camera);
- CameraServerSharedStore.getCameraServerShared().reportAxisCamera(camera.getHandle());
- return camera;
- }
-
/**
* Adds a virtual camera for switching between two streams. Unlike the other addCamera methods,
* this returns a VideoSink rather than a VideoSource. Calling setSource() on the returned object
diff --git a/cameraserver/src/main/native/cpp/cameraserver/CameraServer.cpp b/cameraserver/src/main/native/cpp/cameraserver/CameraServer.cpp
index 69293bbaac..35221bdffa 100644
--- a/cameraserver/src/main/native/cpp/cameraserver/CameraServer.cpp
+++ b/cameraserver/src/main/native/cpp/cameraserver/CameraServer.cpp
@@ -507,63 +507,6 @@ cs::UsbCamera CameraServer::StartAutomaticCapture(std::string_view name,
return camera;
}
-WPI_IGNORE_DEPRECATED
-cs::AxisCamera CameraServer::AddAxisCamera(std::string_view host) {
- return AddAxisCamera("Axis Camera", host);
-}
-
-cs::AxisCamera CameraServer::AddAxisCamera(const char* host) {
- return AddAxisCamera("Axis Camera", host);
-}
-
-cs::AxisCamera CameraServer::AddAxisCamera(const std::string& host) {
- return AddAxisCamera("Axis Camera", host);
-}
-
-cs::AxisCamera CameraServer::AddAxisCamera(std::span hosts) {
- return AddAxisCamera("Axis Camera", hosts);
-}
-
-cs::AxisCamera CameraServer::AddAxisCamera(std::string_view name,
- std::string_view host) {
- ::GetInstance();
- cs::AxisCamera camera{name, host};
- StartAutomaticCapture(camera);
- auto csShared = GetCameraServerShared();
- csShared->ReportAxisCamera(camera.GetHandle());
- return camera;
-}
-
-cs::AxisCamera CameraServer::AddAxisCamera(std::string_view name,
- const char* host) {
- ::GetInstance();
- cs::AxisCamera camera{name, host};
- StartAutomaticCapture(camera);
- auto csShared = GetCameraServerShared();
- csShared->ReportAxisCamera(camera.GetHandle());
- return camera;
-}
-
-cs::AxisCamera CameraServer::AddAxisCamera(std::string_view name,
- const std::string& host) {
- ::GetInstance();
- cs::AxisCamera camera{name, host};
- StartAutomaticCapture(camera);
- auto csShared = GetCameraServerShared();
- csShared->ReportAxisCamera(camera.GetHandle());
- return camera;
-}
-
-cs::AxisCamera CameraServer::AddAxisCamera(std::string_view name,
- std::span hosts) {
- ::GetInstance();
- cs::AxisCamera camera{name, hosts};
- StartAutomaticCapture(camera);
- auto csShared = GetCameraServerShared();
- csShared->ReportAxisCamera(camera.GetHandle());
- return camera;
-}
-WPI_UNIGNORE_DEPRECATED
cs::MjpegServer CameraServer::AddSwitchedCamera(std::string_view name) {
auto& inst = ::GetInstance();
// create a dummy CvSource
diff --git a/cameraserver/src/main/native/include/cameraserver/CameraServer.h b/cameraserver/src/main/native/include/cameraserver/CameraServer.h
index 68f37f22b0..acb608db79 100644
--- a/cameraserver/src/main/native/include/cameraserver/CameraServer.h
+++ b/cameraserver/src/main/native/include/cameraserver/CameraServer.h
@@ -11,8 +11,6 @@
#include
#include
-#include
-
#include "cscore_cv.h"
namespace frc {
@@ -75,128 +73,6 @@ class CameraServer {
*/
static cs::MjpegServer StartAutomaticCapture(const cs::VideoSource& camera);
- WPI_IGNORE_DEPRECATED
- /**
- * Adds an Axis IP camera.
- *
- * This overload calls AddAxisCamera() with name "Axis Camera".
- *
- * @param host Camera host IP or DNS name (e.g. "10.x.y.11")
- * @deprecated Call StartAutomaticCapture with a HttpCamera instead.
- */
- [[deprecated("Call StartAutomaticCapture with a HttpCamera instead.")]]
- static cs::AxisCamera AddAxisCamera(std::string_view host);
-
- /**
- * Adds an Axis IP camera.
- *
- * This overload calls AddAxisCamera() with name "Axis Camera".
- *
- * @param host Camera host IP or DNS name (e.g. "10.x.y.11")
- * @deprecated Call StartAutomaticCapture with a HttpCamera instead.
- */
- [[deprecated("Call StartAutomaticCapture with a HttpCamera instead.")]]
- static cs::AxisCamera AddAxisCamera(const char* host);
-
- /**
- * Adds an Axis IP camera.
- *
- * This overload calls AddAxisCamera() with name "Axis Camera".
- *
- * @param host Camera host IP or DNS name (e.g. "10.x.y.11")
- * @deprecated Call StartAutomaticCapture with a HttpCamera instead.
- */
- [[deprecated("Call StartAutomaticCapture with a HttpCamera instead.")]]
- static cs::AxisCamera AddAxisCamera(const std::string& host);
-
- /**
- * Adds an Axis IP camera.
- *
- * This overload calls AddAxisCamera() with name "Axis Camera".
- *
- * @param hosts Array of Camera host IPs/DNS names
- * @deprecated Call StartAutomaticCapture with a HttpCamera instead.
- */
- [[deprecated("Call StartAutomaticCapture with a HttpCamera instead.")]]
- static cs::AxisCamera AddAxisCamera(std::span hosts);
-
- /**
- * Adds an Axis IP camera.
- *
- * This overload calls AddAxisCamera() with name "Axis Camera".
- *
- * @param hosts Array of Camera host IPs/DNS names
- * @deprecated Call StartAutomaticCapture with a HttpCamera instead.
- */
- template
- [[deprecated("Call StartAutomaticCapture with a HttpCamera instead.")]]
- static cs::AxisCamera AddAxisCamera(std::initializer_list hosts) {
- return AddAxisCamera("Axis Camera", hosts);
- }
-
- /**
- * Adds an Axis IP camera.
- *
- * @param name The name to give the camera
- * @param host Camera host IP or DNS name (e.g. "10.x.y.11")
- * @deprecated Call StartAutomaticCapture with a HttpCamera instead.
- */
- [[deprecated("Call StartAutomaticCapture with a HttpCamera instead.")]]
- static cs::AxisCamera AddAxisCamera(std::string_view name,
- std::string_view host);
-
- /**
- * Adds an Axis IP camera.
- *
- * @param name The name to give the camera
- * @param host Camera host IP or DNS name (e.g. "10.x.y.11")
- * @deprecated Call StartAutomaticCapture with a HttpCamera instead.
- */
- [[deprecated("Call StartAutomaticCapture with a HttpCamera instead.")]]
- static cs::AxisCamera AddAxisCamera(std::string_view name, const char* host);
-
- /**
- * Adds an Axis IP camera.
- *
- * @param name The name to give the camera
- * @param host Camera host IP or DNS name (e.g. "10.x.y.11")
- * @deprecated Call StartAutomaticCapture with a HttpCamera instead.
- */
- [[deprecated("Call StartAutomaticCapture with a HttpCamera instead.")]]
- static cs::AxisCamera AddAxisCamera(std::string_view name,
- const std::string& host);
-
- /**
- * Adds an Axis IP camera.
- *
- * @param name The name to give the camera
- * @param hosts Array of Camera host IPs/DNS names
- * @deprecated Call StartAutomaticCapture with a HttpCamera instead.
- */
- [[deprecated("Call StartAutomaticCapture with a HttpCamera instead.")]]
- static cs::AxisCamera AddAxisCamera(std::string_view name,
- std::span hosts);
-
- /**
- * Adds an Axis IP camera.
- *
- * @param name The name to give the camera
- * @param hosts Array of Camera host IPs/DNS names
- * @deprecated Call StartAutomaticCapture with a HttpCamera instead.
- */
- template
- [[deprecated("Call StartAutomaticCapture with a HttpCamera instead.")]]
- static cs::AxisCamera AddAxisCamera(std::string_view name,
- std::initializer_list hosts) {
- std::vector vec;
- vec.reserve(hosts.size());
- for (const auto& host : hosts) {
- vec.emplace_back(host);
- }
- return AddAxisCamera(name, vec);
- }
- WPI_UNIGNORE_DEPRECATED
-
/**
* Adds a virtual camera for switching between two streams. Unlike the
* other addCamera methods, this returns a VideoSink rather than a