Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ntcore] SetServerTeam: Use Systemcore name/addresses (#8314)

Browse Source
This commit is contained in:
Thad House
2025-12-16 22:28:45 -08:00
committed by GitHub
parent e2d492ac3f
commit d6b54bbae2
3 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ntcore/src/main/native/cpp/ntcore_cpp.cpp
View File

@@ -685,18 +685,17 @@ void SetServerTeam(NT_Inst inst, unsigned int team, unsigned int port) {
static_cast<int>(team % 100)), static_cast<int>(team % 100)),
port); port);
// 172.22.11.2 // 172.26.0.1 (Windows USB)
servers.emplace_back("172.22.11.2", port); servers.emplace_back("172.26.0.1", port);
// roboRIO-<team>-FRC.local // 172.27.0.1 (Unix USB)
servers.emplace_back(fmt::format("roboRIO-{}-FRC.local", team), port); servers.emplace_back("172.27.0.1", port);
// roboRIO-<team>-FRC.lan // 172.30.0.1 (WiFi)
servers.emplace_back(fmt::format("roboRIO-{}-FRC.lan", team), port); servers.emplace_back("172.30.0.1", port);
// roboRIO-<team>-FRC.frc-field.local // robot.local
servers.emplace_back(fmt::format("roboRIO-{}-FRC.frc-field.local", team), servers.emplace_back(fmt::format("robot.local", team), port);
port);
ii->SetServers(servers); ii->SetServers(servers);
} }

5
tools/datalogtool/src/main/native/cpp/Downloader.cpp
View File

@@ -289,9 +289,8 @@ void Downloader::ThreadMain() {
if (auto team = if (auto team =
wpi::util::parse_integer<unsigned int>(m_serverTeam, 10)) { wpi::util::parse_integer<unsigned int>(m_serverTeam, 10)) {
// team number // team number
session = std::make_unique<sftp::Session>( session = std::make_unique<sftp::Session>("robot.local", 22,
fmt::format("roborio-{}-frc.local", team.value()), 22, m_username, m_password);
m_username, m_password);
} else { } else {
session = std::make_unique<sftp::Session>(m_serverTeam, 22, session = std::make_unique<sftp::Session>(m_serverTeam, 22,
m_username, m_password); m_username, m_password);

6
wpinet/examples/parallelconnect/parallelconnect.cpp
View File

@@ -40,10 +40,8 @@ int main() {
connect->Disconnected(); connect->Disconnected();
}); });
}); });
connect->SetServers({{{"roborio-294-frc.local", 8080}, connect->SetServers(
{"roborio-294-frc.frc-field.local", 8080}, {{{"robot.local", 8080}, {"10.2.94.2", 8080}, {"127.0.0.1", 8080}}});
{"10.2.94.2", 8080},
{"127.0.0.1", 8080}}});
}); });
// wait for a keypress to terminate // wait for a keypress to terminate