Skip to content

Commit 1dd11eb

Browse files
jfabellerajfabellera
authored
Merge pull request #16 from REVrobotics/update-2024
Update for FRC 2024
2 parents 6780536 + 952c104 commit 1dd11eb

File tree

7 files changed

+41
-32
lines changed

7 files changed

+41
-32
lines changed

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

Lines changed: 11 additions & 10 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="20008000">
2+
<Project Type="Project" LVVersion="23008000">
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>
@@ -21,6 +21,7 @@
2121
<Item Name="vi.lib" Type="Folder">
2222
<Item Name="Error Cluster From Error Code.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Error Cluster From Error Code.vi"/>
2323
<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"/>
2425
<Item Name="Trim Whitespace.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Trim Whitespace.vi"/>
2526
<Item Name="whitespace.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/whitespace.ctl"/>
2627
<Item Name="WPI_GetSetVariantRefNum.vi" Type="VI" URL="/&lt;vilib&gt;/Rock Robotics/WPI/Utilities/WPI_GetSetVariantRefNum.vi"/>
@@ -40,7 +41,7 @@
4041
</Property>
4142
<Property Name="NIPKG_installerBuiltBefore" Type="Bool">true</Property>
4243
<Property Name="NIPKG_installerDestination" Type="Path">/C/Users/Public/Documents/REV2m-LabVIEW/builds/Installer</Property>
43-
<Property Name="NIPKG_lastBuiltPackage" Type="Str">2m-distance-sensor_2023.0.4-0_windows_all.nipkg</Property>
44+
<Property Name="NIPKG_lastBuiltPackage" Type="Str">2m-distance-sensor_2024.0.4-0_windows_all.nipkg</Property>
4445
<Property Name="NIPKG_license" Type="Ref"></Property>
4546
<Property Name="NIPKG_packageVersion" Type="Bool">false</Property>
4647
<Property Name="NIPKG_releaseNotes" Type="Str"></Property>
@@ -55,10 +56,10 @@
5556
<Property Name="PKG_dependencies[0].Enhanced" Type="Bool">false</Property>
5657
<Property Name="PKG_dependencies[0].MaxVersion" Type="Str"></Property>
5758
<Property Name="PKG_dependencies[0].MaxVersionInclusive" Type="Bool">false</Property>
58-
<Property Name="PKG_dependencies[0].MinVersion" Type="Str">20.1.1.49157-0+f5</Property>
59+
<Property Name="PKG_dependencies[0].MinVersion" Type="Str">23.3.0.49272-0+f120</Property>
5960
<Property Name="PKG_dependencies[0].MinVersionType" Type="Str">Inclusive</Property>
6061
<Property Name="PKG_dependencies[0].NIPKG.DisplayName" Type="Str">LabVIEW Runtime (32-bit)</Property>
61-
<Property Name="PKG_dependencies[0].Package.Name" Type="Str">ni-labview-2020-runtime-engine-x86</Property>
62+
<Property Name="PKG_dependencies[0].Package.Name" Type="Str">ni-labview-2023-runtime-engine-x86</Property>
6263
<Property Name="PKG_dependencies[0].Package.Section" Type="Str">Programming Environments</Property>
6364
<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>
6465
<Property Name="PKG_dependencies[0].Relationship" Type="Str">Required Dependency</Property>
@@ -86,7 +87,7 @@
8687
<Property Name="PKG_destinations[4].Subdir.Parent" Type="Str">{FF584A78-43CB-4A2A-9DB3-1A0A38B1237E}</Property>
8788
<Property Name="PKG_destinations[4].Type" Type="Str">Subdir</Property>
8889
<Property Name="PKG_destinations[5].ID" Type="Str">{FF584A78-43CB-4A2A-9DB3-1A0A38B1237E}</Property>
89-
<Property Name="PKG_destinations[5].Subdir.Directory" Type="Str">LabVIEW 2020</Property>
90+
<Property Name="PKG_destinations[5].Subdir.Directory" Type="Str">LabVIEW 2023</Property>
9091
<Property Name="PKG_destinations[5].Subdir.Parent" Type="Str">{38A4886A-36D8-4C1E-B228-E1694D7B510D}</Property>
9192
<Property Name="PKG_destinations[5].Type" Type="Str">Subdir</Property>
9293
<Property Name="PKG_displayName" Type="Str">REV 2m Distance Sensor</Property>
@@ -106,7 +107,7 @@
106107
<Property Name="PKG_sources[0].ID" Type="Ref">/My Computer/Build Specifications/WPILib Third-Party</Property>
107108
<Property Name="PKG_sources[0].Type" Type="Str">Build</Property>
108109
<Property Name="PKG_synopsis" Type="Str">REV 2m Distance Sensor LabVIEW API</Property>
109-
<Property Name="PKG_version" Type="Str">2023.0.4</Property>
110+
<Property Name="PKG_version" Type="Str">2024.0.4</Property>
110111
</Item>
111112
<Item Name="WPILib Third-Party" Type="Source Distribution">
112113
<Property Name="Bld_buildCacheID" Type="Str">{7C52C9E8-1805-4972-9778-4F7F5AEE00E3}</Property>
@@ -115,8 +116,8 @@
115116
<Property Name="Bld_excludedDirectory[0].pathType" Type="Str">relativeToAppDir</Property>
116117
<Property Name="Bld_excludedDirectory[1]" Type="Path">resource/objmgr</Property>
117118
<Property Name="Bld_excludedDirectory[1].pathType" Type="Str">relativeToAppDir</Property>
118-
<Property Name="Bld_excludedDirectory[2]" Type="Path">/C/ProgramData/National Instruments/InstCache/20.0</Property>
119-
<Property Name="Bld_excludedDirectory[3]" Type="Path">/C/Users/jan-felix.abellera_r/Documents/LabVIEW Data/2020(32-bit)/ExtraVILib</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>
120121
<Property Name="Bld_excludedDirectory[4]" Type="Path">instr.lib</Property>
121122
<Property Name="Bld_excludedDirectory[4].pathType" Type="Str">relativeToAppDir</Property>
122123
<Property Name="Bld_excludedDirectory[5]" Type="Path">user.lib</Property>
@@ -125,7 +126,7 @@
125126
<Property Name="Bld_localDestDir" Type="Path">/C/Users/Public/Documents/REV2m-LabVIEW/WPILib/ThirdParty</Property>
126127
<Property Name="Bld_previewCacheID" Type="Str">{BD7521DF-B566-4760-9656-AE8025F6DCEB}</Property>
127128
<Property Name="Bld_removeVIObj" Type="Int">1</Property>
128-
<Property Name="Bld_version.major" Type="Int">2023</Property>
129+
<Property Name="Bld_version.major" Type="Int">2024</Property>
129130
<Property Name="Bld_version.patch" Type="Int">4</Property>
130131
<Property Name="Destination[0].destName" Type="Str">Destination Directory</Property>
131132
<Property Name="Destination[0].path" Type="Path">/C/Users/Public/Documents/REV2m-LabVIEW/WPILib/ThirdParty</Property>
@@ -150,7 +151,7 @@
150151
<Property Name="Destination[6].path" Type="Path">/C/Users/Public/Documents/REV2m-LabVIEW/WPILib/ThirdParty/REV Robotics/NI_AB_PROJECTNAME</Property>
151152
<Property Name="Destination[6].path.type" Type="Str">&lt;none&gt;</Property>
152153
<Property Name="DestinationCount" Type="Int">7</Property>
153-
<Property Name="Source[0].itemID" Type="Str">{4615F417-8426-414B-90F8-57237D012F6D}</Property>
154+
<Property Name="Source[0].itemID" Type="Str">{D5C36313-3364-4D5F-9F59-1895B940C622}</Property>
154155
<Property Name="Source[0].type" Type="Str">Container</Property>
155156
<Property Name="Source[1].Container.applyDestination" Type="Bool">true</Property>
156157
<Property Name="Source[1].Container.applyInclusion" Type="Bool">true</Property>

‎LabVIEW/2m Distance Sensor/DistanceSensorDriver.lvlib

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

‎README.md

Lines changed: 4 additions & 4 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\2023\vendordeps
9-
* Mac/Linux: ~/wpilib/2023/vendordeps
8+
* Windows: C:\Users\Public\wpilib\2024\vendordeps
9+
* Mac/Linux: ~/wpilib/2024/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\2023\maven
13-
* Mac/Linux: ~/wpilib/2023/maven
12+
* Windows: C:\Users\Public\wpilib\2024\maven
13+
* Mac/Linux: ~/wpilib/2024/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.

‎Source/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ plugins {
22
id 'cpp'
33
id 'java'
44
id 'edu.wpi.first.wpilib.repositories.WPILibRepositoriesPlugin' version '2020.2'
5-
id 'edu.wpi.first.NativeUtils' version '2023.11.1'
6-
id 'edu.wpi.first.GradleJni' version '1.0.0'
7-
id 'edu.wpi.first.GradleVsCode' version '1.3.0'
5+
id 'edu.wpi.first.NativeUtils' version '2024.6.1'
6+
id 'edu.wpi.first.GradleJni' version '1.1.0'
7+
id 'edu.wpi.first.GradleVsCode' version '2.1.0'
88
id 'google-test-test-suite'
99
id "org.sonarqube" version "2.7"
1010
}

‎Source/config.gradle

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ nativeUtils.withCrossRoboRIO()
66
nativeUtils {
77
wpi {
88
configureDependencies {
9-
wpiVersion = "2023.+"
10-
wpimathVersion = "2023.+"
11-
niLibVersion = "2023.3.0"
12-
opencvVersion = "4.6.0-2"
13-
googleTestVersion = "1.11.0-3"
9+
wpiVersion = "2024.+"
10+
opencvYear = "frc2024"
11+
googleTestYear = "frc2024"
12+
niLibVersion = "2024.2.1"
13+
opencvVersion = "4.8.0-2"
14+
googleTestVersion = "1.14.0-1"
1415
}
1516
}
1617
}

‎Source/dependencies.gradle

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
dependencies {
2-
implementation 'edu.wpi.first.cscore:cscore-java:2023.+'
3-
implementation 'edu.wpi.first.cameraserver:cameraserver-java:2023.+'
4-
implementation 'edu.wpi.first.ntcore:ntcore-java:2023.+'
5-
implementation 'edu.wpi.first.wpilibj:wpilibj-java:2023.+'
6-
implementation 'edu.wpi.first.wpiutil:wpiutil-java:2023.+'
7-
implementation 'edu.wpi.first.hal:hal-java:2023.+'
8-
implementation 'edu.wpi.first.thirdparty.frc2023.opencv:opencv-java:4.6.0-2'
2+
implementation 'edu.wpi.first.cscore:cscore-java:2024.+'
3+
implementation 'edu.wpi.first.cameraserver:cameraserver-java:2024.+'
4+
implementation 'edu.wpi.first.ntcore:ntcore-java:2024.+'
5+
implementation 'edu.wpi.first.wpilibj:wpilibj-java:2024.+'
6+
implementation 'edu.wpi.first.wpiutil:wpiutil-java:2024.+'
7+
implementation 'edu.wpi.first.wpimath:wpimath-java:2024.+'
8+
implementation 'edu.wpi.first.wpiunits:wpiunits-java:2024.+'
9+
implementation 'edu.wpi.first.hal:hal-java:2024.+'
10+
implementation "org.ejml:ejml-simple:0.43.1"
11+
implementation "com.fasterxml.jackson.core:jackson-annotations:2.12.4"
12+
implementation "com.fasterxml.jackson.core:jackson-core:2.12.4"
13+
implementation "com.fasterxml.jackson.core:jackson-databind:2.12.4"
14+
implementation 'edu.wpi.first.thirdparty.frc2024.opencv:opencv-java:4.8.0-2'
915
testImplementation(platform('org.junit:junit-bom:5.7.0'))
1016
testImplementation('org.junit.jupiter:junit-jupiter')
1117
}

‎Source/vendordeps/REV2mDistanceSensor.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"fileName": "REV2mDistanceSensor.json",
33
"name": "REV2mDistanceSensor",
44
"version": "0.4.0",
5+
"frcYear": "2024",
56
"uuid": "9e352acd-4eec-40f7-8490-3357b5ed65ae",
67
"mavenUrls": [
78
"https://www.revrobotics.com/content/sw/max/sdk/maven/"

0 commit comments

Comments
 (0)