fix errors

ut-ras · Nov 9, 2024 · c842a21 · c842a21
1 parent b4bb19e
commit c842a21
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 45 deletions.
diff --git a/ut-robomaster/src/subsystems/agitator/agitator_subsystem.cpp b/ut-robomaster/src/subsystems/agitator/agitator_subsystem.cpp
@@ -50,9 +50,9 @@ void AgitatorSubsystem::refresh()
     return;
 #endif
 
-    setAmputated(!hardwareOk())
+    setAmputated(!hardwareOk());
 
-        float time = getTimeMilliseconds() / 1000.0f;
+    float time = getTimeMilliseconds() / 1000.0f;
     float velocity = getShapedVelocity(time, 1.0f, 0.0f, ballsPerSecond);
     bool killSwitch = drivers->isKillSwitched() || !flywheel->isActive() || isAmputated();
 
@@ -78,9 +78,9 @@ float AgitatorSubsystem::getVelocity() { return agitator.measureVelocity(); }
 bool AgitatorSubsystem::hardwareOk()
 {
 #ifdef TARGET_HERO
-    return flywheel.hardwareOk() && agitator.isOnline() && feeder.isOnline()
+    return flywheel->hardwareOk() && agitator.isOnline() && feeder.isOnline();
 #else
-    return flywheel.hardwareOk() && agitator.isOnline()
+    return flywheel->hardwareOk() && agitator.isOnline();
 #endif
 }
 

diff --git a/ut-robomaster/src/subsystems/odometry/odometry_subsystem.cpp b/ut-robomaster/src/subsystems/odometry/odometry_subsystem.cpp
@@ -28,7 +28,7 @@ void OdometrySubsystem::refresh()
     }
 }
 
-bool OdometrySubsystem::hardwareOk() { return chassis.hardwareOk() && turret.hardwareOk(); }
+bool OdometrySubsystem::hardwareOk() { return chassis->hardwareOk() && turret->hardwareOk(); }
 
 Vector2f OdometrySubsystem::getPosition()
 {

diff --git a/ut-robomaster/src/subsystems/odometry/odometry_subsystem.hpp b/ut-robomaster/src/subsystems/odometry/odometry_subsystem.hpp
@@ -15,44 +15,42 @@
 #include "utils/robot_comms.hpp"
 
 #include "drivers.hpp"
+namespace subsystems
 {
-    namespace odometry
-    {
-
-    using chassis::ChassisSubsystem;
-    using tap::algorithms::odometry::Odometry2DTracker;
-    using turret::TurretSubsystem;
-
-    class OdometrySubsystem : public UTSubsystem
-    {
-    public:
-        OdometrySubsystem(
-            src::Drivers* drivers,
-            ChassisSubsystem* chassis,
-            TurretSubsystem* turret);
-        void initialize() override;
-        void refresh() override;
-        const char* getName() override { return "Odometry subsystem"; }
-
-        Vector2f getPosition();
-        Vector2f getLinearVelocity();
-
-        float getChassisYaw();
-        float getChassisAngularVelocity();
-
-        float getTurretLocalYaw();
-        float getTurretLocalPitch();
-        bool hardwareOk() override;
-
-    private:
-        src::Drivers* drivers;
-        ChassisSubsystem* chassis;
-        TurretSubsystem* turret;
-
-        ChassisDisplacementObserver chassisDisplacement;
-        ChassisWorldYawObserver chassisYaw;
-        Odometry2DTracker chassisTracker;
-    };
-    }  // namespace odometry
-}  // namespace subsyste
-}  // namespace subsystemsms
+namespace odometry
+{
+
+using chassis::ChassisSubsystem;
+using tap::algorithms::odometry::Odometry2DTracker;
+using turret::TurretSubsystem;
+
+class OdometrySubsystem : public UTSubsystem
+{
+public:
+    OdometrySubsystem(src::Drivers* drivers, ChassisSubsystem* chassis, TurretSubsystem* turret);
+    void initialize() override;
+    void refresh() override;
+    const char* getName() override { return "Odometry subsystem"; }
+
+    Vector2f getPosition();
+    Vector2f getLinearVelocity();
+
+    float getChassisYaw();
+    float getChassisAngularVelocity();
+
+    float getTurretLocalYaw();
+    float getTurretLocalPitch();
+    bool hardwareOk() override;
+
+private:
+    src::Drivers* drivers;
+    ChassisSubsystem* chassis;
+    TurretSubsystem* turret;
+
+    ChassisDisplacementObserver chassisDisplacement;
+    ChassisWorldYawObserver chassisYaw;
+    Odometry2DTracker chassisTracker;
+};
+}  // namespace odometry
+}  // namespace subsystems
+   // namespace subsystemsms