commit | 5bf99ba732f5034a50770d850819403306d2af0c | [log] [tgz] |
---|---|---|
author | James Kuszmaul <jabukuszmaul+collab@gmail.com> | Wed Dec 01 21:15:42 2021 -0800 |
committer | James Kuszmaul <jabukuszmaul+collab@gmail.com> | Wed Dec 01 21:16:13 2021 -0800 |
tree | d02c2796a478db70c9fdf7c23c1de459f1dd15cb | |
parent | 7d332c534842039d1fc705bf0bfd2e6dc5776eff [diff] |
Fix logical merge conflict from send-checking Change-Id: I6d161bce84b080ec1a08312287111abac333fd62 Signed-off-by: James Kuszmaul <jabukuszmaul+collab@gmail.com>
diff --git a/y2021_bot3/control_loops/superstructure/superstructure_lib_test.cc b/y2021_bot3/control_loops/superstructure/superstructure_lib_test.cc index 615209f..e30fa1d 100644 --- a/y2021_bot3/control_loops/superstructure/superstructure_lib_test.cc +++ b/y2021_bot3/control_loops/superstructure/superstructure_lib_test.cc
@@ -191,7 +191,7 @@ goal_builder.add_intake_speed(speed); goal_builder.add_outtake_speed(speed); goal_builder.add_climber_speed(speed); - ASSERT_TRUE(builder.Send(goal_builder.Finish())); + builder.CheckOk(builder.Send(goal_builder.Finish())); speed += .001; if (speed >= 12) { speed = -12;