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

Use default path for networktables.ini in simulation (#2205)

Browse Source
This commit is contained in:
Peter Johnson
2019-12-29 18:55:02 -06:00
committed by GitHub
parent 5b7dd186d2
commit 8b4508ad53
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wpilibc/src/main/native/cppcs/RobotBase.cpp
View File

@@ -124,7 +124,11 @@ RobotBase::RobotBase() : m_ds(DriverStation::GetInstance()) {
auto inst = nt::NetworkTableInstance::GetDefault();
inst.SetNetworkIdentity("Robot");
#ifdef __FRC_ROBORIO__
inst.StartServer("/home/lvuser/networktables.ini");
#else
inst.StartServer();
#endif
SmartDashboard::init();

6
wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java
View File

@@ -94,7 +94,11 @@ public abstract class RobotBase implements AutoCloseable {
m_threadId = Thread.currentThread().getId();
setupCameraServerShared();
inst.setNetworkIdentity("Robot");
inst.startServer("/home/lvuser/networktables.ini");
if (isReal()) {
inst.startServer("/home/lvuser/networktables.ini");
} else {
inst.startServer();
}
m_ds = DriverStation.getInstance();
inst.getTable("LiveWindow").getSubTable(".status").getEntry("LW Enabled").setBoolean(false);