From 516cbef2c4d29e37e0d3bd165176eb812c72d1cf Mon Sep 17 00:00:00 2001 From: Thad House Date: Tue, 3 Sep 2019 19:55:17 -0700 Subject: [PATCH] Remove RoboRIO ifdef from simulation headers (#1859) --- hal/src/main/native/include/mockdata/AccelerometerData.h | 6 +----- hal/src/main/native/include/mockdata/AnalogGyroData.h | 6 +----- hal/src/main/native/include/mockdata/AnalogInData.h | 6 +----- hal/src/main/native/include/mockdata/AnalogOutData.h | 6 +----- hal/src/main/native/include/mockdata/AnalogTriggerData.h | 6 +----- hal/src/main/native/include/mockdata/CanData.h | 6 +----- hal/src/main/native/include/mockdata/DIOData.h | 6 +----- hal/src/main/native/include/mockdata/DigitalPWMData.h | 6 +----- hal/src/main/native/include/mockdata/DriverStationData.h | 6 +----- hal/src/main/native/include/mockdata/EncoderData.h | 6 +----- hal/src/main/native/include/mockdata/HAL_Value.h | 6 +----- hal/src/main/native/include/mockdata/I2CData.h | 6 +----- hal/src/main/native/include/mockdata/MockHooks.h | 4 ---- hal/src/main/native/include/mockdata/NotifyListener.h | 6 +++--- hal/src/main/native/include/mockdata/PCMData.h | 6 +----- hal/src/main/native/include/mockdata/PDPData.h | 6 +----- hal/src/main/native/include/mockdata/PWMData.h | 6 +----- hal/src/main/native/include/mockdata/RelayData.h | 6 +----- hal/src/main/native/include/mockdata/RoboRioData.h | 6 +----- hal/src/main/native/include/mockdata/SPIAccelerometerData.h | 6 +----- hal/src/main/native/include/mockdata/SPIData.h | 6 +----- hal/src/main/native/include/simulation/AccelerometerSim.h | 5 +---- hal/src/main/native/include/simulation/AnalogGyroSim.h | 5 +---- hal/src/main/native/include/simulation/AnalogInSim.h | 5 +---- hal/src/main/native/include/simulation/AnalogOutSim.h | 5 +---- hal/src/main/native/include/simulation/AnalogTriggerSim.h | 5 +---- hal/src/main/native/include/simulation/CallbackStore.h | 6 +----- hal/src/main/native/include/simulation/DIOSim.h | 5 +---- hal/src/main/native/include/simulation/DigitalPWMSim.h | 5 +---- hal/src/main/native/include/simulation/DriverStationSim.h | 3 --- hal/src/main/native/include/simulation/EncoderSim.h | 5 +---- hal/src/main/native/include/simulation/PCMSim.h | 5 +---- hal/src/main/native/include/simulation/PDPSim.h | 5 +---- hal/src/main/native/include/simulation/PWMSim.h | 5 +---- hal/src/main/native/include/simulation/RelaySim.h | 5 +---- hal/src/main/native/include/simulation/RoboRioSim.h | 5 +---- .../main/native/include/simulation/SPIAccelerometerSim.h | 5 +---- hal/src/main/native/include/simulation/SimHooks.h | 6 +----- 38 files changed, 38 insertions(+), 171 deletions(-) diff --git a/hal/src/main/native/include/mockdata/AccelerometerData.h b/hal/src/main/native/include/mockdata/AccelerometerData.h index 79f151dd07..aa89f6ef12 100644 --- a/hal/src/main/native/include/mockdata/AccelerometerData.h +++ b/hal/src/main/native/include/mockdata/AccelerometerData.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2017-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -7,8 +7,6 @@ #pragma once -#ifndef __FRC_ROBORIO__ - #include "NotifyListener.h" #include "hal/Accelerometer.h" #include "hal/Types.h" @@ -66,5 +64,3 @@ void HALSIM_RegisterAccelerometerAllCallbacks(int32_t index, #ifdef __cplusplus } // extern "C" #endif - -#endif diff --git a/hal/src/main/native/include/mockdata/AnalogGyroData.h b/hal/src/main/native/include/mockdata/AnalogGyroData.h index 5b648eef8b..56c739dab8 100644 --- a/hal/src/main/native/include/mockdata/AnalogGyroData.h +++ b/hal/src/main/native/include/mockdata/AnalogGyroData.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2017-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -7,8 +7,6 @@ #pragma once -#ifndef __FRC_ROBORIO__ - #include "NotifyListener.h" #include "hal/Types.h" @@ -47,5 +45,3 @@ void HALSIM_RegisterAnalogGyroAllCallbacks(int32_t index, #ifdef __cplusplus } // extern "C" #endif - -#endif diff --git a/hal/src/main/native/include/mockdata/AnalogInData.h b/hal/src/main/native/include/mockdata/AnalogInData.h index 7a95164a28..ee004f0739 100644 --- a/hal/src/main/native/include/mockdata/AnalogInData.h +++ b/hal/src/main/native/include/mockdata/AnalogInData.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2017-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -7,8 +7,6 @@ #pragma once -#ifndef __FRC_ROBORIO__ - #include "NotifyListener.h" #include "hal/Types.h" @@ -97,5 +95,3 @@ void HALSIM_RegisterAnalogInAllCallbacks(int32_t index, #ifdef __cplusplus } // extern "C" #endif - -#endif diff --git a/hal/src/main/native/include/mockdata/AnalogOutData.h b/hal/src/main/native/include/mockdata/AnalogOutData.h index 48046ecce7..e8f55f6835 100644 --- a/hal/src/main/native/include/mockdata/AnalogOutData.h +++ b/hal/src/main/native/include/mockdata/AnalogOutData.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2017-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -7,8 +7,6 @@ #pragma once -#ifndef __FRC_ROBORIO__ - #include "NotifyListener.h" #include "hal/Types.h" @@ -40,5 +38,3 @@ void HALSIM_RegisterAnalogOutAllCallbacks(int32_t index, #ifdef __cplusplus } // extern "C" #endif - -#endif diff --git a/hal/src/main/native/include/mockdata/AnalogTriggerData.h b/hal/src/main/native/include/mockdata/AnalogTriggerData.h index 8146b8fe8e..7f06c2e626 100644 --- a/hal/src/main/native/include/mockdata/AnalogTriggerData.h +++ b/hal/src/main/native/include/mockdata/AnalogTriggerData.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2017-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -7,8 +7,6 @@ #pragma once -#ifndef __FRC_ROBORIO__ - #include "NotifyListener.h" #include "hal/Types.h" @@ -64,5 +62,3 @@ void HALSIM_RegisterAnalogTriggerAllCallbacks(int32_t index, #ifdef __cplusplus } // extern "C" #endif - -#endif diff --git a/hal/src/main/native/include/mockdata/CanData.h b/hal/src/main/native/include/mockdata/CanData.h index 4d76dcaf9f..bb821a08e0 100644 --- a/hal/src/main/native/include/mockdata/CanData.h +++ b/hal/src/main/native/include/mockdata/CanData.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2017-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -7,8 +7,6 @@ #pragma once -#ifndef __FRC_ROBORIO__ - #include "HAL_Value.h" #include "NotifyListener.h" #include "hal/Types.h" @@ -74,5 +72,3 @@ void HALSIM_CancelCanGetCANStatusCallback(int32_t uid); #ifdef __cplusplus } // extern "C" #endif - -#endif diff --git a/hal/src/main/native/include/mockdata/DIOData.h b/hal/src/main/native/include/mockdata/DIOData.h index b3bd9f238e..682d8b869e 100644 --- a/hal/src/main/native/include/mockdata/DIOData.h +++ b/hal/src/main/native/include/mockdata/DIOData.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2017-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -7,8 +7,6 @@ #pragma once -#ifndef __FRC_ROBORIO__ - #include "NotifyListener.h" #include "hal/Types.h" @@ -61,5 +59,3 @@ void HALSIM_RegisterDIOAllCallbacks(int32_t index, HAL_NotifyCallback callback, #ifdef __cplusplus } // extern "C" #endif - -#endif diff --git a/hal/src/main/native/include/mockdata/DigitalPWMData.h b/hal/src/main/native/include/mockdata/DigitalPWMData.h index d35e313ba9..5af17e3352 100644 --- a/hal/src/main/native/include/mockdata/DigitalPWMData.h +++ b/hal/src/main/native/include/mockdata/DigitalPWMData.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2017-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -7,8 +7,6 @@ #pragma once -#ifndef __FRC_ROBORIO__ - #include "NotifyListener.h" #include "hal/Types.h" @@ -47,5 +45,3 @@ void HALSIM_RegisterDigitalPWMAllCallbacks(int32_t index, #ifdef __cplusplus } // extern "C" #endif - -#endif diff --git a/hal/src/main/native/include/mockdata/DriverStationData.h b/hal/src/main/native/include/mockdata/DriverStationData.h index 57ca4e019b..1f69664695 100644 --- a/hal/src/main/native/include/mockdata/DriverStationData.h +++ b/hal/src/main/native/include/mockdata/DriverStationData.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2017-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -7,8 +7,6 @@ #pragma once -#ifndef __FRC_ROBORIO__ - #include "NotifyListener.h" #include "hal/DriverStationTypes.h" #include "hal/Types.h" @@ -91,5 +89,3 @@ void HALSIM_NotifyDriverStationNewData(void); #ifdef __cplusplus } // extern "C" #endif - -#endif diff --git a/hal/src/main/native/include/mockdata/EncoderData.h b/hal/src/main/native/include/mockdata/EncoderData.h index bcd00a7469..4b4ad64d1e 100644 --- a/hal/src/main/native/include/mockdata/EncoderData.h +++ b/hal/src/main/native/include/mockdata/EncoderData.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2017-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -7,8 +7,6 @@ #pragma once -#ifndef __FRC_ROBORIO__ - #include "NotifyListener.h" #include "hal/Types.h" @@ -95,5 +93,3 @@ void HALSIM_RegisterEncoderAllCallbacks(int32_t index, #ifdef __cplusplus } // extern "C" #endif - -#endif diff --git a/hal/src/main/native/include/mockdata/HAL_Value.h b/hal/src/main/native/include/mockdata/HAL_Value.h index ee348b914e..4beefa6455 100644 --- a/hal/src/main/native/include/mockdata/HAL_Value.h +++ b/hal/src/main/native/include/mockdata/HAL_Value.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2017-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -7,8 +7,6 @@ #pragma once -#ifndef __FRC_ROBORIO__ - #include "hal/Types.h" /** HAL data types. */ @@ -67,5 +65,3 @@ inline HAL_Value MakeDouble(double v) { value.data.v_double = v; return value; } - -#endif diff --git a/hal/src/main/native/include/mockdata/I2CData.h b/hal/src/main/native/include/mockdata/I2CData.h index 8565fdb436..32ae3a8f4a 100644 --- a/hal/src/main/native/include/mockdata/I2CData.h +++ b/hal/src/main/native/include/mockdata/I2CData.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2017-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -7,8 +7,6 @@ #pragma once -#ifndef __FRC_ROBORIO__ - #include "NotifyListener.h" #include "hal/Types.h" @@ -39,5 +37,3 @@ void HALSIM_CancelI2CWriteCallback(int32_t index, int32_t uid); #ifdef __cplusplus } // extern "C" #endif - -#endif diff --git a/hal/src/main/native/include/mockdata/MockHooks.h b/hal/src/main/native/include/mockdata/MockHooks.h index e484727088..02401b063b 100644 --- a/hal/src/main/native/include/mockdata/MockHooks.h +++ b/hal/src/main/native/include/mockdata/MockHooks.h @@ -7,8 +7,6 @@ #pragma once -#ifndef __FRC_ROBORIO__ - #include "hal/Types.h" extern "C" { @@ -23,5 +21,3 @@ typedef int32_t (*HALSIM_SendErrorHandler)( void HALSIM_SetSendError(HALSIM_SendErrorHandler handler); } // extern "C" - -#endif diff --git a/hal/src/main/native/include/mockdata/NotifyListener.h b/hal/src/main/native/include/mockdata/NotifyListener.h index 8d7e199f48..73dff63524 100644 --- a/hal/src/main/native/include/mockdata/NotifyListener.h +++ b/hal/src/main/native/include/mockdata/NotifyListener.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2017-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -7,8 +7,6 @@ #pragma once -#ifndef __FRC_ROBORIO__ - #include "HAL_Value.h" typedef void (*HAL_NotifyCallback)(const char* name, void* param, @@ -21,6 +19,8 @@ typedef void (*HAL_ConstBufferCallback)(const char* name, void* param, const unsigned char* buffer, unsigned int count); +#ifdef __cplusplus + namespace hal { template diff --git a/hal/src/main/native/include/mockdata/PCMData.h b/hal/src/main/native/include/mockdata/PCMData.h index d919cc9125..74a591ae00 100644 --- a/hal/src/main/native/include/mockdata/PCMData.h +++ b/hal/src/main/native/include/mockdata/PCMData.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2017-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -7,8 +7,6 @@ #pragma once -#ifndef __FRC_ROBORIO__ - #include "NotifyListener.h" #include "hal/Types.h" @@ -89,5 +87,3 @@ void HALSIM_RegisterPCMAllSolenoidCallbacks(int32_t index, int32_t channel, #ifdef __cplusplus } // extern "C" #endif - -#endif diff --git a/hal/src/main/native/include/mockdata/PDPData.h b/hal/src/main/native/include/mockdata/PDPData.h index be24da87c1..a25b66d2e5 100644 --- a/hal/src/main/native/include/mockdata/PDPData.h +++ b/hal/src/main/native/include/mockdata/PDPData.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2017-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -7,8 +7,6 @@ #pragma once -#ifndef __FRC_ROBORIO__ - #include "NotifyListener.h" #include "hal/Types.h" @@ -56,5 +54,3 @@ void HALSIM_RegisterPDPAllNonCurrentCallbacks(int32_t index, int32_t channel, #ifdef __cplusplus } // extern "C" #endif - -#endif diff --git a/hal/src/main/native/include/mockdata/PWMData.h b/hal/src/main/native/include/mockdata/PWMData.h index 08ba3571d7..2a8c63d78e 100644 --- a/hal/src/main/native/include/mockdata/PWMData.h +++ b/hal/src/main/native/include/mockdata/PWMData.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2017-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -7,8 +7,6 @@ #pragma once -#ifndef __FRC_ROBORIO__ - #include "NotifyListener.h" #include "hal/Types.h" @@ -68,5 +66,3 @@ void HALSIM_RegisterPWMAllCallbacks(int32_t index, HAL_NotifyCallback callback, #ifdef __cplusplus } // extern "C" #endif - -#endif diff --git a/hal/src/main/native/include/mockdata/RelayData.h b/hal/src/main/native/include/mockdata/RelayData.h index 6fdac7f2a1..c0b853d851 100644 --- a/hal/src/main/native/include/mockdata/RelayData.h +++ b/hal/src/main/native/include/mockdata/RelayData.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2017-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -7,8 +7,6 @@ #pragma once -#ifndef __FRC_ROBORIO__ - #include "NotifyListener.h" #include "hal/Types.h" @@ -56,5 +54,3 @@ void HALSIM_RegisterRelayAllCallbacks(int32_t index, #ifdef __cplusplus } // extern "C" #endif - -#endif diff --git a/hal/src/main/native/include/mockdata/RoboRioData.h b/hal/src/main/native/include/mockdata/RoboRioData.h index 88b6ece387..3acb0ec365 100644 --- a/hal/src/main/native/include/mockdata/RoboRioData.h +++ b/hal/src/main/native/include/mockdata/RoboRioData.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2017-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -7,8 +7,6 @@ #pragma once -#ifndef __FRC_ROBORIO__ - #include "NotifyListener.h" #include "hal/Types.h" @@ -142,5 +140,3 @@ void HALSIM_RegisterRoboRioAllCallbacks(int32_t index, #ifdef __cplusplus } // extern "C" #endif - -#endif diff --git a/hal/src/main/native/include/mockdata/SPIAccelerometerData.h b/hal/src/main/native/include/mockdata/SPIAccelerometerData.h index 6e37f4066e..c68da4515a 100644 --- a/hal/src/main/native/include/mockdata/SPIAccelerometerData.h +++ b/hal/src/main/native/include/mockdata/SPIAccelerometerData.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2017-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -7,8 +7,6 @@ #pragma once -#ifndef __FRC_ROBORIO__ - #include "NotifyListener.h" #include "hal/Types.h" @@ -63,5 +61,3 @@ void HALSIM_RegisterSPIAccelerometerAllCallbcaks(int32_t index, #ifdef __cplusplus } // extern "C" #endif - -#endif diff --git a/hal/src/main/native/include/mockdata/SPIData.h b/hal/src/main/native/include/mockdata/SPIData.h index 54a2ec986d..da21643562 100644 --- a/hal/src/main/native/include/mockdata/SPIData.h +++ b/hal/src/main/native/include/mockdata/SPIData.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2017-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -7,8 +7,6 @@ #pragma once -#ifndef __FRC_ROBORIO__ - #include "NotifyListener.h" #include "hal/Types.h" @@ -49,5 +47,3 @@ void HALSIM_CancelSPIReadAutoReceivedDataCallback(int32_t index, int32_t uid); #ifdef __cplusplus } // extern "C" #endif - -#endif diff --git a/hal/src/main/native/include/simulation/AccelerometerSim.h b/hal/src/main/native/include/simulation/AccelerometerSim.h index ea873c7b93..07860f0e51 100644 --- a/hal/src/main/native/include/simulation/AccelerometerSim.h +++ b/hal/src/main/native/include/simulation/AccelerometerSim.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -7,8 +7,6 @@ #pragma once -#ifndef __FRC_ROBORIO__ - #include #include @@ -99,4 +97,3 @@ class AccelerometerSim { }; } // namespace sim } // namespace frc -#endif // __FRC_ROBORIO__ diff --git a/hal/src/main/native/include/simulation/AnalogGyroSim.h b/hal/src/main/native/include/simulation/AnalogGyroSim.h index b4c48ca051..b2cdb85484 100644 --- a/hal/src/main/native/include/simulation/AnalogGyroSim.h +++ b/hal/src/main/native/include/simulation/AnalogGyroSim.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -7,8 +7,6 @@ #pragma once -#ifndef __FRC_ROBORIO__ - #include #include @@ -71,4 +69,3 @@ class AnalogGyroSim { }; } // namespace sim } // namespace frc -#endif // __FRC_ROBORIO__ diff --git a/hal/src/main/native/include/simulation/AnalogInSim.h b/hal/src/main/native/include/simulation/AnalogInSim.h index a513c338d8..2a1bbead39 100644 --- a/hal/src/main/native/include/simulation/AnalogInSim.h +++ b/hal/src/main/native/include/simulation/AnalogInSim.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -7,8 +7,6 @@ #pragma once -#ifndef __FRC_ROBORIO__ - #include #include @@ -177,4 +175,3 @@ class AnalogInSim { }; } // namespace sim } // namespace frc -#endif // __FRC_ROBORIO__ diff --git a/hal/src/main/native/include/simulation/AnalogOutSim.h b/hal/src/main/native/include/simulation/AnalogOutSim.h index 3617a66ed4..6bb6e5a292 100644 --- a/hal/src/main/native/include/simulation/AnalogOutSim.h +++ b/hal/src/main/native/include/simulation/AnalogOutSim.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -7,8 +7,6 @@ #pragma once -#ifndef __FRC_ROBORIO__ - #include #include @@ -60,4 +58,3 @@ class AnalogOutSim { }; } // namespace sim } // namespace frc -#endif // __FRC_ROBORIO__ diff --git a/hal/src/main/native/include/simulation/AnalogTriggerSim.h b/hal/src/main/native/include/simulation/AnalogTriggerSim.h index 04faf057b2..2c41be1727 100644 --- a/hal/src/main/native/include/simulation/AnalogTriggerSim.h +++ b/hal/src/main/native/include/simulation/AnalogTriggerSim.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -7,8 +7,6 @@ #pragma once -#ifndef __FRC_ROBORIO__ - #include #include @@ -81,4 +79,3 @@ class AnalogTriggerSim { }; } // namespace sim } // namespace frc -#endif // __FRC_ROBORIO__ diff --git a/hal/src/main/native/include/simulation/CallbackStore.h b/hal/src/main/native/include/simulation/CallbackStore.h index 967e963ee1..8b554a8e14 100644 --- a/hal/src/main/native/include/simulation/CallbackStore.h +++ b/hal/src/main/native/include/simulation/CallbackStore.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -7,8 +7,6 @@ #pragma once -#ifndef __FRC_ROBORIO__ - #include #include @@ -89,5 +87,3 @@ class CallbackStore { }; } // namespace sim } // namespace frc - -#endif diff --git a/hal/src/main/native/include/simulation/DIOSim.h b/hal/src/main/native/include/simulation/DIOSim.h index b4fe947bd8..57079b9b14 100644 --- a/hal/src/main/native/include/simulation/DIOSim.h +++ b/hal/src/main/native/include/simulation/DIOSim.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -7,8 +7,6 @@ #pragma once -#ifndef __FRC_ROBORIO__ - #include #include @@ -99,4 +97,3 @@ class DIOSim { }; } // namespace sim } // namespace frc -#endif // __FRC_ROBORIO__ diff --git a/hal/src/main/native/include/simulation/DigitalPWMSim.h b/hal/src/main/native/include/simulation/DigitalPWMSim.h index ecfc56d6fa..5f5769d151 100644 --- a/hal/src/main/native/include/simulation/DigitalPWMSim.h +++ b/hal/src/main/native/include/simulation/DigitalPWMSim.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -7,8 +7,6 @@ #pragma once -#ifndef __FRC_ROBORIO__ - #include #include @@ -73,4 +71,3 @@ class DigitalPWMSim { }; } // namespace sim } // namespace frc -#endif // __FRC_ROBORIO__ diff --git a/hal/src/main/native/include/simulation/DriverStationSim.h b/hal/src/main/native/include/simulation/DriverStationSim.h index e8047deb9f..e5071cc93c 100644 --- a/hal/src/main/native/include/simulation/DriverStationSim.h +++ b/hal/src/main/native/include/simulation/DriverStationSim.h @@ -7,8 +7,6 @@ #pragma once -#ifndef __FRC_ROBORIO__ - #include #include @@ -109,4 +107,3 @@ class DriverStationSim { }; } // namespace sim } // namespace frc -#endif // __FRC_ROBORIO__ diff --git a/hal/src/main/native/include/simulation/EncoderSim.h b/hal/src/main/native/include/simulation/EncoderSim.h index 493f338c48..f80e8a875b 100644 --- a/hal/src/main/native/include/simulation/EncoderSim.h +++ b/hal/src/main/native/include/simulation/EncoderSim.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -7,8 +7,6 @@ #pragma once -#ifndef __FRC_ROBORIO__ - #include #include @@ -163,4 +161,3 @@ class EncoderSim { }; } // namespace sim } // namespace frc -#endif // __FRC_ROBORIO__ diff --git a/hal/src/main/native/include/simulation/PCMSim.h b/hal/src/main/native/include/simulation/PCMSim.h index bfefa6ebdb..3f3ca9b1fc 100644 --- a/hal/src/main/native/include/simulation/PCMSim.h +++ b/hal/src/main/native/include/simulation/PCMSim.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -7,8 +7,6 @@ #pragma once -#ifndef __FRC_ROBORIO__ - #include #include @@ -147,4 +145,3 @@ class PCMSim { }; } // namespace sim } // namespace frc -#endif // __FRC_ROBORIO__ diff --git a/hal/src/main/native/include/simulation/PDPSim.h b/hal/src/main/native/include/simulation/PDPSim.h index 7677ec201a..e3ffd4b59a 100644 --- a/hal/src/main/native/include/simulation/PDPSim.h +++ b/hal/src/main/native/include/simulation/PDPSim.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -7,8 +7,6 @@ #pragma once -#ifndef __FRC_ROBORIO__ - #include #include @@ -88,4 +86,3 @@ class PDPSim { }; } // namespace sim } // namespace frc -#endif // __FRC_ROBORIO__ diff --git a/hal/src/main/native/include/simulation/PWMSim.h b/hal/src/main/native/include/simulation/PWMSim.h index b90b76f3a8..7aba360516 100644 --- a/hal/src/main/native/include/simulation/PWMSim.h +++ b/hal/src/main/native/include/simulation/PWMSim.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -7,8 +7,6 @@ #pragma once -#ifndef __FRC_ROBORIO__ - #include #include @@ -114,4 +112,3 @@ class PWMSim { }; } // namespace sim } // namespace frc -#endif // __FRC_ROBORIO__ diff --git a/hal/src/main/native/include/simulation/RelaySim.h b/hal/src/main/native/include/simulation/RelaySim.h index b21a0472aa..6958a40a12 100644 --- a/hal/src/main/native/include/simulation/RelaySim.h +++ b/hal/src/main/native/include/simulation/RelaySim.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -7,8 +7,6 @@ #pragma once -#ifndef __FRC_ROBORIO__ - #include #include @@ -88,4 +86,3 @@ class RelaySim { }; } // namespace sim } // namespace frc -#endif // __FRC_ROBORIO__ diff --git a/hal/src/main/native/include/simulation/RoboRioSim.h b/hal/src/main/native/include/simulation/RoboRioSim.h index 0d7c31ca22..9b020ae901 100644 --- a/hal/src/main/native/include/simulation/RoboRioSim.h +++ b/hal/src/main/native/include/simulation/RoboRioSim.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -7,8 +7,6 @@ #pragma once -#ifndef __FRC_ROBORIO__ - #include #include @@ -273,4 +271,3 @@ class RoboRioSim { }; } // namespace sim } // namespace frc -#endif // __FRC_ROBORIO__ diff --git a/hal/src/main/native/include/simulation/SPIAccelerometerSim.h b/hal/src/main/native/include/simulation/SPIAccelerometerSim.h index 4369938285..d7795eecef 100644 --- a/hal/src/main/native/include/simulation/SPIAccelerometerSim.h +++ b/hal/src/main/native/include/simulation/SPIAccelerometerSim.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -7,8 +7,6 @@ #pragma once -#ifndef __FRC_ROBORIO__ - #include #include @@ -95,4 +93,3 @@ class SPIAccelerometerSim { }; } // namespace sim } // namespace frc -#endif // __FRC_ROBORIO__ diff --git a/hal/src/main/native/include/simulation/SimHooks.h b/hal/src/main/native/include/simulation/SimHooks.h index 6f03952b1b..537cef3ca9 100644 --- a/hal/src/main/native/include/simulation/SimHooks.h +++ b/hal/src/main/native/include/simulation/SimHooks.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -7,8 +7,6 @@ #pragma once -#ifndef __FRC_ROBORIO__ - #include "mockdata/MockHooks.h" namespace frc { @@ -24,5 +22,3 @@ void RestartTiming() { HALSIM_RestartTiming(); } } // namespace sim } // namespace frc - -#endif