diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/RoboRIO_FRC_ChipObject_Aliases.h b/ni-libraries/include/FRC_FPGA_ChipObject/RoboRIO_FRC_ChipObject_Aliases.h
index afe6e49af8..4fb250be84 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/RoboRIO_FRC_ChipObject_Aliases.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/RoboRIO_FRC_ChipObject_Aliases.h
@@ -4,6 +4,6 @@
 #ifndef __RoboRIO_FRC_ChipObject_Aliases_h__
 #define __RoboRIO_FRC_ChipObject_Aliases_h__
 
-#define nRoboRIO_FPGANamespace nFRC_2018_18_0_4
+#define nRoboRIO_FPGANamespace nFRC_2018_18_0_5
 
 #endif // __RoboRIO_FRC_ChipObject_Aliases_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/nInterfaceGlobals.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/nInterfaceGlobals.h
index 06d8e3fbe2..9e80569f4b 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/nInterfaceGlobals.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/nInterfaceGlobals.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2018_18_0_4_nInterfaceGlobals_h__
-#define __nFRC_2018_18_0_4_nInterfaceGlobals_h__
+#ifndef __nFRC_2018_18_0_5_nInterfaceGlobals_h__
+#define __nFRC_2018_18_0_5_nInterfaceGlobals_h__
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_4
+namespace nFRC_2018_18_0_5
 {
    extern unsigned int g_currentTargetClass;
 }
 }
 
-#endif // __nFRC_2018_18_0_4_nInterfaceGlobals_h__
+#endif // __nFRC_2018_18_0_5_nInterfaceGlobals_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAI.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAI.h
index 8248e89fda..60bc28504f 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAI.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAI.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2018_18_0_4_AI_h__
-#define __nFRC_2018_18_0_4_AI_h__
+#ifndef __nFRC_2018_18_0_5_AI_h__
+#define __nFRC_2018_18_0_5_AI_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_4
+namespace nFRC_2018_18_0_5
 {
 
 class tAI
@@ -141,4 +141,4 @@ private:
 }
 }
 
-#endif // __nFRC_2018_18_0_4_AI_h__
+#endif // __nFRC_2018_18_0_5_AI_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAO.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAO.h
index 5ed4f5acef..162fa97788 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAO.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAO.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2018_18_0_4_AO_h__
-#define __nFRC_2018_18_0_4_AO_h__
+#ifndef __nFRC_2018_18_0_5_AO_h__
+#define __nFRC_2018_18_0_5_AO_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_4
+namespace nFRC_2018_18_0_5
 {
 
 class tAO
@@ -48,4 +48,4 @@ private:
 }
 }
 
-#endif // __nFRC_2018_18_0_4_AO_h__
+#endif // __nFRC_2018_18_0_5_AO_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccel.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccel.h
index 76de2b7e4b..deaed2a107 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccel.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccel.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2018_18_0_4_Accel_h__
-#define __nFRC_2018_18_0_4_Accel_h__
+#ifndef __nFRC_2018_18_0_5_Accel_h__
+#define __nFRC_2018_18_0_5_Accel_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_4
+namespace nFRC_2018_18_0_5
 {
 
 class tAccel
@@ -100,4 +100,4 @@ private:
 }
 }
 
-#endif // __nFRC_2018_18_0_4_Accel_h__
+#endif // __nFRC_2018_18_0_5_Accel_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccumulator.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccumulator.h
index aed3b827b1..1c109ccabd 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccumulator.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccumulator.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2018_18_0_4_Accumulator_h__
-#define __nFRC_2018_18_0_4_Accumulator_h__
+#ifndef __nFRC_2018_18_0_5_Accumulator_h__
+#define __nFRC_2018_18_0_5_Accumulator_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_4
+namespace nFRC_2018_18_0_5
 {
 
 class tAccumulator
@@ -85,4 +85,4 @@ private:
 }
 }
 
-#endif // __nFRC_2018_18_0_4_Accumulator_h__
+#endif // __nFRC_2018_18_0_5_Accumulator_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAlarm.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAlarm.h
index 927090e40c..4fba4e158b 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAlarm.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAlarm.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2018_18_0_4_Alarm_h__
-#define __nFRC_2018_18_0_4_Alarm_h__
+#ifndef __nFRC_2018_18_0_5_Alarm_h__
+#define __nFRC_2018_18_0_5_Alarm_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_4
+namespace nFRC_2018_18_0_5
 {
 
 class tAlarm
@@ -55,4 +55,4 @@ private:
 }
 }
 
-#endif // __nFRC_2018_18_0_4_Alarm_h__
+#endif // __nFRC_2018_18_0_5_Alarm_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAnalogTrigger.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAnalogTrigger.h
index c1da2e5f05..f63001a451 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAnalogTrigger.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAnalogTrigger.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2018_18_0_4_AnalogTrigger_h__
-#define __nFRC_2018_18_0_4_AnalogTrigger_h__
+#ifndef __nFRC_2018_18_0_5_AnalogTrigger_h__
+#define __nFRC_2018_18_0_5_AnalogTrigger_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_4
+namespace nFRC_2018_18_0_5
 {
 
 class tAnalogTrigger
@@ -127,4 +127,4 @@ private:
 }
 }
 
-#endif // __nFRC_2018_18_0_4_AnalogTrigger_h__
+#endif // __nFRC_2018_18_0_5_AnalogTrigger_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tBIST.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tBIST.h
index 72118daadb..f2c0b1368f 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tBIST.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tBIST.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2018_18_0_4_BIST_h__
-#define __nFRC_2018_18_0_4_BIST_h__
+#ifndef __nFRC_2018_18_0_5_BIST_h__
+#define __nFRC_2018_18_0_5_BIST_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_4
+namespace nFRC_2018_18_0_5
 {
 
 class tBIST
@@ -88,4 +88,4 @@ private:
 }
 }
 
-#endif // __nFRC_2018_18_0_4_BIST_h__
+#endif // __nFRC_2018_18_0_5_BIST_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tCounter.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tCounter.h
index 80b10a4f75..a5e7986be0 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tCounter.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tCounter.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2018_18_0_4_Counter_h__
-#define __nFRC_2018_18_0_4_Counter_h__
+#ifndef __nFRC_2018_18_0_5_Counter_h__
+#define __nFRC_2018_18_0_5_Counter_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_4
+namespace nFRC_2018_18_0_5
 {
 
 class tCounter
@@ -217,4 +217,4 @@ private:
 }
 }
 
-#endif // __nFRC_2018_18_0_4_Counter_h__
+#endif // __nFRC_2018_18_0_5_Counter_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDIO.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDIO.h
index 908b8288a0..6b01329936 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDIO.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDIO.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2018_18_0_4_DIO_h__
-#define __nFRC_2018_18_0_4_DIO_h__
+#ifndef __nFRC_2018_18_0_5_DIO_h__
+#define __nFRC_2018_18_0_5_DIO_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_4
+namespace nFRC_2018_18_0_5
 {
 
 class tDIO
@@ -261,4 +261,4 @@ private:
 }
 }
 
-#endif // __nFRC_2018_18_0_4_DIO_h__
+#endif // __nFRC_2018_18_0_5_DIO_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDMA.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDMA.h
index 0937eec5b8..f6c52e25bd 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDMA.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDMA.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2018_18_0_4_DMA_h__
-#define __nFRC_2018_18_0_4_DMA_h__
+#ifndef __nFRC_2018_18_0_5_DMA_h__
+#define __nFRC_2018_18_0_5_DMA_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_4
+namespace nFRC_2018_18_0_5
 {
 
 class tDMA
@@ -195,4 +195,4 @@ private:
 }
 }
 
-#endif // __nFRC_2018_18_0_4_DMA_h__
+#endif // __nFRC_2018_18_0_5_DMA_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tEncoder.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tEncoder.h
index 342919f375..f94b137c2b 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tEncoder.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tEncoder.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2018_18_0_4_Encoder_h__
-#define __nFRC_2018_18_0_4_Encoder_h__
+#ifndef __nFRC_2018_18_0_5_Encoder_h__
+#define __nFRC_2018_18_0_5_Encoder_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_4
+namespace nFRC_2018_18_0_5
 {
 
 class tEncoder
@@ -197,4 +197,4 @@ private:
 }
 }
 
-#endif // __nFRC_2018_18_0_4_Encoder_h__
+#endif // __nFRC_2018_18_0_5_Encoder_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tGlobal.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tGlobal.h
index b0001c8991..62487cf8e8 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tGlobal.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tGlobal.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2018_18_0_4_Global_h__
-#define __nFRC_2018_18_0_4_Global_h__
+#ifndef __nFRC_2018_18_0_5_Global_h__
+#define __nFRC_2018_18_0_5_Global_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_4
+namespace nFRC_2018_18_0_5
 {
 
 class tGlobal
@@ -105,4 +105,4 @@ private:
 }
 }
 
-#endif // __nFRC_2018_18_0_4_Global_h__
+#endif // __nFRC_2018_18_0_5_Global_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tHMB.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tHMB.h
index 4ed125ee6d..9c7fdf9fb2 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tHMB.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tHMB.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2018_18_0_4_HMB_h__
-#define __nFRC_2018_18_0_4_HMB_h__
+#ifndef __nFRC_2018_18_0_5_HMB_h__
+#define __nFRC_2018_18_0_5_HMB_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_4
+namespace nFRC_2018_18_0_5
 {
 
 class tHMB
@@ -146,4 +146,4 @@ private:
 }
 }
 
-#endif // __nFRC_2018_18_0_4_HMB_h__
+#endif // __nFRC_2018_18_0_5_HMB_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tInterrupt.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tInterrupt.h
index 61fa48f1f7..bc60649c8f 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tInterrupt.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tInterrupt.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2018_18_0_4_Interrupt_h__
-#define __nFRC_2018_18_0_4_Interrupt_h__
+#ifndef __nFRC_2018_18_0_5_Interrupt_h__
+#define __nFRC_2018_18_0_5_Interrupt_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_4
+namespace nFRC_2018_18_0_5
 {
 
 class tInterrupt
@@ -98,4 +98,4 @@ private:
 }
 }
 
-#endif // __nFRC_2018_18_0_4_Interrupt_h__
+#endif // __nFRC_2018_18_0_5_Interrupt_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPWM.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPWM.h
index 8ee7077196..a574ef4b2e 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPWM.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPWM.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2018_18_0_4_PWM_h__
-#define __nFRC_2018_18_0_4_PWM_h__
+#ifndef __nFRC_2018_18_0_5_PWM_h__
+#define __nFRC_2018_18_0_5_PWM_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_4
+namespace nFRC_2018_18_0_5
 {
 
 class tPWM
@@ -132,4 +132,4 @@ private:
 }
 }
 
-#endif // __nFRC_2018_18_0_4_PWM_h__
+#endif // __nFRC_2018_18_0_5_PWM_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPower.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPower.h
index d246760ba4..ad98114caa 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPower.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPower.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2018_18_0_4_Power_h__
-#define __nFRC_2018_18_0_4_Power_h__
+#ifndef __nFRC_2018_18_0_5_Power_h__
+#define __nFRC_2018_18_0_5_Power_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_4
+namespace nFRC_2018_18_0_5
 {
 
 class tPower
@@ -218,4 +218,4 @@ private:
 }
 }
 
-#endif // __nFRC_2018_18_0_4_Power_h__
+#endif // __nFRC_2018_18_0_5_Power_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tRelay.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tRelay.h
index 9af739f7c6..d3c4645232 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tRelay.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tRelay.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2018_18_0_4_Relay_h__
-#define __nFRC_2018_18_0_4_Relay_h__
+#ifndef __nFRC_2018_18_0_5_Relay_h__
+#define __nFRC_2018_18_0_5_Relay_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_4
+namespace nFRC_2018_18_0_5
 {
 
 class tRelay
@@ -66,4 +66,4 @@ private:
 }
 }
 
-#endif // __nFRC_2018_18_0_4_Relay_h__
+#endif // __nFRC_2018_18_0_5_Relay_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSPI.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSPI.h
index db627a379e..d3ac454380 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSPI.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSPI.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2018_18_0_4_SPI_h__
-#define __nFRC_2018_18_0_4_SPI_h__
+#ifndef __nFRC_2018_18_0_5_SPI_h__
+#define __nFRC_2018_18_0_5_SPI_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_4
+namespace nFRC_2018_18_0_5
 {
 
 class tSPI
@@ -35,7 +35,9 @@ public:
          unsigned ExternalClockSource_AnalogTrigger : 1;
          unsigned RisingEdge : 1;
          unsigned FallingEdge : 1;
+         unsigned ExternalClock : 1;
 #else
+         unsigned ExternalClock : 1;
          unsigned FallingEdge : 1;
          unsigned RisingEdge : 1;
          unsigned ExternalClockSource_AnalogTrigger : 1;
@@ -44,7 +46,7 @@ public:
 #endif
       };
       struct{
-         unsigned value : 8;
+         unsigned value : 9;
       };
    } tAutoTriggerConfig;
    typedef
@@ -89,12 +91,14 @@ public:
    virtual void writeAutoTriggerConfig_ExternalClockSource_AnalogTrigger(bool value, tRioStatusCode *status) = 0;
    virtual void writeAutoTriggerConfig_RisingEdge(bool value, tRioStatusCode *status) = 0;
    virtual void writeAutoTriggerConfig_FallingEdge(bool value, tRioStatusCode *status) = 0;
+   virtual void writeAutoTriggerConfig_ExternalClock(bool value, tRioStatusCode *status) = 0;
    virtual tAutoTriggerConfig readAutoTriggerConfig(tRioStatusCode *status) = 0;
    virtual unsigned char readAutoTriggerConfig_ExternalClockSource_Channel(tRioStatusCode *status) = 0;
    virtual unsigned char readAutoTriggerConfig_ExternalClockSource_Module(tRioStatusCode *status) = 0;
    virtual bool readAutoTriggerConfig_ExternalClockSource_AnalogTrigger(tRioStatusCode *status) = 0;
    virtual bool readAutoTriggerConfig_RisingEdge(tRioStatusCode *status) = 0;
    virtual bool readAutoTriggerConfig_FallingEdge(tRioStatusCode *status) = 0;
+   virtual bool readAutoTriggerConfig_ExternalClock(tRioStatusCode *status) = 0;
 
 
    typedef enum
@@ -105,13 +109,6 @@ public:
    virtual unsigned char readAutoChipSelect(tRioStatusCode *status) = 0;
 
 
-   typedef enum
-   {
-   } tAutoForceGo_IfaceConstants;
-
-   virtual void strobeAutoForceGo(tRioStatusCode *status) = 0;
-
-
    typedef enum
    {
    } tDebugRevision_IfaceConstants;
@@ -156,6 +153,14 @@ public:
    virtual unsigned char readDebugSubstate(tRioStatusCode *status) = 0;
 
 
+   typedef enum
+   {
+   } tAutoRate_IfaceConstants;
+
+   virtual void writeAutoRate(unsigned int value, tRioStatusCode *status) = 0;
+   virtual unsigned int readAutoRate(tRioStatusCode *status) = 0;
+
+
    typedef enum
    {
    } tEnableDIO_IfaceConstants;
@@ -176,6 +181,13 @@ public:
    virtual unsigned char readChipSelectActiveHigh_MXP(tRioStatusCode *status) = 0;
 
 
+   typedef enum
+   {
+   } tAutoForceOne_IfaceConstants;
+
+   virtual void strobeAutoForceOne(tRioStatusCode *status) = 0;
+
+
 
 
    typedef enum
@@ -196,4 +208,4 @@ private:
 }
 }
 
-#endif // __nFRC_2018_18_0_4_SPI_h__
+#endif // __nFRC_2018_18_0_5_SPI_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSysWatchdog.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSysWatchdog.h
index 15e3623145..cd2f1adc8d 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSysWatchdog.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSysWatchdog.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2018_18_0_4_SysWatchdog_h__
-#define __nFRC_2018_18_0_4_SysWatchdog_h__
+#ifndef __nFRC_2018_18_0_5_SysWatchdog_h__
+#define __nFRC_2018_18_0_5_SysWatchdog_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_4
+namespace nFRC_2018_18_0_5
 {
 
 class tSysWatchdog
@@ -106,4 +106,4 @@ private:
 }
 }
 
-#endif // __nFRC_2018_18_0_4_SysWatchdog_h__
+#endif // __nFRC_2018_18_0_5_SysWatchdog_h__
diff --git a/ni-libraries/include/FRC_NetworkCommunication/FRCComm.h b/ni-libraries/include/FRC_NetworkCommunication/FRCComm.h
index 13b875bd03..27220cb6aa 100644
--- a/ni-libraries/include/FRC_NetworkCommunication/FRCComm.h
+++ b/ni-libraries/include/FRC_NetworkCommunication/FRCComm.h
@@ -142,7 +142,7 @@ extern "C" {
 
 	int EXPORT_FUNC FRC_NetworkCommunication_getControlWord(struct ControlWord_t *controlWord);
 	int EXPORT_FUNC FRC_NetworkCommunication_getAllianceStation(enum AllianceStationID_t *allianceStation);
-	int EXPORT_FUNC FRC_NetworkCommunication_getMatchInfo(char *eventName, MatchType_t *matchType, uint16_t *matchNumber, uint8_t *replayNumber,
+	int EXPORT_FUNC FRC_NetworkCommunication_getMatchInfo(char *eventName, enum MatchType_t *matchType, uint16_t *matchNumber, uint8_t *replayNumber,
 		uint8_t *gameSpecificMessage, uint16_t *gameSpecificMessageSize);
 	int EXPORT_FUNC FRC_NetworkCommunication_getMatchTime(float *matchTime);
 	int EXPORT_FUNC FRC_NetworkCommunication_getJoystickAxes(uint8_t joystickNum, struct JoystickAxes_t *axes, uint8_t maxAxes);
diff --git a/ni-libraries/include/FRC_NetworkCommunication/NetCommRPCProxy_Occur.h b/ni-libraries/include/FRC_NetworkCommunication/NetCommRPCProxy_Occur.h
new file mode 100644
index 0000000000..bfb44fc9cd
--- /dev/null
+++ b/ni-libraries/include/FRC_NetworkCommunication/NetCommRPCProxy_Occur.h
@@ -0,0 +1,11 @@
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void NetCommRPCProxy_SetOccurFuncPointer(void (*Occur)(uint32_t));
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/ni-libraries/lib/libFRC_NetworkCommunication.so.18.0.0 b/ni-libraries/lib/libFRC_NetworkCommunication.so.18.0.0
index 1873d7dae7..af1ced9d8d 100644
Binary files a/ni-libraries/lib/libFRC_NetworkCommunication.so.18.0.0 and b/ni-libraries/lib/libFRC_NetworkCommunication.so.18.0.0 differ
diff --git a/ni-libraries/lib/libRoboRIO_FRC_ChipObject.so.18.0.0 b/ni-libraries/lib/libRoboRIO_FRC_ChipObject.so.18.0.0
index 18aabd1407..d6dd99cd01 100644
Binary files a/ni-libraries/lib/libRoboRIO_FRC_ChipObject.so.18.0.0 and b/ni-libraries/lib/libRoboRIO_FRC_ChipObject.so.18.0.0 differ