Merge branch 'main' into 2027

wpilibsuite · Dec 2, 2024 · 5cab27f · 5cab27f
2 parents ce63770 + de82ed4
commit 5cab27f
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 1 deletion.
diff --git a/.github/workflows/lint-format.yml b/.github/workflows/lint-format.yml
@@ -51,7 +51,7 @@ jobs:
   tidy:
     name: "clang-tidy"
     runs-on: ubuntu-22.04
-    container: wpilib/roborio-cross-ubuntu:2025-22.04
+    container: wpilib/ubuntu-base:22.04
     steps:
       - uses: actions/checkout@v4
         with:

diff --git a/hal/src/generate/ResourceType.txt b/hal/src/generate/ResourceType.txt
@@ -122,3 +122,5 @@ kResourceType_ChoreoTrigger = 120
 kResourceType_PathWeaverTrajectory = 121
 kResourceType_Koors40 = 122
 kResourceType_ThriftyNova = 123
+kResourceType_PWFSEN36005 = 124
+kResourceType_LaserShark = 125
diff --git a/hal/src/generated/main/java/edu/wpi/first/hal/FRCNetComm.java b/hal/src/generated/main/java/edu/wpi/first/hal/FRCNetComm.java
diff --git a/hal/src/generated/main/native/include/hal/FRCUsageReporting.h b/hal/src/generated/main/native/include/hal/FRCUsageReporting.h
diff --git a/hal/src/generated/main/native/include/hal/UsageReporting.h b/hal/src/generated/main/native/include/hal/UsageReporting.h