| commit | 746fc6d8bb44ae16cf4ff24c22b38b404c807424 | [log] [tgz] |
|---|---|---|
| author | Austin Schuh <austin.linux@gmail.com> | Sun Feb 21 02:53:33 2016 -0800 |
| committer | Austin Schuh <austin.linux@gmail.com> | Sun Feb 21 02:53:33 2016 -0800 |
| tree | 87c63ef7df4e120bc7811599049a8459a115ebe8 | |
| parent | 2091fe5eda75fb7eefabf6625870ebfbba13fc44 [diff] |
Fixed drivetrain code building issue. Change-Id: I630d61a2122956f62534142c37e8282efc8cdb0c
diff --git a/frc971/control_loops/drivetrain/polydrivetrain.cc b/frc971/control_loops/drivetrain/polydrivetrain.cc index cefb1dd..9dad2a8 100644 --- a/frc971/control_loops/drivetrain/polydrivetrain.cc +++ b/frc971/control_loops/drivetrain/polydrivetrain.cc
@@ -68,6 +68,7 @@ return high_gear_speed; case LOW: case SHIFTING_DOWN: + default: return low_gear_speed; break; }
diff --git a/frc971/control_loops/drivetrain/polydrivetrain.h b/frc971/control_loops/drivetrain/polydrivetrain.h index 1ba7eee..c482f77 100644 --- a/frc971/control_loops/drivetrain/polydrivetrain.h +++ b/frc971/control_loops/drivetrain/polydrivetrain.h
@@ -24,7 +24,7 @@ // Computes the speed of the motor given the hall effect position and the // speed of the robot. double MotorSpeed(const constants::ShifterHallEffect &hall_effect, - double shifter_position, double velocity); + double shifter_position, double velocity, Gear gear); // Computes the states of the shifters for the left and right drivetrain sides // given a requested state.