Update to image 2018v13 (#815)

This commit is contained in:
Thad House
2017-12-06 21:02:36 -08:00
committed by Peter Johnson
parent 899892c119
commit 5078f6c92a
25 changed files with 123 additions and 83 deletions

View File

@@ -1,15 +1,18 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2018_18_0_5_nInterfaceGlobals_h__
#define __nFRC_2018_18_0_5_nInterfaceGlobals_h__
#ifndef __nFRC_2018_18_0_7_nInterfaceGlobals_h__
#define __nFRC_2018_18_0_7_nInterfaceGlobals_h__
namespace nFPGA
{
namespace nFRC_2018_18_0_5
namespace nFRC_2018_18_0_7
{
extern unsigned int g_currentTargetClass;
static const int g_SpiAutoData_index = 0;
static const int g_DMA_index = 1;
}
}
#endif // __nFRC_2018_18_0_5_nInterfaceGlobals_h__
#endif // __nFRC_2018_18_0_7_nInterfaceGlobals_h__

View File

@@ -1,15 +1,15 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2018_18_0_5_AI_h__
#define __nFRC_2018_18_0_5_AI_h__
#ifndef __nFRC_2018_18_0_7_AI_h__
#define __nFRC_2018_18_0_7_AI_h__
#include "../tSystem.h"
#include "../tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2018_18_0_5
namespace nFRC_2018_18_0_7
{
class tAI
@@ -141,4 +141,4 @@ private:
}
}
#endif // __nFRC_2018_18_0_5_AI_h__
#endif // __nFRC_2018_18_0_7_AI_h__

View File

@@ -1,15 +1,15 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2018_18_0_5_AO_h__
#define __nFRC_2018_18_0_5_AO_h__
#ifndef __nFRC_2018_18_0_7_AO_h__
#define __nFRC_2018_18_0_7_AO_h__
#include "../tSystem.h"
#include "../tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2018_18_0_5
namespace nFRC_2018_18_0_7
{
class tAO
@@ -48,4 +48,4 @@ private:
}
}
#endif // __nFRC_2018_18_0_5_AO_h__
#endif // __nFRC_2018_18_0_7_AO_h__

View File

@@ -1,15 +1,15 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2018_18_0_5_Accel_h__
#define __nFRC_2018_18_0_5_Accel_h__
#ifndef __nFRC_2018_18_0_7_Accel_h__
#define __nFRC_2018_18_0_7_Accel_h__
#include "../tSystem.h"
#include "../tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2018_18_0_5
namespace nFRC_2018_18_0_7
{
class tAccel
@@ -100,4 +100,4 @@ private:
}
}
#endif // __nFRC_2018_18_0_5_Accel_h__
#endif // __nFRC_2018_18_0_7_Accel_h__

View File

@@ -1,15 +1,15 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2018_18_0_5_Accumulator_h__
#define __nFRC_2018_18_0_5_Accumulator_h__
#ifndef __nFRC_2018_18_0_7_Accumulator_h__
#define __nFRC_2018_18_0_7_Accumulator_h__
#include "../tSystem.h"
#include "../tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2018_18_0_5
namespace nFRC_2018_18_0_7
{
class tAccumulator
@@ -85,4 +85,4 @@ private:
}
}
#endif // __nFRC_2018_18_0_5_Accumulator_h__
#endif // __nFRC_2018_18_0_7_Accumulator_h__

View File

@@ -1,15 +1,15 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2018_18_0_5_Alarm_h__
#define __nFRC_2018_18_0_5_Alarm_h__
#ifndef __nFRC_2018_18_0_7_Alarm_h__
#define __nFRC_2018_18_0_7_Alarm_h__
#include "../tSystem.h"
#include "../tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2018_18_0_5
namespace nFRC_2018_18_0_7
{
class tAlarm
@@ -55,4 +55,4 @@ private:
}
}
#endif // __nFRC_2018_18_0_5_Alarm_h__
#endif // __nFRC_2018_18_0_7_Alarm_h__

View File

@@ -1,15 +1,15 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2018_18_0_5_AnalogTrigger_h__
#define __nFRC_2018_18_0_5_AnalogTrigger_h__
#ifndef __nFRC_2018_18_0_7_AnalogTrigger_h__
#define __nFRC_2018_18_0_7_AnalogTrigger_h__
#include "../tSystem.h"
#include "../tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2018_18_0_5
namespace nFRC_2018_18_0_7
{
class tAnalogTrigger
@@ -127,4 +127,4 @@ private:
}
}
#endif // __nFRC_2018_18_0_5_AnalogTrigger_h__
#endif // __nFRC_2018_18_0_7_AnalogTrigger_h__

View File

@@ -1,15 +1,15 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2018_18_0_5_BIST_h__
#define __nFRC_2018_18_0_5_BIST_h__
#ifndef __nFRC_2018_18_0_7_BIST_h__
#define __nFRC_2018_18_0_7_BIST_h__
#include "../tSystem.h"
#include "../tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2018_18_0_5
namespace nFRC_2018_18_0_7
{
class tBIST
@@ -88,4 +88,4 @@ private:
}
}
#endif // __nFRC_2018_18_0_5_BIST_h__
#endif // __nFRC_2018_18_0_7_BIST_h__

View File

@@ -1,15 +1,15 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2018_18_0_5_Counter_h__
#define __nFRC_2018_18_0_5_Counter_h__
#ifndef __nFRC_2018_18_0_7_Counter_h__
#define __nFRC_2018_18_0_7_Counter_h__
#include "../tSystem.h"
#include "../tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2018_18_0_5
namespace nFRC_2018_18_0_7
{
class tCounter
@@ -217,4 +217,4 @@ private:
}
}
#endif // __nFRC_2018_18_0_5_Counter_h__
#endif // __nFRC_2018_18_0_7_Counter_h__

View File

@@ -1,15 +1,15 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2018_18_0_5_DIO_h__
#define __nFRC_2018_18_0_5_DIO_h__
#ifndef __nFRC_2018_18_0_7_DIO_h__
#define __nFRC_2018_18_0_7_DIO_h__
#include "../tSystem.h"
#include "../tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2018_18_0_5
namespace nFRC_2018_18_0_7
{
class tDIO
@@ -261,4 +261,4 @@ private:
}
}
#endif // __nFRC_2018_18_0_5_DIO_h__
#endif // __nFRC_2018_18_0_7_DIO_h__

View File

@@ -1,15 +1,15 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2018_18_0_5_DMA_h__
#define __nFRC_2018_18_0_5_DMA_h__
#ifndef __nFRC_2018_18_0_7_DMA_h__
#define __nFRC_2018_18_0_7_DMA_h__
#include "../tSystem.h"
#include "../tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2018_18_0_5
namespace nFRC_2018_18_0_7
{
class tDMA
@@ -195,4 +195,4 @@ private:
}
}
#endif // __nFRC_2018_18_0_5_DMA_h__
#endif // __nFRC_2018_18_0_7_DMA_h__

View File

@@ -1,15 +1,15 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2018_18_0_5_Encoder_h__
#define __nFRC_2018_18_0_5_Encoder_h__
#ifndef __nFRC_2018_18_0_7_Encoder_h__
#define __nFRC_2018_18_0_7_Encoder_h__
#include "../tSystem.h"
#include "../tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2018_18_0_5
namespace nFRC_2018_18_0_7
{
class tEncoder
@@ -197,4 +197,4 @@ private:
}
}
#endif // __nFRC_2018_18_0_5_Encoder_h__
#endif // __nFRC_2018_18_0_7_Encoder_h__

View File

@@ -1,15 +1,15 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2018_18_0_5_Global_h__
#define __nFRC_2018_18_0_5_Global_h__
#ifndef __nFRC_2018_18_0_7_Global_h__
#define __nFRC_2018_18_0_7_Global_h__
#include "../tSystem.h"
#include "../tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2018_18_0_5
namespace nFRC_2018_18_0_7
{
class tGlobal
@@ -105,4 +105,4 @@ private:
}
}
#endif // __nFRC_2018_18_0_5_Global_h__
#endif // __nFRC_2018_18_0_7_Global_h__

View File

@@ -1,15 +1,15 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2018_18_0_5_HMB_h__
#define __nFRC_2018_18_0_5_HMB_h__
#ifndef __nFRC_2018_18_0_7_HMB_h__
#define __nFRC_2018_18_0_7_HMB_h__
#include "../tSystem.h"
#include "../tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2018_18_0_5
namespace nFRC_2018_18_0_7
{
class tHMB
@@ -146,4 +146,4 @@ private:
}
}
#endif // __nFRC_2018_18_0_5_HMB_h__
#endif // __nFRC_2018_18_0_7_HMB_h__

View File

@@ -1,15 +1,15 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2018_18_0_5_Interrupt_h__
#define __nFRC_2018_18_0_5_Interrupt_h__
#ifndef __nFRC_2018_18_0_7_Interrupt_h__
#define __nFRC_2018_18_0_7_Interrupt_h__
#include "../tSystem.h"
#include "../tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2018_18_0_5
namespace nFRC_2018_18_0_7
{
class tInterrupt
@@ -98,4 +98,4 @@ private:
}
}
#endif // __nFRC_2018_18_0_5_Interrupt_h__
#endif // __nFRC_2018_18_0_7_Interrupt_h__

View File

@@ -1,15 +1,15 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2018_18_0_5_PWM_h__
#define __nFRC_2018_18_0_5_PWM_h__
#ifndef __nFRC_2018_18_0_7_PWM_h__
#define __nFRC_2018_18_0_7_PWM_h__
#include "../tSystem.h"
#include "../tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2018_18_0_5
namespace nFRC_2018_18_0_7
{
class tPWM
@@ -132,4 +132,4 @@ private:
}
}
#endif // __nFRC_2018_18_0_5_PWM_h__
#endif // __nFRC_2018_18_0_7_PWM_h__

View File

@@ -1,15 +1,15 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2018_18_0_5_Power_h__
#define __nFRC_2018_18_0_5_Power_h__
#ifndef __nFRC_2018_18_0_7_Power_h__
#define __nFRC_2018_18_0_7_Power_h__
#include "../tSystem.h"
#include "../tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2018_18_0_5
namespace nFRC_2018_18_0_7
{
class tPower
@@ -218,4 +218,4 @@ private:
}
}
#endif // __nFRC_2018_18_0_5_Power_h__
#endif // __nFRC_2018_18_0_7_Power_h__

View File

@@ -1,15 +1,15 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2018_18_0_5_Relay_h__
#define __nFRC_2018_18_0_5_Relay_h__
#ifndef __nFRC_2018_18_0_7_Relay_h__
#define __nFRC_2018_18_0_7_Relay_h__
#include "../tSystem.h"
#include "../tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2018_18_0_5
namespace nFRC_2018_18_0_7
{
class tRelay
@@ -66,4 +66,4 @@ private:
}
}
#endif // __nFRC_2018_18_0_5_Relay_h__
#endif // __nFRC_2018_18_0_7_Relay_h__

View File

@@ -1,15 +1,15 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2018_18_0_5_SPI_h__
#define __nFRC_2018_18_0_5_SPI_h__
#ifndef __nFRC_2018_18_0_7_SPI_h__
#define __nFRC_2018_18_0_7_SPI_h__
#include "../tSystem.h"
#include "../tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2018_18_0_5
namespace nFRC_2018_18_0_7
{
class tSPI
@@ -52,6 +52,21 @@ public:
typedef
union{
struct{
#ifdef __vxworks
unsigned TxByteCount : 4;
unsigned ZeroByteCount : 7;
#else
unsigned ZeroByteCount : 7;
unsigned TxByteCount : 4;
#endif
};
struct{
unsigned value : 11;
};
} tAutoByteCount;
typedef
union{
struct{
#ifdef __vxworks
unsigned Hdr : 4;
unsigned MXP : 1;
@@ -116,12 +131,23 @@ public:
virtual unsigned int readDebugRevision(tRioStatusCode *status) = 0;
typedef enum
{
} tTransferSkippedFullCount_IfaceConstants;
virtual unsigned int readTransferSkippedFullCount(tRioStatusCode *status) = 0;
typedef enum
{
} tAutoByteCount_IfaceConstants;
virtual void writeAutoByteCount(unsigned char value, tRioStatusCode *status) = 0;
virtual unsigned char readAutoByteCount(tRioStatusCode *status) = 0;
virtual void writeAutoByteCount(tAutoByteCount value, tRioStatusCode *status) = 0;
virtual void writeAutoByteCount_TxByteCount(unsigned char value, tRioStatusCode *status) = 0;
virtual void writeAutoByteCount_ZeroByteCount(unsigned char value, tRioStatusCode *status) = 0;
virtual tAutoByteCount readAutoByteCount(tRioStatusCode *status) = 0;
virtual unsigned char readAutoByteCount_TxByteCount(tRioStatusCode *status) = 0;
virtual unsigned char readAutoByteCount_ZeroByteCount(tRioStatusCode *status) = 0;
typedef enum
@@ -208,4 +234,4 @@ private:
}
}
#endif // __nFRC_2018_18_0_5_SPI_h__
#endif // __nFRC_2018_18_0_7_SPI_h__

View File

@@ -1,15 +1,15 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2018_18_0_5_SysWatchdog_h__
#define __nFRC_2018_18_0_5_SysWatchdog_h__
#ifndef __nFRC_2018_18_0_7_SysWatchdog_h__
#define __nFRC_2018_18_0_7_SysWatchdog_h__
#include "../tSystem.h"
#include "../tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2018_18_0_5
namespace nFRC_2018_18_0_7
{
class tSysWatchdog
@@ -106,4 +106,4 @@ private:
}
}
#endif // __nFRC_2018_18_0_5_SysWatchdog_h__
#endif // __nFRC_2018_18_0_7_SysWatchdog_h__