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/y2014/actors/autonomous_actor_main.cc b/y2014/actors/autonomous_actor_main.cc
index 524c8f8..871933b 100644
--- a/y2014/actors/autonomous_actor_main.cc
+++ b/y2014/actors/autonomous_actor_main.cc
@@ -4,8 +4,8 @@
#include "aos/init.h"
#include "y2014/actors/autonomous_actor.h"
-int main(int /*argc*/, char * /*argv*/ []) {
- ::aos::Init(-1);
+int main(int argc, char *argv[]) {
+ ::aos::InitGoogle(&argc, &argv);
aos::FlatbufferDetachedBuffer<aos::Configuration> config =
aos::configuration::ReadConfig("config.json");
diff --git a/y2014/actors/shoot_actor.cc b/y2014/actors/shoot_actor.cc
index 58df186..095a972 100644
--- a/y2014/actors/shoot_actor.cc
+++ b/y2014/actors/shoot_actor.cc
@@ -35,7 +35,9 @@
"/shooter")),
shooter_goal_sender_(
event_loop->MakeSender<::y2014::control_loops::shooter::Goal>(
- "/shooter")) {}
+ "/shooter")) {
+ event_loop->SetRuntimeRealtimePriority(29);
+}
double ShootActor::SpeedToAngleOffset(double speed) {
const constants::Values &values = constants::GetValues();
diff --git a/y2014/actors/shoot_actor_main.cc b/y2014/actors/shoot_actor_main.cc
index 9ae0f9d..a28e9a2 100644
--- a/y2014/actors/shoot_actor_main.cc
+++ b/y2014/actors/shoot_actor_main.cc
@@ -4,8 +4,8 @@
#include "aos/init.h"
#include "y2014/actors/shoot_actor.h"
-int main(int /*argc*/, char * /*argv*/[]) {
- ::aos::Init(-1);
+int main(int argc, char *argv[]) {
+ ::aos::InitGoogle(&argc, &argv);
aos::FlatbufferDetachedBuffer<aos::Configuration> config =
aos::configuration::ReadConfig("config.json");
diff --git a/y2014/control_loops/claw/claw_main.cc b/y2014/control_loops/claw/claw_main.cc
index 94936b5..4cffa44 100644
--- a/y2014/control_loops/claw/claw_main.cc
+++ b/y2014/control_loops/claw/claw_main.cc
@@ -3,8 +3,8 @@
#include "aos/events/shm_event_loop.h"
#include "aos/init.h"
-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/y2014/control_loops/drivetrain/drivetrain_main.cc b/y2014/control_loops/drivetrain/drivetrain_main.cc
index c208738..8367ec1 100644
--- a/y2014/control_loops/drivetrain/drivetrain_main.cc
+++ b/y2014/control_loops/drivetrain/drivetrain_main.cc
@@ -6,8 +6,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/y2014/control_loops/shooter/shooter_main.cc b/y2014/control_loops/shooter/shooter_main.cc
index 88c40d0..be3fd41 100644
--- a/y2014/control_loops/shooter/shooter_main.cc
+++ b/y2014/control_loops/shooter/shooter_main.cc
@@ -3,8 +3,8 @@
#include "aos/events/shm_event_loop.h"
#include "aos/init.h"
-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/y2014/hot_goal_reader.cc b/y2014/hot_goal_reader.cc
index 8eb4efb..68ee071 100644
--- a/y2014/hot_goal_reader.cc
+++ b/y2014/hot_goal_reader.cc
@@ -13,8 +13,8 @@
#include "aos/time/time.h"
#include "y2014/queues/hot_goal_generated.h"
-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/y2014/joystick_reader.cc b/y2014/joystick_reader.cc
index f903270..136f65a 100644
--- a/y2014/joystick_reader.cc
+++ b/y2014/joystick_reader.cc
@@ -443,8 +443,8 @@
} // namespace input
} // namespace y2014
-int main() {
- ::aos::InitNRT();
+int main(int argc, char **argv) {
+ ::aos::InitGoogle(&argc, &argv);
aos::FlatbufferDetachedBuffer<aos::Configuration> config =
aos::configuration::ReadConfig("config.json");