Skip to content

Commit 677a4c3

Browse files
committed
fxs
1 parent 37d4467 commit 677a4c3

18 files changed

+109
-1181
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id "java"
3-
id "edu.wpi.first.GradleRIO" version "2025.1.1"
3+
id "edu.wpi.first.GradleRIO" version "2025.2.1"
44
id "com.diffplug.spotless" version "6.12.1"
55
id "com.peterabeles.gversion" version "1.10"
66
}

src/main/java/frc/robot/constants/CoralConstants.java

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
package frc.robot.constants;
22

33
import static edu.wpi.first.units.Units.DegreesPerSecond;
4+
import static edu.wpi.first.units.Units.Rotations;
5+
import static edu.wpi.first.units.Units.RotationsPerSecond;
46

57
import com.ctre.phoenix6.configs.CurrentLimitsConfigs;
68
import com.ctre.phoenix6.configs.HardwareLimitSwitchConfigs;
79
import com.ctre.phoenix6.configs.MotionMagicConfigs;
810
import com.ctre.phoenix6.configs.MotorOutputConfigs;
911
import com.ctre.phoenix6.configs.Slot0Configs;
10-
import com.ctre.phoenix6.configs.TalonFXConfiguration;
12+
import com.ctre.phoenix6.configs.TalonFXSConfiguration;
1113
import com.ctre.phoenix6.signals.ForwardLimitSourceValue;
1214
import com.ctre.phoenix6.signals.ForwardLimitTypeValue;
1315
import com.ctre.phoenix6.signals.GravityTypeValue;
@@ -19,11 +21,11 @@
1921
public class CoralConstants {
2022
public static int kCoralFxId = 0;
2123

22-
public static final AngularVelocity kCloseEnough = DegreesPerSecond.of(5);
24+
public static final AngularVelocity kCloseEnough = RotationsPerSecond.of(0.1);
2325

2426
// Coral Talon FX Config
25-
public static TalonFXConfiguration getFXConfig() {
26-
TalonFXConfiguration fxConfig = new TalonFXConfiguration();
27+
public static TalonFXSConfiguration getFXConfig() {
28+
TalonFXSConfiguration fxsConfig = new TalonFXSConfiguration();
2729

2830
CurrentLimitsConfigs current =
2931
new CurrentLimitsConfigs()
@@ -34,7 +36,7 @@ public static TalonFXConfiguration getFXConfig() {
3436
.withSupplyCurrentLowerLimit(8)
3537
.withSupplyCurrentLowerTime(0.02)
3638
.withSupplyCurrentLimitEnable(true);
37-
fxConfig.CurrentLimits = current;
39+
fxsConfig.CurrentLimits = current;
3840

3941
HardwareLimitSwitchConfigs hwLimit =
4042
new HardwareLimitSwitchConfigs()
@@ -46,7 +48,7 @@ public static TalonFXConfiguration getFXConfig() {
4648
.withReverseLimitEnable(false)
4749
.withReverseLimitType(ReverseLimitTypeValue.NormallyOpen)
4850
.withReverseLimitSource(ReverseLimitSourceValue.LimitSwitchPin);
49-
fxConfig.HardwareLimitSwitch = hwLimit;
51+
fxsConfig.HardwareLimitSwitch = hwLimit;
5052

5153
Slot0Configs slot0 =
5254
new Slot0Configs()
@@ -58,7 +60,7 @@ public static TalonFXConfiguration getFXConfig() {
5860
.withKS(0)
5961
.withKV(0)
6062
.withKA(0);
61-
fxConfig.Slot0 = slot0;
63+
fxsConfig.Slot0 = slot0;
6264

6365
MotionMagicConfigs motionMagic =
6466
new MotionMagicConfigs()
@@ -67,14 +69,14 @@ public static TalonFXConfiguration getFXConfig() {
6769
.withMotionMagicExpo_kA(0)
6870
.withMotionMagicExpo_kV(0)
6971
.withMotionMagicJerk(0);
70-
fxConfig.MotionMagic = motionMagic;
72+
fxsConfig.MotionMagic = motionMagic;
7173

7274
MotorOutputConfigs motorOut =
7375
new MotorOutputConfigs()
7476
.withDutyCycleNeutralDeadband(0.01)
7577
.withNeutralMode(NeutralModeValue.Coast);
76-
fxConfig.MotorOutput = motorOut;
78+
fxsConfig.MotorOutput = motorOut;
7779

78-
return fxConfig;
80+
return fxsConfig;
7981
}
8082
}

src/main/java/frc/robot/subsystems/coral/CoralIOFX.java

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22

33
import static edu.wpi.first.units.Units.DegreesPerSecond;
44

5+
import com.ctre.phoenix6.BaseStatusSignal;
56
import com.ctre.phoenix6.StatusSignal;
6-
import com.ctre.phoenix6.configs.TalonFXConfiguration;
7-
import com.ctre.phoenix6.configs.TalonFXConfigurator;
7+
import com.ctre.phoenix6.configs.TalonFXSConfiguration;
8+
import com.ctre.phoenix6.configs.TalonFXSConfigurator;
89
import com.ctre.phoenix6.controls.MotionMagicVelocityDutyCycle;
9-
import com.ctre.phoenix6.hardware.TalonFX;
10+
import com.ctre.phoenix6.hardware.TalonFXS;
1011
import com.ctre.phoenix6.signals.ForwardLimitValue;
1112
import com.ctre.phoenix6.signals.ReverseLimitValue;
1213
import edu.wpi.first.units.measure.AngularVelocity;
@@ -16,12 +17,11 @@
1617
import org.strykeforce.telemetry.TelemetryService;
1718

1819
public class CoralIOFX implements CoralIO {
19-
// private objects
2020
private Logger logger;
21-
private TalonFX talonFx;
21+
private TalonFXS talonFxs;
2222

2323
// FX Access objects
24-
TalonFXConfigurator configurator;
24+
TalonFXSConfigurator configurator;
2525
private MotionMagicVelocityDutyCycle velocityRequest =
2626
new MotionMagicVelocityDutyCycle(0).withEnableFOC(false).withSlot(0);
2727
StatusSignal<AngularVelocity> curVelocity;
@@ -30,49 +30,50 @@ public class CoralIOFX implements CoralIO {
3030

3131
public CoralIOFX() {
3232
logger = LoggerFactory.getLogger(this.getClass());
33-
talonFx = new TalonFX(CoralConstants.kCoralFxId);
33+
talonFxs = new TalonFXS(CoralConstants.kCoralFxId);
3434

3535
// Config controller
36-
configurator = talonFx.getConfigurator();
37-
configurator.apply(new TalonFXConfiguration()); // Factory default motor controller
36+
configurator = talonFxs.getConfigurator();
37+
configurator.apply(new TalonFXSConfiguration()); // Factory default motor controller
3838
configurator.apply(CoralConstants.getFXConfig());
3939

4040
// Attach status signals
41-
curVelocity = talonFx.getVelocity();
42-
fwdLimitSwitch = talonFx.getForwardLimit();
43-
revLimitSwitch = talonFx.getReverseLimit();
41+
curVelocity = talonFxs.getVelocity();
42+
fwdLimitSwitch = talonFxs.getForwardLimit();
43+
revLimitSwitch = talonFxs.getReverseLimit();
4444
}
4545

4646
@Override
4747
public void setVelocity(AngularVelocity velocity) {
4848
logger.info("Setting velocity to {} degrees per second", velocity.in(DegreesPerSecond));
4949

50-
talonFx.setControl(velocityRequest.withVelocity(velocity));
50+
talonFxs.setControl(velocityRequest.withVelocity(velocity));
5151
}
5252

5353
@Override
5454
public void enableFwdLimitSwitch(boolean enabled) {
55-
talonFx
55+
talonFxs
5656
.getConfigurator()
5757
.apply(CoralConstants.getFXConfig().HardwareLimitSwitch.withForwardLimitEnable(enabled));
5858
}
5959

6060
@Override
6161
public void enableRevLimitSwitch(boolean enabled) {
62-
talonFx
62+
talonFxs
6363
.getConfigurator()
6464
.apply(CoralConstants.getFXConfig().HardwareLimitSwitch.withReverseLimitEnable(enabled));
6565
}
6666

6767
@Override
6868
public void updateInputs(CoralIOInputs inputs) {
69-
inputs.velocity = curVelocity.refresh().getValue();
69+
BaseStatusSignal.refreshAll(curVelocity, fwdLimitSwitch, revLimitSwitch);
70+
inputs.velocity = curVelocity.getValue();
7071
inputs.isFwdLimitSwitchClosed = fwdLimitSwitch.refresh().getValue().value == 1;
7172
inputs.isRevLimitSwitchClosed = revLimitSwitch.refresh().getValue().value == 0;
7273
}
7374

7475
@Override
7576
public void registerWith(TelemetryService telemetryService) {
76-
telemetryService.register(talonFx, true);
77+
telemetryService.register(talonFxs, true);
7778
}
7879
}

src/main/java/frc/robot/subsystems/coral/CoralSubsystem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public boolean isBeamBroken() {
5151
public void periodic() {
5252
// Read Inputs
5353
io.updateInputs(inputs);
54-
54+
5555
// State Machine
5656
switch (curState) {
5757
case INIT:

vendordeps/DogLog.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

vendordeps/LumynLabs-2025.0.0.json

Lines changed: 0 additions & 71 deletions
This file was deleted.

vendordeps/PathplannerLib-2025.2.1.json

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)