From af3b1646d6bf193cee8d9b9d6cff67b351ae1921 Mon Sep 17 00:00:00 2001 From: VyaasBaskar Date: Thu, 16 Jan 2025 11:24:51 -0800 Subject: [PATCH] Update WPILib version to 2025.2.1 --- README.md | 7 +++---- build.gradle | 2 +- .../frc846/control/calculators/CurrentTorqueCalculator.cc | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 9f51550..e40c7bf 100644 --- a/README.md +++ b/README.md @@ -43,8 +43,8 @@ Commands set targets to these subsystems. Some commands are like actions, such a #### WPILib Tools -- Download WPILib tools and WPILib VSCode. Attached is the link for version 2025.1.1. - - [2025.1.1 WINDOWS](https://packages.wpilib.workers.dev/installer/v2025.1.1/Win64/WPILib_Windows-2025.1.1.iso) +- Download WPILib tools and WPILib VSCode. Attached is the link for version 2025.2.1. + - [2025.2.1 WINDOWS](https://packages.wpilib.workers.dev/installer/v2025.2.1/Win64/WPILib_Windows-2025.2.1.iso) - Once downloaded, double click on the file. By default, it will be saved in the downloads folder. - Run the .exe file inside of it. It should be called "WPILib Installer". - Go through the default setup process. @@ -106,7 +106,7 @@ Select x64 or arm depending on your chip. If using M1/M2/M3 mac, select arm. Ignore the LLVM section. -- [WPILib 2025.1.1](https://github.com/wpilibsuite/allwpilib/releases/tag/v2025.1.1). +- [WPILib 2025.2.1](https://github.com/wpilibsuite/allwpilib/releases/tag/v2025.2.1). - [git-scm](https://git-scm.com/download/mac). - Clang-format: `brew install clang-format` - CppCheck: `brew install cppcheck` @@ -173,7 +173,6 @@ To undo the going back: ## CppCheck Warnings ``` -src\frc846\cpp\frc846\control\calculators\CurrentTorqueCalculator.cc:49:30: warning: Variable 'duty_cycle_original' is assigned a value that is never used. [unreadVariable] src\frc846\cpp\frc846\robot\swerve\drivetrain.cc:160:64: warning: Variable 'accel_target' is assigned a value that is never used. [unreadVariable] src\frc846\cpp\frc846\math\collection.cc:25:0: warning: The function 'VerticalDeadband' is never used. [unusedFunction] src\frc846\cpp\frc846\math\collection.cc:39:0: warning: The function 'CoterminalDifference' is never used. [unusedFunction] diff --git a/build.gradle b/build.gradle index 8014394..df0943d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ plugins { id "cpp" id "google-test-test-suite" - id "edu.wpi.first.GradleRIO" version "2025.1.1" + id "edu.wpi.first.GradleRIO" version "2025.2.1" id 'com.diffplug.spotless' version '6.20.0' } diff --git a/src/frc846/cpp/frc846/control/calculators/CurrentTorqueCalculator.cc b/src/frc846/cpp/frc846/control/calculators/CurrentTorqueCalculator.cc index c5afa01..4e80de3 100644 --- a/src/frc846/cpp/frc846/control/calculators/CurrentTorqueCalculator.cc +++ b/src/frc846/cpp/frc846/control/calculators/CurrentTorqueCalculator.cc @@ -46,7 +46,6 @@ double CurrentTorqueCalculator::scale_current_draw(double scale_factor, double CurrentTorqueCalculator::limit_current_draw(double duty_cycle, units::ampere_t current_limit, units::revolutions_per_minute_t rpm, units::volt_t v_supply, unit_ohm circuit_resistance, MotorSpecs specs) { - double duty_cycle_original = duty_cycle; units::ampere_t current_draw = predict_current_draw( duty_cycle, rpm, v_supply, circuit_resistance, specs); if (units::math::abs(current_draw) > current_limit) {