Skip to content

Commit e0ae2fd

Browse files
authored
Merge pull request #16 from REVrobotics/2025-kickoff
Update for 2025 kickoff
2 parents cecabe0 + 56ff7a2 commit e0ae2fd

File tree

8 files changed

+26
-11
lines changed

8 files changed

+26
-11
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,3 +182,6 @@ ctre_sim/
182182
# clangd
183183
/.cache
184184
compile_commands.json
185+
186+
# Eclipse generated file for annotation processors
187+
.factorypath

.wpilib/wpilib_preferences.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"enableCppIntellisense": true,
33
"currentLanguage": "cpp",
4-
"projectYear": "2025beta",
4+
"projectYear": "2025",
55
"teamNumber": 2714
66
}

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# MAXSwerve C++ Template Changelog
22

3+
## [2025.1] - 2025-01-04
4+
5+
- Updates project for kickoff releases
6+
- Adds usage reporting
7+
38
## [2025.0] - 2024-11-15
49

510
- Updates project for 2025 FRC season

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# MAXSwerve C++ Template v2025.0
1+
# MAXSwerve C++ Template v2025.1
22

33
See [the online changelog](https://github.com/REVrobotics/MAXSwerve-Cpp-Template/blob/main/CHANGELOG.md) for information about updates to the template that may have been released since you created your project.
44

build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id "cpp"
33
id "google-test-test-suite"
4-
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-1"
4+
id "edu.wpi.first.GradleRIO" version "2025.1.1"
55
}
66

77
// Define my targets (RoboRIO) and artifacts (deployable files)
@@ -27,6 +27,8 @@ deploy {
2727
frcStaticFileDeploy(getArtifactTypeClass('FileTreeArtifact')) {
2828
files = project.fileTree('src/main/deploy')
2929
directory = '/home/lvuser/deploy'
30+
deleteOldFiles = false // Change to true to delete files on roboRIO that no
31+
// longer exist in deploy directory of this project
3032
}
3133
}
3234
}

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=permwrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

src/main/cpp/subsystems/DriveSubsystem.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include "subsystems/DriveSubsystem.h"
66

77
#include <frc/geometry/Rotation2d.h>
8+
#include <hal/FRCUsageReporting.h>
89
#include <units/angle.h>
910
#include <units/angular_velocity.h>
1011
#include <units/velocity.h>
@@ -27,7 +28,11 @@ DriveSubsystem::DriveSubsystem()
2728
m_gyro.GetAngle(frc::ADIS16470_IMU::IMUAxis::kZ)}),
2829
{m_frontLeft.GetPosition(), m_frontRight.GetPosition(),
2930
m_rearLeft.GetPosition(), m_rearRight.GetPosition()},
30-
frc::Pose2d{}} {}
31+
frc::Pose2d{}} {
32+
// Usage reporting for MAXSwerve template
33+
HAL_Report(HALUsageReporting::kResourceType_RobotDrive,
34+
HALUsageReporting::kRobotDriveSwerve_MaxSwerve);
35+
}
3136

3237
void DriveSubsystem::Periodic() {
3338
// Implementation of subsystem periodic method goes here.

vendordeps/REVLib.json renamed to vendordeps/REVLib-2025.0.0.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"fileName": "REVLib.json",
2+
"fileName": "REVLib-2025.0.0.json",
33
"name": "REVLib",
4-
"version": "2025.0.0-beta-2",
4+
"version": "2025.0.0",
55
"frcYear": "2025",
66
"uuid": "3f48eb8c-50fe-43a6-9cb7-44c86353c4cb",
77
"mavenUrls": [
@@ -12,14 +12,14 @@
1212
{
1313
"groupId": "com.revrobotics.frc",
1414
"artifactId": "REVLib-java",
15-
"version": "2025.0.0-beta-2"
15+
"version": "2025.0.0"
1616
}
1717
],
1818
"jniDependencies": [
1919
{
2020
"groupId": "com.revrobotics.frc",
2121
"artifactId": "REVLib-driver",
22-
"version": "2025.0.0-beta-2",
22+
"version": "2025.0.0",
2323
"skipInvalidPlatforms": true,
2424
"isJar": false,
2525
"validPlatforms": [
@@ -37,7 +37,7 @@
3737
{
3838
"groupId": "com.revrobotics.frc",
3939
"artifactId": "REVLib-cpp",
40-
"version": "2025.0.0-beta-2",
40+
"version": "2025.0.0",
4141
"libName": "REVLib",
4242
"headerClassifier": "headers",
4343
"sharedLibrary": false,
@@ -55,7 +55,7 @@
5555
{
5656
"groupId": "com.revrobotics.frc",
5757
"artifactId": "REVLib-driver",
58-
"version": "2025.0.0-beta-2",
58+
"version": "2025.0.0",
5959
"libName": "REVLibDriver",
6060
"headerClassifier": "headers",
6161
"sharedLibrary": false,

0 commit comments

Comments
 (0)