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

Replace /home/lvuser with /home/systemcore (#8002)

Browse Source
This commit is contained in:
Thad House
2025-06-02 16:42:56 -07:00
committed by GitHub
parent 4d74ea6278
commit 2af8c59858
25 changed files with 139 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wpilibc/src/main/native/cpp/DataLogManager.cpp
View File

@@ -71,7 +71,7 @@ static std::string MakeLogDir(std::string_view dir) {
if (!dir.empty()) {
return std::string{dir};
}
#ifdef __FRC_ROBORIO__
#ifdef __FRC_SYSTEMCORE__
// prefer a mounted USB drive if one is accessible
std::error_code ec;
auto s = fs::status("/u", ec);
@@ -81,14 +81,9 @@ static std::string MakeLogDir(std::string_view dir) {
return "/u/logs";
HAL_ReportUsage("DataLogManager", "USB");
}
if (RobotBase::GetRuntimeType() == kRoboRIO) {
FRC_ReportWarning(
"DataLogManager: Logging to RoboRIO 1 internal storage is "
"not recommended! Plug in a FAT32 formatted flash drive!");
}
fs::create_directory("/home/lvuser/logs", ec);
fs::create_directory("/home/systemcore/logs", ec);
HAL_ReportUsage("DataLogManager", "Onboard");
return "/home/lvuser/logs";
return "/home/systemcore/logs";
#else
std::string logDir = filesystem::GetOperatingDirectory() + "/logs";
std::error_code ec;
@@ -312,7 +307,8 @@ void Thread::StopNTLog() {
void Thread::StartConsoleLog() {
if (!m_consoleLoggerEnabled && RobotBase::IsReal()) {
m_consoleLoggerEnabled = true;
m_consoleLogger = {"/home/lvuser/FRC_UserProgram.log", m_log, "console"};
m_consoleLogger = {"/home/systemcore/FRC_UserProgram.log", m_log,
"console"};
}
}

4
wpilibc/src/main/native/cpp/Filesystem.cpp
View File

@@ -16,7 +16,7 @@ std::string frc::filesystem::GetLaunchDirectory() {
std::string frc::filesystem::GetOperatingDirectory() {
if constexpr (!RobotBase::IsSimulation()) {
return "/home/lvuser";
return "/home/systemcore";
} else {
return frc::filesystem::GetLaunchDirectory();
}
@@ -24,7 +24,7 @@ std::string frc::filesystem::GetOperatingDirectory() {
std::string frc::filesystem::GetDeployDirectory() {
if constexpr (!RobotBase::IsSimulation()) {
return "/home/lvuser/deploy";
return "/home/systemcore/deploy";
} else {
return (fs::current_path() / "src" / "main" / "deploy").string();
}

2
wpilibc/src/main/native/cpp/MotorSafety.cpp
View File

@@ -69,7 +69,7 @@ static MotorSafetyManager& GetManager() {
return manager;
}
#ifndef __FRC_ROBORIO__
#ifndef __FRC_SYSTEMCORE__
namespace frc::impl {
void ResetMotorSafety() {
auto& manager = GetManager();

2
wpilibc/src/main/native/cpp/Preferences.cpp
View File

@@ -41,7 +41,7 @@ static Instance& GetInstance() {
return instance;
}
#ifndef __FRC_ROBORIO__
#ifndef __FRC_SYSTEMCORE__
namespace frc::impl {
void ResetPreferencesInstance() {
GetInstance() = Instance();

2
wpilibc/src/main/native/cpp/smartdashboard/SmartDashboard.cpp
View File

@@ -41,7 +41,7 @@ static Instance& GetInstance() {
return *GetInstanceHolder();
}
#ifndef __FRC_ROBORIO__
#ifndef __FRC_SYSTEMCORE__
namespace frc::impl {
void ResetSmartDashboardInstance() {
std::make_unique<Instance>().swap(GetInstanceHolder());