public class MockMotor
+
public class MockDCMotor
extends Object
Simple mock motor.
@@ -102,7 +106,7 @@ loadScripts(document, 'script');
@@ -152,8 +156,8 @@ loadScripts(document, 'script');
-
-
MockMotor
-public MockMotor()
+MockDCMotor
+public MockDCMotor()
diff --git a/docs/org/firstinspires/ftc/teamcode/subsystems/chute/package-summary.html b/docs/org/firstinspires/ftc/teamcode/subsystems/chute/package-summary.html
index 7ce9237..a169cda 100644
--- a/docs/org/firstinspires/ftc/teamcode/subsystems/chute/package-summary.html
+++ b/docs/org/firstinspires/ftc/teamcode/subsystems/chute/package-summary.html
@@ -83,12 +83,16 @@ loadScripts(document, 'script');
Simple chute controller with homing and position control.
-
+
+
Mock continuous rotation servo for testing.
+
+
+
-
-
+
+
Simple mock potentiometer with configurable wraparound.
diff --git a/docs/org/firstinspires/ftc/teamcode/subsystems/chute/package-tree.html b/docs/org/firstinspires/ftc/teamcode/subsystems/chute/package-tree.html
index 1654ec6..b80fcab 100644
--- a/docs/org/firstinspires/ftc/teamcode/subsystems/chute/package-tree.html
+++ b/docs/org/firstinspires/ftc/teamcode/subsystems/chute/package-tree.html
@@ -55,7 +55,11 @@ loadScripts(document, 'script');
- org.firstinspires.ftc.teamcode.subsystems.chute.Chute
- org.firstinspires.ftc.teamcode.subsystems.chute.ChuteController
-- org.firstinspires.ftc.teamcode.subsystems.chute.MockMotor
+- org.firstinspires.ftc.teamcode.subsystems.chute.MockDCMotor
+
+- org.firstinspires.ftc.teamcode.subsystems.chute.MockCRServo
+
+
- org.firstinspires.ftc.teamcode.subsystems.chute.MockPotentiometer
diff --git a/docs/overview-tree.html b/docs/overview-tree.html
index 232b1cb..b2b22a0 100644
--- a/docs/overview-tree.html
+++ b/docs/overview-tree.html
@@ -59,7 +59,11 @@ loadScripts(document, 'script');
- org.firstinspires.ftc.teamcode.subsystems.chute.Chute
- org.firstinspires.ftc.teamcode.subsystems.chute.ChuteController
-- org.firstinspires.ftc.teamcode.subsystems.chute.MockMotor
+- org.firstinspires.ftc.teamcode.subsystems.chute.MockDCMotor
+
+- org.firstinspires.ftc.teamcode.subsystems.chute.MockCRServo
+
+
- org.firstinspires.ftc.teamcode.subsystems.chute.MockPotentiometer
diff --git a/docs/type-search-index.js b/docs/type-search-index.js
index 4f6f147..0738157 100644
--- a/docs/type-search-index.js
+++ b/docs/type-search-index.js
@@ -1 +1 @@
-typeSearchIndex = [{"l":"All Classes and Interfaces","u":"allclasses-index.html"},{"p":"org.firstinspires.ftc.teamcode.subsystems.chute","l":"Chute"},{"p":"org.firstinspires.ftc.teamcode.subsystems.chute","l":"ChuteController"},{"p":"org.firstinspires.ftc.teamcode.subsystems.chute","l":"MockMotor"},{"p":"org.firstinspires.ftc.teamcode.subsystems.chute","l":"MockPotentiometer"}];updateSearchResults();
\ No newline at end of file
+typeSearchIndex = [{"l":"All Classes and Interfaces","u":"allclasses-index.html"},{"p":"org.firstinspires.ftc.teamcode.subsystems.chute","l":"Chute"},{"p":"org.firstinspires.ftc.teamcode.subsystems.chute","l":"ChuteController"},{"p":"org.firstinspires.ftc.teamcode.subsystems.chute","l":"MockCRServo"},{"p":"org.firstinspires.ftc.teamcode.subsystems.chute","l":"MockDCMotor"},{"p":"org.firstinspires.ftc.teamcode.subsystems.chute","l":"MockPotentiometer"}];updateSearchResults();
\ No newline at end of file
diff --git a/src/main/java/org/firstinspires/ftc/teamcode/opmodes/ChuteOpMode.java b/src/main/java/org/firstinspires/ftc/teamcode/opmodes/ChuteOpMode.java
index 8f0b43f..69ac091 100644
--- a/src/main/java/org/firstinspires/ftc/teamcode/opmodes/ChuteOpMode.java
+++ b/src/main/java/org/firstinspires/ftc/teamcode/opmodes/ChuteOpMode.java
@@ -11,7 +11,7 @@ import org.firstinspires.ftc.teamcode.subsystems.chute.FtcCRServo;
import org.firstinspires.ftc.teamcode.subsystems.chute.FtcDCMotor;
import org.firstinspires.ftc.teamcode.subsystems.chute.FtcPotentiometer;
import org.firstinspires.ftc.teamcode.subsystems.chute.ChuteController;
-import org.firstinspires.ftc.teamcode.subsystems.chute.MockMotor;
+import org.firstinspires.ftc.teamcode.subsystems.chute.MockDCMotor;
/**
* Example OpMode demonstrating chute control with real hardware.
@@ -46,7 +46,7 @@ public class ChuteOpMode extends LinearOpMode {
FtcPotentiometer pot = new FtcPotentiometer(chutePot, POT_WRAP_AMOUNT);
// Create motor adapter — either DcMotor or CRServo
- MockMotor motor;
+ MockDCMotor motor;
if (USE_SERVO) {
CRServo chuteServo = hardwareMap.get(CRServo.class, "chute_servo");
motor = new FtcCRServo(chuteServo);
diff --git a/src/main/java/org/firstinspires/ftc/teamcode/subsystems/chute/Chute.java b/src/main/java/org/firstinspires/ftc/teamcode/subsystems/chute/Chute.java
index d0464c4..ec928eb 100644
--- a/src/main/java/org/firstinspires/ftc/teamcode/subsystems/chute/Chute.java
+++ b/src/main/java/org/firstinspires/ftc/teamcode/subsystems/chute/Chute.java
@@ -51,7 +51,7 @@ package org.firstinspires.ftc.teamcode.subsystems.chute;
*/
public class Chute {
private final ChuteController controller;
- private final MockMotor motor;
+ private final MockDCMotor motor;
private final MockPotentiometer pot;
/**
@@ -72,7 +72,7 @@ public class Chute {
* @param wrapAmount Potentiometer wraparound amount in radians (e.g., pi, 2pi, 4pi)
*/
public Chute(double maxExtension, double wrapAmount) {
- this.motor = new MockMotor();
+ this.motor = new MockDCMotor();
this.pot = new MockPotentiometer(wrapAmount);
this.controller = new ChuteController(motor, pot, maxExtension);
}
@@ -87,7 +87,7 @@ public class Chute {
* @see FtcDCMotor
* @see FtcPotentiometer
*/
- public Chute(ChuteController controller, MockMotor motor, MockPotentiometer pot) {
+ public Chute(ChuteController controller, MockDCMotor motor, MockPotentiometer pot) {
this.controller = controller;
this.motor = motor;
this.pot = pot;
@@ -168,9 +168,9 @@ public class Chute {
/**
* Gets motor instance for testing.
*
- * @return MockMotor instance used by this chute
+ * @return MockDCMotor instance used by this chute
*/
- public MockMotor getMotor() { return motor; }
+ public MockDCMotor getMotor() { return motor; }
/**
* Gets potentiometer instance for testing.
diff --git a/src/main/java/org/firstinspires/ftc/teamcode/subsystems/chute/ChuteController.java b/src/main/java/org/firstinspires/ftc/teamcode/subsystems/chute/ChuteController.java
index ad5ff06..44a230e 100644
--- a/src/main/java/org/firstinspires/ftc/teamcode/subsystems/chute/ChuteController.java
+++ b/src/main/java/org/firstinspires/ftc/teamcode/subsystems/chute/ChuteController.java
@@ -4,7 +4,7 @@ package org.firstinspires.ftc.teamcode.subsystems.chute;
* Simple chute controller with homing and position control.
*/
public class ChuteController {
- private final MockMotor motor;
+ private final MockDCMotor motor;
private final MockPotentiometer pot;
private final double maxExtension;
private final double wrapAmount;
@@ -29,7 +29,7 @@ public class ChuteController {
* @param pot Potentiometer that measures position
* @param maxExtension Maximum extension from home in radians
*/
- public ChuteController(MockMotor motor, MockPotentiometer pot, double maxExtension) {
+ public ChuteController(MockDCMotor motor, MockPotentiometer pot, double maxExtension) {
this.motor = motor;
this.pot = pot;
this.maxExtension = maxExtension;
diff --git a/src/main/java/org/firstinspires/ftc/teamcode/subsystems/chute/FtcCRServo.java b/src/main/java/org/firstinspires/ftc/teamcode/subsystems/chute/FtcCRServo.java
index 3a47eca..7645007 100644
--- a/src/main/java/org/firstinspires/ftc/teamcode/subsystems/chute/FtcCRServo.java
+++ b/src/main/java/org/firstinspires/ftc/teamcode/subsystems/chute/FtcCRServo.java
@@ -3,7 +3,7 @@ package org.firstinspires.ftc.teamcode.subsystems.chute;
import com.qualcomm.robotcore.hardware.CRServo;
/**
- * Adapter that wraps a real FTC CRServo and makes it look like a MockMotor.
+ * Adapter that wraps a real FTC CRServo and makes it look like a MockDCMotor.
* Drop-in replacement for FtcDCMotor when the chute is driven by a continuous
* rotation servo instead of a DC motor.
*
@@ -19,7 +19,7 @@ import com.qualcomm.robotcore.hardware.CRServo;
*
* @see FtcDCMotor
*/
-public class FtcCRServo extends MockMotor {
+public class FtcCRServo extends MockDCMotor {
private final CRServo servo;
/**
diff --git a/src/main/java/org/firstinspires/ftc/teamcode/subsystems/chute/FtcDCMotor.java b/src/main/java/org/firstinspires/ftc/teamcode/subsystems/chute/FtcDCMotor.java
index 6cdfba4..0d7abac 100644
--- a/src/main/java/org/firstinspires/ftc/teamcode/subsystems/chute/FtcDCMotor.java
+++ b/src/main/java/org/firstinspires/ftc/teamcode/subsystems/chute/FtcDCMotor.java
@@ -3,10 +3,10 @@ package org.firstinspires.ftc.teamcode.subsystems.chute;
import com.qualcomm.robotcore.hardware.DcMotor;
/**
- * Adapter that wraps a real FTC DcMotor and makes it look like a MockMotor.
+ * Adapter that wraps a real FTC DcMotor and makes it look like a MockDCMotor.
* Use this to connect the chute controller to actual hardware.
*/
-public class FtcDCMotor extends MockMotor {
+public class FtcDCMotor extends MockDCMotor {
private final DcMotor motor;
/**
diff --git a/src/main/java/org/firstinspires/ftc/teamcode/subsystems/chute/MockCRServo.java b/src/main/java/org/firstinspires/ftc/teamcode/subsystems/chute/MockCRServo.java
index cb7aa54..d4dbe42 100644
--- a/src/main/java/org/firstinspires/ftc/teamcode/subsystems/chute/MockCRServo.java
+++ b/src/main/java/org/firstinspires/ftc/teamcode/subsystems/chute/MockCRServo.java
@@ -4,10 +4,10 @@ package org.firstinspires.ftc.teamcode.subsystems.chute;
* Mock continuous rotation servo for testing.
* Mirrors the override pattern of {@link FtcCRServo} without requiring the FTC SDK.
*
- *
Extends MockMotor and overrides {@code setPower()} to track commanded values,
+ *
Extends MockDCMotor and overrides {@code setPower()} to track commanded values,
* letting tests verify that ChuteController correctly routes through a subclassed motor.
*/
-public class MockCRServo extends MockMotor {
+public class MockCRServo extends MockDCMotor {
private double lastCommandedPower = 0.0;
private int setPowerCallCount = 0;
diff --git a/src/main/java/org/firstinspires/ftc/teamcode/subsystems/chute/MockMotor.java b/src/main/java/org/firstinspires/ftc/teamcode/subsystems/chute/MockDCMotor.java
similarity index 93%
rename from src/main/java/org/firstinspires/ftc/teamcode/subsystems/chute/MockMotor.java
rename to src/main/java/org/firstinspires/ftc/teamcode/subsystems/chute/MockDCMotor.java
index 7b4ad42..37b4a33 100644
--- a/src/main/java/org/firstinspires/ftc/teamcode/subsystems/chute/MockMotor.java
+++ b/src/main/java/org/firstinspires/ftc/teamcode/subsystems/chute/MockDCMotor.java
@@ -3,12 +3,12 @@ package org.firstinspires.ftc.teamcode.subsystems.chute;
/**
* Simple mock motor.
*/
-public class MockMotor {
+public class MockDCMotor {
private double power;
private double position;
private double speed = 1.0; // rad/s at full power
- public MockMotor() {
+ public MockDCMotor() {
this.power = 0.0;
this.position = 0.0;
}
diff --git a/src/test/java/org/firstinspires/ftc/teamcode/subsystems/chute/ChuteTest.java b/src/test/java/org/firstinspires/ftc/teamcode/subsystems/chute/ChuteTest.java
index 9718229..058382c 100644
--- a/src/test/java/org/firstinspires/ftc/teamcode/subsystems/chute/ChuteTest.java
+++ b/src/test/java/org/firstinspires/ftc/teamcode/subsystems/chute/ChuteTest.java
@@ -272,7 +272,7 @@ public class ChuteTest {
// ========================================================================
// CRServo adapter tests
//
- // FtcCRServo extends MockMotor and overrides setPower() to forward to real
+ // FtcCRServo extends MockDCMotor and overrides setPower() to forward to real
// hardware. MockCRServo replicates that pattern without the FTC SDK,
// proving the full pipeline works when the motor is a subclass.
// ========================================================================