From f364065fec1e54e4e5165196830bb31bfc8d463c Mon Sep 17 00:00:00 2001 From: mayabartels Date: Mon, 21 Jan 2019 14:49:23 -0800 Subject: [PATCH] Saved from last change --- .../main/java/org/usfirst/frc4388/robot/Robot.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/2019robot/src/main/java/org/usfirst/frc4388/robot/Robot.java b/2019robot/src/main/java/org/usfirst/frc4388/robot/Robot.java index dc86600..5d66455 100644 --- a/2019robot/src/main/java/org/usfirst/frc4388/robot/Robot.java +++ b/2019robot/src/main/java/org/usfirst/frc4388/robot/Robot.java @@ -64,7 +64,7 @@ public class Robot extends IterativeRobot oi = OI.getInstance(); controlLoop.addLoopable(drive); - controlLoop.addLoopable(Arm); + controlLoop.addLoopable(arm); operationModeChooser = new SendableChooser(); @@ -146,14 +146,15 @@ public class Robot extends IterativeRobot LLautonomousCommand = (Command)LLautonTaskChooser.getSelected(); } - public Alliance getAlliance() { + public Alliance getAlliance() + { return m_ds.getAlliance(); } - public void updateStatus() { + public void updateStatus() + { drive.updateStatus(operationMode); - Elevator.updateStatus(operationMode); - + arm.updateStatus(operationMode); } }