From 4d290a7142cf69e01d92701635daa01ea9ebb004 Mon Sep 17 00:00:00 2001 From: lukesta182 <33330639+lukesta182@users.noreply.github.com> Date: Fri, 16 Nov 2018 10:45:17 -0800 Subject: [PATCH] hpe-code-Review add TODO's and changed 1 button on smart dash. --- src/org/usfirst/frc4388/robot/OI.java | 4 +--- src/org/usfirst/frc4388/robot/Robot.java | 1 - src/org/usfirst/frc4388/robot/subsystems/Carriage.java | 2 +- src/org/usfirst/frc4388/robot/subsystems/Drive.java | 6 +++--- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/org/usfirst/frc4388/robot/OI.java b/src/org/usfirst/frc4388/robot/OI.java index c7ae75e..277c739 100644 --- a/src/org/usfirst/frc4388/robot/OI.java +++ b/src/org/usfirst/frc4388/robot/OI.java @@ -1,6 +1,4 @@ - - - +//TODO clean up white space package org.usfirst.frc4388.robot; import buttons.XBoxTriggerButton; diff --git a/src/org/usfirst/frc4388/robot/Robot.java b/src/org/usfirst/frc4388/robot/Robot.java index f1ecdb3..cf4b7cc 100644 --- a/src/org/usfirst/frc4388/robot/Robot.java +++ b/src/org/usfirst/frc4388/robot/Robot.java @@ -140,7 +140,6 @@ public class Robot extends IterativeRobot LRautonTaskChooser = new SendableChooser(); LRautonTaskChooser.addDefault("Choose LR Program", new CrossTheBaseLine()); - LRautonTaskChooser.addObject("Left to Left Switch", new LeftSwitchAuton()); LRautonTaskChooser.addObject("Right to 2 Cube Scale", new Cube2Right()); diff --git a/src/org/usfirst/frc4388/robot/subsystems/Carriage.java b/src/org/usfirst/frc4388/robot/subsystems/Carriage.java index 2744aec..09000fc 100644 --- a/src/org/usfirst/frc4388/robot/subsystems/Carriage.java +++ b/src/org/usfirst/frc4388/robot/subsystems/Carriage.java @@ -1,4 +1,4 @@ - +//TODO move constants to 1 folder // RobotBuilder Version: 2.0 // // This file was generated by RobotBuilder. It contains sections of diff --git a/src/org/usfirst/frc4388/robot/subsystems/Drive.java b/src/org/usfirst/frc4388/robot/subsystems/Drive.java index b984af3..d174500 100644 --- a/src/org/usfirst/frc4388/robot/subsystems/Drive.java +++ b/src/org/usfirst/frc4388/robot/subsystems/Drive.java @@ -221,7 +221,7 @@ public class Drive extends Subsystem implements ControlLoopable //leftDrive1.setVoltageRampRate(VOLTAGE_RAMP_RATE); //leftDrive1.setNominalClosedLoopVoltage(12.0); leftDrive1.clearStickyFaults(0); - leftDrive1.setInverted(false);//false on comp 2108, false on microbot + leftDrive1.setInverted(true);//false on comp 2108, false on microbot, true on practice chasis leftDrive1.setSensorPhase(true);//true on comp 2108, false on microbot leftDrive1.setSafetyEnabled(false); //leftDrive1.setCurrentLimit(15); @@ -238,7 +238,7 @@ public class Drive extends Subsystem implements ControlLoopable // } - leftDrive2.setInverted(false);//false on comp 2108, false on microbot + leftDrive2.setInverted(true);//false on comp 2108, false on microbot, true on practice chasis leftDrive2.setSafetyEnabled(false); leftDrive2.setNeutralMode(NeutralMode.Brake); leftDrive2.set(ControlMode.Follower, leftDrive1.getDeviceID()); @@ -630,7 +630,7 @@ public class Drive extends Subsystem implements ControlLoopable // m_steerInput = // OI.getInstance().getDriveTrainController().getRightXAxis(); m_moveInput = -OI.getInstance().getDriverController().getLeftYAxis(); - m_steerInput = OI.getInstance().getDriverController().getRightXAxis(); + m_steerInput = /*only negitive on chasis bot*/-OI.getInstance().getDriverController().getRightXAxis(); if (controlMode == DriveControlMode.JOYSTICK) { m_moveOutput = adjustForSensitivity(m_moveScale, m_moveTrim,