commit 3abe8863854a039d08b725055f4d146a540f49fb
author Ojas Upadhye <ojasupadhye@gmail.com> Sat Feb 11 17:06:53 2017 -0800
committer Ojas Upadhye <ojasupadhye@gmail.com> Mon Feb 20 14:16:21 2017 -0800
tree 887e886a7e77080c0fd9433dd57d16f6f557cda3
parent 2dfc9cffb8d756a1293702bffbfa4d6e8311fc7b

Fixed formating in the intake control_loop.

Change-Id: I9d0df25b622400766a2ca7a0d0e9ad4205c89d5c

y2017/constants.h

diff --git a/y2017/constants.h b/y2017/constants.h
index 1ad582b..2e9b770 100644
--- a/y2017/constants.h
+++ b/y2017/constants.h
@@ -70,7 +70,8 @@
   static constexpr double kIntakeEncoderIndexDifference =
       2.0 * M_PI * kIntakeEncoderRatio;
   static constexpr double kMaxIntakeEncoderPulsesPerSecond =
-      control_loops::superstructure::intake::kFreeSpeed * control_loops::superstructure::intake::kOutputRatio /
+      control_loops::superstructure::intake::kFreeSpeed *
+      control_loops::superstructure::intake::kOutputRatio /
       constants::Values::kIntakeEncoderRatio *
       kIntakeEncoderCountsPerRevolution;
   static constexpr ::frc971::constants::Range kIntakeRange{
@@ -83,7 +84,8 @@
   static constexpr double kHoodEncoderIndexDifference =
       2.0 * M_PI * kHoodEncoderRatio;
   static constexpr double kMaxHoodEncoderPulsesPerSecond =
-      control_loops::superstructure::hood::kFreeSpeed * control_loops::superstructure::hood::kOutputRatio /
+      control_loops::superstructure::hood::kFreeSpeed *
+      control_loops::superstructure::hood::kOutputRatio /
       constants::Values::kHoodEncoderRatio * kHoodEncoderCountsPerRevolution;
   static constexpr ::frc971::constants::Range kHoodRange{
       -0.39 * M_PI / 180.0, 37.11 * M_PI / 180.0, (-0.39 + 1.0) * M_PI / 180.0,
@@ -95,7 +97,8 @@
   static constexpr double kTurretEncoderIndexDifference =
       2.0 * M_PI * kTurretEncoderRatio;
   static constexpr double kMaxTurretEncoderPulsesPerSecond =
-      control_loops::superstructure::turret::kFreeSpeed * control_loops::superstructure::turret::kOutputRatio /
+      control_loops::superstructure::turret::kFreeSpeed *
+      control_loops::superstructure::turret::kOutputRatio /
       constants::Values::kTurretEncoderRatio *
       kTurretEncoderCountsPerRevolution;
   static constexpr ::frc971::constants::Range kTurretRange{

y2017/control_loops/superstructure/intake/intake.h

diff --git a/y2017/control_loops/superstructure/intake/intake.h b/y2017/control_loops/superstructure/intake/intake.h
index def4d96..c6990bc 100644
--- a/y2017/control_loops/superstructure/intake/intake.h
+++ b/y2017/control_loops/superstructure/intake/intake.h
@@ -11,38 +11,36 @@
 
 class Intake {
  public:
-   Intake();
-   double goal(int row, int col) const {
-     return profiled_subsystem_.goal(row, col);
-   }
+  Intake();
+  double goal(int row, int col) const {
+    return profiled_subsystem_.goal(row, col);
+  }
 
-   // The zeroing and operating voltages.
-   static constexpr double kZeroingVoltage = 2.5;
-   static constexpr double kOperatingVoltage = 12.0;
+  // The zeroing and operating voltages.
+  static constexpr double kZeroingVoltage = 2.5;
+  static constexpr double kOperatingVoltage = 12.0;
 
-   void Iterate(const control_loops::IntakeGoal *unsafe_goal,
-                const ::frc971::PotAndAbsolutePosition *position,
-                double *output,
-                ::frc971::control_loops::AbsoluteProfiledJointStatus *status);
+  void Iterate(const control_loops::IntakeGoal *unsafe_goal,
+               const ::frc971::PotAndAbsolutePosition *position, double *output,
+               ::frc971::control_loops::AbsoluteProfiledJointStatus *status);
 
-   void Reset();
+  void Reset();
 
-   enum class State : int32_t{
-     UNINITIALIZED,
-     DISABLED_INITIALIZED,
-     ZEROING,
-     RUNNING,
-     ESTOP,
-   };
+  enum class State : int32_t {
+    UNINITIALIZED,
+    DISABLED_INITIALIZED,
+    ZEROING,
+    RUNNING,
+    ESTOP,
+  };
 
-   State state() const { return state_; }
+  State state() const { return state_; }
 
-  private:
-   State state_;
+ private:
+  State state_;
 
-   ::frc971::control_loops::SingleDOFProfiledSubsystem<
-       ::frc971::zeroing::PotAndAbsEncoderZeroingEstimator>
-       profiled_subsystem_;
+  ::frc971::control_loops::SingleDOFProfiledSubsystem<
+      ::frc971::zeroing::PotAndAbsEncoderZeroingEstimator> profiled_subsystem_;
 };
 
 }  // namespace intake