Merge pull request #13 from Team846/2025_updates

2025 updates

.github/workflows/compilation_check.yaml

@@ -10,8 +10,9 @@ on:
 
 jobs:
   compilation_check:
-    runs-on: ubuntu-latest
-    container: wpilib/roborio-cross-ubuntu:2024-22.04
+    runs-on: ubuntu-22.04
+    container: wpilib/roborio-cross-ubuntu:2025-22.04
+
 
     steps:
       - name: Checkout code

.github/workflows/cpp_check.yaml

@@ -10,8 +10,8 @@ on:
 
 jobs:
   cpp_check:
-    runs-on: ubuntu-latest
-    container: wpilib/roborio-cross-ubuntu:2024-22.04
+    runs-on: ubuntu-22.04
+    container: wpilib/roborio-cross-ubuntu:2025-22.04
 
     steps:
       - name: Checkout code

.github/workflows/formatting_check.yaml

@@ -10,8 +10,8 @@ on:
 
 jobs:
   formatting_check:
-    runs-on: ubuntu-latest
-    container: wpilib/roborio-cross-ubuntu:2024-22.04
+    runs-on: ubuntu-22.04
+    container: wpilib/roborio-cross-ubuntu:2025-22.04
 
     steps:
       - name: Checkout code

.vscode/tasks.json

@@ -1,27 +1,28 @@
 {
-  "tasks": [
-    {
-      "type": "cppbuild",
-      "label": "C/C++: clang++.exe build active file",
-      "command": "C:\\Program Files\\LLVM\\bin\\clang++.exe",
-      "args": [
-        "-fcolor-diagnostics",
-        "-fansi-escape-codes",
-        "-g",
-        "${file}",
-        "-o",
-        "${fileDirname}\\${fileBasenameNoExtension}.exe"
-      ],
-      "options": {
-        "cwd": "${fileDirname}"
-      },
-      "problemMatcher": ["$gcc"],
-      "group": {
-        "kind": "build",
-        "isDefault": true
-      },
-      "detail": "Task generated by Debugger."
-    }
-  ],
-  "version": "2.0.0"
-}
+    "tasks": [
+      {
+        "type": "cppbuild",
+        "label": "C/C++: clang++.exe build active file",
+        "command": "C:\\Program Files\\LLVM\\bin\\clang++.exe",
+        "args": [
+          "-fcolor-diagnostics",
+          "-fansi-escape-codes",
+          "-g",
+          "${file}",
+          "-o",
+          "${fileDirname}\\${fileBasenameNoExtension}.exe"
+        ],
+        "options": {
+          "cwd": "${fileDirname}"
+        },
+        "problemMatcher": ["$gcc"],
+        "group": {
+          "kind": "build",
+          "isDefault": true
+        },
+        "detail": "Task generated by Debugger."
+      }
+    ],
+    "version": "2.0.0"
+  }
+

.wpilib/wpilib_preferences.json

@@ -1,6 +1,6 @@
 {
     "enableCppIntellisense": true,
     "currentLanguage": "cpp",
-    "projectYear": "2024",
+    "projectYear": "2025",
     "teamNumber": 846
 }

README.md

@@ -14,39 +14,37 @@ Code subsystems interact with hardware subsystems by: 1. writing to motors and 2
 
 Commands set targets to these subsystems. Some commands are like actions, such as moving the arm to a setpoint, or deploying the intake. Commands can be compounded to form more complex routines and autos.
 
-- src
-  - y2025
-    - cpp
-      - subsystems
-      - commands
-      - autos
-      - main.cpp
-      - FunkyRobot.cc
-    - include
-      - headers for all files in cpp
-    - resources
-      - miscellaneous, vision code
-  - deploy
-    - Nothing yet.
-    - Any files placed in this directory will be put onto the RIO's file system during deploy.
-    - These files can be accessed by robot code.
-- frc846 (arch)
-  - Contains motor control classes, logging classes, prefs, etc.
-- build
-  - tmp
-    - Build Logs can be found here.
-    - Generated by WPILib build tools, not us.
+- ### src/
+  - ### y2025/
+    - ### cpp/
+      - ### subsystems/
+      - ### commands/
+      - #### main.cpp
+      - #### FunkyRobot.cc
+    - ### include/
+      - Headers
+    - ### resources/
+      Miscellaneous, vision code
+  - ### deploy/
+    Any files placed in this directory will be put onto the RIO's file system during deploy.
+    These files can be accessed by robot code.
+    - ### autos/
+      Includes scriptable autos
+- ### frc846/
+  Custom architecture. Contains motor control classes, logging classes, prefs, etc.
+- ### build
+  - ### tmp
+    Build Logs can be found here.
+    Generated by WPILib build tools, not us.
 
 ## First Time Setup - Windows
 
 ### --Downloads--
 
 #### WPILib Tools
 
-- Download WPILib tools and WPILib VSCode. Attached are links for versions 2024.3.1 and 2024.3.2.
-  - [2024.3.1 WINDOWS](https://packages.wpilib.workers.dev/installer/v2024.3.1/Win64/WPILib_Windows-2024.3.1.iso)
-    - Use 2024.3.1 by default. Ask me before downloading 2024.3.2.
-  - [2024.3.2 WINDOWS](https://packages.wpilib.workers.dev/installer/v2024.3.2/Win64/WPILib_Windows-2024.3.2.iso)
+- 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)
 - 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.
@@ -83,7 +81,7 @@ If unfamiliar with GitHub, go through tutorials in the [Using Git](#using-git) s
 ### --Setup--
 
 - Clone the repository.
-  - Run: `git clone https://github.com/Team846/howler_monkey.git` in terminal.
+  - Run: `git clone https://github.com/Team846/monkey_menace.git` in terminal.
 - Open WPILib VSCode
 - In WPILib VSCode, open the folder containing the cloned repository.
   - The path will be `path the clone command was run in + howler_monkey`
@@ -108,15 +106,14 @@ Select x64 or arm depending on your chip. If using M1/M2/M3 mac, select arm.
 
 Ignore the LLVM section.
 
-- [WPILib 2024.3.1](https://github.com/wpilibsuite/allwpilib/releases/tag/v2024.3.1).
-- [WPILib 2024.3.2](https://github.com/wpilibsuite/allwpilib/releases/tag/v2024.3.2).
+- [WPILib 2025.1.1](https://github.com/wpilibsuite/allwpilib/releases/tag/v2025.1.1).
 - [git-scm](https://git-scm.com/download/mac).
 - Clang-format: `brew install clang-format`
 - CppCheck: `brew install cppcheck`
 
 ### --Setup--
 
-WPILib VSCode is installed in a hard-to-find directory on MacOS. It is usually located in ~/wpilib/202x/vscode/ and is called "Visual Studio Code". For example it can be located in /Users/funkymonkey/wpilib/2024/vscode. If you need help finding it, ask someone who has previously installed WPILib VSCode on MacOS.
+WPILib VSCode is installed in a hard-to-find directory on MacOS. It is usually located in ~/wpilib/202x/vscode/ and is called "Visual Studio Code". For example it can be located in /Users/funkymonkey/wpilib/202X/vscode. If you need help finding it, ask someone who has previously installed WPILib VSCode on MacOS.
 
 It is a good idea to rename the file or move it into your Applications folder and pin it in dock for easy access and differentiation from normal VSCode.
 

build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "cpp"
     id "google-test-test-suite"
-    id "edu.wpi.first.GradleRIO" version "2024.3.1"
+    id "edu.wpi.first.GradleRIO" version "2025.1.1"
     id 'com.diffplug.spotless' version '6.20.0'
 }
 
@@ -24,6 +24,10 @@ deploy {
                 frcStaticFileDeploy(getArtifactTypeClass('FileTreeArtifact')) {
                     files = project.fileTree('src/y2025/deploy')
                     directory = '/home/lvuser/deploy'
+
+
+                    // Set deleteOldFiles to true to clear files in deploy/ on RIO that aren't in this project
+                    deleteOldFiles = true  
                 }
             }
         }
@@ -113,7 +117,7 @@ spotless {
         }
         def selectedClangVersion = project.hasProperty('fromCI') ? '18.1.8' : '18.1.8'
 
-        def styleFile = file('style.standard')
+        def styleFile = file('.clang-format')
         def styleConfig = styleFile.text.trim()
 
         clangFormat(selectedClangVersion).style(styleConfig)

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=permwrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/frc846/cpp/frc846/control/MotorMonkey.cc

@@ -2,8 +2,8 @@
 
 #include <frc/RobotBase.h>
 #include <frc/RobotController.h>
-#include <rev/CANSparkFlex.h>
-#include <rev/CANSparkMax.h>
+#include <rev/SparkFlex.h>
+#include <rev/SparkMax.h>
 
 #include <string>