:( i couldnt make robot map work heres some miscelaneous changes

CurtinFRC · Nov 26, 2023 · d707d65 · d707d65
1 parent 6c37666
commit d707d65
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/src/main/include/Robot.h b/src/main/include/Robot.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <frc/TimedRobot.h>
+
 #include "RobotMap.h"
 
 class Robot : public frc::TimedRobot {

diff --git a/src/main/include/RobotMap.h b/src/main/include/RobotMap.h
@@ -1,17 +1,19 @@
 #pragma once
 
-#include "Wombat.h"
-
 #include <frc/XboxController.h>
 
+#include "Wombat.h"
+
 struct RobotMap {
   struct Controllers {
-    frc::XboxController driver = frc::XboxController(0);
-    frc::XboxController coDriver = frc::XboxController(1);
+    frc::XboxController driver         = frc::XboxController(0);
+    frc::XboxController coDriver       = frc::XboxController(1);
     frc::XboxController testController = frc::XboxController(2);
   };
+  Controllers controllers;
 
   struct Swerve {
-    
+
   };
+  Swerve swerve;
 };
diff --git a/wombat/src/main/cpp/drivetrain/SwerveDrive.cpp b/wombat/src/main/cpp/drivetrain/SwerveDrive.cpp
@@ -93,7 +93,7 @@ void wom::drivetrain::SwerveModule::Log() {
 void wom::drivetrain::SwerveModule::OnUpdate(units::second_t dt,
                                              units::radian_t rotation,
                                              units::meter_t  movement,
-                                             units::volt_t rotationVoltage) {
+                                             units::volt_t   rotationVoltage) {
   Log();
 
   switch (_state) {

diff --git a/wombat/src/main/include/utils/Gearbox.h b/wombat/src/main/include/utils/Gearbox.h
@@ -7,7 +7,6 @@
 
 namespace wom {
 namespace utils {
-  using DCMotor = frc::DCMotor;
   /**
    * Struct for motor and encoder pairs.
    *