Skip to content

Merge develop into main for v1.0.0-rc1 release#30

Merged
tbowers7 merged 36 commits intomainfrom
develop
Jan 11, 2025
Merged

Merge develop into main for v1.0.0-rc1 release#30
tbowers7 merged 36 commits intomainfrom
develop

Conversation

@tbowers7
Copy link
Collaborator

@tbowers7 tbowers7 commented Jan 11, 2025

As titled.

Additional documentation will be needed before the standard 1.0.0 release.

@tbowers7
Merge pull request #21 from AZ-First/main
4c3813c 
Pull `main` into `develop`
@tbowers7
Power monitoring now works
89a8a65 
Power monitoring now available in logs with consolidated mechanism current
(e.g., drive vs steer vs other subsystems), a measure of total Amp-hours used
since the start of the program, and an estimate percentage of battery charge
left, with a settable starting Ah in the SmartDashboard.

	modified:   INSTALL.md
	modified:   README.md
	modified:   src/main/java/frc/robot/Constants.java
	modified:   src/main/java/frc/robot/Robot.java
	modified:   src/main/java/frc/robot/RobotContainer.java
	modified:   src/main/java/frc/robot/util/PowerMonitoring.java
@tbowers7
Adjust CI to run on PR's to both main and develop
c25f4bb 
	modified:   .github/workflows/main.yml
@tbowers7
Merge pull request #23 from AZ-First/power_monitoring
56cfe9f 
Include power monitoring
@tbowers7
Update vendoreps; fix Choreo
694931a 
Udate vendor libraries to latest beta.  Fix resulting breaking changes for
Choreo.

	modified:   src/main/java/frc/robot/Robot.java
	modified:   src/main/java/frc/robot/RobotContainer.java
	modified:   src/main/java/frc/robot/subsystems/drive/Drive.java
	modified:   vendordeps/ChoreoLib2025Beta.json
	modified:   vendordeps/PathplannerLib-beta.json
	modified:   vendordeps/REVLib.json
	modified:   vendordeps/ReduxLib_2025.json
	modified:   vendordeps/yagsl.json
@tbowers7
Update function calls deprecated in 2025
a495755 
WPILib has deprecated several standard function calls this year; this commit
adjusts the calls to match the recommended new format.

	modified:   src/main/java/frc/robot/Constants.java
	modified:   src/main/java/frc/robot/commands/ChoreoAutoController.java
	modified:   src/main/java/frc/robot/commands/DriveCommands.java
@tbowers7
Update to WPILib 2025.1.1-beta3; match AK updates
f9a95f3 
In addition to updating to the latest WPILib beta, also match other
AdvantageKit commits as they test their beta.

	modified:   .vscode/settings.json
	modified:   build.gradle
	modified:   src/main/java/frc/robot/commands/ChoreoAutoController.java
	modified:   src/main/java/frc/robot/commands/DriveCommands.java
	modified:   src/main/java/frc/robot/subsystems/drive/Drive.java
	modified:   src/main/java/frc/robot/subsystems/vision/VisionIOLimelight.java
@tbowers7
Cleanup from vendorlib bump
76cfc43 
	modified:   src/main/java/frc/robot/Robot.java
	modified:   src/main/java/frc/robot/RobotContainer.java
@tbowers7
Latest photonlib
040b572 
	modified:   vendordeps/photonlib.json
@tbowers7
Merge pull request #24 from AZ-First/vendor_choreo
85d2dbc 
Update WPILib, `vendordeps`; make conformal changes
@tbowers7
Clean up where constants are defined
3a53c03 
Trying to keep all constant definitions in easy-to-find locations.

	modified:   src/main/java/frc/robot/Constants.java
	modified:   src/main/java/frc/robot/RobotContainer.java
	modified:   src/main/java/frc/robot/commands/ChoreoAutoController.java
	modified:   src/main/java/frc/robot/commands/DriveCommands.java
	modified:   src/main/java/frc/robot/subsystems/drive/Drive.java
	modified:   src/main/java/frc/robot/subsystems/drive/DriveConstants.java
	modified:   src/main/java/frc/robot/subsystems/drive/GyroIONavX.java
	modified:   src/main/java/frc/robot/subsystems/drive/GyroIOPigeon2.java
	modified:   src/main/java/frc/robot/subsystems/drive/ModuleIOBlended.java
	modified:   src/main/java/frc/robot/subsystems/drive/ModuleIOSpark.java
	modified:   src/main/java/frc/robot/subsystems/drive/ModuleIOSparkCANcoder.java
	modified:   src/main/java/frc/robot/subsystems/drive/ModuleIOTalonFX.java
	modified:   src/main/java/frc/robot/subsystems/drive/PhoenixOdometryThread.java
	modified:   src/main/java/frc/robot/subsystems/drive/SparkOdometryThread.java
	modified:   src/main/java/frc/robot/subsystems/flywheel_example/Flywheel.java
	modified:   src/main/java/frc/robot/subsystems/flywheel_example/FlywheelIOSpark.java
@tbowers7
Consolidation of vision constants
e2473f1 
Also, renamed DriveConstants module -> SwerveConstants

	modified:   src/main/java/frc/robot/Constants.java
	modified:   src/main/java/frc/robot/RobotContainer.java
	modified:   src/main/java/frc/robot/commands/DriveCommands.java
	modified:   src/main/java/frc/robot/subsystems/drive/Drive.java
	modified:   src/main/java/frc/robot/subsystems/drive/GyroIONavX.java
	modified:   src/main/java/frc/robot/subsystems/drive/GyroIOPigeon2.java
	modified:   src/main/java/frc/robot/subsystems/drive/Module.java
	modified:   src/main/java/frc/robot/subsystems/drive/ModuleIOBlended.java
	modified:   src/main/java/frc/robot/subsystems/drive/ModuleIOSpark.java
	modified:   src/main/java/frc/robot/subsystems/drive/ModuleIOSparkCANcoder.java
	modified:   src/main/java/frc/robot/subsystems/drive/ModuleIOTalonFX.java
	modified:   src/main/java/frc/robot/subsystems/drive/PhoenixOdometryThread.java
	modified:   src/main/java/frc/robot/subsystems/drive/SparkOdometryThread.java
	renamed:    src/main/java/frc/robot/subsystems/drive/DriveConstants.java -> src/main/java/frc/robot/subsystems/drive/SwerveConstants.java
	modified:   src/main/java/frc/robot/subsystems/flywheel_example/FlywheelIOSpark.java
	modified:   src/main/java/frc/robot/subsystems/vision/Vision.java
	deleted:    src/main/java/frc/robot/subsystems/vision/VisionConstants.java
	modified:   src/main/java/frc/robot/subsystems/vision/VisionIOPhotonVisionSim.java
@tbowers7
Combining and reorganizing constants
702a55b 
	modified:   src/main/java/frc/robot/Constants.java
	modified:   src/main/java/frc/robot/RobotContainer.java
	modified:   src/main/java/frc/robot/commands/ChoreoAutoController.java
	modified:   src/main/java/frc/robot/subsystems/drive/Drive.java
	modified:   src/main/java/frc/robot/subsystems/flywheel_example/FlywheelIOSpark.java
	modified:   src/main/java/frc/robot/subsystems/flywheel_example/FlywheelIOTalonFX.java
	modified:   src/main/java/frc/robot/subsystems/vision/Vision.java
	modified:   src/main/java/frc/robot/subsystems/vision/VisionIOPhotonVisionSim.java
	modified:   src/main/java/frc/robot/util/PowerMonitoring.java
@tbowers7
Late-breaking beta update
0e9df59 
	modified:   src/main/java/frc/robot/subsystems/drive/SwerveConstants.java
	modified:   vendordeps/PathplannerLib-beta.json
@tbowers7
Updates from AdvantageKit since 19-Dec-2024
2b60d35 
	modified:   src/main/java/frc/robot/subsystems/vision/VisionIOLimelight.java
	modified:   src/main/java/frc/robot/subsystems/vision/VisionIOPhotonVision.java
@tbowers7
Update vendordeps
2d7c2be 
	modified:   src/main/java/frc/robot/subsystems/vision/VisionIOPhotonVision.java
	modified:   vendordeps/maple-sim.json
@tbowers7
Clean up constants more
12ba358 
	modified:   src/main/java/frc/robot/Constants.java
	modified:   src/main/java/frc/robot/RobotContainer.java
	modified:   src/main/java/frc/robot/subsystems/vision/Vision.java
	new file:   src/main/java/frc/robot/util/GetJoystickValue.java
@tbowers7
Remove duplicative drive command
17efa75 
	modified:   src/main/java/frc/robot/commands/DriveCommands.java
@tbowers7
Merge pull request #25 from AZ-First/clean_constants
06d1d78 
Clean up the definition of constants
@tbowers7
Update to 2025, WPILib 2025.1.1
6ec382f 
	modified:   .github/dependabot.yml
	modified:   AdvantageScope Swerve Calibration.json
	modified:   WPILib-License.md
	modified:   build.gradle
	modified:   settings.gradle
	modified:   src/main/java/frc/robot/Constants.java
	modified:   src/main/java/frc/robot/Main.java
	modified:   src/main/java/frc/robot/Robot.java
	modified:   src/main/java/frc/robot/RobotContainer.java
	modified:   src/main/java/frc/robot/commands/ChoreoAutoController.java
	modified:   src/main/java/frc/robot/commands/DriveCommands.java
	modified:   src/main/java/frc/robot/subsystems/accelerometer/Accelerometer.java
	modified:   src/main/java/frc/robot/subsystems/drive/Drive.java
	modified:   src/main/java/frc/robot/subsystems/drive/GyroIO.java
	modified:   src/main/java/frc/robot/subsystems/drive/GyroIONavX.java
	modified:   src/main/java/frc/robot/subsystems/drive/GyroIOPigeon2.java
	modified:   src/main/java/frc/robot/subsystems/drive/Module.java
	modified:   src/main/java/frc/robot/subsystems/drive/ModuleIO.java
	modified:   src/main/java/frc/robot/subsystems/drive/ModuleIOBlended.java
	modified:   src/main/java/frc/robot/subsystems/drive/ModuleIOSim.java
	modified:   src/main/java/frc/robot/subsystems/drive/ModuleIOSpark.java
	modified:   src/main/java/frc/robot/subsystems/drive/ModuleIOSparkCANcoder.java
	modified:   src/main/java/frc/robot/subsystems/drive/ModuleIOTalonFX.java
	modified:   src/main/java/frc/robot/subsystems/drive/PhoenixOdometryThread.java
	modified:   src/main/java/frc/robot/subsystems/drive/SparkOdometryThread.java
	modified:   src/main/java/frc/robot/subsystems/drive/SwerveConstants.java
	modified:   src/main/java/frc/robot/subsystems/flywheel_example/Flywheel.java
	modified:   src/main/java/frc/robot/subsystems/flywheel_example/FlywheelIO.java
	modified:   src/main/java/frc/robot/subsystems/flywheel_example/FlywheelIOSim.java
	modified:   src/main/java/frc/robot/subsystems/flywheel_example/FlywheelIOSpark.java
	modified:   src/main/java/frc/robot/subsystems/flywheel_example/FlywheelIOTalonFX.java
	modified:   src/main/java/frc/robot/subsystems/vision/Vision.java
	modified:   src/main/java/frc/robot/subsystems/vision/VisionIO.java
	modified:   src/main/java/frc/robot/subsystems/vision/VisionIOLimelight.java
	modified:   src/main/java/frc/robot/subsystems/vision/VisionIOPhotonVision.java
	modified:   src/main/java/frc/robot/subsystems/vision/VisionIOPhotonVisionSim.java
	modified:   src/main/java/frc/robot/util/Alert.java
	modified:   src/main/java/frc/robot/util/GeomUtil.java
	modified:   src/main/java/frc/robot/util/GetJoystickValue.java
	modified:   src/main/java/frc/robot/util/LocalADStarAK.java
	modified:   src/main/java/frc/robot/util/LoggedTunableNumber.java
	modified:   src/main/java/frc/robot/util/OverrideSwitches.java
	modified:   src/main/java/frc/robot/util/PhoenixUtil.java
	modified:   src/main/java/frc/robot/util/PowerMonitoring.java
	modified:   src/main/java/frc/robot/util/RBSIEnum.java
	modified:   src/main/java/frc/robot/util/RBSISubsystem.java
	modified:   src/main/java/frc/robot/util/RobotDeviceId.java
	modified:   src/main/java/frc/robot/util/SparkUtil.java
	modified:   src/main/java/frc/robot/util/VirtualSubsystem.java
	modified:   src/main/java/frc/robot/util/YagslConstants.java
	modified:   src/test/CurrentLimitTests.java
	modified:   src/test/FusedCANcoderTests.java
	modified:   src/test/LatencyCompensationTests.java
	modified:   src/test/RobotContainerTest.java
@tbowers7
Tie in CTRE Pro to all relevant places
0651ebc 
	modified:   src/main/java/frc/robot/Constants.java
	modified:   src/main/java/frc/robot/RobotContainer.java
	modified:   src/main/java/frc/robot/subsystems/drive/ModuleIOBlended.java
	modified:   src/main/java/frc/robot/subsystems/drive/ModuleIOTalonFX.java
	modified:   src/main/java/frc/robot/subsystems/flywheel_example/FlywheelIOSpark.java
	modified:   src/main/java/frc/robot/subsystems/flywheel_example/FlywheelIOTalonFX.java
	modified:   src/main/java/frc/robot/util/RBSIEnum.java
@tbowers7
Align drive commands with AK2025 templates
5d3078d 
	modified:   src/main/java/frc/robot/Constants.java
	modified:   src/main/java/frc/robot/commands/DriveCommands.java
	modified:   src/main/java/frc/robot/subsystems/drive/Drive.java
	modified:   src/main/java/frc/robot/subsystems/drive/README
@tbowers7
Cleaning up drive commands
a3fba5e 
	modified:   src/main/java/frc/robot/Constants.java
	modified:   src/main/java/frc/robot/commands/DriveCommands.java
@tbowers7
Add joystick slew rate limiter
fe8c3f6 
	modified:   src/main/java/frc/robot/Constants.java
	modified:   src/main/java/frc/robot/commands/DriveCommands.java
@tbowers7
Update FRC year for WPILib kickoff release
38f6391 
	modified:   .wpilib/wpilib_preferences.json
@tbowers7
Updated install instructions
1ad24e0 
Also regenerated `TunerConstants.java` with latest Tuner X Preview version.

	modified:   INSTALL.md
	modified:   src/main/java/frc/robot/generated/TunerConstants.java
@tbowers7
Revert to WPILib 2025.1.1-beta-3
22eea3b 
Just trying to get the robot to run!

	modified:   .wpilib/wpilib_preferences.json
	modified:   build.gradle
	modified:   settings.gradle
	modified:   src/main/java/frc/robot/Robot.java
	modified:   src/main/java/frc/robot/subsystems/drive/Drive.java
	modified:   src/main/java/frc/robot/subsystems/flywheel_example/README
	new file:   src/main/java/frc/robot/subsystems/vision/README
@tbowers7
Updating more vendordeps; WPILib 2025.1.1 Gold
4a0f6ec 
Still waiting on Photon Vision 2025 Gold Standard.

Also need to fix issues related to Phoenix 6 Gold (vs beta).

Update the PathPlanner navgrid.

	modified:   .wpilib/wpilib_preferences.json
	modified:   build.gradle
	modified:   settings.gradle
	modified:   src/main/deploy/pathplanner/navgrid.json
	modified:   src/main/java/frc/robot/RobotContainer.java
	modified:   src/main/java/frc/robot/subsystems/accelerometer/Accelerometer.java
	modified:   src/main/java/frc/robot/subsystems/drive/GyroIONavX.java
	modified:   src/main/java/frc/robot/subsystems/drive/ModuleIOSpark.java
	modified:   src/main/java/frc/robot/subsystems/drive/ModuleIOSparkCANcoder.java
	modified:   src/main/java/frc/robot/subsystems/flywheel_example/FlywheelIOSim.java
	modified:   src/main/java/frc/robot/subsystems/flywheel_example/FlywheelIOSpark.java
	modified:   src/main/java/frc/robot/util/OverrideSwitches.java
	modified:   vendordeps/AdvantageKit.json
	renamed:    vendordeps/ChoreoLib2025Beta.json -> vendordeps/ChoreoLib2025.json
	deleted:    vendordeps/NavX.json
	renamed:    vendordeps/PathplannerLib-beta.json -> vendordeps/PathplannerLib.json
	renamed:    vendordeps/Phoenix5-frc2025-beta-latest.json -> vendordeps/Phoenix5-frc2025-latest.json
	renamed:    vendordeps/Phoenix6-frc2025-beta-latest.json -> vendordeps/Phoenix6-frc2025-latest.json
	modified:   vendordeps/REVLib.json
	renamed:    vendordeps/ReduxLib_2025.json -> vendordeps/ReduxLib-2025.0.0.json
	new file:   vendordeps/Studica-2025.0.0.json
	new file:   vendordeps/ThriftyLib.json
	modified:   vendordeps/URCL.json
	modified:   vendordeps/maple-sim.json
	renamed:    vendordeps/yagsl.json -> vendordeps/yagsl-2025.1.3.json
@tbowers7
Conformal changes for Phoenix6 kickoff version
2a95b2b 
	modified:   src/main/java/frc/robot/generated/TunerConstants.java
	modified:   src/main/java/frc/robot/subsystems/drive/ModuleIOBlended.java
	modified:   src/main/java/frc/robot/subsystems/drive/ModuleIOSim.java
	modified:   src/main/java/frc/robot/subsystems/drive/ModuleIOTalonFX.java
	modified:   src/main/java/frc/robot/subsystems/drive/SwerveConstants.java
@tbowers7
More 2025 vendordep updates
c637e49 
	modified:   vendordeps/ChoreoLib2025.json
	modified:   vendordeps/PathplannerLib.json
	modified:   vendordeps/Phoenix5-frc2025-latest.json
	modified:   vendordeps/maple-sim.json
@tbowers7
Apply TalonFX settings correctly
18e5cc6 
Correctly apply the TalonFX settings to the motor controllers after
all settings been, well, set.

	modified:   src/main/java/frc/robot/Constants.java
	modified:   src/main/java/frc/robot/RobotContainer.java
	modified:   src/main/java/frc/robot/commands/DriveCommands.java
	modified:   src/main/java/frc/robot/generated/TunerConstants.java
	modified:   src/main/java/frc/robot/subsystems/drive/Drive.java
	modified:   src/main/java/frc/robot/subsystems/drive/ModuleIOBlended.java
	modified:   src/main/java/frc/robot/subsystems/drive/ModuleIOTalonFX.java
	modified:   src/main/java/frc/robot/subsystems/drive/SwerveConstants.java
@tbowers7
Merge pull request #28 from AZ-First/smooth_drive
9844866 
Smooth out the driving
@tbowers7
Cleanup of unused things; set CTRE UNLICENSED
133ba5e 
	modified:   src/main/java/frc/robot/Constants.java
	modified:   src/main/java/frc/robot/RobotContainer.java
	modified:   src/main/java/frc/robot/commands/DriveCommands.java
@tbowers7
YAGSL vendorlib update
e099287 
	renamed:    vendordeps/yagsl-2025.1.3.json -> vendordeps/yagsl-2025.1.3.jwt151.json
@tbowers7
Update to WPILib 2025.2.1
80d2201 
The WPILib Week 1 update, including all of the 2025 field images and AprilTags.

	modified:   build.gradle
@tbowers7
Merge pull request #29 from AZ-First/prep4release
956718b 
Small changes to prepare for RC1 release
@tbowers7 tbowers7 merged commit 6dde0ca into main Jan 11, 2025
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@tbowers7