commit dabdf90e70d8ba2386faba3c1c1b8687c10a718f
author Brian Silverman <bsilver16384@gmail.com> Sat Oct 21 15:34:40 2017 -0400
committer Brian Silverman <bsilver16384@gmail.com> Sat Mar 10 18:08:08 2018 -0800
tree 331ced8d56fea0e800a6213c20d1df4343296761
parent 5e849f21aa5ad0063f0ba2edc96adc32b135c56b

Clean up the new pistol grip code

I ended up with various pieces left over after committing all the
pieces...

Change-Id: I129299f988c236a602a289fb0ad6b92f265f8ea2

motors/pistol_grip/controller.cc

diff --git a/motors/pistol_grip/controller.cc b/motors/pistol_grip/controller.cc
index 4460355..dd3a4b8 100644
--- a/motors/pistol_grip/controller.cc
+++ b/motors/pistol_grip/controller.cc
@@ -1,11 +1,13 @@
 #include "motors/core/kinetis.h"
 
-#include <stdio.h>
 #include <inttypes.h>
+#include <stdio.h>
 
 #include <atomic>
 #include <cmath>
 
+#include "frc971/control_loops/drivetrain/integral_haptic_trigger.h"
+#include "frc971/control_loops/drivetrain/integral_haptic_wheel.h"
 #include "motors/core/time.h"
 #include "motors/motor.h"
 #include "motors/peripheral/adc.h"
@@ -14,8 +16,6 @@
 #include "motors/usb/cdc.h"
 #include "motors/usb/usb.h"
 #include "motors/util.h"
-#include "frc971/control_loops/drivetrain/integral_haptic_wheel.h"
-#include "frc971/control_loops/drivetrain/integral_haptic_trigger.h"
 
 #define MOTOR0_PWM_FTM FTM3
 #define MOTOR0_ENCODER_FTM FTM2
@@ -195,11 +195,9 @@
   global_motor0.load(::std::memory_order_relaxed)
       ->HandleInterrupt(BalanceSimpleReadings(readings.currents), encoder);
 
-
   global_trigger_angle.store(trigger_angle);
 }
 
-
 int ConvertFloat16(float val) {
   int result = static_cast<int>(val * 32768.0f) + 32768;
   if (result > 0xffff) {