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.

Sign up for GitHub

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

hpe-code-Review #1 #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

hpe-code-Review #1 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions src/org/usfirst/frc4388/robot/OI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@



//TODO clean up white space
package org.usfirst.frc4388.robot;

import buttons.XBoxTriggerButton;
Expand Down
1 change: 0 additions & 1 deletion src/org/usfirst/frc4388/robot/Robot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ public void robotInit()
LRautonTaskChooser = new SendableChooser<Command>();

LRautonTaskChooser.addDefault("Choose LR Program", new CrossTheBaseLine());


LRautonTaskChooser.addObject("Left to Left Switch", new LeftSwitchAuton());
LRautonTaskChooser.addObject("Right to 2 Cube Scale", new Cube2Right());
Expand Down
2 changes: 1 addition & 1 deletion src/org/usfirst/frc4388/robot/subsystems/Carriage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

//TODO move constants to 1 folder
// RobotBuilder Version: 2.0
//
// This file was generated by RobotBuilder. It contains sections of
Expand Down
6 changes: 3 additions & 3 deletions src/org/usfirst/frc4388/robot/subsystems/Drive.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ public Drive() {
//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);
Expand All @@ -238,7 +238,7 @@ public Drive() {
// }


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());
Expand Down Expand Up @@ -630,7 +630,7 @@ public void driveWithJoystick() {
// 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,
Expand Down