Saved from last change

This commit is contained in:
mayabartels
2019-01-21 14:49:23 -08:00
parent 5fbc5c78df
commit f364065fec
@@ -64,7 +64,7 @@ public class Robot extends IterativeRobot
oi = OI.getInstance(); oi = OI.getInstance();
controlLoop.addLoopable(drive); controlLoop.addLoopable(drive);
controlLoop.addLoopable(Arm); controlLoop.addLoopable(arm);
operationModeChooser = new SendableChooser<OperationMode>(); operationModeChooser = new SendableChooser<OperationMode>();
@@ -146,14 +146,15 @@ public class Robot extends IterativeRobot
LLautonomousCommand = (Command)LLautonTaskChooser.getSelected(); LLautonomousCommand = (Command)LLautonTaskChooser.getSelected();
} }
public Alliance getAlliance() { public Alliance getAlliance()
{
return m_ds.getAlliance(); return m_ds.getAlliance();
} }
public void updateStatus() { public void updateStatus()
{
drive.updateStatus(operationMode); drive.updateStatus(operationMode);
Elevator.updateStatus(operationMode); arm.updateStatus(operationMode);
} }
} }