modifications at Davis. SPLIT OUT LATER
diff --git a/frc971/input/JoystickReader.cc b/frc971/input/JoystickReader.cc
index 84f20b5..237a755 100644
--- a/frc971/input/JoystickReader.cc
+++ b/frc971/input/JoystickReader.cc
@@ -120,9 +120,8 @@
static double angle_adjust_goal = 0.42;
if (Pressed(2, 5)) {
// long shot
- shooter_goal->velocity = 375;
+ shooter_goal->velocity = 131;
angle_adjust_goal = 0.70;
- angle_adjust_goal = 0.564;
} else if (Pressed(2, 3)) {
// medium shot
shooter_goal->velocity = 375;
diff --git a/frc971/input/sensor_packer.cc b/frc971/input/sensor_packer.cc
index b241f50..2b134d0 100644
--- a/frc971/input/sensor_packer.cc
+++ b/frc971/input/sensor_packer.cc
@@ -36,6 +36,7 @@
unique_ptr< ::AnalogTrigger>(
new ::AnalogTrigger(1)),
::AnalogTriggerOutput::Type::kState)),
+ wrist_edge_position_(0),
wrist_notifier_(ReadEncoder, wrist_hall_effect_->source(),
new EncoderReadData(wrist_counter_.get(),
&wrist_edge_position_, &wrist_sync_)),