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

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
2026-06-20 00:51:42 +00:00 · 2020-06-27 22:11:24 -07:00
parent 22c0e2813a
commit ce3bc91946
207 changed files with 1420 additions and 1415 deletions
--- a/simulation/halsim_gui/src/main/native/cpp/AccelerometerGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/AccelerometerGui.cpp
@@ -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 <cstdio>

 #include <hal/Value.h>
+#include <hal/simulation/AccelerometerData.h>
 #include <imgui.h>
-#include <mockdata/AccelerometerData.h>

 #include "SimDeviceGui.h"

--- a/simulation/halsim_gui/src/main/native/cpp/AddressableLEDGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/AddressableLEDGui.cpp
@@ -8,9 +8,9 @@
 #include "AddressableLEDGui.h"

 #include <hal/Ports.h>
+#include <hal/simulation/AddressableLEDData.h>
 #include <imgui.h>
 #include <imgui_internal.h>
-#include <mockdata/AddressableLEDData.h>
 #include <wpi/SmallVector.h>
 #include <wpi/StringRef.h>

--- a/simulation/halsim_gui/src/main/native/cpp/AnalogGyroGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/AnalogGyroGui.cpp
@@ -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,8 +11,8 @@

 #include <hal/Ports.h>
 #include <hal/Value.h>
+#include <hal/simulation/AnalogGyroData.h>
 #include <imgui.h>
-#include <mockdata/AnalogGyroData.h>

 #include "SimDeviceGui.h"

--- a/simulation/halsim_gui/src/main/native/cpp/AnalogInputGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/AnalogInputGui.cpp
@@ -8,10 +8,10 @@
 #include "AnalogInputGui.h"

 #include <hal/Ports.h>
+#include <hal/simulation/AnalogGyroData.h>
+#include <hal/simulation/AnalogInData.h>
+#include <hal/simulation/SimDeviceData.h>
 #include <imgui.h>
-#include <mockdata/AnalogGyroData.h>
-#include <mockdata/AnalogInData.h>
-#include <mockdata/SimDeviceData.h>

 #include "HALSimGui.h"
 #include "IniSaver.h"
--- a/simulation/halsim_gui/src/main/native/cpp/AnalogOutGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/AnalogOutGui.cpp
@@ -8,8 +8,8 @@
 #include "AnalogOutGui.h"

 #include <hal/Ports.h>
+#include <hal/simulation/AnalogOutData.h>
 #include <imgui.h>
-#include <mockdata/AnalogOutData.h>

 #include "IniSaver.h"
 #include "IniSaverInfo.h"
--- a/simulation/halsim_gui/src/main/native/cpp/CompressorGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/CompressorGui.cpp
@@ -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,8 +11,8 @@

 #include <hal/Ports.h>
 #include <hal/Value.h>
+#include <hal/simulation/PCMData.h>
 #include <imgui.h>
-#include <mockdata/PCMData.h>

 #include "HALSimGui.h"
 #include "SimDeviceGui.h"
--- a/simulation/halsim_gui/src/main/native/cpp/DIOGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/DIOGui.cpp
@@ -8,12 +8,12 @@
 #include "DIOGui.h"

 #include <hal/Ports.h>
+#include <hal/simulation/DIOData.h>
+#include <hal/simulation/DigitalPWMData.h>
+#include <hal/simulation/DutyCycleData.h>
+#include <hal/simulation/EncoderData.h>
+#include <hal/simulation/SimDeviceData.h>
 #include <imgui.h>
-#include <mockdata/DIOData.h>
-#include <mockdata/DigitalPWMData.h>
-#include <mockdata/DutyCycleData.h>
-#include <mockdata/EncoderData.h>
-#include <mockdata/SimDeviceData.h>

 #include "HALSimGui.h"
 #include "IniSaver.h"
--- a/simulation/halsim_gui/src/main/native/cpp/DriverStationGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/DriverStationGui.cpp
@@ -11,10 +11,10 @@
 #include <string>

 #include <GLFW/glfw3.h>
+#include <hal/simulation/DriverStationData.h>
+#include <hal/simulation/MockHooks.h>
 #include <imgui.h>
 #include <imgui_internal.h>
-#include <mockdata/DriverStationData.h>
-#include <mockdata/MockHooks.h>
 #include <wpi/Format.h>
 #include <wpi/SmallString.h>
 #include <wpi/StringRef.h>
--- a/simulation/halsim_gui/src/main/native/cpp/EncoderGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/EncoderGui.cpp
@@ -8,9 +8,9 @@
 #include "EncoderGui.h"

 #include <hal/Ports.h>
+#include <hal/simulation/EncoderData.h>
+#include <hal/simulation/SimDeviceData.h>
 #include <imgui.h>
-#include <mockdata/EncoderData.h>
-#include <mockdata/SimDeviceData.h>

 #include "HALSimGui.h"
 #include "IniSaver.h"
--- a/simulation/halsim_gui/src/main/native/cpp/Field2D.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/Field2D.cpp
@@ -14,8 +14,8 @@
 #include <imgui.h>

 #define IMGUI_DEFINE_MATH_OPERATORS
+#include <hal/simulation/SimDeviceData.h>
 #include <imgui_internal.h>
-#include <mockdata/SimDeviceData.h>
 #include <units/units.h>
 #include <wpi/Path.h>
 #include <wpi/SmallString.h>
--- a/simulation/halsim_gui/src/main/native/cpp/HALSimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/HALSimGui.cpp
@@ -12,12 +12,12 @@

 #include <GL/gl3w.h>
 #include <GLFW/glfw3.h>
+#include <hal/simulation/DriverStationData.h>
 #include <imgui.h>
 #include <imgui_ProggyDotted.h>
 #include <imgui_impl_glfw.h>
 #include <imgui_impl_opengl3.h>
 #include <imgui_internal.h>
-#include <mockdata/DriverStationData.h>
 #include <wpi/StringMap.h>
 #include <wpi/raw_ostream.h>

--- a/simulation/halsim_gui/src/main/native/cpp/PDPGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/PDPGui.cpp
@@ -13,8 +13,8 @@
 #include <memory>

 #include <hal/Ports.h>
+#include <hal/simulation/PDPData.h>
 #include <imgui.h>
-#include <mockdata/PDPData.h>

 #include "HALSimGui.h"
 #include "IniSaver.h"
--- a/simulation/halsim_gui/src/main/native/cpp/PWMGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/PWMGui.cpp
@@ -12,9 +12,9 @@
 #include <memory>

 #include <hal/Ports.h>
+#include <hal/simulation/AddressableLEDData.h>
+#include <hal/simulation/PWMData.h>
 #include <imgui.h>
-#include <mockdata/AddressableLEDData.h>
-#include <mockdata/PWMData.h>

 #include "HALSimGui.h"
 #include "IniSaver.h"
--- a/simulation/halsim_gui/src/main/native/cpp/RelayGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/RelayGui.cpp
@@ -11,8 +11,8 @@
 #include <cstring>

 #include <hal/Ports.h>
+#include <hal/simulation/RelayData.h>
 #include <imgui.h>
-#include <mockdata/RelayData.h>

 #include "ExtraGuiWidgets.h"
 #include "HALSimGui.h"
--- a/simulation/halsim_gui/src/main/native/cpp/RoboRioGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/RoboRioGui.cpp
@@ -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.                                                               */
@@ -7,8 +7,8 @@

 #include "RoboRioGui.h"

+#include <hal/simulation/RoboRioData.h>
 #include <imgui.h>
-#include <mockdata/RoboRioData.h>

 #include "HALSimGui.h"

--- a/simulation/halsim_gui/src/main/native/cpp/SimDeviceGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/SimDeviceGui.cpp
@@ -12,8 +12,8 @@
 #include <vector>

 #include <hal/SimDevice.h>
+#include <hal/simulation/SimDeviceData.h>
 #include <imgui.h>
-#include <mockdata/SimDeviceData.h>

 #include "HALSimGui.h"
 #include "IniSaverInfo.h"
--- a/simulation/halsim_gui/src/main/native/cpp/SolenoidGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/SolenoidGui.cpp
@@ -11,8 +11,8 @@
 #include <cstring>

 #include <hal/Ports.h>
+#include <hal/simulation/PCMData.h>
 #include <imgui.h>
-#include <mockdata/PCMData.h>
 #include <wpi/SmallVector.h>

 #include "ExtraGuiWidgets.h"
--- a/simulation/halsim_gui/src/main/native/cpp/TimingGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/TimingGui.cpp
@@ -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.                                                               */
@@ -12,9 +12,9 @@
 #include <vector>

 #include <hal/HALBase.h>
+#include <hal/simulation/MockHooks.h>
+#include <hal/simulation/NotifierData.h>
 #include <imgui.h>
-#include <mockdata/MockHooks.h>
-#include <mockdata/NotifierData.h>

 #include "HALSimGui.h"