| commit | 094d09b4b76181f715da9affc5374f9e77856b22 | [log] [tgz] |
|---|---|---|
| author | Austin Schuh <austin.linux@gmail.com> | Fri Nov 20 23:26:52 2020 -0800 |
| committer | Austin Schuh <austin.linux@gmail.com> | Fri Nov 20 23:36:02 2020 -0800 |
| tree | 739585e6ee1695e22a139bd1b3ff3f36c979f5de | |
| parent | 62288253c0bdff1dfc9cc9470beeeaf3c9a8d96e [diff] |
Simplify aos::Init Most of the variants were to deal with core, which has been gone for a year. Simplify those all into InitGoogle. InitGoogle should be renamed to Init at some point. It does everything now. Change-Id: I738ee03e9c5b2e6348ef33302835f915df68011f
diff --git a/y2019/control_loops/drivetrain/drivetrain_main.cc b/y2019/control_loops/drivetrain/drivetrain_main.cc index 53e2bf5..5641d1d 100644 --- a/y2019/control_loops/drivetrain/drivetrain_main.cc +++ b/y2019/control_loops/drivetrain/drivetrain_main.cc
@@ -7,8 +7,8 @@ using ::frc971::control_loops::drivetrain::DrivetrainLoop; -int main() { - ::aos::InitNRT(); +int main(int argc, char **argv) { + ::aos::InitGoogle(&argc, &argv); aos::FlatbufferDetachedBuffer<aos::Configuration> config = aos::configuration::ReadConfig("config.json");
diff --git a/y2019/control_loops/drivetrain/drivetrain_replay.cc b/y2019/control_loops/drivetrain/drivetrain_replay.cc index 98f3eeb..69cce4f 100644 --- a/y2019/control_loops/drivetrain/drivetrain_replay.cc +++ b/y2019/control_loops/drivetrain/drivetrain_replay.cc
@@ -23,8 +23,6 @@ aos::network::OverrideTeamNumber(FLAGS_team); - aos::InitCreate(); - const aos::FlatbufferDetachedBuffer<aos::Configuration> config = aos::configuration::ReadConfig(FLAGS_config);
diff --git a/y2019/control_loops/drivetrain/replay_localizer.cc b/y2019/control_loops/drivetrain/replay_localizer.cc index de28317..3687e3d 100644 --- a/y2019/control_loops/drivetrain/replay_localizer.cc +++ b/y2019/control_loops/drivetrain/replay_localizer.cc
@@ -398,8 +398,6 @@ ::aos::network::OverrideTeamNumber(FLAGS_team); - ::aos::InitCreate(); - ::y2019::control_loops::drivetrain::LocalizerReplayer replay; replay.ProcessFile(FLAGS_logfile.c_str());