diff --git a/hal/src/main/native/include/HAL/UsageReporting.h b/hal/src/main/native/include/HAL/UsageReporting.h
index 8d447aee06..aaa7d8df81 100644
--- a/hal/src/main/native/include/HAL/UsageReporting.h
+++ b/hal/src/main/native/include/HAL/UsageReporting.h
@@ -83,6 +83,14 @@ namespace nUsageReporting
         kResourceType_PCM, // 60
         kResourceType_PigeonIMU,
         kResourceType_NidecBrushless,
+        kResourceType_CANifier,
+        kResourceType_CTRE_future0,
+        kResourceType_CTRE_future1,
+        kResourceType_CTRE_future2,
+        kResourceType_CTRE_future3,
+        kResourceType_CTRE_future4,
+        kResourceType_CTRE_future5,
+        kResourceType_CTRE_future6, // 70
     } tResourceType;
 
     typedef enum
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 4fb250be84..3a01107b82 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_5
+#define nRoboRIO_FPGANamespace nFRC_2018_18_0_7
 
 #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 9e80569f4b..9c909d15e4 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,18 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2018_18_0_5_nInterfaceGlobals_h__
-#define __nFRC_2018_18_0_5_nInterfaceGlobals_h__
+#ifndef __nFRC_2018_18_0_7_nInterfaceGlobals_h__
+#define __nFRC_2018_18_0_7_nInterfaceGlobals_h__
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_5
+namespace nFRC_2018_18_0_7
 {
    extern unsigned int g_currentTargetClass;
+
+   static const int g_SpiAutoData_index = 0;
+   static const int g_DMA_index = 1;
 }
 }
 
-#endif // __nFRC_2018_18_0_5_nInterfaceGlobals_h__
+#endif // __nFRC_2018_18_0_7_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 60bc28504f..d5ef518e6f 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_5_AI_h__
-#define __nFRC_2018_18_0_5_AI_h__
+#ifndef __nFRC_2018_18_0_7_AI_h__
+#define __nFRC_2018_18_0_7_AI_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_5
+namespace nFRC_2018_18_0_7
 {
 
 class tAI
@@ -141,4 +141,4 @@ private:
 }
 }
 
-#endif // __nFRC_2018_18_0_5_AI_h__
+#endif // __nFRC_2018_18_0_7_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 162fa97788..68ebb09c86 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_5_AO_h__
-#define __nFRC_2018_18_0_5_AO_h__
+#ifndef __nFRC_2018_18_0_7_AO_h__
+#define __nFRC_2018_18_0_7_AO_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_5
+namespace nFRC_2018_18_0_7
 {
 
 class tAO
@@ -48,4 +48,4 @@ private:
 }
 }
 
-#endif // __nFRC_2018_18_0_5_AO_h__
+#endif // __nFRC_2018_18_0_7_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 deaed2a107..b9542db39b 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_5_Accel_h__
-#define __nFRC_2018_18_0_5_Accel_h__
+#ifndef __nFRC_2018_18_0_7_Accel_h__
+#define __nFRC_2018_18_0_7_Accel_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_5
+namespace nFRC_2018_18_0_7
 {
 
 class tAccel
@@ -100,4 +100,4 @@ private:
 }
 }
 
-#endif // __nFRC_2018_18_0_5_Accel_h__
+#endif // __nFRC_2018_18_0_7_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 1c109ccabd..c414536cbc 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_5_Accumulator_h__
-#define __nFRC_2018_18_0_5_Accumulator_h__
+#ifndef __nFRC_2018_18_0_7_Accumulator_h__
+#define __nFRC_2018_18_0_7_Accumulator_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_5
+namespace nFRC_2018_18_0_7
 {
 
 class tAccumulator
@@ -85,4 +85,4 @@ private:
 }
 }
 
-#endif // __nFRC_2018_18_0_5_Accumulator_h__
+#endif // __nFRC_2018_18_0_7_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 4fba4e158b..795cfcda4f 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_5_Alarm_h__
-#define __nFRC_2018_18_0_5_Alarm_h__
+#ifndef __nFRC_2018_18_0_7_Alarm_h__
+#define __nFRC_2018_18_0_7_Alarm_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_5
+namespace nFRC_2018_18_0_7
 {
 
 class tAlarm
@@ -55,4 +55,4 @@ private:
 }
 }
 
-#endif // __nFRC_2018_18_0_5_Alarm_h__
+#endif // __nFRC_2018_18_0_7_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 f63001a451..3285feae06 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_5_AnalogTrigger_h__
-#define __nFRC_2018_18_0_5_AnalogTrigger_h__
+#ifndef __nFRC_2018_18_0_7_AnalogTrigger_h__
+#define __nFRC_2018_18_0_7_AnalogTrigger_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_5
+namespace nFRC_2018_18_0_7
 {
 
 class tAnalogTrigger
@@ -127,4 +127,4 @@ private:
 }
 }
 
-#endif // __nFRC_2018_18_0_5_AnalogTrigger_h__
+#endif // __nFRC_2018_18_0_7_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 f2c0b1368f..ae1f2146c3 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_5_BIST_h__
-#define __nFRC_2018_18_0_5_BIST_h__
+#ifndef __nFRC_2018_18_0_7_BIST_h__
+#define __nFRC_2018_18_0_7_BIST_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_5
+namespace nFRC_2018_18_0_7
 {
 
 class tBIST
@@ -88,4 +88,4 @@ private:
 }
 }
 
-#endif // __nFRC_2018_18_0_5_BIST_h__
+#endif // __nFRC_2018_18_0_7_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 a5e7986be0..e9acd189bf 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_5_Counter_h__
-#define __nFRC_2018_18_0_5_Counter_h__
+#ifndef __nFRC_2018_18_0_7_Counter_h__
+#define __nFRC_2018_18_0_7_Counter_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_5
+namespace nFRC_2018_18_0_7
 {
 
 class tCounter
@@ -217,4 +217,4 @@ private:
 }
 }
 
-#endif // __nFRC_2018_18_0_5_Counter_h__
+#endif // __nFRC_2018_18_0_7_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 6b01329936..8d08b062a5 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_5_DIO_h__
-#define __nFRC_2018_18_0_5_DIO_h__
+#ifndef __nFRC_2018_18_0_7_DIO_h__
+#define __nFRC_2018_18_0_7_DIO_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_5
+namespace nFRC_2018_18_0_7
 {
 
 class tDIO
@@ -261,4 +261,4 @@ private:
 }
 }
 
-#endif // __nFRC_2018_18_0_5_DIO_h__
+#endif // __nFRC_2018_18_0_7_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 f6c52e25bd..294e18d30a 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_5_DMA_h__
-#define __nFRC_2018_18_0_5_DMA_h__
+#ifndef __nFRC_2018_18_0_7_DMA_h__
+#define __nFRC_2018_18_0_7_DMA_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_5
+namespace nFRC_2018_18_0_7
 {
 
 class tDMA
@@ -195,4 +195,4 @@ private:
 }
 }
 
-#endif // __nFRC_2018_18_0_5_DMA_h__
+#endif // __nFRC_2018_18_0_7_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 f94b137c2b..0e840868fc 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_5_Encoder_h__
-#define __nFRC_2018_18_0_5_Encoder_h__
+#ifndef __nFRC_2018_18_0_7_Encoder_h__
+#define __nFRC_2018_18_0_7_Encoder_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_5
+namespace nFRC_2018_18_0_7
 {
 
 class tEncoder
@@ -197,4 +197,4 @@ private:
 }
 }
 
-#endif // __nFRC_2018_18_0_5_Encoder_h__
+#endif // __nFRC_2018_18_0_7_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 62487cf8e8..252ed9c14b 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_5_Global_h__
-#define __nFRC_2018_18_0_5_Global_h__
+#ifndef __nFRC_2018_18_0_7_Global_h__
+#define __nFRC_2018_18_0_7_Global_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_5
+namespace nFRC_2018_18_0_7
 {
 
 class tGlobal
@@ -105,4 +105,4 @@ private:
 }
 }
 
-#endif // __nFRC_2018_18_0_5_Global_h__
+#endif // __nFRC_2018_18_0_7_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 9c7fdf9fb2..103955e51d 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_5_HMB_h__
-#define __nFRC_2018_18_0_5_HMB_h__
+#ifndef __nFRC_2018_18_0_7_HMB_h__
+#define __nFRC_2018_18_0_7_HMB_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_5
+namespace nFRC_2018_18_0_7
 {
 
 class tHMB
@@ -146,4 +146,4 @@ private:
 }
 }
 
-#endif // __nFRC_2018_18_0_5_HMB_h__
+#endif // __nFRC_2018_18_0_7_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 bc60649c8f..319e1d32f0 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_5_Interrupt_h__
-#define __nFRC_2018_18_0_5_Interrupt_h__
+#ifndef __nFRC_2018_18_0_7_Interrupt_h__
+#define __nFRC_2018_18_0_7_Interrupt_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_5
+namespace nFRC_2018_18_0_7
 {
 
 class tInterrupt
@@ -98,4 +98,4 @@ private:
 }
 }
 
-#endif // __nFRC_2018_18_0_5_Interrupt_h__
+#endif // __nFRC_2018_18_0_7_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 a574ef4b2e..20e93bb3f0 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_5_PWM_h__
-#define __nFRC_2018_18_0_5_PWM_h__
+#ifndef __nFRC_2018_18_0_7_PWM_h__
+#define __nFRC_2018_18_0_7_PWM_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_5
+namespace nFRC_2018_18_0_7
 {
 
 class tPWM
@@ -132,4 +132,4 @@ private:
 }
 }
 
-#endif // __nFRC_2018_18_0_5_PWM_h__
+#endif // __nFRC_2018_18_0_7_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 ad98114caa..d7a38bdb3f 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_5_Power_h__
-#define __nFRC_2018_18_0_5_Power_h__
+#ifndef __nFRC_2018_18_0_7_Power_h__
+#define __nFRC_2018_18_0_7_Power_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_5
+namespace nFRC_2018_18_0_7
 {
 
 class tPower
@@ -218,4 +218,4 @@ private:
 }
 }
 
-#endif // __nFRC_2018_18_0_5_Power_h__
+#endif // __nFRC_2018_18_0_7_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 d3c4645232..5f55cb8849 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_5_Relay_h__
-#define __nFRC_2018_18_0_5_Relay_h__
+#ifndef __nFRC_2018_18_0_7_Relay_h__
+#define __nFRC_2018_18_0_7_Relay_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_5
+namespace nFRC_2018_18_0_7
 {
 
 class tRelay
@@ -66,4 +66,4 @@ private:
 }
 }
 
-#endif // __nFRC_2018_18_0_5_Relay_h__
+#endif // __nFRC_2018_18_0_7_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 d3ac454380..4d5a5cd7d6 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_5_SPI_h__
-#define __nFRC_2018_18_0_5_SPI_h__
+#ifndef __nFRC_2018_18_0_7_SPI_h__
+#define __nFRC_2018_18_0_7_SPI_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_5
+namespace nFRC_2018_18_0_7
 {
 
 class tSPI
@@ -52,6 +52,21 @@ public:
    typedef
    union{
       struct{
+#ifdef __vxworks
+         unsigned TxByteCount : 4;
+         unsigned ZeroByteCount : 7;
+#else
+         unsigned ZeroByteCount : 7;
+         unsigned TxByteCount : 4;
+#endif
+      };
+      struct{
+         unsigned value : 11;
+      };
+   } tAutoByteCount;
+   typedef
+   union{
+      struct{
 #ifdef __vxworks
          unsigned Hdr : 4;
          unsigned MXP : 1;
@@ -116,12 +131,23 @@ public:
    virtual unsigned int readDebugRevision(tRioStatusCode *status) = 0;
 
 
+   typedef enum
+   {
+   } tTransferSkippedFullCount_IfaceConstants;
+
+   virtual unsigned int readTransferSkippedFullCount(tRioStatusCode *status) = 0;
+
+
    typedef enum
    {
    } tAutoByteCount_IfaceConstants;
 
-   virtual void writeAutoByteCount(unsigned char value, tRioStatusCode *status) = 0;
-   virtual unsigned char readAutoByteCount(tRioStatusCode *status) = 0;
+   virtual void writeAutoByteCount(tAutoByteCount value, tRioStatusCode *status) = 0;
+   virtual void writeAutoByteCount_TxByteCount(unsigned char value, tRioStatusCode *status) = 0;
+   virtual void writeAutoByteCount_ZeroByteCount(unsigned char value, tRioStatusCode *status) = 0;
+   virtual tAutoByteCount readAutoByteCount(tRioStatusCode *status) = 0;
+   virtual unsigned char readAutoByteCount_TxByteCount(tRioStatusCode *status) = 0;
+   virtual unsigned char readAutoByteCount_ZeroByteCount(tRioStatusCode *status) = 0;
 
 
    typedef enum
@@ -208,4 +234,4 @@ private:
 }
 }
 
-#endif // __nFRC_2018_18_0_5_SPI_h__
+#endif // __nFRC_2018_18_0_7_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 cd2f1adc8d..48182422f3 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_5_SysWatchdog_h__
-#define __nFRC_2018_18_0_5_SysWatchdog_h__
+#ifndef __nFRC_2018_18_0_7_SysWatchdog_h__
+#define __nFRC_2018_18_0_7_SysWatchdog_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2018_18_0_5
+namespace nFRC_2018_18_0_7
 {
 
 class tSysWatchdog
@@ -106,4 +106,4 @@ private:
 }
 }
 
-#endif // __nFRC_2018_18_0_5_SysWatchdog_h__
+#endif // __nFRC_2018_18_0_7_SysWatchdog_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/tSystemInterface.h b/ni-libraries/include/FRC_FPGA_ChipObject/tSystemInterface.h
index ee8ca62a73..d5a5e6343a 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/tSystemInterface.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/tSystemInterface.h
@@ -3,6 +3,8 @@
 #ifndef __tSystemInterface_h__
 #define __tSystemInterface_h__
 
+#include "tDMAChannelDescriptor.h"
+
 namespace nFPGA
 {
 
@@ -19,6 +21,7 @@ public:
    virtual uint32_t getLVHandle(tRioStatusCode *status)=0;
    virtual uint32_t getHandle()=0;
    virtual void reset(tRioStatusCode *status)=0;
+   virtual void getDmaDescriptor(int dmaChannelDescriptorIndex, tDMAChannelDescriptor *desc)=0;
 };
 
 }
diff --git a/ni-libraries/lib/libFRC_NetworkCommunication.so.18.0.0 b/ni-libraries/lib/libFRC_NetworkCommunication.so.18.0.0
index af1ced9d8d..2c2bc8ca0c 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 d6dd99cd01..eccd7ac4dd 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