One more fix to resolve Noah's merge conflict for him
This commit is contained in:
@@ -33,6 +33,8 @@ public class ElevatorConstants {
|
|||||||
public static final double kFeedForwardG = 0;
|
public static final double kFeedForwardG = 0;
|
||||||
public static final double kFeedForwardV = 0;
|
public static final double kFeedForwardV = 0;
|
||||||
|
|
||||||
|
public static final double kElevatorMaxVelocity = 0;
|
||||||
|
|
||||||
// 1, 7, 10 are the defaults for these, change as necessary
|
// 1, 7, 10 are the defaults for these, change as necessary
|
||||||
public static final double kSysIDRampRate = 1;
|
public static final double kSysIDRampRate = 1;
|
||||||
public static final double kSysIDStepVolts = 7;
|
public static final double kSysIDStepVolts = 7;
|
||||||
|
|||||||
Reference in New Issue
Block a user