Update for latest image, not sure about ctre folder so leaving

Change-Id: If2218df082bca93d25b88088696d6c2897732efd

Adding FRC Local new mdns name

Change-Id: I53d206879663b96009ba3a12de161b7a425ffd10

Adding rpath for new libstdc++

Change-Id: I0c022efb0b15f094d153b44f60215ca00d5f1924
This commit is contained in:
Patrick Plenefisch
2015-09-27 14:09:17 -04:00
committed by Brad Miller (WPI)
parent 89ae8f214e
commit 9f859234fb
133 changed files with 505 additions and 233 deletions

View File

@@ -4,6 +4,6 @@
#ifndef __RoboRIO_FRC_ChipObject_Aliases_h__
#define __RoboRIO_FRC_ChipObject_Aliases_h__
#define nRoboRIO_FPGANamespace nFRC_2015_1_0_A
#define nRoboRIO_FPGANamespace nFRC_2016_16_0_0
#endif // __RoboRIO_FRC_ChipObject_Aliases_h__

View File

@@ -1,7 +1,7 @@
/*
* FPGA Interface C API 14.0 header file.
* FPGA Interface C API 15.0 header file.
*
* Copyright (c) 2014,
* Copyright (c) 2015,
* National Instruments Corporation.
* All rights reserved.
*/
@@ -431,6 +431,13 @@ static const NiFpga_Status NiFpga_Status_GatedClockHandshakingViolation = -61216
*/
static const NiFpga_Status NiFpga_Status_ElementsNotPermissibleToBeAcquired = -61219;
/**
* The operation could not be performed because the FPGA is in configuration or
* discovery mode. Wait for configuration or discovery to complete and retry
* your operation.
*/
static const NiFpga_Status NiFpga_Status_FpgaBusyConfiguration = -61252;
/**
* An unexpected internal error occurred.
*/
@@ -514,10 +521,12 @@ static const NiFpga_Status NiFpga_Status_BitfileReadError = -63101;
static const NiFpga_Status NiFpga_Status_SignatureMismatch = -63106;
/**
* The bitfile you are trying to use is not compatible with the version of
* NI-RIO installed on the target and/or the host. Determine which versions of
* NI-RIO and LabVIEW were used to make the bitfile, update the software on the
* target and host to that version or later, and try again.
* The bitfile you are trying to use is incompatible with the version
* of NI-RIO installed on the target and/or host. Update the version
* of NI-RIO on the target and/or host to the same version (or later)
* used to compile the bitfile. Alternatively, recompile the bitfile
* with the same version of NI-RIO that is currently installed on the
* target and/or host.
*/
static const NiFpga_Status NiFpga_Status_IncompatibleBitfile = -63107;
@@ -558,7 +567,7 @@ static const NiFpga_Status NiFpga_Status_OutOfHandles = -63198;
*/
static NiFpga_Inline NiFpga_Bool NiFpga_IsError(const NiFpga_Status status)
{
return status < NiFpga_Status_Success;
return status < NiFpga_Status_Success ? NiFpga_True : NiFpga_False;
}
/**
@@ -569,7 +578,7 @@ static NiFpga_Inline NiFpga_Bool NiFpga_IsError(const NiFpga_Status status)
*/
static NiFpga_Inline NiFpga_Bool NiFpga_IsNotError(const NiFpga_Status status)
{
return status >= NiFpga_Status_Success;
return status >= NiFpga_Status_Success ? NiFpga_True : NiFpga_False;
}
/**

View File

@@ -1,15 +1,15 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2015_1_0_A_nInterfaceGlobals_h__
#define __nFRC_2015_1_0_A_nInterfaceGlobals_h__
#ifndef __nFRC_2016_16_0_0_nInterfaceGlobals_h__
#define __nFRC_2016_16_0_0_nInterfaceGlobals_h__
namespace nFPGA
{
namespace nFRC_2015_1_0_A
namespace nFRC_2016_16_0_0
{
extern unsigned int g_currentTargetClass;
}
}
#endif // __nFRC_2015_1_0_A_nInterfaceGlobals_h__
#endif // __nFRC_2016_16_0_0_nInterfaceGlobals_h__

View File

@@ -1,14 +1,14 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2015_1_0_A_AI_h__
#define __nFRC_2015_1_0_A_AI_h__
#ifndef __nFRC_2016_16_0_0_AI_h__
#define __nFRC_2016_16_0_0_AI_h__
#include "tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2015_1_0_A
namespace nFRC_2016_16_0_0
{
class tAI
@@ -140,4 +140,4 @@ private:
}
}
#endif // __nFRC_2015_1_0_A_AI_h__
#endif // __nFRC_2016_16_0_0_AI_h__

View File

@@ -1,14 +1,14 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2015_1_0_A_AO_h__
#define __nFRC_2015_1_0_A_AO_h__
#ifndef __nFRC_2016_16_0_0_AO_h__
#define __nFRC_2016_16_0_0_AO_h__
#include "tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2015_1_0_A
namespace nFRC_2016_16_0_0
{
class tAO
@@ -47,4 +47,4 @@ private:
}
}
#endif // __nFRC_2015_1_0_A_AO_h__
#endif // __nFRC_2016_16_0_0_AO_h__

View File

@@ -1,14 +1,14 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2015_1_0_A_Accel_h__
#define __nFRC_2015_1_0_A_Accel_h__
#ifndef __nFRC_2016_16_0_0_Accel_h__
#define __nFRC_2016_16_0_0_Accel_h__
#include "tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2015_1_0_A
namespace nFRC_2016_16_0_0
{
class tAccel
@@ -99,4 +99,4 @@ private:
}
}
#endif // __nFRC_2015_1_0_A_Accel_h__
#endif // __nFRC_2016_16_0_0_Accel_h__

View File

@@ -1,14 +1,14 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2015_1_0_A_Accumulator_h__
#define __nFRC_2015_1_0_A_Accumulator_h__
#ifndef __nFRC_2016_16_0_0_Accumulator_h__
#define __nFRC_2016_16_0_0_Accumulator_h__
#include "tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2015_1_0_A
namespace nFRC_2016_16_0_0
{
class tAccumulator
@@ -84,4 +84,4 @@ private:
}
}
#endif // __nFRC_2015_1_0_A_Accumulator_h__
#endif // __nFRC_2016_16_0_0_Accumulator_h__

View File

@@ -1,14 +1,14 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2015_1_0_A_Alarm_h__
#define __nFRC_2015_1_0_A_Alarm_h__
#ifndef __nFRC_2016_16_0_0_Alarm_h__
#define __nFRC_2016_16_0_0_Alarm_h__
#include "tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2015_1_0_A
namespace nFRC_2016_16_0_0
{
class tAlarm
@@ -54,4 +54,4 @@ private:
}
}
#endif // __nFRC_2015_1_0_A_Alarm_h__
#endif // __nFRC_2016_16_0_0_Alarm_h__

View File

@@ -1,14 +1,14 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2015_1_0_A_AnalogTrigger_h__
#define __nFRC_2015_1_0_A_AnalogTrigger_h__
#ifndef __nFRC_2016_16_0_0_AnalogTrigger_h__
#define __nFRC_2016_16_0_0_AnalogTrigger_h__
#include "tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2015_1_0_A
namespace nFRC_2016_16_0_0
{
class tAnalogTrigger
@@ -126,4 +126,4 @@ private:
}
}
#endif // __nFRC_2015_1_0_A_AnalogTrigger_h__
#endif // __nFRC_2016_16_0_0_AnalogTrigger_h__

View File

@@ -1,14 +1,14 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2015_1_0_A_BIST_h__
#define __nFRC_2015_1_0_A_BIST_h__
#ifndef __nFRC_2016_16_0_0_BIST_h__
#define __nFRC_2016_16_0_0_BIST_h__
#include "tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2015_1_0_A
namespace nFRC_2016_16_0_0
{
class tBIST
@@ -87,4 +87,4 @@ private:
}
}
#endif // __nFRC_2015_1_0_A_BIST_h__
#endif // __nFRC_2016_16_0_0_BIST_h__

View File

@@ -1,14 +1,14 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2015_1_0_A_Counter_h__
#define __nFRC_2015_1_0_A_Counter_h__
#ifndef __nFRC_2016_16_0_0_Counter_h__
#define __nFRC_2016_16_0_0_Counter_h__
#include "tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2015_1_0_A
namespace nFRC_2016_16_0_0
{
class tCounter
@@ -216,4 +216,4 @@ private:
}
}
#endif // __nFRC_2015_1_0_A_Counter_h__
#endif // __nFRC_2016_16_0_0_Counter_h__

View File

@@ -1,14 +1,14 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2015_1_0_A_DIO_h__
#define __nFRC_2015_1_0_A_DIO_h__
#ifndef __nFRC_2016_16_0_0_DIO_h__
#define __nFRC_2016_16_0_0_DIO_h__
#include "tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2015_1_0_A
namespace nFRC_2016_16_0_0
{
class tDIO
@@ -245,4 +245,4 @@ private:
}
}
#endif // __nFRC_2015_1_0_A_DIO_h__
#endif // __nFRC_2016_16_0_0_DIO_h__

View File

@@ -1,14 +1,14 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2015_1_0_A_DMA_h__
#define __nFRC_2015_1_0_A_DMA_h__
#ifndef __nFRC_2016_16_0_0_DMA_h__
#define __nFRC_2016_16_0_0_DMA_h__
#include "tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2015_1_0_A
namespace nFRC_2016_16_0_0
{
class tDMA
@@ -185,4 +185,4 @@ private:
}
}
#endif // __nFRC_2015_1_0_A_DMA_h__
#endif // __nFRC_2016_16_0_0_DMA_h__

View File

@@ -1,14 +1,14 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2015_1_0_A_Encoder_h__
#define __nFRC_2015_1_0_A_Encoder_h__
#ifndef __nFRC_2016_16_0_0_Encoder_h__
#define __nFRC_2016_16_0_0_Encoder_h__
#include "tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2015_1_0_A
namespace nFRC_2016_16_0_0
{
class tEncoder
@@ -196,4 +196,4 @@ private:
}
}
#endif // __nFRC_2015_1_0_A_Encoder_h__
#endif // __nFRC_2016_16_0_0_Encoder_h__

View File

@@ -1,14 +1,14 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2015_1_0_A_Global_h__
#define __nFRC_2015_1_0_A_Global_h__
#ifndef __nFRC_2016_16_0_0_Global_h__
#define __nFRC_2016_16_0_0_Global_h__
#include "tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2015_1_0_A
namespace nFRC_2016_16_0_0
{
class tGlobal
@@ -101,4 +101,4 @@ private:
}
}
#endif // __nFRC_2015_1_0_A_Global_h__
#endif // __nFRC_2016_16_0_0_Global_h__

View File

@@ -1,14 +1,14 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2015_1_0_A_Interrupt_h__
#define __nFRC_2015_1_0_A_Interrupt_h__
#ifndef __nFRC_2016_16_0_0_Interrupt_h__
#define __nFRC_2016_16_0_0_Interrupt_h__
#include "tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2015_1_0_A
namespace nFRC_2016_16_0_0
{
class tInterrupt
@@ -97,4 +97,4 @@ private:
}
}
#endif // __nFRC_2015_1_0_A_Interrupt_h__
#endif // __nFRC_2016_16_0_0_Interrupt_h__

View File

@@ -1,14 +1,14 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2015_1_0_A_PWM_h__
#define __nFRC_2015_1_0_A_PWM_h__
#ifndef __nFRC_2016_16_0_0_PWM_h__
#define __nFRC_2016_16_0_0_PWM_h__
#include "tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2015_1_0_A
namespace nFRC_2016_16_0_0
{
class tPWM
@@ -117,4 +117,4 @@ private:
}
}
#endif // __nFRC_2015_1_0_A_PWM_h__
#endif // __nFRC_2016_16_0_0_PWM_h__

View File

@@ -1,14 +1,14 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2015_1_0_A_Power_h__
#define __nFRC_2015_1_0_A_Power_h__
#ifndef __nFRC_2016_16_0_0_Power_h__
#define __nFRC_2016_16_0_0_Power_h__
#include "tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2015_1_0_A
namespace nFRC_2016_16_0_0
{
class tPower
@@ -214,4 +214,4 @@ private:
}
}
#endif // __nFRC_2015_1_0_A_Power_h__
#endif // __nFRC_2016_16_0_0_Power_h__

View File

@@ -1,14 +1,14 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2015_1_0_A_Relay_h__
#define __nFRC_2015_1_0_A_Relay_h__
#ifndef __nFRC_2016_16_0_0_Relay_h__
#define __nFRC_2016_16_0_0_Relay_h__
#include "tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2015_1_0_A
namespace nFRC_2016_16_0_0
{
class tRelay
@@ -65,4 +65,4 @@ private:
}
}
#endif // __nFRC_2015_1_0_A_Relay_h__
#endif // __nFRC_2016_16_0_0_Relay_h__

View File

@@ -1,14 +1,14 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2015_1_0_A_SPI_h__
#define __nFRC_2015_1_0_A_SPI_h__
#ifndef __nFRC_2016_16_0_0_SPI_h__
#define __nFRC_2016_16_0_0_SPI_h__
#include "tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2015_1_0_A
namespace nFRC_2016_16_0_0
{
class tSPI
@@ -65,4 +65,4 @@ private:
}
}
#endif // __nFRC_2015_1_0_A_SPI_h__
#endif // __nFRC_2016_16_0_0_SPI_h__

View File

@@ -1,14 +1,14 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2015_1_0_A_SysWatchdog_h__
#define __nFRC_2015_1_0_A_SysWatchdog_h__
#ifndef __nFRC_2016_16_0_0_SysWatchdog_h__
#define __nFRC_2016_16_0_0_SysWatchdog_h__
#include "tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2015_1_0_A
namespace nFRC_2016_16_0_0
{
class tSysWatchdog
@@ -105,4 +105,4 @@ private:
}
}
#endif // __nFRC_2015_1_0_A_SysWatchdog_h__
#endif // __nFRC_2016_16_0_0_SysWatchdog_h__