Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-23 01:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[sim] Move Sim classes from HAL to wpilibc/j (#2549)

Browse Source 
Also move some things in HAL for consistency.

WAS:
C++:
- C APIs: #include "mockdata/AccelerometerData.h"
- User side class: #include "simulation/AccelerometerSim.h"
Java:
- JNI APIs: hal.sim.mockdata.AccelerometerData (and a few classes in hal.sim)
- User side classes: hal.sim.AccelerometerSim

IS:
C++:
- C APIs: #include "hal/simulation/AccelerometerData.h"
- C++ class: #include "frc/simulation/AccelerometerSim.h"
Java:
- JNI APIs: hal.simulation.AccelerometerData
- User side class: wpilibj.simulation.AccelerometerSim
This commit is contained in:
Peter Johnson
2020-06-27 22:11:24 -07:00
committed by GitHub
parent 22c0e2813a
commit ce3bc91946
207 changed files with 1420 additions and 1415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hal/src/main/native/sim/mockdata/AccelerometerDataInternal.h
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */
/* Copyright (c) 2017-2020 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,8 @@
#pragma once
#include "mockdata/AccelerometerData.h"
#include "mockdata/SimDataValue.h"
#include "hal/simulation/AccelerometerData.h"
#include "hal/simulation/SimDataValue.h"
namespace hal {
class AccelerometerData {

8
hal/src/main/native/sim/mockdata/AddressableLEDDataInternal.h
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2019 FIRST. All Rights Reserved. */
/* Copyright (c) 2019-2020 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. */
@@ -11,9 +11,9 @@
#include <wpi/spinlock.h>
#include "mockdata/AddressableLEDData.h"
#include "mockdata/SimCallbackRegistry.h"
#include "mockdata/SimDataValue.h"
#include "hal/simulation/AddressableLEDData.h"
#include "hal/simulation/SimCallbackRegistry.h"
#include "hal/simulation/SimDataValue.h"
namespace hal {
class AddressableLEDData {

6
hal/src/main/native/sim/mockdata/AnalogGyroDataInternal.h
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */
/* Copyright (c) 2017-2020 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,8 @@
#pragma once
#include "mockdata/AnalogGyroData.h"
#include "mockdata/SimDataValue.h"
#include "hal/simulation/AnalogGyroData.h"
#include "hal/simulation/SimDataValue.h"
namespace hal {
class AnalogGyroData {

6
hal/src/main/native/sim/mockdata/AnalogInDataInternal.h
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */
/* Copyright (c) 2017-2020 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,8 @@
#pragma once
#include "mockdata/AnalogInData.h"
#include "mockdata/SimDataValue.h"
#include "hal/simulation/AnalogInData.h"
#include "hal/simulation/SimDataValue.h"
namespace hal {
class AnalogInData {

6
hal/src/main/native/sim/mockdata/AnalogOutDataInternal.h
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */
/* Copyright (c) 2017-2020 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,8 @@
#pragma once
#include "mockdata/AnalogOutData.h"
#include "mockdata/SimDataValue.h"
#include "hal/simulation/AnalogOutData.h"
#include "hal/simulation/SimDataValue.h"
namespace hal {
class AnalogOutData {

6
hal/src/main/native/sim/mockdata/AnalogTriggerDataInternal.h
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */
/* Copyright (c) 2017-2020 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,8 @@
#pragma once
#include "mockdata/AnalogTriggerData.h"
#include "mockdata/SimDataValue.h"
#include "hal/simulation/AnalogTriggerData.h"
#include "hal/simulation/SimDataValue.h"
namespace hal {
class AnalogTriggerData {

6
hal/src/main/native/sim/mockdata/CanDataInternal.h
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2017-2018 FIRST. All Rights Reserved. */
/* Copyright (c) 2017-2020 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,8 @@
#pragma once
#include "mockdata/CanData.h"
#include "mockdata/SimCallbackRegistry.h"
#include "hal/simulation/CanData.h"
#include "hal/simulation/SimCallbackRegistry.h"
namespace hal {

6
hal/src/main/native/sim/mockdata/DIODataInternal.h
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */
/* Copyright (c) 2017-2020 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,8 @@
#pragma once
#include "mockdata/DIOData.h"
#include "mockdata/SimDataValue.h"
#include "hal/simulation/DIOData.h"
#include "hal/simulation/SimDataValue.h"
namespace hal {
class DIOData {

6
hal/src/main/native/sim/mockdata/DigitalPWMDataInternal.h
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */
/* Copyright (c) 2017-2020 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,8 @@
#pragma once
#include "mockdata/DigitalPWMData.h"
#include "mockdata/SimDataValue.h"
#include "hal/simulation/DigitalPWMData.h"
#include "hal/simulation/SimDataValue.h"
namespace hal {
class DigitalPWMData {

6
hal/src/main/native/sim/mockdata/DriverStationDataInternal.h
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */
/* Copyright (c) 2017-2020 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. */
@@ -11,8 +11,8 @@
#include <wpi/spinlock.h>
#include "mockdata/DriverStationData.h"
#include "mockdata/SimDataValue.h"
#include "hal/simulation/DriverStationData.h"
#include "hal/simulation/SimDataValue.h"
namespace hal {
struct JoystickOutputStore;

6
hal/src/main/native/sim/mockdata/DutyCycleDataInternal.h
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2019 FIRST. All Rights Reserved. */
/* Copyright (c) 2019-2020 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. */
@@ -10,8 +10,8 @@
#include <atomic>
#include <limits>
#include "mockdata/DutyCycleData.h"
#include "mockdata/SimDataValue.h"
#include "hal/simulation/DutyCycleData.h"
#include "hal/simulation/SimDataValue.h"
namespace hal {
class DutyCycleData {

6
hal/src/main/native/sim/mockdata/EncoderDataInternal.h
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */
/* Copyright (c) 2017-2020 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. */
@@ -10,8 +10,8 @@
#include <atomic>
#include <limits>
#include "mockdata/EncoderData.h"
#include "mockdata/SimDataValue.h"
#include "hal/simulation/EncoderData.h"
#include "hal/simulation/SimDataValue.h"
namespace hal {
class EncoderData {

8
hal/src/main/native/sim/mockdata/I2CDataInternal.h
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */
/* Copyright (c) 2017-2020 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,9 +7,9 @@
#pragma once
#include "mockdata/I2CData.h"
#include "mockdata/SimCallbackRegistry.h"
#include "mockdata/SimDataValue.h"
#include "hal/simulation/I2CData.h"
#include "hal/simulation/SimCallbackRegistry.h"
#include "hal/simulation/SimDataValue.h"
namespace hal {
class I2CData {

6
hal/src/main/native/sim/mockdata/PCMDataInternal.h
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */
/* Copyright (c) 2017-2020 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. */
@@ -8,8 +8,8 @@
#pragma once
#include "../PortsInternal.h"
#include "mockdata/PCMData.h"
#include "mockdata/SimDataValue.h"
#include "hal/simulation/PCMData.h"
#include "hal/simulation/SimDataValue.h"
namespace hal {
class PCMData {

6
hal/src/main/native/sim/mockdata/PDPDataInternal.h
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */
/* Copyright (c) 2017-2020 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. */
@@ -8,8 +8,8 @@
#pragma once
#include "../PortsInternal.h"
#include "mockdata/PDPData.h"
#include "mockdata/SimDataValue.h"
#include "hal/simulation/PDPData.h"
#include "hal/simulation/SimDataValue.h"
namespace hal {
class PDPData {

6
hal/src/main/native/sim/mockdata/PWMDataInternal.h
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */
/* Copyright (c) 2017-2020 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,8 @@
#pragma once
#include "mockdata/PWMData.h"
#include "mockdata/SimDataValue.h"
#include "hal/simulation/PWMData.h"
#include "hal/simulation/SimDataValue.h"
namespace hal {
class PWMData {

6
hal/src/main/native/sim/mockdata/RelayDataInternal.h
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */
/* Copyright (c) 2017-2020 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,8 @@
#pragma once
#include "mockdata/RelayData.h"
#include "mockdata/SimDataValue.h"
#include "hal/simulation/RelayData.h"
#include "hal/simulation/SimDataValue.h"
namespace hal {
class RelayData {

4
hal/src/main/native/sim/mockdata/RoboRioDataInternal.h
View File

@@ -7,8 +7,8 @@
#pragma once
#include "mockdata/RoboRioData.h"
#include "mockdata/SimDataValue.h"
#include "hal/simulation/RoboRioData.h"
#include "hal/simulation/SimDataValue.h"
namespace hal {
class RoboRioData {

6
hal/src/main/native/sim/mockdata/SPIAccelerometerDataInternal.h
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */
/* Copyright (c) 2017-2020 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,8 @@
#pragma once
#include "mockdata/SPIAccelerometerData.h"
#include "mockdata/SimDataValue.h"
#include "hal/simulation/SPIAccelerometerData.h"
#include "hal/simulation/SimDataValue.h"
namespace hal {
class SPIAccelerometerData {

8
hal/src/main/native/sim/mockdata/SPIDataInternal.h
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */
/* Copyright (c) 2017-2020 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,9 +7,9 @@
#pragma once
#include "mockdata/SPIData.h"
#include "mockdata/SimCallbackRegistry.h"
#include "mockdata/SimDataValue.h"
#include "hal/simulation/SPIData.h"
#include "hal/simulation/SimCallbackRegistry.h"
#include "hal/simulation/SimDataValue.h"
namespace hal {

4
hal/src/main/native/sim/mockdata/SimDeviceData.cpp
View File

@@ -1,11 +1,11 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2019 FIRST. All Rights Reserved. */
/* Copyright (c) 2019-2020 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. */
/*----------------------------------------------------------------------------*/
#include "mockdata/SimDeviceData.h" // NOLINT(build/include_order)
#include "hal/simulation/SimDeviceData.h" // NOLINT(build/include_order)
#include <algorithm>

6
hal/src/main/native/sim/mockdata/SimDeviceDataInternal.h
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2019 FIRST. All Rights Reserved. */
/* Copyright (c) 2019-2020 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. */
@@ -19,8 +19,8 @@
#include <wpi/spinlock.h>
#include "hal/Value.h"
#include "mockdata/SimCallbackRegistry.h"
#include "mockdata/SimDeviceData.h"
#include "hal/simulation/SimCallbackRegistry.h"
#include "hal/simulation/SimDeviceData.h"
namespace hal {