Updated to NI image v18

Change-Id: If120eee63c7815bfcf2f05fdf48a0399497a645d
This commit is contained in:
Fredric Silberberg
2015-12-11 17:18:41 -05:00
parent 7ba89306ca
commit 82d89d3b70
28 changed files with 184 additions and 158 deletions

View File

@@ -1,15 +1,15 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2016_16_0_0_nInterfaceGlobals_h__
#define __nFRC_2016_16_0_0_nInterfaceGlobals_h__
#ifndef __nFRC_2016_16_1_0_nInterfaceGlobals_h__
#define __nFRC_2016_16_1_0_nInterfaceGlobals_h__
namespace nFPGA
{
namespace nFRC_2016_16_0_0
namespace nFRC_2016_16_1_0
{
extern unsigned int g_currentTargetClass;
}
}
#endif // __nFRC_2016_16_0_0_nInterfaceGlobals_h__
#endif // __nFRC_2016_16_1_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_2016_16_0_0_AI_h__
#define __nFRC_2016_16_0_0_AI_h__
#ifndef __nFRC_2016_16_1_0_AI_h__
#define __nFRC_2016_16_1_0_AI_h__
#include "tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2016_16_0_0
namespace nFRC_2016_16_1_0
{
class tAI
@@ -140,4 +140,4 @@ private:
}
}
#endif // __nFRC_2016_16_0_0_AI_h__
#endif // __nFRC_2016_16_1_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_2016_16_0_0_AO_h__
#define __nFRC_2016_16_0_0_AO_h__
#ifndef __nFRC_2016_16_1_0_AO_h__
#define __nFRC_2016_16_1_0_AO_h__
#include "tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2016_16_0_0
namespace nFRC_2016_16_1_0
{
class tAO
@@ -47,4 +47,4 @@ private:
}
}
#endif // __nFRC_2016_16_0_0_AO_h__
#endif // __nFRC_2016_16_1_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_2016_16_0_0_Accel_h__
#define __nFRC_2016_16_0_0_Accel_h__
#ifndef __nFRC_2016_16_1_0_Accel_h__
#define __nFRC_2016_16_1_0_Accel_h__
#include "tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2016_16_0_0
namespace nFRC_2016_16_1_0
{
class tAccel
@@ -99,4 +99,4 @@ private:
}
}
#endif // __nFRC_2016_16_0_0_Accel_h__
#endif // __nFRC_2016_16_1_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_2016_16_0_0_Accumulator_h__
#define __nFRC_2016_16_0_0_Accumulator_h__
#ifndef __nFRC_2016_16_1_0_Accumulator_h__
#define __nFRC_2016_16_1_0_Accumulator_h__
#include "tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2016_16_0_0
namespace nFRC_2016_16_1_0
{
class tAccumulator
@@ -84,4 +84,4 @@ private:
}
}
#endif // __nFRC_2016_16_0_0_Accumulator_h__
#endif // __nFRC_2016_16_1_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_2016_16_0_0_Alarm_h__
#define __nFRC_2016_16_0_0_Alarm_h__
#ifndef __nFRC_2016_16_1_0_Alarm_h__
#define __nFRC_2016_16_1_0_Alarm_h__
#include "tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2016_16_0_0
namespace nFRC_2016_16_1_0
{
class tAlarm
@@ -54,4 +54,4 @@ private:
}
}
#endif // __nFRC_2016_16_0_0_Alarm_h__
#endif // __nFRC_2016_16_1_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_2016_16_0_0_AnalogTrigger_h__
#define __nFRC_2016_16_0_0_AnalogTrigger_h__
#ifndef __nFRC_2016_16_1_0_AnalogTrigger_h__
#define __nFRC_2016_16_1_0_AnalogTrigger_h__
#include "tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2016_16_0_0
namespace nFRC_2016_16_1_0
{
class tAnalogTrigger
@@ -126,4 +126,4 @@ private:
}
}
#endif // __nFRC_2016_16_0_0_AnalogTrigger_h__
#endif // __nFRC_2016_16_1_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_2016_16_0_0_BIST_h__
#define __nFRC_2016_16_0_0_BIST_h__
#ifndef __nFRC_2016_16_1_0_BIST_h__
#define __nFRC_2016_16_1_0_BIST_h__
#include "tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2016_16_0_0
namespace nFRC_2016_16_1_0
{
class tBIST
@@ -87,4 +87,4 @@ private:
}
}
#endif // __nFRC_2016_16_0_0_BIST_h__
#endif // __nFRC_2016_16_1_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_2016_16_0_0_Counter_h__
#define __nFRC_2016_16_0_0_Counter_h__
#ifndef __nFRC_2016_16_1_0_Counter_h__
#define __nFRC_2016_16_1_0_Counter_h__
#include "tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2016_16_0_0
namespace nFRC_2016_16_1_0
{
class tCounter
@@ -216,4 +216,4 @@ private:
}
}
#endif // __nFRC_2016_16_0_0_Counter_h__
#endif // __nFRC_2016_16_1_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_2016_16_0_0_DIO_h__
#define __nFRC_2016_16_0_0_DIO_h__
#ifndef __nFRC_2016_16_1_0_DIO_h__
#define __nFRC_2016_16_1_0_DIO_h__
#include "tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2016_16_0_0
namespace nFRC_2016_16_1_0
{
class tDIO
@@ -245,4 +245,4 @@ private:
}
}
#endif // __nFRC_2016_16_0_0_DIO_h__
#endif // __nFRC_2016_16_1_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_2016_16_0_0_DMA_h__
#define __nFRC_2016_16_0_0_DMA_h__
#ifndef __nFRC_2016_16_1_0_DMA_h__
#define __nFRC_2016_16_1_0_DMA_h__
#include "tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2016_16_0_0
namespace nFRC_2016_16_1_0
{
class tDMA
@@ -46,13 +46,17 @@ public:
unsigned Enable_Counters_High : 1;
unsigned Enable_CounterTimers_Low : 1;
unsigned Enable_CounterTimers_High : 1;
unsigned Enable_Encoders : 1;
unsigned Enable_EncoderTimers : 1;
unsigned Enable_Encoders_Low : 1;
unsigned Enable_Encoders_High : 1;
unsigned Enable_EncoderTimers_Low : 1;
unsigned Enable_EncoderTimers_High : 1;
unsigned ExternalClock : 1;
#else
unsigned ExternalClock : 1;
unsigned Enable_EncoderTimers : 1;
unsigned Enable_Encoders : 1;
unsigned Enable_EncoderTimers_High : 1;
unsigned Enable_EncoderTimers_Low : 1;
unsigned Enable_Encoders_High : 1;
unsigned Enable_Encoders_Low : 1;
unsigned Enable_CounterTimers_High : 1;
unsigned Enable_CounterTimers_Low : 1;
unsigned Enable_Counters_High : 1;
@@ -73,7 +77,7 @@ public:
#endif
};
struct{
unsigned value : 20;
unsigned value : 22;
};
} tConfig;
typedef
@@ -130,8 +134,10 @@ public:
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_Enable_Encoders_Low(bool value, tRioStatusCode *status) = 0;
virtual void writeConfig_Enable_Encoders_High(bool value, tRioStatusCode *status) = 0;
virtual void writeConfig_Enable_EncoderTimers_Low(bool value, tRioStatusCode *status) = 0;
virtual void writeConfig_Enable_EncoderTimers_High(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;
@@ -151,30 +157,33 @@ public:
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_Enable_Encoders_Low(tRioStatusCode *status) = 0;
virtual bool readConfig_Enable_Encoders_High(tRioStatusCode *status) = 0;
virtual bool readConfig_Enable_EncoderTimers_Low(tRioStatusCode *status) = 0;
virtual bool readConfig_Enable_EncoderTimers_High(tRioStatusCode *status) = 0;
virtual bool readConfig_ExternalClock(tRioStatusCode *status) = 0;
typedef enum
{
kNumExternalTriggersRegisters = 2,
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;
virtual void writeExternalTriggers(unsigned char reg_index, unsigned char bitfield_index, tExternalTriggers value, tRioStatusCode *status) = 0;
virtual void writeExternalTriggers_ExternalClockSource_Channel(unsigned char reg_index, unsigned char bitfield_index, unsigned char value, tRioStatusCode *status) = 0;
virtual void writeExternalTriggers_ExternalClockSource_Module(unsigned char reg_index, unsigned char bitfield_index, unsigned char value, tRioStatusCode *status) = 0;
virtual void writeExternalTriggers_ExternalClockSource_AnalogTrigger(unsigned char reg_index, unsigned char bitfield_index, bool value, tRioStatusCode *status) = 0;
virtual void writeExternalTriggers_RisingEdge(unsigned char reg_index, unsigned char bitfield_index, bool value, tRioStatusCode *status) = 0;
virtual void writeExternalTriggers_FallingEdge(unsigned char reg_index, unsigned char bitfield_index, bool value, tRioStatusCode *status) = 0;
virtual tExternalTriggers readExternalTriggers(unsigned char reg_index, unsigned char bitfield_index, tRioStatusCode *status) = 0;
virtual unsigned char readExternalTriggers_ExternalClockSource_Channel(unsigned char reg_index, unsigned char bitfield_index, tRioStatusCode *status) = 0;
virtual unsigned char readExternalTriggers_ExternalClockSource_Module(unsigned char reg_index, unsigned char bitfield_index, tRioStatusCode *status) = 0;
virtual bool readExternalTriggers_ExternalClockSource_AnalogTrigger(unsigned char reg_index, unsigned char bitfield_index, tRioStatusCode *status) = 0;
virtual bool readExternalTriggers_RisingEdge(unsigned char reg_index, unsigned char bitfield_index, tRioStatusCode *status) = 0;
virtual bool readExternalTriggers_FallingEdge(unsigned char reg_index, unsigned char bitfield_index, tRioStatusCode *status) = 0;
private:
@@ -185,4 +194,4 @@ private:
}
}
#endif // __nFRC_2016_16_0_0_DMA_h__
#endif // __nFRC_2016_16_1_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_2016_16_0_0_Encoder_h__
#define __nFRC_2016_16_0_0_Encoder_h__
#ifndef __nFRC_2016_16_1_0_Encoder_h__
#define __nFRC_2016_16_1_0_Encoder_h__
#include "tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2016_16_0_0
namespace nFRC_2016_16_1_0
{
class tEncoder
@@ -196,4 +196,4 @@ private:
}
}
#endif // __nFRC_2016_16_0_0_Encoder_h__
#endif // __nFRC_2016_16_1_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_2016_16_0_0_Global_h__
#define __nFRC_2016_16_0_0_Global_h__
#ifndef __nFRC_2016_16_1_0_Global_h__
#define __nFRC_2016_16_1_0_Global_h__
#include "tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2016_16_0_0
namespace nFRC_2016_16_1_0
{
class tGlobal
@@ -101,4 +101,4 @@ private:
}
}
#endif // __nFRC_2016_16_0_0_Global_h__
#endif // __nFRC_2016_16_1_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_2016_16_0_0_Interrupt_h__
#define __nFRC_2016_16_0_0_Interrupt_h__
#ifndef __nFRC_2016_16_1_0_Interrupt_h__
#define __nFRC_2016_16_1_0_Interrupt_h__
#include "tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2016_16_0_0
namespace nFRC_2016_16_1_0
{
class tInterrupt
@@ -97,4 +97,4 @@ private:
}
}
#endif // __nFRC_2016_16_0_0_Interrupt_h__
#endif // __nFRC_2016_16_1_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_2016_16_0_0_PWM_h__
#define __nFRC_2016_16_0_0_PWM_h__
#ifndef __nFRC_2016_16_1_0_PWM_h__
#define __nFRC_2016_16_1_0_PWM_h__
#include "tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2016_16_0_0
namespace nFRC_2016_16_1_0
{
class tPWM
@@ -117,4 +117,4 @@ private:
}
}
#endif // __nFRC_2016_16_0_0_PWM_h__
#endif // __nFRC_2016_16_1_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_2016_16_0_0_Power_h__
#define __nFRC_2016_16_0_0_Power_h__
#ifndef __nFRC_2016_16_1_0_Power_h__
#define __nFRC_2016_16_1_0_Power_h__
#include "tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2016_16_0_0
namespace nFRC_2016_16_1_0
{
class tPower
@@ -46,19 +46,21 @@ public:
union{
struct{
#ifdef __vxworks
unsigned OverCurrentFaultCount3V3 : 10;
unsigned OverCurrentFaultCount5V : 10;
unsigned OverCurrentFaultCount6V : 10;
unsigned OverCurrentFaultCount3V3 : 8;
unsigned OverCurrentFaultCount5V : 8;
unsigned OverCurrentFaultCount6V : 8;
unsigned UnderVoltageFaultCount5V : 8;
#else
unsigned OverCurrentFaultCount6V : 10;
unsigned OverCurrentFaultCount5V : 10;
unsigned OverCurrentFaultCount3V3 : 10;
unsigned UnderVoltageFaultCount5V : 8;
unsigned OverCurrentFaultCount6V : 8;
unsigned OverCurrentFaultCount5V : 8;
unsigned OverCurrentFaultCount3V3 : 8;
#endif
};
struct{
unsigned value : 30;
unsigned value : 32;
};
} tOverCurrentFaultCounts;
} tFaultCounts;
typedef
union{
struct{
@@ -124,16 +126,6 @@ public:
virtual void strobeResetFaultCounts(tRioStatusCode *status) = 0;
typedef enum
{
} tOverCurrentFaultCounts_IfaceConstants;
virtual tOverCurrentFaultCounts readOverCurrentFaultCounts(tRioStatusCode *status) = 0;
virtual unsigned short readOverCurrentFaultCounts_OverCurrentFaultCount3V3(tRioStatusCode *status) = 0;
virtual unsigned short readOverCurrentFaultCounts_OverCurrentFaultCount5V(tRioStatusCode *status) = 0;
virtual unsigned short readOverCurrentFaultCounts_OverCurrentFaultCount6V(tRioStatusCode *status) = 0;
typedef enum
{
} tIntegratedIO_IfaceConstants;
@@ -183,6 +175,17 @@ public:
virtual unsigned short readAOVoltage(tRioStatusCode *status) = 0;
typedef enum
{
} tFaultCounts_IfaceConstants;
virtual tFaultCounts readFaultCounts(tRioStatusCode *status) = 0;
virtual unsigned char readFaultCounts_OverCurrentFaultCount3V3(tRioStatusCode *status) = 0;
virtual unsigned char readFaultCounts_OverCurrentFaultCount5V(tRioStatusCode *status) = 0;
virtual unsigned char readFaultCounts_OverCurrentFaultCount6V(tRioStatusCode *status) = 0;
virtual unsigned char readFaultCounts_UnderVoltageFaultCount5V(tRioStatusCode *status) = 0;
typedef enum
{
} tVinCurrent_IfaceConstants;
@@ -214,4 +217,4 @@ private:
}
}
#endif // __nFRC_2016_16_0_0_Power_h__
#endif // __nFRC_2016_16_1_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_2016_16_0_0_Relay_h__
#define __nFRC_2016_16_0_0_Relay_h__
#ifndef __nFRC_2016_16_1_0_Relay_h__
#define __nFRC_2016_16_1_0_Relay_h__
#include "tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2016_16_0_0
namespace nFRC_2016_16_1_0
{
class tRelay
@@ -65,4 +65,4 @@ private:
}
}
#endif // __nFRC_2016_16_0_0_Relay_h__
#endif // __nFRC_2016_16_1_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_2016_16_0_0_SPI_h__
#define __nFRC_2016_16_0_0_SPI_h__
#ifndef __nFRC_2016_16_1_0_SPI_h__
#define __nFRC_2016_16_1_0_SPI_h__
#include "tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2016_16_0_0
namespace nFRC_2016_16_1_0
{
class tSPI
@@ -65,4 +65,4 @@ private:
}
}
#endif // __nFRC_2016_16_0_0_SPI_h__
#endif // __nFRC_2016_16_1_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_2016_16_0_0_SysWatchdog_h__
#define __nFRC_2016_16_0_0_SysWatchdog_h__
#ifndef __nFRC_2016_16_1_0_SysWatchdog_h__
#define __nFRC_2016_16_1_0_SysWatchdog_h__
#include "tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2016_16_0_0
namespace nFRC_2016_16_1_0
{
class tSysWatchdog
@@ -105,4 +105,4 @@ private:
}
}
#endif // __nFRC_2016_16_0_0_SysWatchdog_h__
#endif // __nFRC_2016_16_1_0_SysWatchdog_h__