Remove the final users of robot_state and joystick_state
This means we can remove them from the .q file.
Change-Id: Iefded3cf4537b2635341f3248c5f50af1534a241
diff --git a/frc971/wpilib/ADIS16448.h b/frc971/wpilib/ADIS16448.h
index 49c4fb2..a1d6dcd 100644
--- a/frc971/wpilib/ADIS16448.h
+++ b/frc971/wpilib/ADIS16448.h
@@ -11,7 +11,9 @@
#include "frc971/wpilib/ahal/SPI.h"
#undef ERROR
+#include "aos/events/event-loop.h"
#include "aos/logging/logging.h"
+#include "aos/robot_state/robot_state.q.h"
#include "frc971/wpilib/spi_rx_clearer.h"
namespace frc971 {
@@ -29,7 +31,8 @@
public:
// port is where to find the sensor over SPI.
// dio1 must be connected to DIO1 on the sensor.
- ADIS16448(frc::SPI::Port port, frc::DigitalInput *dio1);
+ ADIS16448(::aos::EventLoop *event_loop, frc::SPI::Port port,
+ frc::DigitalInput *dio1);
// Sets the dummy SPI port to send values on to make the roboRIO deassert the
// chip select line. This is mainly useful when there are no other devices
@@ -89,6 +92,9 @@
// Returns true if it succeeds.
bool Initialize();
+ ::aos::EventLoop *event_loop_;
+ ::aos::Fetcher<::aos::JoystickState> joystick_state_fetcher_;
+
// TODO(Brian): This object has no business owning these ones.
const ::std::unique_ptr<frc::SPI> spi_;
::std::unique_ptr<frc::SPI> dummy_spi_;