Skip to content
This repository was archived by the owner on Jan 13, 2025. It is now read-only.

Commit 1060e1c

Browse files
committed
add current limits to mechanism motors
1 parent f2ec15a commit 1060e1c

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

src/main/java/com/team766/robot/burro_arm/mechanisms/Arm.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import com.team766.config.ConfigFileReader;
44
import com.team766.framework.Mechanism;
55
import com.team766.hal.EncoderReader;
6-
import com.team766.hal.MotorController;
76
import com.team766.hal.MotorController.ControlMode;
87
import com.team766.hal.RobotProvider;
8+
import com.team766.hal.wpilib.CANSparkMaxMotorController;
99
import com.team766.library.RateLimiter;
1010
import com.team766.library.ValueProvider;
1111
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
@@ -16,7 +16,7 @@ public class Arm extends Mechanism {
1616
private static final double MOTOR_ROTATIONS_TO_ARM_ANGLE =
1717
ABSOLUTE_ENCODER_TO_ARM_ANGLE * (1. / (5. * 5. * 5.) /*planetary gearbox*/);
1818

19-
private final MotorController motor;
19+
private final CANSparkMaxMotorController motor;
2020
private final EncoderReader absoluteEncoder;
2121

2222
private final ValueProvider<Double> absoluteEncoderOffset;
@@ -25,7 +25,8 @@ public class Arm extends Mechanism {
2525
private boolean initialized = false;
2626

2727
public Arm() {
28-
motor = RobotProvider.instance.getMotor("arm.Motor");
28+
motor = (CANSparkMaxMotorController)RobotProvider.instance.getMotor("arm.Motor");
29+
motor.setSmartCurrentLimit(5, 80, 200);
2930
absoluteEncoder = RobotProvider.instance.getEncoder("arm.AbsoluteEncoder");
3031
absoluteEncoderOffset = ConfigFileReader.instance.getDouble("arm.AbsoluteEncoderOffset");
3132
}

src/main/java/com/team766/robot/burro_elevator/mechanisms/Elevator.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package com.team766.robot.burro_elevator.mechanisms;
22

33
import com.team766.framework.Mechanism;
4-
import com.team766.hal.MotorController;
4+
import com.team766.hal.MotorController.ControlMode;
55
import com.team766.hal.RobotProvider;
6+
import com.team766.hal.wpilib.CANSparkMaxMotorController;
67
import com.team766.library.RateLimiter;
78
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
89

@@ -12,11 +13,12 @@ public class Elevator extends Mechanism {
1213
* (18. /*teeth per rotation of sprocket*/)
1314
* (1. / (3. * 4. * 4.) /*planetary gearbox*/);
1415

15-
private final MotorController motor;
16+
private final CANSparkMaxMotorController motor;
1617
private final RateLimiter dashboardRateLimiter = new RateLimiter(0.1);
1718

1819
public Elevator() {
19-
motor = RobotProvider.instance.getMotor("elevator.Motor");
20+
motor = (CANSparkMaxMotorController)RobotProvider.instance.getMotor("elevator.Motor");
21+
motor.setSmartCurrentLimit(10, 80, 200);
2022
}
2123

2224
public void setPower(final double power) {
@@ -27,9 +29,7 @@ public void setPower(final double power) {
2729
public void setPosition(final double position) {
2830
checkContextOwnership();
2931

30-
motor.set(
31-
MotorController.ControlMode.Position,
32-
position / MOTOR_ROTATIONS_TO_ELEVATOR_POSITION);
32+
motor.set(ControlMode.Position, position / MOTOR_ROTATIONS_TO_ELEVATOR_POSITION);
3333
}
3434

3535
public double getPosition() {

0 commit comments

Comments
 (0)