From 73328da794c51edca6de38d2cf70fa6c43c364aa Mon Sep 17 00:00:00 2001 From: sciencewhiz Date: Sun, 13 Aug 2023 20:18:16 -0700 Subject: [PATCH] Fix Fake Robot references to Speed Controller Lets the widget show up. Fix a few other references also --- .../edu/wpi/livewindowfakerobot/LiveWindowFakeRobot.java | 6 +++--- .../livewindow/elements/CANSpeedController.java | 2 +- .../smartdashboard/livewindow/elements/LWSubsystem.java | 2 +- .../smartdashboard/livewindow/elements/SpeedController.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fakeRobot/src/main/java/edu/wpi/livewindowfakerobot/LiveWindowFakeRobot.java b/fakeRobot/src/main/java/edu/wpi/livewindowfakerobot/LiveWindowFakeRobot.java index 88de52a..28ed10f 100644 --- a/fakeRobot/src/main/java/edu/wpi/livewindowfakerobot/LiveWindowFakeRobot.java +++ b/fakeRobot/src/main/java/edu/wpi/livewindowfakerobot/LiveWindowFakeRobot.java @@ -34,16 +34,16 @@ public static void main(String[] args) throws IOException { wrist = createTable(liveWindow, "Wrist", "LW Subsystem"); wPotentiometer = createTable(wrist, "Potentiometer", "Analog Input"); - wVictor = createTable(wrist, "Victor", "Speed Controller"); + wVictor = createTable(wrist, "Victor", "Motor Controller"); elevator = createTable(liveWindow, "Elevator", "PIDSubsystem"); ePotentiometer = createTable(elevator, "Potentiometer", "Analog Input"); - eVictor = createTable(elevator, "Victor", "Speed Controller"); + eVictor = createTable(elevator, "Victor", "Motor Controller"); testSys = createTable(liveWindow, "TestSystem", "LW Subsystem"); tComp = createTable(testSys, "Compressor", "Compressor"); tGearTooth = createTable(testSys, "Gear Tooth Sensor", "Gear Tooth"); - tVictor = createTable(testSys, "Victor", "Speed Controller"); + tVictor = createTable(testSys, "Victor", "Motor Controller"); tPotentiometer = createTable(testSys, "Potentiometer", "Analog Input"); tRelay = createTable(testSys, "Spike", "Relay"); tDigitalOutput = createTable(testSys, "Digital Output", "Digital Output"); diff --git a/src/main/java/edu/wpi/first/smartdashboard/livewindow/elements/CANSpeedController.java b/src/main/java/edu/wpi/first/smartdashboard/livewindow/elements/CANSpeedController.java index 2a93ab0..cff2131 100644 --- a/src/main/java/edu/wpi/first/smartdashboard/livewindow/elements/CANSpeedController.java +++ b/src/main/java/edu/wpi/first/smartdashboard/livewindow/elements/CANSpeedController.java @@ -56,7 +56,7 @@ public class CANSpeedController extends AbstractTableWidget implements Controlle private JPanel headerPanel; /** - * Control panel containing the PID editor / speed controller editor. + * Control panel containing the PID editor / Motor Controller editor. */ private JPanel controlPanel; private JPanel disabledControlPanel; diff --git a/src/main/java/edu/wpi/first/smartdashboard/livewindow/elements/LWSubsystem.java b/src/main/java/edu/wpi/first/smartdashboard/livewindow/elements/LWSubsystem.java index 92be43f..e4b2fbf 100644 --- a/src/main/java/edu/wpi/first/smartdashboard/livewindow/elements/LWSubsystem.java +++ b/src/main/java/edu/wpi/first/smartdashboard/livewindow/elements/LWSubsystem.java @@ -24,7 +24,7 @@ /** * The main player in the Live Window. Subsystems hold every component that * corresponds to that physical subsystem on the robot (e.g. a drive train would - * contain speed controllers and encoders). + * contain Motor Controllers and encoders). * * @author Sam Carlberg */ diff --git a/src/main/java/edu/wpi/first/smartdashboard/livewindow/elements/SpeedController.java b/src/main/java/edu/wpi/first/smartdashboard/livewindow/elements/SpeedController.java index 4a96534..6f16583 100644 --- a/src/main/java/edu/wpi/first/smartdashboard/livewindow/elements/SpeedController.java +++ b/src/main/java/edu/wpi/first/smartdashboard/livewindow/elements/SpeedController.java @@ -24,7 +24,7 @@ public class SpeedController extends AbstractTableWidget implements Controller { private NumberSlider controller; /** - * Used to turn off the speed controller + * Used to turn off the Motor Controller */ private final JButton zeroButton = new JButton("Zero");