From 4dd3a36d2ecc48656f3b87252646547ae278a167 Mon Sep 17 00:00:00 2001 From: Thad House Date: Mon, 2 Dec 2024 01:01:19 +0000 Subject: [PATCH 1/2] [ci] Switch lint task to use base ubuntu image (#7471) --- .github/workflows/lint-format.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-format.yml b/.github/workflows/lint-format.yml index 008fe76560..8de7bd9c20 100644 --- 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: From de82ed434d4439bec46bf8dee1415248f1bec780 Mon Sep 17 00:00:00 2001 From: sciencewhiz Date: Sun, 1 Dec 2024 17:02:20 -0800 Subject: [PATCH 2/2] [hal] Add usage reporting for TOF sensors (#7470) --- hal/src/generate/ResourceType.txt | 2 ++ hal/src/generated/main/java/edu/wpi/first/hal/FRCNetComm.java | 4 ++++ hal/src/generated/main/native/include/hal/FRCUsageReporting.h | 2 ++ hal/src/generated/main/native/include/hal/UsageReporting.h | 2 ++ 4 files changed, 10 insertions(+) diff --git a/hal/src/generate/ResourceType.txt b/hal/src/generate/ResourceType.txt index c388b11b0f..5723e81564 100644 --- 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 index 51dd474856..0f1b55c096 100644 --- a/hal/src/generated/main/java/edu/wpi/first/hal/FRCNetComm.java +++ b/hal/src/generated/main/java/edu/wpi/first/hal/FRCNetComm.java @@ -267,6 +267,10 @@ public final class FRCNetComm { public static final int kResourceType_Koors40 = 122; /** kResourceType_ThriftyNova = 123. */ public static final int kResourceType_ThriftyNova = 123; + /** kResourceType_PWFSEN36005 = 124. */ + public static final int kResourceType_PWFSEN36005 = 124; + /** kResourceType_LaserShark = 125. */ + public static final int kResourceType_LaserShark = 125; } /** diff --git a/hal/src/generated/main/native/include/hal/FRCUsageReporting.h b/hal/src/generated/main/native/include/hal/FRCUsageReporting.h index 11fb9a334f..fa702d0b58 100644 --- a/hal/src/generated/main/native/include/hal/FRCUsageReporting.h +++ b/hal/src/generated/main/native/include/hal/FRCUsageReporting.h @@ -175,6 +175,8 @@ namespace HALUsageReporting { kResourceType_PathWeaverTrajectory = 121, kResourceType_Koors40 = 122, kResourceType_ThriftyNova = 123, + kResourceType_PWFSEN36005 = 124, + kResourceType_LaserShark = 125, }; enum tInstances : int32_t { kLanguage_LabVIEW = 1, diff --git a/hal/src/generated/main/native/include/hal/UsageReporting.h b/hal/src/generated/main/native/include/hal/UsageReporting.h index 01a32d389f..2c37cfbe61 100644 --- a/hal/src/generated/main/native/include/hal/UsageReporting.h +++ b/hal/src/generated/main/native/include/hal/UsageReporting.h @@ -144,6 +144,8 @@ typedef enum kResourceType_PathWeaverTrajectory = 121, kResourceType_Koors40 = 122, kResourceType_ThriftyNova = 123, + kResourceType_PWFSEN36005 = 124, + kResourceType_LaserShark = 125, // kResourceType_MaximumID = 255, } tResourceType;