commit ed5b26d1a2438112020af8b31af8103cae7f6661
author Austin Schuh <austin.linux@gmail.com> Thu Dec 05 20:51:59 2019 -0800
committer Austin Schuh <austin.linux@gmail.com> Sun Dec 08 19:17:38 2019 -0800
tree e32c20d8eb1d3d0b3f76675f6e27febdce3d0402
parent 80c7fce65f5d095b4bf4b53b10e957e314d1c618

y2019 robot code starts!

We are now deploying the config, and all the missing locations are now
available.  Some channels got renamed to be more user friendly.

Change-Id: Idc771998b24a769994ec80f3aee292b0d1ac6240

aos/input/BUILD

diff --git a/aos/input/BUILD b/aos/input/BUILD
index b4ceea6..24e6381 100644
--- a/aos/input/BUILD
+++ b/aos/input/BUILD
@@ -61,6 +61,7 @@
         "//aos/input:joystick_input",
         "//aos/logging",
         "//frc971/autonomous:auto_fbs",
+        "//frc971/autonomous:auto_mode_fbs",
         "//frc971/autonomous:base_autonomous_actor",
     ],
 )

aos/input/action_joystick_input.cc

diff --git a/aos/input/action_joystick_input.cc b/aos/input/action_joystick_input.cc
index 376009b..02e6c51 100644
--- a/aos/input/action_joystick_input.cc
+++ b/aos/input/action_joystick_input.cc
@@ -2,6 +2,7 @@
 
 #include "aos/input/driver_station_data.h"
 #include "frc971/autonomous/auto_generated.h"
+#include "frc971/autonomous/auto_mode_generated.h"
 #include "frc971/autonomous/base_autonomous_actor.h"
 
 using ::aos::input::driver_station::ControlBit;

aos/input/action_joystick_input.h

diff --git a/aos/input/action_joystick_input.h b/aos/input/action_joystick_input.h
index 781e224..562d41a 100644
--- a/aos/input/action_joystick_input.h
+++ b/aos/input/action_joystick_input.h
@@ -5,6 +5,7 @@
 #include "aos/input/drivetrain_input.h"
 #include "aos/input/joystick_input.h"
 #include "frc971/autonomous/auto_generated.h"
+#include "frc971/autonomous/auto_mode_generated.h"
 #include "frc971/autonomous/base_autonomous_actor.h"
 
 namespace aos {
@@ -40,7 +41,7 @@
             ::frc971::autonomous::BaseAutonomousActor::MakeFactory(event_loop)),
         autonomous_mode_fetcher_(
             event_loop->MakeFetcher<::frc971::autonomous::AutonomousMode>(
-                ".frc971.autonomous.auto_mode")) {}
+                "/autonomous")) {}
 
   virtual ~ActionJoystickInput() {}
 

aos/input/joystick_input.h

diff --git a/aos/input/joystick_input.h b/aos/input/joystick_input.h
index 5e8bf5a..7a6e8c3 100644
--- a/aos/input/joystick_input.h
+++ b/aos/input/joystick_input.h
@@ -19,8 +19,7 @@
   explicit JoystickInput(::aos::EventLoop *event_loop)
       : event_loop_(event_loop) {
     event_loop_->MakeWatcher(
-        ".aos.joystick_state",
-        [this](const ::aos::JoystickState &joystick_state) {
+        "/aos", [this](const ::aos::JoystickState &joystick_state) {
           this->HandleData(&joystick_state);
         });
     event_loop->SetRuntimeRealtimePriority(29);