Skip to content
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.

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

Fix Fake Robot references to Speed Controller #179

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand Down