Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
build:
name: Build
runs-on: ubuntu-latest
container: wpilib/roborio-cross-ubuntu:2023-22.04
container: wpilib/roborio-cross-ubuntu:2024-22.04
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -16,8 +16,8 @@ jobs:

- uses: actions/setup-java@v4
with:
java-version: 11
distribution: 'zulu'
distribution: 'temurin'
java-version: 17

- name: Publish
run: |
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
id 'base'
id 'maven-publish'
id "com.jfrog.artifactory" version "4.29.3"
id 'edu.wpi.first.NativeUtils' version '2023.10.0'
id 'edu.wpi.first.NativeUtils' version '2025.3.0'
id 'cpp'
id 'c'
}
Expand Down Expand Up @@ -85,8 +85,8 @@ class FileDependencySet implements NativeDependencySet {
}

def netCommDependencySet = new FileDependencySet(project.files(
'src/lib/netcomm/libFRC_NetworkCommunication.so.24.0.0',
'src/lib/chipobject/libRoboRIO_FRC_ChipObject.so.24.0.0',
'src/lib/netcomm/libFRC_NetworkCommunication.so.25.0.0',
'src/lib/chipobject/libRoboRIO_FRC_ChipObject.so.25.0.0',
'src/lib/visa/libvisa.so.23.3.0'),
project.files())

Expand Down Expand Up @@ -175,7 +175,7 @@ ext.addTaskToCopyAllOutputs = { task ->
copyAllOutputs.from task.archivePath
}

def pubVersion = '2024.2.1'
def pubVersion = '2025.0.0'

def baseArtifactId = 'chipobject'
def artifactGroupId = 'edu.wpi.first.ni-libraries'
Expand Down
2 changes: 2 additions & 0 deletions src/include/FRC_NetworkCommunication/UsageReporting.h
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@ typedef enum
kResourceType_Redux_future5,
kResourceType_RevSparkFlexCAN,
kResourceType_RevSparkFlexPWM,

// kResourceType_MaximumID = 255,
} tResourceType;

typedef enum
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading