From 64747063808b0a9bb258cdc6e63bcb0e887cea9d Mon Sep 17 00:00:00 2001 From: David Nguyen Date: Sat, 10 Oct 2026 11:12:40 -0700 Subject: [PATCH 1/4] Finsh --- .../subsystems/arm/BaseArmSubsystem.java | 67 +++++++++++++++++++ .../arm/commands/BaseArmMaintainer.java | 40 +++++++++++ 2 files changed, 107 insertions(+) create mode 100644 src/main/java/xbot/common/subsystems/arm/BaseArmSubsystem.java create mode 100644 src/main/java/xbot/common/subsystems/arm/commands/BaseArmMaintainer.java diff --git a/src/main/java/xbot/common/subsystems/arm/BaseArmSubsystem.java b/src/main/java/xbot/common/subsystems/arm/BaseArmSubsystem.java new file mode 100644 index 00000000..675e0925 --- /dev/null +++ b/src/main/java/xbot/common/subsystems/arm/BaseArmSubsystem.java @@ -0,0 +1,67 @@ +package xbot.common.subsystems.arm; + +import org.wpilib.command2.Command; +import org.wpilib.command2.Commands; +import org.wpilib.tunable.TunableDouble; +import org.wpilib.units.measure.Angle; + + +import xbot.common.command.BaseSetpointSubsystem; +import xbot.common.controls.actuators.XCANMotorController; +import xbot.common.controls.actuators.XCANMotorControllerPIDProperties; +import org.wpilib.tunable.Tunable; + +import xbot.common.properties.TunableFactory; + +import javax.inject.Inject; +import javax.inject.Singleton; + +@Singleton +public abstract class BaseArmSubsystem extends BaseSetpointSubsystem { + + private Tunable calibrationValue; + + private Angle currentArmAngle; + private Angle targetAngle; + private TunableDouble targetAngleProperty; + + boolean isCalibrated = false; + boolean hasAbsoluteEncoder; + + public BaseArmSubsystem(XCANMotorController.XCANMotorControllerFactory xcanMotorControllerFactory, + TunableFactory tunableFactory) { + super(); + tunableFactory.setPrefix(this); + + } + public abstract Angle getTargetValue() ; + + public abstract boolean hasAbsoluteEncoder() ; + + public abstract void setTargetValue (Angle desiredAngle) ; + + public abstract void setPower(Double power) ; + + public abstract boolean isCalibrated() ; + + protected abstract boolean areTwoTargetsEquivalent(Angle target1, Angle target2) ; + + public abstract void periodic() ; + + public abstract Angle getCurrentValue() ; + + public Command getHasAbsoluteEncoder() { + + return Commands.runOnce(() -> { + hasAbsoluteEncoder = hasAbsoluteEncoder() ; + }); + + } + + public Command getCalibrateCommand() { + return Commands.runOnce(() -> { + isCalibrated = isCalibrated() ; + }); + } + +} diff --git a/src/main/java/xbot/common/subsystems/arm/commands/BaseArmMaintainer.java b/src/main/java/xbot/common/subsystems/arm/commands/BaseArmMaintainer.java new file mode 100644 index 00000000..76a0d79a --- /dev/null +++ b/src/main/java/xbot/common/subsystems/arm/commands/BaseArmMaintainer.java @@ -0,0 +1,40 @@ +package xbot.common.subsystems.arm.commands; + +import org.wpilib.units.measure.Angle; + +import xbot.common.properties.TunableFactory; +import xbot.common.subsystems.arm.BaseArmSubsystem; +import edu.wpi.first.units.Units; +import edu.wpi.first.units.measure.Angle; +import xbot.common.command.BaseMaintainerCommand; +import xbot.common.controls.sensors.XXboxController; +import xbot.common.logic.HumanVsMachineDecider; +import xbot.common.properties.PropertyFactory; + +import javax.inject.Inject; + +public abstract class BaseArmMaintainer extends BaseMaintainerCommand { + + final BaseArmSubsystem baseArm; + + public BaseArmMaintainer(TunableFactory tunableFactory, + HumanVsMachineDecider.HumanVsMachineDeciderFactory hvmFactory, + BaseArmSubsystem baseArm) { + super(baseArm,tunableFactory,hvmFactory,1,1); + + this.baseArm = baseArm; + } + + public abstract void initialize() ; + + protected abstract void coastAction() ; + + protected abstract void calibratedMachineControlAction() ; + + protected abstract double getErrorMagnitude() ; + + protected abstract Double getHumanInput() ; + + protected abstract double getHumanInputMagnitude() ; + +} \ No newline at end of file From b0ad1209fd5a05a549494f06f6fe56436bf55771 Mon Sep 17 00:00:00 2001 From: David Nguyen Date: Sat, 10 Oct 2026 11:13:44 -0700 Subject: [PATCH 2/4] cleaning --- .../xbot/common/subsystems/arm/BaseArmSubsystem.java | 10 +--------- .../subsystems/arm/commands/BaseArmMaintainer.java | 1 - 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/main/java/xbot/common/subsystems/arm/BaseArmSubsystem.java b/src/main/java/xbot/common/subsystems/arm/BaseArmSubsystem.java index 675e0925..c38cbbfe 100644 --- a/src/main/java/xbot/common/subsystems/arm/BaseArmSubsystem.java +++ b/src/main/java/xbot/common/subsystems/arm/BaseArmSubsystem.java @@ -19,12 +19,6 @@ @Singleton public abstract class BaseArmSubsystem extends BaseSetpointSubsystem { - private Tunable calibrationValue; - - private Angle currentArmAngle; - private Angle targetAngle; - private TunableDouble targetAngleProperty; - boolean isCalibrated = false; boolean hasAbsoluteEncoder; @@ -34,6 +28,7 @@ public BaseArmSubsystem(XCANMotorController.XCANMotorControllerFactory xcanMotor tunableFactory.setPrefix(this); } + public abstract Angle getTargetValue() ; public abstract boolean hasAbsoluteEncoder() ; @@ -51,11 +46,9 @@ public BaseArmSubsystem(XCANMotorController.XCANMotorControllerFactory xcanMotor public abstract Angle getCurrentValue() ; public Command getHasAbsoluteEncoder() { - return Commands.runOnce(() -> { hasAbsoluteEncoder = hasAbsoluteEncoder() ; }); - } public Command getCalibrateCommand() { @@ -63,5 +56,4 @@ public Command getCalibrateCommand() { isCalibrated = isCalibrated() ; }); } - } diff --git a/src/main/java/xbot/common/subsystems/arm/commands/BaseArmMaintainer.java b/src/main/java/xbot/common/subsystems/arm/commands/BaseArmMaintainer.java index 76a0d79a..de505bde 100644 --- a/src/main/java/xbot/common/subsystems/arm/commands/BaseArmMaintainer.java +++ b/src/main/java/xbot/common/subsystems/arm/commands/BaseArmMaintainer.java @@ -36,5 +36,4 @@ public BaseArmMaintainer(TunableFactory tunableFactory, protected abstract Double getHumanInput() ; protected abstract double getHumanInputMagnitude() ; - } \ No newline at end of file From 41dcc33d7a206d93397d58bc58ac5d20e5d49e64 Mon Sep 17 00:00:00 2001 From: David Nguyen Date: Sat, 10 Oct 2026 13:38:52 -0700 Subject: [PATCH 3/4] Fixed unresolved imports and checkstyling --- .../xbot/common/subsystems/arm/BaseArmSubsystem.java | 11 ++++------- .../subsystems/arm/commands/BaseArmMaintainer.java | 11 +++-------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/src/main/java/xbot/common/subsystems/arm/BaseArmSubsystem.java b/src/main/java/xbot/common/subsystems/arm/BaseArmSubsystem.java index c38cbbfe..16279594 100644 --- a/src/main/java/xbot/common/subsystems/arm/BaseArmSubsystem.java +++ b/src/main/java/xbot/common/subsystems/arm/BaseArmSubsystem.java @@ -1,20 +1,17 @@ package xbot.common.subsystems.arm; +import javax.inject.Singleton; + import org.wpilib.command2.Command; import org.wpilib.command2.Commands; -import org.wpilib.tunable.TunableDouble; import org.wpilib.units.measure.Angle; - import xbot.common.command.BaseSetpointSubsystem; import xbot.common.controls.actuators.XCANMotorController; -import xbot.common.controls.actuators.XCANMotorControllerPIDProperties; -import org.wpilib.tunable.Tunable; - import xbot.common.properties.TunableFactory; -import javax.inject.Inject; -import javax.inject.Singleton; + + @Singleton public abstract class BaseArmSubsystem extends BaseSetpointSubsystem { diff --git a/src/main/java/xbot/common/subsystems/arm/commands/BaseArmMaintainer.java b/src/main/java/xbot/common/subsystems/arm/commands/BaseArmMaintainer.java index de505bde..6240e2eb 100644 --- a/src/main/java/xbot/common/subsystems/arm/commands/BaseArmMaintainer.java +++ b/src/main/java/xbot/common/subsystems/arm/commands/BaseArmMaintainer.java @@ -2,18 +2,13 @@ import org.wpilib.units.measure.Angle; -import xbot.common.properties.TunableFactory; -import xbot.common.subsystems.arm.BaseArmSubsystem; -import edu.wpi.first.units.Units; -import edu.wpi.first.units.measure.Angle; import xbot.common.command.BaseMaintainerCommand; -import xbot.common.controls.sensors.XXboxController; import xbot.common.logic.HumanVsMachineDecider; -import xbot.common.properties.PropertyFactory; +import xbot.common.properties.TunableFactory; +import xbot.common.subsystems.arm.BaseArmSubsystem; -import javax.inject.Inject; -public abstract class BaseArmMaintainer extends BaseMaintainerCommand { +public abstract class BaseArmMaintainer extends BaseMaintainerCommand { final BaseArmSubsystem baseArm; From 07950b960ed1df1431ac537ba9f6eeeeb949c096 Mon Sep 17 00:00:00 2001 From: David Nguyen Date: Sat, 14 Nov 2026 11:39:39 -0800 Subject: [PATCH 4/4] pulled changes --- .../subsystems/arm/BaseArmSubsystem.java | 31 +++++++++---------- .../arm/commands/BaseArmMaintainer.java | 21 ++++++------- 2 files changed, 24 insertions(+), 28 deletions(-) diff --git a/src/main/java/xbot/common/subsystems/arm/BaseArmSubsystem.java b/src/main/java/xbot/common/subsystems/arm/BaseArmSubsystem.java index 16279594..22a32098 100644 --- a/src/main/java/xbot/common/subsystems/arm/BaseArmSubsystem.java +++ b/src/main/java/xbot/common/subsystems/arm/BaseArmSubsystem.java @@ -10,47 +10,46 @@ import xbot.common.controls.actuators.XCANMotorController; import xbot.common.properties.TunableFactory; - - - @Singleton -public abstract class BaseArmSubsystem extends BaseSetpointSubsystem { +public abstract class BaseArmSubsystem extends BaseSetpointSubsystem { boolean isCalibrated = false; boolean hasAbsoluteEncoder; - public BaseArmSubsystem(XCANMotorController.XCANMotorControllerFactory xcanMotorControllerFactory, - TunableFactory tunableFactory) { + public BaseArmSubsystem(XCANMotorController.XCANMotorControllerFactory xcanMotorControllerFactory, TunableFactory tunableFactory) { super(); tunableFactory.setPrefix(this); } - public abstract Angle getTargetValue() ; + public abstract Angle getTargetValue(); - public abstract boolean hasAbsoluteEncoder() ; + public abstract boolean hasAbsoluteEncoder(); - public abstract void setTargetValue (Angle desiredAngle) ; + public abstract void setTargetValue(Angle desiredAngle); - public abstract void setPower(Double power) ; + public abstract void setPower(Double power); - public abstract boolean isCalibrated() ; + public abstract boolean isCalibrated(); - protected abstract boolean areTwoTargetsEquivalent(Angle target1, Angle target2) ; + protected abstract boolean areTwoTargetsEquivalent(Angle target1, Angle target2); - public abstract void periodic() ; + @Override + public void periodic() { + super.periodic(); + } - public abstract Angle getCurrentValue() ; + public abstract Angle getCurrentValue(); public Command getHasAbsoluteEncoder() { return Commands.runOnce(() -> { - hasAbsoluteEncoder = hasAbsoluteEncoder() ; + hasAbsoluteEncoder = hasAbsoluteEncoder(); }); } public Command getCalibrateCommand() { return Commands.runOnce(() -> { - isCalibrated = isCalibrated() ; + isCalibrated = isCalibrated(); }); } } diff --git a/src/main/java/xbot/common/subsystems/arm/commands/BaseArmMaintainer.java b/src/main/java/xbot/common/subsystems/arm/commands/BaseArmMaintainer.java index 6240e2eb..4ffe8107 100644 --- a/src/main/java/xbot/common/subsystems/arm/commands/BaseArmMaintainer.java +++ b/src/main/java/xbot/common/subsystems/arm/commands/BaseArmMaintainer.java @@ -7,28 +7,25 @@ import xbot.common.properties.TunableFactory; import xbot.common.subsystems.arm.BaseArmSubsystem; - public abstract class BaseArmMaintainer extends BaseMaintainerCommand { final BaseArmSubsystem baseArm; - public BaseArmMaintainer(TunableFactory tunableFactory, - HumanVsMachineDecider.HumanVsMachineDeciderFactory hvmFactory, - BaseArmSubsystem baseArm) { - super(baseArm,tunableFactory,hvmFactory,1,1); + public BaseArmMaintainer(TunableFactory tunableFactory, HumanVsMachineDecider.HumanVsMachineDeciderFactory hvmFactory, BaseArmSubsystem baseArm) { + super(baseArm, tunableFactory, hvmFactory, 1, 1); this.baseArm = baseArm; } - public abstract void initialize() ; + public abstract void initialize(); - protected abstract void coastAction() ; + protected abstract void coastAction(); - protected abstract void calibratedMachineControlAction() ; + protected abstract void calibratedMachineControlAction(); - protected abstract double getErrorMagnitude() ; + protected abstract double getErrorMagnitude(); - protected abstract Double getHumanInput() ; + protected abstract Double getHumanInput(); - protected abstract double getHumanInputMagnitude() ; -} \ No newline at end of file + protected abstract double getHumanInputMagnitude(); +}