From d6b54bbae2e9fdbef4c1e448b2ddcc0eeb88a70a Mon Sep 17 00:00:00 2001
From: Thad House <ThadHouse@users.noreply.github.com>
Date: Tue, 16 Dec 2025 22:28:45 -0800
Subject: [PATCH] [ntcore] SetServerTeam: Use Systemcore name/addresses (#8314)

---
 ntcore/src/main/native/cpp/ntcore_cpp.cpp       | 17 ++++++++---------
 .../src/main/native/cpp/Downloader.cpp          |  5 ++---
 .../parallelconnect/parallelconnect.cpp         |  6 ++----
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/ntcore/src/main/native/cpp/ntcore_cpp.cpp b/ntcore/src/main/native/cpp/ntcore_cpp.cpp
index 45e4bcb3d5..1eeb503aac 100644
--- a/ntcore/src/main/native/cpp/ntcore_cpp.cpp
+++ b/ntcore/src/main/native/cpp/ntcore_cpp.cpp
@@ -685,18 +685,17 @@ void SetServerTeam(NT_Inst inst, unsigned int team, unsigned int port) {
                                      static_cast<int>(team % 100)),
                          port);
 
-    // 172.22.11.2
-    servers.emplace_back("172.22.11.2", port);
+    // 172.26.0.1 (Windows USB)
+    servers.emplace_back("172.26.0.1", port);
 
-    // roboRIO-<team>-FRC.local
-    servers.emplace_back(fmt::format("roboRIO-{}-FRC.local", team), port);
+    // 172.27.0.1 (Unix USB)
+    servers.emplace_back("172.27.0.1", port);
 
-    // roboRIO-<team>-FRC.lan
-    servers.emplace_back(fmt::format("roboRIO-{}-FRC.lan", team), port);
+    // 172.30.0.1 (WiFi)
+    servers.emplace_back("172.30.0.1", port);
 
-    // roboRIO-<team>-FRC.frc-field.local
-    servers.emplace_back(fmt::format("roboRIO-{}-FRC.frc-field.local", team),
-                         port);
+    // robot.local
+    servers.emplace_back(fmt::format("robot.local", team), port);
 
     ii->SetServers(servers);
   }
diff --git a/tools/datalogtool/src/main/native/cpp/Downloader.cpp b/tools/datalogtool/src/main/native/cpp/Downloader.cpp
index 28fd49e3fb..b56028daaa 100644
--- a/tools/datalogtool/src/main/native/cpp/Downloader.cpp
+++ b/tools/datalogtool/src/main/native/cpp/Downloader.cpp
@@ -289,9 +289,8 @@ void Downloader::ThreadMain() {
           if (auto team =
                   wpi::util::parse_integer<unsigned int>(m_serverTeam, 10)) {
             // team number
-            session = std::make_unique<sftp::Session>(
-                fmt::format("roborio-{}-frc.local", team.value()), 22,
-                m_username, m_password);
+            session = std::make_unique<sftp::Session>("robot.local", 22,
+                                                      m_username, m_password);
           } else {
             session = std::make_unique<sftp::Session>(m_serverTeam, 22,
                                                       m_username, m_password);
diff --git a/wpinet/examples/parallelconnect/parallelconnect.cpp b/wpinet/examples/parallelconnect/parallelconnect.cpp
index 81442f8bb3..ce78097d2b 100644
--- a/wpinet/examples/parallelconnect/parallelconnect.cpp
+++ b/wpinet/examples/parallelconnect/parallelconnect.cpp
@@ -40,10 +40,8 @@ int main() {
             connect->Disconnected();
           });
         });
-    connect->SetServers({{{"roborio-294-frc.local", 8080},
-                          {"roborio-294-frc.frc-field.local", 8080},
-                          {"10.2.94.2", 8080},
-                          {"127.0.0.1", 8080}}});
+    connect->SetServers(
+        {{{"robot.local", 8080}, {"10.2.94.2", 8080}, {"127.0.0.1", 8080}}});
   });
 
   // wait for a keypress to terminate