Update to 2019 image 4

wpilibsuite · Oct 5, 2018 · 063574f · 063574f
1 parent aaee580
commit 063574f
Show file tree

Hide file tree

Showing 18 changed files with 4 additions and 4 deletions.
diff --git a/FileLocations.txt b/FileLocations.txt
@@ -1,10 +1,8 @@
 libFRC_NetworkCommunication.so - \usr\local\frc\lib
-libi2c.so - \usr\local\frc\lib
 libNiFpga.so - \usr\local\natinst\lib
 libNiFpgaLv.so - \usr\local\natinst\lib
 libniriodevenum.so - \usr\local\natinst\lib
 libniriosession.so - \usr\local\natinst\lib
 libNiRioSrv.so - \usr\local\natinst\lib
 libRoboRIO_FRC_ChipObject.so - \usr\local\frc\lib
-libspi.so - \usr\local\frc\lib
 libvisa.so - \usr\local\vxipnp\linux\lib\
diff --git a/build.gradle b/build.gradle
@@ -29,7 +29,7 @@ ext.addTaskToCopyAllOutputs = { task ->
     copyAllOutputs.from task.archivePath
 }
 
-def pubVersion = '2018.17.1'
+def pubVersion = '2019.4.1'
 
 def baseArtifactId = 'chipobject'
 def artifactGroupId = 'edu.wpi.first.ni-libraries'

diff --git a/src/include/FRC_NetworkCommunication/FRCComm.h b/src/include/FRC_NetworkCommunication/FRCComm.h
@@ -141,6 +141,7 @@ extern "C" {
 	int EXPORT_FUNC setNewDataOccurRef(uint32_t refnum);
 
 	int EXPORT_FUNC FRC_NetworkCommunication_getControlWord(struct ControlWord_t *controlWord);
+	int EXPORT_FUNC FRC_NetworkCommunication_getWatchdogActive(void);
 	int EXPORT_FUNC FRC_NetworkCommunication_getAllianceStation(enum AllianceStationID_t *allianceStation);
 	int EXPORT_FUNC FRC_NetworkCommunication_getMatchInfo(char *eventName, enum MatchType_t *matchType, uint16_t *matchNumber, uint8_t *replayNumber,
 		uint8_t *gameSpecificMessage, uint16_t *gameSpecificMessageSize);

diff --git a/src/include/FRC_NetworkCommunication/UsageReporting.h b/src/include/FRC_NetworkCommunication/UsageReporting.h
@@ -1,3 +1,4 @@
+
 #ifndef __UsageReporting_h__
 #define __UsageReporting_h__
 
@@ -161,7 +162,7 @@ namespace nUsageReporting
 
     /**
      * Report the usage of a resource of interest.
-     *
+     * 
      * @param resource one of the values in the tResourceType above (max value 51).
      * @param instanceNumber an index that identifies the resource instance.
      * @param context an optional additional context number for some cases (such as module number).  Set to 0 to omit.

diff --git a/src/lib/chipobject/libFRC_NetworkCommunication.so.18.0.0 b/src/lib/chipobject/libFRC_NetworkCommunication.so.18.0.0
diff --git a/src/lib/chipobject/libNiFpga.so.17.0.0 b/src/lib/chipobject/libNiFpga.so.17.0.0
diff --git a/src/lib/chipobject/libNiFpga.so.18.0.0 b/src/lib/chipobject/libNiFpga.so.18.0.0
diff --git a/src/lib/chipobject/libNiFpgaLv.so.17.0.0 b/src/lib/chipobject/libNiFpgaLv.so.17.0.0
diff --git a/src/lib/chipobject/libNiFpgaLv.so.18.0.0 b/src/lib/chipobject/libNiFpgaLv.so.18.0.0
diff --git a/src/lib/chipobject/libNiRioSrv.so.17.0.0 b/src/lib/chipobject/libNiRioSrv.so.17.0.0
diff --git a/src/lib/chipobject/libNiRioSrv.so.18.0.0 b/src/lib/chipobject/libNiRioSrv.so.18.0.0
diff --git a/...tcomm/libRoboRIO_FRC_ChipObject.so.18.0.0 → ...bject/libRoboRIO_FRC_ChipObject.so.19.0.0 b/...tcomm/libRoboRIO_FRC_ChipObject.so.18.0.0 → ...bject/libRoboRIO_FRC_ChipObject.so.19.0.0
diff --git a/src/lib/chipobject/libniriodevenum.so.17.0.0 b/src/lib/chipobject/libniriodevenum.so.17.0.0
diff --git a/src/lib/chipobject/libniriodevenum.so.18.0.0 b/src/lib/chipobject/libniriodevenum.so.18.0.0
diff --git a/src/lib/chipobject/libniriosession.so.17.0.0 b/src/lib/chipobject/libniriosession.so.17.0.0
diff --git a/src/lib/chipobject/libniriosession.so.18.0.0 b/src/lib/chipobject/libniriosession.so.18.0.0
diff --git a/src/lib/chipobject/libvisa.so b/src/lib/chipobject/libvisa.so
diff --git a/src/lib/netcomm/libFRC_NetworkCommunication.so.19.0.0 b/src/lib/netcomm/libFRC_NetworkCommunication.so.19.0.0