Skip to content

Commit 92f4cf9

Browse files
jfabellerajfabellera
authored
Merge pull request #21 from REVrobotics/2026
Update for 2026
2 parents d7ae1b9 + bb51de6 commit 92f4cf9

13 files changed

Lines changed: 61 additions & 71 deletions

‎LabVIEW/2m Distance Sensor/2m Distance Sensor.lvproj‎

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version='1.0' encoding='UTF-8'?>
2-
<Project Type="Project" LVVersion="23008000">
2+
<Project Type="Project" LVVersion="25008000">
33
<Item Name="My Computer" Type="My Computer">
44
<Property Name="server.app.propertiesEnabled" Type="Bool">true</Property>
55
<Property Name="server.control.propertiesEnabled" Type="Bool">true</Property>
@@ -17,18 +17,7 @@
1717
<Property Name="NI.DISK" Type="Bool">true</Property>
1818
</Item>
1919
<Item Name="DistanceSensorDriver.lvlib" Type="Library" URL="../DistanceSensorDriver.lvlib"/>
20-
<Item Name="Dependencies" Type="Dependencies">
21-
<Item Name="vi.lib" Type="Folder">
22-
<Item Name="Error Cluster From Error Code.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Error Cluster From Error Code.vi"/>
23-
<Item Name="Refnum Registry Operation.ctl" Type="VI" URL="/&lt;vilib&gt;/Rock Robotics/WPI/Utilities/Refnum Registry Operation.ctl"/>
24-
<Item Name="Trim Whitespace One-Sided.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Trim Whitespace One-Sided.vi"/>
25-
<Item Name="Trim Whitespace.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Trim Whitespace.vi"/>
26-
<Item Name="whitespace.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/whitespace.ctl"/>
27-
<Item Name="WPI_GetSetVariantRefNum.vi" Type="VI" URL="/&lt;vilib&gt;/Rock Robotics/WPI/Utilities/WPI_GetSetVariantRefNum.vi"/>
28-
<Item Name="WPI_UtilitiesERRGetRefNum.vi" Type="VI" URL="/&lt;vilib&gt;/Rock Robotics/WPI/Utilities/WPI_UtilitiesERRGetRefNum.vi"/>
29-
<Item Name="WPI_UtilitiesFRC Build Error.vi" Type="VI" URL="/&lt;vilib&gt;/Rock Robotics/WPI/Utilities/WPI_UtilitiesFRC Build Error.vi"/>
30-
</Item>
31-
</Item>
20+
<Item Name="Dependencies" Type="Dependencies"/>
3221
<Item Name="Build Specifications" Type="Build">
3322
<Item Name="2m Distance Sensor Package" Type="{E661DAE2-7517-431F-AC41-30807A3BDA38}">
3423
<Property Name="NIPKG_addToFeed" Type="Bool">true</Property>
@@ -41,7 +30,7 @@
4130
</Property>
4231
<Property Name="NIPKG_installerBuiltBefore" Type="Bool">true</Property>
4332
<Property Name="NIPKG_installerDestination" Type="Path">/C/Users/Public/Documents/REV2m-LabVIEW/builds/Installer</Property>
44-
<Property Name="NIPKG_lastBuiltPackage" Type="Str">2m-distance-sensor_2025.0.0-0_windows_all.nipkg</Property>
33+
<Property Name="NIPKG_lastBuiltPackage" Type="Str">2m-distance-sensor_2026.0.0-0_windows_all.nipkg</Property>
4534
<Property Name="NIPKG_license" Type="Ref"></Property>
4635
<Property Name="NIPKG_packageVersion" Type="Bool">false</Property>
4736
<Property Name="NIPKG_releaseNotes" Type="Str"></Property>
@@ -56,10 +45,10 @@
5645
<Property Name="PKG_dependencies[0].Enhanced" Type="Bool">false</Property>
5746
<Property Name="PKG_dependencies[0].MaxVersion" Type="Str"></Property>
5847
<Property Name="PKG_dependencies[0].MaxVersionInclusive" Type="Bool">false</Property>
59-
<Property Name="PKG_dependencies[0].MinVersion" Type="Str">23.3.5.49154-0+f2</Property>
48+
<Property Name="PKG_dependencies[0].MinVersion" Type="Str">25.3.3.49167-0+f15</Property>
6049
<Property Name="PKG_dependencies[0].MinVersionType" Type="Str">Inclusive</Property>
6150
<Property Name="PKG_dependencies[0].NIPKG.DisplayName" Type="Str">LabVIEW Runtime (32-bit)</Property>
62-
<Property Name="PKG_dependencies[0].Package.Name" Type="Str">ni-labview-2023-runtime-engine-x86</Property>
51+
<Property Name="PKG_dependencies[0].Package.Name" Type="Str">ni-labview-2025-runtime-engine-x86</Property>
6352
<Property Name="PKG_dependencies[0].Package.Section" Type="Str">Programming Environments</Property>
6453
<Property Name="PKG_dependencies[0].Package.Synopsis" Type="Str">The LabVIEW Runtime is a software add-on that enables engineers to run executables on a nondevelopment machine.</Property>
6554
<Property Name="PKG_dependencies[0].Relationship" Type="Str">Required Dependency</Property>
@@ -87,7 +76,7 @@
8776
<Property Name="PKG_destinations[4].Subdir.Parent" Type="Str">{FF584A78-43CB-4A2A-9DB3-1A0A38B1237E}</Property>
8877
<Property Name="PKG_destinations[4].Type" Type="Str">Subdir</Property>
8978
<Property Name="PKG_destinations[5].ID" Type="Str">{FF584A78-43CB-4A2A-9DB3-1A0A38B1237E}</Property>
90-
<Property Name="PKG_destinations[5].Subdir.Directory" Type="Str">LabVIEW 2023</Property>
79+
<Property Name="PKG_destinations[5].Subdir.Directory" Type="Str">LabVIEW 2025</Property>
9180
<Property Name="PKG_destinations[5].Subdir.Parent" Type="Str">{38A4886A-36D8-4C1E-B228-E1694D7B510D}</Property>
9281
<Property Name="PKG_destinations[5].Type" Type="Str">Subdir</Property>
9382
<Property Name="PKG_displayName" Type="Str">REV 2m Distance Sensor</Property>
@@ -107,7 +96,7 @@
10796
<Property Name="PKG_sources[0].ID" Type="Ref">/My Computer/Build Specifications/WPILib Third-Party</Property>
10897
<Property Name="PKG_sources[0].Type" Type="Str">Build</Property>
10998
<Property Name="PKG_synopsis" Type="Str">REV 2m Distance Sensor LabVIEW API</Property>
110-
<Property Name="PKG_version" Type="Str">2025.0.0</Property>
99+
<Property Name="PKG_version" Type="Str">2026.0.0</Property>
111100
</Item>
112101
<Item Name="WPILib Third-Party" Type="Source Distribution">
113102
<Property Name="Bld_buildCacheID" Type="Str">{7C52C9E8-1805-4972-9778-4F7F5AEE00E3}</Property>
@@ -116,8 +105,8 @@
116105
<Property Name="Bld_excludedDirectory[0].pathType" Type="Str">relativeToAppDir</Property>
117106
<Property Name="Bld_excludedDirectory[1]" Type="Path">resource/objmgr</Property>
118107
<Property Name="Bld_excludedDirectory[1].pathType" Type="Str">relativeToAppDir</Property>
119-
<Property Name="Bld_excludedDirectory[2]" Type="Path">/C/ProgramData/National Instruments/InstCache/23.0</Property>
120-
<Property Name="Bld_excludedDirectory[3]" Type="Path">/C/Users/jan-felix.abellera_r/Documents/LabVIEW Data/2023(32-bit)/ExtraVILib</Property>
108+
<Property Name="Bld_excludedDirectory[2]" Type="Path">/C/ProgramData/National Instruments/InstCache/25.0</Property>
109+
<Property Name="Bld_excludedDirectory[3]" Type="Path">/C/Users/Jan-Felix Abellera/Documents/LabVIEW Data/2025(32-bit)/ExtraVILib</Property>
121110
<Property Name="Bld_excludedDirectory[4]" Type="Path">instr.lib</Property>
122111
<Property Name="Bld_excludedDirectory[4].pathType" Type="Str">relativeToAppDir</Property>
123112
<Property Name="Bld_excludedDirectory[5]" Type="Path">user.lib</Property>
@@ -126,7 +115,7 @@
126115
<Property Name="Bld_localDestDir" Type="Path">/C/Users/Public/Documents/REV2m-LabVIEW/WPILib/ThirdParty</Property>
127116
<Property Name="Bld_previewCacheID" Type="Str">{BD7521DF-B566-4760-9656-AE8025F6DCEB}</Property>
128117
<Property Name="Bld_removeVIObj" Type="Int">1</Property>
129-
<Property Name="Bld_version.major" Type="Int">2025</Property>
118+
<Property Name="Bld_version.major" Type="Int">2026</Property>
130119
<Property Name="Destination[0].destName" Type="Str">Destination Directory</Property>
131120
<Property Name="Destination[0].path" Type="Path">/C/Users/Public/Documents/REV2m-LabVIEW/WPILib/ThirdParty</Property>
132121
<Property Name="Destination[0].path.type" Type="Str">&lt;none&gt;</Property>
@@ -150,7 +139,7 @@
150139
<Property Name="Destination[6].path" Type="Path">/C/Users/Public/Documents/REV2m-LabVIEW/WPILib/ThirdParty/REV Robotics/NI_AB_PROJECTNAME</Property>
151140
<Property Name="Destination[6].path.type" Type="Str">&lt;none&gt;</Property>
152141
<Property Name="DestinationCount" Type="Int">7</Property>
153-
<Property Name="Source[0].itemID" Type="Str">{DC5DF021-9B2F-4FF5-8781-0A6280263A68}</Property>
142+
<Property Name="Source[0].itemID" Type="Str">{0986E4C0-19BE-4A6D-B1F0-F2301E8EE982}</Property>
154143
<Property Name="Source[0].type" Type="Str">Container</Property>
155144
<Property Name="Source[1].Container.applyDestination" Type="Bool">true</Property>
156145
<Property Name="Source[1].Container.applyInclusion" Type="Bool">true</Property>

‎LabVIEW/2m Distance Sensor/DistanceSensorDriver.lvlib‎

Lines changed: 5 additions & 5 deletions
Large diffs are not rendered by default.

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ roboRIO library for the [REV Robotics 2M Distance Sensor](http://www.revrobotics
55
Download the latest `REV-2m-Distance-Sensor-roboRIO-SDK-[version].zip` from the [release](https://github.com/REVrobotics/2m-Distance-Sensor/releases) tab and unzip it.
66

77
Inside `REV-2m-Distance-Sensor-roboRIO-SDK-[version]` there will be vendordeps and maven folders. Copy the file `REV2mDistanceSensor.json` under vendordeps to the frc vendordeps folder on your machine. It is typically located in the following places:
8-
* Windows: C:\Users\Public\wpilib\2025\vendordeps
9-
* Mac/Linux: ~/wpilib/2025/vendordeps
8+
* Windows: C:\Users\Public\wpilib\2026\vendordeps
9+
* Mac/Linux: ~/wpilib/2026/vendordeps
1010

1111
Next, merge the maven folder with the frc maven folder on your machine, typically located at:
12-
* Windows: C:\Users\Public\wpilib\2025\maven
13-
* Mac/Linux: ~/wpilib/2025/maven
12+
* Windows: C:\Users\Public\wpilib\2026\maven
13+
* Mac/Linux: ~/wpilib/2026/maven
1414

1515
In order to use these libraries in your robot code, open a project in VsCode.
1616
* Press `Ctrl-Shift-P` to open the WPI commands window.
@@ -21,7 +21,7 @@ In order to use these libraries in your robot code, open a project in VsCode.
2121
The REV2mDistance sensor library can now be used in your code.
2222

2323
## Installing For LabVIEW
24-
Download the `rev-2m-distance-sensor_1.0.0-0_windows_x64.nipkg` installer under the releases tab. Simply run the installer and you will have access to REV2mDistanceSensor functions in your projects.
24+
Download the `rev-2m-distance-sensor_X.X.X-X_windows_x64.nipkg` installer under the releases tab. Simply run the installer and you will have access to REV2mDistanceSensor functions in your projects.
2525

2626
## Examples
2727
Examples for this library can be found in the `Examples` folder for both C++ and Java.

‎Source/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
id 'cpp'
33
id 'java'
44
id 'edu.wpi.first.wpilib.repositories.WPILibRepositoriesPlugin' version '2025.0'
5-
id 'edu.wpi.first.NativeUtils' version '2025.9.0'
5+
id 'edu.wpi.first.NativeUtils' version '2026.0.1'
66
id 'edu.wpi.first.GradleJni' version '1.1.0'
77
id 'edu.wpi.first.GradleVsCode' version '2.1.0'
88
id 'google-test-test-suite'
@@ -93,5 +93,5 @@ javadoc {
9393
apply from: 'publish.gradle'
9494

9595
wrapper {
96-
gradleVersion = '8.11'
96+
gradleVersion = '8.14.3'
9797
}

‎Source/build_and_publish_locally.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -e
33

44
LIB=DistanceSensor
5-
BUILD_YEAR=2025
5+
BUILD_YEAR=2026
66
VENDOR_GENERATED_DIR=./vendordeps/*
77
BUILD_REPO_DIR=./build/repos
88
RELEASE_DIR=$BUILD_REPO_DIR/releases/com/revrobotics/frc

‎Source/config.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ nativeUtils.withCrossRoboRIO()
66
nativeUtils {
77
wpi {
88
configureDependencies {
9-
wpiVersion = "2025.+"
9+
wpiVersion = "2026.+"
1010
opencvYear = "frc2025"
11-
niLibVersion = "2025.0.0"
11+
niLibVersion = "2026.1.2"
1212
opencvVersion = "4.10.0-2"
1313
wpimathVersion = "2024.+"
1414
googleTestYear = "frc2024"

‎Source/dependencies.gradle‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
dependencies {
2-
implementation 'edu.wpi.first.cscore:cscore-java:2025.+'
3-
implementation 'edu.wpi.first.cameraserver:cameraserver-java:2025.+'
4-
implementation 'edu.wpi.first.ntcore:ntcore-java:2025.+'
5-
implementation 'edu.wpi.first.wpilibj:wpilibj-java:2025.+'
6-
implementation 'edu.wpi.first.wpiutil:wpiutil-java:2025.+'
7-
implementation 'edu.wpi.first.wpimath:wpimath-java:2025.+'
8-
implementation 'edu.wpi.first.wpiunits:wpiunits-java:2025.+'
9-
implementation 'edu.wpi.first.hal:hal-java:2025.+'
2+
implementation 'edu.wpi.first.cscore:cscore-java:2026.+'
3+
implementation 'edu.wpi.first.cameraserver:cameraserver-java:2026.+'
4+
implementation 'edu.wpi.first.ntcore:ntcore-java:2026.+'
5+
implementation 'edu.wpi.first.wpilibj:wpilibj-java:2026.+'
6+
implementation 'edu.wpi.first.wpiutil:wpiutil-java:2026.+'
7+
implementation 'edu.wpi.first.wpimath:wpimath-java:2026.+'
8+
implementation 'edu.wpi.first.wpiunits:wpiunits-java:2026.+'
9+
implementation 'edu.wpi.first.hal:hal-java:2026.+'
1010
implementation "org.ejml:ejml-simple:0.43.1"
1111
implementation "com.fasterxml.jackson.core:jackson-annotations:2.12.4"
1212
implementation "com.fasterxml.jackson.core:jackson-core:2.12.4"

‎Source/gradle/wrapper/gradle-wrapper.jar‎

181 Bytes
Binary file not shown.

‎Source/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎Source/gradlew‎

Lines changed: 4 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)