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
2 changes: 1 addition & 1 deletion allowed_images.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2024_v2.*
2025_v2.*
4 changes: 2 additions & 2 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 '2025.3.0'
id 'edu.wpi.first.NativeUtils' version '2025.9.0'
id 'cpp'
id 'c'
}
Expand Down Expand Up @@ -175,7 +175,7 @@ ext.addTaskToCopyAllOutputs = { task ->
copyAllOutputs.from task.archivePath
}

def pubVersion = '2025.0.0'
def pubVersion = '2025.2.0'

def baseArtifactId = 'chipobject'
def artifactGroupId = 'edu.wpi.first.ni-libraries'
Expand Down
9 changes: 9 additions & 0 deletions src/include/FRC_NetworkCommunication/UsageReporting.h
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,15 @@ typedef enum
kResourceType_Redux_future5,
kResourceType_RevSparkFlexCAN,
kResourceType_RevSparkFlexPWM,
kResourceType_WPIlib_future1,
kResourceType_WPIlib_future2,
kResourceType_WPIlib_future3,
kResourceType_WPIlib_future4,
kResourceType_WPIlib_future5, // 120
kResourceType_WPIlib_future6,
kResourceType_WPIlib_future7,
kResourceType_WPIlib_future8,
kResourceType_Rev_ServoHub,

// kResourceType_MaximumID = 255,
} tResourceType;
Expand Down
Binary file modified src/lib/chipobject/libRoboRIO_FRC_ChipObject.so.25.0.0
Binary file not shown.
Binary file modified src/lib/netcomm/libFRC_NetworkCommunication.so.25.0.0
Binary file not shown.
Loading