Skip to content

Replace hostname with Systemcore hostname #8314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: 2027
Choose a base branch
from
+7 −17
Open

Replace hostname with Systemcore hostname #8314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15119b4
Replace hostname with Systemcore hostname
ThadHouse Oct 30, 2025
0bd8c82
Format
ThadHouse Oct 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions datalogtool/src/main/native/cpp/Downloader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,9 +288,8 @@ void Downloader::ThreadMain() {
case kConnecting:
if (auto team = wpi::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);
Expand Down
13 changes: 3 additions & 10 deletions ntcore/src/main/native/cpp/ntcore_cpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,7 +677,7 @@ void SetServer(
void SetServerTeam(NT_Inst inst, unsigned int team, unsigned int port) {
if (auto ii = InstanceImpl::GetTyped(inst, Handle::kInstance)) {
std::vector<std::pair<std::string, unsigned int>> servers;
servers.reserve(5);
servers.reserve(3);

// 10.te.am.2
servers.emplace_back(fmt::format("10.{}.{}.2", static_cast<int>(team / 100),
Expand All @@ -687,15 +687,8 @@ void SetServerTeam(NT_Inst inst, unsigned int team, unsigned int port) {
// 172.22.11.2
servers.emplace_back("172.22.11.2", port);
Copy link
Member

@rzblue rzblue Oct 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you want to add the USB IPs as well?

Copy link
Member Author

@ThadHouse ThadHouse Oct 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes we do, those are likely changing soon though, so this PR will wait for that.


// roboRIO-<team>-FRC.local
servers.emplace_back(fmt::format("roboRIO-{}-FRC.local", team), port);

// roboRIO-<team>-FRC.lan
servers.emplace_back(fmt::format("roboRIO-{}-FRC.lan", team), 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);
}
Expand Down
6 changes: 2 additions & 4 deletions wpinet/examples/parallelconnect/parallelconnect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,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
Expand Down
Loading