Skip to content

Commit

Permalink
merging master into all subsystems
Browse files Browse the repository at this point in the history
  • Loading branch information
DhananjayKhulbe committed Jan 31, 2025
2 parents d214af2 + fbb9a20 commit 47cf40b
Show file tree
Hide file tree
Showing 78 changed files with 2,536 additions and 405 deletions.
5 changes: 4 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,10 @@
"xtr1common": "cpp",
"xtree": "cpp",
"xutility": "cpp",
"queue": "cpp"
"queue": "cpp",
"expected": "cpp",
"source_location": "cpp",
"version": "cpp"
},
"wpilib.useWindbgX": true,
"C_Cpp.errorSquiggles": "enabled",
Expand Down
9 changes: 3 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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`
Expand Down Expand Up @@ -173,9 +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]
src/frc846/cpp/frc846/math/collection.cc:52:0: warning: The function 'CoterminalSum' is never used. [unusedFunction]
```
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ spotless {
}

if (!project.hasProperty('fromCI')) {
check.dependsOn spotlessApply
spotlessApply
}
spotlessCppCheck.onlyIf { !project.hasProperty('fromCI') || project.hasProperty('runningSpotlessCpp') }

Expand Down Expand Up @@ -204,4 +204,4 @@ runCppcheck.onlyIf { !project.hasProperty('fromCI') }
if (!project.hasProperty('fromCI')) {
check.dependsOn runCppcheck
runCppcheck.dependsOn spotlessApply
}
}
Loading

0 comments on commit 47cf40b

Please sign in to comment.