diff --git a/TeamCode/src/main/java/ftclib b/TeamCode/src/main/java/ftclib index e00a6a5..12962c5 160000 --- a/TeamCode/src/main/java/ftclib +++ b/TeamCode/src/main/java/ftclib @@ -1 +1 @@ -Subproject commit e00a6a5bfdb3b4d9399960e732a60357aa2cdbd3 +Subproject commit 12962c5ae8eefce4ffabf6b4bc104fe78e418882 diff --git a/TeamCode/src/main/java/teamcode/RobotParams.java b/TeamCode/src/main/java/teamcode/RobotParams.java index 20111f8..09a7580 100644 --- a/TeamCode/src/main/java/teamcode/RobotParams.java +++ b/TeamCode/src/main/java/teamcode/RobotParams.java @@ -52,7 +52,13 @@ public class RobotParams */ public static class Gobilda { - // https://www.gobilda.com/5203-series-yellow-jacket-planetary-gear-motor-19-2-1-ratio-24mm-length-8mm-rex-shaft-312-rpm-3-3-5v-encoder/ + //https://www.gobilda.com/5203-series-yellow-jacket-planetary-gear-motor-71-2-1-ratio-24mm-length-8mm-rex-shaft-84-rpm-3-3-5v-encoder/ + public static final double MOTOR_5203_84_ENC_PPR = + (((1.0 + 46.0/17.0) * (1.0 + 46.0/17.0) * (1.0 + 46.0/11.0)) * 28.0); + public static final double MOTOR_5203_84_MAX_RPM = 84.0; + public static final double MOTOR_5203_84_MAX_VEL_PPS = + MOTOR_5203_84_ENC_PPR * MOTOR_5203_84_MAX_RPM / 60.0; // 2789.661 pps + //https://www.gobilda.com/5203-series-yellow-jacket-planetary-gear-motor-19-2-1-ratio-24mm-length-8mm-rex-shaft-312-rpm-3-3-5v-encoder/ public static final double MOTOR_5203_312_ENC_PPR = (((1.0 + 46.0/17.0)*(1.0 + 46.0/11.0))*28.0); public static final double MOTOR_5203_312_MAX_RPM = 312.0; public static final double MOTOR_5203_312_MAX_VEL_PPS = @@ -143,7 +149,7 @@ public class RobotParams // Status Update: Status Update may affect robot loop time, don't do it when in competition. public static final boolean doStatusUpdate = !inCompetition; public static final boolean showSubsystems = true; - public static final boolean useBlinkinLED = true; + public static final boolean useBlinkinLED = false; public static final boolean useGobildaLED = false; // Vision public static final boolean useVision = false; @@ -269,9 +275,7 @@ public class RobotParams public VisionOnlyParams() { robotName = "VisionOnly"; - // Front Camera webCam1 = new FrontCamParams(); - // Back Camera webCam2 = new BackCamParams(); limelight = new LimelightParams(); } //VisionOnlyParams diff --git a/TeamCode/src/main/java/trclib b/TeamCode/src/main/java/trclib index 5297676..d9953b9 160000 --- a/TeamCode/src/main/java/trclib +++ b/TeamCode/src/main/java/trclib @@ -1 +1 @@ -Subproject commit 5297676fcb83b6174ff31862d0dcaa026816d606 +Subproject commit d9953b914bd293f540aebc502d118c8959c79127