diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/RoboRIO_FRC_ChipObject_Aliases.h b/hal/lib/Athena/FRC_FPGA_ChipObject/RoboRIO_FRC_ChipObject_Aliases.h
index f536d2a878..7bae082843 100644
--- a/hal/lib/Athena/FRC_FPGA_ChipObject/RoboRIO_FRC_ChipObject_Aliases.h
+++ b/hal/lib/Athena/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_2015_1_0_9
+#define nRoboRIO_FPGANamespace nFRC_2015_1_0_A
 
 #endif // __RoboRIO_FRC_ChipObject_Aliases_h__
diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nInvariantFPGANamespace/nInterfaceGlobals.h b/hal/lib/Athena/FRC_FPGA_ChipObject/nInvariantFPGANamespace/nInterfaceGlobals.h
new file mode 100644
index 0000000000..abd07d4fcf
--- /dev/null
+++ b/hal/lib/Athena/FRC_FPGA_ChipObject/nInvariantFPGANamespace/nInterfaceGlobals.h
@@ -0,0 +1,15 @@
+// Copyright (c) National Instruments 2008.  All Rights Reserved.
+// Do Not Edit... this file is generated!
+
+#ifndef __nFRC_C0EF_1_1_0_nInterfaceGlobals_h__
+#define __nFRC_C0EF_1_1_0_nInterfaceGlobals_h__
+
+namespace nFPGA
+{
+namespace nFRC_C0EF_1_1_0
+{
+   extern unsigned int g_currentTargetClass;
+}
+}
+
+#endif // __nFRC_C0EF_1_1_0_nInterfaceGlobals_h__
diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/nInterfaceGlobals.h b/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/nInterfaceGlobals.h
index 71272aaba4..9ff5a0ec41 100644
--- a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/nInterfaceGlobals.h
+++ b/hal/lib/Athena/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_2015_1_0_9_nInterfaceGlobals_h__
-#define __nFRC_2015_1_0_9_nInterfaceGlobals_h__
+#ifndef __nFRC_2015_1_0_A_nInterfaceGlobals_h__
+#define __nFRC_2015_1_0_A_nInterfaceGlobals_h__
 
 namespace nFPGA
 {
-namespace nFRC_2015_1_0_9
+namespace nFRC_2015_1_0_A
 {
    extern unsigned int g_currentTargetClass;
 }
 }
 
-#endif // __nFRC_2015_1_0_9_nInterfaceGlobals_h__
+#endif // __nFRC_2015_1_0_A_nInterfaceGlobals_h__
diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAI.h b/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAI.h
index 039155f972..2a8f614314 100644
--- a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAI.h
+++ b/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAI.h
@@ -1,14 +1,14 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2015_1_0_9_AI_h__
-#define __nFRC_2015_1_0_9_AI_h__
+#ifndef __nFRC_2015_1_0_A_AI_h__
+#define __nFRC_2015_1_0_A_AI_h__
 
 #include "tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2015_1_0_9
+namespace nFRC_2015_1_0_A
 {
 
 class tAI
@@ -140,4 +140,4 @@ private:
 }
 }
 
-#endif // __nFRC_2015_1_0_9_AI_h__
+#endif // __nFRC_2015_1_0_A_AI_h__
diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAO.h b/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAO.h
index 674f38c992..7160f040d4 100644
--- a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAO.h
+++ b/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAO.h
@@ -1,14 +1,14 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2015_1_0_9_AO_h__
-#define __nFRC_2015_1_0_9_AO_h__
+#ifndef __nFRC_2015_1_0_A_AO_h__
+#define __nFRC_2015_1_0_A_AO_h__
 
 #include "tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2015_1_0_9
+namespace nFRC_2015_1_0_A
 {
 
 class tAO
@@ -47,4 +47,4 @@ private:
 }
 }
 
-#endif // __nFRC_2015_1_0_9_AO_h__
+#endif // __nFRC_2015_1_0_A_AO_h__
diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccel.h b/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccel.h
index e7fe83bfd0..02318decb0 100644
--- a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccel.h
+++ b/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccel.h
@@ -1,14 +1,14 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2015_1_0_9_Accel_h__
-#define __nFRC_2015_1_0_9_Accel_h__
+#ifndef __nFRC_2015_1_0_A_Accel_h__
+#define __nFRC_2015_1_0_A_Accel_h__
 
 #include "tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2015_1_0_9
+namespace nFRC_2015_1_0_A
 {
 
 class tAccel
@@ -99,4 +99,4 @@ private:
 }
 }
 
-#endif // __nFRC_2015_1_0_9_Accel_h__
+#endif // __nFRC_2015_1_0_A_Accel_h__
diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccumulator.h b/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccumulator.h
index a6d9dc8463..991c5fb20e 100644
--- a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccumulator.h
+++ b/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccumulator.h
@@ -1,14 +1,14 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2015_1_0_9_Accumulator_h__
-#define __nFRC_2015_1_0_9_Accumulator_h__
+#ifndef __nFRC_2015_1_0_A_Accumulator_h__
+#define __nFRC_2015_1_0_A_Accumulator_h__
 
 #include "tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2015_1_0_9
+namespace nFRC_2015_1_0_A
 {
 
 class tAccumulator
@@ -84,4 +84,4 @@ private:
 }
 }
 
-#endif // __nFRC_2015_1_0_9_Accumulator_h__
+#endif // __nFRC_2015_1_0_A_Accumulator_h__
diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAlarm.h b/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAlarm.h
index 8fb2024f2e..8739405a90 100644
--- a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAlarm.h
+++ b/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAlarm.h
@@ -1,14 +1,14 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2015_1_0_9_Alarm_h__
-#define __nFRC_2015_1_0_9_Alarm_h__
+#ifndef __nFRC_2015_1_0_A_Alarm_h__
+#define __nFRC_2015_1_0_A_Alarm_h__
 
 #include "tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2015_1_0_9
+namespace nFRC_2015_1_0_A
 {
 
 class tAlarm
@@ -54,4 +54,4 @@ private:
 }
 }
 
-#endif // __nFRC_2015_1_0_9_Alarm_h__
+#endif // __nFRC_2015_1_0_A_Alarm_h__
diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAnalogTrigger.h b/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAnalogTrigger.h
index c99b7dbd10..6b89bc24ac 100644
--- a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAnalogTrigger.h
+++ b/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAnalogTrigger.h
@@ -1,14 +1,14 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2015_1_0_9_AnalogTrigger_h__
-#define __nFRC_2015_1_0_9_AnalogTrigger_h__
+#ifndef __nFRC_2015_1_0_A_AnalogTrigger_h__
+#define __nFRC_2015_1_0_A_AnalogTrigger_h__
 
 #include "tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2015_1_0_9
+namespace nFRC_2015_1_0_A
 {
 
 class tAnalogTrigger
@@ -126,4 +126,4 @@ private:
 }
 }
 
-#endif // __nFRC_2015_1_0_9_AnalogTrigger_h__
+#endif // __nFRC_2015_1_0_A_AnalogTrigger_h__
diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tBIST.h b/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tBIST.h
index a3e5465e70..41b862670d 100644
--- a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tBIST.h
+++ b/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tBIST.h
@@ -1,14 +1,14 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2015_1_0_9_BIST_h__
-#define __nFRC_2015_1_0_9_BIST_h__
+#ifndef __nFRC_2015_1_0_A_BIST_h__
+#define __nFRC_2015_1_0_A_BIST_h__
 
 #include "tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2015_1_0_9
+namespace nFRC_2015_1_0_A
 {
 
 class tBIST
@@ -87,4 +87,4 @@ private:
 }
 }
 
-#endif // __nFRC_2015_1_0_9_BIST_h__
+#endif // __nFRC_2015_1_0_A_BIST_h__
diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tCounter.h b/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tCounter.h
index a0d6be7338..6eff544625 100644
--- a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tCounter.h
+++ b/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tCounter.h
@@ -1,14 +1,14 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2015_1_0_9_Counter_h__
-#define __nFRC_2015_1_0_9_Counter_h__
+#ifndef __nFRC_2015_1_0_A_Counter_h__
+#define __nFRC_2015_1_0_A_Counter_h__
 
 #include "tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2015_1_0_9
+namespace nFRC_2015_1_0_A
 {
 
 class tCounter
@@ -216,4 +216,4 @@ private:
 }
 }
 
-#endif // __nFRC_2015_1_0_9_Counter_h__
+#endif // __nFRC_2015_1_0_A_Counter_h__
diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDIO.h b/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDIO.h
index 21e420dcf6..0d9659b95d 100644
--- a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDIO.h
+++ b/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDIO.h
@@ -1,14 +1,14 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2015_1_0_9_DIO_h__
-#define __nFRC_2015_1_0_9_DIO_h__
+#ifndef __nFRC_2015_1_0_A_DIO_h__
+#define __nFRC_2015_1_0_A_DIO_h__
 
 #include "tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2015_1_0_9
+namespace nFRC_2015_1_0_A
 {
 
 class tDIO
@@ -245,4 +245,4 @@ private:
 }
 }
 
-#endif // __nFRC_2015_1_0_9_DIO_h__
+#endif // __nFRC_2015_1_0_A_DIO_h__
diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDMA.h b/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDMA.h
index 81d3ce0f31..4b57edf71f 100644
--- a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDMA.h
+++ b/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDMA.h
@@ -1,14 +1,14 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2015_1_0_9_DMA_h__
-#define __nFRC_2015_1_0_9_DMA_h__
+#ifndef __nFRC_2015_1_0_A_DMA_h__
+#define __nFRC_2015_1_0_A_DMA_h__
 
 #include "tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2015_1_0_9
+namespace nFRC_2015_1_0_A
 {
 
 class tDMA
@@ -185,4 +185,4 @@ private:
 }
 }
 
-#endif // __nFRC_2015_1_0_9_DMA_h__
+#endif // __nFRC_2015_1_0_A_DMA_h__
diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tEncoder.h b/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tEncoder.h
index ea9a9c549e..466b9c1b94 100644
--- a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tEncoder.h
+++ b/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tEncoder.h
@@ -1,14 +1,14 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2015_1_0_9_Encoder_h__
-#define __nFRC_2015_1_0_9_Encoder_h__
+#ifndef __nFRC_2015_1_0_A_Encoder_h__
+#define __nFRC_2015_1_0_A_Encoder_h__
 
 #include "tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2015_1_0_9
+namespace nFRC_2015_1_0_A
 {
 
 class tEncoder
@@ -24,7 +24,7 @@ public:
 
    typedef enum
    {
-      kNumSystems = 4,
+      kNumSystems = 8,
    } tIfaceConstants;
 
    typedef
@@ -196,4 +196,4 @@ private:
 }
 }
 
-#endif // __nFRC_2015_1_0_9_Encoder_h__
+#endif // __nFRC_2015_1_0_A_Encoder_h__
diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tGlobal.h b/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tGlobal.h
index a2aee88e60..e2014de9aa 100644
--- a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tGlobal.h
+++ b/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tGlobal.h
@@ -1,14 +1,14 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2015_1_0_9_Global_h__
-#define __nFRC_2015_1_0_9_Global_h__
+#ifndef __nFRC_2015_1_0_A_Global_h__
+#define __nFRC_2015_1_0_A_Global_h__
 
 #include "tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2015_1_0_9
+namespace nFRC_2015_1_0_A
 {
 
 class tGlobal
@@ -101,4 +101,4 @@ private:
 }
 }
 
-#endif // __nFRC_2015_1_0_9_Global_h__
+#endif // __nFRC_2015_1_0_A_Global_h__
diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tInterrupt.h b/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tInterrupt.h
index 1460558501..16233e1ed6 100644
--- a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tInterrupt.h
+++ b/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tInterrupt.h
@@ -1,14 +1,14 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2015_1_0_9_Interrupt_h__
-#define __nFRC_2015_1_0_9_Interrupt_h__
+#ifndef __nFRC_2015_1_0_A_Interrupt_h__
+#define __nFRC_2015_1_0_A_Interrupt_h__
 
 #include "tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2015_1_0_9
+namespace nFRC_2015_1_0_A
 {
 
 class tInterrupt
@@ -97,4 +97,4 @@ private:
 }
 }
 
-#endif // __nFRC_2015_1_0_9_Interrupt_h__
+#endif // __nFRC_2015_1_0_A_Interrupt_h__
diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPWM.h b/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPWM.h
index e7c64deb8c..5dcf5e2ab1 100644
--- a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPWM.h
+++ b/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPWM.h
@@ -1,14 +1,14 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2015_1_0_9_PWM_h__
-#define __nFRC_2015_1_0_9_PWM_h__
+#ifndef __nFRC_2015_1_0_A_PWM_h__
+#define __nFRC_2015_1_0_A_PWM_h__
 
 #include "tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2015_1_0_9
+namespace nFRC_2015_1_0_A
 {
 
 class tPWM
@@ -117,4 +117,4 @@ private:
 }
 }
 
-#endif // __nFRC_2015_1_0_9_PWM_h__
+#endif // __nFRC_2015_1_0_A_PWM_h__
diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPower.h b/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPower.h
index 1de4dd0f1e..6084c66b99 100644
--- a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPower.h
+++ b/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPower.h
@@ -1,14 +1,14 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2015_1_0_9_Power_h__
-#define __nFRC_2015_1_0_9_Power_h__
+#ifndef __nFRC_2015_1_0_A_Power_h__
+#define __nFRC_2015_1_0_A_Power_h__
 
 #include "tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2015_1_0_9
+namespace nFRC_2015_1_0_A
 {
 
 class tPower
@@ -214,4 +214,4 @@ private:
 }
 }
 
-#endif // __nFRC_2015_1_0_9_Power_h__
+#endif // __nFRC_2015_1_0_A_Power_h__
diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tRelay.h b/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tRelay.h
index 5f47c0a5b0..e3f02867d6 100644
--- a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tRelay.h
+++ b/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tRelay.h
@@ -1,14 +1,14 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2015_1_0_9_Relay_h__
-#define __nFRC_2015_1_0_9_Relay_h__
+#ifndef __nFRC_2015_1_0_A_Relay_h__
+#define __nFRC_2015_1_0_A_Relay_h__
 
 #include "tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2015_1_0_9
+namespace nFRC_2015_1_0_A
 {
 
 class tRelay
@@ -65,4 +65,4 @@ private:
 }
 }
 
-#endif // __nFRC_2015_1_0_9_Relay_h__
+#endif // __nFRC_2015_1_0_A_Relay_h__
diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSPI.h b/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSPI.h
index b8478da9e4..93a2b3ea46 100644
--- a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSPI.h
+++ b/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSPI.h
@@ -1,14 +1,14 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2015_1_0_9_SPI_h__
-#define __nFRC_2015_1_0_9_SPI_h__
+#ifndef __nFRC_2015_1_0_A_SPI_h__
+#define __nFRC_2015_1_0_A_SPI_h__
 
 #include "tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2015_1_0_9
+namespace nFRC_2015_1_0_A
 {
 
 class tSPI
@@ -65,4 +65,4 @@ private:
 }
 }
 
-#endif // __nFRC_2015_1_0_9_SPI_h__
+#endif // __nFRC_2015_1_0_A_SPI_h__
diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSysWatchdog.h b/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSysWatchdog.h
index f67a822885..67dcd13ffe 100644
--- a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSysWatchdog.h
+++ b/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSysWatchdog.h
@@ -1,14 +1,14 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2015_1_0_9_SysWatchdog_h__
-#define __nFRC_2015_1_0_9_SysWatchdog_h__
+#ifndef __nFRC_2015_1_0_A_SysWatchdog_h__
+#define __nFRC_2015_1_0_A_SysWatchdog_h__
 
 #include "tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2015_1_0_9
+namespace nFRC_2015_1_0_A
 {
 
 class tSysWatchdog
@@ -105,4 +105,4 @@ private:
 }
 }
 
-#endif // __nFRC_2015_1_0_9_SysWatchdog_h__
+#endif // __nFRC_2015_1_0_A_SysWatchdog_h__
diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/nInterfaceGlobals.h b/hal/lib/Athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/nInterfaceGlobals.h
new file mode 100644
index 0000000000..f34cc742f7
--- /dev/null
+++ b/hal/lib/Athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/nInterfaceGlobals.h
@@ -0,0 +1,15 @@
+// Copyright (c) National Instruments 2008.  All Rights Reserved.
+// Do Not Edit... this file is generated!
+
+#ifndef __nFRC_2012_1_6_4_nInterfaceGlobals_h__
+#define __nFRC_2012_1_6_4_nInterfaceGlobals_h__
+
+namespace nFPGA
+{
+namespace nFRC_2012_1_6_4
+{
+   extern unsigned int g_currentTargetClass;
+}
+}
+
+#endif // __nFRC_2012_1_6_4_nInterfaceGlobals_h__
diff --git a/hal/lib/Athena/NetworkCommunication/CANInterfacePlugin.h b/hal/lib/Athena/NetworkCommunication/CANInterfacePlugin.h
index f4c4064dc6..77d992cf24 100644
--- a/hal/lib/Athena/NetworkCommunication/CANInterfacePlugin.h
+++ b/hal/lib/Athena/NetworkCommunication/CANInterfacePlugin.h
@@ -51,6 +51,7 @@ public:
 	 */
 	virtual int32_t receiveMessage(uint32_t &messageID, uint8_t *data, uint8_t &dataSize) = 0;
 
+#if defined(__linux)
 	/**
 	 * This entry-point of the CANInterfacePlugin returns status of the CAN bus.
 	 * 
@@ -67,6 +68,7 @@ public:
 	 * @return This should return 0 if all status was retrieved successfully or an error code if not.
 	 */
 	virtual int32_t getStatus(uint32_t &busOffCount, uint32_t &txFullCount, uint32_t &receiveErrorCount, uint32_t &transmitErrorCount) {return 0;}
+#endif
 };
 
 /**
diff --git a/ni-libraries/libFRC_NetworkCommunication.so.1.5.0 b/ni-libraries/libFRC_NetworkCommunication.so.1.5.0
index 45230dd7c3..556a49ca79 100755
Binary files a/ni-libraries/libFRC_NetworkCommunication.so.1.5.0 and b/ni-libraries/libFRC_NetworkCommunication.so.1.5.0 differ
diff --git a/ni-libraries/libFRC_NetworkCommunicationLV.so.1.5.0 b/ni-libraries/libFRC_NetworkCommunicationLV.so.1.5.0
index 670c16e50d..9bf208ae28 100755
Binary files a/ni-libraries/libFRC_NetworkCommunicationLV.so.1.5.0 and b/ni-libraries/libFRC_NetworkCommunicationLV.so.1.5.0 differ
diff --git a/ni-libraries/libRoboRIO_FRC_ChipObject.so.1.2.0 b/ni-libraries/libRoboRIO_FRC_ChipObject.so.1.2.0
index 63c3c6e0c5..f6adf4ef70 100755
Binary files a/ni-libraries/libRoboRIO_FRC_ChipObject.so.1.2.0 and b/ni-libraries/libRoboRIO_FRC_ChipObject.so.1.2.0 differ