Skip to content

Commit

Permalink
Merge branch 'main' into dev-auto
Browse files Browse the repository at this point in the history
  • Loading branch information
manthan-acharya committed Feb 13, 2024
2 parents eec4384 + 67f0108 commit 2c2a1a4
Show file tree
Hide file tree
Showing 87 changed files with 2,450 additions and 7,745 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,9 @@ jobs:
uses: actions/checkout@v2
- name: Grant execute permission
run: chmod +x gradlew
- name: Check formatting
run: ./gradlew spotlessCheck
- name: Build robot code
run: ./gradlew build
env:
GENERATE_EMPTY_DRIVE_TRAJECTORIES: true
10 changes: 8 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ Temporary Items
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
!.vscode/style.xml

### Windows ###
# Windows thumbnail cache files
Expand Down Expand Up @@ -168,8 +169,13 @@ out/
# Fleet
.fleet

# Simulation GUI and other tools window save file
# Simulation GUI and other tools window save files
*-window.json
simgui*.json
networktables.json

# Version file
src/main/java/org/littletonrobotics/frc2024/BuildConstants.java
src/main/java/org/littletonrobotics/frc2024/BuildConstants.java

# Generated paths
src/main/deploy/trajectories/*.pathblob
12 changes: 0 additions & 12 deletions .pathplanner/settings.json

This file was deleted.

9 changes: 9 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,15 @@
null
],
"java.test.defaultConfig": "WPIlibUnitTests",
"java.format.enabled": false,
"editor.detectIndentation": false,
"editor.insertSpaces": true,
"editor.tabSize": 2,
"editor.formatOnSave": true,
"editor.formatOnPaste": true,
"editor.formatOnType": true,
"editor.formatOnSaveMode": "file",
"editor.autoIndent": "full",
"spotlessGradle.format.enable": true,
"spotlessGradle.diagnostics.enable": false,
"editor.defaultFormatter": "richardwillis.vscode-spotless-gradle",
Expand Down
Loading

0 comments on commit 2c2a1a4

Please sign in to comment.