Skip to content

Commit 4785480

Browse files
committed
Update to image 12
1 parent 14ccbf6 commit 4785480

File tree

4 files changed

+10
-2
lines changed

4 files changed

+10
-2
lines changed

RequiredVersion.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2019_v12

build.gradle

+7-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ext.addTaskToCopyAllOutputs = { task ->
2929
copyAllOutputs.from task.archivePath
3030
}
3131

32-
def pubVersion = '2019.9.3'
32+
def pubVersion = '2019.12.1'
3333

3434
def baseArtifactId = 'chipobject'
3535
def artifactGroupId = 'edu.wpi.first.ni-libraries'
@@ -70,6 +70,9 @@ task libZip(type: Zip) {
7070
from('src/lib/chipobject') {
7171
into '/linux/athena/shared/'
7272
}
73+
from ('RequiredVersion.txt') {
74+
into '/'
75+
}
7376
}
7477

7578
task libZipDebug(type: Zip) {
@@ -80,6 +83,9 @@ task libZipDebug(type: Zip) {
8083
from('src/lib/chipobject') {
8184
into '/linux/athena/shared/'
8285
}
86+
from ('RequiredVersion.txt') {
87+
into '/'
88+
}
8389
}
8490

8591
task headersZip(type: Zip) {

src/include/FRC_NetworkCommunication/UsageReporting.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ namespace nUsageReporting
104104
kResourceType_PWMVictorSPX,
105105
kResourceType_RevSparkMaxPWM,
106106
kResourceType_RevSparkMaxCAN,
107+
kResourceType_ADIS16470,
107108
} tResourceType;
108109

109110
typedef enum
@@ -164,7 +165,7 @@ namespace nUsageReporting
164165

165166
/**
166167
* Report the usage of a resource of interest.
167-
*
168+
*
168169
* @param resource one of the values in the tResourceType above (max value 51).
169170
* @param instanceNumber an index that identifies the resource instance.
170171
* @param context an optional additional context number for some cases (such as module number). Set to 0 to omit.
Binary file not shown.

0 commit comments

Comments
 (0)