Skip to content

Commit

Permalink
Update to 2024v2 Image
Browse files Browse the repository at this point in the history
  • Loading branch information
ThadHouse committed Dec 7, 2023
1 parent 7f83457 commit 8959854
Show file tree
Hide file tree
Showing 28 changed files with 106 additions and 91 deletions.
2 changes: 1 addition & 1 deletion allowed_images.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2024_v1.*
2024_v2.*
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ ext.addTaskToCopyAllOutputs = { task ->
copyAllOutputs.from task.archivePath
}

def pubVersion = '2024.1.1'
def pubVersion = '2024.2.0'

def baseArtifactId = 'chipobject'
def artifactGroupId = 'edu.wpi.first.ni-libraries'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
#ifndef __RoboRIO_FRC_ChipObject_Aliases_h__
#define __RoboRIO_FRC_ChipObject_Aliases_h__

#define nRoboRIO_FPGANamespace nFRC_2023_23_0_0
#define nRoboRIO_FPGANamespace nFRC_2024_24_0_0

#endif // __RoboRIO_FRC_ChipObject_Aliases_h__
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!

#ifndef __nFRC_2023_23_0_0_nInterfaceGlobals_h__
#define __nFRC_2023_23_0_0_nInterfaceGlobals_h__
#ifndef __nFRC_2024_24_0_0_nInterfaceGlobals_h__
#define __nFRC_2024_24_0_0_nInterfaceGlobals_h__

namespace nFPGA
{
namespace nFRC_2023_23_0_0
namespace nFRC_2024_24_0_0
{
extern unsigned int g_currentTargetClass;

Expand All @@ -15,4 +15,4 @@ namespace nFRC_2023_23_0_0
}
}

#endif // __nFRC_2023_23_0_0_nInterfaceGlobals_h__
#endif // __nFRC_2024_24_0_0_nInterfaceGlobals_h__
8 changes: 4 additions & 4 deletions src/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAI.h
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!

#ifndef __nFRC_2023_23_0_0_AI_h__
#define __nFRC_2023_23_0_0_AI_h__
#ifndef __nFRC_2024_24_0_0_AI_h__
#define __nFRC_2024_24_0_0_AI_h__

#include "../tSystem.h"
#include "../tSystemInterface.h"

namespace nFPGA
{
namespace nFRC_2023_23_0_0
namespace nFRC_2024_24_0_0
{

class tAI
Expand Down Expand Up @@ -141,4 +141,4 @@ class tAI
}
}

#endif // __nFRC_2023_23_0_0_AI_h__
#endif // __nFRC_2024_24_0_0_AI_h__
8 changes: 4 additions & 4 deletions src/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAO.h
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!

#ifndef __nFRC_2023_23_0_0_AO_h__
#define __nFRC_2023_23_0_0_AO_h__
#ifndef __nFRC_2024_24_0_0_AO_h__
#define __nFRC_2024_24_0_0_AO_h__

#include "../tSystem.h"
#include "../tSystemInterface.h"

namespace nFPGA
{
namespace nFRC_2023_23_0_0
namespace nFRC_2024_24_0_0
{

class tAO
Expand Down Expand Up @@ -48,4 +48,4 @@ class tAO
}
}

#endif // __nFRC_2023_23_0_0_AO_h__
#endif // __nFRC_2024_24_0_0_AO_h__
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!

#ifndef __nFRC_2023_23_0_0_Accel_h__
#define __nFRC_2023_23_0_0_Accel_h__
#ifndef __nFRC_2024_24_0_0_Accel_h__
#define __nFRC_2024_24_0_0_Accel_h__

#include "../tSystem.h"
#include "../tSystemInterface.h"

namespace nFPGA
{
namespace nFRC_2023_23_0_0
namespace nFRC_2024_24_0_0
{

class tAccel
Expand Down Expand Up @@ -100,4 +100,4 @@ class tAccel
}
}

#endif // __nFRC_2023_23_0_0_Accel_h__
#endif // __nFRC_2024_24_0_0_Accel_h__
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!

#ifndef __nFRC_2023_23_0_0_Accumulator_h__
#define __nFRC_2023_23_0_0_Accumulator_h__
#ifndef __nFRC_2024_24_0_0_Accumulator_h__
#define __nFRC_2024_24_0_0_Accumulator_h__

#include "../tSystem.h"
#include "../tSystemInterface.h"

namespace nFPGA
{
namespace nFRC_2023_23_0_0
namespace nFRC_2024_24_0_0
{

class tAccumulator
Expand Down Expand Up @@ -85,4 +85,4 @@ class tAccumulator
}
}

#endif // __nFRC_2023_23_0_0_Accumulator_h__
#endif // __nFRC_2024_24_0_0_Accumulator_h__
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!

#ifndef __nFRC_2023_23_0_0_Alarm_h__
#define __nFRC_2023_23_0_0_Alarm_h__
#ifndef __nFRC_2024_24_0_0_Alarm_h__
#define __nFRC_2024_24_0_0_Alarm_h__

#include "../tSystem.h"
#include "../tSystemInterface.h"

namespace nFPGA
{
namespace nFRC_2023_23_0_0
namespace nFRC_2024_24_0_0
{

class tAlarm
Expand Down Expand Up @@ -55,4 +55,4 @@ class tAlarm
}
}

#endif // __nFRC_2023_23_0_0_Alarm_h__
#endif // __nFRC_2024_24_0_0_Alarm_h__
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!

#ifndef __nFRC_2023_23_0_0_AnalogTrigger_h__
#define __nFRC_2023_23_0_0_AnalogTrigger_h__
#ifndef __nFRC_2024_24_0_0_AnalogTrigger_h__
#define __nFRC_2024_24_0_0_AnalogTrigger_h__

#include "../tSystem.h"
#include "../tSystemInterface.h"

namespace nFPGA
{
namespace nFRC_2023_23_0_0
namespace nFRC_2024_24_0_0
{

class tAnalogTrigger
Expand Down Expand Up @@ -131,4 +131,4 @@ class tAnalogTrigger
}
}

#endif // __nFRC_2023_23_0_0_AnalogTrigger_h__
#endif // __nFRC_2024_24_0_0_AnalogTrigger_h__
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!

#ifndef __nFRC_2023_23_0_0_BIST_h__
#define __nFRC_2023_23_0_0_BIST_h__
#ifndef __nFRC_2024_24_0_0_BIST_h__
#define __nFRC_2024_24_0_0_BIST_h__

#include "../tSystem.h"
#include "../tSystemInterface.h"

namespace nFPGA
{
namespace nFRC_2023_23_0_0
namespace nFRC_2024_24_0_0
{

class tBIST
Expand Down Expand Up @@ -88,4 +88,4 @@ class tBIST
}
}

#endif // __nFRC_2023_23_0_0_BIST_h__
#endif // __nFRC_2024_24_0_0_BIST_h__
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!

#ifndef __nFRC_2023_23_0_0_Counter_h__
#define __nFRC_2023_23_0_0_Counter_h__
#ifndef __nFRC_2024_24_0_0_Counter_h__
#define __nFRC_2024_24_0_0_Counter_h__

#include "../tSystem.h"
#include "../tSystemInterface.h"

namespace nFPGA
{
namespace nFRC_2023_23_0_0
namespace nFRC_2024_24_0_0
{

class tCounter
Expand Down Expand Up @@ -217,4 +217,4 @@ class tCounter
}
}

#endif // __nFRC_2023_23_0_0_Counter_h__
#endif // __nFRC_2024_24_0_0_Counter_h__
8 changes: 4 additions & 4 deletions src/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDIO.h
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!

#ifndef __nFRC_2023_23_0_0_DIO_h__
#define __nFRC_2023_23_0_0_DIO_h__
#ifndef __nFRC_2024_24_0_0_DIO_h__
#define __nFRC_2024_24_0_0_DIO_h__

#include "../tSystem.h"
#include "../tSystemInterface.h"

namespace nFPGA
{
namespace nFRC_2023_23_0_0
namespace nFRC_2024_24_0_0
{

class tDIO
Expand Down Expand Up @@ -261,4 +261,4 @@ class tDIO
}
}

#endif // __nFRC_2023_23_0_0_DIO_h__
#endif // __nFRC_2024_24_0_0_DIO_h__
8 changes: 4 additions & 4 deletions src/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDMA.h
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!

#ifndef __nFRC_2023_23_0_0_DMA_h__
#define __nFRC_2023_23_0_0_DMA_h__
#ifndef __nFRC_2024_24_0_0_DMA_h__
#define __nFRC_2024_24_0_0_DMA_h__

#include "../tSystem.h"
#include "../tSystemInterface.h"

namespace nFPGA
{
namespace nFRC_2023_23_0_0
namespace nFRC_2024_24_0_0
{

class tDMA
Expand Down Expand Up @@ -203,4 +203,4 @@ class tDMA
}
}

#endif // __nFRC_2023_23_0_0_DMA_h__
#endif // __nFRC_2024_24_0_0_DMA_h__
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!

#ifndef __nFRC_2023_23_0_0_DutyCycle_h__
#define __nFRC_2023_23_0_0_DutyCycle_h__
#ifndef __nFRC_2024_24_0_0_DutyCycle_h__
#define __nFRC_2024_24_0_0_DutyCycle_h__

#include "../tSystem.h"
#include "../tSystemInterface.h"

namespace nFPGA
{
namespace nFRC_2023_23_0_0
namespace nFRC_2024_24_0_0
{

class tDutyCycle
Expand Down Expand Up @@ -93,4 +93,4 @@ class tDutyCycle
}
}

#endif // __nFRC_2023_23_0_0_DutyCycle_h__
#endif // __nFRC_2024_24_0_0_DutyCycle_h__
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!

#ifndef __nFRC_2023_23_0_0_Encoder_h__
#define __nFRC_2023_23_0_0_Encoder_h__
#ifndef __nFRC_2024_24_0_0_Encoder_h__
#define __nFRC_2024_24_0_0_Encoder_h__

#include "../tSystem.h"
#include "../tSystemInterface.h"

namespace nFPGA
{
namespace nFRC_2023_23_0_0
namespace nFRC_2024_24_0_0
{

class tEncoder
Expand Down Expand Up @@ -197,4 +197,4 @@ class tEncoder
}
}

#endif // __nFRC_2023_23_0_0_Encoder_h__
#endif // __nFRC_2024_24_0_0_Encoder_h__
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!

#ifndef __nFRC_2023_23_0_0_Global_h__
#define __nFRC_2023_23_0_0_Global_h__
#ifndef __nFRC_2024_24_0_0_Global_h__
#define __nFRC_2024_24_0_0_Global_h__

#include "../tSystem.h"
#include "../tSystemInterface.h"

namespace nFPGA
{
namespace nFRC_2023_23_0_0
namespace nFRC_2024_24_0_0
{

class tGlobal
Expand Down Expand Up @@ -120,4 +120,4 @@ class tGlobal
}
}

#endif // __nFRC_2023_23_0_0_Global_h__
#endif // __nFRC_2024_24_0_0_Global_h__
8 changes: 4 additions & 4 deletions src/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tHMB.h
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!

#ifndef __nFRC_2023_23_0_0_HMB_h__
#define __nFRC_2023_23_0_0_HMB_h__
#ifndef __nFRC_2024_24_0_0_HMB_h__
#define __nFRC_2024_24_0_0_HMB_h__

#include "../tSystem.h"
#include "../tSystemInterface.h"

namespace nFPGA
{
namespace nFRC_2023_23_0_0
namespace nFRC_2024_24_0_0
{

class tHMB
Expand Down Expand Up @@ -223,4 +223,4 @@ class tHMB
}
}

#endif // __nFRC_2023_23_0_0_HMB_h__
#endif // __nFRC_2024_24_0_0_HMB_h__
Loading

0 comments on commit 8959854

Please sign in to comment.