From e525efd9dd6b4e644fefcea6d0cf89704d599c3e Mon Sep 17 00:00:00 2001 From: Spikes2212 Date: Tue, 28 Jan 2025 14:14:25 +0200 Subject: [PATCH 01/19] bomboclat --- .../spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java b/src/main/java/com/spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java index 5e635c1db..a93086249 100644 --- a/src/main/java/com/spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java +++ b/src/main/java/com/spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java @@ -61,7 +61,7 @@ public TalonFXWrapper(int deviceId, CANBus canbus) { /** * Constructs a new instance of {@link TalonFXWrapper}. * - * @param deviceId the talon's id + * @param deviceId the talon's i */ public TalonFXWrapper(int deviceId) { this(deviceId, ""); From c4cc75fe83de5a56d9b2d977dd0edf26946fb70f Mon Sep 17 00:00:00 2001 From: Spikes2212 Date: Tue, 28 Jan 2025 14:14:31 +0200 Subject: [PATCH 02/19] bomboclat --- .../spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java b/src/main/java/com/spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java index a93086249..5e635c1db 100644 --- a/src/main/java/com/spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java +++ b/src/main/java/com/spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java @@ -61,7 +61,7 @@ public TalonFXWrapper(int deviceId, CANBus canbus) { /** * Constructs a new instance of {@link TalonFXWrapper}. * - * @param deviceId the talon's i + * @param deviceId the talon's id */ public TalonFXWrapper(int deviceId) { this(deviceId, ""); From bffbf981a32182817ea368a30c5afc4a9fc2d567 Mon Sep 17 00:00:00 2001 From: Spikes2212 Date: Tue, 28 Jan 2025 10:11:55 +0200 Subject: [PATCH 03/19] test --- .../MoveSmartMotorControllerTankDrivetrain.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/spikes2212/command/drivetrains/commands/smartmotorcontrollerdrivetrain/MoveSmartMotorControllerTankDrivetrain.java b/src/main/java/com/spikes2212/command/drivetrains/commands/smartmotorcontrollerdrivetrain/MoveSmartMotorControllerTankDrivetrain.java index e62b61855..5937d8449 100644 --- a/src/main/java/com/spikes2212/command/drivetrains/commands/smartmotorcontrollerdrivetrain/MoveSmartMotorControllerTankDrivetrain.java +++ b/src/main/java/com/spikes2212/command/drivetrains/commands/smartmotorcontrollerdrivetrain/MoveSmartMotorControllerTankDrivetrain.java @@ -10,7 +10,7 @@ import java.util.function.Supplier; /** - * A command that moves a {@link SmartMotorControllerTankDrivetrain} using its master motor controllers' control loops. + * A command that moves a {@link SmartMotorControllerTankDrivetrain} using its master motor controllers' control loops * * @author Yoel Perman Brilliant * @see SmartMotorControllerTankDrivetrain From 028f0137099dc61563ce52d0d8c2ea917204c727 Mon Sep 17 00:00:00 2001 From: Spikes2212 Date: Tue, 28 Jan 2025 10:12:01 +0200 Subject: [PATCH 04/19] test --- .../MoveSmartMotorControllerTankDrivetrain.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/spikes2212/command/drivetrains/commands/smartmotorcontrollerdrivetrain/MoveSmartMotorControllerTankDrivetrain.java b/src/main/java/com/spikes2212/command/drivetrains/commands/smartmotorcontrollerdrivetrain/MoveSmartMotorControllerTankDrivetrain.java index 5937d8449..e62b61855 100644 --- a/src/main/java/com/spikes2212/command/drivetrains/commands/smartmotorcontrollerdrivetrain/MoveSmartMotorControllerTankDrivetrain.java +++ b/src/main/java/com/spikes2212/command/drivetrains/commands/smartmotorcontrollerdrivetrain/MoveSmartMotorControllerTankDrivetrain.java @@ -10,7 +10,7 @@ import java.util.function.Supplier; /** - * A command that moves a {@link SmartMotorControllerTankDrivetrain} using its master motor controllers' control loops + * A command that moves a {@link SmartMotorControllerTankDrivetrain} using its master motor controllers' control loops. * * @author Yoel Perman Brilliant * @see SmartMotorControllerTankDrivetrain From b2ad6b00df993f7e3beafd0512e3c9e5e40a1c32 Mon Sep 17 00:00:00 2001 From: Spikes2212 Date: Tue, 28 Jan 2025 14:20:53 +0200 Subject: [PATCH 05/19] weg --- .../MoveSmartMotorControllerTankDrivetrain.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/spikes2212/command/drivetrains/commands/smartmotorcontrollerdrivetrain/MoveSmartMotorControllerTankDrivetrain.java b/src/main/java/com/spikes2212/command/drivetrains/commands/smartmotorcontrollerdrivetrain/MoveSmartMotorControllerTankDrivetrain.java index e62b61855..aabfd2252 100644 --- a/src/main/java/com/spikes2212/command/drivetrains/commands/smartmotorcontrollerdrivetrain/MoveSmartMotorControllerTankDrivetrain.java +++ b/src/main/java/com/spikes2212/command/drivetrains/commands/smartmotorcontrollerdrivetrain/MoveSmartMotorControllerTankDrivetrain.java @@ -28,7 +28,7 @@ public class MoveSmartMotorControllerTankDrivetrain extends Command { protected final PIDSettings leftPIDSettings; /** - * The right side loop's PID constants. + * The right side loop's PID constantswe */ protected final PIDSettings rightPIDSettings; From 5d801f19a466ebc9f28f67442b1e9ab12249f960 Mon Sep 17 00:00:00 2001 From: Spikes2212 Date: Tue, 28 Jan 2025 14:21:01 +0200 Subject: [PATCH 06/19] weg --- .../MoveSmartMotorControllerTankDrivetrain.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/spikes2212/command/drivetrains/commands/smartmotorcontrollerdrivetrain/MoveSmartMotorControllerTankDrivetrain.java b/src/main/java/com/spikes2212/command/drivetrains/commands/smartmotorcontrollerdrivetrain/MoveSmartMotorControllerTankDrivetrain.java index aabfd2252..e62b61855 100644 --- a/src/main/java/com/spikes2212/command/drivetrains/commands/smartmotorcontrollerdrivetrain/MoveSmartMotorControllerTankDrivetrain.java +++ b/src/main/java/com/spikes2212/command/drivetrains/commands/smartmotorcontrollerdrivetrain/MoveSmartMotorControllerTankDrivetrain.java @@ -28,7 +28,7 @@ public class MoveSmartMotorControllerTankDrivetrain extends Command { protected final PIDSettings leftPIDSettings; /** - * The right side loop's PID constantswe + * The right side loop's PID constants. */ protected final PIDSettings rightPIDSettings; From d97ad7509751605e0a719c4df953bee75a9d5f83 Mon Sep 17 00:00:00 2001 From: Spikes2212 Date: Tue, 28 Jan 2025 14:22:32 +0200 Subject: [PATCH 07/19] weh --- .../spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java b/src/main/java/com/spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java index 5e635c1db..a93086249 100644 --- a/src/main/java/com/spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java +++ b/src/main/java/com/spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java @@ -61,7 +61,7 @@ public TalonFXWrapper(int deviceId, CANBus canbus) { /** * Constructs a new instance of {@link TalonFXWrapper}. * - * @param deviceId the talon's id + * @param deviceId the talon's i */ public TalonFXWrapper(int deviceId) { this(deviceId, ""); From 9f6446fa7e067c0475ac1ac2a9a0d8bb663b9927 Mon Sep 17 00:00:00 2001 From: Spikes2212 Date: Tue, 28 Jan 2025 14:22:38 +0200 Subject: [PATCH 08/19] weh --- .../spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java b/src/main/java/com/spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java index a93086249..5e635c1db 100644 --- a/src/main/java/com/spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java +++ b/src/main/java/com/spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java @@ -61,7 +61,7 @@ public TalonFXWrapper(int deviceId, CANBus canbus) { /** * Constructs a new instance of {@link TalonFXWrapper}. * - * @param deviceId the talon's i + * @param deviceId the talon's id */ public TalonFXWrapper(int deviceId) { this(deviceId, ""); From 563947fff9b3e26b35c7deb7fba227dab8dc6485 Mon Sep 17 00:00:00 2001 From: Spikes2212 Date: Thu, 20 Feb 2025 17:29:09 +0200 Subject: [PATCH 09/19] protected instead of private --- .../util/smartmotorcontrollers/SparkWrapper.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/spikes2212/util/smartmotorcontrollers/SparkWrapper.java b/src/main/java/com/spikes2212/util/smartmotorcontrollers/SparkWrapper.java index 1ef01fc0d..821f28f37 100644 --- a/src/main/java/com/spikes2212/util/smartmotorcontrollers/SparkWrapper.java +++ b/src/main/java/com/spikes2212/util/smartmotorcontrollers/SparkWrapper.java @@ -24,27 +24,27 @@ public class SparkWrapper implements SmartMotorController { /** * The spark motor controller. */ - private SparkBase sparkBase; + protected SparkBase sparkBase; /** * The spark's configuration accessor. */ - private SparkBaseConfigAccessor configAccessor; + protected SparkBaseConfigAccessor configAccessor; /** * The spark's configuration. */ - private SparkBaseConfig sparkConfig; + protected SparkBaseConfig sparkConfig; /** * The closed loop configuration for the spark. */ - private ClosedLoopConfig closedLoopConfig; + protected ClosedLoopConfig closedLoopConfig; /** * The encoder configuration for the spark. */ - private EncoderConfig encoderConfig; + protected EncoderConfig encoderConfig; /** * Constructs a new instance of {@link SparkWrapper} with a {@link SparkMax} as the motor controller. From 9243522eacf8f522bd012b2f83714aeb236cf29b Mon Sep 17 00:00:00 2001 From: Spikes2212 Date: Tue, 28 Jan 2025 10:11:55 +0200 Subject: [PATCH 10/19] test --- .../MoveSmartMotorControllerTankDrivetrain.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/spikes2212/command/drivetrains/commands/smartmotorcontrollerdrivetrain/MoveSmartMotorControllerTankDrivetrain.java b/src/main/java/com/spikes2212/command/drivetrains/commands/smartmotorcontrollerdrivetrain/MoveSmartMotorControllerTankDrivetrain.java index e62b61855..5937d8449 100644 --- a/src/main/java/com/spikes2212/command/drivetrains/commands/smartmotorcontrollerdrivetrain/MoveSmartMotorControllerTankDrivetrain.java +++ b/src/main/java/com/spikes2212/command/drivetrains/commands/smartmotorcontrollerdrivetrain/MoveSmartMotorControllerTankDrivetrain.java @@ -10,7 +10,7 @@ import java.util.function.Supplier; /** - * A command that moves a {@link SmartMotorControllerTankDrivetrain} using its master motor controllers' control loops. + * A command that moves a {@link SmartMotorControllerTankDrivetrain} using its master motor controllers' control loops * * @author Yoel Perman Brilliant * @see SmartMotorControllerTankDrivetrain From 8a3d71358b1ce23dfd40c18c5b96810b751b8d33 Mon Sep 17 00:00:00 2001 From: Spikes2212 Date: Tue, 28 Jan 2025 10:12:01 +0200 Subject: [PATCH 11/19] test --- .../MoveSmartMotorControllerTankDrivetrain.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/spikes2212/command/drivetrains/commands/smartmotorcontrollerdrivetrain/MoveSmartMotorControllerTankDrivetrain.java b/src/main/java/com/spikes2212/command/drivetrains/commands/smartmotorcontrollerdrivetrain/MoveSmartMotorControllerTankDrivetrain.java index 5937d8449..e62b61855 100644 --- a/src/main/java/com/spikes2212/command/drivetrains/commands/smartmotorcontrollerdrivetrain/MoveSmartMotorControllerTankDrivetrain.java +++ b/src/main/java/com/spikes2212/command/drivetrains/commands/smartmotorcontrollerdrivetrain/MoveSmartMotorControllerTankDrivetrain.java @@ -10,7 +10,7 @@ import java.util.function.Supplier; /** - * A command that moves a {@link SmartMotorControllerTankDrivetrain} using its master motor controllers' control loops + * A command that moves a {@link SmartMotorControllerTankDrivetrain} using its master motor controllers' control loops. * * @author Yoel Perman Brilliant * @see SmartMotorControllerTankDrivetrain From 6b4de89b73114b80f0978502b5e21365efb83edd Mon Sep 17 00:00:00 2001 From: Spikes2212 Date: Tue, 28 Jan 2025 14:20:53 +0200 Subject: [PATCH 12/19] weg --- .../MoveSmartMotorControllerTankDrivetrain.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/spikes2212/command/drivetrains/commands/smartmotorcontrollerdrivetrain/MoveSmartMotorControllerTankDrivetrain.java b/src/main/java/com/spikes2212/command/drivetrains/commands/smartmotorcontrollerdrivetrain/MoveSmartMotorControllerTankDrivetrain.java index e62b61855..aabfd2252 100644 --- a/src/main/java/com/spikes2212/command/drivetrains/commands/smartmotorcontrollerdrivetrain/MoveSmartMotorControllerTankDrivetrain.java +++ b/src/main/java/com/spikes2212/command/drivetrains/commands/smartmotorcontrollerdrivetrain/MoveSmartMotorControllerTankDrivetrain.java @@ -28,7 +28,7 @@ public class MoveSmartMotorControllerTankDrivetrain extends Command { protected final PIDSettings leftPIDSettings; /** - * The right side loop's PID constants. + * The right side loop's PID constantswe */ protected final PIDSettings rightPIDSettings; From bab5facb0a62ba51aa8ecf044adbf9adcbab4706 Mon Sep 17 00:00:00 2001 From: Spikes2212 Date: Tue, 28 Jan 2025 14:21:01 +0200 Subject: [PATCH 13/19] weg --- .../MoveSmartMotorControllerTankDrivetrain.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/spikes2212/command/drivetrains/commands/smartmotorcontrollerdrivetrain/MoveSmartMotorControllerTankDrivetrain.java b/src/main/java/com/spikes2212/command/drivetrains/commands/smartmotorcontrollerdrivetrain/MoveSmartMotorControllerTankDrivetrain.java index aabfd2252..e62b61855 100644 --- a/src/main/java/com/spikes2212/command/drivetrains/commands/smartmotorcontrollerdrivetrain/MoveSmartMotorControllerTankDrivetrain.java +++ b/src/main/java/com/spikes2212/command/drivetrains/commands/smartmotorcontrollerdrivetrain/MoveSmartMotorControllerTankDrivetrain.java @@ -28,7 +28,7 @@ public class MoveSmartMotorControllerTankDrivetrain extends Command { protected final PIDSettings leftPIDSettings; /** - * The right side loop's PID constantswe + * The right side loop's PID constants. */ protected final PIDSettings rightPIDSettings; From 1339539a499856193b8f6169170f3e2bef901de5 Mon Sep 17 00:00:00 2001 From: Spikes2212 Date: Tue, 28 Jan 2025 14:14:25 +0200 Subject: [PATCH 14/19] bomboclat --- .../spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java b/src/main/java/com/spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java index 46587ff54..ce87d1197 100644 --- a/src/main/java/com/spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java +++ b/src/main/java/com/spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java @@ -61,7 +61,7 @@ public TalonFXWrapper(int deviceId, CANBus canbus) { /** * Constructs a new instance of {@link TalonFXWrapper}. * - * @param deviceId the talon's id + * @param deviceId the talon's i */ public TalonFXWrapper(int deviceId) { this(deviceId, ""); From 411c6fa128be452e22a916be1cc2819836386a19 Mon Sep 17 00:00:00 2001 From: Spikes2212 Date: Tue, 28 Jan 2025 14:14:31 +0200 Subject: [PATCH 15/19] bomboclat --- .../spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java b/src/main/java/com/spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java index ce87d1197..46587ff54 100644 --- a/src/main/java/com/spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java +++ b/src/main/java/com/spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java @@ -61,7 +61,7 @@ public TalonFXWrapper(int deviceId, CANBus canbus) { /** * Constructs a new instance of {@link TalonFXWrapper}. * - * @param deviceId the talon's i + * @param deviceId the talon's id */ public TalonFXWrapper(int deviceId) { this(deviceId, ""); From fa7fe155e855aca13aea669e2356344e56499070 Mon Sep 17 00:00:00 2001 From: Spikes2212 Date: Tue, 28 Jan 2025 14:22:32 +0200 Subject: [PATCH 16/19] weh --- .../spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java b/src/main/java/com/spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java index 46587ff54..ce87d1197 100644 --- a/src/main/java/com/spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java +++ b/src/main/java/com/spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java @@ -61,7 +61,7 @@ public TalonFXWrapper(int deviceId, CANBus canbus) { /** * Constructs a new instance of {@link TalonFXWrapper}. * - * @param deviceId the talon's id + * @param deviceId the talon's i */ public TalonFXWrapper(int deviceId) { this(deviceId, ""); From e7973298d0e1265de9fc83f0dcf2279592e6fde1 Mon Sep 17 00:00:00 2001 From: Spikes2212 Date: Tue, 28 Jan 2025 14:22:38 +0200 Subject: [PATCH 17/19] weh --- .../spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java b/src/main/java/com/spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java index ce87d1197..46587ff54 100644 --- a/src/main/java/com/spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java +++ b/src/main/java/com/spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java @@ -61,7 +61,7 @@ public TalonFXWrapper(int deviceId, CANBus canbus) { /** * Constructs a new instance of {@link TalonFXWrapper}. * - * @param deviceId the talon's i + * @param deviceId the talon's id */ public TalonFXWrapper(int deviceId) { this(deviceId, ""); From 3c8a6493ee90ec877a9409b99f39ba960a6008ce Mon Sep 17 00:00:00 2001 From: Spikes2212 Date: Thu, 20 Feb 2025 17:29:09 +0200 Subject: [PATCH 18/19] protected instead of private --- .../util/smartmotorcontrollers/SparkWrapper.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/spikes2212/util/smartmotorcontrollers/SparkWrapper.java b/src/main/java/com/spikes2212/util/smartmotorcontrollers/SparkWrapper.java index b16b1e11d..3f65cc2e7 100644 --- a/src/main/java/com/spikes2212/util/smartmotorcontrollers/SparkWrapper.java +++ b/src/main/java/com/spikes2212/util/smartmotorcontrollers/SparkWrapper.java @@ -24,27 +24,27 @@ public class SparkWrapper implements SmartMotorController { /** * The spark motor controller. */ - private SparkBase sparkBase; + protected SparkBase sparkBase; /** * The spark's configuration accessor. */ - private SparkBaseConfigAccessor configAccessor; + protected SparkBaseConfigAccessor configAccessor; /** * The spark's configuration. */ - private SparkBaseConfig sparkConfig; + protected SparkBaseConfig sparkConfig; /** * The closed loop configuration for the spark. */ - private ClosedLoopConfig closedLoopConfig; + protected ClosedLoopConfig closedLoopConfig; /** * The encoder configuration for the spark. */ - private EncoderConfig encoderConfig; + protected EncoderConfig encoderConfig; /** * Constructs a new instance of {@link SparkWrapper} with a {@link SparkMax} as the motor controller. From ea4fac63d71fe656613910146bb73e784abf6165 Mon Sep 17 00:00:00 2001 From: Spikes2212 Date: Thu, 20 Feb 2025 17:31:15 +0200 Subject: [PATCH 19/19] rebased --- .../com/spikes2212/util/smartmotorcontrollers/SparkWrapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/spikes2212/util/smartmotorcontrollers/SparkWrapper.java b/src/main/java/com/spikes2212/util/smartmotorcontrollers/SparkWrapper.java index 3f65cc2e7..0c53ab164 100644 --- a/src/main/java/com/spikes2212/util/smartmotorcontrollers/SparkWrapper.java +++ b/src/main/java/com/spikes2212/util/smartmotorcontrollers/SparkWrapper.java @@ -19,7 +19,7 @@ public class SparkWrapper implements SmartMotorController { /** * The feed forward controller running the feed forward calculations. */ - private final FeedForwardController feedForwardController; + protected final FeedForwardController feedForwardController; /** * The spark motor controller.