From 8b4508ad53c85e5f7157eee8ed6ce2eb3b6cc27c Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Sun, 29 Dec 2019 18:55:02 -0600 Subject: [PATCH] Use default path for networktables.ini in simulation (#2205) --- wpilibc/src/main/native/cppcs/RobotBase.cpp | 4 ++++ wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/wpilibc/src/main/native/cppcs/RobotBase.cpp b/wpilibc/src/main/native/cppcs/RobotBase.cpp index f468f73010..eaf4ddcdcf 100644 --- a/wpilibc/src/main/native/cppcs/RobotBase.cpp +++ b/wpilibc/src/main/native/cppcs/RobotBase.cpp @@ -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(); diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java index 80c445f7f0..e2861f4610 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java @@ -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);