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
33 changes: 11 additions & 22 deletions LabVIEW/2m Distance Sensor/2m Distance Sensor.lvproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<Project Type="Project" LVVersion="23008000">
<Project Type="Project" LVVersion="25008000">
<Item Name="My Computer" Type="My Computer">
<Property Name="server.app.propertiesEnabled" Type="Bool">true</Property>
<Property Name="server.control.propertiesEnabled" Type="Bool">true</Property>
Expand All @@ -17,18 +17,7 @@
<Property Name="NI.DISK" Type="Bool">true</Property>
</Item>
<Item Name="DistanceSensorDriver.lvlib" Type="Library" URL="../DistanceSensorDriver.lvlib"/>
<Item Name="Dependencies" Type="Dependencies">
<Item Name="vi.lib" Type="Folder">
<Item Name="Error Cluster From Error Code.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Error Cluster From Error Code.vi"/>
<Item Name="Refnum Registry Operation.ctl" Type="VI" URL="/&lt;vilib&gt;/Rock Robotics/WPI/Utilities/Refnum Registry Operation.ctl"/>
<Item Name="Trim Whitespace One-Sided.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Trim Whitespace One-Sided.vi"/>
<Item Name="Trim Whitespace.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Trim Whitespace.vi"/>
<Item Name="whitespace.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/whitespace.ctl"/>
<Item Name="WPI_GetSetVariantRefNum.vi" Type="VI" URL="/&lt;vilib&gt;/Rock Robotics/WPI/Utilities/WPI_GetSetVariantRefNum.vi"/>
<Item Name="WPI_UtilitiesERRGetRefNum.vi" Type="VI" URL="/&lt;vilib&gt;/Rock Robotics/WPI/Utilities/WPI_UtilitiesERRGetRefNum.vi"/>
<Item Name="WPI_UtilitiesFRC Build Error.vi" Type="VI" URL="/&lt;vilib&gt;/Rock Robotics/WPI/Utilities/WPI_UtilitiesFRC Build Error.vi"/>
</Item>
</Item>
<Item Name="Dependencies" Type="Dependencies"/>
<Item Name="Build Specifications" Type="Build">
<Item Name="2m Distance Sensor Package" Type="{E661DAE2-7517-431F-AC41-30807A3BDA38}">
<Property Name="NIPKG_addToFeed" Type="Bool">true</Property>
Expand All @@ -41,7 +30,7 @@
</Property>
<Property Name="NIPKG_installerBuiltBefore" Type="Bool">true</Property>
<Property Name="NIPKG_installerDestination" Type="Path">/C/Users/Public/Documents/REV2m-LabVIEW/builds/Installer</Property>
<Property Name="NIPKG_lastBuiltPackage" Type="Str">2m-distance-sensor_2025.0.0-0_windows_all.nipkg</Property>
<Property Name="NIPKG_lastBuiltPackage" Type="Str">2m-distance-sensor_2026.0.0-0_windows_all.nipkg</Property>
<Property Name="NIPKG_license" Type="Ref"></Property>
<Property Name="NIPKG_packageVersion" Type="Bool">false</Property>
<Property Name="NIPKG_releaseNotes" Type="Str"></Property>
Expand All @@ -56,10 +45,10 @@
<Property Name="PKG_dependencies[0].Enhanced" Type="Bool">false</Property>
<Property Name="PKG_dependencies[0].MaxVersion" Type="Str"></Property>
<Property Name="PKG_dependencies[0].MaxVersionInclusive" Type="Bool">false</Property>
<Property Name="PKG_dependencies[0].MinVersion" Type="Str">23.3.5.49154-0+f2</Property>
<Property Name="PKG_dependencies[0].MinVersion" Type="Str">25.3.3.49167-0+f15</Property>
<Property Name="PKG_dependencies[0].MinVersionType" Type="Str">Inclusive</Property>
<Property Name="PKG_dependencies[0].NIPKG.DisplayName" Type="Str">LabVIEW Runtime (32-bit)</Property>
<Property Name="PKG_dependencies[0].Package.Name" Type="Str">ni-labview-2023-runtime-engine-x86</Property>
<Property Name="PKG_dependencies[0].Package.Name" Type="Str">ni-labview-2025-runtime-engine-x86</Property>
<Property Name="PKG_dependencies[0].Package.Section" Type="Str">Programming Environments</Property>
<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>
<Property Name="PKG_dependencies[0].Relationship" Type="Str">Required Dependency</Property>
Expand Down Expand Up @@ -87,7 +76,7 @@
<Property Name="PKG_destinations[4].Subdir.Parent" Type="Str">{FF584A78-43CB-4A2A-9DB3-1A0A38B1237E}</Property>
<Property Name="PKG_destinations[4].Type" Type="Str">Subdir</Property>
<Property Name="PKG_destinations[5].ID" Type="Str">{FF584A78-43CB-4A2A-9DB3-1A0A38B1237E}</Property>
<Property Name="PKG_destinations[5].Subdir.Directory" Type="Str">LabVIEW 2023</Property>
<Property Name="PKG_destinations[5].Subdir.Directory" Type="Str">LabVIEW 2025</Property>
<Property Name="PKG_destinations[5].Subdir.Parent" Type="Str">{38A4886A-36D8-4C1E-B228-E1694D7B510D}</Property>
<Property Name="PKG_destinations[5].Type" Type="Str">Subdir</Property>
<Property Name="PKG_displayName" Type="Str">REV 2m Distance Sensor</Property>
Expand All @@ -107,7 +96,7 @@
<Property Name="PKG_sources[0].ID" Type="Ref">/My Computer/Build Specifications/WPILib Third-Party</Property>
<Property Name="PKG_sources[0].Type" Type="Str">Build</Property>
<Property Name="PKG_synopsis" Type="Str">REV 2m Distance Sensor LabVIEW API</Property>
<Property Name="PKG_version" Type="Str">2025.0.0</Property>
<Property Name="PKG_version" Type="Str">2026.0.0</Property>
</Item>
<Item Name="WPILib Third-Party" Type="Source Distribution">
<Property Name="Bld_buildCacheID" Type="Str">{7C52C9E8-1805-4972-9778-4F7F5AEE00E3}</Property>
Expand All @@ -116,8 +105,8 @@
<Property Name="Bld_excludedDirectory[0].pathType" Type="Str">relativeToAppDir</Property>
<Property Name="Bld_excludedDirectory[1]" Type="Path">resource/objmgr</Property>
<Property Name="Bld_excludedDirectory[1].pathType" Type="Str">relativeToAppDir</Property>
<Property Name="Bld_excludedDirectory[2]" Type="Path">/C/ProgramData/National Instruments/InstCache/23.0</Property>
<Property Name="Bld_excludedDirectory[3]" Type="Path">/C/Users/jan-felix.abellera_r/Documents/LabVIEW Data/2023(32-bit)/ExtraVILib</Property>
<Property Name="Bld_excludedDirectory[2]" Type="Path">/C/ProgramData/National Instruments/InstCache/25.0</Property>
<Property Name="Bld_excludedDirectory[3]" Type="Path">/C/Users/Jan-Felix Abellera/Documents/LabVIEW Data/2025(32-bit)/ExtraVILib</Property>
<Property Name="Bld_excludedDirectory[4]" Type="Path">instr.lib</Property>
<Property Name="Bld_excludedDirectory[4].pathType" Type="Str">relativeToAppDir</Property>
<Property Name="Bld_excludedDirectory[5]" Type="Path">user.lib</Property>
Expand All @@ -126,7 +115,7 @@
<Property Name="Bld_localDestDir" Type="Path">/C/Users/Public/Documents/REV2m-LabVIEW/WPILib/ThirdParty</Property>
<Property Name="Bld_previewCacheID" Type="Str">{BD7521DF-B566-4760-9656-AE8025F6DCEB}</Property>
<Property Name="Bld_removeVIObj" Type="Int">1</Property>
<Property Name="Bld_version.major" Type="Int">2025</Property>
<Property Name="Bld_version.major" Type="Int">2026</Property>
<Property Name="Destination[0].destName" Type="Str">Destination Directory</Property>
<Property Name="Destination[0].path" Type="Path">/C/Users/Public/Documents/REV2m-LabVIEW/WPILib/ThirdParty</Property>
<Property Name="Destination[0].path.type" Type="Str">&lt;none&gt;</Property>
Expand All @@ -150,7 +139,7 @@
<Property Name="Destination[6].path" Type="Path">/C/Users/Public/Documents/REV2m-LabVIEW/WPILib/ThirdParty/REV Robotics/NI_AB_PROJECTNAME</Property>
<Property Name="Destination[6].path.type" Type="Str">&lt;none&gt;</Property>
<Property Name="DestinationCount" Type="Int">7</Property>
<Property Name="Source[0].itemID" Type="Str">{DC5DF021-9B2F-4FF5-8781-0A6280263A68}</Property>
<Property Name="Source[0].itemID" Type="Str">{0986E4C0-19BE-4A6D-B1F0-F2301E8EE982}</Property>
<Property Name="Source[0].type" Type="Str">Container</Property>
<Property Name="Source[1].Container.applyDestination" Type="Bool">true</Property>
<Property Name="Source[1].Container.applyInclusion" Type="Bool">true</Property>
Expand Down
10 changes: 5 additions & 5 deletions LabVIEW/2m Distance Sensor/DistanceSensorDriver.lvlib

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ roboRIO library for the [REV Robotics 2M Distance Sensor](http://www.revrobotics
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.

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:
* Windows: C:\Users\Public\wpilib\2025\vendordeps
* Mac/Linux: ~/wpilib/2025/vendordeps
* Windows: C:\Users\Public\wpilib\2026\vendordeps
* Mac/Linux: ~/wpilib/2026/vendordeps

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

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

## Installing For LabVIEW
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.
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.

## Examples
Examples for this library can be found in the `Examples` folder for both C++ and Java.
4 changes: 2 additions & 2 deletions Source/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins {
id 'cpp'
id 'java'
id 'edu.wpi.first.wpilib.repositories.WPILibRepositoriesPlugin' version '2025.0'
id 'edu.wpi.first.NativeUtils' version '2025.9.0'
id 'edu.wpi.first.NativeUtils' version '2026.0.1'
id 'edu.wpi.first.GradleJni' version '1.1.0'
id 'edu.wpi.first.GradleVsCode' version '2.1.0'
id 'google-test-test-suite'
Expand Down Expand Up @@ -93,5 +93,5 @@ javadoc {
apply from: 'publish.gradle'

wrapper {
gradleVersion = '8.11'
gradleVersion = '8.14.3'
}
2 changes: 1 addition & 1 deletion Source/build_and_publish_locally.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -e

LIB=DistanceSensor
BUILD_YEAR=2025
BUILD_YEAR=2026
VENDOR_GENERATED_DIR=./vendordeps/*
BUILD_REPO_DIR=./build/repos
RELEASE_DIR=$BUILD_REPO_DIR/releases/com/revrobotics/frc
Expand Down
4 changes: 2 additions & 2 deletions Source/config.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ nativeUtils.withCrossRoboRIO()
nativeUtils {
wpi {
configureDependencies {
wpiVersion = "2025.+"
wpiVersion = "2026.+"
opencvYear = "frc2025"
niLibVersion = "2025.0.0"
niLibVersion = "2026.1.2"
opencvVersion = "4.10.0-2"
wpimathVersion = "2024.+"
googleTestYear = "frc2024"
Expand Down
16 changes: 8 additions & 8 deletions Source/dependencies.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
dependencies {
implementation 'edu.wpi.first.cscore:cscore-java:2025.+'
implementation 'edu.wpi.first.cameraserver:cameraserver-java:2025.+'
implementation 'edu.wpi.first.ntcore:ntcore-java:2025.+'
implementation 'edu.wpi.first.wpilibj:wpilibj-java:2025.+'
implementation 'edu.wpi.first.wpiutil:wpiutil-java:2025.+'
implementation 'edu.wpi.first.wpimath:wpimath-java:2025.+'
implementation 'edu.wpi.first.wpiunits:wpiunits-java:2025.+'
implementation 'edu.wpi.first.hal:hal-java:2025.+'
implementation 'edu.wpi.first.cscore:cscore-java:2026.+'
implementation 'edu.wpi.first.cameraserver:cameraserver-java:2026.+'
implementation 'edu.wpi.first.ntcore:ntcore-java:2026.+'
implementation 'edu.wpi.first.wpilibj:wpilibj-java:2026.+'
implementation 'edu.wpi.first.wpiutil:wpiutil-java:2026.+'
implementation 'edu.wpi.first.wpimath:wpimath-java:2026.+'
implementation 'edu.wpi.first.wpiunits:wpiunits-java:2026.+'
implementation 'edu.wpi.first.hal:hal-java:2026.+'
implementation "org.ejml:ejml-simple:0.43.1"
implementation "com.fasterxml.jackson.core:jackson-annotations:2.12.4"
implementation "com.fasterxml.jackson.core:jackson-core:2.12.4"
Expand Down
Binary file modified Source/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion Source/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
9 changes: 4 additions & 5 deletions Source/gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Source/gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 14 additions & 12 deletions Source/publish.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'maven-publish'

ext.licenseFile = files("$rootDir/LICENSE.txt")

def pubVersion = '2025.0.0'
def pubVersion = '2026.0.0'

def outputsFolder = file("$buildDir/allOutputs")

Expand Down Expand Up @@ -126,11 +126,13 @@ task outputJavadocJar(type: Jar, dependsOn: javadoc) {
}

artifacts {
archives sourcesJar
archives javadocJar
archives outputJar
archives outputSourcesJar
archives outputJavadocJar
tasks.named("assemble") {
dependsOn(sourcesJar)
dependsOn(javadocJar)
dependsOn(outputJar)
dependsOn(outputSourcesJar)
dependsOn(outputJavadocJar)
}
}

addTaskToCopyAllOutputs(outputSourcesJar)
Expand Down Expand Up @@ -186,8 +188,8 @@ model {
artifact cppSourceZip

artifactId = "${baseArtifactId}-cpp"
groupId artifactGroupId
version pubVersion
groupId = artifactGroupId
version = pubVersion
}
driver(MavenPublication) {
revDriverTaskList.each {
Expand All @@ -199,8 +201,8 @@ model {
artifact cppHeadersZip

artifactId = "${baseArtifactId}-driver"
groupId artifactGroupId
version pubVersion
groupId = artifactGroupId
version = pubVersion
}

java(MavenPublication) {
Expand All @@ -209,8 +211,8 @@ model {
artifact javadocJar

artifactId = "${baseArtifactId}-java"
groupId artifactGroupId
version pubVersion
groupId = artifactGroupId
version = pubVersion
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions Source/vendordeps/REV2mDistanceSensor.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"fileName": "REV2mDistanceSensor.json",
"name": "REV2mDistanceSensor",
"version": "2025.0.0",
"frcYear": "2025",
"version": "2026.0.0",
"frcYear": "2026",
"uuid": "9e352acd-4eec-40f7-8490-3357b5ed65ae",
"mavenUrls": [
"https://maven.revrobotics.com/"
Expand All @@ -12,14 +12,14 @@
{
"groupId": "com.revrobotics.frc",
"artifactId": "DistanceSensor-java",
"version": "2025.0.0"
"version": "2026.0.0"
}
],
"jniDependencies": [
{
"groupId": "com.revrobotics.frc",
"artifactId": "DistanceSensor-driver",
"version": "2025.0.0",
"version": "2026.0.0",
"skipInvalidPlatforms": true,
"isJar": false,
"validPlatforms": [
Expand All @@ -31,7 +31,7 @@
{
"groupId": "com.revrobotics.frc",
"artifactId": "DistanceSensor-cpp",
"version": "2025.0.0",
"version": "2026.0.0",
"libName": "libDistanceSensor",
"headerClassifier": "headers",
"sharedLibrary": true,
Expand All @@ -43,7 +43,7 @@
{
"groupId": "com.revrobotics.frc",
"artifactId": "DistanceSensor-driver",
"version": "2025.0.0",
"version": "2026.0.0",
"libName": "libDistanceSensorDriver",
"headerClassifier": "headers",
"sharedLibrary": false,
Expand Down