Log gear/shifting info in drivetrain status instead of seperate structs

Change-Id: Ib25174051fab63ec7b453da02ddf5f0a12e0145d
diff --git a/frc971/control_loops/drivetrain/drivetrain.q b/frc971/control_loops/drivetrain/drivetrain.q
index da4fadc..76f5ec6 100644
--- a/frc971/control_loops/drivetrain/drivetrain.q
+++ b/frc971/control_loops/drivetrain/drivetrain.q
@@ -144,6 +144,10 @@
 
     // The angle of the robot relative to the ground.
     double ground_angle;
+
+    // Information about shifting logic and curent gear, for logging purposes
+    GearLogging gear_logging;
+    CIMLogging cim_logging;
   };
 
   queue Goal goal;