Remove RoboRIO ifdef from simulation headers (#1859)

This commit is contained in:
Thad House
2019-09-03 19:55:17 -07:00
committed by Peter Johnson
parent 9b6ffc201c
commit 516cbef2c4
38 changed files with 38 additions and 171 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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 <typename CallbackFunction>

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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