commit | b6c5c8522aeccdfd46986550aa7bef56fde58454 | [log] [tgz] |
---|---|---|
author | Austin Schuh <austin.linux@gmail.com> | Sun May 19 20:13:31 2019 -0700 |
committer | Austin Schuh <austin.linux@gmail.com> | Wed May 22 22:24:27 2019 -0700 |
tree | e0b938840afbfd13adce62fdf769a91d53c95f14 | |
parent | 44019f94389b8293c6b553d506f36d876c444419 [diff] |
Move VisionStatus to an event loop Convert the simulation over to using SimulatedEventLoop as well. Change-Id: I05d837530f83df5432f056ca5ef6515fbab5f897
diff --git a/y2017/control_loops/superstructure/column/column.cc b/y2017/control_loops/superstructure/column/column.cc index 85af86b..b4762a7 100644 --- a/y2017/control_loops/superstructure/column/column.cc +++ b/y2017/control_loops/superstructure/column/column.cc
@@ -364,8 +364,9 @@ status->stuck_voltage = IndexerStuckVoltage(); } -Column::Column() - : profiled_subsystem_( +Column::Column(::aos::EventLoop *event_loop) + : vision_time_adjuster_(event_loop), + profiled_subsystem_( ::std::unique_ptr< ::frc971::control_loops::SimpleCappedStateFeedbackLoop<6, 2, 2>>( new ::frc971::control_loops::SimpleCappedStateFeedbackLoop<
diff --git a/y2017/control_loops/superstructure/column/column.h b/y2017/control_loops/superstructure/column/column.h index 4a4dfbd..0caa66e 100644 --- a/y2017/control_loops/superstructure/column/column.h +++ b/y2017/control_loops/superstructure/column/column.h
@@ -159,7 +159,7 @@ class Column { public: - Column(); + Column(::aos::EventLoop *event_loop); double goal(int row, int col) const { return profiled_subsystem_.goal(row, col); }