Merge branch 'main' into 400-fix-smart-shoot-distance-calculation

frc-862 · Mar 9, 2024 · 343b974 · 343b974
2 parents 5a0ed29 + ca3fd1e
commit 343b974
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/src/main/java/frc/robot/command/shoot/AmpShot.java b/src/main/java/frc/robot/command/shoot/AmpShot.java
@@ -25,15 +25,15 @@ public AmpShot(Flywheel flywheel, Pivot pivot) {
 
 	@Override
 	public void initialize() {
-		flywheel.setTopMoterRPM(CandConstants.AMP_TOP_RPM + flywheel.getBias());
-		flywheel.setBottomMoterRPM(CandConstants.AMP_BOTTOM_RPM + flywheel.getBias());
+		flywheel.setTopMotorRPM(CandConstants.AMP_TOP_RPM + flywheel.getBias());
+		flywheel.setBottomMotorRPM(CandConstants.AMP_BOTTOM_RPM + flywheel.getBias());
 		pivot.setTargetAngle(CandConstants.AMP_ANGLE + pivot.getBias());
 	}
 
 	@Override
 	public void execute() {
-		flywheel.setTopMoterRPM(CandConstants.AMP_TOP_RPM + flywheel.getBias());
-		flywheel.setBottomMoterRPM(CandConstants.AMP_BOTTOM_RPM + flywheel.getBias());
+		flywheel.setTopMotorRPM(CandConstants.AMP_TOP_RPM + flywheel.getBias());
+		flywheel.setBottomMotorRPM(CandConstants.AMP_BOTTOM_RPM + flywheel.getBias());
 		pivot.setTargetAngle(CandConstants.AMP_ANGLE + pivot.getBias());
 	}
 

diff --git a/src/main/java/frc/robot/command/shoot/AutonCand/AmpShotAuton.java b/src/main/java/frc/robot/command/shoot/AutonCand/AmpShotAuton.java
@@ -39,8 +39,8 @@ public void initialize() {
 		shot = false;
 		startIndexing = false;
 		startTime = Timer.getFPGATimestamp();
-		flywheel.setTopMoterRPM(CandConstants.AMP_TOP_RPM + flywheel.getBias());
-		flywheel.setBottomMoterRPM(CandConstants.AMP_BOTTOM_RPM + flywheel.getBias());
+		flywheel.setTopMotorRPM(CandConstants.AMP_TOP_RPM + flywheel.getBias());
+		flywheel.setBottomMotorRPM(CandConstants.AMP_BOTTOM_RPM + flywheel.getBias());
 		pivot.setTargetAngle(CandConstants.AMP_ANGLE + pivot.getBias());
 	}
 
@@ -58,8 +58,8 @@ public void execute() {
 			indexer.indexUp();
 		}
 
-		flywheel.setTopMoterRPM(CandConstants.AMP_TOP_RPM + flywheel.getBias());
-		flywheel.setBottomMoterRPM(CandConstants.AMP_BOTTOM_RPM + flywheel.getBias());
+		flywheel.setTopMotorRPM(CandConstants.AMP_TOP_RPM + flywheel.getBias());
+		flywheel.setBottomMotorRPM(CandConstants.AMP_BOTTOM_RPM + flywheel.getBias());
 		pivot.setTargetAngle(CandConstants.AMP_ANGLE + pivot.getBias());
 	}
 

diff --git a/src/main/java/frc/robot/command/shoot/Tune.java b/src/main/java/frc/robot/command/shoot/Tune.java
@@ -39,8 +39,8 @@ public void execute() {
 		LightningShuffleboard.setBool("TUNE", "Pivot On target", pivot.onTarget());
 
 		// flywheel.setAllMotorsRPM(flywheelTargetRPM);
-		flywheel.setTopMoterRPM(flywheelTargetRPMTop);
-		flywheel.setBottomMoterRPM(flywheelTargetRPMBottom);
+		flywheel.setTopMotorRPM(flywheelTargetRPMTop);
+		flywheel.setBottomMotorRPM(flywheelTargetRPMBottom);
 		pivot.setTargetAngle(pivotTargetAngle);
 	}
 

diff --git a/src/main/java/frc/robot/command/tests/testcmds/FlywheelTest.java b/src/main/java/frc/robot/command/tests/testcmds/FlywheelTest.java
@@ -23,8 +23,8 @@ public FlywheelTest(Flywheel flywheel, double topMotorSpeed, double bottomMotorS
 
     @Override
     public void initialize() {
-        flywheel.setTopMoterRPM(topMotorSpeed);
-        flywheel.setBottomMoterRPM(bottomMotorSpeed);
+        flywheel.setTopMotorRPM(topMotorSpeed);
+        flywheel.setBottomMotorRPM(bottomMotorSpeed);
     }
 
     @Override

diff --git a/src/main/java/frc/robot/subsystems/Flywheel.java b/src/main/java/frc/robot/subsystems/Flywheel.java
@@ -84,7 +84,7 @@ public void setAllMotorsRPM(double rpm) {
      * Sets the RPM of top flywheel
      * @param rpm RPM of the flywheel
      */
-    public void setTopMoterRPM(double rpm) {
+    public void setTopMotorRPM(double rpm) {
         coast(false);
         topTargetRPS = rpm / 60;
     }
@@ -93,7 +93,7 @@ public void setTopMoterRPM(double rpm) {
      * Sets the RPM of bottom flywheel
      * @param rpm RPM of the flywheel
      */
-    public void setBottomMoterRPM(double rpm) {
+    public void setBottomMotorRPM(double rpm) {
         coast(false);
         bottomTargetRPS = rpm / 60;
     }