diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/FRC_FPGA_ChipObject_Aliases.h b/hal/lib/athena/FRC_FPGA_ChipObject/FRC_FPGA_ChipObject_Aliases.h deleted file mode 100644 index d9fba25c52..0000000000 --- a/hal/lib/athena/FRC_FPGA_ChipObject/FRC_FPGA_ChipObject_Aliases.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (c) National Instruments 2008. All Rights Reserved. -// Do Not Edit... this file is generated! - -#ifndef __FRC_FPGA_ChipObject_Aliases_h__ -#define __FRC_FPGA_ChipObject_Aliases_h__ - -#define nRuntimeFPGANamespace nFRC_2012_1_6_4 -#define nInvariantFPGANamespace nFRC_C0EF_1_1_0 - -#endif // __FRC_FPGA_ChipObject_Aliases_h__ 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 923234eed6..40b14defac 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_2016_16_1_0 +#define nRoboRIO_FPGANamespace nFRC_2017_17_0_1 #endif // __RoboRIO_FRC_ChipObject_Aliases_h__ diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/fpgainterfacecapi/NiFpga.h b/hal/lib/athena/FRC_FPGA_ChipObject/fpgainterfacecapi/NiFpga.h index 4e9147b313..7bf96a82c7 100644 --- a/hal/lib/athena/FRC_FPGA_ChipObject/fpgainterfacecapi/NiFpga.h +++ b/hal/lib/athena/FRC_FPGA_ChipObject/fpgainterfacecapi/NiFpga.h @@ -1,7 +1,7 @@ /* - * FPGA Interface C API 15.0 header file. + * FPGA Interface C API 16.0 header file. * - * Copyright (c) 2015, + * Copyright (c) 2016, * National Instruments Corporation. * All rights reserved. */ @@ -138,7 +138,7 @@ */ #if NiFpga_Cpp || NiFpga_C99 /* The inline keyword exists in C++ and C99. */ -#define NiFpga_Inline inline + #define NiFpga_Inline inline #elif NiFpga_Msvc /* Visual C++ (at least since 6.0) also supports an alternate keyword. */ #define NiFpga_Inline __inline @@ -275,12 +275,6 @@ static const NiFpga_Status NiFpga_Status_ResourceNotFound = -52006; */ static const NiFpga_Status NiFpga_Status_ResourceNotInitialized = -52010; -/** - * A hardware failure has occurred. The operation could not be completed as - * specified. - */ -static const NiFpga_Status NiFpga_Status_HardwareFault = -52018; - /** * The FPGA is already running. */ @@ -438,6 +432,14 @@ static const NiFpga_Status NiFpga_Status_ElementsNotPermissibleToBeAcquired = -6 */ static const NiFpga_Status NiFpga_Status_FpgaBusyConfiguration = -61252; +/** + * LabVIEW FPGA does not support Close and Reset if Last Reference for bitfiles + * that do not support Reset. Pass the + * NiFpga_CloseAttribute_NoResetIfLastSession attribute to NiFpga_Close instead + * of 0. + */ +static const NiFpga_Status NiFpga_Status_CloseAndResetCalledWithResetNotSupported = -61253; + /** * An unexpected internal error occurred. */ @@ -530,6 +532,12 @@ static const NiFpga_Status NiFpga_Status_SignatureMismatch = -63106; */ static const NiFpga_Status NiFpga_Status_IncompatibleBitfile = -63107; +/** + * A hardware failure has occurred. The operation could not be completed as + * specified. + */ +static const NiFpga_Status NiFpga_Status_HardwareFault = -63150; + /** * Either the supplied resource name is invalid as a RIO resource name, or the * device was not found. Use MAX to find the proper resource name for the @@ -863,6 +871,32 @@ NiFpga_Status NiFpga_ReadU64(NiFpga_Session session, uint32_t indicator, uint64_t* value); +/** + * Reads a single-precision floating-point value from a given indicator or + * control. + * + * @param session handle to a currently open session + * @param indicator indicator or control from which to read + * @param value outputs the value that was read + * @return result of the call + */ +NiFpga_Status NiFpga_ReadSgl(NiFpga_Session session, + uint32_t indicator, + float* value); + +/** + * Reads a double-precision floating-point value from a given indicator or + * control. + * + * @param session handle to a currently open session + * @param indicator indicator or control from which to read + * @param value outputs the value that was read + * @return result of the call + */ +NiFpga_Status NiFpga_ReadDbl(NiFpga_Session session, + uint32_t indicator, + double* value); + /** * Writes a boolean value to a given control or indicator. * @@ -971,6 +1005,32 @@ NiFpga_Status NiFpga_WriteU64(NiFpga_Session session, uint32_t control, uint64_t value); +/** + * Writes a single-precision floating-point value to a given control or + * indicator. + * + * @param session handle to a currently open session + * @param control control or indicator to which to write + * @param value value to write + * @return result of the call + */ +NiFpga_Status NiFpga_WriteSgl(NiFpga_Session session, + uint32_t control, + float value); + +/** + * Writes a double-precision floating-point value to a given control or + * indicator. + * + * @param session handle to a currently open session + * @param control control or indicator to which to write + * @param value value to write + * @return result of the call + */ +NiFpga_Status NiFpga_WriteDbl(NiFpga_Session session, + uint32_t control, + double value); + /** * Reads an entire array of boolean values from a given array indicator or * control. @@ -1133,6 +1193,42 @@ NiFpga_Status NiFpga_ReadArrayU64(NiFpga_Session session, uint64_t* array, size_t size); +/** + * Reads an entire array of single-precision floating-point values from a + * given array indicator or control. + * + * @warning The size passed must be the exact number of elements in the + * indicator or control. + * + * @param session handle to a currently open session + * @param indicator indicator or control from which to read + * @param array outputs the entire array that was read + * @param size exact number of elements in the indicator or control + * @return result of the call + */ +NiFpga_Status NiFpga_ReadArraySgl(NiFpga_Session session, + uint32_t indicator, + float* array, + size_t size); + +/** + * Reads an entire array of double-precision floating-point values from a + * given array indicator or control. + * + * @warning The size passed must be the exact number of elements in the + * indicator or control. + * + * @param session handle to a currently open session + * @param indicator indicator or control from which to read + * @param array outputs the entire array that was read + * @param size exact number of elements in the indicator or control + * @return result of the call + */ +NiFpga_Status NiFpga_ReadArrayDbl(NiFpga_Session session, + uint32_t indicator, + double* array, + size_t size); + /** * Writes an entire array of boolean values to a given array control or * indicator. @@ -1295,6 +1391,42 @@ NiFpga_Status NiFpga_WriteArrayU64(NiFpga_Session session, const uint64_t* array, size_t size); +/** + * Writes an entire array of single-precision floating-point values to a given + * array control or indicator. + * + * @warning The size passed must be the exact number of elements in the + * control or indicator. + * + * @param session handle to a currently open session + * @param control control or indicator to which to write + * @param array entire array to write + * @param size exact number of elements in the control or indicator + * @return result of the call + */ +NiFpga_Status NiFpga_WriteArraySgl(NiFpga_Session session, + uint32_t control, + const float* array, + size_t size); + +/** + * Writes an entire array of double-precision floating-point values to a given + * array control or indicator. + * + * @warning The size passed must be the exact number of elements in the + * control or indicator. + * + * @param session handle to a currently open session + * @param control control or indicator to which to write + * @param array entire array to write + * @param size exact number of elements in the control or indicator + * @return result of the call + */ +NiFpga_Status NiFpga_WriteArrayDbl(NiFpga_Session session, + uint32_t control, + const double* array, + size_t size); + /** * Enumeration of all 32 possible IRQs. Multiple IRQs can be bitwise ORed * together like this: @@ -1633,6 +1765,44 @@ NiFpga_Status NiFpga_ReadFifoU64(NiFpga_Session session, uint32_t timeout, size_t* elementsRemaining); +/** + * Reads from a target-to-host FIFO of single-precision floating-point values. + * + * @param session handle to a currently open session + * @param fifo target-to-host FIFO from which to read + * @param data outputs the data that was read + * @param numberOfElements number of elements to read + * @param timeout timeout in milliseconds, or NiFpga_InfiniteTimeout + * @param elementsRemaining if non-NULL, outputs the number of elements + * remaining in the host memory part of the DMA FIFO + * @return result of the call + */ +NiFpga_Status NiFpga_ReadFifoSgl(NiFpga_Session session, + uint32_t fifo, + float* data, + size_t numberOfElements, + uint32_t timeout, + size_t* elementsRemaining); + +/** + * Reads from a target-to-host FIFO of double-precision floating-point values. + * + * @param session handle to a currently open session + * @param fifo target-to-host FIFO from which to read + * @param data outputs the data that was read + * @param numberOfElements number of elements to read + * @param timeout timeout in milliseconds, or NiFpga_InfiniteTimeout + * @param elementsRemaining if non-NULL, outputs the number of elements + * remaining in the host memory part of the DMA FIFO + * @return result of the call + */ +NiFpga_Status NiFpga_ReadFifoDbl(NiFpga_Session session, + uint32_t fifo, + double* data, + size_t numberOfElements, + uint32_t timeout, + size_t* elementsRemaining); + /** * Writes to a host-to-target FIFO of booleans. * @@ -1813,6 +1983,46 @@ NiFpga_Status NiFpga_WriteFifoU64(NiFpga_Session session, uint32_t timeout, size_t* emptyElementsRemaining); +/** + * Writes to a host-to-target FIFO of single-precision floating-point values. + * + * @param session handle to a currently open session + * @param fifo host-to-target FIFO to which to write + * @param data data to write + * @param numberOfElements number of elements to write + * @param timeout timeout in milliseconds, or NiFpga_InfiniteTimeout + * @param emptyElementsRemaining if non-NULL, outputs the number of empty + * elements remaining in the host memory part of + * the DMA FIFO + * @return result of the call + */ +NiFpga_Status NiFpga_WriteFifoSgl(NiFpga_Session session, + uint32_t fifo, + const float* data, + size_t numberOfElements, + uint32_t timeout, + size_t* emptyElementsRemaining); + +/** + * Writes to a host-to-target FIFO of double-precision floating-point values. + * + * @param session handle to a currently open session + * @param fifo host-to-target FIFO to which to write + * @param data data to write + * @param numberOfElements number of elements to write + * @param timeout timeout in milliseconds, or NiFpga_InfiniteTimeout + * @param emptyElementsRemaining if non-NULL, outputs the number of empty + * elements remaining in the host memory part of + * the DMA FIFO + * @return result of the call + */ +NiFpga_Status NiFpga_WriteFifoDbl(NiFpga_Session session, + uint32_t fifo, + const double* data, + size_t numberOfElements, + uint32_t timeout, + size_t* emptyElementsRemaining); + /** * Acquires elements for reading from a target-to-host FIFO of booleans. * @@ -2118,6 +2328,74 @@ NiFpga_Status NiFpga_AcquireFifoReadElementsU64( size_t* elementsAcquired, size_t* elementsRemaining); +/** + * Acquires elements for reading from a target-to-host FIFO of single-precision + * floating-point values. + * + * Acquiring, reading, and releasing FIFO elements prevents the need to copy + * the contents of elements from the host memory buffer to a separate + * user-allocated buffer before reading. The FPGA target cannot write to + * elements acquired by the host. Therefore, the host must release elements + * after reading them. The number of elements acquired may differ from the + * number of elements requested if, for example, the number of elements + * requested reaches the end of the host memory buffer. Always release all + * acquired elements before closing the session. Do not attempt to access FIFO + * elements after the elements are released or the session is closed. + * + * @param session handle to a currently open session + * @param fifo target-to-host FIFO from which to read + * @param elements outputs a pointer to the elements acquired + * @param elementsRequested requested number of elements + * @param timeout timeout in milliseconds, or NiFpga_InfiniteTimeout + * @param elementsAcquired actual number of elements acquired, which may be + * less than the requested number + * @param elementsRemaining if non-NULL, outputs the number of elements + * remaining in the host memory part of the DMA FIFO + * @return result of the call + */ +NiFpga_Status NiFpga_AcquireFifoReadElementsSgl( + NiFpga_Session session, + uint32_t fifo, + float** elements, + size_t elementsRequested, + uint32_t timeout, + size_t* elementsAcquired, + size_t* elementsRemaining); + +/** + * Acquires elements for reading from a target-to-host FIFO of double-precision + * floating-point values. + * + * Acquiring, reading, and releasing FIFO elements prevents the need to copy + * the contents of elements from the host memory buffer to a separate + * user-allocated buffer before reading. The FPGA target cannot write to + * elements acquired by the host. Therefore, the host must release elements + * after reading them. The number of elements acquired may differ from the + * number of elements requested if, for example, the number of elements + * requested reaches the end of the host memory buffer. Always release all + * acquired elements before closing the session. Do not attempt to access FIFO + * elements after the elements are released or the session is closed. + * + * @param session handle to a currently open session + * @param fifo target-to-host FIFO from which to read + * @param elements outputs a pointer to the elements acquired + * @param elementsRequested requested number of elements + * @param timeout timeout in milliseconds, or NiFpga_InfiniteTimeout + * @param elementsAcquired actual number of elements acquired, which may be + * less than the requested number + * @param elementsRemaining if non-NULL, outputs the number of elements + * remaining in the host memory part of the DMA FIFO + * @return result of the call + */ +NiFpga_Status NiFpga_AcquireFifoReadElementsDbl( + NiFpga_Session session, + uint32_t fifo, + double** elements, + size_t elementsRequested, + uint32_t timeout, + size_t* elementsAcquired, + size_t* elementsRemaining); + /** * Acquires elements for writing to a host-to-target FIFO of booleans. * @@ -2423,6 +2701,74 @@ NiFpga_Status NiFpga_AcquireFifoWriteElementsU64( size_t* elementsAcquired, size_t* elementsRemaining); +/** + * Acquires elements for writing to a host-to-target FIFO of single-precision + * floating-point values. + * + * Acquiring, writing, and releasing FIFO elements prevents the need to write + * first into a separate user-allocated buffer and then copy the contents of + * elements to the host memory buffer. The FPGA target cannot read elements + * acquired by the host. Therefore, the host must release elements after + * writing to them. The number of elements acquired may differ from the number + * of elements requested if, for example, the number of elements requested + * reaches the end of the host memory buffer. Always release all acquired + * elements before closing the session. Do not attempt to access FIFO elements + * after the elements are released or the session is closed. + * + * @param session handle to a currently open session + * @param fifo host-to-target FIFO to which to write + * @param elements outputs a pointer to the elements acquired + * @param elementsRequested requested number of elements + * @param timeout timeout in milliseconds, or NiFpga_InfiniteTimeout + * @param elementsAcquired actual number of elements acquired, which may be + * less than the requested number + * @param elementsRemaining if non-NULL, outputs the number of elements + * remaining in the host memory part of the DMA FIFO + * @return result of the call + */ +NiFpga_Status NiFpga_AcquireFifoWriteElementsSgl( + NiFpga_Session session, + uint32_t fifo, + float** elements, + size_t elementsRequested, + uint32_t timeout, + size_t* elementsAcquired, + size_t* elementsRemaining); + +/** + * Acquires elements for writing to a host-to-target FIFO of single-precision + * floating-point values. + * + * Acquiring, writing, and releasing FIFO elements prevents the need to write + * first into a separate user-allocated buffer and then copy the contents of + * elements to the host memory buffer. The FPGA target cannot read elements + * acquired by the host. Therefore, the host must release elements after + * writing to them. The number of elements acquired may differ from the number + * of elements requested if, for example, the number of elements requested + * reaches the end of the host memory buffer. Always release all acquired + * elements before closing the session. Do not attempt to access FIFO elements + * after the elements are released or the session is closed. + * + * @param session handle to a currently open session + * @param fifo host-to-target FIFO to which to write + * @param elements outputs a pointer to the elements acquired + * @param elementsRequested requested number of elements + * @param timeout timeout in milliseconds, or NiFpga_InfiniteTimeout + * @param elementsAcquired actual number of elements acquired, which may be + * less than the requested number + * @param elementsRemaining if non-NULL, outputs the number of elements + * remaining in the host memory part of the DMA FIFO + * @return result of the call + */ +NiFpga_Status NiFpga_AcquireFifoWriteElementsDbl( + NiFpga_Session session, + uint32_t fifo, + double** elements, + size_t elementsRequested, + uint32_t timeout, + size_t* elementsAcquired, + size_t* elementsRemaining); + /** * Releases previously acquired FIFO elements. * @@ -2445,7 +2791,9 @@ NiFpga_Status NiFpga_ReleaseFifoElements(NiFpga_Session session, * * @param session handle to a currently open session * @param fifo peer-to-peer FIFO - * @param endpoint outputs the endpoint reference + * @param endpoint Outputs the endpoint reference. + * The actual type is a nip2p_tEndpointHandle usable by + * the NI Peer-to-Peer Streaming C/C++ API. * @return result of the call */ NiFpga_Status NiFpga_GetPeerToPeerFifoEndpoint(NiFpga_Session session, diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/nInvariantFPGANamespace/nInterfaceGlobals.h b/hal/lib/athena/FRC_FPGA_ChipObject/nInvariantFPGANamespace/nInterfaceGlobals.h deleted file mode 100644 index abd07d4fcf..0000000000 --- a/hal/lib/athena/FRC_FPGA_ChipObject/nInvariantFPGANamespace/nInterfaceGlobals.h +++ /dev/null @@ -1,15 +0,0 @@ -// 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/nInvariantFPGANamespace/tAI.h b/hal/lib/athena/FRC_FPGA_ChipObject/nInvariantFPGANamespace/tAI.h deleted file mode 100644 index 14121b5e60..0000000000 --- a/hal/lib/athena/FRC_FPGA_ChipObject/nInvariantFPGANamespace/tAI.h +++ /dev/null @@ -1,73 +0,0 @@ -// Copyright (c) National Instruments 2008. All Rights Reserved. -// Do Not Edit... this file is generated! - -#ifndef __nFRC_C0EF_1_1_0_AI_h__ -#define __nFRC_C0EF_1_1_0_AI_h__ - -#include "tSystemInterface.h" - -namespace nFPGA -{ -namespace nFRC_C0EF_1_1_0 -{ - -class tAI -{ -public: - tAI(){} - virtual ~tAI(){} - - virtual tSystemInterface* getSystemInterface() = 0; - static tAI* create(unsigned char sys_index, tRioStatusCode *status); - virtual unsigned char getSystemIndex() = 0; - - - typedef enum - { - kNumSystems = 2, - } tIfaceConstants; - - - - typedef enum - { - } tCalOK_IfaceConstants; - - virtual bool readCalOK(tRioStatusCode *status) = 0; - - - typedef enum - { - } tDoneTime_IfaceConstants; - - virtual unsigned int readDoneTime(tRioStatusCode *status) = 0; - - - - - typedef enum - { - kNumOffsetRegisters = 8, - } tOffset_IfaceConstants; - - virtual signed int readOffset(unsigned char reg_index, tRioStatusCode *status) = 0; - - - typedef enum - { - kNumLSBWeightRegisters = 8, - } tLSBWeight_IfaceConstants; - - virtual unsigned int readLSBWeight(unsigned char reg_index, tRioStatusCode *status) = 0; - - - -private: - tAI(const tAI&); - void operator=(const tAI&); -}; - -} -} - -#endif // __nFRC_C0EF_1_1_0_AI_h__ diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/nInvariantFPGANamespace/tGlobal.h b/hal/lib/athena/FRC_FPGA_ChipObject/nInvariantFPGANamespace/tGlobal.h deleted file mode 100644 index 0b741172f5..0000000000 --- a/hal/lib/athena/FRC_FPGA_ChipObject/nInvariantFPGANamespace/tGlobal.h +++ /dev/null @@ -1,69 +0,0 @@ -// Copyright (c) National Instruments 2008. All Rights Reserved. -// Do Not Edit... this file is generated! - -#ifndef __nFRC_C0EF_1_1_0_Global_h__ -#define __nFRC_C0EF_1_1_0_Global_h__ - -#include "tSystemInterface.h" - -namespace nFPGA -{ -namespace nFRC_C0EF_1_1_0 -{ - -class tGlobal -{ -public: - tGlobal(){} - virtual ~tGlobal(){} - - virtual tSystemInterface* getSystemInterface() = 0; - static tGlobal* create(tRioStatusCode *status); - - typedef enum - { - kNumSystems = 1, - } tIfaceConstants; - - - - - typedef enum - { - } tVersion_IfaceConstants; - - virtual unsigned short readVersion(tRioStatusCode *status) = 0; - - - typedef enum - { - } tLocalTime_IfaceConstants; - - virtual unsigned int readLocalTime(tRioStatusCode *status) = 0; - - - typedef enum - { - } tRevision_IfaceConstants; - - virtual unsigned int readRevision(tRioStatusCode *status) = 0; - - - typedef enum - { - } tReserved_IfaceConstants; - - virtual unsigned char readReserved(tRioStatusCode *status) = 0; - - - - -private: - tGlobal(const tGlobal&); - void operator=(const tGlobal&); -}; - -} -} - -#endif // __nFRC_C0EF_1_1_0_Global_h__ diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/nInvariantFPGANamespace/tLoadOut.h b/hal/lib/athena/FRC_FPGA_ChipObject/nInvariantFPGANamespace/tLoadOut.h deleted file mode 100644 index a7c4ebbb02..0000000000 --- a/hal/lib/athena/FRC_FPGA_ChipObject/nInvariantFPGANamespace/tLoadOut.h +++ /dev/null @@ -1,79 +0,0 @@ -// Copyright (c) National Instruments 2008. All Rights Reserved. -// Do Not Edit... this file is generated! - -#ifndef __nFRC_C0EF_1_1_0_LoadOut_h__ -#define __nFRC_C0EF_1_1_0_LoadOut_h__ - -#include "tSystemInterface.h" - -namespace nFPGA -{ -namespace nFRC_C0EF_1_1_0 -{ - -class tLoadOut -{ -public: - tLoadOut(){} - virtual ~tLoadOut(){} - - virtual tSystemInterface* getSystemInterface() = 0; - static tLoadOut* create(tRioStatusCode *status); - - typedef enum - { - kNumSystems = 1, - } tIfaceConstants; - - - - - typedef enum - { - } tReady_IfaceConstants; - - virtual bool readReady(tRioStatusCode *status) = 0; - - - typedef enum - { - } tDoneTime_IfaceConstants; - - virtual unsigned int readDoneTime(tRioStatusCode *status) = 0; - - - - - typedef enum - { - kNumVendorIDRegisters = 8, - } tVendorID_IfaceConstants; - - virtual unsigned short readVendorID(unsigned char reg_index, tRioStatusCode *status) = 0; - - - typedef enum - { - kNumSerialNumberRegisters = 8, - } tSerialNumber_IfaceConstants; - - virtual unsigned int readSerialNumber(unsigned char reg_index, tRioStatusCode *status) = 0; - - - typedef enum - { - kNumModuleIDRegisters = 8, - } tModuleID_IfaceConstants; - - virtual unsigned short readModuleID(unsigned char reg_index, tRioStatusCode *status) = 0; - - -private: - tLoadOut(const tLoadOut&); - void operator=(const tLoadOut&); -}; - -} -} - -#endif // __nFRC_C0EF_1_1_0_LoadOut_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 ddd27c6b0f..fab7dd0bc2 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_2016_16_1_0_nInterfaceGlobals_h__ -#define __nFRC_2016_16_1_0_nInterfaceGlobals_h__ +#ifndef __nFRC_2017_17_0_1_nInterfaceGlobals_h__ +#define __nFRC_2017_17_0_1_nInterfaceGlobals_h__ namespace nFPGA { -namespace nFRC_2016_16_1_0 +namespace nFRC_2017_17_0_1 { extern unsigned int g_currentTargetClass; } } -#endif // __nFRC_2016_16_1_0_nInterfaceGlobals_h__ +#endif // __nFRC_2017_17_0_1_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 a4e9aa96dd..76ef906c43 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_2016_16_1_0_AI_h__ -#define __nFRC_2016_16_1_0_AI_h__ +#ifndef __nFRC_2017_17_0_1_AI_h__ +#define __nFRC_2017_17_0_1_AI_h__ #include "tSystemInterface.h" namespace nFPGA { -namespace nFRC_2016_16_1_0 +namespace nFRC_2017_17_0_1 { class tAI @@ -140,4 +140,4 @@ private: } } -#endif // __nFRC_2016_16_1_0_AI_h__ +#endif // __nFRC_2017_17_0_1_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 467503ac0d..f3007287d3 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_2016_16_1_0_AO_h__ -#define __nFRC_2016_16_1_0_AO_h__ +#ifndef __nFRC_2017_17_0_1_AO_h__ +#define __nFRC_2017_17_0_1_AO_h__ #include "tSystemInterface.h" namespace nFPGA { -namespace nFRC_2016_16_1_0 +namespace nFRC_2017_17_0_1 { class tAO @@ -47,4 +47,4 @@ private: } } -#endif // __nFRC_2016_16_1_0_AO_h__ +#endif // __nFRC_2017_17_0_1_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 3fb1193cd7..0cfcf0de87 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_2016_16_1_0_Accel_h__ -#define __nFRC_2016_16_1_0_Accel_h__ +#ifndef __nFRC_2017_17_0_1_Accel_h__ +#define __nFRC_2017_17_0_1_Accel_h__ #include "tSystemInterface.h" namespace nFPGA { -namespace nFRC_2016_16_1_0 +namespace nFRC_2017_17_0_1 { class tAccel @@ -99,4 +99,4 @@ private: } } -#endif // __nFRC_2016_16_1_0_Accel_h__ +#endif // __nFRC_2017_17_0_1_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 ace00280a3..98d9585609 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_2016_16_1_0_Accumulator_h__ -#define __nFRC_2016_16_1_0_Accumulator_h__ +#ifndef __nFRC_2017_17_0_1_Accumulator_h__ +#define __nFRC_2017_17_0_1_Accumulator_h__ #include "tSystemInterface.h" namespace nFPGA { -namespace nFRC_2016_16_1_0 +namespace nFRC_2017_17_0_1 { class tAccumulator @@ -84,4 +84,4 @@ private: } } -#endif // __nFRC_2016_16_1_0_Accumulator_h__ +#endif // __nFRC_2017_17_0_1_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 be6a1fe44f..251d303b4e 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_2016_16_1_0_Alarm_h__ -#define __nFRC_2016_16_1_0_Alarm_h__ +#ifndef __nFRC_2017_17_0_1_Alarm_h__ +#define __nFRC_2017_17_0_1_Alarm_h__ #include "tSystemInterface.h" namespace nFPGA { -namespace nFRC_2016_16_1_0 +namespace nFRC_2017_17_0_1 { class tAlarm @@ -54,4 +54,4 @@ private: } } -#endif // __nFRC_2016_16_1_0_Alarm_h__ +#endif // __nFRC_2017_17_0_1_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 347d692868..c34893f38c 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_2016_16_1_0_AnalogTrigger_h__ -#define __nFRC_2016_16_1_0_AnalogTrigger_h__ +#ifndef __nFRC_2017_17_0_1_AnalogTrigger_h__ +#define __nFRC_2017_17_0_1_AnalogTrigger_h__ #include "tSystemInterface.h" namespace nFPGA { -namespace nFRC_2016_16_1_0 +namespace nFRC_2017_17_0_1 { class tAnalogTrigger @@ -126,4 +126,4 @@ private: } } -#endif // __nFRC_2016_16_1_0_AnalogTrigger_h__ +#endif // __nFRC_2017_17_0_1_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 ba6077012b..a9551d1e78 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_2016_16_1_0_BIST_h__ -#define __nFRC_2016_16_1_0_BIST_h__ +#ifndef __nFRC_2017_17_0_1_BIST_h__ +#define __nFRC_2017_17_0_1_BIST_h__ #include "tSystemInterface.h" namespace nFPGA { -namespace nFRC_2016_16_1_0 +namespace nFRC_2017_17_0_1 { class tBIST @@ -87,4 +87,4 @@ private: } } -#endif // __nFRC_2016_16_1_0_BIST_h__ +#endif // __nFRC_2017_17_0_1_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 ebfb6805c5..50d15c31a1 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_2016_16_1_0_Counter_h__ -#define __nFRC_2016_16_1_0_Counter_h__ +#ifndef __nFRC_2017_17_0_1_Counter_h__ +#define __nFRC_2017_17_0_1_Counter_h__ #include "tSystemInterface.h" namespace nFPGA { -namespace nFRC_2016_16_1_0 +namespace nFRC_2017_17_0_1 { class tCounter @@ -216,4 +216,4 @@ private: } } -#endif // __nFRC_2016_16_1_0_Counter_h__ +#endif // __nFRC_2017_17_0_1_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 c14ebf9384..bccfdb7de8 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_2016_16_1_0_DIO_h__ -#define __nFRC_2016_16_1_0_DIO_h__ +#ifndef __nFRC_2017_17_0_1_DIO_h__ +#define __nFRC_2017_17_0_1_DIO_h__ #include "tSystemInterface.h" namespace nFPGA { -namespace nFRC_2016_16_1_0 +namespace nFRC_2017_17_0_1 { class tDIO @@ -30,11 +30,13 @@ public: struct{ #ifdef __vxworks unsigned Headers : 10; - unsigned Reserved : 6; + unsigned SPIPort : 5; + unsigned Reserved : 1; unsigned MXP : 16; #else unsigned MXP : 16; - unsigned Reserved : 6; + unsigned Reserved : 1; + unsigned SPIPort : 5; unsigned Headers : 10; #endif }; @@ -47,11 +49,13 @@ public: struct{ #ifdef __vxworks unsigned Headers : 10; - unsigned Reserved : 6; + unsigned SPIPort : 5; + unsigned Reserved : 1; unsigned MXP : 16; #else unsigned MXP : 16; - unsigned Reserved : 6; + unsigned Reserved : 1; + unsigned SPIPort : 5; unsigned Headers : 10; #endif }; @@ -64,11 +68,13 @@ public: struct{ #ifdef __vxworks unsigned Headers : 10; - unsigned Reserved : 6; + unsigned SPIPort : 5; + unsigned Reserved : 1; unsigned MXP : 16; #else unsigned MXP : 16; - unsigned Reserved : 6; + unsigned Reserved : 1; + unsigned SPIPort : 5; unsigned Headers : 10; #endif }; @@ -81,11 +87,13 @@ public: struct{ #ifdef __vxworks unsigned Headers : 10; - unsigned Reserved : 6; + unsigned SPIPort : 5; + unsigned Reserved : 1; unsigned MXP : 16; #else unsigned MXP : 16; - unsigned Reserved : 6; + unsigned Reserved : 1; + unsigned SPIPort : 5; unsigned Headers : 10; #endif }; @@ -102,10 +110,12 @@ public: virtual void writeDO(tDO value, tRioStatusCode *status) = 0; virtual void writeDO_Headers(unsigned short value, tRioStatusCode *status) = 0; + virtual void writeDO_SPIPort(unsigned char value, tRioStatusCode *status) = 0; virtual void writeDO_Reserved(unsigned char value, tRioStatusCode *status) = 0; virtual void writeDO_MXP(unsigned short value, tRioStatusCode *status) = 0; virtual tDO readDO(tRioStatusCode *status) = 0; virtual unsigned short readDO_Headers(tRioStatusCode *status) = 0; + virtual unsigned char readDO_SPIPort(tRioStatusCode *status) = 0; virtual unsigned char readDO_Reserved(tRioStatusCode *status) = 0; virtual unsigned short readDO_MXP(tRioStatusCode *status) = 0; @@ -143,10 +153,12 @@ public: virtual void writeOutputEnable(tOutputEnable value, tRioStatusCode *status) = 0; virtual void writeOutputEnable_Headers(unsigned short value, tRioStatusCode *status) = 0; + virtual void writeOutputEnable_SPIPort(unsigned char value, tRioStatusCode *status) = 0; virtual void writeOutputEnable_Reserved(unsigned char value, tRioStatusCode *status) = 0; virtual void writeOutputEnable_MXP(unsigned short value, tRioStatusCode *status) = 0; virtual tOutputEnable readOutputEnable(tRioStatusCode *status) = 0; virtual unsigned short readOutputEnable_Headers(tRioStatusCode *status) = 0; + virtual unsigned char readOutputEnable_SPIPort(tRioStatusCode *status) = 0; virtual unsigned char readOutputEnable_Reserved(tRioStatusCode *status) = 0; virtual unsigned short readOutputEnable_MXP(tRioStatusCode *status) = 0; @@ -166,10 +178,12 @@ public: virtual void writePulse(tPulse value, tRioStatusCode *status) = 0; virtual void writePulse_Headers(unsigned short value, tRioStatusCode *status) = 0; + virtual void writePulse_SPIPort(unsigned char value, tRioStatusCode *status) = 0; virtual void writePulse_Reserved(unsigned char value, tRioStatusCode *status) = 0; virtual void writePulse_MXP(unsigned short value, tRioStatusCode *status) = 0; virtual tPulse readPulse(tRioStatusCode *status) = 0; virtual unsigned short readPulse_Headers(tRioStatusCode *status) = 0; + virtual unsigned char readPulse_SPIPort(tRioStatusCode *status) = 0; virtual unsigned char readPulse_Reserved(tRioStatusCode *status) = 0; virtual unsigned short readPulse_MXP(tRioStatusCode *status) = 0; @@ -180,6 +194,7 @@ public: virtual tDI readDI(tRioStatusCode *status) = 0; virtual unsigned short readDI_Headers(tRioStatusCode *status) = 0; + virtual unsigned char readDI_SPIPort(tRioStatusCode *status) = 0; virtual unsigned char readDI_Reserved(tRioStatusCode *status) = 0; virtual unsigned short readDI_MXP(tRioStatusCode *status) = 0; @@ -245,4 +260,4 @@ private: } } -#endif // __nFRC_2016_16_1_0_DIO_h__ +#endif // __nFRC_2017_17_0_1_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 760ee355d5..03ac207c32 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_2016_16_1_0_DMA_h__ -#define __nFRC_2016_16_1_0_DMA_h__ +#ifndef __nFRC_2017_17_0_1_DMA_h__ +#define __nFRC_2017_17_0_1_DMA_h__ #include "tSystemInterface.h" namespace nFPGA { -namespace nFRC_2016_16_1_0 +namespace nFRC_2017_17_0_1 { class tDMA @@ -194,4 +194,4 @@ private: } } -#endif // __nFRC_2016_16_1_0_DMA_h__ +#endif // __nFRC_2017_17_0_1_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 8db77c2d75..53330fea7e 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_2016_16_1_0_Encoder_h__ -#define __nFRC_2016_16_1_0_Encoder_h__ +#ifndef __nFRC_2017_17_0_1_Encoder_h__ +#define __nFRC_2017_17_0_1_Encoder_h__ #include "tSystemInterface.h" namespace nFPGA { -namespace nFRC_2016_16_1_0 +namespace nFRC_2017_17_0_1 { class tEncoder @@ -196,4 +196,4 @@ private: } } -#endif // __nFRC_2016_16_1_0_Encoder_h__ +#endif // __nFRC_2017_17_0_1_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 737a241e0f..056313675d 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_2016_16_1_0_Global_h__ -#define __nFRC_2016_16_1_0_Global_h__ +#ifndef __nFRC_2017_17_0_1_Global_h__ +#define __nFRC_2017_17_0_1_Global_h__ #include "tSystemInterface.h" namespace nFPGA { -namespace nFRC_2016_16_1_0 +namespace nFRC_2017_17_0_1 { class tGlobal @@ -29,7 +29,6 @@ public: union{ struct{ #ifdef __vxworks - unsigned Radio : 8; unsigned Comm : 8; unsigned Mode : 8; unsigned RSL : 1; @@ -37,11 +36,10 @@ public: unsigned RSL : 1; unsigned Mode : 8; unsigned Comm : 8; - unsigned Radio : 8; #endif }; struct{ - unsigned value : 25; + unsigned value : 17; }; } tLEDs; @@ -52,12 +50,10 @@ public: } tLEDs_IfaceConstants; virtual void writeLEDs(tLEDs value, tRioStatusCode *status) = 0; - virtual void writeLEDs_Radio(unsigned char value, tRioStatusCode *status) = 0; virtual void writeLEDs_Comm(unsigned char value, tRioStatusCode *status) = 0; virtual void writeLEDs_Mode(unsigned char value, tRioStatusCode *status) = 0; virtual void writeLEDs_RSL(bool value, tRioStatusCode *status) = 0; virtual tLEDs readLEDs(tRioStatusCode *status) = 0; - virtual unsigned char readLEDs_Radio(tRioStatusCode *status) = 0; virtual unsigned char readLEDs_Comm(tRioStatusCode *status) = 0; virtual unsigned char readLEDs_Mode(tRioStatusCode *status) = 0; virtual bool readLEDs_RSL(tRioStatusCode *status) = 0; @@ -101,4 +97,4 @@ private: } } -#endif // __nFRC_2016_16_1_0_Global_h__ +#endif // __nFRC_2017_17_0_1_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 e2f69a2a60..d0ae406d4a 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_2016_16_1_0_Interrupt_h__ -#define __nFRC_2016_16_1_0_Interrupt_h__ +#ifndef __nFRC_2017_17_0_1_Interrupt_h__ +#define __nFRC_2017_17_0_1_Interrupt_h__ #include "tSystemInterface.h" namespace nFPGA { -namespace nFRC_2016_16_1_0 +namespace nFRC_2017_17_0_1 { class tInterrupt @@ -97,4 +97,4 @@ private: } } -#endif // __nFRC_2016_16_1_0_Interrupt_h__ +#endif // __nFRC_2017_17_0_1_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 73c82a7817..bfb223afc2 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_2016_16_1_0_PWM_h__ -#define __nFRC_2016_16_1_0_PWM_h__ +#ifndef __nFRC_2017_17_0_1_PWM_h__ +#define __nFRC_2017_17_0_1_PWM_h__ #include "tSystemInterface.h" namespace nFPGA { -namespace nFRC_2016_16_1_0 +namespace nFRC_2017_17_0_1 { class tPWM @@ -117,4 +117,4 @@ private: } } -#endif // __nFRC_2016_16_1_0_PWM_h__ +#endif // __nFRC_2017_17_0_1_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 6e72979723..5dd3b5b06a 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_2016_16_1_0_Power_h__ -#define __nFRC_2016_16_1_0_Power_h__ +#ifndef __nFRC_2017_17_0_1_Power_h__ +#define __nFRC_2017_17_0_1_Power_h__ #include "tSystemInterface.h" namespace nFPGA { -namespace nFRC_2016_16_1_0 +namespace nFRC_2017_17_0_1 { class tPower @@ -217,4 +217,4 @@ private: } } -#endif // __nFRC_2016_16_1_0_Power_h__ +#endif // __nFRC_2017_17_0_1_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 e1d934512d..45abe365c4 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_2016_16_1_0_Relay_h__ -#define __nFRC_2016_16_1_0_Relay_h__ +#ifndef __nFRC_2017_17_0_1_Relay_h__ +#define __nFRC_2017_17_0_1_Relay_h__ #include "tSystemInterface.h" namespace nFPGA { -namespace nFRC_2016_16_1_0 +namespace nFRC_2017_17_0_1 { class tRelay @@ -65,4 +65,4 @@ private: } } -#endif // __nFRC_2016_16_1_0_Relay_h__ +#endif // __nFRC_2017_17_0_1_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 2c1760790f..a0c115c526 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_2016_16_1_0_SPI_h__ -#define __nFRC_2016_16_1_0_SPI_h__ +#ifndef __nFRC_2017_17_0_1_SPI_h__ +#define __nFRC_2017_17_0_1_SPI_h__ #include "tSystemInterface.h" namespace nFPGA { -namespace nFRC_2016_16_1_0 +namespace nFRC_2017_17_0_1 { class tSPI @@ -43,6 +43,14 @@ public: + typedef enum + { + } tEnableDIO_IfaceConstants; + + virtual void writeEnableDIO(unsigned char value, tRioStatusCode *status) = 0; + virtual unsigned char readEnableDIO(tRioStatusCode *status) = 0; + + typedef enum { } tChipSelectActiveHigh_IfaceConstants; @@ -65,4 +73,4 @@ private: } } -#endif // __nFRC_2016_16_1_0_SPI_h__ +#endif // __nFRC_2017_17_0_1_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 08c7a23ef8..19e1eabc34 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_2016_16_1_0_SysWatchdog_h__ -#define __nFRC_2016_16_1_0_SysWatchdog_h__ +#ifndef __nFRC_2017_17_0_1_SysWatchdog_h__ +#define __nFRC_2017_17_0_1_SysWatchdog_h__ #include "tSystemInterface.h" namespace nFPGA { -namespace nFRC_2016_16_1_0 +namespace nFRC_2017_17_0_1 { class tSysWatchdog @@ -105,4 +105,4 @@ private: } } -#endif // __nFRC_2016_16_1_0_SysWatchdog_h__ +#endif // __nFRC_2017_17_0_1_SysWatchdog_h__ diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/nInterfaceGlobals.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/nInterfaceGlobals.h deleted file mode 100644 index f34cc742f7..0000000000 --- a/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/nInterfaceGlobals.h +++ /dev/null @@ -1,15 +0,0 @@ -// 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/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tAI.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tAI.h deleted file mode 100644 index 78c423a019..0000000000 --- a/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tAI.h +++ /dev/null @@ -1,149 +0,0 @@ -// Copyright (c) National Instruments 2008. All Rights Reserved. -// Do Not Edit... this file is generated! - -#ifndef __nFRC_2012_1_6_4_AI_h__ -#define __nFRC_2012_1_6_4_AI_h__ - -#include "tSystemInterface.h" - -namespace nFPGA -{ -namespace nFRC_2012_1_6_4 -{ - -class tAI -{ -public: - tAI(){} - virtual ~tAI(){} - - virtual tSystemInterface* getSystemInterface() = 0; - static tAI* create(unsigned char sys_index, tRioStatusCode *status); - virtual unsigned char getSystemIndex() = 0; - - - typedef enum - { - kNumSystems = 2, - } tIfaceConstants; - - typedef - union{ - struct{ -#ifdef __vxworks - unsigned Channel : 3; - unsigned Module : 1; - unsigned Averaged : 1; -#else - unsigned Averaged : 1; - unsigned Module : 1; - unsigned Channel : 3; -#endif - }; - struct{ - unsigned value : 5; - }; - } tReadSelect; - typedef - union{ - struct{ -#ifdef __vxworks - unsigned ScanSize : 3; - unsigned ConvertRate : 26; -#else - unsigned ConvertRate : 26; - unsigned ScanSize : 3; -#endif - }; - struct{ - unsigned value : 29; - }; - } tConfig; - - - typedef enum - { - } tConfig_IfaceConstants; - - virtual void writeConfig(tConfig value, tRioStatusCode *status) = 0; - virtual void writeConfig_ScanSize(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeConfig_ConvertRate(unsigned int value, tRioStatusCode *status) = 0; - virtual tConfig readConfig(tRioStatusCode *status) = 0; - virtual unsigned char readConfig_ScanSize(tRioStatusCode *status) = 0; - virtual unsigned int readConfig_ConvertRate(tRioStatusCode *status) = 0; - - - typedef enum - { - } tLoopTiming_IfaceConstants; - - virtual unsigned int readLoopTiming(tRioStatusCode *status) = 0; - - - typedef enum - { - kNumOversampleBitsElements = 8, - } tOversampleBits_IfaceConstants; - - virtual void writeOversampleBits(unsigned char bitfield_index, unsigned char value, tRioStatusCode *status) = 0; - virtual unsigned char readOversampleBits(unsigned char bitfield_index, tRioStatusCode *status) = 0; - - - typedef enum - { - kNumAverageBitsElements = 8, - } tAverageBits_IfaceConstants; - - virtual void writeAverageBits(unsigned char bitfield_index, unsigned char value, tRioStatusCode *status) = 0; - virtual unsigned char readAverageBits(unsigned char bitfield_index, tRioStatusCode *status) = 0; - - - typedef enum - { - kNumScanListElements = 8, - } tScanList_IfaceConstants; - - virtual void writeScanList(unsigned char bitfield_index, unsigned char value, tRioStatusCode *status) = 0; - virtual unsigned char readScanList(unsigned char bitfield_index, tRioStatusCode *status) = 0; - - - - typedef enum - { - } tOutput_IfaceConstants; - - virtual signed int readOutput(tRioStatusCode *status) = 0; - - - typedef enum - { - } tLatchOutput_IfaceConstants; - - virtual void strobeLatchOutput(tRioStatusCode *status) = 0; - - - typedef enum - { - } tReadSelect_IfaceConstants; - - virtual void writeReadSelect(tReadSelect value, tRioStatusCode *status) = 0; - virtual void writeReadSelect_Channel(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeReadSelect_Module(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeReadSelect_Averaged(bool value, tRioStatusCode *status) = 0; - virtual tReadSelect readReadSelect(tRioStatusCode *status) = 0; - virtual unsigned char readReadSelect_Channel(tRioStatusCode *status) = 0; - virtual unsigned char readReadSelect_Module(tRioStatusCode *status) = 0; - virtual bool readReadSelect_Averaged(tRioStatusCode *status) = 0; - - - - -private: - tAI(const tAI&); - void operator=(const tAI&); -}; - -} -} - -#endif // __nFRC_2012_1_6_4_AI_h__ diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tAccumulator.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tAccumulator.h deleted file mode 100644 index 1a0972a7e0..0000000000 --- a/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tAccumulator.h +++ /dev/null @@ -1,87 +0,0 @@ -// Copyright (c) National Instruments 2008. All Rights Reserved. -// Do Not Edit... this file is generated! - -#ifndef __nFRC_2012_1_6_4_Accumulator_h__ -#define __nFRC_2012_1_6_4_Accumulator_h__ - -#include "tSystemInterface.h" - -namespace nFPGA -{ -namespace nFRC_2012_1_6_4 -{ - -class tAccumulator -{ -public: - tAccumulator(){} - virtual ~tAccumulator(){} - - virtual tSystemInterface* getSystemInterface() = 0; - static tAccumulator* create(unsigned char sys_index, tRioStatusCode *status); - virtual unsigned char getSystemIndex() = 0; - - - typedef enum - { - kNumSystems = 2, - } tIfaceConstants; - - typedef - union{ - struct{ - signed long long Value; - unsigned Count : 32; - }; - struct{ - unsigned value : 32; - unsigned value2 : 32; - unsigned value3 : 32; - }; - } tOutput; - - - typedef enum - { - } tOutput_IfaceConstants; - - virtual tOutput readOutput(tRioStatusCode *status) = 0; - virtual signed long long readOutput_Value(tRioStatusCode *status) = 0; - virtual unsigned int readOutput_Count(tRioStatusCode *status) = 0; - - - typedef enum - { - } tCenter_IfaceConstants; - - virtual void writeCenter(signed int value, tRioStatusCode *status) = 0; - virtual signed int readCenter(tRioStatusCode *status) = 0; - - - typedef enum - { - } tDeadband_IfaceConstants; - - virtual void writeDeadband(signed int value, tRioStatusCode *status) = 0; - virtual signed int readDeadband(tRioStatusCode *status) = 0; - - - typedef enum - { - } tReset_IfaceConstants; - - virtual void strobeReset(tRioStatusCode *status) = 0; - - - - - -private: - tAccumulator(const tAccumulator&); - void operator=(const tAccumulator&); -}; - -} -} - -#endif // __nFRC_2012_1_6_4_Accumulator_h__ diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tAlarm.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tAlarm.h deleted file mode 100644 index f3eb33f1d2..0000000000 --- a/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tAlarm.h +++ /dev/null @@ -1,57 +0,0 @@ -// Copyright (c) National Instruments 2008. All Rights Reserved. -// Do Not Edit... this file is generated! - -#ifndef __nFRC_2012_1_6_4_Alarm_h__ -#define __nFRC_2012_1_6_4_Alarm_h__ - -#include "tSystemInterface.h" - -namespace nFPGA -{ -namespace nFRC_2012_1_6_4 -{ - -class tAlarm -{ -public: - tAlarm(){} - virtual ~tAlarm(){} - - virtual tSystemInterface* getSystemInterface() = 0; - static tAlarm* create(tRioStatusCode *status); - - typedef enum - { - kNumSystems = 1, - } tIfaceConstants; - - - - - typedef enum - { - } tEnable_IfaceConstants; - - virtual void writeEnable(bool value, tRioStatusCode *status) = 0; - virtual bool readEnable(tRioStatusCode *status) = 0; - - - typedef enum - { - } tTriggerTime_IfaceConstants; - - virtual void writeTriggerTime(unsigned int value, tRioStatusCode *status) = 0; - virtual unsigned int readTriggerTime(tRioStatusCode *status) = 0; - - - - -private: - tAlarm(const tAlarm&); - void operator=(const tAlarm&); -}; - -} -} - -#endif // __nFRC_2012_1_6_4_Alarm_h__ diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tAnalogTrigger.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tAnalogTrigger.h deleted file mode 100644 index 43150f7930..0000000000 --- a/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tAnalogTrigger.h +++ /dev/null @@ -1,133 +0,0 @@ -// Copyright (c) National Instruments 2008. All Rights Reserved. -// Do Not Edit... this file is generated! - -#ifndef __nFRC_2012_1_6_4_AnalogTrigger_h__ -#define __nFRC_2012_1_6_4_AnalogTrigger_h__ - -#include "tSystemInterface.h" - -namespace nFPGA -{ -namespace nFRC_2012_1_6_4 -{ - -class tAnalogTrigger -{ -public: - tAnalogTrigger(){} - virtual ~tAnalogTrigger(){} - - virtual tSystemInterface* getSystemInterface() = 0; - static tAnalogTrigger* create(unsigned char sys_index, tRioStatusCode *status); - virtual unsigned char getSystemIndex() = 0; - - - typedef enum - { - kNumSystems = 8, - } tIfaceConstants; - - typedef - union{ - struct{ -#ifdef __vxworks - unsigned InHysteresis : 1; - unsigned OverLimit : 1; - unsigned Rising : 1; - unsigned Falling : 1; -#else - unsigned Falling : 1; - unsigned Rising : 1; - unsigned OverLimit : 1; - unsigned InHysteresis : 1; -#endif - }; - struct{ - unsigned value : 4; - }; - } tOutput; - typedef - union{ - struct{ -#ifdef __vxworks - unsigned Channel : 3; - unsigned Module : 1; - unsigned Averaged : 1; - unsigned Filter : 1; - unsigned FloatingRollover : 1; - signed RolloverLimit : 8; -#else - signed RolloverLimit : 8; - unsigned FloatingRollover : 1; - unsigned Filter : 1; - unsigned Averaged : 1; - unsigned Module : 1; - unsigned Channel : 3; -#endif - }; - struct{ - unsigned value : 15; - }; - } tSourceSelect; - - - typedef enum - { - } tSourceSelect_IfaceConstants; - - virtual void writeSourceSelect(tSourceSelect value, tRioStatusCode *status) = 0; - virtual void writeSourceSelect_Channel(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeSourceSelect_Module(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeSourceSelect_Averaged(bool value, tRioStatusCode *status) = 0; - virtual void writeSourceSelect_Filter(bool value, tRioStatusCode *status) = 0; - virtual void writeSourceSelect_FloatingRollover(bool value, tRioStatusCode *status) = 0; - virtual void writeSourceSelect_RolloverLimit(signed short value, tRioStatusCode *status) = 0; - virtual tSourceSelect readSourceSelect(tRioStatusCode *status) = 0; - virtual unsigned char readSourceSelect_Channel(tRioStatusCode *status) = 0; - virtual unsigned char readSourceSelect_Module(tRioStatusCode *status) = 0; - virtual bool readSourceSelect_Averaged(tRioStatusCode *status) = 0; - virtual bool readSourceSelect_Filter(tRioStatusCode *status) = 0; - virtual bool readSourceSelect_FloatingRollover(tRioStatusCode *status) = 0; - virtual signed short readSourceSelect_RolloverLimit(tRioStatusCode *status) = 0; - - - typedef enum - { - } tUpperLimit_IfaceConstants; - - virtual void writeUpperLimit(signed int value, tRioStatusCode *status) = 0; - virtual signed int readUpperLimit(tRioStatusCode *status) = 0; - - - typedef enum - { - } tLowerLimit_IfaceConstants; - - virtual void writeLowerLimit(signed int value, tRioStatusCode *status) = 0; - virtual signed int readLowerLimit(tRioStatusCode *status) = 0; - - - - typedef enum - { - kNumOutputElements = 8, - } tOutput_IfaceConstants; - - virtual tOutput readOutput(unsigned char bitfield_index, tRioStatusCode *status) = 0; - virtual bool readOutput_InHysteresis(unsigned char bitfield_index, tRioStatusCode *status) = 0; - virtual bool readOutput_OverLimit(unsigned char bitfield_index, tRioStatusCode *status) = 0; - virtual bool readOutput_Rising(unsigned char bitfield_index, tRioStatusCode *status) = 0; - virtual bool readOutput_Falling(unsigned char bitfield_index, tRioStatusCode *status) = 0; - - - - -private: - tAnalogTrigger(const tAnalogTrigger&); - void operator=(const tAnalogTrigger&); -}; - -} -} - -#endif // __nFRC_2012_1_6_4_AnalogTrigger_h__ diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tCounter.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tCounter.h deleted file mode 100644 index b23a7f06f2..0000000000 --- a/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tCounter.h +++ /dev/null @@ -1,219 +0,0 @@ -// Copyright (c) National Instruments 2008. All Rights Reserved. -// Do Not Edit... this file is generated! - -#ifndef __nFRC_2012_1_6_4_Counter_h__ -#define __nFRC_2012_1_6_4_Counter_h__ - -#include "tSystemInterface.h" - -namespace nFPGA -{ -namespace nFRC_2012_1_6_4 -{ - -class tCounter -{ -public: - tCounter(){} - virtual ~tCounter(){} - - virtual tSystemInterface* getSystemInterface() = 0; - static tCounter* create(unsigned char sys_index, tRioStatusCode *status); - virtual unsigned char getSystemIndex() = 0; - - - typedef enum - { - kNumSystems = 8, - } tIfaceConstants; - - typedef - union{ - struct{ -#ifdef __vxworks - unsigned Direction : 1; - signed Value : 31; -#else - signed Value : 31; - unsigned Direction : 1; -#endif - }; - struct{ - unsigned value : 32; - }; - } tOutput; - typedef - union{ - struct{ -#ifdef __vxworks - unsigned UpSource_Channel : 4; - unsigned UpSource_Module : 1; - unsigned UpSource_AnalogTrigger : 1; - unsigned DownSource_Channel : 4; - unsigned DownSource_Module : 1; - unsigned DownSource_AnalogTrigger : 1; - unsigned IndexSource_Channel : 4; - unsigned IndexSource_Module : 1; - unsigned IndexSource_AnalogTrigger : 1; - unsigned IndexActiveHigh : 1; - unsigned UpRisingEdge : 1; - unsigned UpFallingEdge : 1; - unsigned DownRisingEdge : 1; - unsigned DownFallingEdge : 1; - unsigned Mode : 2; - unsigned PulseLengthThreshold : 6; - unsigned Enable : 1; -#else - unsigned Enable : 1; - unsigned PulseLengthThreshold : 6; - unsigned Mode : 2; - unsigned DownFallingEdge : 1; - unsigned DownRisingEdge : 1; - unsigned UpFallingEdge : 1; - unsigned UpRisingEdge : 1; - unsigned IndexActiveHigh : 1; - unsigned IndexSource_AnalogTrigger : 1; - unsigned IndexSource_Module : 1; - unsigned IndexSource_Channel : 4; - unsigned DownSource_AnalogTrigger : 1; - unsigned DownSource_Module : 1; - unsigned DownSource_Channel : 4; - unsigned UpSource_AnalogTrigger : 1; - unsigned UpSource_Module : 1; - unsigned UpSource_Channel : 4; -#endif - }; - struct{ - unsigned value : 32; - }; - } tConfig; - typedef - union{ - struct{ -#ifdef __vxworks - unsigned Period : 23; - signed Count : 8; - unsigned Stalled : 1; -#else - unsigned Stalled : 1; - signed Count : 8; - unsigned Period : 23; -#endif - }; - struct{ - unsigned value : 32; - }; - } tTimerOutput; - typedef - union{ - struct{ -#ifdef __vxworks - unsigned StallPeriod : 24; - unsigned AverageSize : 7; - unsigned UpdateWhenEmpty : 1; -#else - unsigned UpdateWhenEmpty : 1; - unsigned AverageSize : 7; - unsigned StallPeriod : 24; -#endif - }; - struct{ - unsigned value : 32; - }; - } tTimerConfig; - - - typedef enum - { - } tOutput_IfaceConstants; - - virtual tOutput readOutput(tRioStatusCode *status) = 0; - virtual bool readOutput_Direction(tRioStatusCode *status) = 0; - virtual signed int readOutput_Value(tRioStatusCode *status) = 0; - - - typedef enum - { - } tConfig_IfaceConstants; - - virtual void writeConfig(tConfig value, tRioStatusCode *status) = 0; - virtual void writeConfig_UpSource_Channel(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeConfig_UpSource_Module(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeConfig_UpSource_AnalogTrigger(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_DownSource_Channel(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeConfig_DownSource_Module(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeConfig_DownSource_AnalogTrigger(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_IndexSource_Channel(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeConfig_IndexSource_Module(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeConfig_IndexSource_AnalogTrigger(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_IndexActiveHigh(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_UpRisingEdge(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_UpFallingEdge(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_DownRisingEdge(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_DownFallingEdge(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_Mode(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeConfig_PulseLengthThreshold(unsigned short value, tRioStatusCode *status) = 0; - virtual void writeConfig_Enable(bool value, tRioStatusCode *status) = 0; - virtual tConfig readConfig(tRioStatusCode *status) = 0; - virtual unsigned char readConfig_UpSource_Channel(tRioStatusCode *status) = 0; - virtual unsigned char readConfig_UpSource_Module(tRioStatusCode *status) = 0; - virtual bool readConfig_UpSource_AnalogTrigger(tRioStatusCode *status) = 0; - virtual unsigned char readConfig_DownSource_Channel(tRioStatusCode *status) = 0; - virtual unsigned char readConfig_DownSource_Module(tRioStatusCode *status) = 0; - virtual bool readConfig_DownSource_AnalogTrigger(tRioStatusCode *status) = 0; - virtual unsigned char readConfig_IndexSource_Channel(tRioStatusCode *status) = 0; - virtual unsigned char readConfig_IndexSource_Module(tRioStatusCode *status) = 0; - virtual bool readConfig_IndexSource_AnalogTrigger(tRioStatusCode *status) = 0; - virtual bool readConfig_IndexActiveHigh(tRioStatusCode *status) = 0; - virtual bool readConfig_UpRisingEdge(tRioStatusCode *status) = 0; - virtual bool readConfig_UpFallingEdge(tRioStatusCode *status) = 0; - virtual bool readConfig_DownRisingEdge(tRioStatusCode *status) = 0; - virtual bool readConfig_DownFallingEdge(tRioStatusCode *status) = 0; - virtual unsigned char readConfig_Mode(tRioStatusCode *status) = 0; - virtual unsigned short readConfig_PulseLengthThreshold(tRioStatusCode *status) = 0; - virtual bool readConfig_Enable(tRioStatusCode *status) = 0; - - - typedef enum - { - } tTimerOutput_IfaceConstants; - - virtual tTimerOutput readTimerOutput(tRioStatusCode *status) = 0; - virtual unsigned int readTimerOutput_Period(tRioStatusCode *status) = 0; - virtual signed char readTimerOutput_Count(tRioStatusCode *status) = 0; - virtual bool readTimerOutput_Stalled(tRioStatusCode *status) = 0; - - - typedef enum - { - } tReset_IfaceConstants; - - virtual void strobeReset(tRioStatusCode *status) = 0; - - - typedef enum - { - } tTimerConfig_IfaceConstants; - - virtual void writeTimerConfig(tTimerConfig value, tRioStatusCode *status) = 0; - virtual void writeTimerConfig_StallPeriod(unsigned int value, tRioStatusCode *status) = 0; - virtual void writeTimerConfig_AverageSize(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeTimerConfig_UpdateWhenEmpty(bool value, tRioStatusCode *status) = 0; - virtual tTimerConfig readTimerConfig(tRioStatusCode *status) = 0; - virtual unsigned int readTimerConfig_StallPeriod(tRioStatusCode *status) = 0; - virtual unsigned char readTimerConfig_AverageSize(tRioStatusCode *status) = 0; - virtual bool readTimerConfig_UpdateWhenEmpty(tRioStatusCode *status) = 0; - - - - - -private: - tCounter(const tCounter&); - void operator=(const tCounter&); -}; - -} -} - -#endif // __nFRC_2012_1_6_4_Counter_h__ diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tDIO.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tDIO.h deleted file mode 100644 index babb691e3b..0000000000 --- a/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tDIO.h +++ /dev/null @@ -1,330 +0,0 @@ -// Copyright (c) National Instruments 2008. All Rights Reserved. -// Do Not Edit... this file is generated! - -#ifndef __nFRC_2012_1_6_4_DIO_h__ -#define __nFRC_2012_1_6_4_DIO_h__ - -#include "tSystemInterface.h" - -namespace nFPGA -{ -namespace nFRC_2012_1_6_4 -{ - -class tDIO -{ -public: - tDIO(){} - virtual ~tDIO(){} - - virtual tSystemInterface* getSystemInterface() = 0; - static tDIO* create(unsigned char sys_index, tRioStatusCode *status); - virtual unsigned char getSystemIndex() = 0; - - - typedef enum - { - kNumSystems = 2, - } tIfaceConstants; - - typedef - union{ - struct{ -#ifdef __vxworks - unsigned Period : 16; - unsigned MinHigh : 16; -#else - unsigned MinHigh : 16; - unsigned Period : 16; -#endif - }; - struct{ - unsigned value : 32; - }; - } tPWMConfig; - typedef - union{ - struct{ -#ifdef __vxworks - unsigned RelayFwd : 8; - unsigned RelayRev : 8; - unsigned I2CHeader : 4; -#else - unsigned I2CHeader : 4; - unsigned RelayRev : 8; - unsigned RelayFwd : 8; -#endif - }; - struct{ - unsigned value : 20; - }; - } tSlowValue; - typedef - union{ - struct{ -#ifdef __vxworks - unsigned Transaction : 1; - unsigned Done : 1; - unsigned Aborted : 1; - unsigned DataReceivedHigh : 24; -#else - unsigned DataReceivedHigh : 24; - unsigned Aborted : 1; - unsigned Done : 1; - unsigned Transaction : 1; -#endif - }; - struct{ - unsigned value : 27; - }; - } tI2CStatus; - typedef - union{ - struct{ -#ifdef __vxworks - unsigned Address : 8; - unsigned BytesToRead : 3; - unsigned BytesToWrite : 3; - unsigned DataToSendHigh : 16; - unsigned BitwiseHandshake : 1; -#else - unsigned BitwiseHandshake : 1; - unsigned DataToSendHigh : 16; - unsigned BytesToWrite : 3; - unsigned BytesToRead : 3; - unsigned Address : 8; -#endif - }; - struct{ - unsigned value : 31; - }; - } tI2CConfig; - typedef - union{ - struct{ -#ifdef __vxworks - unsigned PeriodPower : 4; - unsigned OutputSelect_0 : 4; - unsigned OutputSelect_1 : 4; - unsigned OutputSelect_2 : 4; - unsigned OutputSelect_3 : 4; -#else - unsigned OutputSelect_3 : 4; - unsigned OutputSelect_2 : 4; - unsigned OutputSelect_1 : 4; - unsigned OutputSelect_0 : 4; - unsigned PeriodPower : 4; -#endif - }; - struct{ - unsigned value : 20; - }; - } tDO_PWMConfig; - - - typedef enum - { - kNumFilterSelectElements = 16, - } tFilterSelect_IfaceConstants; - - virtual void writeFilterSelect(unsigned char bitfield_index, unsigned char value, tRioStatusCode *status) = 0; - virtual unsigned char readFilterSelect(unsigned char bitfield_index, tRioStatusCode *status) = 0; - - - typedef enum - { - } tI2CDataToSend_IfaceConstants; - - virtual void writeI2CDataToSend(unsigned int value, tRioStatusCode *status) = 0; - virtual unsigned int readI2CDataToSend(tRioStatusCode *status) = 0; - - - typedef enum - { - } tDO_IfaceConstants; - - virtual void writeDO(unsigned short value, tRioStatusCode *status) = 0; - virtual unsigned short readDO(tRioStatusCode *status) = 0; - - - typedef enum - { - kNumFilterPeriodElements = 3, - } tFilterPeriod_IfaceConstants; - - virtual void writeFilterPeriod(unsigned char bitfield_index, unsigned char value, tRioStatusCode *status) = 0; - virtual unsigned char readFilterPeriod(unsigned char bitfield_index, tRioStatusCode *status) = 0; - - - typedef enum - { - } tOutputEnable_IfaceConstants; - - virtual void writeOutputEnable(unsigned short value, tRioStatusCode *status) = 0; - virtual unsigned short readOutputEnable(tRioStatusCode *status) = 0; - - - typedef enum - { - } tPulse_IfaceConstants; - - virtual void writePulse(unsigned short value, tRioStatusCode *status) = 0; - virtual unsigned short readPulse(tRioStatusCode *status) = 0; - - - typedef enum - { - } tSlowValue_IfaceConstants; - - virtual void writeSlowValue(tSlowValue value, tRioStatusCode *status) = 0; - virtual void writeSlowValue_RelayFwd(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeSlowValue_RelayRev(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeSlowValue_I2CHeader(unsigned char value, tRioStatusCode *status) = 0; - virtual tSlowValue readSlowValue(tRioStatusCode *status) = 0; - virtual unsigned char readSlowValue_RelayFwd(tRioStatusCode *status) = 0; - virtual unsigned char readSlowValue_RelayRev(tRioStatusCode *status) = 0; - virtual unsigned char readSlowValue_I2CHeader(tRioStatusCode *status) = 0; - - - typedef enum - { - } tI2CStatus_IfaceConstants; - - virtual tI2CStatus readI2CStatus(tRioStatusCode *status) = 0; - virtual unsigned char readI2CStatus_Transaction(tRioStatusCode *status) = 0; - virtual bool readI2CStatus_Done(tRioStatusCode *status) = 0; - virtual bool readI2CStatus_Aborted(tRioStatusCode *status) = 0; - virtual unsigned int readI2CStatus_DataReceivedHigh(tRioStatusCode *status) = 0; - - - typedef enum - { - } tI2CDataReceived_IfaceConstants; - - virtual unsigned int readI2CDataReceived(tRioStatusCode *status) = 0; - - - typedef enum - { - } tDI_IfaceConstants; - - virtual unsigned short readDI(tRioStatusCode *status) = 0; - - - typedef enum - { - } tPulseLength_IfaceConstants; - - virtual void writePulseLength(unsigned char value, tRioStatusCode *status) = 0; - virtual unsigned char readPulseLength(tRioStatusCode *status) = 0; - - - typedef enum - { - kNumPWMPeriodScaleElements = 10, - } tPWMPeriodScale_IfaceConstants; - - virtual void writePWMPeriodScale(unsigned char bitfield_index, unsigned char value, tRioStatusCode *status) = 0; - virtual unsigned char readPWMPeriodScale(unsigned char bitfield_index, tRioStatusCode *status) = 0; - - - typedef enum - { - kNumDO_PWMDutyCycleElements = 4, - } tDO_PWMDutyCycle_IfaceConstants; - - virtual void writeDO_PWMDutyCycle(unsigned char bitfield_index, unsigned char value, tRioStatusCode *status) = 0; - virtual unsigned char readDO_PWMDutyCycle(unsigned char bitfield_index, tRioStatusCode *status) = 0; - - - typedef enum - { - } tBFL_IfaceConstants; - - virtual void writeBFL(bool value, tRioStatusCode *status) = 0; - virtual bool readBFL(tRioStatusCode *status) = 0; - - - typedef enum - { - } tI2CConfig_IfaceConstants; - - virtual void writeI2CConfig(tI2CConfig value, tRioStatusCode *status) = 0; - virtual void writeI2CConfig_Address(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeI2CConfig_BytesToRead(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeI2CConfig_BytesToWrite(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeI2CConfig_DataToSendHigh(unsigned short value, tRioStatusCode *status) = 0; - virtual void writeI2CConfig_BitwiseHandshake(bool value, tRioStatusCode *status) = 0; - virtual tI2CConfig readI2CConfig(tRioStatusCode *status) = 0; - virtual unsigned char readI2CConfig_Address(tRioStatusCode *status) = 0; - virtual unsigned char readI2CConfig_BytesToRead(tRioStatusCode *status) = 0; - virtual unsigned char readI2CConfig_BytesToWrite(tRioStatusCode *status) = 0; - virtual unsigned short readI2CConfig_DataToSendHigh(tRioStatusCode *status) = 0; - virtual bool readI2CConfig_BitwiseHandshake(tRioStatusCode *status) = 0; - - - typedef enum - { - } tDO_PWMConfig_IfaceConstants; - - virtual void writeDO_PWMConfig(tDO_PWMConfig value, tRioStatusCode *status) = 0; - virtual void writeDO_PWMConfig_PeriodPower(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeDO_PWMConfig_OutputSelect_0(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeDO_PWMConfig_OutputSelect_1(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeDO_PWMConfig_OutputSelect_2(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeDO_PWMConfig_OutputSelect_3(unsigned char value, tRioStatusCode *status) = 0; - virtual tDO_PWMConfig readDO_PWMConfig(tRioStatusCode *status) = 0; - virtual unsigned char readDO_PWMConfig_PeriodPower(tRioStatusCode *status) = 0; - virtual unsigned char readDO_PWMConfig_OutputSelect_0(tRioStatusCode *status) = 0; - virtual unsigned char readDO_PWMConfig_OutputSelect_1(tRioStatusCode *status) = 0; - virtual unsigned char readDO_PWMConfig_OutputSelect_2(tRioStatusCode *status) = 0; - virtual unsigned char readDO_PWMConfig_OutputSelect_3(tRioStatusCode *status) = 0; - - - typedef enum - { - } tI2CStart_IfaceConstants; - - virtual void strobeI2CStart(tRioStatusCode *status) = 0; - - - - typedef enum - { - } tLoopTiming_IfaceConstants; - - virtual unsigned short readLoopTiming(tRioStatusCode *status) = 0; - - - typedef enum - { - } tPWMConfig_IfaceConstants; - - virtual void writePWMConfig(tPWMConfig value, tRioStatusCode *status) = 0; - virtual void writePWMConfig_Period(unsigned short value, tRioStatusCode *status) = 0; - virtual void writePWMConfig_MinHigh(unsigned short value, tRioStatusCode *status) = 0; - virtual tPWMConfig readPWMConfig(tRioStatusCode *status) = 0; - virtual unsigned short readPWMConfig_Period(tRioStatusCode *status) = 0; - virtual unsigned short readPWMConfig_MinHigh(tRioStatusCode *status) = 0; - - - - typedef enum - { - kNumPWMValueRegisters = 10, - } tPWMValue_IfaceConstants; - - virtual void writePWMValue(unsigned char reg_index, unsigned char value, tRioStatusCode *status) = 0; - virtual unsigned char readPWMValue(unsigned char reg_index, tRioStatusCode *status) = 0; - - - -private: - tDIO(const tDIO&); - void operator=(const tDIO&); -}; - -} -} - -#endif // __nFRC_2012_1_6_4_DIO_h__ diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tDMA.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tDMA.h deleted file mode 100644 index 006ec60a9a..0000000000 --- a/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tDMA.h +++ /dev/null @@ -1,188 +0,0 @@ -// Copyright (c) National Instruments 2008. All Rights Reserved. -// Do Not Edit... this file is generated! - -#ifndef __nFRC_2012_1_6_4_DMA_h__ -#define __nFRC_2012_1_6_4_DMA_h__ - -#include "tSystemInterface.h" - -namespace nFPGA -{ -namespace nFRC_2012_1_6_4 -{ - -class tDMA -{ -public: - tDMA(){} - virtual ~tDMA(){} - - virtual tSystemInterface* getSystemInterface() = 0; - static tDMA* create(tRioStatusCode *status); - - typedef enum - { - kNumSystems = 1, - } tIfaceConstants; - - typedef - union{ - struct{ -#ifdef __vxworks - unsigned Pause : 1; - unsigned Enable_AI0_Low : 1; - unsigned Enable_AI0_High : 1; - unsigned Enable_AIAveraged0_Low : 1; - unsigned Enable_AIAveraged0_High : 1; - unsigned Enable_AI1_Low : 1; - unsigned Enable_AI1_High : 1; - unsigned Enable_AIAveraged1_Low : 1; - unsigned Enable_AIAveraged1_High : 1; - unsigned Enable_Accumulator0 : 1; - unsigned Enable_Accumulator1 : 1; - unsigned Enable_DI : 1; - unsigned Enable_AnalogTriggers : 1; - unsigned Enable_Counters_Low : 1; - unsigned Enable_Counters_High : 1; - unsigned Enable_CounterTimers_Low : 1; - unsigned Enable_CounterTimers_High : 1; - unsigned Enable_Encoders : 1; - unsigned Enable_EncoderTimers : 1; - unsigned ExternalClock : 1; -#else - unsigned ExternalClock : 1; - unsigned Enable_EncoderTimers : 1; - unsigned Enable_Encoders : 1; - unsigned Enable_CounterTimers_High : 1; - unsigned Enable_CounterTimers_Low : 1; - unsigned Enable_Counters_High : 1; - unsigned Enable_Counters_Low : 1; - unsigned Enable_AnalogTriggers : 1; - unsigned Enable_DI : 1; - unsigned Enable_Accumulator1 : 1; - unsigned Enable_Accumulator0 : 1; - unsigned Enable_AIAveraged1_High : 1; - unsigned Enable_AIAveraged1_Low : 1; - unsigned Enable_AI1_High : 1; - unsigned Enable_AI1_Low : 1; - unsigned Enable_AIAveraged0_High : 1; - unsigned Enable_AIAveraged0_Low : 1; - unsigned Enable_AI0_High : 1; - unsigned Enable_AI0_Low : 1; - unsigned Pause : 1; -#endif - }; - struct{ - unsigned value : 20; - }; - } tConfig; - typedef - union{ - struct{ -#ifdef __vxworks - unsigned ExternalClockSource_Channel : 4; - unsigned ExternalClockSource_Module : 1; - unsigned ExternalClockSource_AnalogTrigger : 1; - unsigned RisingEdge : 1; - unsigned FallingEdge : 1; -#else - unsigned FallingEdge : 1; - unsigned RisingEdge : 1; - unsigned ExternalClockSource_AnalogTrigger : 1; - unsigned ExternalClockSource_Module : 1; - unsigned ExternalClockSource_Channel : 4; -#endif - }; - struct{ - unsigned value : 8; - }; - } tExternalTriggers; - - - - typedef enum - { - } tRate_IfaceConstants; - - virtual void writeRate(unsigned int value, tRioStatusCode *status) = 0; - virtual unsigned int readRate(tRioStatusCode *status) = 0; - - - typedef enum - { - } tConfig_IfaceConstants; - - virtual void writeConfig(tConfig value, tRioStatusCode *status) = 0; - virtual void writeConfig_Pause(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_Enable_AI0_Low(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_Enable_AI0_High(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_Enable_AIAveraged0_Low(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_Enable_AIAveraged0_High(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_Enable_AI1_Low(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_Enable_AI1_High(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_Enable_AIAveraged1_Low(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_Enable_AIAveraged1_High(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_Enable_Accumulator0(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_Enable_Accumulator1(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_Enable_DI(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_Enable_AnalogTriggers(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_Enable_Counters_Low(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_Enable_Counters_High(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_Enable_CounterTimers_Low(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_Enable_CounterTimers_High(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_Enable_Encoders(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_Enable_EncoderTimers(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_ExternalClock(bool value, tRioStatusCode *status) = 0; - virtual tConfig readConfig(tRioStatusCode *status) = 0; - virtual bool readConfig_Pause(tRioStatusCode *status) = 0; - virtual bool readConfig_Enable_AI0_Low(tRioStatusCode *status) = 0; - virtual bool readConfig_Enable_AI0_High(tRioStatusCode *status) = 0; - virtual bool readConfig_Enable_AIAveraged0_Low(tRioStatusCode *status) = 0; - virtual bool readConfig_Enable_AIAveraged0_High(tRioStatusCode *status) = 0; - virtual bool readConfig_Enable_AI1_Low(tRioStatusCode *status) = 0; - virtual bool readConfig_Enable_AI1_High(tRioStatusCode *status) = 0; - virtual bool readConfig_Enable_AIAveraged1_Low(tRioStatusCode *status) = 0; - virtual bool readConfig_Enable_AIAveraged1_High(tRioStatusCode *status) = 0; - virtual bool readConfig_Enable_Accumulator0(tRioStatusCode *status) = 0; - virtual bool readConfig_Enable_Accumulator1(tRioStatusCode *status) = 0; - virtual bool readConfig_Enable_DI(tRioStatusCode *status) = 0; - virtual bool readConfig_Enable_AnalogTriggers(tRioStatusCode *status) = 0; - virtual bool readConfig_Enable_Counters_Low(tRioStatusCode *status) = 0; - virtual bool readConfig_Enable_Counters_High(tRioStatusCode *status) = 0; - virtual bool readConfig_Enable_CounterTimers_Low(tRioStatusCode *status) = 0; - virtual bool readConfig_Enable_CounterTimers_High(tRioStatusCode *status) = 0; - virtual bool readConfig_Enable_Encoders(tRioStatusCode *status) = 0; - virtual bool readConfig_Enable_EncoderTimers(tRioStatusCode *status) = 0; - virtual bool readConfig_ExternalClock(tRioStatusCode *status) = 0; - - - typedef enum - { - kNumExternalTriggersElements = 4, - } tExternalTriggers_IfaceConstants; - - virtual void writeExternalTriggers(unsigned char bitfield_index, tExternalTriggers value, tRioStatusCode *status) = 0; - virtual void writeExternalTriggers_ExternalClockSource_Channel(unsigned char bitfield_index, unsigned char value, tRioStatusCode *status) = 0; - virtual void writeExternalTriggers_ExternalClockSource_Module(unsigned char bitfield_index, unsigned char value, tRioStatusCode *status) = 0; - virtual void writeExternalTriggers_ExternalClockSource_AnalogTrigger(unsigned char bitfield_index, bool value, tRioStatusCode *status) = 0; - virtual void writeExternalTriggers_RisingEdge(unsigned char bitfield_index, bool value, tRioStatusCode *status) = 0; - virtual void writeExternalTriggers_FallingEdge(unsigned char bitfield_index, bool value, tRioStatusCode *status) = 0; - virtual tExternalTriggers readExternalTriggers(unsigned char bitfield_index, tRioStatusCode *status) = 0; - virtual unsigned char readExternalTriggers_ExternalClockSource_Channel(unsigned char bitfield_index, tRioStatusCode *status) = 0; - virtual unsigned char readExternalTriggers_ExternalClockSource_Module(unsigned char bitfield_index, tRioStatusCode *status) = 0; - virtual bool readExternalTriggers_ExternalClockSource_AnalogTrigger(unsigned char bitfield_index, tRioStatusCode *status) = 0; - virtual bool readExternalTriggers_RisingEdge(unsigned char bitfield_index, tRioStatusCode *status) = 0; - virtual bool readExternalTriggers_FallingEdge(unsigned char bitfield_index, tRioStatusCode *status) = 0; - - - - -private: - tDMA(const tDMA&); - void operator=(const tDMA&); -}; - -} -} - -#endif // __nFRC_2012_1_6_4_DMA_h__ diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tEncoder.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tEncoder.h deleted file mode 100644 index 7255920278..0000000000 --- a/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tEncoder.h +++ /dev/null @@ -1,199 +0,0 @@ -// Copyright (c) National Instruments 2008. All Rights Reserved. -// Do Not Edit... this file is generated! - -#ifndef __nFRC_2012_1_6_4_Encoder_h__ -#define __nFRC_2012_1_6_4_Encoder_h__ - -#include "tSystemInterface.h" - -namespace nFPGA -{ -namespace nFRC_2012_1_6_4 -{ - -class tEncoder -{ -public: - tEncoder(){} - virtual ~tEncoder(){} - - virtual tSystemInterface* getSystemInterface() = 0; - static tEncoder* create(unsigned char sys_index, tRioStatusCode *status); - virtual unsigned char getSystemIndex() = 0; - - - typedef enum - { - kNumSystems = 4, - } tIfaceConstants; - - typedef - union{ - struct{ -#ifdef __vxworks - unsigned Direction : 1; - signed Value : 31; -#else - signed Value : 31; - unsigned Direction : 1; -#endif - }; - struct{ - unsigned value : 32; - }; - } tOutput; - typedef - union{ - struct{ -#ifdef __vxworks - unsigned ASource_Channel : 4; - unsigned ASource_Module : 1; - unsigned ASource_AnalogTrigger : 1; - unsigned BSource_Channel : 4; - unsigned BSource_Module : 1; - unsigned BSource_AnalogTrigger : 1; - unsigned IndexSource_Channel : 4; - unsigned IndexSource_Module : 1; - unsigned IndexSource_AnalogTrigger : 1; - unsigned IndexActiveHigh : 1; - unsigned Reverse : 1; - unsigned Enable : 1; -#else - unsigned Enable : 1; - unsigned Reverse : 1; - unsigned IndexActiveHigh : 1; - unsigned IndexSource_AnalogTrigger : 1; - unsigned IndexSource_Module : 1; - unsigned IndexSource_Channel : 4; - unsigned BSource_AnalogTrigger : 1; - unsigned BSource_Module : 1; - unsigned BSource_Channel : 4; - unsigned ASource_AnalogTrigger : 1; - unsigned ASource_Module : 1; - unsigned ASource_Channel : 4; -#endif - }; - struct{ - unsigned value : 21; - }; - } tConfig; - typedef - union{ - struct{ -#ifdef __vxworks - unsigned Period : 23; - signed Count : 8; - unsigned Stalled : 1; -#else - unsigned Stalled : 1; - signed Count : 8; - unsigned Period : 23; -#endif - }; - struct{ - unsigned value : 32; - }; - } tTimerOutput; - typedef - union{ - struct{ -#ifdef __vxworks - unsigned StallPeriod : 24; - unsigned AverageSize : 7; - unsigned UpdateWhenEmpty : 1; -#else - unsigned UpdateWhenEmpty : 1; - unsigned AverageSize : 7; - unsigned StallPeriod : 24; -#endif - }; - struct{ - unsigned value : 32; - }; - } tTimerConfig; - - - typedef enum - { - } tOutput_IfaceConstants; - - virtual tOutput readOutput(tRioStatusCode *status) = 0; - virtual bool readOutput_Direction(tRioStatusCode *status) = 0; - virtual signed int readOutput_Value(tRioStatusCode *status) = 0; - - - typedef enum - { - } tConfig_IfaceConstants; - - virtual void writeConfig(tConfig value, tRioStatusCode *status) = 0; - virtual void writeConfig_ASource_Channel(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeConfig_ASource_Module(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeConfig_ASource_AnalogTrigger(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_BSource_Channel(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeConfig_BSource_Module(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeConfig_BSource_AnalogTrigger(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_IndexSource_Channel(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeConfig_IndexSource_Module(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeConfig_IndexSource_AnalogTrigger(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_IndexActiveHigh(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_Reverse(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_Enable(bool value, tRioStatusCode *status) = 0; - virtual tConfig readConfig(tRioStatusCode *status) = 0; - virtual unsigned char readConfig_ASource_Channel(tRioStatusCode *status) = 0; - virtual unsigned char readConfig_ASource_Module(tRioStatusCode *status) = 0; - virtual bool readConfig_ASource_AnalogTrigger(tRioStatusCode *status) = 0; - virtual unsigned char readConfig_BSource_Channel(tRioStatusCode *status) = 0; - virtual unsigned char readConfig_BSource_Module(tRioStatusCode *status) = 0; - virtual bool readConfig_BSource_AnalogTrigger(tRioStatusCode *status) = 0; - virtual unsigned char readConfig_IndexSource_Channel(tRioStatusCode *status) = 0; - virtual unsigned char readConfig_IndexSource_Module(tRioStatusCode *status) = 0; - virtual bool readConfig_IndexSource_AnalogTrigger(tRioStatusCode *status) = 0; - virtual bool readConfig_IndexActiveHigh(tRioStatusCode *status) = 0; - virtual bool readConfig_Reverse(tRioStatusCode *status) = 0; - virtual bool readConfig_Enable(tRioStatusCode *status) = 0; - - - typedef enum - { - } tTimerOutput_IfaceConstants; - - virtual tTimerOutput readTimerOutput(tRioStatusCode *status) = 0; - virtual unsigned int readTimerOutput_Period(tRioStatusCode *status) = 0; - virtual signed char readTimerOutput_Count(tRioStatusCode *status) = 0; - virtual bool readTimerOutput_Stalled(tRioStatusCode *status) = 0; - - - typedef enum - { - } tReset_IfaceConstants; - - virtual void strobeReset(tRioStatusCode *status) = 0; - - - typedef enum - { - } tTimerConfig_IfaceConstants; - - virtual void writeTimerConfig(tTimerConfig value, tRioStatusCode *status) = 0; - virtual void writeTimerConfig_StallPeriod(unsigned int value, tRioStatusCode *status) = 0; - virtual void writeTimerConfig_AverageSize(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeTimerConfig_UpdateWhenEmpty(bool value, tRioStatusCode *status) = 0; - virtual tTimerConfig readTimerConfig(tRioStatusCode *status) = 0; - virtual unsigned int readTimerConfig_StallPeriod(tRioStatusCode *status) = 0; - virtual unsigned char readTimerConfig_AverageSize(tRioStatusCode *status) = 0; - virtual bool readTimerConfig_UpdateWhenEmpty(tRioStatusCode *status) = 0; - - - - - -private: - tEncoder(const tEncoder&); - void operator=(const tEncoder&); -}; - -} -} - -#endif // __nFRC_2012_1_6_4_Encoder_h__ diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tGlobal.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tGlobal.h deleted file mode 100644 index 0782f35109..0000000000 --- a/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tGlobal.h +++ /dev/null @@ -1,70 +0,0 @@ -// Copyright (c) National Instruments 2008. All Rights Reserved. -// Do Not Edit... this file is generated! - -#ifndef __nFRC_2012_1_6_4_Global_h__ -#define __nFRC_2012_1_6_4_Global_h__ - -#include "tSystemInterface.h" - -namespace nFPGA -{ -namespace nFRC_2012_1_6_4 -{ - -class tGlobal -{ -public: - tGlobal(){} - virtual ~tGlobal(){} - - virtual tSystemInterface* getSystemInterface() = 0; - static tGlobal* create(tRioStatusCode *status); - - typedef enum - { - kNumSystems = 1, - } tIfaceConstants; - - - - - typedef enum - { - } tVersion_IfaceConstants; - - virtual unsigned short readVersion(tRioStatusCode *status) = 0; - - - typedef enum - { - } tLocalTime_IfaceConstants; - - virtual unsigned int readLocalTime(tRioStatusCode *status) = 0; - - - typedef enum - { - } tFPGA_LED_IfaceConstants; - - virtual void writeFPGA_LED(bool value, tRioStatusCode *status) = 0; - virtual bool readFPGA_LED(tRioStatusCode *status) = 0; - - - typedef enum - { - } tRevision_IfaceConstants; - - virtual unsigned int readRevision(tRioStatusCode *status) = 0; - - - - -private: - tGlobal(const tGlobal&); - void operator=(const tGlobal&); -}; - -} -} - -#endif // __nFRC_2012_1_6_4_Global_h__ diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tInterrupt.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tInterrupt.h deleted file mode 100644 index 40186e539d..0000000000 --- a/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tInterrupt.h +++ /dev/null @@ -1,93 +0,0 @@ -// Copyright (c) National Instruments 2008. All Rights Reserved. -// Do Not Edit... this file is generated! - -#ifndef __nFRC_2012_1_6_4_Interrupt_h__ -#define __nFRC_2012_1_6_4_Interrupt_h__ - -#include "tSystemInterface.h" - -namespace nFPGA -{ -namespace nFRC_2012_1_6_4 -{ - -class tInterrupt -{ -public: - tInterrupt(){} - virtual ~tInterrupt(){} - - virtual tSystemInterface* getSystemInterface() = 0; - static tInterrupt* create(unsigned char sys_index, tRioStatusCode *status); - virtual unsigned char getSystemIndex() = 0; - - - typedef enum - { - kNumSystems = 8, - } tIfaceConstants; - - typedef - union{ - struct{ -#ifdef __vxworks - unsigned Source_Channel : 4; - unsigned Source_Module : 1; - unsigned Source_AnalogTrigger : 1; - unsigned RisingEdge : 1; - unsigned FallingEdge : 1; - unsigned WaitForAck : 1; -#else - unsigned WaitForAck : 1; - unsigned FallingEdge : 1; - unsigned RisingEdge : 1; - unsigned Source_AnalogTrigger : 1; - unsigned Source_Module : 1; - unsigned Source_Channel : 4; -#endif - }; - struct{ - unsigned value : 9; - }; - } tConfig; - - - typedef enum - { - } tTimeStamp_IfaceConstants; - - virtual unsigned int readTimeStamp(tRioStatusCode *status) = 0; - - - typedef enum - { - } tConfig_IfaceConstants; - - virtual void writeConfig(tConfig value, tRioStatusCode *status) = 0; - virtual void writeConfig_Source_Channel(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeConfig_Source_Module(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeConfig_Source_AnalogTrigger(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_RisingEdge(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_FallingEdge(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_WaitForAck(bool value, tRioStatusCode *status) = 0; - virtual tConfig readConfig(tRioStatusCode *status) = 0; - virtual unsigned char readConfig_Source_Channel(tRioStatusCode *status) = 0; - virtual unsigned char readConfig_Source_Module(tRioStatusCode *status) = 0; - virtual bool readConfig_Source_AnalogTrigger(tRioStatusCode *status) = 0; - virtual bool readConfig_RisingEdge(tRioStatusCode *status) = 0; - virtual bool readConfig_FallingEdge(tRioStatusCode *status) = 0; - virtual bool readConfig_WaitForAck(tRioStatusCode *status) = 0; - - - - - -private: - tInterrupt(const tInterrupt&); - void operator=(const tInterrupt&); -}; - -} -} - -#endif // __nFRC_2012_1_6_4_Interrupt_h__ diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tSPI.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tSPI.h deleted file mode 100644 index 45c208c6ed..0000000000 --- a/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tSPI.h +++ /dev/null @@ -1,228 +0,0 @@ -// Copyright (c) National Instruments 2008. All Rights Reserved. -// Do Not Edit... this file is generated! - -#ifndef __nFRC_2012_1_6_4_SPI_h__ -#define __nFRC_2012_1_6_4_SPI_h__ - -#include "tSystemInterface.h" - -namespace nFPGA -{ -namespace nFRC_2012_1_6_4 -{ - -class tSPI -{ -public: - tSPI(){} - virtual ~tSPI(){} - - virtual tSystemInterface* getSystemInterface() = 0; - static tSPI* create(tRioStatusCode *status); - - typedef enum - { - kNumSystems = 1, - } tIfaceConstants; - - typedef - union{ - struct{ -#ifdef __vxworks - unsigned ReceivedDataOverflow : 1; - unsigned Idle : 1; -#else - unsigned Idle : 1; - unsigned ReceivedDataOverflow : 1; -#endif - }; - struct{ - unsigned value : 2; - }; - } tStatus; - typedef - union{ - struct{ -#ifdef __vxworks - unsigned BusBitWidth : 8; - unsigned ClockHalfPeriodDelay : 8; - unsigned MSBfirst : 1; - unsigned DataOnFalling : 1; - unsigned LatchFirst : 1; - unsigned LatchLast : 1; - unsigned FramePolarity : 1; - unsigned WriteOnly : 1; - unsigned ClockPolarity : 1; -#else - unsigned ClockPolarity : 1; - unsigned WriteOnly : 1; - unsigned FramePolarity : 1; - unsigned LatchLast : 1; - unsigned LatchFirst : 1; - unsigned DataOnFalling : 1; - unsigned MSBfirst : 1; - unsigned ClockHalfPeriodDelay : 8; - unsigned BusBitWidth : 8; -#endif - }; - struct{ - unsigned value : 23; - }; - } tConfig; - typedef - union{ - struct{ -#ifdef __vxworks - unsigned SCLK_Channel : 4; - unsigned SCLK_Module : 1; - unsigned MOSI_Channel : 4; - unsigned MOSI_Module : 1; - unsigned MISO_Channel : 4; - unsigned MISO_Module : 1; - unsigned SS_Channel : 4; - unsigned SS_Module : 1; -#else - unsigned SS_Module : 1; - unsigned SS_Channel : 4; - unsigned MISO_Module : 1; - unsigned MISO_Channel : 4; - unsigned MOSI_Module : 1; - unsigned MOSI_Channel : 4; - unsigned SCLK_Module : 1; - unsigned SCLK_Channel : 4; -#endif - }; - struct{ - unsigned value : 20; - }; - } tChannels; - - - - typedef enum - { - } tStatus_IfaceConstants; - - virtual tStatus readStatus(tRioStatusCode *status) = 0; - virtual bool readStatus_ReceivedDataOverflow(tRioStatusCode *status) = 0; - virtual bool readStatus_Idle(tRioStatusCode *status) = 0; - - - typedef enum - { - } tReceivedData_IfaceConstants; - - virtual unsigned int readReceivedData(tRioStatusCode *status) = 0; - - - typedef enum - { - } tDataToLoad_IfaceConstants; - - virtual void writeDataToLoad(unsigned int value, tRioStatusCode *status) = 0; - virtual unsigned int readDataToLoad(tRioStatusCode *status) = 0; - - - typedef enum - { - } tConfig_IfaceConstants; - - virtual void writeConfig(tConfig value, tRioStatusCode *status) = 0; - virtual void writeConfig_BusBitWidth(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeConfig_ClockHalfPeriodDelay(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeConfig_MSBfirst(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_DataOnFalling(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_LatchFirst(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_LatchLast(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_FramePolarity(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_WriteOnly(bool value, tRioStatusCode *status) = 0; - virtual void writeConfig_ClockPolarity(bool value, tRioStatusCode *status) = 0; - virtual tConfig readConfig(tRioStatusCode *status) = 0; - virtual unsigned char readConfig_BusBitWidth(tRioStatusCode *status) = 0; - virtual unsigned char readConfig_ClockHalfPeriodDelay(tRioStatusCode *status) = 0; - virtual bool readConfig_MSBfirst(tRioStatusCode *status) = 0; - virtual bool readConfig_DataOnFalling(tRioStatusCode *status) = 0; - virtual bool readConfig_LatchFirst(tRioStatusCode *status) = 0; - virtual bool readConfig_LatchLast(tRioStatusCode *status) = 0; - virtual bool readConfig_FramePolarity(tRioStatusCode *status) = 0; - virtual bool readConfig_WriteOnly(tRioStatusCode *status) = 0; - virtual bool readConfig_ClockPolarity(tRioStatusCode *status) = 0; - - - typedef enum - { - } tClearReceivedData_IfaceConstants; - - virtual void strobeClearReceivedData(tRioStatusCode *status) = 0; - - - typedef enum - { - } tReceivedElements_IfaceConstants; - - virtual unsigned short readReceivedElements(tRioStatusCode *status) = 0; - - - typedef enum - { - } tLoad_IfaceConstants; - - virtual void strobeLoad(tRioStatusCode *status) = 0; - - - typedef enum - { - } tReset_IfaceConstants; - - virtual void strobeReset(tRioStatusCode *status) = 0; - - - typedef enum - { - } tChannels_IfaceConstants; - - virtual void writeChannels(tChannels value, tRioStatusCode *status) = 0; - virtual void writeChannels_SCLK_Channel(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeChannels_SCLK_Module(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeChannels_MOSI_Channel(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeChannels_MOSI_Module(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeChannels_MISO_Channel(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeChannels_MISO_Module(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeChannels_SS_Channel(unsigned char value, tRioStatusCode *status) = 0; - virtual void writeChannels_SS_Module(unsigned char value, tRioStatusCode *status) = 0; - virtual tChannels readChannels(tRioStatusCode *status) = 0; - virtual unsigned char readChannels_SCLK_Channel(tRioStatusCode *status) = 0; - virtual unsigned char readChannels_SCLK_Module(tRioStatusCode *status) = 0; - virtual unsigned char readChannels_MOSI_Channel(tRioStatusCode *status) = 0; - virtual unsigned char readChannels_MOSI_Module(tRioStatusCode *status) = 0; - virtual unsigned char readChannels_MISO_Channel(tRioStatusCode *status) = 0; - virtual unsigned char readChannels_MISO_Module(tRioStatusCode *status) = 0; - virtual unsigned char readChannels_SS_Channel(tRioStatusCode *status) = 0; - virtual unsigned char readChannels_SS_Module(tRioStatusCode *status) = 0; - - - typedef enum - { - } tAvailableToLoad_IfaceConstants; - - virtual unsigned short readAvailableToLoad(tRioStatusCode *status) = 0; - - - typedef enum - { - } tReadReceivedData_IfaceConstants; - - virtual void strobeReadReceivedData(tRioStatusCode *status) = 0; - - - - -private: - tSPI(const tSPI&); - void operator=(const tSPI&); -}; - -} -} - -#endif // __nFRC_2012_1_6_4_SPI_h__ diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tSolenoid.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tSolenoid.h deleted file mode 100644 index 8627eea6cc..0000000000 --- a/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tSolenoid.h +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright (c) National Instruments 2008. All Rights Reserved. -// Do Not Edit... this file is generated! - -#ifndef __nFRC_2012_1_6_4_Solenoid_h__ -#define __nFRC_2012_1_6_4_Solenoid_h__ - -#include "tSystemInterface.h" - -namespace nFPGA -{ -namespace nFRC_2012_1_6_4 -{ - -class tSolenoid -{ -public: - tSolenoid(){} - virtual ~tSolenoid(){} - - virtual tSystemInterface* getSystemInterface() = 0; - static tSolenoid* create(tRioStatusCode *status); - - typedef enum - { - kNumSystems = 1, - } tIfaceConstants; - - - - - typedef enum - { - kNumDO7_0Elements = 2, - } tDO7_0_IfaceConstants; - - virtual void writeDO7_0(unsigned char bitfield_index, unsigned char value, tRioStatusCode *status) = 0; - virtual unsigned char readDO7_0(unsigned char bitfield_index, tRioStatusCode *status) = 0; - - - - -private: - tSolenoid(const tSolenoid&); - void operator=(const tSolenoid&); -}; - -} -} - -#endif // __nFRC_2012_1_6_4_Solenoid_h__ diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tSysWatchdog.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tSysWatchdog.h deleted file mode 100644 index 2ef01ffbc4..0000000000 --- a/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tSysWatchdog.h +++ /dev/null @@ -1,71 +0,0 @@ -// Copyright (c) National Instruments 2008. All Rights Reserved. -// Do Not Edit... this file is generated! - -#ifndef __nFRC_2012_1_6_4_SysWatchdog_h__ -#define __nFRC_2012_1_6_4_SysWatchdog_h__ - -#include "tSystemInterface.h" - -namespace nFPGA -{ -namespace nFRC_2012_1_6_4 -{ - -class tSysWatchdog -{ -public: - tSysWatchdog(){} - virtual ~tSysWatchdog(){} - - virtual tSystemInterface* getSystemInterface() = 0; - static tSysWatchdog* create(tRioStatusCode *status); - - typedef enum - { - kNumSystems = 1, - } tIfaceConstants; - - - - - typedef enum - { - } tCommand_IfaceConstants; - - virtual void writeCommand(unsigned short value, tRioStatusCode *status) = 0; - virtual unsigned short readCommand(tRioStatusCode *status) = 0; - - - typedef enum - { - } tChallenge_IfaceConstants; - - virtual unsigned char readChallenge(tRioStatusCode *status) = 0; - - - typedef enum - { - } tActive_IfaceConstants; - - virtual void writeActive(bool value, tRioStatusCode *status) = 0; - virtual bool readActive(tRioStatusCode *status) = 0; - - - typedef enum - { - } tTimer_IfaceConstants; - - virtual unsigned int readTimer(tRioStatusCode *status) = 0; - - - - -private: - tSysWatchdog(const tSysWatchdog&); - void operator=(const tSysWatchdog&); -}; - -} -} - -#endif // __nFRC_2012_1_6_4_SysWatchdog_h__ diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tWatchdog.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tWatchdog.h deleted file mode 100644 index a589eda553..0000000000 --- a/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tWatchdog.h +++ /dev/null @@ -1,108 +0,0 @@ -// Copyright (c) National Instruments 2008. All Rights Reserved. -// Do Not Edit... this file is generated! - -#ifndef __nFRC_2012_1_6_4_Watchdog_h__ -#define __nFRC_2012_1_6_4_Watchdog_h__ - -#include "tSystemInterface.h" - -namespace nFPGA -{ -namespace nFRC_2012_1_6_4 -{ - -class tWatchdog -{ -public: - tWatchdog(){} - virtual ~tWatchdog(){} - - virtual tSystemInterface* getSystemInterface() = 0; - static tWatchdog* create(tRioStatusCode *status); - - typedef enum - { - kNumSystems = 1, - } tIfaceConstants; - - typedef - union{ - struct{ -#ifdef __vxworks - unsigned SystemActive : 1; - unsigned Alive : 1; - unsigned SysDisableCount : 15; - unsigned DisableCount : 15; -#else - unsigned DisableCount : 15; - unsigned SysDisableCount : 15; - unsigned Alive : 1; - unsigned SystemActive : 1; -#endif - }; - struct{ - unsigned value : 32; - }; - } tStatus; - - - - typedef enum - { - } tStatus_IfaceConstants; - - virtual tStatus readStatus(tRioStatusCode *status) = 0; - virtual bool readStatus_SystemActive(tRioStatusCode *status) = 0; - virtual bool readStatus_Alive(tRioStatusCode *status) = 0; - virtual unsigned short readStatus_SysDisableCount(tRioStatusCode *status) = 0; - virtual unsigned short readStatus_DisableCount(tRioStatusCode *status) = 0; - - - typedef enum - { - } tKill_IfaceConstants; - - virtual void strobeKill(tRioStatusCode *status) = 0; - - - typedef enum - { - } tFeed_IfaceConstants; - - virtual void strobeFeed(tRioStatusCode *status) = 0; - - - typedef enum - { - } tTimer_IfaceConstants; - - virtual unsigned int readTimer(tRioStatusCode *status) = 0; - - - typedef enum - { - } tExpiration_IfaceConstants; - - virtual void writeExpiration(unsigned int value, tRioStatusCode *status) = 0; - virtual unsigned int readExpiration(tRioStatusCode *status) = 0; - - - typedef enum - { - } tImmortal_IfaceConstants; - - virtual void writeImmortal(bool value, tRioStatusCode *status) = 0; - virtual bool readImmortal(tRioStatusCode *status) = 0; - - - - -private: - tWatchdog(const tWatchdog&); - void operator=(const tWatchdog&); -}; - -} -} - -#endif // __nFRC_2012_1_6_4_Watchdog_h__ diff --git a/hal/lib/athena/FRC_NetworkCommunication/CANSessionMux.h b/hal/lib/athena/FRC_NetworkCommunication/CANSessionMux.h new file mode 100644 index 0000000000..fe4cde0c8a --- /dev/null +++ b/hal/lib/athena/FRC_NetworkCommunication/CANSessionMux.h @@ -0,0 +1,66 @@ +// CANSessionMux.h +// +// Defines the API for building a CAN Interface Plugin to support +// PWM-cable-free CAN motor control on FRC robots. This allows you +// to connect any CAN interface to the secure Jaguar CAN driver. +// + +#ifndef __CANSessionMux_h__ +#define __CANSessionMux_h__ + +#if defined(__vxworks) +#include +#else +#include +#endif + +#define CAN_SEND_PERIOD_NO_REPEAT 0 +#define CAN_SEND_PERIOD_STOP_REPEATING -1 + +/* Flags in the upper bits of the messageID */ +#define CAN_IS_FRAME_REMOTE 0x80000000 +#define CAN_IS_FRAME_11BIT 0x40000000 + +#define ERR_CANSessionMux_InvalidBuffer -44086 +#define ERR_CANSessionMux_MessageNotFound -44087 +#define WARN_CANSessionMux_NoToken 44087 +#define ERR_CANSessionMux_NotAllowed -44088 +#define ERR_CANSessionMux_NotInitialized -44089 +#define ERR_CANSessionMux_SessionOverrun 44050 + +struct tCANStreamMessage{ + uint32_t messageID; + uint32_t timeStamp; + uint8_t data[8]; + uint8_t dataSize; +}; + +#ifdef __cplusplus +namespace nCANSessionMux +{ + void sendMessage_wrapper(uint32_t messageID, const uint8_t *data, uint8_t dataSize, int32_t periodMs, int32_t *status); + void receiveMessage_wrapper(uint32_t *messageID, uint32_t messageIDMask, uint8_t *data, uint8_t *dataSize, uint32_t *timeStamp, int32_t *status); + void openStreamSession(uint32_t *sessionHandle, uint32_t messageID, uint32_t messageIDMask, uint32_t maxMessages, int32_t *status); + void closeStreamSession(uint32_t sessionHandle); + void readStreamSession(uint32_t sessionHandle, struct tCANStreamMessage *messages, uint32_t messagesToRead, uint32_t *messagesRead, int32_t *status); + void getCANStatus(float *percentBusUtilization, uint32_t *busOffCount, uint32_t *txFullCount, uint32_t *receiveErrorCount, uint32_t *transmitErrorCount, int32_t *status); +} +#endif + +#ifdef __cplusplus +extern "C" +{ +#endif + + void FRC_NetworkCommunication_CANSessionMux_sendMessage(uint32_t messageID, const uint8_t *data, uint8_t dataSize, int32_t periodMs, int32_t *status); + void FRC_NetworkCommunication_CANSessionMux_receiveMessage(uint32_t *messageID, uint32_t messageIDMask, uint8_t *data, uint8_t *dataSize, uint32_t *timeStamp, int32_t *status); + void FRC_NetworkCommunication_CANSessionMux_openStreamSession(uint32_t *sessionHandle, uint32_t messageID, uint32_t messageIDMask, uint32_t maxMessages, int32_t *status); + void FRC_NetworkCommunication_CANSessionMux_closeStreamSession(uint32_t sessionHandle); + void FRC_NetworkCommunication_CANSessionMux_readStreamSession(uint32_t sessionHandle, struct tCANStreamMessage *messages, uint32_t messagesToRead, uint32_t *messagesRead, int32_t *status); + void FRC_NetworkCommunication_CANSessionMux_getCANStatus(float *percentBusUtilization, uint32_t *busOffCount, uint32_t *txFullCount, uint32_t *receiveErrorCount, uint32_t *transmitErrorCount, int32_t *status); + +#ifdef __cplusplus +} +#endif + +#endif // __CANSessionMux_h__ diff --git a/hal/lib/athena/FRC_NetworkCommunication/FRCComm.h b/hal/lib/athena/FRC_NetworkCommunication/FRCComm.h new file mode 100644 index 0000000000..32e0fb99fb --- /dev/null +++ b/hal/lib/athena/FRC_NetworkCommunication/FRCComm.h @@ -0,0 +1,163 @@ +/************************************************************* + * NOTICE + * + * These are the only externally exposed functions to the + * NetworkCommunication library + * + * This is an implementation of FRC Spec for Comm Protocol + * Revision 4.5, June 30, 2008 + * + * Copyright (c) National Instruments 2008. All Rights Reserved. + * + *************************************************************/ + +#ifndef __FRC_COMM_H__ +#define __FRC_COMM_H__ + +#ifdef WIN32 +# include +#ifdef USE_THRIFT +# define EXPORT_FUNC +# else +# define EXPORT_FUNC __declspec(dllexport) __cdecl +# endif +#elif defined(__vxworks) +# include +# define EXPORT_FUNC +#elif defined(__linux) +# include +# include +# define EXPORT_FUNC +#endif + +#define ERR_FRCSystem_NetCommNotResponding -44049 +#define ERR_FRCSystem_NoDSConnection -44018 + +#ifdef WIN32 +# define __DEPRECATED__ __declspec(deprecated) +#else +# define __DEPRECATED__ __attribute__((__deprecated__)) +#endif + +enum AllianceStationID_t { + kAllianceStationID_red1, + kAllianceStationID_red2, + kAllianceStationID_red3, + kAllianceStationID_blue1, + kAllianceStationID_blue2, + kAllianceStationID_blue3, +}; + +enum MatchType_t { + kMatchType_none, + kMatchType_practice, + kMatchType_qualification, + kMatchType_elimination, +}; + +struct ControlWord_t { +#ifndef __vxworks + uint32_t enabled : 1; + uint32_t autonomous : 1; + uint32_t test :1; + uint32_t eStop : 1; + uint32_t fmsAttached:1; + uint32_t dsAttached:1; + uint32_t control_reserved : 26; +#else + uint32_t control_reserved : 26; + uint32_t dsAttached:1; + uint32_t fmsAttached:1; + uint32_t eStop : 1; + uint32_t test :1; + uint32_t autonomous : 1; + uint32_t enabled : 1; +#endif +}; + +struct JoystickAxes_t { + uint16_t count; + int16_t axes[1]; +}; + +struct JoystickPOV_t { + uint16_t count; + int16_t povs[1]; +}; + +#ifdef __cplusplus +extern "C" { +#endif + int EXPORT_FUNC FRC_NetworkCommunication_Reserve(void *instance); +#ifndef SIMULATION + void EXPORT_FUNC getFPGAHardwareVersion(uint16_t *fpgaVersion, uint32_t *fpgaRevision); +#endif + /** + * Safely copy data into the status packet to be sent back to the driver station. + * @deprecated battery is the only parameter to this function that is still used, and only on cRIO / simulation. + */ + __DEPRECATED__ int EXPORT_FUNC setStatusData(float battery, uint8_t dsDigitalOut, uint8_t updateNumber, + const char *userDataHigh, int userDataHighLength, + const char *userDataLow, int userDataLowLength, int wait_ms); + /** + * Send error data to the DS + * @deprecated This old method is hard to parse on the DS side. It will be removed soon. Use FRC_NetworkCommunication_sendError instead. + * @param errorData is a cstr of the error message + * @param errorDataLength is the length of the errorData + * @param wait_ms is ignored (included for binary compatibility) + * @return 0 on success, 1 on no DS connection + */ + __DEPRECATED__ int EXPORT_FUNC setErrorData(const char *errors, int errorsLength, int wait_ms); + + /** + * Send a console output line to the Driver Station + * @param line a null-terminated string + * @return 0 on success, other on failure + */ + int EXPORT_FUNC FRC_NetworkCommunication_sendConsoleLine(const char *line); + + /** + * Send an error to the Driver Station + * @param isError true if error, false if warning + * @param errorCode value of error condition + * @param isLVCode true if error code is defined in errors.txt, false if not (i.e. made up for C++) + * @param details error description that contains details such as which resource number caused the failure + * @param location Source file, function, and line number that the error was generated - optional + * @param callStack The details about what functions were called through before the error was reported - optional + * @return 0 on success, other on failure + */ + int EXPORT_FUNC FRC_NetworkCommunication_sendError(int isError, int32_t errorCode, int isLVCode, + const char *details, const char *location, const char *callStack); + +#ifdef WIN32 + void EXPORT_FUNC setNewDataSem(HANDLE); +#elif defined (__vxworks) + void EXPORT_FUNC setNewDataSem(SEM_ID); +#else + void EXPORT_FUNC setNewDataSem(pthread_cond_t *); +#endif + + // this uint32_t is really a LVRefNum + int EXPORT_FUNC setNewDataOccurRef(uint32_t refnum); + + 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_getMatchTime(float *matchTime); + int EXPORT_FUNC FRC_NetworkCommunication_getJoystickAxes(uint8_t joystickNum, struct JoystickAxes_t *axes, uint8_t maxAxes); + int EXPORT_FUNC FRC_NetworkCommunication_getJoystickButtons(uint8_t joystickNum, uint32_t *buttons, uint8_t *count); + int EXPORT_FUNC FRC_NetworkCommunication_getJoystickPOVs(uint8_t joystickNum, struct JoystickPOV_t *povs, uint8_t maxPOVs); + int EXPORT_FUNC FRC_NetworkCommunication_setJoystickOutputs(uint8_t joystickNum, uint32_t hidOutputs, uint16_t leftRumble, uint16_t rightRumble); + int EXPORT_FUNC FRC_NetworkCommunication_getJoystickDesc(uint8_t joystickNum, uint8_t *isXBox, uint8_t *type, char *name, + uint8_t *axisCount, uint8_t *axisTypes, uint8_t *buttonCount, uint8_t *povCount); + + void EXPORT_FUNC FRC_NetworkCommunication_getVersionString(char *version); + int EXPORT_FUNC FRC_NetworkCommunication_observeUserProgramStarting(void); + void EXPORT_FUNC FRC_NetworkCommunication_observeUserProgramDisabled(void); + void EXPORT_FUNC FRC_NetworkCommunication_observeUserProgramAutonomous(void); + void EXPORT_FUNC FRC_NetworkCommunication_observeUserProgramTeleop(void); + void EXPORT_FUNC FRC_NetworkCommunication_observeUserProgramTest(void); +#ifdef __cplusplus +} +#endif + +#endif diff --git a/hal/lib/athena/FRC_NetworkCommunication/LoadOut.h b/hal/lib/athena/FRC_NetworkCommunication/LoadOut.h new file mode 100644 index 0000000000..c7ee1f3734 --- /dev/null +++ b/hal/lib/athena/FRC_NetworkCommunication/LoadOut.h @@ -0,0 +1,58 @@ + +#ifndef __LoadOut_h__ +#define __LoadOut_h__ + +#ifdef WIN32 +#include +#define EXPORT_FUNC __declspec(dllexport) __cdecl +#elif defined (__vxworks) +#include +#define EXPORT_FUNC +#else +#include +#define EXPORT_FUNC +#endif + +#define kMaxModuleNumber 2 +namespace nLoadOut +{ +#if defined(__vxworks) || defined(SIMULATION) + typedef enum { + kModuleType_Unknown = 0x00, + kModuleType_Analog = 0x01, + kModuleType_Digital = 0x02, + kModuleType_Solenoid = 0x03, + } tModuleType; + bool EXPORT_FUNC getModulePresence(tModuleType moduleType, uint8_t moduleNumber); +#endif + typedef enum { + kTargetClass_Unknown = 0x00, + kTargetClass_FRC1 = 0x10, + kTargetClass_FRC2 = 0x20, + kTargetClass_FRC3 = 0x30, + kTargetClass_RoboRIO = 0x40, +#if defined(__vxworks) || defined(SIMULATION) + kTargetClass_FRC2_Analog = kTargetClass_FRC2 | kModuleType_Analog, + kTargetClass_FRC2_Digital = kTargetClass_FRC2 | kModuleType_Digital, + kTargetClass_FRC2_Solenoid = kTargetClass_FRC2 | kModuleType_Solenoid, +#endif + kTargetClass_FamilyMask = 0xF0, + kTargetClass_ModuleMask = 0x0F, + } tTargetClass; + tTargetClass EXPORT_FUNC getTargetClass(); +} + +#ifdef __cplusplus +extern "C" { +#endif + +#if defined(__vxworks) || defined(SIMULATION) + uint32_t EXPORT_FUNC FRC_NetworkCommunication_nLoadOut_getModulePresence(uint32_t moduleType, uint8_t moduleNumber); +#endif + uint32_t EXPORT_FUNC FRC_NetworkCommunication_nLoadOut_getTargetClass(); + +#ifdef __cplusplus +} +#endif + +#endif // __LoadOut_h__ diff --git a/hal/lib/athena/FRC_NetworkCommunication/UsageReporting.h b/hal/lib/athena/FRC_NetworkCommunication/UsageReporting.h new file mode 100644 index 0000000000..2d4ba9ba00 --- /dev/null +++ b/hal/lib/athena/FRC_NetworkCommunication/UsageReporting.h @@ -0,0 +1,150 @@ + +#ifndef __UsageReporting_h__ +#define __UsageReporting_h__ + +#ifdef WIN32 +#include +#define EXPORT_FUNC __declspec(dllexport) __cdecl +#elif defined (__vxworks) +#include +#define EXPORT_FUNC +#else +#include +#include +#define EXPORT_FUNC +#endif + +#define kUsageReporting_version 1 + +namespace nUsageReporting +{ + typedef enum + { + kResourceType_Controller, + kResourceType_Module, + kResourceType_Language, + kResourceType_CANPlugin, + kResourceType_Accelerometer, + kResourceType_ADXL345, + kResourceType_AnalogChannel, + kResourceType_AnalogTrigger, + kResourceType_AnalogTriggerOutput, + kResourceType_CANJaguar, + kResourceType_Compressor, // 10 + kResourceType_Counter, + kResourceType_Dashboard, + kResourceType_DigitalInput, + kResourceType_DigitalOutput, + kResourceType_DriverStationCIO, + kResourceType_DriverStationEIO, + kResourceType_DriverStationLCD, + kResourceType_Encoder, + kResourceType_GearTooth, + kResourceType_Gyro, // 20 + kResourceType_I2C, + kResourceType_Framework, + kResourceType_Jaguar, + kResourceType_Joystick, + kResourceType_Kinect, + kResourceType_KinectStick, + kResourceType_PIDController, + kResourceType_Preferences, + kResourceType_PWM, + kResourceType_Relay, // 30 + kResourceType_RobotDrive, + kResourceType_SerialPort, + kResourceType_Servo, + kResourceType_Solenoid, + kResourceType_SPI, + kResourceType_Task, + kResourceType_Ultrasonic, + kResourceType_Victor, + kResourceType_Button, + kResourceType_Command, // 40 + kResourceType_AxisCamera, + kResourceType_PCVideoServer, + kResourceType_SmartDashboard, + kResourceType_Talon, + kResourceType_HiTechnicColorSensor, + kResourceType_HiTechnicAccel, + kResourceType_HiTechnicCompass, + kResourceType_SRF08, + kResourceType_AnalogOutput, + kResourceType_VictorSP, // 50 + kResourceType_TalonSRX, + kResourceType_CANTalonSRX, + kResourceType_ADXL362, + kResourceType_ADXRS450, + kResourceType_RevSPARK, + kResourceType_MindsensorsSD540, + kResourceType_DigitalFilter, + kResourceType_ADIS16448, + } tResourceType; + + typedef enum + { + kLanguage_LabVIEW = 1, + kLanguage_CPlusPlus = 2, + kLanguage_Java = 3, + kLanguage_Python = 4, + + kCANPlugin_BlackJagBridge = 1, + kCANPlugin_2CAN = 2, + + kFramework_Iterative = 1, + kFramework_Simple = 2, + kFramework_CommandControl = 3, + + kRobotDrive_ArcadeStandard = 1, + kRobotDrive_ArcadeButtonSpin = 2, + kRobotDrive_ArcadeRatioCurve = 3, + kRobotDrive_Tank = 4, + kRobotDrive_MecanumPolar = 5, + kRobotDrive_MecanumCartesian = 6, + + kDriverStationCIO_Analog = 1, + kDriverStationCIO_DigitalIn = 2, + kDriverStationCIO_DigitalOut = 3, + + kDriverStationEIO_Acceleration = 1, + kDriverStationEIO_AnalogIn = 2, + kDriverStationEIO_AnalogOut = 3, + kDriverStationEIO_Button = 4, + kDriverStationEIO_LED = 5, + kDriverStationEIO_DigitalIn = 6, + kDriverStationEIO_DigitalOut = 7, + kDriverStationEIO_FixedDigitalOut = 8, + kDriverStationEIO_PWM = 9, + kDriverStationEIO_Encoder = 10, + kDriverStationEIO_TouchSlider = 11, + + kADXL345_SPI = 1, + kADXL345_I2C = 2, + + kCommand_Scheduler = 1, + + kSmartDashboard_Instance = 1, + } tInstances; + + /** + * 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. + * @param feature a string to be included describing features in use on a specific resource. Setting the same resource more than once allows you to change the feature string. + */ + uint32_t EXPORT_FUNC report(tResourceType resource, uint8_t instanceNumber, uint8_t context = 0, const char *feature = NULL); +} + +#ifdef __cplusplus +extern "C" { +#endif + + uint32_t EXPORT_FUNC FRC_NetworkCommunication_nUsageReporting_report(uint8_t resource, uint8_t instanceNumber, uint8_t context, const char *feature); + +#ifdef __cplusplus +} +#endif + +#endif // __UsageReporting_h__ diff --git a/ni-libraries/libFRC_NetworkCommunication.so b/ni-libraries/libFRC_NetworkCommunication.so index 7b68b764bd..dc96e6faaf 100644 --- a/ni-libraries/libFRC_NetworkCommunication.so +++ b/ni-libraries/libFRC_NetworkCommunication.so @@ -1,2 +1,2 @@ OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libFRC_NetworkCommunication.so.16 ) +GROUP ( libFRC_NetworkCommunication.so.17 ) diff --git a/ni-libraries/libFRC_NetworkCommunication.so.16 b/ni-libraries/libFRC_NetworkCommunication.so.16 deleted file mode 100644 index 52ac7c221e..0000000000 --- a/ni-libraries/libFRC_NetworkCommunication.so.16 +++ /dev/null @@ -1,2 +0,0 @@ -OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libFRC_NetworkCommunication.so.16.0 ) diff --git a/ni-libraries/libFRC_NetworkCommunication.so.16.0 b/ni-libraries/libFRC_NetworkCommunication.so.16.0 deleted file mode 100644 index 932383bc69..0000000000 --- a/ni-libraries/libFRC_NetworkCommunication.so.16.0 +++ /dev/null @@ -1,2 +0,0 @@ -OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libFRC_NetworkCommunication.so.16.0.0 ) diff --git a/ni-libraries/libFRC_NetworkCommunication.so.16.0.0 b/ni-libraries/libFRC_NetworkCommunication.so.16.0.0 deleted file mode 100755 index 9cfcd70258..0000000000 Binary files a/ni-libraries/libFRC_NetworkCommunication.so.16.0.0 and /dev/null differ diff --git a/ni-libraries/libFRC_NetworkCommunication.so.17 b/ni-libraries/libFRC_NetworkCommunication.so.17 new file mode 100644 index 0000000000..87323bdd2b --- /dev/null +++ b/ni-libraries/libFRC_NetworkCommunication.so.17 @@ -0,0 +1,2 @@ +OUTPUT_FORMAT(elf32-littlearm) +GROUP ( libFRC_NetworkCommunication.so.17.0 ) diff --git a/ni-libraries/libFRC_NetworkCommunication.so.17.0 b/ni-libraries/libFRC_NetworkCommunication.so.17.0 new file mode 100644 index 0000000000..aa7d8b6334 --- /dev/null +++ b/ni-libraries/libFRC_NetworkCommunication.so.17.0 @@ -0,0 +1,2 @@ +OUTPUT_FORMAT(elf32-littlearm) +GROUP ( libFRC_NetworkCommunication.so.17.0.0 ) diff --git a/ni-libraries/libFRC_NetworkCommunication.so.17.0.0 b/ni-libraries/libFRC_NetworkCommunication.so.17.0.0 new file mode 100644 index 0000000000..9146e98efd Binary files /dev/null and b/ni-libraries/libFRC_NetworkCommunication.so.17.0.0 differ diff --git a/ni-libraries/libFRC_NetworkCommunicationLV.so b/ni-libraries/libFRC_NetworkCommunicationLV.so index 2a94a14437..5d13e85487 100644 --- a/ni-libraries/libFRC_NetworkCommunicationLV.so +++ b/ni-libraries/libFRC_NetworkCommunicationLV.so @@ -1,2 +1,2 @@ OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libFRC_NetworkCommunicationLV.so.16 ) +GROUP ( libFRC_NetworkCommunicationLV.so.17 ) diff --git a/ni-libraries/libFRC_NetworkCommunicationLV.so.16 b/ni-libraries/libFRC_NetworkCommunicationLV.so.16 deleted file mode 100644 index 4c35d455a7..0000000000 --- a/ni-libraries/libFRC_NetworkCommunicationLV.so.16 +++ /dev/null @@ -1,2 +0,0 @@ -OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libFRC_NetworkCommunicationLV.so.16.0 ) diff --git a/ni-libraries/libFRC_NetworkCommunicationLV.so.16.0 b/ni-libraries/libFRC_NetworkCommunicationLV.so.16.0 deleted file mode 100644 index 74fe2d15b3..0000000000 --- a/ni-libraries/libFRC_NetworkCommunicationLV.so.16.0 +++ /dev/null @@ -1,2 +0,0 @@ -OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libFRC_NetworkCommunicationLV.so.16.0.0 ) diff --git a/ni-libraries/libFRC_NetworkCommunicationLV.so.16.0.0 b/ni-libraries/libFRC_NetworkCommunicationLV.so.16.0.0 deleted file mode 100755 index 940acdee1d..0000000000 Binary files a/ni-libraries/libFRC_NetworkCommunicationLV.so.16.0.0 and /dev/null differ diff --git a/ni-libraries/libFRC_NetworkCommunicationLV.so.17 b/ni-libraries/libFRC_NetworkCommunicationLV.so.17 new file mode 100644 index 0000000000..97fc85ba59 --- /dev/null +++ b/ni-libraries/libFRC_NetworkCommunicationLV.so.17 @@ -0,0 +1,2 @@ +OUTPUT_FORMAT(elf32-littlearm) +GROUP ( libFRC_NetworkCommunicationLV.so.17.0 ) diff --git a/ni-libraries/libFRC_NetworkCommunicationLV.so.17.0 b/ni-libraries/libFRC_NetworkCommunicationLV.so.17.0 new file mode 100644 index 0000000000..ea1c26f84c --- /dev/null +++ b/ni-libraries/libFRC_NetworkCommunicationLV.so.17.0 @@ -0,0 +1,2 @@ +OUTPUT_FORMAT(elf32-littlearm) +GROUP ( libFRC_NetworkCommunicationLV.so.17.0.0 ) diff --git a/ni-libraries/libFRC_NetworkCommunicationLV.so.17.0.0 b/ni-libraries/libFRC_NetworkCommunicationLV.so.17.0.0 new file mode 100644 index 0000000000..13259a19f5 Binary files /dev/null and b/ni-libraries/libFRC_NetworkCommunicationLV.so.17.0.0 differ diff --git a/ni-libraries/libGCBase_gcc-4.4-arm_v2_3.so b/ni-libraries/libGCBase_gcc-4.4-arm_v2_3.so deleted file mode 100755 index 3bcda8d191..0000000000 Binary files a/ni-libraries/libGCBase_gcc-4.4-arm_v2_3.so and /dev/null differ diff --git a/ni-libraries/libGCBase_gcc-4.4-arm_v3_0_NI.so b/ni-libraries/libGCBase_gcc-4.4-arm_v3_0_NI.so new file mode 100644 index 0000000000..cd3761c7f8 Binary files /dev/null and b/ni-libraries/libGCBase_gcc-4.4-arm_v3_0_NI.so differ diff --git a/ni-libraries/libGenApi_gcc-4.4-arm_v2_3.so b/ni-libraries/libGenApi_gcc-4.4-arm_v2_3.so deleted file mode 100755 index 7e6a6df7db..0000000000 Binary files a/ni-libraries/libGenApi_gcc-4.4-arm_v2_3.so and /dev/null differ diff --git a/ni-libraries/libGenApi_gcc-4.4-arm_v3_0_NI.so b/ni-libraries/libGenApi_gcc-4.4-arm_v3_0_NI.so new file mode 100644 index 0000000000..dbc00089a9 Binary files /dev/null and b/ni-libraries/libGenApi_gcc-4.4-arm_v3_0_NI.so differ diff --git a/ni-libraries/libLog_gcc-4.4-arm_v2_3.so b/ni-libraries/libLog_gcc-4.4-arm_v2_3.so deleted file mode 100755 index 6e8719bc35..0000000000 Binary files a/ni-libraries/libLog_gcc-4.4-arm_v2_3.so and /dev/null differ diff --git a/ni-libraries/libLog_gcc-4.4-arm_v3_0_NI.so b/ni-libraries/libLog_gcc-4.4-arm_v3_0_NI.so new file mode 100644 index 0000000000..227b31206f Binary files /dev/null and b/ni-libraries/libLog_gcc-4.4-arm_v3_0_NI.so differ diff --git a/ni-libraries/libMathParser_gcc-4.4-arm_v2_3.so b/ni-libraries/libMathParser_gcc-4.4-arm_v2_3.so deleted file mode 100755 index e4d1279d9c..0000000000 Binary files a/ni-libraries/libMathParser_gcc-4.4-arm_v2_3.so and /dev/null differ diff --git a/ni-libraries/libMathParser_gcc-4.4-arm_v3_0_NI.so b/ni-libraries/libMathParser_gcc-4.4-arm_v3_0_NI.so new file mode 100644 index 0000000000..20b5d1b368 Binary files /dev/null and b/ni-libraries/libMathParser_gcc-4.4-arm_v3_0_NI.so differ diff --git a/ni-libraries/libNiFpga.so b/ni-libraries/libNiFpga.so index ef3895d221..86c9b65653 100644 --- a/ni-libraries/libNiFpga.so +++ b/ni-libraries/libNiFpga.so @@ -1,2 +1,2 @@ OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libNiFpga.so.15 ) +GROUP ( libNiFpga.so.16 ) diff --git a/ni-libraries/libNiFpga.so.15.0.0 b/ni-libraries/libNiFpga.so.15.0.0 deleted file mode 100755 index 75c201d635..0000000000 Binary files a/ni-libraries/libNiFpga.so.15.0.0 and /dev/null differ diff --git a/ni-libraries/libNiFpga.so.15 b/ni-libraries/libNiFpga.so.16 similarity index 52% rename from ni-libraries/libNiFpga.so.15 rename to ni-libraries/libNiFpga.so.16 index 3db9399e50..45c210ea61 100644 --- a/ni-libraries/libNiFpga.so.15 +++ b/ni-libraries/libNiFpga.so.16 @@ -1,2 +1,2 @@ OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libNiFpga.so.15.0 ) +GROUP ( libNiFpga.so.16.0 ) diff --git a/ni-libraries/libNiRioSrv.so.15 b/ni-libraries/libNiFpga.so.16.0 similarity index 50% rename from ni-libraries/libNiRioSrv.so.15 rename to ni-libraries/libNiFpga.so.16.0 index e030465d8d..7c0fac630e 100644 --- a/ni-libraries/libNiRioSrv.so.15 +++ b/ni-libraries/libNiFpga.so.16.0 @@ -1,2 +1,2 @@ OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libNiRioSrv.so.15.0 ) +GROUP ( libNiFpga.so.16.0.0 ) diff --git a/ni-libraries/libNiFpga.so.16.0.0 b/ni-libraries/libNiFpga.so.16.0.0 new file mode 100644 index 0000000000..2298a52f8c Binary files /dev/null and b/ni-libraries/libNiFpga.so.16.0.0 differ diff --git a/ni-libraries/libNiFpgaLv.so b/ni-libraries/libNiFpgaLv.so index 2d5b7e8341..e0ee5adfd6 100644 --- a/ni-libraries/libNiFpgaLv.so +++ b/ni-libraries/libNiFpgaLv.so @@ -1,2 +1,2 @@ OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libNiFpgaLv.so.15 ) +GROUP ( libNiFpgaLv.so.16 ) diff --git a/ni-libraries/libNiFpgaLv.so.15.0 b/ni-libraries/libNiFpgaLv.so.15.0 deleted file mode 100644 index 3a71dc5b43..0000000000 --- a/ni-libraries/libNiFpgaLv.so.15.0 +++ /dev/null @@ -1,2 +0,0 @@ -OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libNiFpgaLv.so.15.0.0 ) diff --git a/ni-libraries/libNiFpgaLv.so.15.0.0 b/ni-libraries/libNiFpgaLv.so.15.0.0 deleted file mode 100755 index 6187874d8b..0000000000 Binary files a/ni-libraries/libNiFpgaLv.so.15.0.0 and /dev/null differ diff --git a/ni-libraries/libNiFpga.so.15.0 b/ni-libraries/libNiFpgaLv.so.16 similarity index 50% rename from ni-libraries/libNiFpga.so.15.0 rename to ni-libraries/libNiFpgaLv.so.16 index fe101f5b2e..afc36922ee 100644 --- a/ni-libraries/libNiFpga.so.15.0 +++ b/ni-libraries/libNiFpgaLv.so.16 @@ -1,2 +1,2 @@ OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libNiFpga.so.15.0.0 ) +GROUP ( libNiFpgaLv.so.16.0 ) diff --git a/ni-libraries/libNiFpgaLv.so.16.0 b/ni-libraries/libNiFpgaLv.so.16.0 new file mode 100644 index 0000000000..7789a61fe1 --- /dev/null +++ b/ni-libraries/libNiFpgaLv.so.16.0 @@ -0,0 +1,2 @@ +OUTPUT_FORMAT(elf32-littlearm) +GROUP ( libNiFpgaLv.so.16.0.0 ) diff --git a/ni-libraries/libNiFpgaLv.so.16.0.0 b/ni-libraries/libNiFpgaLv.so.16.0.0 new file mode 100644 index 0000000000..b59e64850a Binary files /dev/null and b/ni-libraries/libNiFpgaLv.so.16.0.0 differ diff --git a/ni-libraries/libNiRioSrv.so b/ni-libraries/libNiRioSrv.so index b6b45e4af0..1e416d8662 100644 --- a/ni-libraries/libNiRioSrv.so +++ b/ni-libraries/libNiRioSrv.so @@ -1,2 +1,2 @@ OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libNiRioSrv.so.15 ) +GROUP ( libNiRioSrv.so.16 ) diff --git a/ni-libraries/libNiRioSrv.so.15.0 b/ni-libraries/libNiRioSrv.so.15.0 deleted file mode 100644 index c9e5988206..0000000000 --- a/ni-libraries/libNiRioSrv.so.15.0 +++ /dev/null @@ -1,2 +0,0 @@ -OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libNiRioSrv.so.15.0.0 ) diff --git a/ni-libraries/libNiRioSrv.so.15.0.0 b/ni-libraries/libNiRioSrv.so.15.0.0 deleted file mode 100755 index d0d52cafc6..0000000000 Binary files a/ni-libraries/libNiRioSrv.so.15.0.0 and /dev/null differ diff --git a/ni-libraries/libNiFpgaLv.so.15 b/ni-libraries/libNiRioSrv.so.16 similarity index 50% rename from ni-libraries/libNiFpgaLv.so.15 rename to ni-libraries/libNiRioSrv.so.16 index 070a61625e..ec6848f904 100644 --- a/ni-libraries/libNiFpgaLv.so.15 +++ b/ni-libraries/libNiRioSrv.so.16 @@ -1,2 +1,2 @@ OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libNiFpgaLv.so.15.0 ) +GROUP ( libNiRioSrv.so.16.0 ) diff --git a/ni-libraries/libNiRioSrv.so.16.0 b/ni-libraries/libNiRioSrv.so.16.0 new file mode 100644 index 0000000000..7a8b574f4f --- /dev/null +++ b/ni-libraries/libNiRioSrv.so.16.0 @@ -0,0 +1,2 @@ +OUTPUT_FORMAT(elf32-littlearm) +GROUP ( libNiRioSrv.so.16.0.0 ) diff --git a/ni-libraries/libNiRioSrv.so.16.0.0 b/ni-libraries/libNiRioSrv.so.16.0.0 new file mode 100644 index 0000000000..c259a9ea90 Binary files /dev/null and b/ni-libraries/libNiRioSrv.so.16.0.0 differ diff --git a/ni-libraries/libNodeMapData_gcc-4.4-arm_v3_0_NI.so b/ni-libraries/libNodeMapData_gcc-4.4-arm_v3_0_NI.so new file mode 100644 index 0000000000..3419948fb8 Binary files /dev/null and b/ni-libraries/libNodeMapData_gcc-4.4-arm_v3_0_NI.so differ diff --git a/ni-libraries/libRoboRIO_FRC_ChipObject.so b/ni-libraries/libRoboRIO_FRC_ChipObject.so index 38c70b9e27..6dcc36d7e1 100644 --- a/ni-libraries/libRoboRIO_FRC_ChipObject.so +++ b/ni-libraries/libRoboRIO_FRC_ChipObject.so @@ -1,2 +1,2 @@ OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libRoboRIO_FRC_ChipObject.so.16 ) +GROUP ( libRoboRIO_FRC_ChipObject.so.17 ) diff --git a/ni-libraries/libRoboRIO_FRC_ChipObject.so.16 b/ni-libraries/libRoboRIO_FRC_ChipObject.so.16 deleted file mode 100644 index f10be9fba7..0000000000 --- a/ni-libraries/libRoboRIO_FRC_ChipObject.so.16 +++ /dev/null @@ -1,2 +0,0 @@ -OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libRoboRIO_FRC_ChipObject.so.16.0 ) diff --git a/ni-libraries/libRoboRIO_FRC_ChipObject.so.16.0 b/ni-libraries/libRoboRIO_FRC_ChipObject.so.16.0 deleted file mode 100644 index 0e8a25918b..0000000000 --- a/ni-libraries/libRoboRIO_FRC_ChipObject.so.16.0 +++ /dev/null @@ -1,2 +0,0 @@ -OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libRoboRIO_FRC_ChipObject.so.16.0.0 ) diff --git a/ni-libraries/libRoboRIO_FRC_ChipObject.so.16.0.0 b/ni-libraries/libRoboRIO_FRC_ChipObject.so.16.0.0 deleted file mode 100755 index be55941a33..0000000000 Binary files a/ni-libraries/libRoboRIO_FRC_ChipObject.so.16.0.0 and /dev/null differ diff --git a/ni-libraries/libRoboRIO_FRC_ChipObject.so.17 b/ni-libraries/libRoboRIO_FRC_ChipObject.so.17 new file mode 100644 index 0000000000..762c490347 --- /dev/null +++ b/ni-libraries/libRoboRIO_FRC_ChipObject.so.17 @@ -0,0 +1,2 @@ +OUTPUT_FORMAT(elf32-littlearm) +GROUP ( libRoboRIO_FRC_ChipObject.so.17.0 ) diff --git a/ni-libraries/libRoboRIO_FRC_ChipObject.so.17.0 b/ni-libraries/libRoboRIO_FRC_ChipObject.so.17.0 new file mode 100644 index 0000000000..02ca762642 --- /dev/null +++ b/ni-libraries/libRoboRIO_FRC_ChipObject.so.17.0 @@ -0,0 +1,2 @@ +OUTPUT_FORMAT(elf32-littlearm) +GROUP ( libRoboRIO_FRC_ChipObject.so.17.0.0 ) diff --git a/ni-libraries/libRoboRIO_FRC_ChipObject.so.17.0.0 b/ni-libraries/libRoboRIO_FRC_ChipObject.so.17.0.0 new file mode 100644 index 0000000000..85bb1af000 Binary files /dev/null and b/ni-libraries/libRoboRIO_FRC_ChipObject.so.17.0.0 differ diff --git a/ni-libraries/libXmlParser_gcc-4.4-arm_v3_0_NI.so b/ni-libraries/libXmlParser_gcc-4.4-arm_v3_0_NI.so new file mode 100644 index 0000000000..596bba0d59 Binary files /dev/null and b/ni-libraries/libXmlParser_gcc-4.4-arm_v3_0_NI.so differ diff --git a/ni-libraries/libni_emb.so.8 b/ni-libraries/libavcodec.so similarity index 53% rename from ni-libraries/libni_emb.so.8 rename to ni-libraries/libavcodec.so index 2723c59320..0b852e82a0 100644 --- a/ni-libraries/libni_emb.so.8 +++ b/ni-libraries/libavcodec.so @@ -1,2 +1,2 @@ OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libni_emb.so.8.0 ) +GROUP ( libavcodec.so.54 ) diff --git a/ni-libraries/libavcodec.so.54 b/ni-libraries/libavcodec.so.54 new file mode 100644 index 0000000000..128cb3722c --- /dev/null +++ b/ni-libraries/libavcodec.so.54 @@ -0,0 +1,2 @@ +OUTPUT_FORMAT(elf32-littlearm) +GROUP ( libavcodec.so.54.59 ) diff --git a/ni-libraries/libavcodec.so.54.59 b/ni-libraries/libavcodec.so.54.59 new file mode 100644 index 0000000000..17b52f0542 --- /dev/null +++ b/ni-libraries/libavcodec.so.54.59 @@ -0,0 +1,2 @@ +OUTPUT_FORMAT(elf32-littlearm) +GROUP ( libavcodec.so.54.59.100 ) diff --git a/ni-libraries/libavcodec.so.54.59.100 b/ni-libraries/libavcodec.so.54.59.100 new file mode 100644 index 0000000000..221915e951 Binary files /dev/null and b/ni-libraries/libavcodec.so.54.59.100 differ diff --git a/ni-libraries/libavformat.so b/ni-libraries/libavformat.so new file mode 100644 index 0000000000..9f2588780b --- /dev/null +++ b/ni-libraries/libavformat.so @@ -0,0 +1,2 @@ +OUTPUT_FORMAT(elf32-littlearm) +GROUP ( libavformat.so.54 ) diff --git a/ni-libraries/libavformat.so.54 b/ni-libraries/libavformat.so.54 new file mode 100644 index 0000000000..86de5e59f3 --- /dev/null +++ b/ni-libraries/libavformat.so.54 @@ -0,0 +1,2 @@ +OUTPUT_FORMAT(elf32-littlearm) +GROUP ( libavformat.so.54.29 ) diff --git a/ni-libraries/libavformat.so.54.29 b/ni-libraries/libavformat.so.54.29 new file mode 100644 index 0000000000..f95fca305b --- /dev/null +++ b/ni-libraries/libavformat.so.54.29 @@ -0,0 +1,2 @@ +OUTPUT_FORMAT(elf32-littlearm) +GROUP ( libavformat.so.54.29.104 ) diff --git a/ni-libraries/libavformat.so.54.29.104 b/ni-libraries/libavformat.so.54.29.104 new file mode 100644 index 0000000000..ebec673f6b Binary files /dev/null and b/ni-libraries/libavformat.so.54.29.104 differ diff --git a/ni-libraries/libi2c.so.1.0 b/ni-libraries/libavutil.so similarity index 54% rename from ni-libraries/libi2c.so.1.0 rename to ni-libraries/libavutil.so index 68c589079a..4c9396b2a7 100644 --- a/ni-libraries/libi2c.so.1.0 +++ b/ni-libraries/libavutil.so @@ -1,2 +1,2 @@ OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libi2c.so.1.0.0 ) +GROUP ( libavutil.so.51 ) diff --git a/ni-libraries/libavutil.so.51 b/ni-libraries/libavutil.so.51 new file mode 100644 index 0000000000..b19596e6ec --- /dev/null +++ b/ni-libraries/libavutil.so.51 @@ -0,0 +1,2 @@ +OUTPUT_FORMAT(elf32-littlearm) +GROUP ( libavutil.so.51.73 ) diff --git a/ni-libraries/libavutil.so.51.73 b/ni-libraries/libavutil.so.51.73 new file mode 100644 index 0000000000..79c32869bf --- /dev/null +++ b/ni-libraries/libavutil.so.51.73 @@ -0,0 +1,2 @@ +OUTPUT_FORMAT(elf32-littlearm) +GROUP ( libavutil.so.51.73.101 ) diff --git a/ni-libraries/libavutil.so.51.73.101 b/ni-libraries/libavutil.so.51.73.101 new file mode 100644 index 0000000000..7f07e0ad68 Binary files /dev/null and b/ni-libraries/libavutil.so.51.73.101 differ diff --git a/ni-libraries/libi2c.so b/ni-libraries/libi2c.so index 673ca375fe..0ad64d3705 100644 --- a/ni-libraries/libi2c.so +++ b/ni-libraries/libi2c.so @@ -1,2 +1,2 @@ OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libi2c.so.1 ) +GROUP ( libi2c.so.2 ) diff --git a/ni-libraries/libi2c.so.1.0.0 b/ni-libraries/libi2c.so.1.0.0 deleted file mode 100755 index fd8c6da3d7..0000000000 Binary files a/ni-libraries/libi2c.so.1.0.0 and /dev/null differ diff --git a/ni-libraries/libi2c.so.1 b/ni-libraries/libi2c.so.2 similarity index 56% rename from ni-libraries/libi2c.so.1 rename to ni-libraries/libi2c.so.2 index e10758b25e..d9fb88c4fe 100644 --- a/ni-libraries/libi2c.so.1 +++ b/ni-libraries/libi2c.so.2 @@ -1,2 +1,2 @@ OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libi2c.so.1.0 ) +GROUP ( libi2c.so.2.0 ) diff --git a/ni-libraries/libi2c.so.2.0 b/ni-libraries/libi2c.so.2.0 new file mode 100644 index 0000000000..f5e62fd488 --- /dev/null +++ b/ni-libraries/libi2c.so.2.0 @@ -0,0 +1,2 @@ +OUTPUT_FORMAT(elf32-littlearm) +GROUP ( libi2c.so.2.0.0 ) diff --git a/ni-libraries/libi2c.so.2.0.0 b/ni-libraries/libi2c.so.2.0.0 new file mode 100644 index 0000000000..8e80859270 Binary files /dev/null and b/ni-libraries/libi2c.so.2.0.0 differ diff --git a/ni-libraries/liblog4cpp_gcc-4.4-arm_v2_3.so b/ni-libraries/liblog4cpp_gcc-4.4-arm_v2_3.so deleted file mode 100755 index 46f6780917..0000000000 Binary files a/ni-libraries/liblog4cpp_gcc-4.4-arm_v2_3.so and /dev/null differ diff --git a/ni-libraries/liblog4cpp_gcc-4.4-arm_v3_0_NI.so b/ni-libraries/liblog4cpp_gcc-4.4-arm_v3_0_NI.so new file mode 100644 index 0000000000..da11a7d797 Binary files /dev/null and b/ni-libraries/liblog4cpp_gcc-4.4-arm_v3_0_NI.so differ diff --git a/ni-libraries/libni_emb.so b/ni-libraries/libni_emb.so index b979985b95..54986e0647 100644 --- a/ni-libraries/libni_emb.so +++ b/ni-libraries/libni_emb.so @@ -1,2 +1,2 @@ OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libni_emb.so.8 ) +GROUP ( libni_emb.so.9 ) diff --git a/ni-libraries/libni_emb.so.8.0 b/ni-libraries/libni_emb.so.8.0 deleted file mode 100644 index ae1c0461a5..0000000000 --- a/ni-libraries/libni_emb.so.8.0 +++ /dev/null @@ -1,2 +0,0 @@ -OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libni_emb.so.8.0.0 ) diff --git a/ni-libraries/libni_emb.so.8.0.0 b/ni-libraries/libni_emb.so.8.0.0 deleted file mode 100755 index a094ca6bd6..0000000000 Binary files a/ni-libraries/libni_emb.so.8.0.0 and /dev/null differ diff --git a/ni-libraries/libni_emb.so.9 b/ni-libraries/libni_emb.so.9 new file mode 100644 index 0000000000..2ff3ccab06 --- /dev/null +++ b/ni-libraries/libni_emb.so.9 @@ -0,0 +1,2 @@ +OUTPUT_FORMAT(elf32-littlearm) +GROUP ( libni_emb.so.9.0 ) diff --git a/ni-libraries/libni_emb.so.9.0 b/ni-libraries/libni_emb.so.9.0 new file mode 100644 index 0000000000..fe0d80427b --- /dev/null +++ b/ni-libraries/libni_emb.so.9.0 @@ -0,0 +1,2 @@ +OUTPUT_FORMAT(elf32-littlearm) +GROUP ( libni_emb.so.9.0.0 ) diff --git a/ni-libraries/libni_emb.so.9.0.0 b/ni-libraries/libni_emb.so.9.0.0 new file mode 100644 index 0000000000..6c13322d37 Binary files /dev/null and b/ni-libraries/libni_emb.so.9.0.0 differ diff --git a/ni-libraries/libni_rtlog.so.2 b/ni-libraries/libni_rtlog.so.2 index bae6b90702..2c575fcfe6 100644 --- a/ni-libraries/libni_rtlog.so.2 +++ b/ni-libraries/libni_rtlog.so.2 @@ -1,2 +1,2 @@ OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libni_rtlog.so.2.4 ) +GROUP ( libni_rtlog.so.2.5 ) diff --git a/ni-libraries/libni_rtlog.so.2.4 b/ni-libraries/libni_rtlog.so.2.4 deleted file mode 100644 index abaf6d93e8..0000000000 --- a/ni-libraries/libni_rtlog.so.2.4 +++ /dev/null @@ -1,2 +0,0 @@ -OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libni_rtlog.so.2.4.0 ) diff --git a/ni-libraries/libni_rtlog.so.2.5 b/ni-libraries/libni_rtlog.so.2.5 new file mode 100644 index 0000000000..e7137f705f --- /dev/null +++ b/ni-libraries/libni_rtlog.so.2.5 @@ -0,0 +1,2 @@ +OUTPUT_FORMAT(elf32-littlearm) +GROUP ( libni_rtlog.so.2.5.0 ) diff --git a/ni-libraries/libni_rtlog.so.2.4.0 b/ni-libraries/libni_rtlog.so.2.5.0 old mode 100755 new mode 100644 similarity index 94% rename from ni-libraries/libni_rtlog.so.2.4.0 rename to ni-libraries/libni_rtlog.so.2.5.0 index 447e399ffd..81937400ae Binary files a/ni-libraries/libni_rtlog.so.2.4.0 and b/ni-libraries/libni_rtlog.so.2.5.0 differ diff --git a/ni-libraries/libniimaqdx.so.15 b/ni-libraries/libniimaqdx.so.15 index 4f92f0d35d..89f686b41d 100644 --- a/ni-libraries/libniimaqdx.so.15 +++ b/ni-libraries/libniimaqdx.so.15 @@ -1,2 +1,2 @@ OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libniimaqdx.so.15.0 ) +GROUP ( libniimaqdx.so.15.5 ) diff --git a/ni-libraries/libniimaqdx.so.15.0 b/ni-libraries/libniimaqdx.so.15.0 deleted file mode 100644 index 4e7e77beaf..0000000000 --- a/ni-libraries/libniimaqdx.so.15.0 +++ /dev/null @@ -1,2 +0,0 @@ -OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libniimaqdx.so.15.0.0 ) diff --git a/ni-libraries/libniimaqdx.so.15.0.0 b/ni-libraries/libniimaqdx.so.15.0.0 deleted file mode 100755 index ccad9d943c..0000000000 Binary files a/ni-libraries/libniimaqdx.so.15.0.0 and /dev/null differ diff --git a/ni-libraries/libniimaqdx.so.15.5 b/ni-libraries/libniimaqdx.so.15.5 new file mode 100644 index 0000000000..581ea4792c --- /dev/null +++ b/ni-libraries/libniimaqdx.so.15.5 @@ -0,0 +1,2 @@ +OUTPUT_FORMAT(elf32-littlearm) +GROUP ( libniimaqdx.so.15.5.0 ) diff --git a/ni-libraries/libniimaqdx.so.15.5.0 b/ni-libraries/libniimaqdx.so.15.5.0 new file mode 100644 index 0000000000..fcfd4f5c95 Binary files /dev/null and b/ni-libraries/libniimaqdx.so.15.5.0 differ diff --git a/ni-libraries/libnipalu.so b/ni-libraries/libnipalu.so index 96b50311b3..f57d810c36 100644 --- a/ni-libraries/libnipalu.so +++ b/ni-libraries/libnipalu.so @@ -1,2 +1,2 @@ OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libnipalu.so.15 ) +GROUP ( libnipalu.so.16 ) diff --git a/ni-libraries/libnipalu.so.15 b/ni-libraries/libnipalu.so.15 deleted file mode 100644 index f951d9d302..0000000000 --- a/ni-libraries/libnipalu.so.15 +++ /dev/null @@ -1,2 +0,0 @@ -OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libnipalu.so.15.0 ) diff --git a/ni-libraries/libnipalu.so.15.0 b/ni-libraries/libnipalu.so.15.0 deleted file mode 100644 index d50d250ab9..0000000000 --- a/ni-libraries/libnipalu.so.15.0 +++ /dev/null @@ -1,2 +0,0 @@ -OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libnipalu.so.15.0.0 ) diff --git a/ni-libraries/libnipalu.so.16 b/ni-libraries/libnipalu.so.16 new file mode 100644 index 0000000000..5723f8cc27 --- /dev/null +++ b/ni-libraries/libnipalu.so.16 @@ -0,0 +1,2 @@ +OUTPUT_FORMAT(elf32-littlearm) +GROUP ( libnipalu.so.16.0 ) diff --git a/ni-libraries/libnipalu.so.16.0 b/ni-libraries/libnipalu.so.16.0 new file mode 100644 index 0000000000..25dbf4c1e6 --- /dev/null +++ b/ni-libraries/libnipalu.so.16.0 @@ -0,0 +1,2 @@ +OUTPUT_FORMAT(elf32-littlearm) +GROUP ( libnipalu.so.16.0.0 ) diff --git a/ni-libraries/libnipalu.so.15.0.0 b/ni-libraries/libnipalu.so.16.0.0 similarity index 53% rename from ni-libraries/libnipalu.so.15.0.0 rename to ni-libraries/libnipalu.so.16.0.0 index 81f4a451d0..fb0c9e3adc 100644 Binary files a/ni-libraries/libnipalu.so.15.0.0 and b/ni-libraries/libnipalu.so.16.0.0 differ diff --git a/ni-libraries/libnirio_emb_can.so b/ni-libraries/libnirio_emb_can.so index 6da3410979..2d00b44dae 100644 --- a/ni-libraries/libnirio_emb_can.so +++ b/ni-libraries/libnirio_emb_can.so @@ -1,2 +1,2 @@ OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libnirio_emb_can.so.15 ) +GROUP ( libnirio_emb_can.so.16 ) diff --git a/ni-libraries/libnirio_emb_can.so.15 b/ni-libraries/libnirio_emb_can.so.15 deleted file mode 100644 index 381ed2d0f2..0000000000 --- a/ni-libraries/libnirio_emb_can.so.15 +++ /dev/null @@ -1,2 +0,0 @@ -OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libnirio_emb_can.so.15.0 ) diff --git a/ni-libraries/libnirio_emb_can.so.15.0 b/ni-libraries/libnirio_emb_can.so.15.0 deleted file mode 100644 index 64e2ff1b87..0000000000 --- a/ni-libraries/libnirio_emb_can.so.15.0 +++ /dev/null @@ -1,2 +0,0 @@ -OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libnirio_emb_can.so.15.0.0 ) diff --git a/ni-libraries/libnirio_emb_can.so.16 b/ni-libraries/libnirio_emb_can.so.16 new file mode 100644 index 0000000000..3355a50da1 --- /dev/null +++ b/ni-libraries/libnirio_emb_can.so.16 @@ -0,0 +1,2 @@ +OUTPUT_FORMAT(elf32-littlearm) +GROUP ( libnirio_emb_can.so.16.0 ) diff --git a/ni-libraries/libnirio_emb_can.so.16.0 b/ni-libraries/libnirio_emb_can.so.16.0 new file mode 100644 index 0000000000..a9db8961ee --- /dev/null +++ b/ni-libraries/libnirio_emb_can.so.16.0 @@ -0,0 +1,2 @@ +OUTPUT_FORMAT(elf32-littlearm) +GROUP ( libnirio_emb_can.so.16.0.0 ) diff --git a/ni-libraries/libnirio_emb_can.so.15.0.0 b/ni-libraries/libnirio_emb_can.so.16.0.0 old mode 100755 new mode 100644 similarity index 50% rename from ni-libraries/libnirio_emb_can.so.15.0.0 rename to ni-libraries/libnirio_emb_can.so.16.0.0 index 98f760bc65..aa1bec5859 Binary files a/ni-libraries/libnirio_emb_can.so.15.0.0 and b/ni-libraries/libnirio_emb_can.so.16.0.0 differ diff --git a/ni-libraries/libniriodevenum.so b/ni-libraries/libniriodevenum.so new file mode 100644 index 0000000000..9f52d4c31e --- /dev/null +++ b/ni-libraries/libniriodevenum.so @@ -0,0 +1,2 @@ +OUTPUT_FORMAT(elf32-littlearm) +GROUP ( libniriodevenum.so.16 ) diff --git a/ni-libraries/libniriodevenum.so.16 b/ni-libraries/libniriodevenum.so.16 new file mode 100644 index 0000000000..21bbd7bebc --- /dev/null +++ b/ni-libraries/libniriodevenum.so.16 @@ -0,0 +1,2 @@ +OUTPUT_FORMAT(elf32-littlearm) +GROUP ( libniriodevenum.so.16.0 ) diff --git a/ni-libraries/libniriodevenum.so.16.0 b/ni-libraries/libniriodevenum.so.16.0 new file mode 100644 index 0000000000..71ffaaaed6 --- /dev/null +++ b/ni-libraries/libniriodevenum.so.16.0 @@ -0,0 +1,2 @@ +OUTPUT_FORMAT(elf32-littlearm) +GROUP ( libniriodevenum.so.16.0.0 ) diff --git a/ni-libraries/libniriodevenum.so.16.0.0 b/ni-libraries/libniriodevenum.so.16.0.0 new file mode 100644 index 0000000000..ad304cb9b2 Binary files /dev/null and b/ni-libraries/libniriodevenum.so.16.0.0 differ diff --git a/ni-libraries/libniriosession.so b/ni-libraries/libniriosession.so new file mode 100644 index 0000000000..24630874d3 --- /dev/null +++ b/ni-libraries/libniriosession.so @@ -0,0 +1,2 @@ +OUTPUT_FORMAT(elf32-littlearm) +GROUP ( libniriosession.so.16 ) diff --git a/ni-libraries/libniriosession.so.16 b/ni-libraries/libniriosession.so.16 new file mode 100644 index 0000000000..b25c3e3cd4 --- /dev/null +++ b/ni-libraries/libniriosession.so.16 @@ -0,0 +1,2 @@ +OUTPUT_FORMAT(elf32-littlearm) +GROUP ( libniriosession.so.16.0 ) diff --git a/ni-libraries/libniriosession.so.16.0 b/ni-libraries/libniriosession.so.16.0 new file mode 100644 index 0000000000..2bdccb379a --- /dev/null +++ b/ni-libraries/libniriosession.so.16.0 @@ -0,0 +1,2 @@ +OUTPUT_FORMAT(elf32-littlearm) +GROUP ( libniriosession.so.16.0.0 ) diff --git a/ni-libraries/libniriosession.so.16.0.0 b/ni-libraries/libniriosession.so.16.0.0 new file mode 100644 index 0000000000..9a3494ae50 Binary files /dev/null and b/ni-libraries/libniriosession.so.16.0.0 differ diff --git a/ni-libraries/libnivision.so b/ni-libraries/libnivision.so index f81bbcf38a..104912f7bd 100644 --- a/ni-libraries/libnivision.so +++ b/ni-libraries/libnivision.so @@ -1,2 +1,2 @@ OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libnivision.so.15 ) +GROUP ( libnivision.so.16 ) diff --git a/ni-libraries/libnivision.so.15 b/ni-libraries/libnivision.so.15 deleted file mode 100644 index adb373e5a2..0000000000 --- a/ni-libraries/libnivision.so.15 +++ /dev/null @@ -1,2 +0,0 @@ -OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libnivision.so.15.0 ) diff --git a/ni-libraries/libnivision.so.15.0 b/ni-libraries/libnivision.so.15.0 deleted file mode 100644 index eae0f232bb..0000000000 --- a/ni-libraries/libnivision.so.15.0 +++ /dev/null @@ -1,2 +0,0 @@ -OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libnivision.so.15.0.0 ) diff --git a/ni-libraries/libnivision.so.16 b/ni-libraries/libnivision.so.16 new file mode 100644 index 0000000000..96a449d391 --- /dev/null +++ b/ni-libraries/libnivision.so.16 @@ -0,0 +1,2 @@ +OUTPUT_FORMAT(elf32-littlearm) +GROUP ( libnivision.so.16.0 ) diff --git a/ni-libraries/libnivision.so.16.0 b/ni-libraries/libnivision.so.16.0 new file mode 100644 index 0000000000..5c1cbf2519 --- /dev/null +++ b/ni-libraries/libnivision.so.16.0 @@ -0,0 +1,2 @@ +OUTPUT_FORMAT(elf32-littlearm) +GROUP ( libnivision.so.16.0.0 ) diff --git a/ni-libraries/libnivision.so.15.0.0 b/ni-libraries/libnivision.so.16.0.0 old mode 100755 new mode 100644 similarity index 75% rename from ni-libraries/libnivision.so.15.0.0 rename to ni-libraries/libnivision.so.16.0.0 index 0f435eae81..2d016ebd77 Binary files a/ni-libraries/libnivision.so.15.0.0 and b/ni-libraries/libnivision.so.16.0.0 differ diff --git a/ni-libraries/libnivissvc.so b/ni-libraries/libnivissvc.so index 47649eea75..7c71532b06 100644 --- a/ni-libraries/libnivissvc.so +++ b/ni-libraries/libnivissvc.so @@ -1,2 +1,2 @@ OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libnivissvc.so.15 ) +GROUP ( libnivissvc.so.16 ) diff --git a/ni-libraries/libnivissvc.so.15 b/ni-libraries/libnivissvc.so.15 deleted file mode 100644 index 8181c862e9..0000000000 --- a/ni-libraries/libnivissvc.so.15 +++ /dev/null @@ -1,2 +0,0 @@ -OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libnivissvc.so.15.0 ) diff --git a/ni-libraries/libnivissvc.so.15.0 b/ni-libraries/libnivissvc.so.15.0 deleted file mode 100644 index 408c822815..0000000000 --- a/ni-libraries/libnivissvc.so.15.0 +++ /dev/null @@ -1,2 +0,0 @@ -OUTPUT_FORMAT(elf32-littlearm) -GROUP ( libnivissvc.so.15.0.0 ) diff --git a/ni-libraries/libnivissvc.so.16 b/ni-libraries/libnivissvc.so.16 new file mode 100644 index 0000000000..c544790636 --- /dev/null +++ b/ni-libraries/libnivissvc.so.16 @@ -0,0 +1,2 @@ +OUTPUT_FORMAT(elf32-littlearm) +GROUP ( libnivissvc.so.16.0 ) diff --git a/ni-libraries/libnivissvc.so.16.0 b/ni-libraries/libnivissvc.so.16.0 new file mode 100644 index 0000000000..31f2d0646b --- /dev/null +++ b/ni-libraries/libnivissvc.so.16.0 @@ -0,0 +1,2 @@ +OUTPUT_FORMAT(elf32-littlearm) +GROUP ( libnivissvc.so.16.0.0 ) diff --git a/ni-libraries/libnivissvc.so.15.0.0 b/ni-libraries/libnivissvc.so.16.0.0 old mode 100755 new mode 100644 similarity index 53% rename from ni-libraries/libnivissvc.so.15.0.0 rename to ni-libraries/libnivissvc.so.16.0.0 index e314583787..6113cfe10a Binary files a/ni-libraries/libnivissvc.so.15.0.0 and b/ni-libraries/libnivissvc.so.16.0.0 differ diff --git a/ni-libraries/libswscale.so b/ni-libraries/libswscale.so new file mode 100644 index 0000000000..f22aebbf76 --- /dev/null +++ b/ni-libraries/libswscale.so @@ -0,0 +1,2 @@ +OUTPUT_FORMAT(elf32-littlearm) +GROUP ( libswscale.so.2 ) diff --git a/ni-libraries/libswscale.so.2 b/ni-libraries/libswscale.so.2 new file mode 100644 index 0000000000..cc8301cdae --- /dev/null +++ b/ni-libraries/libswscale.so.2 @@ -0,0 +1,2 @@ +OUTPUT_FORMAT(elf32-littlearm) +GROUP ( libswscale.so.2.1 ) diff --git a/ni-libraries/libswscale.so.2.1 b/ni-libraries/libswscale.so.2.1 new file mode 100644 index 0000000000..643c94041e --- /dev/null +++ b/ni-libraries/libswscale.so.2.1 @@ -0,0 +1,2 @@ +OUTPUT_FORMAT(elf32-littlearm) +GROUP ( libswscale.so.2.1.101 ) diff --git a/ni-libraries/libswscale.so.2.1.101 b/ni-libraries/libswscale.so.2.1.101 new file mode 100644 index 0000000000..692c8f1bdc Binary files /dev/null and b/ni-libraries/libswscale.so.2.1.101 differ diff --git a/ni-libraries/libvisa.so b/ni-libraries/libvisa.so index 0ada01105b..7aa06498d1 100755 Binary files a/ni-libraries/libvisa.so and b/ni-libraries/libvisa.so differ diff --git a/ni-libraries/libwpi.so b/ni-libraries/libwpi.so index 429ff806dc..0a110ded13 100644 --- a/ni-libraries/libwpi.so +++ b/ni-libraries/libwpi.so @@ -1,3 +1,3 @@ /* GNU ld script */ OUTPUT_FORMAT(elf32-littlearm) -INPUT ( -lwpi_2015 ) +GROUP ( AS_NEEDED ( -lwpilib_nonshared -lHALAthena -lntcore -lwpiutil -lFRC_NetworkCommunication -li2c -lni_emb -lNiFpgaLv -lNiFpga -lnirio_emb_can -lNiRioSrv -lni_rtlog -lRoboRIO_FRC_ChipObject -lspi -lvisa -ldl -lpthread -lrt -lGCBase_gcc-4.4-arm_v3_0_NI -lGenApi_gcc-4.4-arm_v3_0_NI -lLog_gcc-4.4-arm_v3_0_NI -lMathParser_gcc-4.4-arm_v3_0_NI -llog4cpp_gcc-4.4-arm_v3_0_NI -lniimaqdx -lnivision -lnivissvc -lnipalu -lNodeMapData_gcc-4.4-arm_v3_0_NI -lXmlParser_gcc-4.4-arm_v3_0_NI -lavcodec -lavformat -lavutil -lniriodevenum -lniriosession -lswscale) ) diff --git a/ni-libraries/libwpi_2015.so b/ni-libraries/libwpi_2015.so deleted file mode 100644 index a369b497fb..0000000000 --- a/ni-libraries/libwpi_2015.so +++ /dev/null @@ -1,3 +0,0 @@ -/* GNU ld script */ -OUTPUT_FORMAT(elf32-littlearm) -GROUP ( AS_NEEDED ( -lwpilib_nonshared -lHALAthena -lntcore -lwpiutil -lFRC_NetworkCommunication -li2c -lni_emb -lNiFpgaLv -lNiFpga -lnirio_emb_can -lNiRioSrv -lni_rtlog -lRoboRIO_FRC_ChipObject -lspi -lvisa -ldl -lpthread -lrt -lGCBase_gcc-4.4-arm_v2_3 -lGenApi_gcc-4.4-arm_v2_3 -lLog_gcc-4.4-arm_v2_3 -lMathParser_gcc-4.4-arm_v2_3 -llog4cpp_gcc-4.4-arm_v2_3 -lniimaqdx -lnivision -lnivissvc -lnipalu) ) diff --git a/wpilibc/athena.gradle b/wpilibc/athena.gradle index 9994f350f6..d6bc0d9f4d 100644 --- a/wpilibc/athena.gradle +++ b/wpilibc/athena.gradle @@ -103,14 +103,14 @@ task wpilibcZip(type: Zip) { // this cannot be done purely with dependsOn in the task, as the static library task doesn't exist yet. Same goes for // the networkTablesStaticLibrary task and the two HAL tasks below tasks.whenTaskAdded { task -> - if (task.name == 'wpilib_nonsharedStaticLibrary') { + if (task.name.toLowerCase() == 'wpilib_nonsharedstaticlibrary') { wpilibcZip.dependsOn task } } // Add the hal static and shared libraries as a dependency project(':hal').tasks.whenTaskAdded { task -> - if (task.name == 'hALAthenaStaticLibrary' || task.name == 'hALAthenaSharedLibrary') { + if (task.name.toLowerCase() == 'halathenastaticlibrary' || task.name.toLowerCase() == 'halathenasharedlibrary') { wpilibcZip.dependsOn task } } diff --git a/wpilibc/athena/src/RobotBase.cpp b/wpilibc/athena/src/RobotBase.cpp index fd6ae2eb24..5dcc42e2bf 100644 --- a/wpilibc/athena/src/RobotBase.cpp +++ b/wpilibc/athena/src/RobotBase.cpp @@ -39,7 +39,7 @@ RobotBase::RobotBase() : m_ds(DriverStation::GetInstance()) { file = std::fopen("/tmp/frc_versions/FRC_Lib_Version.ini", "w"); if (file != nullptr) { - std::fputs("2016 C++ Release 5", file); + std::fputs("v2017.1.0-beta-1", file); std::fclose(file); } } diff --git a/wpilibcIntegrationTests/build.gradle b/wpilibcIntegrationTests/build.gradle index 86799fdb4e..e31b6a53b3 100644 --- a/wpilibcIntegrationTests/build.gradle +++ b/wpilibcIntegrationTests/build.gradle @@ -18,7 +18,7 @@ model { } cppCompiler.args '-pthread', '-Wno-unused-variable' - linker.args '-pthread', '-Wno-unused-variable', '-Wl,-rpath,/opt/GenICam_v2_3/bin/Linux_armv7-a' + linker.args '-pthread', '-Wno-unused-variable', '-Wl,-rpath,/opt/GenICam_v3_0_NI/bin/Linux32_ARM' } sources { cpp { diff --git a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/RobotBase.java b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/RobotBase.java index cb3839235d..ce6a87ed50 100644 --- a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/RobotBase.java +++ b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/RobotBase.java @@ -215,7 +215,7 @@ public abstract class RobotBase { file.createNewFile(); try (FileOutputStream output = new FileOutputStream(file)) { - output.write("2016 Java Release 5".getBytes()); + output.write("v2017.1.0-beta-1".getBytes()); } } catch (IOException ex) {