Skip to content

Commit 377d1d1

Browse files
committed
Merge branch 'groupOne' of https://github.com/FRC1257/Subsystem-Development into groupOne
2 parents 31d6030 + 9b6b3eb commit 377d1d1

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@
22

33
public class DropperConstants {
44

5-
public static Constraints kArmConstraints;
5+
public static Constraints kDropperConstraints;
66
public static final double UPPER_LIMIT = 1;
77
public static final double LOWER_LIMIT = -1;
88

9-
// add motor id's
9+
public static final int LEFT_MOTOR_ID = 0
10+
public static final int RIGHT_MOTOR_ID = 0
11+
12+
1013
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ public class ArmIOInputs {
1010
public double angVelocityRadsPerSec;
1111
}
1212

13+
// Methods to be implemented in IOSim and IOSparkMax
1314
public default void updateInputs(ArmIOInputs inputs) {}
1415

1516
public default double getAngle() {}

0 commit comments

Comments
 (0)