Merge branch 'main' into 2027

This commit is contained in:
Peter Johnson
2024-12-01 17:03:03 -08:00
5 changed files with 11 additions and 1 deletions

View File

@@ -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:

View File

@@ -122,3 +122,5 @@ kResourceType_ChoreoTrigger = 120
kResourceType_PathWeaverTrajectory = 121
kResourceType_Koors40 = 122
kResourceType_ThriftyNova = 123
kResourceType_PWFSEN36005 = 124
kResourceType_LaserShark = 125

View File

@@ -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;
}
/**

View File

@@ -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,

View File

@@ -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;