Merge pull request #5 from team4909/champs

Merge in final 2024 code
team4909 · Jan 15, 2025 · eecf5d2 · eecf5d2
2 parents 4e4aef1 + 37078cc
commit eecf5d2
Show file tree

Hide file tree

Showing 100 changed files with 22,933 additions and 8,850 deletions.
diff --git a/.AdvantageScope/2-7-24-copy-of-config.json → .AdvantageScope/config.json b/.AdvantageScope/2-7-24-copy-of-config.json → .AdvantageScope/config.json
diff --git a/.AdvantageScope/model.glb b/.AdvantageScope/model.glb
diff --git a/.AdvantageScope/model_0.glb b/.AdvantageScope/model_0.glb
diff --git a/.AdvantageScope/model_1.glb b/.AdvantageScope/model_1.glb
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,8 +11,10 @@ jobs:
     container: wpilib/roborio-cross-ubuntu:2024-22.04
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Grant execute permission
         run: chmod +x gradlew
+      - name: Check formatting
+        run: ./gradlew spotlessCheck
       - name: Build robot code
         run: ./gradlew build
diff --git a/.gitignore b/.gitignore
@@ -180,4 +180,5 @@ logs/
 # Folder that has CTRE Phoenix Sim device config storage
 ctre_sim/
 
-.SysId/
+.SysId/
+.DataLogTool/
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -1,13 +1,6 @@
 {
   "version": "0.2.0",
   "configurations": [
-    {
-      "type": "java",
-      "name": "Main",
-      "request": "launch",
-      "mainClass": "frc.robot.Main",
-      "projectName": "2024-Crescendo"
-    },
     {
       "type": "wpilib",
       "name": "WPILib Desktop Debug",

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -28,6 +28,15 @@
     }
   ],
   "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",