Skip to content

Commit ae5797e

Browse files
committed
Merge branch 'groupOne' of https://github.com/FRC1257/Subsystem-Development into groupOne
2 parents d14b66d + a5a2abd commit ae5797e

11 files changed

Lines changed: 71 additions & 9 deletions

File tree

0 Bytes
Binary file not shown.
1.03 KB
Binary file not shown.
1.11 KB
Binary file not shown.
0 Bytes
Binary file not shown.

bin/main/frc/robot/Robot.class

1.65 KB
Binary file not shown.
12.3 KB
Binary file not shown.
2.33 KB
Binary file not shown.

src/main/java/frc/robot/subsystems/dropper/Dropper.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ public Dropper(DropperIO io) {
1616
this.io = io;
1717
}
1818

19+
//every 0.2 secs updates the inputs
1920
@Override
2021
public void periodic() {
2122
io.updateInputs(inputs);
@@ -26,11 +27,12 @@ public Command runVoltage(DoubleSupplier voltage) {
2627
return new RunCommand (() -> io.setVoltage(voltage), this).withName("Dropper Voltage");
2728
}
2829

29-
30+
//stops the dropper motors
3031
public Command stop() {
3132
return runOnce(() -> io.stop().withName("Dropper Stop"));
3233
}
3334

35+
// sets the PID
3436
public void setPIDGains(double kP, double kI, double kD) {
3537
io.setPIDGains(kP, kI, kD);
3638
}

src/main/java/frc/robot/subsystems/dropper/DropperIO.java

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,22 @@ public default double getAngVelocity() {
2424
public default void setVoltage(double voltage) {}
2525

2626
public default void setPosition(int position) {}
27+
28+
public default void setSetpoint(double setpoint) {}
29+
30+
public default void goToSetpoint(double setpoint) {}
2731

2832
public default void stop() {}
2933

3034
// PID
31-
public default void setPIDGains(double kp, ki, kd) {}
32-
public default double getP() {}
33-
public default double getI() {}
34-
public default double getD() {}
35+
public default void setPIDGains(double kp, double ki, double kd) {}
36+
public default double getP() {
37+
return 0.0;
38+
}
39+
public default double getI() {
40+
return 0.0;
41+
}
42+
public default double getD() {
43+
return 0.0;
44+
}
3545
}
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,58 @@
11
package frc.robot.subsystems.dropper;
22

3+
import static frc.robot.Constants.NEO_CURRENT_LIMIT;
4+
5+
import edu.wpi.first.math.controller.ProfiledPIDController;
6+
37
public class DropperIOSim implements DropperIO {
48

9+
@Override
10+
public default void updateInputs(DropperIOInputs inputs) {
11+
12+
}
13+
14+
@Override
15+
public default double getAngle() {
16+
return DropperIOInputs.angle;
17+
}
18+
19+
@Override
20+
public default double getAngVelocity() {
21+
return DropperIOInputs.velocity;
22+
}
23+
24+
@Override
25+
public default void setVoltage(double voltage) {
26+
27+
}
28+
29+
@Override
30+
public default void setPosition(int position) {
31+
32+
}
33+
34+
@Override
35+
public default void stop() {}
36+
37+
// PID
38+
39+
@Override
40+
public default void setPIDGains(double kp, ki, kd) {
41+
42+
}
43+
44+
@Override
45+
public default double getP() {
46+
47+
}
48+
49+
@Override
50+
public default double getI() {
51+
52+
}
53+
54+
@Override
55+
public default double getD() {
56+
57+
}
558
}

0 commit comments

Comments
 (0)