diff --git a/hal/simjni.gradle b/hal/simjni.gradle index 7cc7e5f880..d2ba22b993 100644 --- a/hal/simjni.gradle +++ b/hal/simjni.gradle @@ -33,7 +33,7 @@ task generateAthenaSimFiles() { dirs.each { def tree = fileTree(dir: it) tree.each { file -> - if (!file.name.contains('edu_wpi_first_hal_sim_mockdata_')) { + if (!file.name.contains('edu_wpi_first_hal_simulation_')) { return } boolean reading = false diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AccelerometerDataJNI.java b/hal/src/main/java/edu/wpi/first/hal/simulation/AccelerometerDataJNI.java similarity index 92% rename from hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AccelerometerDataJNI.java rename to hal/src/main/java/edu/wpi/first/hal/simulation/AccelerometerDataJNI.java index 22276d42f0..cb42c98a56 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AccelerometerDataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/simulation/AccelerometerDataJNI.java @@ -1,13 +1,12 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim.mockdata; +package edu.wpi.first.hal.simulation; -import edu.wpi.first.hal.sim.NotifyCallback; import edu.wpi.first.hal.JNIWrapper; public class AccelerometerDataJNI extends JNIWrapper { diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AddressableLEDDataJNI.java b/hal/src/main/java/edu/wpi/first/hal/simulation/AddressableLEDDataJNI.java similarity index 91% rename from hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AddressableLEDDataJNI.java rename to hal/src/main/java/edu/wpi/first/hal/simulation/AddressableLEDDataJNI.java index 8098e6813a..2f6f8f594a 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AddressableLEDDataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/simulation/AddressableLEDDataJNI.java @@ -1,14 +1,12 @@ /*----------------------------------------------------------------------------*/ -/* 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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim.mockdata; +package edu.wpi.first.hal.simulation; -import edu.wpi.first.hal.sim.ConstBufferCallback; -import edu.wpi.first.hal.sim.NotifyCallback; import edu.wpi.first.hal.JNIWrapper; public class AddressableLEDDataJNI extends JNIWrapper { diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AnalogGyroDataJNI.java b/hal/src/main/java/edu/wpi/first/hal/simulation/AnalogGyroDataJNI.java similarity index 90% rename from hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AnalogGyroDataJNI.java rename to hal/src/main/java/edu/wpi/first/hal/simulation/AnalogGyroDataJNI.java index 4995df203b..42cc5089f7 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AnalogGyroDataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/simulation/AnalogGyroDataJNI.java @@ -1,13 +1,12 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim.mockdata; +package edu.wpi.first.hal.simulation; -import edu.wpi.first.hal.sim.NotifyCallback; import edu.wpi.first.hal.JNIWrapper; public class AnalogGyroDataJNI extends JNIWrapper { diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AnalogInDataJNI.java b/hal/src/main/java/edu/wpi/first/hal/simulation/AnalogInDataJNI.java similarity index 96% rename from hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AnalogInDataJNI.java rename to hal/src/main/java/edu/wpi/first/hal/simulation/AnalogInDataJNI.java index ed4fbac7cb..3656ffa0ce 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AnalogInDataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/simulation/AnalogInDataJNI.java @@ -1,13 +1,12 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim.mockdata; +package edu.wpi.first.hal.simulation; -import edu.wpi.first.hal.sim.NotifyCallback; import edu.wpi.first.hal.JNIWrapper; public class AnalogInDataJNI extends JNIWrapper { diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AnalogOutDataJNI.java b/hal/src/main/java/edu/wpi/first/hal/simulation/AnalogOutDataJNI.java similarity index 88% rename from hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AnalogOutDataJNI.java rename to hal/src/main/java/edu/wpi/first/hal/simulation/AnalogOutDataJNI.java index 2f7596ca82..23bc8ac9f6 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AnalogOutDataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/simulation/AnalogOutDataJNI.java @@ -1,13 +1,12 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim.mockdata; +package edu.wpi.first.hal.simulation; -import edu.wpi.first.hal.sim.NotifyCallback; import edu.wpi.first.hal.JNIWrapper; public class AnalogOutDataJNI extends JNIWrapper { diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AnalogTriggerDataJNI.java b/hal/src/main/java/edu/wpi/first/hal/simulation/AnalogTriggerDataJNI.java similarity index 91% rename from hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AnalogTriggerDataJNI.java rename to hal/src/main/java/edu/wpi/first/hal/simulation/AnalogTriggerDataJNI.java index cf4187f586..a8c12495e2 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AnalogTriggerDataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/simulation/AnalogTriggerDataJNI.java @@ -1,13 +1,12 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim.mockdata; +package edu.wpi.first.hal.simulation; -import edu.wpi.first.hal.sim.NotifyCallback; import edu.wpi.first.hal.JNIWrapper; public class AnalogTriggerDataJNI extends JNIWrapper { diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/BufferCallback.java b/hal/src/main/java/edu/wpi/first/hal/simulation/BufferCallback.java similarity index 83% rename from hal/src/main/java/edu/wpi/first/hal/sim/BufferCallback.java rename to hal/src/main/java/edu/wpi/first/hal/simulation/BufferCallback.java index 0f7b2d9c20..a8d8ce1dc8 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/BufferCallback.java +++ b/hal/src/main/java/edu/wpi/first/hal/simulation/BufferCallback.java @@ -1,11 +1,11 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim; +package edu.wpi.first.hal.simulation; public interface BufferCallback { void callback(String name, byte[] buffer, int count); diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/ConstBufferCallback.java b/hal/src/main/java/edu/wpi/first/hal/simulation/ConstBufferCallback.java similarity index 83% rename from hal/src/main/java/edu/wpi/first/hal/sim/ConstBufferCallback.java rename to hal/src/main/java/edu/wpi/first/hal/simulation/ConstBufferCallback.java index a4251c2b32..6cb2375655 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/ConstBufferCallback.java +++ b/hal/src/main/java/edu/wpi/first/hal/simulation/ConstBufferCallback.java @@ -1,11 +1,11 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim; +package edu.wpi.first.hal.simulation; public interface ConstBufferCallback { void callback(String name, byte[] buffer, int count); diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/DIODataJNI.java b/hal/src/main/java/edu/wpi/first/hal/simulation/DIODataJNI.java similarity index 93% rename from hal/src/main/java/edu/wpi/first/hal/sim/mockdata/DIODataJNI.java rename to hal/src/main/java/edu/wpi/first/hal/simulation/DIODataJNI.java index 55de7debb0..5d41a2f6e1 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/DIODataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/simulation/DIODataJNI.java @@ -1,13 +1,12 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim.mockdata; +package edu.wpi.first.hal.simulation; -import edu.wpi.first.hal.sim.NotifyCallback; import edu.wpi.first.hal.JNIWrapper; public class DIODataJNI extends JNIWrapper { diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/DigitalPWMDataJNI.java b/hal/src/main/java/edu/wpi/first/hal/simulation/DigitalPWMDataJNI.java similarity index 90% rename from hal/src/main/java/edu/wpi/first/hal/sim/mockdata/DigitalPWMDataJNI.java rename to hal/src/main/java/edu/wpi/first/hal/simulation/DigitalPWMDataJNI.java index 69bee073e3..1520ece51e 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/DigitalPWMDataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/simulation/DigitalPWMDataJNI.java @@ -1,13 +1,12 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim.mockdata; +package edu.wpi.first.hal.simulation; -import edu.wpi.first.hal.sim.NotifyCallback; import edu.wpi.first.hal.JNIWrapper; public class DigitalPWMDataJNI extends JNIWrapper { diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/DriverStationDataJNI.java b/hal/src/main/java/edu/wpi/first/hal/simulation/DriverStationDataJNI.java similarity index 97% rename from hal/src/main/java/edu/wpi/first/hal/sim/mockdata/DriverStationDataJNI.java rename to hal/src/main/java/edu/wpi/first/hal/simulation/DriverStationDataJNI.java index 93d7c30dfd..7be4857317 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/DriverStationDataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/simulation/DriverStationDataJNI.java @@ -5,10 +5,9 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim.mockdata; +package edu.wpi.first.hal.simulation; import edu.wpi.first.hal.JNIWrapper; -import edu.wpi.first.hal.sim.NotifyCallback; public class DriverStationDataJNI extends JNIWrapper { public static native int registerEnabledCallback(NotifyCallback callback, boolean initialNotify); diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/DutyCycleDataJNI.java b/hal/src/main/java/edu/wpi/first/hal/simulation/DutyCycleDataJNI.java similarity index 90% rename from hal/src/main/java/edu/wpi/first/hal/sim/mockdata/DutyCycleDataJNI.java rename to hal/src/main/java/edu/wpi/first/hal/simulation/DutyCycleDataJNI.java index 5cbae6efc7..dccec92505 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/DutyCycleDataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/simulation/DutyCycleDataJNI.java @@ -1,13 +1,12 @@ /*----------------------------------------------------------------------------*/ -/* 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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim.mockdata; +package edu.wpi.first.hal.simulation; -import edu.wpi.first.hal.sim.NotifyCallback; import edu.wpi.first.hal.JNIWrapper; public class DutyCycleDataJNI extends JNIWrapper { diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/EncoderDataJNI.java b/hal/src/main/java/edu/wpi/first/hal/simulation/EncoderDataJNI.java similarity index 97% rename from hal/src/main/java/edu/wpi/first/hal/sim/mockdata/EncoderDataJNI.java rename to hal/src/main/java/edu/wpi/first/hal/simulation/EncoderDataJNI.java index e99504289f..6df88b8fb5 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/EncoderDataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/simulation/EncoderDataJNI.java @@ -5,9 +5,8 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim.mockdata; +package edu.wpi.first.hal.simulation; -import edu.wpi.first.hal.sim.NotifyCallback; import edu.wpi.first.hal.JNIWrapper; public class EncoderDataJNI extends JNIWrapper { diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/I2CDataJNI.java b/hal/src/main/java/edu/wpi/first/hal/simulation/I2CDataJNI.java similarity index 83% rename from hal/src/main/java/edu/wpi/first/hal/sim/mockdata/I2CDataJNI.java rename to hal/src/main/java/edu/wpi/first/hal/simulation/I2CDataJNI.java index 33d78f8ffb..8dbc9e6f42 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/I2CDataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/simulation/I2CDataJNI.java @@ -1,15 +1,12 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim.mockdata; +package edu.wpi.first.hal.simulation; -import edu.wpi.first.hal.sim.BufferCallback; -import edu.wpi.first.hal.sim.ConstBufferCallback; -import edu.wpi.first.hal.sim.NotifyCallback; import edu.wpi.first.hal.JNIWrapper; public class I2CDataJNI extends JNIWrapper { diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/NotifierDataJNI.java b/hal/src/main/java/edu/wpi/first/hal/simulation/NotifierDataJNI.java similarity index 85% rename from hal/src/main/java/edu/wpi/first/hal/sim/mockdata/NotifierDataJNI.java rename to hal/src/main/java/edu/wpi/first/hal/simulation/NotifierDataJNI.java index ecc0842245..823318c8a2 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/NotifierDataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/simulation/NotifierDataJNI.java @@ -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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim.mockdata; +package edu.wpi.first.hal.simulation; import edu.wpi.first.hal.JNIWrapper; diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/NotifyCallback.java b/hal/src/main/java/edu/wpi/first/hal/simulation/NotifyCallback.java similarity index 87% rename from hal/src/main/java/edu/wpi/first/hal/sim/NotifyCallback.java rename to hal/src/main/java/edu/wpi/first/hal/simulation/NotifyCallback.java index 9c655e4b48..22ec015719 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/NotifyCallback.java +++ b/hal/src/main/java/edu/wpi/first/hal/simulation/NotifyCallback.java @@ -1,11 +1,11 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim; +package edu.wpi.first.hal.simulation; import edu.wpi.first.hal.HALValue; diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/PCMDataJNI.java b/hal/src/main/java/edu/wpi/first/hal/simulation/PCMDataJNI.java similarity index 95% rename from hal/src/main/java/edu/wpi/first/hal/sim/mockdata/PCMDataJNI.java rename to hal/src/main/java/edu/wpi/first/hal/simulation/PCMDataJNI.java index c5de287cdd..6b72297df1 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/PCMDataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/simulation/PCMDataJNI.java @@ -1,13 +1,12 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim.mockdata; +package edu.wpi.first.hal.simulation; -import edu.wpi.first.hal.sim.NotifyCallback; import edu.wpi.first.hal.JNIWrapper; public class PCMDataJNI extends JNIWrapper { diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/PDPDataJNI.java b/hal/src/main/java/edu/wpi/first/hal/simulation/PDPDataJNI.java similarity index 92% rename from hal/src/main/java/edu/wpi/first/hal/sim/mockdata/PDPDataJNI.java rename to hal/src/main/java/edu/wpi/first/hal/simulation/PDPDataJNI.java index 581a727ced..8825f601c1 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/PDPDataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/simulation/PDPDataJNI.java @@ -1,13 +1,12 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim.mockdata; +package edu.wpi.first.hal.simulation; -import edu.wpi.first.hal.sim.NotifyCallback; import edu.wpi.first.hal.JNIWrapper; public class PDPDataJNI extends JNIWrapper { diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/PWMDataJNI.java b/hal/src/main/java/edu/wpi/first/hal/simulation/PWMDataJNI.java similarity index 94% rename from hal/src/main/java/edu/wpi/first/hal/sim/mockdata/PWMDataJNI.java rename to hal/src/main/java/edu/wpi/first/hal/simulation/PWMDataJNI.java index e36990e212..f44b56b72d 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/PWMDataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/simulation/PWMDataJNI.java @@ -1,13 +1,12 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim.mockdata; +package edu.wpi.first.hal.simulation; -import edu.wpi.first.hal.sim.NotifyCallback; import edu.wpi.first.hal.JNIWrapper; public class PWMDataJNI extends JNIWrapper { diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/RelayDataJNI.java b/hal/src/main/java/edu/wpi/first/hal/simulation/RelayDataJNI.java similarity index 92% rename from hal/src/main/java/edu/wpi/first/hal/sim/mockdata/RelayDataJNI.java rename to hal/src/main/java/edu/wpi/first/hal/simulation/RelayDataJNI.java index 320a86d2fd..e7973a3447 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/RelayDataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/simulation/RelayDataJNI.java @@ -1,13 +1,12 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim.mockdata; +package edu.wpi.first.hal.simulation; -import edu.wpi.first.hal.sim.NotifyCallback; import edu.wpi.first.hal.JNIWrapper; public class RelayDataJNI extends JNIWrapper { diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/RoboRioDataJNI.java b/hal/src/main/java/edu/wpi/first/hal/simulation/RoboRioDataJNI.java similarity index 97% rename from hal/src/main/java/edu/wpi/first/hal/sim/mockdata/RoboRioDataJNI.java rename to hal/src/main/java/edu/wpi/first/hal/simulation/RoboRioDataJNI.java index a13845c113..63ebef0b95 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/RoboRioDataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/simulation/RoboRioDataJNI.java @@ -1,13 +1,12 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim.mockdata; +package edu.wpi.first.hal.simulation; -import edu.wpi.first.hal.sim.NotifyCallback; import edu.wpi.first.hal.JNIWrapper; public class RoboRioDataJNI extends JNIWrapper { diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/SPIAccelerometerDataJNI.java b/hal/src/main/java/edu/wpi/first/hal/simulation/SPIAccelerometerDataJNI.java similarity index 92% rename from hal/src/main/java/edu/wpi/first/hal/sim/mockdata/SPIAccelerometerDataJNI.java rename to hal/src/main/java/edu/wpi/first/hal/simulation/SPIAccelerometerDataJNI.java index d8e735375b..2e8ebaeaa6 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/SPIAccelerometerDataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/simulation/SPIAccelerometerDataJNI.java @@ -1,13 +1,12 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim.mockdata; +package edu.wpi.first.hal.simulation; -import edu.wpi.first.hal.sim.NotifyCallback; import edu.wpi.first.hal.JNIWrapper; public class SPIAccelerometerDataJNI extends JNIWrapper { diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/SPIDataJNI.java b/hal/src/main/java/edu/wpi/first/hal/simulation/SPIDataJNI.java similarity index 82% rename from hal/src/main/java/edu/wpi/first/hal/sim/mockdata/SPIDataJNI.java rename to hal/src/main/java/edu/wpi/first/hal/simulation/SPIDataJNI.java index a12ec66902..fd6b854afc 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/SPIDataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/simulation/SPIDataJNI.java @@ -1,16 +1,12 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim.mockdata; +package edu.wpi.first.hal.simulation; -import edu.wpi.first.hal.sim.BufferCallback; -import edu.wpi.first.hal.sim.ConstBufferCallback; -import edu.wpi.first.hal.sim.NotifyCallback; -import edu.wpi.first.hal.sim.SpiReadAutoReceiveBufferCallback; import edu.wpi.first.hal.JNIWrapper; public class SPIDataJNI extends JNIWrapper { diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/SimDeviceCallback.java b/hal/src/main/java/edu/wpi/first/hal/simulation/SimDeviceCallback.java similarity index 83% rename from hal/src/main/java/edu/wpi/first/hal/sim/SimDeviceCallback.java rename to hal/src/main/java/edu/wpi/first/hal/simulation/SimDeviceCallback.java index ff9e45b2e3..2390bf43ba 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/SimDeviceCallback.java +++ b/hal/src/main/java/edu/wpi/first/hal/simulation/SimDeviceCallback.java @@ -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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim; +package edu.wpi.first.hal.simulation; @FunctionalInterface public interface SimDeviceCallback { diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/SimDeviceDataJNI.java b/hal/src/main/java/edu/wpi/first/hal/simulation/SimDeviceDataJNI.java similarity index 95% rename from hal/src/main/java/edu/wpi/first/hal/sim/mockdata/SimDeviceDataJNI.java rename to hal/src/main/java/edu/wpi/first/hal/simulation/SimDeviceDataJNI.java index b2183ffb81..8bb15754dd 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/SimDeviceDataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/simulation/SimDeviceDataJNI.java @@ -5,10 +5,8 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim.mockdata; +package edu.wpi.first.hal.simulation; -import edu.wpi.first.hal.sim.SimDeviceCallback; -import edu.wpi.first.hal.sim.SimValueCallback; import edu.wpi.first.hal.HALValue; import edu.wpi.first.hal.JNIWrapper; diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/SimHooks.java b/hal/src/main/java/edu/wpi/first/hal/simulation/SimHooks.java similarity index 93% rename from hal/src/main/java/edu/wpi/first/hal/sim/SimHooks.java rename to hal/src/main/java/edu/wpi/first/hal/simulation/SimHooks.java index a995bca297..4ea18dc78d 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/SimHooks.java +++ b/hal/src/main/java/edu/wpi/first/hal/simulation/SimHooks.java @@ -5,9 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim; - -import edu.wpi.first.hal.sim.mockdata.SimulatorJNI; +package edu.wpi.first.hal.simulation; public final class SimHooks { private SimHooks() { diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/SimValueCallback.java b/hal/src/main/java/edu/wpi/first/hal/simulation/SimValueCallback.java similarity index 88% rename from hal/src/main/java/edu/wpi/first/hal/sim/SimValueCallback.java rename to hal/src/main/java/edu/wpi/first/hal/simulation/SimValueCallback.java index 786158acf4..d65ab380e8 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/SimValueCallback.java +++ b/hal/src/main/java/edu/wpi/first/hal/simulation/SimValueCallback.java @@ -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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim; +package edu.wpi.first.hal.simulation; import edu.wpi.first.hal.HALValue; diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/SimulatorJNI.java b/hal/src/main/java/edu/wpi/first/hal/simulation/SimulatorJNI.java similarity index 96% rename from hal/src/main/java/edu/wpi/first/hal/sim/mockdata/SimulatorJNI.java rename to hal/src/main/java/edu/wpi/first/hal/simulation/SimulatorJNI.java index ade8d52c7d..a04d7dd756 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/SimulatorJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/simulation/SimulatorJNI.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim.mockdata; +package edu.wpi.first.hal.simulation; import edu.wpi.first.hal.JNIWrapper; diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/SpiReadAutoReceiveBufferCallback.java b/hal/src/main/java/edu/wpi/first/hal/simulation/SpiReadAutoReceiveBufferCallback.java similarity index 84% rename from hal/src/main/java/edu/wpi/first/hal/sim/SpiReadAutoReceiveBufferCallback.java rename to hal/src/main/java/edu/wpi/first/hal/simulation/SpiReadAutoReceiveBufferCallback.java index 5083fabc7c..8061b5beb1 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/SpiReadAutoReceiveBufferCallback.java +++ b/hal/src/main/java/edu/wpi/first/hal/simulation/SpiReadAutoReceiveBufferCallback.java @@ -1,11 +1,11 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim; +package edu.wpi.first.hal.simulation; public interface SpiReadAutoReceiveBufferCallback { int callback(String name, int[] buffer, int numToRead); diff --git a/hal/src/main/native/include/mockdata/AccelerometerData.h b/hal/src/main/native/include/hal/simulation/AccelerometerData.h similarity index 96% rename from hal/src/main/native/include/mockdata/AccelerometerData.h rename to hal/src/main/native/include/hal/simulation/AccelerometerData.h index aa89f6ef12..0a926718ee 100644 --- a/hal/src/main/native/include/mockdata/AccelerometerData.h +++ b/hal/src/main/native/include/hal/simulation/AccelerometerData.h @@ -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 "NotifyListener.h" #include "hal/Accelerometer.h" #include "hal/Types.h" +#include "hal/simulation/NotifyListener.h" #ifdef __cplusplus extern "C" { diff --git a/hal/src/main/native/include/mockdata/AddressableLEDData.h b/hal/src/main/native/include/hal/simulation/AddressableLEDData.h similarity index 96% rename from hal/src/main/native/include/mockdata/AddressableLEDData.h rename to hal/src/main/native/include/hal/simulation/AddressableLEDData.h index 0d8f3f32da..197dbbf442 100644 --- a/hal/src/main/native/include/mockdata/AddressableLEDData.h +++ b/hal/src/main/native/include/hal/simulation/AddressableLEDData.h @@ -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,9 +7,9 @@ #pragma once -#include "NotifyListener.h" #include "hal/AddressableLEDTypes.h" #include "hal/Types.h" +#include "hal/simulation/NotifyListener.h" #ifdef __cplusplus extern "C" { diff --git a/hal/src/main/native/include/mockdata/AnalogGyroData.h b/hal/src/main/native/include/hal/simulation/AnalogGyroData.h similarity index 95% rename from hal/src/main/native/include/mockdata/AnalogGyroData.h rename to hal/src/main/native/include/hal/simulation/AnalogGyroData.h index 56c739dab8..91e684e7bd 100644 --- a/hal/src/main/native/include/mockdata/AnalogGyroData.h +++ b/hal/src/main/native/include/hal/simulation/AnalogGyroData.h @@ -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 "NotifyListener.h" #include "hal/Types.h" +#include "hal/simulation/NotifyListener.h" #ifdef __cplusplus extern "C" { diff --git a/hal/src/main/native/include/mockdata/AnalogInData.h b/hal/src/main/native/include/hal/simulation/AnalogInData.h similarity index 97% rename from hal/src/main/native/include/mockdata/AnalogInData.h rename to hal/src/main/native/include/hal/simulation/AnalogInData.h index e571563075..9ab2d3b3ef 100644 --- a/hal/src/main/native/include/mockdata/AnalogInData.h +++ b/hal/src/main/native/include/hal/simulation/AnalogInData.h @@ -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 "NotifyListener.h" #include "hal/Types.h" +#include "hal/simulation/NotifyListener.h" #ifdef __cplusplus extern "C" { diff --git a/hal/src/main/native/include/mockdata/AnalogOutData.h b/hal/src/main/native/include/hal/simulation/AnalogOutData.h similarity index 94% rename from hal/src/main/native/include/mockdata/AnalogOutData.h rename to hal/src/main/native/include/hal/simulation/AnalogOutData.h index e8f55f6835..fa1413dba4 100644 --- a/hal/src/main/native/include/mockdata/AnalogOutData.h +++ b/hal/src/main/native/include/hal/simulation/AnalogOutData.h @@ -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 "NotifyListener.h" #include "hal/Types.h" +#include "hal/simulation/NotifyListener.h" #ifdef __cplusplus extern "C" { diff --git a/hal/src/main/native/include/mockdata/AnalogTriggerData.h b/hal/src/main/native/include/hal/simulation/AnalogTriggerData.h similarity index 96% rename from hal/src/main/native/include/mockdata/AnalogTriggerData.h rename to hal/src/main/native/include/hal/simulation/AnalogTriggerData.h index 566f2f531a..9ba3ad4554 100644 --- a/hal/src/main/native/include/mockdata/AnalogTriggerData.h +++ b/hal/src/main/native/include/hal/simulation/AnalogTriggerData.h @@ -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 "NotifyListener.h" #include "hal/Types.h" +#include "hal/simulation/NotifyListener.h" enum HALSIM_AnalogTriggerMode : int32_t { HALSIM_AnalogTriggerUnassigned, diff --git a/hal/src/main/native/include/mockdata/CanData.h b/hal/src/main/native/include/hal/simulation/CanData.h similarity index 96% rename from hal/src/main/native/include/mockdata/CanData.h rename to hal/src/main/native/include/hal/simulation/CanData.h index 0d48290783..eb5ea63058 100644 --- a/hal/src/main/native/include/mockdata/CanData.h +++ b/hal/src/main/native/include/hal/simulation/CanData.h @@ -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 "NotifyListener.h" #include "hal/Types.h" #include "hal/Value.h" +#include "hal/simulation/NotifyListener.h" typedef void (*HAL_CAN_SendMessageCallback)(const char* name, void* param, uint32_t messageID, diff --git a/hal/src/main/native/include/mockdata/DIOData.h b/hal/src/main/native/include/hal/simulation/DIOData.h similarity index 96% rename from hal/src/main/native/include/mockdata/DIOData.h rename to hal/src/main/native/include/hal/simulation/DIOData.h index d13eee1f47..ddda655315 100644 --- a/hal/src/main/native/include/mockdata/DIOData.h +++ b/hal/src/main/native/include/hal/simulation/DIOData.h @@ -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 "NotifyListener.h" #include "hal/Types.h" +#include "hal/simulation/NotifyListener.h" #ifdef __cplusplus extern "C" { diff --git a/hal/src/main/native/include/mockdata/DigitalPWMData.h b/hal/src/main/native/include/hal/simulation/DigitalPWMData.h similarity index 95% rename from hal/src/main/native/include/mockdata/DigitalPWMData.h rename to hal/src/main/native/include/hal/simulation/DigitalPWMData.h index 5af17e3352..355565afe9 100644 --- a/hal/src/main/native/include/mockdata/DigitalPWMData.h +++ b/hal/src/main/native/include/hal/simulation/DigitalPWMData.h @@ -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 "NotifyListener.h" #include "hal/Types.h" +#include "hal/simulation/NotifyListener.h" #ifdef __cplusplus extern "C" { diff --git a/hal/src/main/native/include/mockdata/DriverStationData.h b/hal/src/main/native/include/hal/simulation/DriverStationData.h similarity index 97% rename from hal/src/main/native/include/mockdata/DriverStationData.h rename to hal/src/main/native/include/hal/simulation/DriverStationData.h index 1f69664695..e7c8cae8d9 100644 --- a/hal/src/main/native/include/mockdata/DriverStationData.h +++ b/hal/src/main/native/include/hal/simulation/DriverStationData.h @@ -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 "NotifyListener.h" #include "hal/DriverStationTypes.h" #include "hal/Types.h" +#include "hal/simulation/NotifyListener.h" #ifdef __cplusplus extern "C" { diff --git a/hal/src/main/native/include/mockdata/DutyCycleData.h b/hal/src/main/native/include/hal/simulation/DutyCycleData.h similarity index 95% rename from hal/src/main/native/include/mockdata/DutyCycleData.h rename to hal/src/main/native/include/hal/simulation/DutyCycleData.h index b97b355131..1aae35fd04 100644 --- a/hal/src/main/native/include/mockdata/DutyCycleData.h +++ b/hal/src/main/native/include/hal/simulation/DutyCycleData.h @@ -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 @@ #pragma once -#include "NotifyListener.h" #include "hal/Types.h" +#include "hal/simulation/NotifyListener.h" #ifdef __cplusplus extern "C" { diff --git a/hal/src/main/native/include/mockdata/EncoderData.h b/hal/src/main/native/include/hal/simulation/EncoderData.h similarity index 99% rename from hal/src/main/native/include/mockdata/EncoderData.h rename to hal/src/main/native/include/hal/simulation/EncoderData.h index 7ae3c4b592..ca5becef92 100644 --- a/hal/src/main/native/include/mockdata/EncoderData.h +++ b/hal/src/main/native/include/hal/simulation/EncoderData.h @@ -7,8 +7,8 @@ #pragma once -#include "NotifyListener.h" #include "hal/Types.h" +#include "hal/simulation/NotifyListener.h" #ifdef __cplusplus extern "C" { diff --git a/hal/src/main/native/include/mockdata/I2CData.h b/hal/src/main/native/include/hal/simulation/I2CData.h similarity index 93% rename from hal/src/main/native/include/mockdata/I2CData.h rename to hal/src/main/native/include/hal/simulation/I2CData.h index 32ae3a8f4a..3d72850cd9 100644 --- a/hal/src/main/native/include/mockdata/I2CData.h +++ b/hal/src/main/native/include/hal/simulation/I2CData.h @@ -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 "NotifyListener.h" #include "hal/Types.h" +#include "hal/simulation/NotifyListener.h" #ifdef __cplusplus extern "C" { diff --git a/hal/src/main/native/include/mockdata/MockHooks.h b/hal/src/main/native/include/hal/simulation/MockHooks.h similarity index 100% rename from hal/src/main/native/include/mockdata/MockHooks.h rename to hal/src/main/native/include/hal/simulation/MockHooks.h diff --git a/hal/src/main/native/include/mockdata/NotifierData.h b/hal/src/main/native/include/hal/simulation/NotifierData.h similarity index 94% rename from hal/src/main/native/include/mockdata/NotifierData.h rename to hal/src/main/native/include/hal/simulation/NotifierData.h index b1ed50f292..445e9395f8 100644 --- a/hal/src/main/native/include/mockdata/NotifierData.h +++ b/hal/src/main/native/include/hal/simulation/NotifierData.h @@ -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. */ diff --git a/hal/src/main/native/include/mockdata/NotifyListener.h b/hal/src/main/native/include/hal/simulation/NotifyListener.h similarity index 95% rename from hal/src/main/native/include/mockdata/NotifyListener.h rename to hal/src/main/native/include/hal/simulation/NotifyListener.h index a4558030fd..bff763a990 100644 --- a/hal/src/main/native/include/mockdata/NotifyListener.h +++ b/hal/src/main/native/include/hal/simulation/NotifyListener.h @@ -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. */ diff --git a/hal/src/main/native/include/mockdata/PCMData.h b/hal/src/main/native/include/hal/simulation/PCMData.h similarity index 97% rename from hal/src/main/native/include/mockdata/PCMData.h rename to hal/src/main/native/include/hal/simulation/PCMData.h index 66b1ec2d59..ad2188dc78 100644 --- a/hal/src/main/native/include/mockdata/PCMData.h +++ b/hal/src/main/native/include/hal/simulation/PCMData.h @@ -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 "NotifyListener.h" #include "hal/Types.h" +#include "hal/simulation/NotifyListener.h" #ifdef __cplusplus extern "C" { diff --git a/hal/src/main/native/include/mockdata/PDPData.h b/hal/src/main/native/include/hal/simulation/PDPData.h similarity index 96% rename from hal/src/main/native/include/mockdata/PDPData.h rename to hal/src/main/native/include/hal/simulation/PDPData.h index 8315e3c6aa..7ec11a4a3f 100644 --- a/hal/src/main/native/include/mockdata/PDPData.h +++ b/hal/src/main/native/include/hal/simulation/PDPData.h @@ -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 "NotifyListener.h" #include "hal/Types.h" +#include "hal/simulation/NotifyListener.h" #ifdef __cplusplus extern "C" { diff --git a/hal/src/main/native/include/mockdata/PWMData.h b/hal/src/main/native/include/hal/simulation/PWMData.h similarity index 96% rename from hal/src/main/native/include/mockdata/PWMData.h rename to hal/src/main/native/include/hal/simulation/PWMData.h index 2a8c63d78e..a53671043d 100644 --- a/hal/src/main/native/include/mockdata/PWMData.h +++ b/hal/src/main/native/include/hal/simulation/PWMData.h @@ -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 "NotifyListener.h" #include "hal/Types.h" +#include "hal/simulation/NotifyListener.h" #ifdef __cplusplus extern "C" { diff --git a/hal/src/main/native/include/mockdata/RelayData.h b/hal/src/main/native/include/hal/simulation/RelayData.h similarity index 95% rename from hal/src/main/native/include/mockdata/RelayData.h rename to hal/src/main/native/include/hal/simulation/RelayData.h index c0b853d851..1329d29f10 100644 --- a/hal/src/main/native/include/mockdata/RelayData.h +++ b/hal/src/main/native/include/hal/simulation/RelayData.h @@ -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 "NotifyListener.h" #include "hal/Types.h" +#include "hal/simulation/NotifyListener.h" #ifdef __cplusplus extern "C" { diff --git a/hal/src/main/native/include/mockdata/RoboRioData.h b/hal/src/main/native/include/hal/simulation/RoboRioData.h similarity index 98% rename from hal/src/main/native/include/mockdata/RoboRioData.h rename to hal/src/main/native/include/hal/simulation/RoboRioData.h index 3acb0ec365..31cd60f96d 100644 --- a/hal/src/main/native/include/mockdata/RoboRioData.h +++ b/hal/src/main/native/include/hal/simulation/RoboRioData.h @@ -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 "NotifyListener.h" #include "hal/Types.h" +#include "hal/simulation/NotifyListener.h" #ifdef __cplusplus extern "C" { diff --git a/hal/src/main/native/include/mockdata/SPIAccelerometerData.h b/hal/src/main/native/include/hal/simulation/SPIAccelerometerData.h similarity index 96% rename from hal/src/main/native/include/mockdata/SPIAccelerometerData.h rename to hal/src/main/native/include/hal/simulation/SPIAccelerometerData.h index c68da4515a..6515aa8eb7 100644 --- a/hal/src/main/native/include/mockdata/SPIAccelerometerData.h +++ b/hal/src/main/native/include/hal/simulation/SPIAccelerometerData.h @@ -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 "NotifyListener.h" #include "hal/Types.h" +#include "hal/simulation/NotifyListener.h" #ifdef __cplusplus extern "C" { diff --git a/hal/src/main/native/include/mockdata/SPIData.h b/hal/src/main/native/include/hal/simulation/SPIData.h similarity index 95% rename from hal/src/main/native/include/mockdata/SPIData.h rename to hal/src/main/native/include/hal/simulation/SPIData.h index da21643562..149a1ef236 100644 --- a/hal/src/main/native/include/mockdata/SPIData.h +++ b/hal/src/main/native/include/hal/simulation/SPIData.h @@ -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 "NotifyListener.h" #include "hal/Types.h" +#include "hal/simulation/NotifyListener.h" typedef void (*HAL_SpiReadAutoReceiveBufferCallback)(const char* name, void* param, diff --git a/hal/src/main/native/include/mockdata/SimCallbackRegistry.h b/hal/src/main/native/include/hal/simulation/SimCallbackRegistry.h similarity index 98% rename from hal/src/main/native/include/mockdata/SimCallbackRegistry.h rename to hal/src/main/native/include/hal/simulation/SimCallbackRegistry.h index 3e1aeb013f..bedc81b2ab 100644 --- a/hal/src/main/native/include/mockdata/SimCallbackRegistry.h +++ b/hal/src/main/native/include/hal/simulation/SimCallbackRegistry.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ @@ -14,7 +14,7 @@ #include #include -#include "mockdata/NotifyListener.h" +#include "hal/simulation/NotifyListener.h" namespace hal { diff --git a/hal/src/main/native/include/mockdata/SimDataValue.h b/hal/src/main/native/include/hal/simulation/SimDataValue.h similarity index 98% rename from hal/src/main/native/include/mockdata/SimDataValue.h rename to hal/src/main/native/include/hal/simulation/SimDataValue.h index b6723bbcb7..c06363acd2 100644 --- a/hal/src/main/native/include/mockdata/SimDataValue.h +++ b/hal/src/main/native/include/hal/simulation/SimDataValue.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ @@ -13,8 +13,8 @@ #include #include -#include "mockdata/NotifyListener.h" -#include "mockdata/SimCallbackRegistry.h" +#include "hal/simulation/NotifyListener.h" +#include "hal/simulation/SimCallbackRegistry.h" namespace hal { diff --git a/hal/src/main/native/include/mockdata/SimDeviceData.h b/hal/src/main/native/include/hal/simulation/SimDeviceData.h similarity index 96% rename from hal/src/main/native/include/mockdata/SimDeviceData.h rename to hal/src/main/native/include/hal/simulation/SimDeviceData.h index 44398d78e8..8ab4ba4b9a 100644 --- a/hal/src/main/native/include/mockdata/SimDeviceData.h +++ b/hal/src/main/native/include/hal/simulation/SimDeviceData.h @@ -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,9 +7,9 @@ #pragma once -#include "NotifyListener.h" #include "hal/Types.h" #include "hal/Value.h" +#include "hal/simulation/NotifyListener.h" typedef void (*HALSIM_SimDeviceCallback)(const char* name, void* param, HAL_SimDeviceHandle handle); diff --git a/hal/src/main/native/sim/DriverStation.cpp b/hal/src/main/native/sim/DriverStation.cpp index 9e97c56cea..68c31fd1d1 100644 --- a/hal/src/main/native/sim/DriverStation.cpp +++ b/hal/src/main/native/sim/DriverStation.cpp @@ -21,8 +21,8 @@ #include #include "HALInitializer.h" +#include "hal/simulation/MockHooks.h" #include "mockdata/DriverStationDataInternal.h" -#include "mockdata/MockHooks.h" static wpi::mutex msgMutex; static wpi::condition_variable* newDSDataAvailableCond; diff --git a/hal/src/main/native/sim/HAL.cpp b/hal/src/main/native/sim/HAL.cpp index 1f50d4361f..df9bb4a8b7 100644 --- a/hal/src/main/native/sim/HAL.cpp +++ b/hal/src/main/native/sim/HAL.cpp @@ -17,7 +17,7 @@ #include "hal/Errors.h" #include "hal/Extensions.h" #include "hal/handles/HandlesInternal.h" -#include "mockdata/DriverStationData.h" +#include "hal/simulation/DriverStationData.h" #include "mockdata/RoboRioDataInternal.h" using namespace hal; diff --git a/hal/src/main/native/sim/MockHooksInternal.h b/hal/src/main/native/sim/MockHooksInternal.h index a69e9bf062..252a0599bc 100644 --- a/hal/src/main/native/sim/MockHooksInternal.h +++ b/hal/src/main/native/sim/MockHooksInternal.h @@ -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. */ @@ -9,7 +9,7 @@ #include -#include "mockdata/MockHooks.h" +#include "hal/simulation/MockHooks.h" namespace hal { void RestartTiming(); diff --git a/hal/src/main/native/sim/Notifier.cpp b/hal/src/main/native/sim/Notifier.cpp index 211f7b22e2..7771d7ca8d 100644 --- a/hal/src/main/native/sim/Notifier.cpp +++ b/hal/src/main/native/sim/Notifier.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2016-2019 FIRST. All Rights Reserved. */ +/* Copyright (c) 2016-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. */ @@ -22,7 +22,7 @@ #include "hal/HAL.h" #include "hal/cpp/fpga_clock.h" #include "hal/handles/UnlimitedHandleResource.h" -#include "mockdata/NotifierData.h" +#include "hal/simulation/NotifierData.h" namespace { struct Notifier { diff --git a/hal/src/main/native/sim/jni/AccelerometerDataJNI.cpp b/hal/src/main/native/sim/jni/AccelerometerDataJNI.cpp index 0b47a265d5..21d93fe143 100644 --- a/hal/src/main/native/sim/jni/AccelerometerDataJNI.cpp +++ b/hal/src/main/native/sim/jni/AccelerometerDataJNI.cpp @@ -8,20 +8,20 @@ #include #include "CallbackStore.h" -#include "edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI.h" -#include "mockdata/AccelerometerData.h" +#include "edu_wpi_first_hal_simulation_AccelerometerDataJNI.h" +#include "hal/simulation/AccelerometerData.h" using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI * Method: registerActiveCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_registerActiveCallback +Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_registerActiveCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -29,12 +29,12 @@ Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_registerActiveCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI * Method: cancelActiveCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_cancelActiveCallback +Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_cancelActiveCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -42,36 +42,36 @@ Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_cancelActiveCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI * Method: getActive * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_getActive +Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_getActive (JNIEnv*, jclass, jint index) { return HALSIM_GetAccelerometerActive(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI * Method: setActive * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_setActive +Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_setActive (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetAccelerometerActive(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI * Method: registerRangeCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_registerRangeCallback +Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_registerRangeCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -79,12 +79,12 @@ Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_registerRangeCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI * Method: cancelRangeCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_cancelRangeCallback +Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_cancelRangeCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -92,24 +92,24 @@ Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_cancelRangeCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI * Method: getRange * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_getRange +Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_getRange (JNIEnv*, jclass, jint index) { return HALSIM_GetAccelerometerRange(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI * Method: setRange * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_setRange +Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_setRange (JNIEnv*, jclass, jint index, jint value) { HALSIM_SetAccelerometerRange(index, @@ -117,12 +117,12 @@ Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_setRange } /* - * Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI * Method: registerXCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_registerXCallback +Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_registerXCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -130,12 +130,12 @@ Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_registerXCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI * Method: cancelXCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_cancelXCallback +Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_cancelXCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -143,36 +143,36 @@ Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_cancelXCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI * Method: getX * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_getX +Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_getX (JNIEnv*, jclass, jint index) { return HALSIM_GetAccelerometerX(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI * Method: setX * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_setX +Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_setX (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetAccelerometerX(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI * Method: registerYCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_registerYCallback +Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_registerYCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -180,12 +180,12 @@ Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_registerYCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI * Method: cancelYCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_cancelYCallback +Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_cancelYCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -193,36 +193,36 @@ Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_cancelYCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI * Method: getY * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_getY +Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_getY (JNIEnv*, jclass, jint index) { return HALSIM_GetAccelerometerY(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI * Method: setY * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_setY +Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_setY (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetAccelerometerY(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI * Method: registerZCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_registerZCallback +Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_registerZCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -230,12 +230,12 @@ Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_registerZCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI * Method: cancelZCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_cancelZCallback +Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_cancelZCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -243,36 +243,36 @@ Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_cancelZCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI * Method: getZ * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_getZ +Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_getZ (JNIEnv*, jclass, jint index) { return HALSIM_GetAccelerometerZ(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI * Method: setZ * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_setZ +Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_setZ (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetAccelerometerZ(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI * Method: resetData * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_resetData +Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_resetData (JNIEnv*, jclass, jint index) { HALSIM_ResetAccelerometerData(index); diff --git a/hal/src/main/native/sim/jni/AddressableLEDDataJNI.cpp b/hal/src/main/native/sim/jni/AddressableLEDDataJNI.cpp index b5e8293408..edab6dd28d 100644 --- a/hal/src/main/native/sim/jni/AddressableLEDDataJNI.cpp +++ b/hal/src/main/native/sim/jni/AddressableLEDDataJNI.cpp @@ -9,8 +9,8 @@ #include "CallbackStore.h" #include "ConstBufferCallbackStore.h" -#include "edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI.h" -#include "mockdata/AddressableLEDData.h" +#include "edu_wpi_first_hal_simulation_AddressableLEDDataJNI.h" +#include "hal/simulation/AddressableLEDData.h" static_assert(sizeof(jbyte) * 4 == sizeof(HAL_AddressableLEDData)); @@ -20,12 +20,12 @@ using namespace wpi::java; extern "C" { /* - * Class: edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI + * Class: edu_wpi_first_hal_simulation_AddressableLEDDataJNI * Method: registerInitializedCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI_registerInitializedCallback +Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_registerInitializedCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback( @@ -34,12 +34,12 @@ Java_edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI_registerInitializedCal } /* - * Class: edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI + * Class: edu_wpi_first_hal_simulation_AddressableLEDDataJNI * Method: cancelInitializedCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI_cancelInitializedCallback +Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_cancelInitializedCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -47,36 +47,36 @@ Java_edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI_cancelInitializedCallb } /* - * Class: edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI + * Class: edu_wpi_first_hal_simulation_AddressableLEDDataJNI * Method: getInitialized * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI_getInitialized +Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_getInitialized (JNIEnv*, jclass, jint index) { return HALSIM_GetAddressableLEDInitialized(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI + * Class: edu_wpi_first_hal_simulation_AddressableLEDDataJNI * Method: setInitialized * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI_setInitialized +Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_setInitialized (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetAddressableLEDInitialized(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI + * Class: edu_wpi_first_hal_simulation_AddressableLEDDataJNI * Method: registerOutputPortCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI_registerOutputPortCallback +Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_registerOutputPortCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback( @@ -85,12 +85,12 @@ Java_edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI_registerOutputPortCall } /* - * Class: edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI + * Class: edu_wpi_first_hal_simulation_AddressableLEDDataJNI * Method: cancelOutputPortCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI_cancelOutputPortCallback +Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_cancelOutputPortCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -98,36 +98,36 @@ Java_edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI_cancelOutputPortCallba } /* - * Class: edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI + * Class: edu_wpi_first_hal_simulation_AddressableLEDDataJNI * Method: getOutputPort * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI_getOutputPort +Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_getOutputPort (JNIEnv*, jclass, jint index) { return HALSIM_GetAddressableLEDOutputPort(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI + * Class: edu_wpi_first_hal_simulation_AddressableLEDDataJNI * Method: setOutputPort * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI_setOutputPort +Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_setOutputPort (JNIEnv*, jclass, jint index, jint value) { HALSIM_SetAddressableLEDOutputPort(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI + * Class: edu_wpi_first_hal_simulation_AddressableLEDDataJNI * Method: registerLengthCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI_registerLengthCallback +Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_registerLengthCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -135,12 +135,12 @@ Java_edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI_registerLengthCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI + * Class: edu_wpi_first_hal_simulation_AddressableLEDDataJNI * Method: cancelLengthCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI_cancelLengthCallback +Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_cancelLengthCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -148,36 +148,36 @@ Java_edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI_cancelLengthCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI + * Class: edu_wpi_first_hal_simulation_AddressableLEDDataJNI * Method: getLength * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI_getLength +Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_getLength (JNIEnv*, jclass, jint index) { return HALSIM_GetAddressableLEDLength(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI + * Class: edu_wpi_first_hal_simulation_AddressableLEDDataJNI * Method: setLength * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI_setLength +Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_setLength (JNIEnv*, jclass, jint index, jint value) { HALSIM_SetAddressableLEDLength(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI + * Class: edu_wpi_first_hal_simulation_AddressableLEDDataJNI * Method: registerRunningCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI_registerRunningCallback +Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_registerRunningCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -185,12 +185,12 @@ Java_edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI_registerRunningCallbac } /* - * Class: edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI + * Class: edu_wpi_first_hal_simulation_AddressableLEDDataJNI * Method: cancelRunningCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI_cancelRunningCallback +Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_cancelRunningCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -198,36 +198,36 @@ Java_edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI_cancelRunningCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI + * Class: edu_wpi_first_hal_simulation_AddressableLEDDataJNI * Method: getRunning * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI_getRunning +Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_getRunning (JNIEnv*, jclass, jint index) { return HALSIM_GetAddressableLEDRunning(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI + * Class: edu_wpi_first_hal_simulation_AddressableLEDDataJNI * Method: setRunning * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI_setRunning +Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_setRunning (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetAddressableLEDRunning(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI + * Class: edu_wpi_first_hal_simulation_AddressableLEDDataJNI * Method: registerDataCallback * Signature: (ILjava/lang/Object;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI_registerDataCallback +Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_registerDataCallback (JNIEnv* env, jclass, jint index, jobject callback) { return sim::AllocateConstBufferCallback( @@ -235,12 +235,12 @@ Java_edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI_registerDataCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI + * Class: edu_wpi_first_hal_simulation_AddressableLEDDataJNI * Method: cancelDataCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI_cancelDataCallback +Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_cancelDataCallback (JNIEnv* env, jclass, jint index, jint handle) { sim::FreeConstBufferCallback(env, handle, index, @@ -248,12 +248,12 @@ Java_edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI_cancelDataCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI + * Class: edu_wpi_first_hal_simulation_AddressableLEDDataJNI * Method: getData * Signature: (I)[B */ JNIEXPORT jbyteArray JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI_getData +Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_getData (JNIEnv* env, jclass, jint index) { auto data = @@ -264,12 +264,12 @@ Java_edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI_getData } /* - * Class: edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI + * Class: edu_wpi_first_hal_simulation_AddressableLEDDataJNI * Method: setData * Signature: (I[B)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI_setData +Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_setData (JNIEnv* env, jclass, jint index, jbyteArray arr) { JByteArrayRef jArrRef{env, arr}; @@ -280,12 +280,12 @@ Java_edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI_setData } /* - * Class: edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI + * Class: edu_wpi_first_hal_simulation_AddressableLEDDataJNI * Method: resetData * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AddressableLEDDataJNI_resetData +Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_resetData (JNIEnv*, jclass, jint index) { HALSIM_ResetAddressableLEDData(index); diff --git a/hal/src/main/native/sim/jni/AnalogGyroDataJNI.cpp b/hal/src/main/native/sim/jni/AnalogGyroDataJNI.cpp index 9bd780acb5..ed867cd5cb 100644 --- a/hal/src/main/native/sim/jni/AnalogGyroDataJNI.cpp +++ b/hal/src/main/native/sim/jni/AnalogGyroDataJNI.cpp @@ -8,20 +8,20 @@ #include #include "CallbackStore.h" -#include "edu_wpi_first_hal_sim_mockdata_AnalogGyroDataJNI.h" -#include "mockdata/AnalogGyroData.h" +#include "edu_wpi_first_hal_simulation_AnalogGyroDataJNI.h" +#include "hal/simulation/AnalogGyroData.h" using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogGyroDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogGyroDataJNI * Method: registerAngleCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogGyroDataJNI_registerAngleCallback +Java_edu_wpi_first_hal_simulation_AnalogGyroDataJNI_registerAngleCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -29,12 +29,12 @@ Java_edu_wpi_first_hal_sim_mockdata_AnalogGyroDataJNI_registerAngleCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogGyroDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogGyroDataJNI * Method: cancelAngleCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogGyroDataJNI_cancelAngleCallback +Java_edu_wpi_first_hal_simulation_AnalogGyroDataJNI_cancelAngleCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -42,36 +42,36 @@ Java_edu_wpi_first_hal_sim_mockdata_AnalogGyroDataJNI_cancelAngleCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogGyroDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogGyroDataJNI * Method: getAngle * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogGyroDataJNI_getAngle +Java_edu_wpi_first_hal_simulation_AnalogGyroDataJNI_getAngle (JNIEnv*, jclass, jint index) { return HALSIM_GetAnalogGyroAngle(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogGyroDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogGyroDataJNI * Method: setAngle * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogGyroDataJNI_setAngle +Java_edu_wpi_first_hal_simulation_AnalogGyroDataJNI_setAngle (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetAnalogGyroAngle(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogGyroDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogGyroDataJNI * Method: registerRateCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogGyroDataJNI_registerRateCallback +Java_edu_wpi_first_hal_simulation_AnalogGyroDataJNI_registerRateCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -79,12 +79,12 @@ Java_edu_wpi_first_hal_sim_mockdata_AnalogGyroDataJNI_registerRateCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogGyroDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogGyroDataJNI * Method: cancelRateCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogGyroDataJNI_cancelRateCallback +Java_edu_wpi_first_hal_simulation_AnalogGyroDataJNI_cancelRateCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -92,36 +92,36 @@ Java_edu_wpi_first_hal_sim_mockdata_AnalogGyroDataJNI_cancelRateCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogGyroDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogGyroDataJNI * Method: getRate * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogGyroDataJNI_getRate +Java_edu_wpi_first_hal_simulation_AnalogGyroDataJNI_getRate (JNIEnv*, jclass, jint index) { return HALSIM_GetAnalogGyroRate(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogGyroDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogGyroDataJNI * Method: setRate * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogGyroDataJNI_setRate +Java_edu_wpi_first_hal_simulation_AnalogGyroDataJNI_setRate (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetAnalogGyroRate(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogGyroDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogGyroDataJNI * Method: registerInitializedCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogGyroDataJNI_registerInitializedCallback +Java_edu_wpi_first_hal_simulation_AnalogGyroDataJNI_registerInitializedCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -129,12 +129,12 @@ Java_edu_wpi_first_hal_sim_mockdata_AnalogGyroDataJNI_registerInitializedCallbac } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogGyroDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogGyroDataJNI * Method: cancelInitializedCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogGyroDataJNI_cancelInitializedCallback +Java_edu_wpi_first_hal_simulation_AnalogGyroDataJNI_cancelInitializedCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -142,36 +142,36 @@ Java_edu_wpi_first_hal_sim_mockdata_AnalogGyroDataJNI_cancelInitializedCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogGyroDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogGyroDataJNI * Method: getInitialized * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogGyroDataJNI_getInitialized +Java_edu_wpi_first_hal_simulation_AnalogGyroDataJNI_getInitialized (JNIEnv*, jclass, jint index) { return HALSIM_GetAnalogGyroInitialized(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogGyroDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogGyroDataJNI * Method: setInitialized * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogGyroDataJNI_setInitialized +Java_edu_wpi_first_hal_simulation_AnalogGyroDataJNI_setInitialized (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetAnalogGyroInitialized(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogGyroDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogGyroDataJNI * Method: resetData * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogGyroDataJNI_resetData +Java_edu_wpi_first_hal_simulation_AnalogGyroDataJNI_resetData (JNIEnv*, jclass, jint index) { HALSIM_ResetAnalogGyroData(index); diff --git a/hal/src/main/native/sim/jni/AnalogInDataJNI.cpp b/hal/src/main/native/sim/jni/AnalogInDataJNI.cpp index 53e0fb9b60..0266a76e67 100644 --- a/hal/src/main/native/sim/jni/AnalogInDataJNI.cpp +++ b/hal/src/main/native/sim/jni/AnalogInDataJNI.cpp @@ -8,20 +8,20 @@ #include #include "CallbackStore.h" -#include "edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI.h" -#include "mockdata/AnalogInData.h" +#include "edu_wpi_first_hal_simulation_AnalogInDataJNI.h" +#include "hal/simulation/AnalogInData.h" using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI * Method: registerInitializedCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_registerInitializedCallback +Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_registerInitializedCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -29,12 +29,12 @@ Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_registerInitializedCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI * Method: cancelInitializedCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_cancelInitializedCallback +Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_cancelInitializedCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -42,36 +42,36 @@ Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_cancelInitializedCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI * Method: getInitialized * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_getInitialized +Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_getInitialized (JNIEnv*, jclass, jint index) { return HALSIM_GetAnalogInInitialized(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI * Method: setInitialized * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_setInitialized +Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_setInitialized (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetAnalogInInitialized(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI * Method: registerAverageBitsCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_registerAverageBitsCallback +Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_registerAverageBitsCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -79,12 +79,12 @@ Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_registerAverageBitsCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI * Method: cancelAverageBitsCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_cancelAverageBitsCallback +Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_cancelAverageBitsCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -92,36 +92,36 @@ Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_cancelAverageBitsCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI * Method: getAverageBits * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_getAverageBits +Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_getAverageBits (JNIEnv*, jclass, jint index) { return HALSIM_GetAnalogInAverageBits(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI * Method: setAverageBits * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_setAverageBits +Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_setAverageBits (JNIEnv*, jclass, jint index, jint value) { HALSIM_SetAnalogInAverageBits(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI * Method: registerOversampleBitsCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_registerOversampleBitsCallback +Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_registerOversampleBitsCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -129,12 +129,12 @@ Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_registerOversampleBitsCallba } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI * Method: cancelOversampleBitsCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_cancelOversampleBitsCallback +Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_cancelOversampleBitsCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -142,36 +142,36 @@ Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_cancelOversampleBitsCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI * Method: getOversampleBits * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_getOversampleBits +Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_getOversampleBits (JNIEnv*, jclass, jint index) { return HALSIM_GetAnalogInOversampleBits(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI * Method: setOversampleBits * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_setOversampleBits +Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_setOversampleBits (JNIEnv*, jclass, jint index, jint value) { HALSIM_SetAnalogInOversampleBits(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI * Method: registerVoltageCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_registerVoltageCallback +Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_registerVoltageCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -179,12 +179,12 @@ Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_registerVoltageCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI * Method: cancelVoltageCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_cancelVoltageCallback +Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_cancelVoltageCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -192,36 +192,36 @@ Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_cancelVoltageCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI * Method: getVoltage * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_getVoltage +Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_getVoltage (JNIEnv*, jclass, jint index) { return HALSIM_GetAnalogInVoltage(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI * Method: setVoltage * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_setVoltage +Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_setVoltage (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetAnalogInVoltage(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI * Method: registerAccumulatorInitializedCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_registerAccumulatorInitializedCallback +Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_registerAccumulatorInitializedCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback( @@ -230,12 +230,12 @@ Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_registerAccumulatorInitializ } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI * Method: cancelAccumulatorInitializedCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_cancelAccumulatorInitializedCallback +Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_cancelAccumulatorInitializedCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback( @@ -243,36 +243,36 @@ Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_cancelAccumulatorInitialized } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI * Method: getAccumulatorInitialized * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_getAccumulatorInitialized +Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_getAccumulatorInitialized (JNIEnv*, jclass, jint index) { return HALSIM_GetAnalogInAccumulatorInitialized(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI * Method: setAccumulatorInitialized * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_setAccumulatorInitialized +Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_setAccumulatorInitialized (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetAnalogInAccumulatorInitialized(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI * Method: registerAccumulatorValueCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_registerAccumulatorValueCallback +Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_registerAccumulatorValueCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback( @@ -281,12 +281,12 @@ Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_registerAccumulatorValueCall } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI * Method: cancelAccumulatorValueCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_cancelAccumulatorValueCallback +Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_cancelAccumulatorValueCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -294,36 +294,36 @@ Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_cancelAccumulatorValueCallba } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI * Method: getAccumulatorValue * Signature: (I)J */ JNIEXPORT jlong JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_getAccumulatorValue +Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_getAccumulatorValue (JNIEnv*, jclass, jint index) { return HALSIM_GetAnalogInAccumulatorValue(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI * Method: setAccumulatorValue * Signature: (IJ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_setAccumulatorValue +Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_setAccumulatorValue (JNIEnv*, jclass, jint index, jlong value) { HALSIM_SetAnalogInAccumulatorValue(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI * Method: registerAccumulatorCountCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_registerAccumulatorCountCallback +Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_registerAccumulatorCountCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback( @@ -332,12 +332,12 @@ Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_registerAccumulatorCountCall } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI * Method: cancelAccumulatorCountCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_cancelAccumulatorCountCallback +Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_cancelAccumulatorCountCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -345,36 +345,36 @@ Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_cancelAccumulatorCountCallba } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI * Method: getAccumulatorCount * Signature: (I)J */ JNIEXPORT jlong JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_getAccumulatorCount +Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_getAccumulatorCount (JNIEnv*, jclass, jint index) { return HALSIM_GetAnalogInAccumulatorCount(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI * Method: setAccumulatorCount * Signature: (IJ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_setAccumulatorCount +Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_setAccumulatorCount (JNIEnv*, jclass, jint index, jlong value) { HALSIM_SetAnalogInAccumulatorCount(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI * Method: registerAccumulatorCenterCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_registerAccumulatorCenterCallback +Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_registerAccumulatorCenterCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback( @@ -383,12 +383,12 @@ Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_registerAccumulatorCenterCal } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI * Method: cancelAccumulatorCenterCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_cancelAccumulatorCenterCallback +Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_cancelAccumulatorCenterCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -396,36 +396,36 @@ Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_cancelAccumulatorCenterCallb } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI * Method: getAccumulatorCenter * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_getAccumulatorCenter +Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_getAccumulatorCenter (JNIEnv*, jclass, jint index) { return HALSIM_GetAnalogInAccumulatorCenter(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI * Method: setAccumulatorCenter * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_setAccumulatorCenter +Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_setAccumulatorCenter (JNIEnv*, jclass, jint index, jint value) { HALSIM_SetAnalogInAccumulatorCenter(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI * Method: registerAccumulatorDeadbandCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_registerAccumulatorDeadbandCallback +Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_registerAccumulatorDeadbandCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback( @@ -434,12 +434,12 @@ Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_registerAccumulatorDeadbandC } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI * Method: cancelAccumulatorDeadbandCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_cancelAccumulatorDeadbandCallback +Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_cancelAccumulatorDeadbandCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -447,36 +447,36 @@ Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_cancelAccumulatorDeadbandCal } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI * Method: getAccumulatorDeadband * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_getAccumulatorDeadband +Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_getAccumulatorDeadband (JNIEnv*, jclass, jint index) { return HALSIM_GetAnalogInAccumulatorDeadband(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI * Method: setAccumulatorDeadband * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_setAccumulatorDeadband +Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_setAccumulatorDeadband (JNIEnv*, jclass, jint index, jint value) { HALSIM_SetAnalogInAccumulatorDeadband(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI * Method: resetData * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI_resetData +Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_resetData (JNIEnv*, jclass, jint index) { HALSIM_ResetAnalogInData(index); diff --git a/hal/src/main/native/sim/jni/AnalogOutDataJNI.cpp b/hal/src/main/native/sim/jni/AnalogOutDataJNI.cpp index b70566b12b..06f5be6ccb 100644 --- a/hal/src/main/native/sim/jni/AnalogOutDataJNI.cpp +++ b/hal/src/main/native/sim/jni/AnalogOutDataJNI.cpp @@ -8,20 +8,20 @@ #include #include "CallbackStore.h" -#include "edu_wpi_first_hal_sim_mockdata_AnalogOutDataJNI.h" -#include "mockdata/AnalogOutData.h" +#include "edu_wpi_first_hal_simulation_AnalogOutDataJNI.h" +#include "hal/simulation/AnalogOutData.h" using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogOutDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogOutDataJNI * Method: registerVoltageCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogOutDataJNI_registerVoltageCallback +Java_edu_wpi_first_hal_simulation_AnalogOutDataJNI_registerVoltageCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -29,12 +29,12 @@ Java_edu_wpi_first_hal_sim_mockdata_AnalogOutDataJNI_registerVoltageCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogOutDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogOutDataJNI * Method: cancelVoltageCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogOutDataJNI_cancelVoltageCallback +Java_edu_wpi_first_hal_simulation_AnalogOutDataJNI_cancelVoltageCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -42,36 +42,36 @@ Java_edu_wpi_first_hal_sim_mockdata_AnalogOutDataJNI_cancelVoltageCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogOutDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogOutDataJNI * Method: getVoltage * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogOutDataJNI_getVoltage +Java_edu_wpi_first_hal_simulation_AnalogOutDataJNI_getVoltage (JNIEnv*, jclass, jint index) { return HALSIM_GetAnalogOutVoltage(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogOutDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogOutDataJNI * Method: setVoltage * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogOutDataJNI_setVoltage +Java_edu_wpi_first_hal_simulation_AnalogOutDataJNI_setVoltage (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetAnalogOutVoltage(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogOutDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogOutDataJNI * Method: registerInitializedCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogOutDataJNI_registerInitializedCallback +Java_edu_wpi_first_hal_simulation_AnalogOutDataJNI_registerInitializedCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -79,12 +79,12 @@ Java_edu_wpi_first_hal_sim_mockdata_AnalogOutDataJNI_registerInitializedCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogOutDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogOutDataJNI * Method: cancelInitializedCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogOutDataJNI_cancelInitializedCallback +Java_edu_wpi_first_hal_simulation_AnalogOutDataJNI_cancelInitializedCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -92,36 +92,36 @@ Java_edu_wpi_first_hal_sim_mockdata_AnalogOutDataJNI_cancelInitializedCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogOutDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogOutDataJNI * Method: getInitialized * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogOutDataJNI_getInitialized +Java_edu_wpi_first_hal_simulation_AnalogOutDataJNI_getInitialized (JNIEnv*, jclass, jint index) { return HALSIM_GetAnalogOutInitialized(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogOutDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogOutDataJNI * Method: setInitialized * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogOutDataJNI_setInitialized +Java_edu_wpi_first_hal_simulation_AnalogOutDataJNI_setInitialized (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetAnalogOutInitialized(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogOutDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogOutDataJNI * Method: resetData * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogOutDataJNI_resetData +Java_edu_wpi_first_hal_simulation_AnalogOutDataJNI_resetData (JNIEnv*, jclass, jint index) { HALSIM_ResetAnalogOutData(index); diff --git a/hal/src/main/native/sim/jni/AnalogTriggerDataJNI.cpp b/hal/src/main/native/sim/jni/AnalogTriggerDataJNI.cpp index 9a5b5c171c..c096e52869 100644 --- a/hal/src/main/native/sim/jni/AnalogTriggerDataJNI.cpp +++ b/hal/src/main/native/sim/jni/AnalogTriggerDataJNI.cpp @@ -8,20 +8,20 @@ #include #include "CallbackStore.h" -#include "edu_wpi_first_hal_sim_mockdata_AnalogTriggerDataJNI.h" -#include "mockdata/AnalogTriggerData.h" +#include "edu_wpi_first_hal_simulation_AnalogTriggerDataJNI.h" +#include "hal/simulation/AnalogTriggerData.h" using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogTriggerDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogTriggerDataJNI * Method: registerInitializedCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogTriggerDataJNI_registerInitializedCallback +Java_edu_wpi_first_hal_simulation_AnalogTriggerDataJNI_registerInitializedCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback( @@ -30,12 +30,12 @@ Java_edu_wpi_first_hal_sim_mockdata_AnalogTriggerDataJNI_registerInitializedCall } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogTriggerDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogTriggerDataJNI * Method: cancelInitializedCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogTriggerDataJNI_cancelInitializedCallback +Java_edu_wpi_first_hal_simulation_AnalogTriggerDataJNI_cancelInitializedCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -43,36 +43,36 @@ Java_edu_wpi_first_hal_sim_mockdata_AnalogTriggerDataJNI_cancelInitializedCallba } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogTriggerDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogTriggerDataJNI * Method: getInitialized * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogTriggerDataJNI_getInitialized +Java_edu_wpi_first_hal_simulation_AnalogTriggerDataJNI_getInitialized (JNIEnv*, jclass, jint index) { return HALSIM_GetAnalogTriggerInitialized(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogTriggerDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogTriggerDataJNI * Method: setInitialized * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogTriggerDataJNI_setInitialized +Java_edu_wpi_first_hal_simulation_AnalogTriggerDataJNI_setInitialized (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetAnalogTriggerInitialized(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogTriggerDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogTriggerDataJNI * Method: registerTriggerLowerBoundCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogTriggerDataJNI_registerTriggerLowerBoundCallback +Java_edu_wpi_first_hal_simulation_AnalogTriggerDataJNI_registerTriggerLowerBoundCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback( @@ -81,12 +81,12 @@ Java_edu_wpi_first_hal_sim_mockdata_AnalogTriggerDataJNI_registerTriggerLowerBou } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogTriggerDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogTriggerDataJNI * Method: cancelTriggerLowerBoundCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogTriggerDataJNI_cancelTriggerLowerBoundCallback +Java_edu_wpi_first_hal_simulation_AnalogTriggerDataJNI_cancelTriggerLowerBoundCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback( @@ -94,36 +94,36 @@ Java_edu_wpi_first_hal_sim_mockdata_AnalogTriggerDataJNI_cancelTriggerLowerBound } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogTriggerDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogTriggerDataJNI * Method: getTriggerLowerBound * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogTriggerDataJNI_getTriggerLowerBound +Java_edu_wpi_first_hal_simulation_AnalogTriggerDataJNI_getTriggerLowerBound (JNIEnv*, jclass, jint index) { return HALSIM_GetAnalogTriggerTriggerLowerBound(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogTriggerDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogTriggerDataJNI * Method: setTriggerLowerBound * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogTriggerDataJNI_setTriggerLowerBound +Java_edu_wpi_first_hal_simulation_AnalogTriggerDataJNI_setTriggerLowerBound (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetAnalogTriggerTriggerLowerBound(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogTriggerDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogTriggerDataJNI * Method: registerTriggerUpperBoundCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogTriggerDataJNI_registerTriggerUpperBoundCallback +Java_edu_wpi_first_hal_simulation_AnalogTriggerDataJNI_registerTriggerUpperBoundCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback( @@ -132,12 +132,12 @@ Java_edu_wpi_first_hal_sim_mockdata_AnalogTriggerDataJNI_registerTriggerUpperBou } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogTriggerDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogTriggerDataJNI * Method: cancelTriggerUpperBoundCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogTriggerDataJNI_cancelTriggerUpperBoundCallback +Java_edu_wpi_first_hal_simulation_AnalogTriggerDataJNI_cancelTriggerUpperBoundCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback( @@ -145,36 +145,36 @@ Java_edu_wpi_first_hal_sim_mockdata_AnalogTriggerDataJNI_cancelTriggerUpperBound } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogTriggerDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogTriggerDataJNI * Method: getTriggerUpperBound * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogTriggerDataJNI_getTriggerUpperBound +Java_edu_wpi_first_hal_simulation_AnalogTriggerDataJNI_getTriggerUpperBound (JNIEnv*, jclass, jint index) { return HALSIM_GetAnalogTriggerTriggerUpperBound(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogTriggerDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogTriggerDataJNI * Method: setTriggerUpperBound * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogTriggerDataJNI_setTriggerUpperBound +Java_edu_wpi_first_hal_simulation_AnalogTriggerDataJNI_setTriggerUpperBound (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetAnalogTriggerTriggerUpperBound(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_AnalogTriggerDataJNI + * Class: edu_wpi_first_hal_simulation_AnalogTriggerDataJNI * Method: resetData * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_AnalogTriggerDataJNI_resetData +Java_edu_wpi_first_hal_simulation_AnalogTriggerDataJNI_resetData (JNIEnv*, jclass, jint index) { HALSIM_ResetAnalogTriggerData(index); diff --git a/hal/src/main/native/sim/jni/BufferCallbackStore.cpp b/hal/src/main/native/sim/jni/BufferCallbackStore.cpp index 95a60c5460..6751e030b6 100644 --- a/hal/src/main/native/sim/jni/BufferCallbackStore.cpp +++ b/hal/src/main/native/sim/jni/BufferCallbackStore.cpp @@ -15,7 +15,7 @@ #include "hal/Types.h" #include "hal/Value.h" #include "hal/handles/UnlimitedHandleResource.h" -#include "mockdata/NotifyListener.h" +#include "hal/simulation/NotifyListener.h" using namespace hal; using namespace hal::sim; diff --git a/hal/src/main/native/sim/jni/BufferCallbackStore.h b/hal/src/main/native/sim/jni/BufferCallbackStore.h index 9c632229f5..8e746d2afa 100644 --- a/hal/src/main/native/sim/jni/BufferCallbackStore.h +++ b/hal/src/main/native/sim/jni/BufferCallbackStore.h @@ -15,7 +15,7 @@ #include "hal/Types.h" #include "hal/Value.h" #include "hal/handles/UnlimitedHandleResource.h" -#include "mockdata/NotifyListener.h" +#include "hal/simulation/NotifyListener.h" namespace hal { namespace sim { diff --git a/hal/src/main/native/sim/jni/CallbackStore.cpp b/hal/src/main/native/sim/jni/CallbackStore.cpp index 5b31adbceb..5ce046de6e 100644 --- a/hal/src/main/native/sim/jni/CallbackStore.cpp +++ b/hal/src/main/native/sim/jni/CallbackStore.cpp @@ -15,7 +15,7 @@ #include "hal/Types.h" #include "hal/Value.h" #include "hal/handles/UnlimitedHandleResource.h" -#include "mockdata/NotifyListener.h" +#include "hal/simulation/NotifyListener.h" using namespace hal; using namespace hal::sim; diff --git a/hal/src/main/native/sim/jni/CallbackStore.h b/hal/src/main/native/sim/jni/CallbackStore.h index b61be0d344..0ba44d3d74 100644 --- a/hal/src/main/native/sim/jni/CallbackStore.h +++ b/hal/src/main/native/sim/jni/CallbackStore.h @@ -15,7 +15,7 @@ #include "hal/Types.h" #include "hal/Value.h" #include "hal/handles/UnlimitedHandleResource.h" -#include "mockdata/NotifyListener.h" +#include "hal/simulation/NotifyListener.h" namespace hal { namespace sim { diff --git a/hal/src/main/native/sim/jni/ConstBufferCallbackStore.cpp b/hal/src/main/native/sim/jni/ConstBufferCallbackStore.cpp index 6bfaaebaf6..b9c9808d9b 100644 --- a/hal/src/main/native/sim/jni/ConstBufferCallbackStore.cpp +++ b/hal/src/main/native/sim/jni/ConstBufferCallbackStore.cpp @@ -15,7 +15,7 @@ #include "hal/Types.h" #include "hal/Value.h" #include "hal/handles/UnlimitedHandleResource.h" -#include "mockdata/NotifyListener.h" +#include "hal/simulation/NotifyListener.h" using namespace hal; using namespace hal::sim; diff --git a/hal/src/main/native/sim/jni/ConstBufferCallbackStore.h b/hal/src/main/native/sim/jni/ConstBufferCallbackStore.h index 92c2e8d20e..b69eccf154 100644 --- a/hal/src/main/native/sim/jni/ConstBufferCallbackStore.h +++ b/hal/src/main/native/sim/jni/ConstBufferCallbackStore.h @@ -15,7 +15,7 @@ #include "hal/Types.h" #include "hal/Value.h" #include "hal/handles/UnlimitedHandleResource.h" -#include "mockdata/NotifyListener.h" +#include "hal/simulation/NotifyListener.h" namespace hal { namespace sim { diff --git a/hal/src/main/native/sim/jni/DIODataJNI.cpp b/hal/src/main/native/sim/jni/DIODataJNI.cpp index 8f28b5dd7e..f757558917 100644 --- a/hal/src/main/native/sim/jni/DIODataJNI.cpp +++ b/hal/src/main/native/sim/jni/DIODataJNI.cpp @@ -8,20 +8,20 @@ #include #include "CallbackStore.h" -#include "edu_wpi_first_hal_sim_mockdata_DIODataJNI.h" -#include "mockdata/DIOData.h" +#include "edu_wpi_first_hal_simulation_DIODataJNI.h" +#include "hal/simulation/DIOData.h" using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI + * Class: edu_wpi_first_hal_simulation_DIODataJNI * Method: registerInitializedCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_registerInitializedCallback +Java_edu_wpi_first_hal_simulation_DIODataJNI_registerInitializedCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -29,12 +29,12 @@ Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_registerInitializedCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI + * Class: edu_wpi_first_hal_simulation_DIODataJNI * Method: cancelInitializedCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_cancelInitializedCallback +Java_edu_wpi_first_hal_simulation_DIODataJNI_cancelInitializedCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -42,36 +42,36 @@ Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_cancelInitializedCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI + * Class: edu_wpi_first_hal_simulation_DIODataJNI * Method: getInitialized * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_getInitialized +Java_edu_wpi_first_hal_simulation_DIODataJNI_getInitialized (JNIEnv*, jclass, jint index) { return HALSIM_GetDIOInitialized(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI + * Class: edu_wpi_first_hal_simulation_DIODataJNI * Method: setInitialized * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_setInitialized +Java_edu_wpi_first_hal_simulation_DIODataJNI_setInitialized (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetDIOInitialized(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI + * Class: edu_wpi_first_hal_simulation_DIODataJNI * Method: registerValueCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_registerValueCallback +Java_edu_wpi_first_hal_simulation_DIODataJNI_registerValueCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -79,48 +79,48 @@ Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_registerValueCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI + * Class: edu_wpi_first_hal_simulation_DIODataJNI * Method: cancelValueCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_cancelValueCallback +Java_edu_wpi_first_hal_simulation_DIODataJNI_cancelValueCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, &HALSIM_CancelDIOValueCallback); } /* - * Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI + * Class: edu_wpi_first_hal_simulation_DIODataJNI * Method: getValue * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_getValue +Java_edu_wpi_first_hal_simulation_DIODataJNI_getValue (JNIEnv*, jclass, jint index) { return HALSIM_GetDIOValue(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI + * Class: edu_wpi_first_hal_simulation_DIODataJNI * Method: setValue * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_setValue +Java_edu_wpi_first_hal_simulation_DIODataJNI_setValue (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetDIOValue(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI + * Class: edu_wpi_first_hal_simulation_DIODataJNI * Method: registerPulseLengthCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_registerPulseLengthCallback +Java_edu_wpi_first_hal_simulation_DIODataJNI_registerPulseLengthCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -128,12 +128,12 @@ Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_registerPulseLengthCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI + * Class: edu_wpi_first_hal_simulation_DIODataJNI * Method: cancelPulseLengthCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_cancelPulseLengthCallback +Java_edu_wpi_first_hal_simulation_DIODataJNI_cancelPulseLengthCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -141,36 +141,36 @@ Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_cancelPulseLengthCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI + * Class: edu_wpi_first_hal_simulation_DIODataJNI * Method: getPulseLength * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_getPulseLength +Java_edu_wpi_first_hal_simulation_DIODataJNI_getPulseLength (JNIEnv*, jclass, jint index) { return HALSIM_GetDIOPulseLength(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI + * Class: edu_wpi_first_hal_simulation_DIODataJNI * Method: setPulseLength * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_setPulseLength +Java_edu_wpi_first_hal_simulation_DIODataJNI_setPulseLength (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetDIOPulseLength(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI + * Class: edu_wpi_first_hal_simulation_DIODataJNI * Method: registerIsInputCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_registerIsInputCallback +Java_edu_wpi_first_hal_simulation_DIODataJNI_registerIsInputCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -178,12 +178,12 @@ Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_registerIsInputCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI + * Class: edu_wpi_first_hal_simulation_DIODataJNI * Method: cancelIsInputCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_cancelIsInputCallback +Java_edu_wpi_first_hal_simulation_DIODataJNI_cancelIsInputCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -191,36 +191,36 @@ Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_cancelIsInputCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI + * Class: edu_wpi_first_hal_simulation_DIODataJNI * Method: getIsInput * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_getIsInput +Java_edu_wpi_first_hal_simulation_DIODataJNI_getIsInput (JNIEnv*, jclass, jint index) { return HALSIM_GetDIOIsInput(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI + * Class: edu_wpi_first_hal_simulation_DIODataJNI * Method: setIsInput * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_setIsInput +Java_edu_wpi_first_hal_simulation_DIODataJNI_setIsInput (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetDIOIsInput(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI + * Class: edu_wpi_first_hal_simulation_DIODataJNI * Method: registerFilterIndexCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_registerFilterIndexCallback +Java_edu_wpi_first_hal_simulation_DIODataJNI_registerFilterIndexCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -228,12 +228,12 @@ Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_registerFilterIndexCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI + * Class: edu_wpi_first_hal_simulation_DIODataJNI * Method: cancelFilterIndexCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_cancelFilterIndexCallback +Java_edu_wpi_first_hal_simulation_DIODataJNI_cancelFilterIndexCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -241,36 +241,36 @@ Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_cancelFilterIndexCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI + * Class: edu_wpi_first_hal_simulation_DIODataJNI * Method: getFilterIndex * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_getFilterIndex +Java_edu_wpi_first_hal_simulation_DIODataJNI_getFilterIndex (JNIEnv*, jclass, jint index) { return HALSIM_GetDIOFilterIndex(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI + * Class: edu_wpi_first_hal_simulation_DIODataJNI * Method: setFilterIndex * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_setFilterIndex +Java_edu_wpi_first_hal_simulation_DIODataJNI_setFilterIndex (JNIEnv*, jclass, jint index, jint value) { HALSIM_SetDIOFilterIndex(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI + * Class: edu_wpi_first_hal_simulation_DIODataJNI * Method: resetData * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_resetData +Java_edu_wpi_first_hal_simulation_DIODataJNI_resetData (JNIEnv*, jclass, jint index) { HALSIM_ResetDIOData(index); diff --git a/hal/src/main/native/sim/jni/DigitalPWMDataJNI.cpp b/hal/src/main/native/sim/jni/DigitalPWMDataJNI.cpp index 2efa0ede18..d4b1ed51a5 100644 --- a/hal/src/main/native/sim/jni/DigitalPWMDataJNI.cpp +++ b/hal/src/main/native/sim/jni/DigitalPWMDataJNI.cpp @@ -8,20 +8,20 @@ #include #include "CallbackStore.h" -#include "edu_wpi_first_hal_sim_mockdata_DigitalPWMDataJNI.h" -#include "mockdata/DigitalPWMData.h" +#include "edu_wpi_first_hal_simulation_DigitalPWMDataJNI.h" +#include "hal/simulation/DigitalPWMData.h" using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_sim_mockdata_DigitalPWMDataJNI + * Class: edu_wpi_first_hal_simulation_DigitalPWMDataJNI * Method: registerInitializedCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DigitalPWMDataJNI_registerInitializedCallback +Java_edu_wpi_first_hal_simulation_DigitalPWMDataJNI_registerInitializedCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -29,12 +29,12 @@ Java_edu_wpi_first_hal_sim_mockdata_DigitalPWMDataJNI_registerInitializedCallbac } /* - * Class: edu_wpi_first_hal_sim_mockdata_DigitalPWMDataJNI + * Class: edu_wpi_first_hal_simulation_DigitalPWMDataJNI * Method: cancelInitializedCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DigitalPWMDataJNI_cancelInitializedCallback +Java_edu_wpi_first_hal_simulation_DigitalPWMDataJNI_cancelInitializedCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -42,36 +42,36 @@ Java_edu_wpi_first_hal_sim_mockdata_DigitalPWMDataJNI_cancelInitializedCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_DigitalPWMDataJNI + * Class: edu_wpi_first_hal_simulation_DigitalPWMDataJNI * Method: getInitialized * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DigitalPWMDataJNI_getInitialized +Java_edu_wpi_first_hal_simulation_DigitalPWMDataJNI_getInitialized (JNIEnv*, jclass, jint index) { return HALSIM_GetDigitalPWMInitialized(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_DigitalPWMDataJNI + * Class: edu_wpi_first_hal_simulation_DigitalPWMDataJNI * Method: setInitialized * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DigitalPWMDataJNI_setInitialized +Java_edu_wpi_first_hal_simulation_DigitalPWMDataJNI_setInitialized (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetDigitalPWMInitialized(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_DigitalPWMDataJNI + * Class: edu_wpi_first_hal_simulation_DigitalPWMDataJNI * Method: registerDutyCycleCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DigitalPWMDataJNI_registerDutyCycleCallback +Java_edu_wpi_first_hal_simulation_DigitalPWMDataJNI_registerDutyCycleCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -79,12 +79,12 @@ Java_edu_wpi_first_hal_sim_mockdata_DigitalPWMDataJNI_registerDutyCycleCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_DigitalPWMDataJNI + * Class: edu_wpi_first_hal_simulation_DigitalPWMDataJNI * Method: cancelDutyCycleCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DigitalPWMDataJNI_cancelDutyCycleCallback +Java_edu_wpi_first_hal_simulation_DigitalPWMDataJNI_cancelDutyCycleCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -92,36 +92,36 @@ Java_edu_wpi_first_hal_sim_mockdata_DigitalPWMDataJNI_cancelDutyCycleCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_DigitalPWMDataJNI + * Class: edu_wpi_first_hal_simulation_DigitalPWMDataJNI * Method: getDutyCycle * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DigitalPWMDataJNI_getDutyCycle +Java_edu_wpi_first_hal_simulation_DigitalPWMDataJNI_getDutyCycle (JNIEnv*, jclass, jint index) { return HALSIM_GetDigitalPWMDutyCycle(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_DigitalPWMDataJNI + * Class: edu_wpi_first_hal_simulation_DigitalPWMDataJNI * Method: setDutyCycle * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DigitalPWMDataJNI_setDutyCycle +Java_edu_wpi_first_hal_simulation_DigitalPWMDataJNI_setDutyCycle (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetDigitalPWMDutyCycle(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_DigitalPWMDataJNI + * Class: edu_wpi_first_hal_simulation_DigitalPWMDataJNI * Method: registerPinCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DigitalPWMDataJNI_registerPinCallback +Java_edu_wpi_first_hal_simulation_DigitalPWMDataJNI_registerPinCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -129,12 +129,12 @@ Java_edu_wpi_first_hal_sim_mockdata_DigitalPWMDataJNI_registerPinCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_DigitalPWMDataJNI + * Class: edu_wpi_first_hal_simulation_DigitalPWMDataJNI * Method: cancelPinCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DigitalPWMDataJNI_cancelPinCallback +Java_edu_wpi_first_hal_simulation_DigitalPWMDataJNI_cancelPinCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -142,36 +142,36 @@ Java_edu_wpi_first_hal_sim_mockdata_DigitalPWMDataJNI_cancelPinCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_DigitalPWMDataJNI + * Class: edu_wpi_first_hal_simulation_DigitalPWMDataJNI * Method: getPin * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DigitalPWMDataJNI_getPin +Java_edu_wpi_first_hal_simulation_DigitalPWMDataJNI_getPin (JNIEnv*, jclass, jint index) { return HALSIM_GetDigitalPWMPin(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_DigitalPWMDataJNI + * Class: edu_wpi_first_hal_simulation_DigitalPWMDataJNI * Method: setPin * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DigitalPWMDataJNI_setPin +Java_edu_wpi_first_hal_simulation_DigitalPWMDataJNI_setPin (JNIEnv*, jclass, jint index, jint value) { HALSIM_SetDigitalPWMPin(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_DigitalPWMDataJNI + * Class: edu_wpi_first_hal_simulation_DigitalPWMDataJNI * Method: resetData * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DigitalPWMDataJNI_resetData +Java_edu_wpi_first_hal_simulation_DigitalPWMDataJNI_resetData (JNIEnv*, jclass, jint index) { HALSIM_ResetDigitalPWMData(index); diff --git a/hal/src/main/native/sim/jni/DriverStationDataJNI.cpp b/hal/src/main/native/sim/jni/DriverStationDataJNI.cpp index 985d6b84b5..2c77b4b31c 100644 --- a/hal/src/main/native/sim/jni/DriverStationDataJNI.cpp +++ b/hal/src/main/native/sim/jni/DriverStationDataJNI.cpp @@ -12,9 +12,9 @@ #include #include "CallbackStore.h" -#include "edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI.h" -#include "mockdata/DriverStationData.h" -#include "mockdata/MockHooks.h" +#include "edu_wpi_first_hal_simulation_DriverStationDataJNI.h" +#include "hal/simulation/DriverStationData.h" +#include "hal/simulation/MockHooks.h" using namespace hal; using namespace wpi::java; @@ -22,12 +22,12 @@ using namespace wpi::java; extern "C" { /* - * Class: edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI + * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI * Method: registerEnabledCallback * Signature: (Ljava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_registerEnabledCallback +Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_registerEnabledCallback (JNIEnv* env, jclass, jobject callback, jboolean initialNotify) { return sim::AllocateCallbackNoIndex( @@ -36,12 +36,12 @@ Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_registerEnabledCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI + * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI * Method: cancelEnabledCallback * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_cancelEnabledCallback +Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_cancelEnabledCallback (JNIEnv* env, jclass, jint handle) { return sim::FreeCallbackNoIndex(env, handle, @@ -49,36 +49,36 @@ Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_cancelEnabledCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI + * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI * Method: getEnabled * Signature: ()Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_getEnabled +Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_getEnabled (JNIEnv*, jclass) { return HALSIM_GetDriverStationEnabled(); } /* - * Class: edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI + * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI * Method: setEnabled * Signature: (Z)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_setEnabled +Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setEnabled (JNIEnv*, jclass, jboolean value) { HALSIM_SetDriverStationEnabled(value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI + * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI * Method: registerAutonomousCallback * Signature: (Ljava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_registerAutonomousCallback +Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_registerAutonomousCallback (JNIEnv* env, jclass, jobject callback, jboolean initialNotify) { return sim::AllocateCallbackNoIndex( @@ -87,12 +87,12 @@ Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_registerAutonomousCallb } /* - * Class: edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI + * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI * Method: cancelAutonomousCallback * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_cancelAutonomousCallback +Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_cancelAutonomousCallback (JNIEnv* env, jclass, jint handle) { return sim::FreeCallbackNoIndex( @@ -100,36 +100,36 @@ Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_cancelAutonomousCallbac } /* - * Class: edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI + * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI * Method: getAutonomous * Signature: ()Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_getAutonomous +Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_getAutonomous (JNIEnv*, jclass) { return HALSIM_GetDriverStationAutonomous(); } /* - * Class: edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI + * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI * Method: setAutonomous * Signature: (Z)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_setAutonomous +Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setAutonomous (JNIEnv*, jclass, jboolean value) { HALSIM_SetDriverStationAutonomous(value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI + * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI * Method: registerTestCallback * Signature: (Ljava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_registerTestCallback +Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_registerTestCallback (JNIEnv* env, jclass, jobject callback, jboolean initialNotify) { return sim::AllocateCallbackNoIndex( @@ -137,12 +137,12 @@ Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_registerTestCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI + * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI * Method: cancelTestCallback * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_cancelTestCallback +Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_cancelTestCallback (JNIEnv* env, jclass, jint handle) { return sim::FreeCallbackNoIndex(env, handle, @@ -150,36 +150,36 @@ Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_cancelTestCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI + * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI * Method: getTest * Signature: ()Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_getTest +Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_getTest (JNIEnv*, jclass) { return HALSIM_GetDriverStationTest(); } /* - * Class: edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI + * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI * Method: setTest * Signature: (Z)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_setTest +Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setTest (JNIEnv*, jclass, jboolean value) { HALSIM_SetDriverStationTest(value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI + * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI * Method: registerEStopCallback * Signature: (Ljava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_registerEStopCallback +Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_registerEStopCallback (JNIEnv* env, jclass, jobject callback, jboolean initialNotify) { return sim::AllocateCallbackNoIndex( @@ -187,12 +187,12 @@ Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_registerEStopCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI + * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI * Method: cancelEStopCallback * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_cancelEStopCallback +Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_cancelEStopCallback (JNIEnv* env, jclass, jint handle) { return sim::FreeCallbackNoIndex(env, handle, @@ -200,36 +200,36 @@ Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_cancelEStopCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI + * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI * Method: getEStop * Signature: ()Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_getEStop +Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_getEStop (JNIEnv*, jclass) { return HALSIM_GetDriverStationEStop(); } /* - * Class: edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI + * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI * Method: setEStop * Signature: (Z)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_setEStop +Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setEStop (JNIEnv*, jclass, jboolean value) { HALSIM_SetDriverStationEStop(value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI + * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI * Method: registerFmsAttachedCallback * Signature: (Ljava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_registerFmsAttachedCallback +Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_registerFmsAttachedCallback (JNIEnv* env, jclass, jobject callback, jboolean initialNotify) { return sim::AllocateCallbackNoIndex( @@ -238,12 +238,12 @@ Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_registerFmsAttachedCall } /* - * Class: edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI + * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI * Method: cancelFmsAttachedCallback * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_cancelFmsAttachedCallback +Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_cancelFmsAttachedCallback (JNIEnv* env, jclass, jint handle) { return sim::FreeCallbackNoIndex( @@ -251,36 +251,36 @@ Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_cancelFmsAttachedCallba } /* - * Class: edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI + * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI * Method: getFmsAttached * Signature: ()Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_getFmsAttached +Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_getFmsAttached (JNIEnv*, jclass) { return HALSIM_GetDriverStationFmsAttached(); } /* - * Class: edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI + * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI * Method: setFmsAttached * Signature: (Z)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_setFmsAttached +Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setFmsAttached (JNIEnv*, jclass, jboolean value) { HALSIM_SetDriverStationFmsAttached(value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI + * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI * Method: registerDsAttachedCallback * Signature: (Ljava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_registerDsAttachedCallback +Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_registerDsAttachedCallback (JNIEnv* env, jclass, jobject callback, jboolean initialNotify) { return sim::AllocateCallbackNoIndex( @@ -289,12 +289,12 @@ Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_registerDsAttachedCallb } /* - * Class: edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI + * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI * Method: cancelDsAttachedCallback * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_cancelDsAttachedCallback +Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_cancelDsAttachedCallback (JNIEnv* env, jclass, jint handle) { return sim::FreeCallbackNoIndex( @@ -302,36 +302,36 @@ Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_cancelDsAttachedCallbac } /* - * Class: edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI + * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI * Method: getDsAttached * Signature: ()Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_getDsAttached +Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_getDsAttached (JNIEnv*, jclass) { return HALSIM_GetDriverStationDsAttached(); } /* - * Class: edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI + * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI * Method: setDsAttached * Signature: (Z)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_setDsAttached +Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setDsAttached (JNIEnv*, jclass, jboolean value) { HALSIM_SetDriverStationDsAttached(value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI + * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI * Method: setJoystickAxes * Signature: (B[F)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_setJoystickAxes +Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setJoystickAxes (JNIEnv* env, jclass, jbyte joystickNum, jfloatArray axesArray) { HAL_JoystickAxes axes; @@ -351,12 +351,12 @@ Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_setJoystickAxes } /* - * Class: edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI + * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI * Method: setJoystickPOVs * Signature: (B[S)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_setJoystickPOVs +Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setJoystickPOVs (JNIEnv* env, jclass, jbyte joystickNum, jshortArray povsArray) { HAL_JoystickPOVs povs; @@ -376,12 +376,12 @@ Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_setJoystickPOVs } /* - * Class: edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI + * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI * Method: setJoystickButtons * Signature: (BII)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_setJoystickButtons +Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setJoystickButtons (JNIEnv* env, jclass, jbyte joystickNum, jint buttons, jint count) { if (count > 32) { @@ -394,12 +394,12 @@ Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_setJoystickButtons } /* - * Class: edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI + * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI * Method: setMatchInfo * Signature: (Ljava/lang/String;Ljava/lang/String;III)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_setMatchInfo +Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setMatchInfo (JNIEnv* env, jclass, jstring eventName, jstring gameSpecificMessage, jint matchNumber, jint replayNumber, jint matchType) { @@ -420,12 +420,12 @@ Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_setMatchInfo } /* - * Class: edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI + * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI * Method: registerAllCallbacks * Signature: (Ljava/lang/Object;Z)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_registerAllCallbacks +Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_registerAllCallbacks (JNIEnv* env, jclass, jobject callback, jboolean initialNotify) { sim::AllocateCallbackNoIndex( @@ -437,24 +437,24 @@ Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_registerAllCallbacks } /* - * Class: edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI + * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI * Method: notifyNewData * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_notifyNewData +Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_notifyNewData (JNIEnv*, jclass) { HALSIM_NotifyDriverStationNewData(); } /* - * Class: edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI + * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI * Method: setSendError * Signature: (Z)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_setSendError +Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setSendError (JNIEnv*, jclass, jboolean shouldSend) { if (shouldSend) { @@ -468,12 +468,12 @@ Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_setSendError } /* - * Class: edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI + * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI * Method: setSendConsoleLine * Signature: (Z)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_setSendConsoleLine +Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setSendConsoleLine (JNIEnv*, jclass, jboolean shouldSend) { if (shouldSend) { @@ -484,12 +484,12 @@ Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_setSendConsoleLine } /* - * Class: edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI + * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI * Method: resetData * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI_resetData +Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_resetData (JNIEnv*, jclass) { HALSIM_ResetDriverStationData(); diff --git a/hal/src/main/native/sim/jni/DutyCycleDataJNI.cpp b/hal/src/main/native/sim/jni/DutyCycleDataJNI.cpp index d36ed50562..e230a10fc2 100644 --- a/hal/src/main/native/sim/jni/DutyCycleDataJNI.cpp +++ b/hal/src/main/native/sim/jni/DutyCycleDataJNI.cpp @@ -8,20 +8,20 @@ #include #include "CallbackStore.h" -#include "edu_wpi_first_hal_sim_mockdata_DutyCycleDataJNI.h" -#include "mockdata/DutyCycleData.h" +#include "edu_wpi_first_hal_simulation_DutyCycleDataJNI.h" +#include "hal/simulation/DutyCycleData.h" using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_sim_mockdata_DutyCycleDataJNI + * Class: edu_wpi_first_hal_simulation_DutyCycleDataJNI * Method: registerInitializedCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DutyCycleDataJNI_registerInitializedCallback +Java_edu_wpi_first_hal_simulation_DutyCycleDataJNI_registerInitializedCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -29,12 +29,12 @@ Java_edu_wpi_first_hal_sim_mockdata_DutyCycleDataJNI_registerInitializedCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_DutyCycleDataJNI + * Class: edu_wpi_first_hal_simulation_DutyCycleDataJNI * Method: cancelInitializedCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DutyCycleDataJNI_cancelInitializedCallback +Java_edu_wpi_first_hal_simulation_DutyCycleDataJNI_cancelInitializedCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -42,36 +42,36 @@ Java_edu_wpi_first_hal_sim_mockdata_DutyCycleDataJNI_cancelInitializedCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_DutyCycleDataJNI + * Class: edu_wpi_first_hal_simulation_DutyCycleDataJNI * Method: getInitialized * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DutyCycleDataJNI_getInitialized +Java_edu_wpi_first_hal_simulation_DutyCycleDataJNI_getInitialized (JNIEnv*, jclass, jint index) { return HALSIM_GetDutyCycleInitialized(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_DutyCycleDataJNI + * Class: edu_wpi_first_hal_simulation_DutyCycleDataJNI * Method: setInitialized * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DutyCycleDataJNI_setInitialized +Java_edu_wpi_first_hal_simulation_DutyCycleDataJNI_setInitialized (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetDutyCycleInitialized(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_DutyCycleDataJNI + * Class: edu_wpi_first_hal_simulation_DutyCycleDataJNI * Method: registerFrequencyCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DutyCycleDataJNI_registerFrequencyCallback +Java_edu_wpi_first_hal_simulation_DutyCycleDataJNI_registerFrequencyCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -79,12 +79,12 @@ Java_edu_wpi_first_hal_sim_mockdata_DutyCycleDataJNI_registerFrequencyCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_DutyCycleDataJNI + * Class: edu_wpi_first_hal_simulation_DutyCycleDataJNI * Method: cancelFrequencyCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DutyCycleDataJNI_cancelFrequencyCallback +Java_edu_wpi_first_hal_simulation_DutyCycleDataJNI_cancelFrequencyCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -92,36 +92,36 @@ Java_edu_wpi_first_hal_sim_mockdata_DutyCycleDataJNI_cancelFrequencyCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_DutyCycleDataJNI + * Class: edu_wpi_first_hal_simulation_DutyCycleDataJNI * Method: getFrequency * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DutyCycleDataJNI_getFrequency +Java_edu_wpi_first_hal_simulation_DutyCycleDataJNI_getFrequency (JNIEnv*, jclass, jint index) { return HALSIM_GetDutyCycleFrequency(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_DutyCycleDataJNI + * Class: edu_wpi_first_hal_simulation_DutyCycleDataJNI * Method: setFrequency * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DutyCycleDataJNI_setFrequency +Java_edu_wpi_first_hal_simulation_DutyCycleDataJNI_setFrequency (JNIEnv*, jclass, jint index, jint value) { HALSIM_SetDutyCycleFrequency(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_DutyCycleDataJNI + * Class: edu_wpi_first_hal_simulation_DutyCycleDataJNI * Method: registerOutputCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DutyCycleDataJNI_registerOutputCallback +Java_edu_wpi_first_hal_simulation_DutyCycleDataJNI_registerOutputCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -129,12 +129,12 @@ Java_edu_wpi_first_hal_sim_mockdata_DutyCycleDataJNI_registerOutputCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_DutyCycleDataJNI + * Class: edu_wpi_first_hal_simulation_DutyCycleDataJNI * Method: cancelOutputCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DutyCycleDataJNI_cancelOutputCallback +Java_edu_wpi_first_hal_simulation_DutyCycleDataJNI_cancelOutputCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -142,36 +142,36 @@ Java_edu_wpi_first_hal_sim_mockdata_DutyCycleDataJNI_cancelOutputCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_DutyCycleDataJNI + * Class: edu_wpi_first_hal_simulation_DutyCycleDataJNI * Method: getOutput * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DutyCycleDataJNI_getOutput +Java_edu_wpi_first_hal_simulation_DutyCycleDataJNI_getOutput (JNIEnv*, jclass, jint index) { return HALSIM_GetDutyCycleOutput(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_DutyCycleDataJNI + * Class: edu_wpi_first_hal_simulation_DutyCycleDataJNI * Method: setOutput * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DutyCycleDataJNI_setOutput +Java_edu_wpi_first_hal_simulation_DutyCycleDataJNI_setOutput (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetDutyCycleOutput(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_DutyCycleDataJNI + * Class: edu_wpi_first_hal_simulation_DutyCycleDataJNI * Method: resetData * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_DutyCycleDataJNI_resetData +Java_edu_wpi_first_hal_simulation_DutyCycleDataJNI_resetData (JNIEnv*, jclass, jint index) { HALSIM_ResetDutyCycleData(index); diff --git a/hal/src/main/native/sim/jni/EncoderDataJNI.cpp b/hal/src/main/native/sim/jni/EncoderDataJNI.cpp index 9cc603c4d4..88b94e90af 100644 --- a/hal/src/main/native/sim/jni/EncoderDataJNI.cpp +++ b/hal/src/main/native/sim/jni/EncoderDataJNI.cpp @@ -8,20 +8,20 @@ #include #include "CallbackStore.h" -#include "edu_wpi_first_hal_sim_mockdata_EncoderDataJNI.h" -#include "mockdata/EncoderData.h" +#include "edu_wpi_first_hal_simulation_EncoderDataJNI.h" +#include "hal/simulation/EncoderData.h" using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_sim_mockdata_EncoderDataJNI + * Class: edu_wpi_first_hal_simulation_EncoderDataJNI * Method: registerInitializedCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_registerInitializedCallback +Java_edu_wpi_first_hal_simulation_EncoderDataJNI_registerInitializedCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -29,12 +29,12 @@ Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_registerInitializedCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_EncoderDataJNI + * Class: edu_wpi_first_hal_simulation_EncoderDataJNI * Method: cancelInitializedCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_cancelInitializedCallback +Java_edu_wpi_first_hal_simulation_EncoderDataJNI_cancelInitializedCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -42,36 +42,36 @@ Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_cancelInitializedCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_EncoderDataJNI + * Class: edu_wpi_first_hal_simulation_EncoderDataJNI * Method: getInitialized * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_getInitialized +Java_edu_wpi_first_hal_simulation_EncoderDataJNI_getInitialized (JNIEnv*, jclass, jint index) { return HALSIM_GetEncoderInitialized(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_EncoderDataJNI + * Class: edu_wpi_first_hal_simulation_EncoderDataJNI * Method: setInitialized * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_setInitialized +Java_edu_wpi_first_hal_simulation_EncoderDataJNI_setInitialized (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetEncoderInitialized(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_EncoderDataJNI + * Class: edu_wpi_first_hal_simulation_EncoderDataJNI * Method: registerCountCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_registerCountCallback +Java_edu_wpi_first_hal_simulation_EncoderDataJNI_registerCountCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -79,12 +79,12 @@ Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_registerCountCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_EncoderDataJNI + * Class: edu_wpi_first_hal_simulation_EncoderDataJNI * Method: cancelCountCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_cancelCountCallback +Java_edu_wpi_first_hal_simulation_EncoderDataJNI_cancelCountCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -92,36 +92,36 @@ Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_cancelCountCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_EncoderDataJNI + * Class: edu_wpi_first_hal_simulation_EncoderDataJNI * Method: getCount * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_getCount +Java_edu_wpi_first_hal_simulation_EncoderDataJNI_getCount (JNIEnv*, jclass, jint index) { return HALSIM_GetEncoderCount(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_EncoderDataJNI + * Class: edu_wpi_first_hal_simulation_EncoderDataJNI * Method: setCount * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_setCount +Java_edu_wpi_first_hal_simulation_EncoderDataJNI_setCount (JNIEnv*, jclass, jint index, jint value) { HALSIM_SetEncoderCount(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_EncoderDataJNI + * Class: edu_wpi_first_hal_simulation_EncoderDataJNI * Method: registerPeriodCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_registerPeriodCallback +Java_edu_wpi_first_hal_simulation_EncoderDataJNI_registerPeriodCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -129,12 +129,12 @@ Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_registerPeriodCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_EncoderDataJNI + * Class: edu_wpi_first_hal_simulation_EncoderDataJNI * Method: cancelPeriodCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_cancelPeriodCallback +Java_edu_wpi_first_hal_simulation_EncoderDataJNI_cancelPeriodCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -142,36 +142,36 @@ Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_cancelPeriodCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_EncoderDataJNI + * Class: edu_wpi_first_hal_simulation_EncoderDataJNI * Method: getPeriod * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_getPeriod +Java_edu_wpi_first_hal_simulation_EncoderDataJNI_getPeriod (JNIEnv*, jclass, jint index) { return HALSIM_GetEncoderPeriod(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_EncoderDataJNI + * Class: edu_wpi_first_hal_simulation_EncoderDataJNI * Method: setPeriod * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_setPeriod +Java_edu_wpi_first_hal_simulation_EncoderDataJNI_setPeriod (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetEncoderPeriod(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_EncoderDataJNI + * Class: edu_wpi_first_hal_simulation_EncoderDataJNI * Method: registerResetCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_registerResetCallback +Java_edu_wpi_first_hal_simulation_EncoderDataJNI_registerResetCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -179,12 +179,12 @@ Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_registerResetCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_EncoderDataJNI + * Class: edu_wpi_first_hal_simulation_EncoderDataJNI * Method: cancelResetCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_cancelResetCallback +Java_edu_wpi_first_hal_simulation_EncoderDataJNI_cancelResetCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -192,36 +192,36 @@ Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_cancelResetCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_EncoderDataJNI + * Class: edu_wpi_first_hal_simulation_EncoderDataJNI * Method: getReset * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_getReset +Java_edu_wpi_first_hal_simulation_EncoderDataJNI_getReset (JNIEnv*, jclass, jint index) { return HALSIM_GetEncoderReset(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_EncoderDataJNI + * Class: edu_wpi_first_hal_simulation_EncoderDataJNI * Method: setReset * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_setReset +Java_edu_wpi_first_hal_simulation_EncoderDataJNI_setReset (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetEncoderReset(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_EncoderDataJNI + * Class: edu_wpi_first_hal_simulation_EncoderDataJNI * Method: registerMaxPeriodCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_registerMaxPeriodCallback +Java_edu_wpi_first_hal_simulation_EncoderDataJNI_registerMaxPeriodCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -229,12 +229,12 @@ Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_registerMaxPeriodCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_EncoderDataJNI + * Class: edu_wpi_first_hal_simulation_EncoderDataJNI * Method: cancelMaxPeriodCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_cancelMaxPeriodCallback +Java_edu_wpi_first_hal_simulation_EncoderDataJNI_cancelMaxPeriodCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -242,36 +242,36 @@ Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_cancelMaxPeriodCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_EncoderDataJNI + * Class: edu_wpi_first_hal_simulation_EncoderDataJNI * Method: getMaxPeriod * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_getMaxPeriod +Java_edu_wpi_first_hal_simulation_EncoderDataJNI_getMaxPeriod (JNIEnv*, jclass, jint index) { return HALSIM_GetEncoderMaxPeriod(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_EncoderDataJNI + * Class: edu_wpi_first_hal_simulation_EncoderDataJNI * Method: setMaxPeriod * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_setMaxPeriod +Java_edu_wpi_first_hal_simulation_EncoderDataJNI_setMaxPeriod (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetEncoderMaxPeriod(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_EncoderDataJNI + * Class: edu_wpi_first_hal_simulation_EncoderDataJNI * Method: registerDirectionCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_registerDirectionCallback +Java_edu_wpi_first_hal_simulation_EncoderDataJNI_registerDirectionCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -279,12 +279,12 @@ Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_registerDirectionCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_EncoderDataJNI + * Class: edu_wpi_first_hal_simulation_EncoderDataJNI * Method: cancelDirectionCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_cancelDirectionCallback +Java_edu_wpi_first_hal_simulation_EncoderDataJNI_cancelDirectionCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -292,36 +292,36 @@ Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_cancelDirectionCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_EncoderDataJNI + * Class: edu_wpi_first_hal_simulation_EncoderDataJNI * Method: getDirection * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_getDirection +Java_edu_wpi_first_hal_simulation_EncoderDataJNI_getDirection (JNIEnv*, jclass, jint index) { return HALSIM_GetEncoderDirection(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_EncoderDataJNI + * Class: edu_wpi_first_hal_simulation_EncoderDataJNI * Method: setDirection * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_setDirection +Java_edu_wpi_first_hal_simulation_EncoderDataJNI_setDirection (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetEncoderDirection(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_EncoderDataJNI + * Class: edu_wpi_first_hal_simulation_EncoderDataJNI * Method: registerReverseDirectionCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_registerReverseDirectionCallback +Java_edu_wpi_first_hal_simulation_EncoderDataJNI_registerReverseDirectionCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -329,12 +329,12 @@ Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_registerReverseDirectionCallb } /* - * Class: edu_wpi_first_hal_sim_mockdata_EncoderDataJNI + * Class: edu_wpi_first_hal_simulation_EncoderDataJNI * Method: cancelReverseDirectionCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_cancelReverseDirectionCallback +Java_edu_wpi_first_hal_simulation_EncoderDataJNI_cancelReverseDirectionCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -342,36 +342,36 @@ Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_cancelReverseDirectionCallbac } /* - * Class: edu_wpi_first_hal_sim_mockdata_EncoderDataJNI + * Class: edu_wpi_first_hal_simulation_EncoderDataJNI * Method: getReverseDirection * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_getReverseDirection +Java_edu_wpi_first_hal_simulation_EncoderDataJNI_getReverseDirection (JNIEnv*, jclass, jint index) { return HALSIM_GetEncoderReverseDirection(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_EncoderDataJNI + * Class: edu_wpi_first_hal_simulation_EncoderDataJNI * Method: setReverseDirection * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_setReverseDirection +Java_edu_wpi_first_hal_simulation_EncoderDataJNI_setReverseDirection (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetEncoderReverseDirection(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_EncoderDataJNI + * Class: edu_wpi_first_hal_simulation_EncoderDataJNI * Method: registerSamplesToAverageCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_registerSamplesToAverageCallback +Java_edu_wpi_first_hal_simulation_EncoderDataJNI_registerSamplesToAverageCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -379,12 +379,12 @@ Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_registerSamplesToAverageCallb } /* - * Class: edu_wpi_first_hal_sim_mockdata_EncoderDataJNI + * Class: edu_wpi_first_hal_simulation_EncoderDataJNI * Method: cancelSamplesToAverageCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_cancelSamplesToAverageCallback +Java_edu_wpi_first_hal_simulation_EncoderDataJNI_cancelSamplesToAverageCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -392,84 +392,84 @@ Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_cancelSamplesToAverageCallbac } /* - * Class: edu_wpi_first_hal_sim_mockdata_EncoderDataJNI + * Class: edu_wpi_first_hal_simulation_EncoderDataJNI * Method: getSamplesToAverage * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_getSamplesToAverage +Java_edu_wpi_first_hal_simulation_EncoderDataJNI_getSamplesToAverage (JNIEnv*, jclass, jint index) { return HALSIM_GetEncoderSamplesToAverage(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_EncoderDataJNI + * Class: edu_wpi_first_hal_simulation_EncoderDataJNI * Method: setSamplesToAverage * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_setSamplesToAverage +Java_edu_wpi_first_hal_simulation_EncoderDataJNI_setSamplesToAverage (JNIEnv*, jclass, jint index, jint value) { HALSIM_SetEncoderSamplesToAverage(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_EncoderDataJNI + * Class: edu_wpi_first_hal_simulation_EncoderDataJNI * Method: setDistance * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_setDistance +Java_edu_wpi_first_hal_simulation_EncoderDataJNI_setDistance (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetEncoderDistance(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_EncoderDataJNI + * Class: edu_wpi_first_hal_simulation_EncoderDataJNI * Method: getDistance * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_getDistance +Java_edu_wpi_first_hal_simulation_EncoderDataJNI_getDistance (JNIEnv*, jclass, jint index) { return HALSIM_GetEncoderDistance(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_EncoderDataJNI + * Class: edu_wpi_first_hal_simulation_EncoderDataJNI * Method: setRate * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_setRate +Java_edu_wpi_first_hal_simulation_EncoderDataJNI_setRate (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetEncoderRate(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_EncoderDataJNI + * Class: edu_wpi_first_hal_simulation_EncoderDataJNI * Method: getRate * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_getRate +Java_edu_wpi_first_hal_simulation_EncoderDataJNI_getRate (JNIEnv*, jclass, jint index) { return HALSIM_GetEncoderRate(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_EncoderDataJNI + * Class: edu_wpi_first_hal_simulation_EncoderDataJNI * Method: resetData * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_EncoderDataJNI_resetData +Java_edu_wpi_first_hal_simulation_EncoderDataJNI_resetData (JNIEnv*, jclass, jint index) { HALSIM_ResetEncoderData(index); diff --git a/hal/src/main/native/sim/jni/I2CDataJNI.cpp b/hal/src/main/native/sim/jni/I2CDataJNI.cpp index d6a9b02746..e4c2259ad6 100644 --- a/hal/src/main/native/sim/jni/I2CDataJNI.cpp +++ b/hal/src/main/native/sim/jni/I2CDataJNI.cpp @@ -10,20 +10,20 @@ #include "BufferCallbackStore.h" #include "CallbackStore.h" #include "ConstBufferCallbackStore.h" -#include "edu_wpi_first_hal_sim_mockdata_I2CDataJNI.h" -#include "mockdata/I2CData.h" +#include "edu_wpi_first_hal_simulation_I2CDataJNI.h" +#include "hal/simulation/I2CData.h" using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_sim_mockdata_I2CDataJNI + * Class: edu_wpi_first_hal_simulation_I2CDataJNI * Method: registerInitializedCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_I2CDataJNI_registerInitializedCallback +Java_edu_wpi_first_hal_simulation_I2CDataJNI_registerInitializedCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -31,12 +31,12 @@ Java_edu_wpi_first_hal_sim_mockdata_I2CDataJNI_registerInitializedCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_I2CDataJNI + * Class: edu_wpi_first_hal_simulation_I2CDataJNI * Method: cancelInitializedCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_I2CDataJNI_cancelInitializedCallback +Java_edu_wpi_first_hal_simulation_I2CDataJNI_cancelInitializedCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -44,36 +44,36 @@ Java_edu_wpi_first_hal_sim_mockdata_I2CDataJNI_cancelInitializedCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_I2CDataJNI + * Class: edu_wpi_first_hal_simulation_I2CDataJNI * Method: getInitialized * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_I2CDataJNI_getInitialized +Java_edu_wpi_first_hal_simulation_I2CDataJNI_getInitialized (JNIEnv*, jclass, jint index) { return HALSIM_GetI2CInitialized(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_I2CDataJNI + * Class: edu_wpi_first_hal_simulation_I2CDataJNI * Method: setInitialized * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_I2CDataJNI_setInitialized +Java_edu_wpi_first_hal_simulation_I2CDataJNI_setInitialized (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetI2CInitialized(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_I2CDataJNI + * Class: edu_wpi_first_hal_simulation_I2CDataJNI * Method: registerReadCallback * Signature: (ILjava/lang/Object;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_I2CDataJNI_registerReadCallback +Java_edu_wpi_first_hal_simulation_I2CDataJNI_registerReadCallback (JNIEnv* env, jclass, jint index, jobject callback) { return sim::AllocateBufferCallback(env, index, callback, @@ -81,24 +81,24 @@ Java_edu_wpi_first_hal_sim_mockdata_I2CDataJNI_registerReadCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_I2CDataJNI + * Class: edu_wpi_first_hal_simulation_I2CDataJNI * Method: cancelReadCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_I2CDataJNI_cancelReadCallback +Java_edu_wpi_first_hal_simulation_I2CDataJNI_cancelReadCallback (JNIEnv* env, jclass, jint index, jint handle) { sim::FreeBufferCallback(env, handle, index, &HALSIM_CancelI2CReadCallback); } /* - * Class: edu_wpi_first_hal_sim_mockdata_I2CDataJNI + * Class: edu_wpi_first_hal_simulation_I2CDataJNI * Method: registerWriteCallback * Signature: (ILjava/lang/Object;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_I2CDataJNI_registerWriteCallback +Java_edu_wpi_first_hal_simulation_I2CDataJNI_registerWriteCallback (JNIEnv* env, jclass, jint index, jobject callback) { return sim::AllocateConstBufferCallback(env, index, callback, @@ -106,12 +106,12 @@ Java_edu_wpi_first_hal_sim_mockdata_I2CDataJNI_registerWriteCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_I2CDataJNI + * Class: edu_wpi_first_hal_simulation_I2CDataJNI * Method: cancelWriteCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_I2CDataJNI_cancelWriteCallback +Java_edu_wpi_first_hal_simulation_I2CDataJNI_cancelWriteCallback (JNIEnv* env, jclass, jint index, jint handle) { sim::FreeConstBufferCallback(env, handle, index, @@ -119,12 +119,12 @@ Java_edu_wpi_first_hal_sim_mockdata_I2CDataJNI_cancelWriteCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_I2CDataJNI + * Class: edu_wpi_first_hal_simulation_I2CDataJNI * Method: resetData * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_I2CDataJNI_resetData +Java_edu_wpi_first_hal_simulation_I2CDataJNI_resetData (JNIEnv*, jclass, jint index) { HALSIM_ResetI2CData(index); diff --git a/hal/src/main/native/sim/jni/NotifierDataJNI.cpp b/hal/src/main/native/sim/jni/NotifierDataJNI.cpp index b59b6e0741..845c1643ba 100644 --- a/hal/src/main/native/sim/jni/NotifierDataJNI.cpp +++ b/hal/src/main/native/sim/jni/NotifierDataJNI.cpp @@ -1,34 +1,34 @@ /*----------------------------------------------------------------------------*/ -/* 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 "edu_wpi_first_hal_sim_mockdata_NotifierDataJNI.h" -#include "mockdata/NotifierData.h" +#include "edu_wpi_first_hal_simulation_NotifierDataJNI.h" +#include "hal/simulation/NotifierData.h" extern "C" { /* - * Class: edu_wpi_first_hal_sim_mockdata_NotifierDataJNI + * Class: edu_wpi_first_hal_simulation_NotifierDataJNI * Method: getNextTimeout * Signature: ()J */ JNIEXPORT jlong JNICALL -Java_edu_wpi_first_hal_sim_mockdata_NotifierDataJNI_getNextTimeout +Java_edu_wpi_first_hal_simulation_NotifierDataJNI_getNextTimeout (JNIEnv*, jclass) { return HALSIM_GetNextNotifierTimeout(); } /* - * Class: edu_wpi_first_hal_sim_mockdata_NotifierDataJNI + * Class: edu_wpi_first_hal_simulation_NotifierDataJNI * Method: getNumNotifiers * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_NotifierDataJNI_getNumNotifiers +Java_edu_wpi_first_hal_simulation_NotifierDataJNI_getNumNotifiers (JNIEnv*, jclass) { return HALSIM_GetNumNotifiers(); diff --git a/hal/src/main/native/sim/jni/PCMDataJNI.cpp b/hal/src/main/native/sim/jni/PCMDataJNI.cpp index 62d75883f5..cfcd2c04a5 100644 --- a/hal/src/main/native/sim/jni/PCMDataJNI.cpp +++ b/hal/src/main/native/sim/jni/PCMDataJNI.cpp @@ -8,20 +8,20 @@ #include #include "CallbackStore.h" -#include "edu_wpi_first_hal_sim_mockdata_PCMDataJNI.h" -#include "mockdata/PCMData.h" +#include "edu_wpi_first_hal_simulation_PCMDataJNI.h" +#include "hal/simulation/PCMData.h" using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_sim_mockdata_PCMDataJNI + * Class: edu_wpi_first_hal_simulation_PCMDataJNI * Method: registerSolenoidInitializedCallback * Signature: (IILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_registerSolenoidInitializedCallback +Java_edu_wpi_first_hal_simulation_PCMDataJNI_registerSolenoidInitializedCallback (JNIEnv* env, jclass, jint index, jint channel, jobject callback, jboolean initialNotify) { @@ -31,12 +31,12 @@ Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_registerSolenoidInitializedCallba } /* - * Class: edu_wpi_first_hal_sim_mockdata_PCMDataJNI + * Class: edu_wpi_first_hal_simulation_PCMDataJNI * Method: cancelSolenoidInitializedCallback * Signature: (III)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_cancelSolenoidInitializedCallback +Java_edu_wpi_first_hal_simulation_PCMDataJNI_cancelSolenoidInitializedCallback (JNIEnv* env, jclass, jint index, jint channel, jint handle) { return sim::FreeChannelCallback(env, handle, index, channel, @@ -44,36 +44,36 @@ Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_cancelSolenoidInitializedCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_PCMDataJNI + * Class: edu_wpi_first_hal_simulation_PCMDataJNI * Method: getSolenoidInitialized * Signature: (II)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_getSolenoidInitialized +Java_edu_wpi_first_hal_simulation_PCMDataJNI_getSolenoidInitialized (JNIEnv*, jclass, jint index, jint channel) { return HALSIM_GetPCMSolenoidInitialized(index, channel); } /* - * Class: edu_wpi_first_hal_sim_mockdata_PCMDataJNI + * Class: edu_wpi_first_hal_simulation_PCMDataJNI * Method: setSolenoidInitialized * Signature: (IIZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_setSolenoidInitialized +Java_edu_wpi_first_hal_simulation_PCMDataJNI_setSolenoidInitialized (JNIEnv*, jclass, jint index, jint channel, jboolean value) { HALSIM_SetPCMSolenoidInitialized(index, channel, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_PCMDataJNI + * Class: edu_wpi_first_hal_simulation_PCMDataJNI * Method: registerSolenoidOutputCallback * Signature: (IILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_registerSolenoidOutputCallback +Java_edu_wpi_first_hal_simulation_PCMDataJNI_registerSolenoidOutputCallback (JNIEnv* env, jclass, jint index, jint channel, jobject callback, jboolean initialNotify) { @@ -83,12 +83,12 @@ Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_registerSolenoidOutputCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_PCMDataJNI + * Class: edu_wpi_first_hal_simulation_PCMDataJNI * Method: cancelSolenoidOutputCallback * Signature: (III)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_cancelSolenoidOutputCallback +Java_edu_wpi_first_hal_simulation_PCMDataJNI_cancelSolenoidOutputCallback (JNIEnv* env, jclass, jint index, jint channel, jint handle) { return sim::FreeChannelCallback(env, handle, index, channel, @@ -96,36 +96,36 @@ Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_cancelSolenoidOutputCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_PCMDataJNI + * Class: edu_wpi_first_hal_simulation_PCMDataJNI * Method: getSolenoidOutput * Signature: (II)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_getSolenoidOutput +Java_edu_wpi_first_hal_simulation_PCMDataJNI_getSolenoidOutput (JNIEnv*, jclass, jint index, jint channel) { return HALSIM_GetPCMSolenoidOutput(index, channel); } /* - * Class: edu_wpi_first_hal_sim_mockdata_PCMDataJNI + * Class: edu_wpi_first_hal_simulation_PCMDataJNI * Method: setSolenoidOutput * Signature: (IIZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_setSolenoidOutput +Java_edu_wpi_first_hal_simulation_PCMDataJNI_setSolenoidOutput (JNIEnv*, jclass, jint index, jint channel, jboolean value) { HALSIM_SetPCMSolenoidOutput(index, channel, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_PCMDataJNI + * Class: edu_wpi_first_hal_simulation_PCMDataJNI * Method: registerCompressorInitializedCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_registerCompressorInitializedCallback +Java_edu_wpi_first_hal_simulation_PCMDataJNI_registerCompressorInitializedCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback( @@ -134,12 +134,12 @@ Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_registerCompressorInitializedCall } /* - * Class: edu_wpi_first_hal_sim_mockdata_PCMDataJNI + * Class: edu_wpi_first_hal_simulation_PCMDataJNI * Method: cancelCompressorInitializedCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_cancelCompressorInitializedCallback +Java_edu_wpi_first_hal_simulation_PCMDataJNI_cancelCompressorInitializedCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -147,36 +147,36 @@ Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_cancelCompressorInitializedCallba } /* - * Class: edu_wpi_first_hal_sim_mockdata_PCMDataJNI + * Class: edu_wpi_first_hal_simulation_PCMDataJNI * Method: getCompressorInitialized * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_getCompressorInitialized +Java_edu_wpi_first_hal_simulation_PCMDataJNI_getCompressorInitialized (JNIEnv*, jclass, jint index) { return HALSIM_GetPCMCompressorInitialized(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_PCMDataJNI + * Class: edu_wpi_first_hal_simulation_PCMDataJNI * Method: setCompressorInitialized * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_setCompressorInitialized +Java_edu_wpi_first_hal_simulation_PCMDataJNI_setCompressorInitialized (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetPCMCompressorInitialized(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_PCMDataJNI + * Class: edu_wpi_first_hal_simulation_PCMDataJNI * Method: registerCompressorOnCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_registerCompressorOnCallback +Java_edu_wpi_first_hal_simulation_PCMDataJNI_registerCompressorOnCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -184,12 +184,12 @@ Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_registerCompressorOnCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_PCMDataJNI + * Class: edu_wpi_first_hal_simulation_PCMDataJNI * Method: cancelCompressorOnCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_cancelCompressorOnCallback +Java_edu_wpi_first_hal_simulation_PCMDataJNI_cancelCompressorOnCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -197,36 +197,36 @@ Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_cancelCompressorOnCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_PCMDataJNI + * Class: edu_wpi_first_hal_simulation_PCMDataJNI * Method: getCompressorOn * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_getCompressorOn +Java_edu_wpi_first_hal_simulation_PCMDataJNI_getCompressorOn (JNIEnv*, jclass, jint index) { return HALSIM_GetPCMCompressorOn(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_PCMDataJNI + * Class: edu_wpi_first_hal_simulation_PCMDataJNI * Method: setCompressorOn * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_setCompressorOn +Java_edu_wpi_first_hal_simulation_PCMDataJNI_setCompressorOn (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetPCMCompressorOn(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_PCMDataJNI + * Class: edu_wpi_first_hal_simulation_PCMDataJNI * Method: registerClosedLoopEnabledCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_registerClosedLoopEnabledCallback +Java_edu_wpi_first_hal_simulation_PCMDataJNI_registerClosedLoopEnabledCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -234,12 +234,12 @@ Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_registerClosedLoopEnabledCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_PCMDataJNI + * Class: edu_wpi_first_hal_simulation_PCMDataJNI * Method: cancelClosedLoopEnabledCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_cancelClosedLoopEnabledCallback +Java_edu_wpi_first_hal_simulation_PCMDataJNI_cancelClosedLoopEnabledCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -247,36 +247,36 @@ Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_cancelClosedLoopEnabledCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_PCMDataJNI + * Class: edu_wpi_first_hal_simulation_PCMDataJNI * Method: getClosedLoopEnabled * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_getClosedLoopEnabled +Java_edu_wpi_first_hal_simulation_PCMDataJNI_getClosedLoopEnabled (JNIEnv*, jclass, jint index) { return HALSIM_GetPCMClosedLoopEnabled(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_PCMDataJNI + * Class: edu_wpi_first_hal_simulation_PCMDataJNI * Method: setClosedLoopEnabled * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_setClosedLoopEnabled +Java_edu_wpi_first_hal_simulation_PCMDataJNI_setClosedLoopEnabled (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetPCMClosedLoopEnabled(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_PCMDataJNI + * Class: edu_wpi_first_hal_simulation_PCMDataJNI * Method: registerPressureSwitchCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_registerPressureSwitchCallback +Java_edu_wpi_first_hal_simulation_PCMDataJNI_registerPressureSwitchCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -284,12 +284,12 @@ Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_registerPressureSwitchCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_PCMDataJNI + * Class: edu_wpi_first_hal_simulation_PCMDataJNI * Method: cancelPressureSwitchCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_cancelPressureSwitchCallback +Java_edu_wpi_first_hal_simulation_PCMDataJNI_cancelPressureSwitchCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -297,36 +297,36 @@ Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_cancelPressureSwitchCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_PCMDataJNI + * Class: edu_wpi_first_hal_simulation_PCMDataJNI * Method: getPressureSwitch * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_getPressureSwitch +Java_edu_wpi_first_hal_simulation_PCMDataJNI_getPressureSwitch (JNIEnv*, jclass, jint index) { return HALSIM_GetPCMPressureSwitch(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_PCMDataJNI + * Class: edu_wpi_first_hal_simulation_PCMDataJNI * Method: setPressureSwitch * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_setPressureSwitch +Java_edu_wpi_first_hal_simulation_PCMDataJNI_setPressureSwitch (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetPCMPressureSwitch(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_PCMDataJNI + * Class: edu_wpi_first_hal_simulation_PCMDataJNI * Method: registerCompressorCurrentCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_registerCompressorCurrentCallback +Java_edu_wpi_first_hal_simulation_PCMDataJNI_registerCompressorCurrentCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -334,12 +334,12 @@ Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_registerCompressorCurrentCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_PCMDataJNI + * Class: edu_wpi_first_hal_simulation_PCMDataJNI * Method: cancelCompressorCurrentCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_cancelCompressorCurrentCallback +Java_edu_wpi_first_hal_simulation_PCMDataJNI_cancelCompressorCurrentCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -347,36 +347,36 @@ Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_cancelCompressorCurrentCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_PCMDataJNI + * Class: edu_wpi_first_hal_simulation_PCMDataJNI * Method: getCompressorCurrent * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_getCompressorCurrent +Java_edu_wpi_first_hal_simulation_PCMDataJNI_getCompressorCurrent (JNIEnv*, jclass, jint index) { return HALSIM_GetPCMCompressorCurrent(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_PCMDataJNI + * Class: edu_wpi_first_hal_simulation_PCMDataJNI * Method: setCompressorCurrent * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_setCompressorCurrent +Java_edu_wpi_first_hal_simulation_PCMDataJNI_setCompressorCurrent (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetPCMCompressorCurrent(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_PCMDataJNI + * Class: edu_wpi_first_hal_simulation_PCMDataJNI * Method: registerAllNonSolenoidCallbacks * Signature: (ILjava/lang/Object;Z)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_registerAllNonSolenoidCallbacks +Java_edu_wpi_first_hal_simulation_PCMDataJNI_registerAllNonSolenoidCallbacks (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { sim::AllocateCallback( @@ -388,12 +388,12 @@ Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_registerAllNonSolenoidCallbacks } /* - * Class: edu_wpi_first_hal_sim_mockdata_PCMDataJNI + * Class: edu_wpi_first_hal_simulation_PCMDataJNI * Method: registerAllSolenoidCallbacks * Signature: (IILjava/lang/Object;Z)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_registerAllSolenoidCallbacks +Java_edu_wpi_first_hal_simulation_PCMDataJNI_registerAllSolenoidCallbacks (JNIEnv* env, jclass, jint index, jint channel, jobject callback, jboolean initialNotify) { @@ -407,12 +407,12 @@ Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_registerAllSolenoidCallbacks } /* - * Class: edu_wpi_first_hal_sim_mockdata_PCMDataJNI + * Class: edu_wpi_first_hal_simulation_PCMDataJNI * Method: resetData * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_resetData +Java_edu_wpi_first_hal_simulation_PCMDataJNI_resetData (JNIEnv*, jclass, jint index) { HALSIM_ResetPCMData(index); diff --git a/hal/src/main/native/sim/jni/PDPDataJNI.cpp b/hal/src/main/native/sim/jni/PDPDataJNI.cpp index 14022100cc..2ce6cbd1f3 100644 --- a/hal/src/main/native/sim/jni/PDPDataJNI.cpp +++ b/hal/src/main/native/sim/jni/PDPDataJNI.cpp @@ -8,20 +8,20 @@ #include #include "CallbackStore.h" -#include "edu_wpi_first_hal_sim_mockdata_PDPDataJNI.h" -#include "mockdata/PDPData.h" +#include "edu_wpi_first_hal_simulation_PDPDataJNI.h" +#include "hal/simulation/PDPData.h" using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_sim_mockdata_PDPDataJNI + * Class: edu_wpi_first_hal_simulation_PDPDataJNI * Method: registerInitializedCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PDPDataJNI_registerInitializedCallback +Java_edu_wpi_first_hal_simulation_PDPDataJNI_registerInitializedCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -29,12 +29,12 @@ Java_edu_wpi_first_hal_sim_mockdata_PDPDataJNI_registerInitializedCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_PDPDataJNI + * Class: edu_wpi_first_hal_simulation_PDPDataJNI * Method: cancelInitializedCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PDPDataJNI_cancelInitializedCallback +Java_edu_wpi_first_hal_simulation_PDPDataJNI_cancelInitializedCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -42,36 +42,36 @@ Java_edu_wpi_first_hal_sim_mockdata_PDPDataJNI_cancelInitializedCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_PDPDataJNI + * Class: edu_wpi_first_hal_simulation_PDPDataJNI * Method: getInitialized * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PDPDataJNI_getInitialized +Java_edu_wpi_first_hal_simulation_PDPDataJNI_getInitialized (JNIEnv*, jclass, jint index) { return HALSIM_GetPDPInitialized(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_PDPDataJNI + * Class: edu_wpi_first_hal_simulation_PDPDataJNI * Method: setInitialized * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PDPDataJNI_setInitialized +Java_edu_wpi_first_hal_simulation_PDPDataJNI_setInitialized (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetPDPInitialized(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_PDPDataJNI + * Class: edu_wpi_first_hal_simulation_PDPDataJNI * Method: registerTemperatureCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PDPDataJNI_registerTemperatureCallback +Java_edu_wpi_first_hal_simulation_PDPDataJNI_registerTemperatureCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -79,12 +79,12 @@ Java_edu_wpi_first_hal_sim_mockdata_PDPDataJNI_registerTemperatureCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_PDPDataJNI + * Class: edu_wpi_first_hal_simulation_PDPDataJNI * Method: cancelTemperatureCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PDPDataJNI_cancelTemperatureCallback +Java_edu_wpi_first_hal_simulation_PDPDataJNI_cancelTemperatureCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -92,36 +92,36 @@ Java_edu_wpi_first_hal_sim_mockdata_PDPDataJNI_cancelTemperatureCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_PDPDataJNI + * Class: edu_wpi_first_hal_simulation_PDPDataJNI * Method: getTemperature * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PDPDataJNI_getTemperature +Java_edu_wpi_first_hal_simulation_PDPDataJNI_getTemperature (JNIEnv*, jclass, jint index) { return HALSIM_GetPDPTemperature(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_PDPDataJNI + * Class: edu_wpi_first_hal_simulation_PDPDataJNI * Method: setTemperature * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PDPDataJNI_setTemperature +Java_edu_wpi_first_hal_simulation_PDPDataJNI_setTemperature (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetPDPTemperature(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_PDPDataJNI + * Class: edu_wpi_first_hal_simulation_PDPDataJNI * Method: registerVoltageCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PDPDataJNI_registerVoltageCallback +Java_edu_wpi_first_hal_simulation_PDPDataJNI_registerVoltageCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -129,12 +129,12 @@ Java_edu_wpi_first_hal_sim_mockdata_PDPDataJNI_registerVoltageCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_PDPDataJNI + * Class: edu_wpi_first_hal_simulation_PDPDataJNI * Method: cancelVoltageCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PDPDataJNI_cancelVoltageCallback +Java_edu_wpi_first_hal_simulation_PDPDataJNI_cancelVoltageCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -142,36 +142,36 @@ Java_edu_wpi_first_hal_sim_mockdata_PDPDataJNI_cancelVoltageCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_PDPDataJNI + * Class: edu_wpi_first_hal_simulation_PDPDataJNI * Method: getVoltage * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PDPDataJNI_getVoltage +Java_edu_wpi_first_hal_simulation_PDPDataJNI_getVoltage (JNIEnv*, jclass, jint index) { return HALSIM_GetPDPVoltage(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_PDPDataJNI + * Class: edu_wpi_first_hal_simulation_PDPDataJNI * Method: setVoltage * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PDPDataJNI_setVoltage +Java_edu_wpi_first_hal_simulation_PDPDataJNI_setVoltage (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetPDPVoltage(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_PDPDataJNI + * Class: edu_wpi_first_hal_simulation_PDPDataJNI * Method: registerCurrentCallback * Signature: (IILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PDPDataJNI_registerCurrentCallback +Java_edu_wpi_first_hal_simulation_PDPDataJNI_registerCurrentCallback (JNIEnv* env, jclass, jint index, jint channel, jobject callback, jboolean initialNotify) { @@ -181,12 +181,12 @@ Java_edu_wpi_first_hal_sim_mockdata_PDPDataJNI_registerCurrentCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_PDPDataJNI + * Class: edu_wpi_first_hal_simulation_PDPDataJNI * Method: cancelCurrentCallback * Signature: (III)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PDPDataJNI_cancelCurrentCallback +Java_edu_wpi_first_hal_simulation_PDPDataJNI_cancelCurrentCallback (JNIEnv* env, jclass, jint index, jint channel, jint handle) { return sim::FreeChannelCallback(env, handle, index, channel, @@ -194,36 +194,36 @@ Java_edu_wpi_first_hal_sim_mockdata_PDPDataJNI_cancelCurrentCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_PDPDataJNI + * Class: edu_wpi_first_hal_simulation_PDPDataJNI * Method: getCurrent * Signature: (II)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PDPDataJNI_getCurrent +Java_edu_wpi_first_hal_simulation_PDPDataJNI_getCurrent (JNIEnv*, jclass, jint index, jint channel) { return HALSIM_GetPDPCurrent(index, channel); } /* - * Class: edu_wpi_first_hal_sim_mockdata_PDPDataJNI + * Class: edu_wpi_first_hal_simulation_PDPDataJNI * Method: setCurrent * Signature: (IID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PDPDataJNI_setCurrent +Java_edu_wpi_first_hal_simulation_PDPDataJNI_setCurrent (JNIEnv*, jclass, jint index, jint channel, jdouble value) { HALSIM_SetPDPCurrent(index, channel, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_PDPDataJNI + * Class: edu_wpi_first_hal_simulation_PDPDataJNI * Method: resetData * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PDPDataJNI_resetData +Java_edu_wpi_first_hal_simulation_PDPDataJNI_resetData (JNIEnv*, jclass, jint index) { HALSIM_ResetPDPData(index); diff --git a/hal/src/main/native/sim/jni/PWMDataJNI.cpp b/hal/src/main/native/sim/jni/PWMDataJNI.cpp index 075c3b8726..03e61ef1aa 100644 --- a/hal/src/main/native/sim/jni/PWMDataJNI.cpp +++ b/hal/src/main/native/sim/jni/PWMDataJNI.cpp @@ -8,20 +8,20 @@ #include #include "CallbackStore.h" -#include "edu_wpi_first_hal_sim_mockdata_PWMDataJNI.h" -#include "mockdata/PWMData.h" +#include "edu_wpi_first_hal_simulation_PWMDataJNI.h" +#include "hal/simulation/PWMData.h" using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_sim_mockdata_PWMDataJNI + * Class: edu_wpi_first_hal_simulation_PWMDataJNI * Method: registerInitializedCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PWMDataJNI_registerInitializedCallback +Java_edu_wpi_first_hal_simulation_PWMDataJNI_registerInitializedCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -29,12 +29,12 @@ Java_edu_wpi_first_hal_sim_mockdata_PWMDataJNI_registerInitializedCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_PWMDataJNI + * Class: edu_wpi_first_hal_simulation_PWMDataJNI * Method: cancelInitializedCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PWMDataJNI_cancelInitializedCallback +Java_edu_wpi_first_hal_simulation_PWMDataJNI_cancelInitializedCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -42,36 +42,36 @@ Java_edu_wpi_first_hal_sim_mockdata_PWMDataJNI_cancelInitializedCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_PWMDataJNI + * Class: edu_wpi_first_hal_simulation_PWMDataJNI * Method: getInitialized * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PWMDataJNI_getInitialized +Java_edu_wpi_first_hal_simulation_PWMDataJNI_getInitialized (JNIEnv*, jclass, jint index) { return HALSIM_GetPWMInitialized(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_PWMDataJNI + * Class: edu_wpi_first_hal_simulation_PWMDataJNI * Method: setInitialized * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PWMDataJNI_setInitialized +Java_edu_wpi_first_hal_simulation_PWMDataJNI_setInitialized (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetPWMInitialized(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_PWMDataJNI + * Class: edu_wpi_first_hal_simulation_PWMDataJNI * Method: registerRawValueCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PWMDataJNI_registerRawValueCallback +Java_edu_wpi_first_hal_simulation_PWMDataJNI_registerRawValueCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -79,12 +79,12 @@ Java_edu_wpi_first_hal_sim_mockdata_PWMDataJNI_registerRawValueCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_PWMDataJNI + * Class: edu_wpi_first_hal_simulation_PWMDataJNI * Method: cancelRawValueCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PWMDataJNI_cancelRawValueCallback +Java_edu_wpi_first_hal_simulation_PWMDataJNI_cancelRawValueCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -92,36 +92,36 @@ Java_edu_wpi_first_hal_sim_mockdata_PWMDataJNI_cancelRawValueCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_PWMDataJNI + * Class: edu_wpi_first_hal_simulation_PWMDataJNI * Method: getRawValue * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PWMDataJNI_getRawValue +Java_edu_wpi_first_hal_simulation_PWMDataJNI_getRawValue (JNIEnv*, jclass, jint index) { return HALSIM_GetPWMRawValue(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_PWMDataJNI + * Class: edu_wpi_first_hal_simulation_PWMDataJNI * Method: setRawValue * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PWMDataJNI_setRawValue +Java_edu_wpi_first_hal_simulation_PWMDataJNI_setRawValue (JNIEnv*, jclass, jint index, jint value) { HALSIM_SetPWMRawValue(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_PWMDataJNI + * Class: edu_wpi_first_hal_simulation_PWMDataJNI * Method: registerSpeedCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PWMDataJNI_registerSpeedCallback +Java_edu_wpi_first_hal_simulation_PWMDataJNI_registerSpeedCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -129,48 +129,48 @@ Java_edu_wpi_first_hal_sim_mockdata_PWMDataJNI_registerSpeedCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_PWMDataJNI + * Class: edu_wpi_first_hal_simulation_PWMDataJNI * Method: cancelSpeedCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PWMDataJNI_cancelSpeedCallback +Java_edu_wpi_first_hal_simulation_PWMDataJNI_cancelSpeedCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, &HALSIM_CancelPWMSpeedCallback); } /* - * Class: edu_wpi_first_hal_sim_mockdata_PWMDataJNI + * Class: edu_wpi_first_hal_simulation_PWMDataJNI * Method: getSpeed * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PWMDataJNI_getSpeed +Java_edu_wpi_first_hal_simulation_PWMDataJNI_getSpeed (JNIEnv*, jclass, jint index) { return HALSIM_GetPWMSpeed(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_PWMDataJNI + * Class: edu_wpi_first_hal_simulation_PWMDataJNI * Method: setSpeed * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PWMDataJNI_setSpeed +Java_edu_wpi_first_hal_simulation_PWMDataJNI_setSpeed (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetPWMSpeed(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_PWMDataJNI + * Class: edu_wpi_first_hal_simulation_PWMDataJNI * Method: registerPositionCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PWMDataJNI_registerPositionCallback +Java_edu_wpi_first_hal_simulation_PWMDataJNI_registerPositionCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -178,12 +178,12 @@ Java_edu_wpi_first_hal_sim_mockdata_PWMDataJNI_registerPositionCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_PWMDataJNI + * Class: edu_wpi_first_hal_simulation_PWMDataJNI * Method: cancelPositionCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PWMDataJNI_cancelPositionCallback +Java_edu_wpi_first_hal_simulation_PWMDataJNI_cancelPositionCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -191,36 +191,36 @@ Java_edu_wpi_first_hal_sim_mockdata_PWMDataJNI_cancelPositionCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_PWMDataJNI + * Class: edu_wpi_first_hal_simulation_PWMDataJNI * Method: getPosition * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PWMDataJNI_getPosition +Java_edu_wpi_first_hal_simulation_PWMDataJNI_getPosition (JNIEnv*, jclass, jint index) { return HALSIM_GetPWMPosition(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_PWMDataJNI + * Class: edu_wpi_first_hal_simulation_PWMDataJNI * Method: setPosition * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PWMDataJNI_setPosition +Java_edu_wpi_first_hal_simulation_PWMDataJNI_setPosition (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetPWMPosition(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_PWMDataJNI + * Class: edu_wpi_first_hal_simulation_PWMDataJNI * Method: registerPeriodScaleCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PWMDataJNI_registerPeriodScaleCallback +Java_edu_wpi_first_hal_simulation_PWMDataJNI_registerPeriodScaleCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -228,12 +228,12 @@ Java_edu_wpi_first_hal_sim_mockdata_PWMDataJNI_registerPeriodScaleCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_PWMDataJNI + * Class: edu_wpi_first_hal_simulation_PWMDataJNI * Method: cancelPeriodScaleCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PWMDataJNI_cancelPeriodScaleCallback +Java_edu_wpi_first_hal_simulation_PWMDataJNI_cancelPeriodScaleCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -241,36 +241,36 @@ Java_edu_wpi_first_hal_sim_mockdata_PWMDataJNI_cancelPeriodScaleCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_PWMDataJNI + * Class: edu_wpi_first_hal_simulation_PWMDataJNI * Method: getPeriodScale * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PWMDataJNI_getPeriodScale +Java_edu_wpi_first_hal_simulation_PWMDataJNI_getPeriodScale (JNIEnv*, jclass, jint index) { return HALSIM_GetPWMPeriodScale(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_PWMDataJNI + * Class: edu_wpi_first_hal_simulation_PWMDataJNI * Method: setPeriodScale * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PWMDataJNI_setPeriodScale +Java_edu_wpi_first_hal_simulation_PWMDataJNI_setPeriodScale (JNIEnv*, jclass, jint index, jint value) { HALSIM_SetPWMPeriodScale(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_PWMDataJNI + * Class: edu_wpi_first_hal_simulation_PWMDataJNI * Method: registerZeroLatchCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PWMDataJNI_registerZeroLatchCallback +Java_edu_wpi_first_hal_simulation_PWMDataJNI_registerZeroLatchCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -278,12 +278,12 @@ Java_edu_wpi_first_hal_sim_mockdata_PWMDataJNI_registerZeroLatchCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_PWMDataJNI + * Class: edu_wpi_first_hal_simulation_PWMDataJNI * Method: cancelZeroLatchCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PWMDataJNI_cancelZeroLatchCallback +Java_edu_wpi_first_hal_simulation_PWMDataJNI_cancelZeroLatchCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -291,36 +291,36 @@ Java_edu_wpi_first_hal_sim_mockdata_PWMDataJNI_cancelZeroLatchCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_PWMDataJNI + * Class: edu_wpi_first_hal_simulation_PWMDataJNI * Method: getZeroLatch * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PWMDataJNI_getZeroLatch +Java_edu_wpi_first_hal_simulation_PWMDataJNI_getZeroLatch (JNIEnv*, jclass, jint index) { return HALSIM_GetPWMZeroLatch(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_PWMDataJNI + * Class: edu_wpi_first_hal_simulation_PWMDataJNI * Method: setZeroLatch * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PWMDataJNI_setZeroLatch +Java_edu_wpi_first_hal_simulation_PWMDataJNI_setZeroLatch (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetPWMZeroLatch(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_PWMDataJNI + * Class: edu_wpi_first_hal_simulation_PWMDataJNI * Method: resetData * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_PWMDataJNI_resetData +Java_edu_wpi_first_hal_simulation_PWMDataJNI_resetData (JNIEnv*, jclass, jint index) { HALSIM_ResetPWMData(index); diff --git a/hal/src/main/native/sim/jni/RelayDataJNI.cpp b/hal/src/main/native/sim/jni/RelayDataJNI.cpp index 416c702cc2..7abe7cbb13 100644 --- a/hal/src/main/native/sim/jni/RelayDataJNI.cpp +++ b/hal/src/main/native/sim/jni/RelayDataJNI.cpp @@ -8,20 +8,20 @@ #include #include "CallbackStore.h" -#include "edu_wpi_first_hal_sim_mockdata_RelayDataJNI.h" -#include "mockdata/RelayData.h" +#include "edu_wpi_first_hal_simulation_RelayDataJNI.h" +#include "hal/simulation/RelayData.h" using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_sim_mockdata_RelayDataJNI + * Class: edu_wpi_first_hal_simulation_RelayDataJNI * Method: registerInitializedForwardCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RelayDataJNI_registerInitializedForwardCallback +Java_edu_wpi_first_hal_simulation_RelayDataJNI_registerInitializedForwardCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -29,12 +29,12 @@ Java_edu_wpi_first_hal_sim_mockdata_RelayDataJNI_registerInitializedForwardCallb } /* - * Class: edu_wpi_first_hal_sim_mockdata_RelayDataJNI + * Class: edu_wpi_first_hal_simulation_RelayDataJNI * Method: cancelInitializedForwardCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RelayDataJNI_cancelInitializedForwardCallback +Java_edu_wpi_first_hal_simulation_RelayDataJNI_cancelInitializedForwardCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -42,36 +42,36 @@ Java_edu_wpi_first_hal_sim_mockdata_RelayDataJNI_cancelInitializedForwardCallbac } /* - * Class: edu_wpi_first_hal_sim_mockdata_RelayDataJNI + * Class: edu_wpi_first_hal_simulation_RelayDataJNI * Method: getInitializedForward * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RelayDataJNI_getInitializedForward +Java_edu_wpi_first_hal_simulation_RelayDataJNI_getInitializedForward (JNIEnv*, jclass, jint index) { return HALSIM_GetRelayInitializedForward(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_RelayDataJNI + * Class: edu_wpi_first_hal_simulation_RelayDataJNI * Method: setInitializedForward * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RelayDataJNI_setInitializedForward +Java_edu_wpi_first_hal_simulation_RelayDataJNI_setInitializedForward (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetRelayInitializedForward(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_RelayDataJNI + * Class: edu_wpi_first_hal_simulation_RelayDataJNI * Method: registerInitializedReverseCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RelayDataJNI_registerInitializedReverseCallback +Java_edu_wpi_first_hal_simulation_RelayDataJNI_registerInitializedReverseCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -79,12 +79,12 @@ Java_edu_wpi_first_hal_sim_mockdata_RelayDataJNI_registerInitializedReverseCallb } /* - * Class: edu_wpi_first_hal_sim_mockdata_RelayDataJNI + * Class: edu_wpi_first_hal_simulation_RelayDataJNI * Method: cancelInitializedReverseCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RelayDataJNI_cancelInitializedReverseCallback +Java_edu_wpi_first_hal_simulation_RelayDataJNI_cancelInitializedReverseCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -92,36 +92,36 @@ Java_edu_wpi_first_hal_sim_mockdata_RelayDataJNI_cancelInitializedReverseCallbac } /* - * Class: edu_wpi_first_hal_sim_mockdata_RelayDataJNI + * Class: edu_wpi_first_hal_simulation_RelayDataJNI * Method: getInitializedReverse * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RelayDataJNI_getInitializedReverse +Java_edu_wpi_first_hal_simulation_RelayDataJNI_getInitializedReverse (JNIEnv*, jclass, jint index) { return HALSIM_GetRelayInitializedReverse(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_RelayDataJNI + * Class: edu_wpi_first_hal_simulation_RelayDataJNI * Method: setInitializedReverse * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RelayDataJNI_setInitializedReverse +Java_edu_wpi_first_hal_simulation_RelayDataJNI_setInitializedReverse (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetRelayInitializedReverse(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_RelayDataJNI + * Class: edu_wpi_first_hal_simulation_RelayDataJNI * Method: registerForwardCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RelayDataJNI_registerForwardCallback +Java_edu_wpi_first_hal_simulation_RelayDataJNI_registerForwardCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -129,12 +129,12 @@ Java_edu_wpi_first_hal_sim_mockdata_RelayDataJNI_registerForwardCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_RelayDataJNI + * Class: edu_wpi_first_hal_simulation_RelayDataJNI * Method: cancelForwardCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RelayDataJNI_cancelForwardCallback +Java_edu_wpi_first_hal_simulation_RelayDataJNI_cancelForwardCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -142,36 +142,36 @@ Java_edu_wpi_first_hal_sim_mockdata_RelayDataJNI_cancelForwardCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_RelayDataJNI + * Class: edu_wpi_first_hal_simulation_RelayDataJNI * Method: getForward * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RelayDataJNI_getForward +Java_edu_wpi_first_hal_simulation_RelayDataJNI_getForward (JNIEnv*, jclass, jint index) { return HALSIM_GetRelayForward(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_RelayDataJNI + * Class: edu_wpi_first_hal_simulation_RelayDataJNI * Method: setForward * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RelayDataJNI_setForward +Java_edu_wpi_first_hal_simulation_RelayDataJNI_setForward (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetRelayForward(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_RelayDataJNI + * Class: edu_wpi_first_hal_simulation_RelayDataJNI * Method: registerReverseCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RelayDataJNI_registerReverseCallback +Java_edu_wpi_first_hal_simulation_RelayDataJNI_registerReverseCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -179,12 +179,12 @@ Java_edu_wpi_first_hal_sim_mockdata_RelayDataJNI_registerReverseCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_RelayDataJNI + * Class: edu_wpi_first_hal_simulation_RelayDataJNI * Method: cancelReverseCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RelayDataJNI_cancelReverseCallback +Java_edu_wpi_first_hal_simulation_RelayDataJNI_cancelReverseCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -192,36 +192,36 @@ Java_edu_wpi_first_hal_sim_mockdata_RelayDataJNI_cancelReverseCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_RelayDataJNI + * Class: edu_wpi_first_hal_simulation_RelayDataJNI * Method: getReverse * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RelayDataJNI_getReverse +Java_edu_wpi_first_hal_simulation_RelayDataJNI_getReverse (JNIEnv*, jclass, jint index) { return HALSIM_GetRelayReverse(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_RelayDataJNI + * Class: edu_wpi_first_hal_simulation_RelayDataJNI * Method: setReverse * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RelayDataJNI_setReverse +Java_edu_wpi_first_hal_simulation_RelayDataJNI_setReverse (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetRelayReverse(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_RelayDataJNI + * Class: edu_wpi_first_hal_simulation_RelayDataJNI * Method: resetData * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RelayDataJNI_resetData +Java_edu_wpi_first_hal_simulation_RelayDataJNI_resetData (JNIEnv*, jclass, jint index) { HALSIM_ResetRelayData(index); diff --git a/hal/src/main/native/sim/jni/RoboRioDataJNI.cpp b/hal/src/main/native/sim/jni/RoboRioDataJNI.cpp index 7509fc4db9..484821b3e8 100644 --- a/hal/src/main/native/sim/jni/RoboRioDataJNI.cpp +++ b/hal/src/main/native/sim/jni/RoboRioDataJNI.cpp @@ -8,20 +8,20 @@ #include #include "CallbackStore.h" -#include "edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI.h" -#include "mockdata/RoboRioData.h" +#include "edu_wpi_first_hal_simulation_RoboRioDataJNI.h" +#include "hal/simulation/RoboRioData.h" using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: registerFPGAButtonCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerFPGAButtonCallback +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerFPGAButtonCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -29,12 +29,12 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerFPGAButtonCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: cancelFPGAButtonCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelFPGAButtonCallback +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelFPGAButtonCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -42,36 +42,36 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelFPGAButtonCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: getFPGAButton * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_getFPGAButton +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getFPGAButton (JNIEnv*, jclass, jint index) { return HALSIM_GetRoboRioFPGAButton(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: setFPGAButton * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_setFPGAButton +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setFPGAButton (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetRoboRioFPGAButton(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: registerVInVoltageCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerVInVoltageCallback +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerVInVoltageCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -79,12 +79,12 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerVInVoltageCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: cancelVInVoltageCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelVInVoltageCallback +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelVInVoltageCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -92,36 +92,36 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelVInVoltageCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: getVInVoltage * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_getVInVoltage +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getVInVoltage (JNIEnv*, jclass, jint index) { return HALSIM_GetRoboRioVInVoltage(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: setVInVoltage * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_setVInVoltage +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setVInVoltage (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetRoboRioVInVoltage(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: registerVInCurrentCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerVInCurrentCallback +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerVInCurrentCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -129,12 +129,12 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerVInCurrentCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: cancelVInCurrentCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelVInCurrentCallback +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelVInCurrentCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -142,36 +142,36 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelVInCurrentCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: getVInCurrent * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_getVInCurrent +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getVInCurrent (JNIEnv*, jclass, jint index) { return HALSIM_GetRoboRioVInCurrent(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: setVInCurrent * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_setVInCurrent +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setVInCurrent (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetRoboRioVInCurrent(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: registerUserVoltage6VCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserVoltage6VCallback +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserVoltage6VCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -179,12 +179,12 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserVoltage6VCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: cancelUserVoltage6VCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserVoltage6VCallback +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserVoltage6VCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -192,36 +192,36 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserVoltage6VCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: getUserVoltage6V * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_getUserVoltage6V +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserVoltage6V (JNIEnv*, jclass, jint index) { return HALSIM_GetRoboRioUserVoltage6V(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: setUserVoltage6V * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_setUserVoltage6V +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserVoltage6V (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetRoboRioUserVoltage6V(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: registerUserCurrent6VCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserCurrent6VCallback +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserCurrent6VCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -229,12 +229,12 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserCurrent6VCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: cancelUserCurrent6VCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserCurrent6VCallback +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserCurrent6VCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -242,36 +242,36 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserCurrent6VCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: getUserCurrent6V * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_getUserCurrent6V +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserCurrent6V (JNIEnv*, jclass, jint index) { return HALSIM_GetRoboRioUserCurrent6V(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: setUserCurrent6V * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_setUserCurrent6V +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserCurrent6V (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetRoboRioUserCurrent6V(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: registerUserActive6VCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserActive6VCallback +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserActive6VCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -279,12 +279,12 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserActive6VCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: cancelUserActive6VCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserActive6VCallback +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserActive6VCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -292,36 +292,36 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserActive6VCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: getUserActive6V * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_getUserActive6V +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserActive6V (JNIEnv*, jclass, jint index) { return HALSIM_GetRoboRioUserActive6V(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: setUserActive6V * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_setUserActive6V +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserActive6V (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetRoboRioUserActive6V(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: registerUserVoltage5VCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserVoltage5VCallback +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserVoltage5VCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -329,12 +329,12 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserVoltage5VCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: cancelUserVoltage5VCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserVoltage5VCallback +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserVoltage5VCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -342,36 +342,36 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserVoltage5VCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: getUserVoltage5V * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_getUserVoltage5V +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserVoltage5V (JNIEnv*, jclass, jint index) { return HALSIM_GetRoboRioUserVoltage5V(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: setUserVoltage5V * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_setUserVoltage5V +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserVoltage5V (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetRoboRioUserVoltage5V(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: registerUserCurrent5VCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserCurrent5VCallback +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserCurrent5VCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -379,12 +379,12 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserCurrent5VCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: cancelUserCurrent5VCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserCurrent5VCallback +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserCurrent5VCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -392,36 +392,36 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserCurrent5VCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: getUserCurrent5V * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_getUserCurrent5V +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserCurrent5V (JNIEnv*, jclass, jint index) { return HALSIM_GetRoboRioUserCurrent5V(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: setUserCurrent5V * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_setUserCurrent5V +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserCurrent5V (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetRoboRioUserCurrent5V(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: registerUserActive5VCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserActive5VCallback +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserActive5VCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -429,12 +429,12 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserActive5VCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: cancelUserActive5VCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserActive5VCallback +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserActive5VCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -442,36 +442,36 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserActive5VCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: getUserActive5V * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_getUserActive5V +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserActive5V (JNIEnv*, jclass, jint index) { return HALSIM_GetRoboRioUserActive5V(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: setUserActive5V * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_setUserActive5V +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserActive5V (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetRoboRioUserActive5V(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: registerUserVoltage3V3Callback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserVoltage3V3Callback +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserVoltage3V3Callback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -479,12 +479,12 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserVoltage3V3Callbac } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: cancelUserVoltage3V3Callback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserVoltage3V3Callback +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserVoltage3V3Callback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -492,36 +492,36 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserVoltage3V3Callback } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: getUserVoltage3V3 * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_getUserVoltage3V3 +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserVoltage3V3 (JNIEnv*, jclass, jint index) { return HALSIM_GetRoboRioUserVoltage3V3(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: setUserVoltage3V3 * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_setUserVoltage3V3 +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserVoltage3V3 (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetRoboRioUserVoltage3V3(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: registerUserCurrent3V3Callback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserCurrent3V3Callback +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserCurrent3V3Callback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -529,12 +529,12 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserCurrent3V3Callbac } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: cancelUserCurrent3V3Callback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserCurrent3V3Callback +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserCurrent3V3Callback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -542,36 +542,36 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserCurrent3V3Callback } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: getUserCurrent3V3 * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_getUserCurrent3V3 +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserCurrent3V3 (JNIEnv*, jclass, jint index) { return HALSIM_GetRoboRioUserCurrent3V3(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: setUserCurrent3V3 * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_setUserCurrent3V3 +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserCurrent3V3 (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetRoboRioUserCurrent3V3(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: registerUserActive3V3Callback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserActive3V3Callback +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserActive3V3Callback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -579,12 +579,12 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserActive3V3Callback } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: cancelUserActive3V3Callback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserActive3V3Callback +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserActive3V3Callback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -592,36 +592,36 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserActive3V3Callback } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: getUserActive3V3 * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_getUserActive3V3 +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserActive3V3 (JNIEnv*, jclass, jint index) { return HALSIM_GetRoboRioUserActive3V3(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: setUserActive3V3 * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_setUserActive3V3 +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserActive3V3 (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetRoboRioUserActive3V3(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: registerUserFaults6VCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserFaults6VCallback +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserFaults6VCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -629,12 +629,12 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserFaults6VCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: cancelUserFaults6VCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserFaults6VCallback +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserFaults6VCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -642,36 +642,36 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserFaults6VCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: getUserFaults6V * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_getUserFaults6V +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserFaults6V (JNIEnv*, jclass, jint index) { return HALSIM_GetRoboRioUserFaults6V(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: setUserFaults6V * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_setUserFaults6V +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserFaults6V (JNIEnv*, jclass, jint index, jint value) { HALSIM_SetRoboRioUserFaults6V(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: registerUserFaults5VCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserFaults5VCallback +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserFaults5VCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -679,12 +679,12 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserFaults5VCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: cancelUserFaults5VCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserFaults5VCallback +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserFaults5VCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -692,36 +692,36 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserFaults5VCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: getUserFaults5V * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_getUserFaults5V +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserFaults5V (JNIEnv*, jclass, jint index) { return HALSIM_GetRoboRioUserFaults5V(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: setUserFaults5V * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_setUserFaults5V +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserFaults5V (JNIEnv*, jclass, jint index, jint value) { HALSIM_SetRoboRioUserFaults5V(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: registerUserFaults3V3Callback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserFaults3V3Callback +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserFaults3V3Callback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -729,12 +729,12 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserFaults3V3Callback } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: cancelUserFaults3V3Callback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserFaults3V3Callback +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserFaults3V3Callback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -742,36 +742,36 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserFaults3V3Callback } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: getUserFaults3V3 * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_getUserFaults3V3 +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserFaults3V3 (JNIEnv*, jclass, jint index) { return HALSIM_GetRoboRioUserFaults3V3(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: setUserFaults3V3 * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_setUserFaults3V3 +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserFaults3V3 (JNIEnv*, jclass, jint index, jint value) { HALSIM_SetRoboRioUserFaults3V3(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI + * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI * Method: resetData * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_resetData +Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_resetData (JNIEnv*, jclass, jint index) { HALSIM_ResetRoboRioData(index); diff --git a/hal/src/main/native/sim/jni/SPIAccelerometerDataJNI.cpp b/hal/src/main/native/sim/jni/SPIAccelerometerDataJNI.cpp index 3ba99921f2..fe0c41051c 100644 --- a/hal/src/main/native/sim/jni/SPIAccelerometerDataJNI.cpp +++ b/hal/src/main/native/sim/jni/SPIAccelerometerDataJNI.cpp @@ -8,20 +8,20 @@ #include #include "CallbackStore.h" -#include "edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI.h" -#include "mockdata/SPIAccelerometerData.h" +#include "edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI.h" +#include "hal/simulation/SPIAccelerometerData.h" using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI * Method: registerActiveCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI_registerActiveCallback +Java_edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI_registerActiveCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -29,12 +29,12 @@ Java_edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI_registerActiveCallba } /* - * Class: edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI * Method: cancelActiveCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI_cancelActiveCallback +Java_edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI_cancelActiveCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -42,36 +42,36 @@ Java_edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI_cancelActiveCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI * Method: getActive * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI_getActive +Java_edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI_getActive (JNIEnv*, jclass, jint index) { return HALSIM_GetSPIAccelerometerActive(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI * Method: setActive * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI_setActive +Java_edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI_setActive (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetSPIAccelerometerActive(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI * Method: registerRangeCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI_registerRangeCallback +Java_edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI_registerRangeCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -79,12 +79,12 @@ Java_edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI_registerRangeCallbac } /* - * Class: edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI * Method: cancelRangeCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI_cancelRangeCallback +Java_edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI_cancelRangeCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -92,36 +92,36 @@ Java_edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI_cancelRangeCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI * Method: getRange * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI_getRange +Java_edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI_getRange (JNIEnv*, jclass, jint index) { return HALSIM_GetSPIAccelerometerRange(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI * Method: setRange * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI_setRange +Java_edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI_setRange (JNIEnv*, jclass, jint index, jint value) { HALSIM_SetSPIAccelerometerRange(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI * Method: registerXCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI_registerXCallback +Java_edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI_registerXCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -129,12 +129,12 @@ Java_edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI_registerXCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI * Method: cancelXCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI_cancelXCallback +Java_edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI_cancelXCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -142,36 +142,36 @@ Java_edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI_cancelXCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI * Method: getX * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI_getX +Java_edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI_getX (JNIEnv*, jclass, jint index) { return HALSIM_GetSPIAccelerometerX(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI * Method: setX * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI_setX +Java_edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI_setX (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetSPIAccelerometerX(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI * Method: registerYCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI_registerYCallback +Java_edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI_registerYCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -179,12 +179,12 @@ Java_edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI_registerYCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI * Method: cancelYCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI_cancelYCallback +Java_edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI_cancelYCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -192,36 +192,36 @@ Java_edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI_cancelYCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI * Method: getY * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI_getY +Java_edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI_getY (JNIEnv*, jclass, jint index) { return HALSIM_GetSPIAccelerometerY(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI * Method: setY * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI_setY +Java_edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI_setY (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetSPIAccelerometerY(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI * Method: registerZCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI_registerZCallback +Java_edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI_registerZCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -229,12 +229,12 @@ Java_edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI_registerZCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI * Method: cancelZCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI_cancelZCallback +Java_edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI_cancelZCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -242,36 +242,36 @@ Java_edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI_cancelZCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI * Method: getZ * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI_getZ +Java_edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI_getZ (JNIEnv*, jclass, jint index) { return HALSIM_GetSPIAccelerometerZ(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI * Method: setZ * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI_setZ +Java_edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI_setZ (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetSPIAccelerometerZ(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI + * Class: edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI * Method: resetData * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI_resetData +Java_edu_wpi_first_hal_simulation_SPIAccelerometerDataJNI_resetData (JNIEnv*, jclass, jint index) { HALSIM_ResetSPIAccelerometerData(index); diff --git a/hal/src/main/native/sim/jni/SPIDataJNI.cpp b/hal/src/main/native/sim/jni/SPIDataJNI.cpp index 8ddbd82c93..3709984987 100644 --- a/hal/src/main/native/sim/jni/SPIDataJNI.cpp +++ b/hal/src/main/native/sim/jni/SPIDataJNI.cpp @@ -11,20 +11,20 @@ #include "CallbackStore.h" #include "ConstBufferCallbackStore.h" #include "SpiReadAutoReceiveBufferCallbackStore.h" -#include "edu_wpi_first_hal_sim_mockdata_SPIDataJNI.h" -#include "mockdata/SPIData.h" +#include "edu_wpi_first_hal_simulation_SPIDataJNI.h" +#include "hal/simulation/SPIData.h" using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_sim_mockdata_SPIDataJNI + * Class: edu_wpi_first_hal_simulation_SPIDataJNI * Method: registerInitializedCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SPIDataJNI_registerInitializedCallback +Java_edu_wpi_first_hal_simulation_SPIDataJNI_registerInitializedCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -32,12 +32,12 @@ Java_edu_wpi_first_hal_sim_mockdata_SPIDataJNI_registerInitializedCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_SPIDataJNI + * Class: edu_wpi_first_hal_simulation_SPIDataJNI * Method: cancelInitializedCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SPIDataJNI_cancelInitializedCallback +Java_edu_wpi_first_hal_simulation_SPIDataJNI_cancelInitializedCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -45,36 +45,36 @@ Java_edu_wpi_first_hal_sim_mockdata_SPIDataJNI_cancelInitializedCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_SPIDataJNI + * Class: edu_wpi_first_hal_simulation_SPIDataJNI * Method: getInitialized * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SPIDataJNI_getInitialized +Java_edu_wpi_first_hal_simulation_SPIDataJNI_getInitialized (JNIEnv*, jclass, jint index) { return HALSIM_GetSPIInitialized(index); } /* - * Class: edu_wpi_first_hal_sim_mockdata_SPIDataJNI + * Class: edu_wpi_first_hal_simulation_SPIDataJNI * Method: setInitialized * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SPIDataJNI_setInitialized +Java_edu_wpi_first_hal_simulation_SPIDataJNI_setInitialized (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetSPIInitialized(index, value); } /* - * Class: edu_wpi_first_hal_sim_mockdata_SPIDataJNI + * Class: edu_wpi_first_hal_simulation_SPIDataJNI * Method: registerReadCallback * Signature: (ILjava/lang/Object;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SPIDataJNI_registerReadCallback +Java_edu_wpi_first_hal_simulation_SPIDataJNI_registerReadCallback (JNIEnv* env, jclass, jint index, jobject callback) { return sim::AllocateBufferCallback(env, index, callback, @@ -82,24 +82,24 @@ Java_edu_wpi_first_hal_sim_mockdata_SPIDataJNI_registerReadCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_SPIDataJNI + * Class: edu_wpi_first_hal_simulation_SPIDataJNI * Method: cancelReadCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SPIDataJNI_cancelReadCallback +Java_edu_wpi_first_hal_simulation_SPIDataJNI_cancelReadCallback (JNIEnv* env, jclass, jint index, jint handle) { sim::FreeBufferCallback(env, handle, index, &HALSIM_CancelSPIReadCallback); } /* - * Class: edu_wpi_first_hal_sim_mockdata_SPIDataJNI + * Class: edu_wpi_first_hal_simulation_SPIDataJNI * Method: registerWriteCallback * Signature: (ILjava/lang/Object;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SPIDataJNI_registerWriteCallback +Java_edu_wpi_first_hal_simulation_SPIDataJNI_registerWriteCallback (JNIEnv* env, jclass, jint index, jobject callback) { return sim::AllocateConstBufferCallback(env, index, callback, @@ -107,12 +107,12 @@ Java_edu_wpi_first_hal_sim_mockdata_SPIDataJNI_registerWriteCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_SPIDataJNI + * Class: edu_wpi_first_hal_simulation_SPIDataJNI * Method: cancelWriteCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SPIDataJNI_cancelWriteCallback +Java_edu_wpi_first_hal_simulation_SPIDataJNI_cancelWriteCallback (JNIEnv* env, jclass, jint index, jint handle) { sim::FreeConstBufferCallback(env, handle, index, @@ -120,12 +120,12 @@ Java_edu_wpi_first_hal_sim_mockdata_SPIDataJNI_cancelWriteCallback } /* - * Class: edu_wpi_first_hal_sim_mockdata_SPIDataJNI + * Class: edu_wpi_first_hal_simulation_SPIDataJNI * Method: registerReadAutoReceiveBufferCallback * Signature: (ILjava/lang/Object;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SPIDataJNI_registerReadAutoReceiveBufferCallback +Java_edu_wpi_first_hal_simulation_SPIDataJNI_registerReadAutoReceiveBufferCallback (JNIEnv* env, jclass, jint index, jobject callback) { return sim::AllocateSpiBufferCallback( @@ -133,12 +133,12 @@ Java_edu_wpi_first_hal_sim_mockdata_SPIDataJNI_registerReadAutoReceiveBufferCall } /* - * Class: edu_wpi_first_hal_sim_mockdata_SPIDataJNI + * Class: edu_wpi_first_hal_simulation_SPIDataJNI * Method: cancelReadAutoReceiveBufferCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SPIDataJNI_cancelReadAutoReceiveBufferCallback +Java_edu_wpi_first_hal_simulation_SPIDataJNI_cancelReadAutoReceiveBufferCallback (JNIEnv* env, jclass, jint index, jint handle) { sim::FreeSpiBufferCallback(env, handle, index, @@ -146,12 +146,12 @@ Java_edu_wpi_first_hal_sim_mockdata_SPIDataJNI_cancelReadAutoReceiveBufferCallba } /* - * Class: edu_wpi_first_hal_sim_mockdata_SPIDataJNI + * Class: edu_wpi_first_hal_simulation_SPIDataJNI * Method: resetData * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SPIDataJNI_resetData +Java_edu_wpi_first_hal_simulation_SPIDataJNI_resetData (JNIEnv*, jclass, jint index) { HALSIM_ResetSPIData(index); diff --git a/hal/src/main/native/sim/jni/SimDeviceDataJNI.cpp b/hal/src/main/native/sim/jni/SimDeviceDataJNI.cpp index 61de859107..b14e42af18 100644 --- a/hal/src/main/native/sim/jni/SimDeviceDataJNI.cpp +++ b/hal/src/main/native/sim/jni/SimDeviceDataJNI.cpp @@ -17,8 +17,8 @@ #include #include "SimulatorJNI.h" -#include "edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI.h" -#include "mockdata/SimDeviceData.h" +#include "edu_wpi_first_hal_simulation_SimDeviceDataJNI.h" +#include "hal/simulation/SimDeviceData.h" using namespace hal; using namespace wpi::java; @@ -265,21 +265,23 @@ namespace sim { bool InitializeSimDeviceDataJNI(JNIEnv* env) { simDeviceInfoCls = JClass( - env, "edu/wpi/first/hal/sim/mockdata/SimDeviceDataJNI$SimDeviceInfo"); + env, "edu/wpi/first/hal/simulation/SimDeviceDataJNI$SimDeviceInfo"); if (!simDeviceInfoCls) return false; - simValueInfoCls = JClass( - env, "edu/wpi/first/hal/sim/mockdata/SimDeviceDataJNI$SimValueInfo"); + simValueInfoCls = + JClass(env, "edu/wpi/first/hal/simulation/SimDeviceDataJNI$SimValueInfo"); if (!simValueInfoCls) return false; - simDeviceCallbackCls = JClass(env, "edu/wpi/first/hal/sim/SimDeviceCallback"); + simDeviceCallbackCls = + JClass(env, "edu/wpi/first/hal/simulation/SimDeviceCallback"); if (!simDeviceCallbackCls) return false; simDeviceCallbackCallback = env->GetMethodID(simDeviceCallbackCls, "callback", "(Ljava/lang/String;I)V"); if (!simDeviceCallbackCallback) return false; - simValueCallbackCls = JClass(env, "edu/wpi/first/hal/sim/SimValueCallback"); + simValueCallbackCls = + JClass(env, "edu/wpi/first/hal/simulation/SimValueCallback"); if (!simValueCallbackCls) return false; simValueCallbackCallback = env->GetMethodID( @@ -302,12 +304,12 @@ void FreeSimDeviceDataJNI(JNIEnv* env) { extern "C" { /* - * Class: edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI + * Class: edu_wpi_first_hal_simulation_SimDeviceDataJNI * Method: registerSimDeviceCreatedCallback * Signature: (Ljava/lang/String;Ljava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI_registerSimDeviceCreatedCallback +Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_registerSimDeviceCreatedCallback (JNIEnv* env, jclass, jstring prefix, jobject callback, jboolean initialNotify) { @@ -326,24 +328,24 @@ Java_edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI_registerSimDeviceCreatedCal } /* - * Class: edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI + * Class: edu_wpi_first_hal_simulation_SimDeviceDataJNI * Method: cancelSimDeviceCreatedCallback * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI_cancelSimDeviceCreatedCallback +Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_cancelSimDeviceCreatedCallback (JNIEnv* env, jclass, jint uid) { CallbackJNI::GetInstance().FreeCallback(env, uid); } /* - * Class: edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI + * Class: edu_wpi_first_hal_simulation_SimDeviceDataJNI * Method: registerSimDeviceFreedCallback * Signature: (Ljava/lang/String;Ljava/lang/Object;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI_registerSimDeviceFreedCallback +Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_registerSimDeviceFreedCallback (JNIEnv* env, jclass, jstring prefix, jobject callback) { auto [uid, store] = @@ -360,48 +362,48 @@ Java_edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI_registerSimDeviceFreedCallb } /* - * Class: edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI + * Class: edu_wpi_first_hal_simulation_SimDeviceDataJNI * Method: cancelSimDeviceFreedCallback * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI_cancelSimDeviceFreedCallback +Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_cancelSimDeviceFreedCallback (JNIEnv* env, jclass, jint uid) { CallbackJNI::GetInstance().FreeCallback(env, uid); } /* - * Class: edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI + * Class: edu_wpi_first_hal_simulation_SimDeviceDataJNI * Method: getSimDeviceHandle * Signature: (Ljava/lang/String;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI_getSimDeviceHandle +Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_getSimDeviceHandle (JNIEnv* env, jclass, jstring name) { return HALSIM_GetSimDeviceHandle(JStringRef{env, name}.c_str()); } /* - * Class: edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI + * Class: edu_wpi_first_hal_simulation_SimDeviceDataJNI * Method: getSimValueDeviceHandle * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI_getSimValueDeviceHandle +Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_getSimValueDeviceHandle (JNIEnv*, jclass, jint handle) { return HALSIM_GetSimValueDeviceHandle(handle); } /* - * Class: edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI + * Class: edu_wpi_first_hal_simulation_SimDeviceDataJNI * Method: enumerateSimDevices * Signature: (Ljava/lang/String;)[Ljava/lang/Object; */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI_enumerateSimDevices +Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_enumerateSimDevices (JNIEnv* env, jclass, jstring prefix) { // get values @@ -426,12 +428,12 @@ Java_edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI_enumerateSimDevices } /* - * Class: edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI + * Class: edu_wpi_first_hal_simulation_SimDeviceDataJNI * Method: registerSimValueCreatedCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI_registerSimValueCreatedCallback +Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_registerSimValueCreatedCallback (JNIEnv* env, jclass, jint device, jobject callback, jboolean initialNotify) { auto [uid, store] = @@ -450,24 +452,24 @@ Java_edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI_registerSimValueCreatedCall } /* - * Class: edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI + * Class: edu_wpi_first_hal_simulation_SimDeviceDataJNI * Method: cancelSimValueCreatedCallback * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI_cancelSimValueCreatedCallback +Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_cancelSimValueCreatedCallback (JNIEnv* env, jclass, jint uid) { CallbackJNI::GetInstance().FreeCallback(env, uid); } /* - * Class: edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI + * Class: edu_wpi_first_hal_simulation_SimDeviceDataJNI * Method: registerSimValueChangedCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI_registerSimValueChangedCallback +Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_registerSimValueChangedCallback (JNIEnv* env, jclass, jint handle, jobject callback, jboolean initialNotify) { auto [uid, store] = @@ -486,36 +488,36 @@ Java_edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI_registerSimValueChangedCall } /* - * Class: edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI + * Class: edu_wpi_first_hal_simulation_SimDeviceDataJNI * Method: cancelSimValueChangedCallback * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI_cancelSimValueChangedCallback +Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_cancelSimValueChangedCallback (JNIEnv* env, jclass, jint uid) { CallbackJNI::GetInstance().FreeCallback(env, uid); } /* - * Class: edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI + * Class: edu_wpi_first_hal_simulation_SimDeviceDataJNI * Method: getSimValueHandle * Signature: (ILjava/lang/String;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI_getSimValueHandle +Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_getSimValueHandle (JNIEnv* env, jclass, jint device, jstring name) { return HALSIM_GetSimValueHandle(device, JStringRef{env, name}.c_str()); } /* - * Class: edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI + * Class: edu_wpi_first_hal_simulation_SimDeviceDataJNI * Method: enumerateSimValues * Signature: (I)[Ljava/lang/Object; */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI_enumerateSimValues +Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_enumerateSimValues (JNIEnv* env, jclass, jint device) { // get values @@ -540,12 +542,12 @@ Java_edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI_enumerateSimValues } /* - * Class: edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI + * Class: edu_wpi_first_hal_simulation_SimDeviceDataJNI * Method: getSimValueEnumOptions * Signature: (I)[Ljava/lang/Object; */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI_getSimValueEnumOptions +Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_getSimValueEnumOptions (JNIEnv* env, jclass, jint handle) { static JClass stringCls{env, "java/lang/String"}; @@ -562,12 +564,12 @@ Java_edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI_getSimValueEnumOptions } /* - * Class: edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI + * Class: edu_wpi_first_hal_simulation_SimDeviceDataJNI * Method: resetSimDeviceData * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SimDeviceDataJNI_resetSimDeviceData +Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_resetSimDeviceData (JNIEnv*, jclass) { HALSIM_ResetSimDeviceData(); diff --git a/hal/src/main/native/sim/jni/SimulatorJNI.cpp b/hal/src/main/native/sim/jni/SimulatorJNI.cpp index b7b05b73bb..8e2a232ff1 100644 --- a/hal/src/main/native/sim/jni/SimulatorJNI.cpp +++ b/hal/src/main/native/sim/jni/SimulatorJNI.cpp @@ -14,10 +14,10 @@ #include "ConstBufferCallbackStore.h" #include "SimDeviceDataJNI.h" #include "SpiReadAutoReceiveBufferCallbackStore.h" -#include "edu_wpi_first_hal_sim_mockdata_SimulatorJNI.h" +#include "edu_wpi_first_hal_simulation_SimulatorJNI.h" #include "hal/HAL.h" #include "hal/handles/HandlesInternal.h" -#include "mockdata/MockHooks.h" +#include "hal/simulation/MockHooks.h" using namespace wpi::java; @@ -40,14 +40,16 @@ jint SimOnLoad(JavaVM* vm, void* reserved) { if (vm->GetEnv(reinterpret_cast(&env), JNI_VERSION_1_6) != JNI_OK) return JNI_ERR; - notifyCallbackCls = JClass(env, "edu/wpi/first/hal/sim/NotifyCallback"); + notifyCallbackCls = + JClass(env, "edu/wpi/first/hal/simulation/NotifyCallback"); if (!notifyCallbackCls) return JNI_ERR; notifyCallbackCallback = env->GetMethodID(notifyCallbackCls, "callbackNative", "(Ljava/lang/String;IJD)V"); if (!notifyCallbackCallback) return JNI_ERR; - bufferCallbackCls = JClass(env, "edu/wpi/first/hal/sim/BufferCallback"); + bufferCallbackCls = + JClass(env, "edu/wpi/first/hal/simulation/BufferCallback"); if (!bufferCallbackCls) return JNI_ERR; bufferCallbackCallback = env->GetMethodID(bufferCallbackCls, "callback", @@ -55,15 +57,15 @@ jint SimOnLoad(JavaVM* vm, void* reserved) { if (!bufferCallbackCallback) return JNI_ERR; constBufferCallbackCls = - JClass(env, "edu/wpi/first/hal/sim/ConstBufferCallback"); + JClass(env, "edu/wpi/first/hal/simulation/ConstBufferCallback"); if (!constBufferCallbackCls) return JNI_ERR; constBufferCallbackCallback = env->GetMethodID( constBufferCallbackCls, "callback", "(Ljava/lang/String;[BI)V"); if (!constBufferCallbackCallback) return JNI_ERR; - spiReadAutoReceiveBufferCallbackCls = - JClass(env, "edu/wpi/first/hal/sim/SpiReadAutoReceiveBufferCallback"); + spiReadAutoReceiveBufferCallbackCls = JClass( + env, "edu/wpi/first/hal/simulation/SpiReadAutoReceiveBufferCallback"); if (!spiReadAutoReceiveBufferCallbackCls) return JNI_ERR; spiReadAutoReceiveBufferCallbackCallback = @@ -109,108 +111,108 @@ jmethodID GetSpiReadAutoReceiveBufferCallback() { extern "C" { /* - * Class: edu_wpi_first_hal_sim_mockdata_SimulatorJNI + * Class: edu_wpi_first_hal_simulation_SimulatorJNI * Method: setRuntimeType * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SimulatorJNI_setRuntimeType +Java_edu_wpi_first_hal_simulation_SimulatorJNI_setRuntimeType (JNIEnv*, jclass, jint type) { HALSIM_SetRuntimeType(static_cast(type)); } /* - * Class: edu_wpi_first_hal_sim_mockdata_SimulatorJNI + * Class: edu_wpi_first_hal_simulation_SimulatorJNI * Method: waitForProgramStart * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SimulatorJNI_waitForProgramStart +Java_edu_wpi_first_hal_simulation_SimulatorJNI_waitForProgramStart (JNIEnv*, jclass) { HALSIM_WaitForProgramStart(); } /* - * Class: edu_wpi_first_hal_sim_mockdata_SimulatorJNI + * Class: edu_wpi_first_hal_simulation_SimulatorJNI * Method: setProgramStarted * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SimulatorJNI_setProgramStarted +Java_edu_wpi_first_hal_simulation_SimulatorJNI_setProgramStarted (JNIEnv*, jclass) { HALSIM_SetProgramStarted(); } /* - * Class: edu_wpi_first_hal_sim_mockdata_SimulatorJNI + * Class: edu_wpi_first_hal_simulation_SimulatorJNI * Method: restartTiming * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SimulatorJNI_restartTiming +Java_edu_wpi_first_hal_simulation_SimulatorJNI_restartTiming (JNIEnv*, jclass) { HALSIM_RestartTiming(); } /* - * Class: edu_wpi_first_hal_sim_mockdata_SimulatorJNI + * Class: edu_wpi_first_hal_simulation_SimulatorJNI * Method: pauseTiming * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SimulatorJNI_pauseTiming +Java_edu_wpi_first_hal_simulation_SimulatorJNI_pauseTiming (JNIEnv*, jclass) { HALSIM_PauseTiming(); } /* - * Class: edu_wpi_first_hal_sim_mockdata_SimulatorJNI + * Class: edu_wpi_first_hal_simulation_SimulatorJNI * Method: resumeTiming * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SimulatorJNI_resumeTiming +Java_edu_wpi_first_hal_simulation_SimulatorJNI_resumeTiming (JNIEnv*, jclass) { HALSIM_ResumeTiming(); } /* - * Class: edu_wpi_first_hal_sim_mockdata_SimulatorJNI + * Class: edu_wpi_first_hal_simulation_SimulatorJNI * Method: isTimingPaused * Signature: ()Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SimulatorJNI_isTimingPaused +Java_edu_wpi_first_hal_simulation_SimulatorJNI_isTimingPaused (JNIEnv*, jclass) { return HALSIM_IsTimingPaused(); } /* - * Class: edu_wpi_first_hal_sim_mockdata_SimulatorJNI + * Class: edu_wpi_first_hal_simulation_SimulatorJNI * Method: stepTiming * Signature: (J)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SimulatorJNI_stepTiming +Java_edu_wpi_first_hal_simulation_SimulatorJNI_stepTiming (JNIEnv*, jclass, jlong delta) { HALSIM_StepTiming(delta); } /* - * Class: edu_wpi_first_hal_sim_mockdata_SimulatorJNI + * Class: edu_wpi_first_hal_simulation_SimulatorJNI * Method: resetHandles * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_sim_mockdata_SimulatorJNI_resetHandles +Java_edu_wpi_first_hal_simulation_SimulatorJNI_resetHandles (JNIEnv*, jclass) { hal::HandleBase::ResetGlobalHandles(); diff --git a/hal/src/main/native/sim/jni/SpiReadAutoReceiveBufferCallbackStore.cpp b/hal/src/main/native/sim/jni/SpiReadAutoReceiveBufferCallbackStore.cpp index 72538e7334..5432840895 100644 --- a/hal/src/main/native/sim/jni/SpiReadAutoReceiveBufferCallbackStore.cpp +++ b/hal/src/main/native/sim/jni/SpiReadAutoReceiveBufferCallbackStore.cpp @@ -15,7 +15,7 @@ #include "hal/Types.h" #include "hal/Value.h" #include "hal/handles/UnlimitedHandleResource.h" -#include "mockdata/NotifyListener.h" +#include "hal/simulation/NotifyListener.h" using namespace hal; using namespace hal::sim; diff --git a/hal/src/main/native/sim/jni/SpiReadAutoReceiveBufferCallbackStore.h b/hal/src/main/native/sim/jni/SpiReadAutoReceiveBufferCallbackStore.h index 4a5d7381ac..6a457de83e 100644 --- a/hal/src/main/native/sim/jni/SpiReadAutoReceiveBufferCallbackStore.h +++ b/hal/src/main/native/sim/jni/SpiReadAutoReceiveBufferCallbackStore.h @@ -15,8 +15,8 @@ #include "hal/Types.h" #include "hal/Value.h" #include "hal/handles/UnlimitedHandleResource.h" -#include "mockdata/NotifyListener.h" -#include "mockdata/SPIData.h" +#include "hal/simulation/NotifyListener.h" +#include "hal/simulation/SPIData.h" namespace hal { namespace sim { diff --git a/hal/src/main/native/sim/mockdata/AccelerometerDataInternal.h b/hal/src/main/native/sim/mockdata/AccelerometerDataInternal.h index 9db087584f..e2e0a80303 100644 --- a/hal/src/main/native/sim/mockdata/AccelerometerDataInternal.h +++ b/hal/src/main/native/sim/mockdata/AccelerometerDataInternal.h @@ -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 { diff --git a/hal/src/main/native/sim/mockdata/AddressableLEDDataInternal.h b/hal/src/main/native/sim/mockdata/AddressableLEDDataInternal.h index 9d6e215e93..f0b79989d8 100644 --- a/hal/src/main/native/sim/mockdata/AddressableLEDDataInternal.h +++ b/hal/src/main/native/sim/mockdata/AddressableLEDDataInternal.h @@ -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 -#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 { diff --git a/hal/src/main/native/sim/mockdata/AnalogGyroDataInternal.h b/hal/src/main/native/sim/mockdata/AnalogGyroDataInternal.h index 427d2fb19e..ff12b60a99 100644 --- a/hal/src/main/native/sim/mockdata/AnalogGyroDataInternal.h +++ b/hal/src/main/native/sim/mockdata/AnalogGyroDataInternal.h @@ -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 { diff --git a/hal/src/main/native/sim/mockdata/AnalogInDataInternal.h b/hal/src/main/native/sim/mockdata/AnalogInDataInternal.h index cd8348d809..90d707c2f8 100644 --- a/hal/src/main/native/sim/mockdata/AnalogInDataInternal.h +++ b/hal/src/main/native/sim/mockdata/AnalogInDataInternal.h @@ -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 { diff --git a/hal/src/main/native/sim/mockdata/AnalogOutDataInternal.h b/hal/src/main/native/sim/mockdata/AnalogOutDataInternal.h index da7d49fa9f..779ee96709 100644 --- a/hal/src/main/native/sim/mockdata/AnalogOutDataInternal.h +++ b/hal/src/main/native/sim/mockdata/AnalogOutDataInternal.h @@ -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 { diff --git a/hal/src/main/native/sim/mockdata/AnalogTriggerDataInternal.h b/hal/src/main/native/sim/mockdata/AnalogTriggerDataInternal.h index 61b3c1964c..cb63cc9612 100644 --- a/hal/src/main/native/sim/mockdata/AnalogTriggerDataInternal.h +++ b/hal/src/main/native/sim/mockdata/AnalogTriggerDataInternal.h @@ -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 { diff --git a/hal/src/main/native/sim/mockdata/CanDataInternal.h b/hal/src/main/native/sim/mockdata/CanDataInternal.h index ffdd35179f..df5b29033e 100644 --- a/hal/src/main/native/sim/mockdata/CanDataInternal.h +++ b/hal/src/main/native/sim/mockdata/CanDataInternal.h @@ -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 { diff --git a/hal/src/main/native/sim/mockdata/DIODataInternal.h b/hal/src/main/native/sim/mockdata/DIODataInternal.h index 49e0f75bed..c3266d5219 100644 --- a/hal/src/main/native/sim/mockdata/DIODataInternal.h +++ b/hal/src/main/native/sim/mockdata/DIODataInternal.h @@ -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 { diff --git a/hal/src/main/native/sim/mockdata/DigitalPWMDataInternal.h b/hal/src/main/native/sim/mockdata/DigitalPWMDataInternal.h index 09d5903b5a..f2c7a5eca3 100644 --- a/hal/src/main/native/sim/mockdata/DigitalPWMDataInternal.h +++ b/hal/src/main/native/sim/mockdata/DigitalPWMDataInternal.h @@ -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 { diff --git a/hal/src/main/native/sim/mockdata/DriverStationDataInternal.h b/hal/src/main/native/sim/mockdata/DriverStationDataInternal.h index fdeb3c62a9..7838d67145 100644 --- a/hal/src/main/native/sim/mockdata/DriverStationDataInternal.h +++ b/hal/src/main/native/sim/mockdata/DriverStationDataInternal.h @@ -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 -#include "mockdata/DriverStationData.h" -#include "mockdata/SimDataValue.h" +#include "hal/simulation/DriverStationData.h" +#include "hal/simulation/SimDataValue.h" namespace hal { struct JoystickOutputStore; diff --git a/hal/src/main/native/sim/mockdata/DutyCycleDataInternal.h b/hal/src/main/native/sim/mockdata/DutyCycleDataInternal.h index 2f98b072be..e69f9aac83 100644 --- a/hal/src/main/native/sim/mockdata/DutyCycleDataInternal.h +++ b/hal/src/main/native/sim/mockdata/DutyCycleDataInternal.h @@ -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 #include -#include "mockdata/DutyCycleData.h" -#include "mockdata/SimDataValue.h" +#include "hal/simulation/DutyCycleData.h" +#include "hal/simulation/SimDataValue.h" namespace hal { class DutyCycleData { diff --git a/hal/src/main/native/sim/mockdata/EncoderDataInternal.h b/hal/src/main/native/sim/mockdata/EncoderDataInternal.h index 389289c6f1..3848f1d0f9 100644 --- a/hal/src/main/native/sim/mockdata/EncoderDataInternal.h +++ b/hal/src/main/native/sim/mockdata/EncoderDataInternal.h @@ -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 #include -#include "mockdata/EncoderData.h" -#include "mockdata/SimDataValue.h" +#include "hal/simulation/EncoderData.h" +#include "hal/simulation/SimDataValue.h" namespace hal { class EncoderData { diff --git a/hal/src/main/native/sim/mockdata/I2CDataInternal.h b/hal/src/main/native/sim/mockdata/I2CDataInternal.h index c799bb7d0d..4822222ac8 100644 --- a/hal/src/main/native/sim/mockdata/I2CDataInternal.h +++ b/hal/src/main/native/sim/mockdata/I2CDataInternal.h @@ -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 { diff --git a/hal/src/main/native/sim/mockdata/PCMDataInternal.h b/hal/src/main/native/sim/mockdata/PCMDataInternal.h index 0c7b99b3d6..0d3752ee85 100644 --- a/hal/src/main/native/sim/mockdata/PCMDataInternal.h +++ b/hal/src/main/native/sim/mockdata/PCMDataInternal.h @@ -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 { diff --git a/hal/src/main/native/sim/mockdata/PDPDataInternal.h b/hal/src/main/native/sim/mockdata/PDPDataInternal.h index 8d45416f93..3392eaa25f 100644 --- a/hal/src/main/native/sim/mockdata/PDPDataInternal.h +++ b/hal/src/main/native/sim/mockdata/PDPDataInternal.h @@ -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 { diff --git a/hal/src/main/native/sim/mockdata/PWMDataInternal.h b/hal/src/main/native/sim/mockdata/PWMDataInternal.h index 248b7b3788..028e25a373 100644 --- a/hal/src/main/native/sim/mockdata/PWMDataInternal.h +++ b/hal/src/main/native/sim/mockdata/PWMDataInternal.h @@ -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 { diff --git a/hal/src/main/native/sim/mockdata/RelayDataInternal.h b/hal/src/main/native/sim/mockdata/RelayDataInternal.h index cb38388132..d62ea2f5cb 100644 --- a/hal/src/main/native/sim/mockdata/RelayDataInternal.h +++ b/hal/src/main/native/sim/mockdata/RelayDataInternal.h @@ -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 { diff --git a/hal/src/main/native/sim/mockdata/RoboRioDataInternal.h b/hal/src/main/native/sim/mockdata/RoboRioDataInternal.h index 106c438b8c..2fb3456038 100644 --- a/hal/src/main/native/sim/mockdata/RoboRioDataInternal.h +++ b/hal/src/main/native/sim/mockdata/RoboRioDataInternal.h @@ -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 { diff --git a/hal/src/main/native/sim/mockdata/SPIAccelerometerDataInternal.h b/hal/src/main/native/sim/mockdata/SPIAccelerometerDataInternal.h index 661e01bfb7..59c6685763 100644 --- a/hal/src/main/native/sim/mockdata/SPIAccelerometerDataInternal.h +++ b/hal/src/main/native/sim/mockdata/SPIAccelerometerDataInternal.h @@ -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 { diff --git a/hal/src/main/native/sim/mockdata/SPIDataInternal.h b/hal/src/main/native/sim/mockdata/SPIDataInternal.h index 44868d2d15..ff0a6c902e 100644 --- a/hal/src/main/native/sim/mockdata/SPIDataInternal.h +++ b/hal/src/main/native/sim/mockdata/SPIDataInternal.h @@ -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 { diff --git a/hal/src/main/native/sim/mockdata/SimDeviceData.cpp b/hal/src/main/native/sim/mockdata/SimDeviceData.cpp index a703257ed4..358320aaca 100644 --- a/hal/src/main/native/sim/mockdata/SimDeviceData.cpp +++ b/hal/src/main/native/sim/mockdata/SimDeviceData.cpp @@ -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 diff --git a/hal/src/main/native/sim/mockdata/SimDeviceDataInternal.h b/hal/src/main/native/sim/mockdata/SimDeviceDataInternal.h index 2582eca3ac..b71b807575 100644 --- a/hal/src/main/native/sim/mockdata/SimDeviceDataInternal.h +++ b/hal/src/main/native/sim/mockdata/SimDeviceDataInternal.h @@ -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 #include "hal/Value.h" -#include "mockdata/SimCallbackRegistry.h" -#include "mockdata/SimDeviceData.h" +#include "hal/simulation/SimCallbackRegistry.h" +#include "hal/simulation/SimDeviceData.h" namespace hal { diff --git a/hal/src/test/native/cpp/can/CANTest.cpp b/hal/src/test/native/cpp/can/CANTest.cpp index 6f5549c437..427bb54895 100644 --- a/hal/src/test/native/cpp/can/CANTest.cpp +++ b/hal/src/test/native/cpp/can/CANTest.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2015-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2015-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,7 +8,7 @@ #include "gtest/gtest.h" #include "hal/CANAPI.h" #include "hal/HAL.h" -#include "mockdata/CanData.h" +#include "hal/simulation/CanData.h" namespace hal { struct CANTestStore { diff --git a/hal/src/test/native/cpp/mockdata/AnalogInDataTests.cpp b/hal/src/test/native/cpp/mockdata/AnalogInDataTests.cpp index 791be7954a..c102480439 100644 --- a/hal/src/test/native/cpp/mockdata/AnalogInDataTests.cpp +++ b/hal/src/test/native/cpp/mockdata/AnalogInDataTests.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2015-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2015-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. */ @@ -9,7 +9,7 @@ #include "hal/AnalogInput.h" #include "hal/HAL.h" #include "hal/handles/HandlesInternal.h" -#include "mockdata/AnalogInData.h" +#include "hal/simulation/AnalogInData.h" namespace hal { diff --git a/hal/src/test/native/cpp/mockdata/AnalogOutDataTests.cpp b/hal/src/test/native/cpp/mockdata/AnalogOutDataTests.cpp index 8f6d6f0d19..d6c9f707a7 100644 --- a/hal/src/test/native/cpp/mockdata/AnalogOutDataTests.cpp +++ b/hal/src/test/native/cpp/mockdata/AnalogOutDataTests.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2015-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2015-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. */ @@ -9,7 +9,7 @@ #include "hal/AnalogOutput.h" #include "hal/HAL.h" #include "hal/handles/HandlesInternal.h" -#include "mockdata/AnalogOutData.h" +#include "hal/simulation/AnalogOutData.h" namespace hal { diff --git a/hal/src/test/native/cpp/mockdata/DIODataTests.cpp b/hal/src/test/native/cpp/mockdata/DIODataTests.cpp index 19fe99428a..248f841291 100644 --- a/hal/src/test/native/cpp/mockdata/DIODataTests.cpp +++ b/hal/src/test/native/cpp/mockdata/DIODataTests.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2015-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2015-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. */ @@ -9,7 +9,7 @@ #include "hal/DIO.h" #include "hal/HAL.h" #include "hal/handles/HandlesInternal.h" -#include "mockdata/DIOData.h" +#include "hal/simulation/DIOData.h" namespace hal { diff --git a/hal/src/test/native/cpp/mockdata/DriverStationDataTests.cpp b/hal/src/test/native/cpp/mockdata/DriverStationDataTests.cpp index 5505c068e6..5cb28c4c3f 100644 --- a/hal/src/test/native/cpp/mockdata/DriverStationDataTests.cpp +++ b/hal/src/test/native/cpp/mockdata/DriverStationDataTests.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2015-2019 FIRST. All Rights Reserved. */ +/* Copyright (c) 2015-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,7 +10,7 @@ #include "gtest/gtest.h" #include "hal/HAL.h" #include "hal/Solenoid.h" -#include "mockdata/DriverStationData.h" +#include "hal/simulation/DriverStationData.h" namespace hal { diff --git a/hal/src/test/native/cpp/mockdata/I2CDataTests.cpp b/hal/src/test/native/cpp/mockdata/I2CDataTests.cpp index 3a8e01ce55..b78564b4a8 100644 --- a/hal/src/test/native/cpp/mockdata/I2CDataTests.cpp +++ b/hal/src/test/native/cpp/mockdata/I2CDataTests.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2015-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2015-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. */ @@ -9,7 +9,7 @@ #include "hal/HAL.h" #include "hal/I2C.h" #include "hal/handles/HandlesInternal.h" -#include "mockdata/I2CData.h" +#include "hal/simulation/I2CData.h" namespace hal { diff --git a/hal/src/test/native/cpp/mockdata/PCMDataTests.cpp b/hal/src/test/native/cpp/mockdata/PCMDataTests.cpp index 50a8ae39b5..5fc19aa1d2 100644 --- a/hal/src/test/native/cpp/mockdata/PCMDataTests.cpp +++ b/hal/src/test/native/cpp/mockdata/PCMDataTests.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2015-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2015-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. */ @@ -9,7 +9,7 @@ #include "hal/HAL.h" #include "hal/Solenoid.h" #include "hal/handles/HandlesInternal.h" -#include "mockdata/PCMData.h" +#include "hal/simulation/PCMData.h" namespace hal { diff --git a/hal/src/test/native/cpp/mockdata/PDPDataTests.cpp b/hal/src/test/native/cpp/mockdata/PDPDataTests.cpp index a46454f001..f980c7cb9a 100644 --- a/hal/src/test/native/cpp/mockdata/PDPDataTests.cpp +++ b/hal/src/test/native/cpp/mockdata/PDPDataTests.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2015-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2015-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. */ @@ -9,7 +9,7 @@ #include "hal/HAL.h" #include "hal/PDP.h" #include "hal/handles/HandlesInternal.h" -#include "mockdata/PDPData.h" +#include "hal/simulation/PDPData.h" namespace hal { diff --git a/hal/src/test/native/cpp/mockdata/PWMDataTests.cpp b/hal/src/test/native/cpp/mockdata/PWMDataTests.cpp index 447a51044c..daca364b05 100644 --- a/hal/src/test/native/cpp/mockdata/PWMDataTests.cpp +++ b/hal/src/test/native/cpp/mockdata/PWMDataTests.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2015-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2015-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. */ @@ -9,7 +9,7 @@ #include "hal/HAL.h" #include "hal/PWM.h" #include "hal/handles/HandlesInternal.h" -#include "mockdata/PWMData.h" +#include "hal/simulation/PWMData.h" namespace hal { diff --git a/hal/src/test/native/cpp/mockdata/RelayDataTests.cpp b/hal/src/test/native/cpp/mockdata/RelayDataTests.cpp index 408657a52b..edc0fb4c17 100644 --- a/hal/src/test/native/cpp/mockdata/RelayDataTests.cpp +++ b/hal/src/test/native/cpp/mockdata/RelayDataTests.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2015-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2015-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. */ @@ -9,7 +9,7 @@ #include "hal/HAL.h" #include "hal/Relay.h" #include "hal/handles/HandlesInternal.h" -#include "mockdata/RelayData.h" +#include "hal/simulation/RelayData.h" namespace hal { diff --git a/hal/src/test/native/cpp/mockdata/SPIDataTests.cpp b/hal/src/test/native/cpp/mockdata/SPIDataTests.cpp index 64c85553e9..423db6d955 100644 --- a/hal/src/test/native/cpp/mockdata/SPIDataTests.cpp +++ b/hal/src/test/native/cpp/mockdata/SPIDataTests.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2015-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2015-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. */ @@ -9,7 +9,7 @@ #include "hal/HAL.h" #include "hal/SPI.h" #include "hal/handles/HandlesInternal.h" -#include "mockdata/SPIData.h" +#include "hal/simulation/SPIData.h" namespace hal { diff --git a/simulation/halsim_ds_socket/src/main/native/cpp/DSCommPacket.cpp b/simulation/halsim_ds_socket/src/main/native/cpp/DSCommPacket.cpp index 95f393b303..f353005d83 100644 --- a/simulation/halsim_ds_socket/src/main/native/cpp/DSCommPacket.cpp +++ b/simulation/halsim_ds_socket/src/main/native/cpp/DSCommPacket.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ @@ -14,8 +14,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/simulation/halsim_ds_socket/src/main/native/include/DSCommPacket.h b/simulation/halsim_ds_socket/src/main/native/include/DSCommPacket.h index ebe36e4f68..f189d6ab3c 100644 --- a/simulation/halsim_ds_socket/src/main/native/include/DSCommPacket.h +++ b/simulation/halsim_ds_socket/src/main/native/include/DSCommPacket.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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,7 +10,7 @@ #include #include -#include +#include #include #include diff --git a/simulation/halsim_gazebo/src/main/native/cpp/GazeboAnalogIn.cpp b/simulation/halsim_gazebo/src/main/native/cpp/GazeboAnalogIn.cpp index 30319c93e2..ce202214c3 100644 --- a/simulation/halsim_gazebo/src/main/native/cpp/GazeboAnalogIn.cpp +++ b/simulation/halsim_gazebo/src/main/native/cpp/GazeboAnalogIn.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2014-2019 FIRST. All Rights Reserved. */ +/* Copyright (c) 2014-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 #include -#include -#include +#include +#include static void init_callback(const char* name, void* param, const struct HAL_Value* value) { diff --git a/simulation/halsim_gazebo/src/main/native/cpp/GazeboDIO.cpp b/simulation/halsim_gazebo/src/main/native/cpp/GazeboDIO.cpp index d0c190ec03..f95b4f585d 100644 --- a/simulation/halsim_gazebo/src/main/native/cpp/GazeboDIO.cpp +++ b/simulation/halsim_gazebo/src/main/native/cpp/GazeboDIO.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2014-2019 FIRST. All Rights Reserved. */ +/* Copyright (c) 2014-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 #include -#include -#include +#include +#include static void init_callback(const char* name, void* param, const struct HAL_Value* value) { diff --git a/simulation/halsim_gazebo/src/main/native/cpp/GazeboEncoder.cpp b/simulation/halsim_gazebo/src/main/native/cpp/GazeboEncoder.cpp index bb5894dae3..03c2f792c6 100644 --- a/simulation/halsim_gazebo/src/main/native/cpp/GazeboEncoder.cpp +++ b/simulation/halsim_gazebo/src/main/native/cpp/GazeboEncoder.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2014-2019 FIRST. All Rights Reserved. */ +/* Copyright (c) 2014-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 #include -#include -#include +#include +#include static void encoder_init_callback(const char* name, void* param, const struct HAL_Value* value) { diff --git a/simulation/halsim_gazebo/src/main/native/cpp/GazeboPCM.cpp b/simulation/halsim_gazebo/src/main/native/cpp/GazeboPCM.cpp index 0f0a44e69f..1802f2ef53 100644 --- a/simulation/halsim_gazebo/src/main/native/cpp/GazeboPCM.cpp +++ b/simulation/halsim_gazebo/src/main/native/cpp/GazeboPCM.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2014-2019 FIRST. All Rights Reserved. */ +/* Copyright (c) 2014-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 #include -#include -#include +#include +#include #include "simulation/gz_msgs/msgs.h" diff --git a/simulation/halsim_gazebo/src/main/native/cpp/GazeboPWM.cpp b/simulation/halsim_gazebo/src/main/native/cpp/GazeboPWM.cpp index 3e01e1d10d..a297255bee 100644 --- a/simulation/halsim_gazebo/src/main/native/cpp/GazeboPWM.cpp +++ b/simulation/halsim_gazebo/src/main/native/cpp/GazeboPWM.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2014-2019 FIRST. All Rights Reserved. */ +/* Copyright (c) 2014-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 #include -#include -#include +#include +#include #include "simulation/gz_msgs/msgs.h" diff --git a/simulation/halsim_gui/src/main/native/cpp/AccelerometerGui.cpp b/simulation/halsim_gui/src/main/native/cpp/AccelerometerGui.cpp index e993ba236e..5a8ec8b93e 100644 --- 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 #include +#include #include -#include #include "SimDeviceGui.h" diff --git a/simulation/halsim_gui/src/main/native/cpp/AddressableLEDGui.cpp b/simulation/halsim_gui/src/main/native/cpp/AddressableLEDGui.cpp index 2fbc4ba95a..36b085c23e 100644 --- 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 +#include #include #include -#include #include #include diff --git a/simulation/halsim_gui/src/main/native/cpp/AnalogGyroGui.cpp b/simulation/halsim_gui/src/main/native/cpp/AnalogGyroGui.cpp index 1ae0faed34..37c1faddc4 100644 --- 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 #include +#include #include -#include #include "SimDeviceGui.h" diff --git a/simulation/halsim_gui/src/main/native/cpp/AnalogInputGui.cpp b/simulation/halsim_gui/src/main/native/cpp/AnalogInputGui.cpp index c2b1ada2b8..80cfe401ad 100644 --- 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 +#include +#include +#include #include -#include -#include -#include #include "HALSimGui.h" #include "IniSaver.h" diff --git a/simulation/halsim_gui/src/main/native/cpp/AnalogOutGui.cpp b/simulation/halsim_gui/src/main/native/cpp/AnalogOutGui.cpp index e347bf5785..89b70ce7fe 100644 --- 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 +#include #include -#include #include "IniSaver.h" #include "IniSaverInfo.h" diff --git a/simulation/halsim_gui/src/main/native/cpp/CompressorGui.cpp b/simulation/halsim_gui/src/main/native/cpp/CompressorGui.cpp index 737a6f93c1..b2322320b2 100644 --- 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 #include +#include #include -#include #include "HALSimGui.h" #include "SimDeviceGui.h" diff --git a/simulation/halsim_gui/src/main/native/cpp/DIOGui.cpp b/simulation/halsim_gui/src/main/native/cpp/DIOGui.cpp index 7647cef85f..f3678956da 100644 --- 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 +#include +#include +#include +#include +#include #include -#include -#include -#include -#include -#include #include "HALSimGui.h" #include "IniSaver.h" diff --git a/simulation/halsim_gui/src/main/native/cpp/DriverStationGui.cpp b/simulation/halsim_gui/src/main/native/cpp/DriverStationGui.cpp index 38fd90e268..cccf29556e 100644 --- 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 #include +#include +#include #include #include -#include -#include #include #include #include diff --git a/simulation/halsim_gui/src/main/native/cpp/EncoderGui.cpp b/simulation/halsim_gui/src/main/native/cpp/EncoderGui.cpp index 6fdb1a543e..8edf1d95fd 100644 --- 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 +#include +#include #include -#include -#include #include "HALSimGui.h" #include "IniSaver.h" diff --git a/simulation/halsim_gui/src/main/native/cpp/Field2D.cpp b/simulation/halsim_gui/src/main/native/cpp/Field2D.cpp index 901ee30e08..4f4cf31821 100644 --- 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 #define IMGUI_DEFINE_MATH_OPERATORS +#include #include -#include #include #include #include diff --git a/simulation/halsim_gui/src/main/native/cpp/HALSimGui.cpp b/simulation/halsim_gui/src/main/native/cpp/HALSimGui.cpp index 8e0ad84937..a141bdde4e 100644 --- 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 #include +#include #include #include #include #include #include -#include #include #include diff --git a/simulation/halsim_gui/src/main/native/cpp/PDPGui.cpp b/simulation/halsim_gui/src/main/native/cpp/PDPGui.cpp index 5fdebbb58d..cfe1abb121 100644 --- 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 #include +#include #include -#include #include "HALSimGui.h" #include "IniSaver.h" diff --git a/simulation/halsim_gui/src/main/native/cpp/PWMGui.cpp b/simulation/halsim_gui/src/main/native/cpp/PWMGui.cpp index 2407e056b0..d1c03c75b5 100644 --- 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 #include +#include +#include #include -#include -#include #include "HALSimGui.h" #include "IniSaver.h" diff --git a/simulation/halsim_gui/src/main/native/cpp/RelayGui.cpp b/simulation/halsim_gui/src/main/native/cpp/RelayGui.cpp index df059c8aea..8b961eaf46 100644 --- 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 #include +#include #include -#include #include "ExtraGuiWidgets.h" #include "HALSimGui.h" diff --git a/simulation/halsim_gui/src/main/native/cpp/RoboRioGui.cpp b/simulation/halsim_gui/src/main/native/cpp/RoboRioGui.cpp index e4d6650e72..eab4a2311e 100644 --- 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 #include -#include #include "HALSimGui.h" diff --git a/simulation/halsim_gui/src/main/native/cpp/SimDeviceGui.cpp b/simulation/halsim_gui/src/main/native/cpp/SimDeviceGui.cpp index 12b162f66e..bc426d3fa7 100644 --- 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 #include +#include #include -#include #include "HALSimGui.h" #include "IniSaverInfo.h" diff --git a/simulation/halsim_gui/src/main/native/cpp/SolenoidGui.cpp b/simulation/halsim_gui/src/main/native/cpp/SolenoidGui.cpp index bc523a699a..9709a49e1e 100644 --- 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 #include +#include #include -#include #include #include "ExtraGuiWidgets.h" diff --git a/simulation/halsim_gui/src/main/native/cpp/TimingGui.cpp b/simulation/halsim_gui/src/main/native/cpp/TimingGui.cpp index 9897a7ab41..18e6dc8487 100644 --- 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 #include +#include +#include #include -#include -#include #include "HALSimGui.h" diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/MockHardwareExtension.java b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/MockHardwareExtension.java index 4f9abf05b4..b842c282a0 100644 --- a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/MockHardwareExtension.java +++ b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/MockHardwareExtension.java @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2016-2019 FIRST. All Rights Reserved. */ +/* Copyright (c) 2016-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,7 +12,7 @@ import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ExtensionContext.Namespace; import edu.wpi.first.hal.HAL; -import edu.wpi.first.hal.sim.DriverStationSim; +import edu.wpi.first.wpilibj.simulation.DriverStationSim; public final class MockHardwareExtension implements BeforeAllCallback { private static ExtensionContext getRoot(ExtensionContext context) { diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/CommandTestBase.java b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/CommandTestBase.java index 30ea673f36..5e443b6332 100644 --- a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/CommandTestBase.java +++ b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/CommandTestBase.java @@ -11,8 +11,8 @@ import java.util.Set; import org.junit.jupiter.api.BeforeEach; -import edu.wpi.first.hal.sim.DriverStationSim; import edu.wpi.first.wpilibj.DriverStation; +import edu.wpi.first.wpilibj.simulation.DriverStationSim; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandTestBase.h b/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandTestBase.h index 8b22844dca..6cdf6bf584 100644 --- a/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandTestBase.h +++ b/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandTestBase.h @@ -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. */ @@ -8,10 +8,10 @@ #pragma once #include -#include #include -#include +#include +#include #include "ErrorConfirmer.h" #include "frc2/command/CommandGroupBase.h" @@ -21,7 +21,6 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" #include "make_vector.h" -#include "simulation/DriverStationSim.h" namespace frc2 { class CommandTestBase : public ::testing::Test { diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/ErrorConfirmer.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/ErrorConfirmer.cpp index 2565a94271..2c13f5dbd8 100644 --- a/wpilibNewCommands/src/test/native/cpp/frc2/command/ErrorConfirmer.cpp +++ b/wpilibNewCommands/src/test/native/cpp/frc2/command/ErrorConfirmer.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,6 +7,8 @@ #include "ErrorConfirmer.h" +#include + ErrorConfirmer* ErrorConfirmer::instance; int32_t ErrorConfirmer::HandleError(HAL_Bool isError, int32_t errorCode, diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/ErrorConfirmer.h b/wpilibNewCommands/src/test/native/cpp/frc2/command/ErrorConfirmer.h index 011158ca45..2df5e26bcb 100644 --- a/wpilibNewCommands/src/test/native/cpp/frc2/command/ErrorConfirmer.h +++ b/wpilibNewCommands/src/test/native/cpp/frc2/command/ErrorConfirmer.h @@ -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,12 +7,9 @@ #pragma once -#include - -#include +#include #include "gmock/gmock.h" -#include "simulation/DriverStationSim.h" class ErrorConfirmer { public: diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/POVButtonTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/POVButtonTest.cpp index d501943c49..2f3976abe0 100644 --- a/wpilibNewCommands/src/test/native/cpp/frc2/command/POVButtonTest.cpp +++ b/wpilibNewCommands/src/test/native/cpp/frc2/command/POVButtonTest.cpp @@ -6,7 +6,7 @@ /*----------------------------------------------------------------------------*/ #include -#include +#include #include "CommandTestBase.h" #include "frc2/command/CommandScheduler.h" diff --git a/wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/MockHardwareExtension.java b/wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/MockHardwareExtension.java index d97b35237f..a53f41b276 100644 --- a/wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/MockHardwareExtension.java +++ b/wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/MockHardwareExtension.java @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2016-2019 FIRST. All Rights Reserved. */ +/* Copyright (c) 2016-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,7 +12,7 @@ import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ExtensionContext.Namespace; import edu.wpi.first.hal.HAL; -import edu.wpi.first.hal.sim.DriverStationSim; +import edu.wpi.first.wpilibj.simulation.DriverStationSim; public final class MockHardwareExtension implements BeforeAllCallback { private static ExtensionContext getRoot(ExtensionContext context) { diff --git a/hal/src/main/native/sim/CallbackStore.cpp b/wpilibc/src/main/native/cpp/simulation/CallbackStore.cpp similarity index 85% rename from hal/src/main/native/sim/CallbackStore.cpp rename to wpilibc/src/main/native/cpp/simulation/CallbackStore.cpp index d278b93ab6..6777d9bd77 100644 --- a/hal/src/main/native/sim/CallbackStore.cpp +++ b/wpilibc/src/main/native/cpp/simulation/CallbackStore.cpp @@ -1,11 +1,11 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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 "simulation/CallbackStore.h" +#include "frc/simulation/CallbackStore.h" void frc::sim::CallbackStoreThunk(const char* name, void* param, const HAL_Value* value) { diff --git a/hal/src/main/native/include/simulation/AccelerometerSim.h b/wpilibc/src/main/native/include/frc/simulation/AccelerometerSim.h similarity index 97% rename from hal/src/main/native/include/simulation/AccelerometerSim.h rename to wpilibc/src/main/native/include/frc/simulation/AccelerometerSim.h index 07860f0e51..4c1c9fdf59 100644 --- a/hal/src/main/native/include/simulation/AccelerometerSim.h +++ b/wpilibc/src/main/native/include/frc/simulation/AccelerometerSim.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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,9 @@ #include #include +#include + #include "CallbackStore.h" -#include "mockdata/AccelerometerData.h" namespace frc { namespace sim { diff --git a/hal/src/main/native/include/simulation/AnalogGyroSim.h b/wpilibc/src/main/native/include/frc/simulation/AnalogGyroSim.h similarity index 95% rename from hal/src/main/native/include/simulation/AnalogGyroSim.h rename to wpilibc/src/main/native/include/frc/simulation/AnalogGyroSim.h index b2cdb85484..b37d0c57bd 100644 --- a/hal/src/main/native/include/simulation/AnalogGyroSim.h +++ b/wpilibc/src/main/native/include/frc/simulation/AnalogGyroSim.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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,9 @@ #include #include +#include + #include "CallbackStore.h" -#include "mockdata/AnalogGyroData.h" namespace frc { namespace sim { diff --git a/hal/src/main/native/include/simulation/AnalogInSim.h b/wpilibc/src/main/native/include/frc/simulation/AnalogInSim.h similarity index 98% rename from hal/src/main/native/include/simulation/AnalogInSim.h rename to wpilibc/src/main/native/include/frc/simulation/AnalogInSim.h index 2a1bbead39..d317807a5a 100644 --- a/hal/src/main/native/include/simulation/AnalogInSim.h +++ b/wpilibc/src/main/native/include/frc/simulation/AnalogInSim.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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,9 @@ #include #include +#include + #include "CallbackStore.h" -#include "mockdata/AnalogInData.h" namespace frc { namespace sim { diff --git a/hal/src/main/native/include/simulation/AnalogOutSim.h b/wpilibc/src/main/native/include/frc/simulation/AnalogOutSim.h similarity index 94% rename from hal/src/main/native/include/simulation/AnalogOutSim.h rename to wpilibc/src/main/native/include/frc/simulation/AnalogOutSim.h index 6bb6e5a292..7dc4afe13d 100644 --- a/hal/src/main/native/include/simulation/AnalogOutSim.h +++ b/wpilibc/src/main/native/include/frc/simulation/AnalogOutSim.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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,9 @@ #include #include +#include + #include "CallbackStore.h" -#include "mockdata/AnalogOutData.h" namespace frc { namespace sim { diff --git a/hal/src/main/native/include/simulation/AnalogTriggerSim.h b/wpilibc/src/main/native/include/frc/simulation/AnalogTriggerSim.h similarity index 96% rename from hal/src/main/native/include/simulation/AnalogTriggerSim.h rename to wpilibc/src/main/native/include/frc/simulation/AnalogTriggerSim.h index 2c41be1727..e2462282b5 100644 --- a/hal/src/main/native/include/simulation/AnalogTriggerSim.h +++ b/wpilibc/src/main/native/include/frc/simulation/AnalogTriggerSim.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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,9 @@ #include #include +#include + #include "CallbackStore.h" -#include "mockdata/AnalogTriggerData.h" namespace frc { namespace sim { diff --git a/hal/src/main/native/include/simulation/CallbackStore.h b/wpilibc/src/main/native/include/frc/simulation/CallbackStore.h similarity index 96% rename from hal/src/main/native/include/simulation/CallbackStore.h rename to wpilibc/src/main/native/include/frc/simulation/CallbackStore.h index b2d4bdf58f..5d5d352fe8 100644 --- a/hal/src/main/native/include/simulation/CallbackStore.h +++ b/wpilibc/src/main/native/include/frc/simulation/CallbackStore.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ @@ -9,10 +9,9 @@ #include +#include #include -#include "hal/Value.h" - namespace frc { namespace sim { diff --git a/hal/src/main/native/include/simulation/DIOSim.h b/wpilibc/src/main/native/include/frc/simulation/DIOSim.h similarity index 97% rename from hal/src/main/native/include/simulation/DIOSim.h rename to wpilibc/src/main/native/include/frc/simulation/DIOSim.h index 57079b9b14..1bf002646f 100644 --- a/hal/src/main/native/include/simulation/DIOSim.h +++ b/wpilibc/src/main/native/include/frc/simulation/DIOSim.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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,9 @@ #include #include +#include + #include "CallbackStore.h" -#include "mockdata/DIOData.h" namespace frc { namespace sim { diff --git a/hal/src/main/native/include/simulation/DigitalPWMSim.h b/wpilibc/src/main/native/include/frc/simulation/DigitalPWMSim.h similarity index 95% rename from hal/src/main/native/include/simulation/DigitalPWMSim.h rename to wpilibc/src/main/native/include/frc/simulation/DigitalPWMSim.h index 5f5769d151..2a75031853 100644 --- a/hal/src/main/native/include/simulation/DigitalPWMSim.h +++ b/wpilibc/src/main/native/include/frc/simulation/DigitalPWMSim.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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,9 @@ #include #include +#include + #include "CallbackStore.h" -#include "mockdata/DigitalPWMData.h" namespace frc { namespace sim { diff --git a/hal/src/main/native/include/simulation/DriverStationSim.h b/wpilibc/src/main/native/include/frc/simulation/DriverStationSim.h similarity index 97% rename from hal/src/main/native/include/simulation/DriverStationSim.h rename to wpilibc/src/main/native/include/frc/simulation/DriverStationSim.h index e5071cc93c..90a6169ac8 100644 --- a/hal/src/main/native/include/simulation/DriverStationSim.h +++ b/wpilibc/src/main/native/include/frc/simulation/DriverStationSim.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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,9 @@ #include #include +#include + #include "CallbackStore.h" -#include "mockdata/DriverStationData.h" namespace frc { namespace sim { diff --git a/hal/src/main/native/include/simulation/DutyCycleSim.h b/wpilibc/src/main/native/include/frc/simulation/DutyCycleSim.h similarity index 95% rename from hal/src/main/native/include/simulation/DutyCycleSim.h rename to wpilibc/src/main/native/include/frc/simulation/DutyCycleSim.h index f55dfc96f1..2998c632c3 100644 --- a/hal/src/main/native/include/simulation/DutyCycleSim.h +++ b/wpilibc/src/main/native/include/frc/simulation/DutyCycleSim.h @@ -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,9 @@ #include #include +#include + #include "CallbackStore.h" -#include "mockdata/DutyCycleData.h" namespace frc { namespace sim { diff --git a/hal/src/main/native/include/simulation/EncoderSim.h b/wpilibc/src/main/native/include/frc/simulation/EncoderSim.h similarity index 99% rename from hal/src/main/native/include/simulation/EncoderSim.h rename to wpilibc/src/main/native/include/frc/simulation/EncoderSim.h index a97f1e3a9e..5bf89b0dfe 100644 --- a/hal/src/main/native/include/simulation/EncoderSim.h +++ b/wpilibc/src/main/native/include/frc/simulation/EncoderSim.h @@ -10,8 +10,9 @@ #include #include +#include + #include "CallbackStore.h" -#include "mockdata/EncoderData.h" namespace frc { namespace sim { diff --git a/hal/src/main/native/include/simulation/PCMSim.h b/wpilibc/src/main/native/include/frc/simulation/PCMSim.h similarity index 98% rename from hal/src/main/native/include/simulation/PCMSim.h rename to wpilibc/src/main/native/include/frc/simulation/PCMSim.h index b6fcd5a2bb..091f7ff1ad 100644 --- a/hal/src/main/native/include/simulation/PCMSim.h +++ b/wpilibc/src/main/native/include/frc/simulation/PCMSim.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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,9 @@ #include #include +#include + #include "CallbackStore.h" -#include "mockdata/PCMData.h" namespace frc { namespace sim { diff --git a/hal/src/main/native/include/simulation/PDPSim.h b/wpilibc/src/main/native/include/frc/simulation/PDPSim.h similarity index 96% rename from hal/src/main/native/include/simulation/PDPSim.h rename to wpilibc/src/main/native/include/frc/simulation/PDPSim.h index 72d8233f99..73e3cda54e 100644 --- a/hal/src/main/native/include/simulation/PDPSim.h +++ b/wpilibc/src/main/native/include/frc/simulation/PDPSim.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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,9 @@ #include #include +#include + #include "CallbackStore.h" -#include "mockdata/PDPData.h" namespace frc { namespace sim { diff --git a/hal/src/main/native/include/simulation/PWMSim.h b/wpilibc/src/main/native/include/frc/simulation/PWMSim.h similarity index 97% rename from hal/src/main/native/include/simulation/PWMSim.h rename to wpilibc/src/main/native/include/frc/simulation/PWMSim.h index 7aba360516..726555c8fb 100644 --- a/hal/src/main/native/include/simulation/PWMSim.h +++ b/wpilibc/src/main/native/include/frc/simulation/PWMSim.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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,9 @@ #include #include +#include + #include "CallbackStore.h" -#include "mockdata/PWMData.h" namespace frc { namespace sim { diff --git a/hal/src/main/native/include/simulation/RelaySim.h b/wpilibc/src/main/native/include/frc/simulation/RelaySim.h similarity index 96% rename from hal/src/main/native/include/simulation/RelaySim.h rename to wpilibc/src/main/native/include/frc/simulation/RelaySim.h index 6958a40a12..c8b1680c38 100644 --- a/hal/src/main/native/include/simulation/RelaySim.h +++ b/wpilibc/src/main/native/include/frc/simulation/RelaySim.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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,9 @@ #include #include +#include + #include "CallbackStore.h" -#include "mockdata/RelayData.h" namespace frc { namespace sim { diff --git a/hal/src/main/native/include/simulation/RoboRioSim.h b/wpilibc/src/main/native/include/frc/simulation/RoboRioSim.h similarity index 98% rename from hal/src/main/native/include/simulation/RoboRioSim.h rename to wpilibc/src/main/native/include/frc/simulation/RoboRioSim.h index 9b020ae901..e04e5b428f 100644 --- a/hal/src/main/native/include/simulation/RoboRioSim.h +++ b/wpilibc/src/main/native/include/frc/simulation/RoboRioSim.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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,9 @@ #include #include +#include + #include "CallbackStore.h" -#include "mockdata/RoboRioData.h" namespace frc { namespace sim { diff --git a/hal/src/main/native/include/simulation/SPIAccelerometerSim.h b/wpilibc/src/main/native/include/frc/simulation/SPIAccelerometerSim.h similarity index 96% rename from hal/src/main/native/include/simulation/SPIAccelerometerSim.h rename to wpilibc/src/main/native/include/frc/simulation/SPIAccelerometerSim.h index d7795eecef..94d407203c 100644 --- a/hal/src/main/native/include/simulation/SPIAccelerometerSim.h +++ b/wpilibc/src/main/native/include/frc/simulation/SPIAccelerometerSim.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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,9 @@ #include #include +#include + #include "CallbackStore.h" -#include "mockdata/SPIAccelerometerData.h" namespace frc { namespace sim { diff --git a/hal/src/main/native/include/simulation/SimDeviceSim.h b/wpilibc/src/main/native/include/frc/simulation/SimDeviceSim.h similarity index 94% rename from hal/src/main/native/include/simulation/SimDeviceSim.h rename to wpilibc/src/main/native/include/frc/simulation/SimDeviceSim.h index 5705a08227..5ea076ea64 100644 --- a/hal/src/main/native/include/simulation/SimDeviceSim.h +++ b/wpilibc/src/main/native/include/frc/simulation/SimDeviceSim.h @@ -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. */ @@ -13,9 +13,10 @@ #include #include +#include +#include + #include "CallbackStore.h" -#include "hal/SimDevice.h" -#include "mockdata/SimDeviceData.h" namespace frc { namespace sim { diff --git a/hal/src/main/native/include/simulation/SimHooks.h b/wpilibc/src/main/native/include/frc/simulation/SimHooks.h similarity index 96% rename from hal/src/main/native/include/simulation/SimHooks.h rename to wpilibc/src/main/native/include/frc/simulation/SimHooks.h index c348d77ed6..b91c9f8c47 100644 --- a/hal/src/main/native/include/simulation/SimHooks.h +++ b/wpilibc/src/main/native/include/frc/simulation/SimHooks.h @@ -7,7 +7,7 @@ #pragma once -#include "mockdata/MockHooks.h" +#include namespace frc { namespace sim { diff --git a/hal/src/test/native/cpp/sim/AccelerometerSimTest.cpp b/wpilibc/src/test/native/cpp/simulation/AccelerometerSimTest.cpp similarity index 83% rename from hal/src/test/native/cpp/sim/AccelerometerSimTest.cpp rename to wpilibc/src/test/native/cpp/simulation/AccelerometerSimTest.cpp index 54be6e3060..7807e0c908 100644 --- a/hal/src/test/native/cpp/sim/AccelerometerSimTest.cpp +++ b/wpilibc/src/test/native/cpp/simulation/AccelerometerSimTest.cpp @@ -1,19 +1,19 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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 "frc/simulation/AccelerometerSim.h" // NOLINT(build/include_order) + +#include +#include + #include "gtest/gtest.h" -#include "hal/Accelerometer.h" -#include "hal/HAL.h" -#include "simulation/AccelerometerSim.h" using namespace frc::sim; -namespace hal { - TEST(AcclerometerSimTests, TestActiveCallback) { HAL_Initialize(500, 0); @@ -38,5 +38,3 @@ TEST(AcclerometerSimTests, TestActiveCallback) { EXPECT_TRUE(wasTriggered); EXPECT_TRUE(lastValue); } - -} // namespace hal diff --git a/hal/src/test/native/cpp/sim/SimDeviceSimTest.cpp b/wpilibc/src/test/native/cpp/simulation/SimDeviceSimTest.cpp similarity index 73% rename from hal/src/test/native/cpp/sim/SimDeviceSimTest.cpp rename to wpilibc/src/test/native/cpp/simulation/SimDeviceSimTest.cpp index ba0646d0da..ea7b809c67 100644 --- a/hal/src/test/native/cpp/sim/SimDeviceSimTest.cpp +++ b/wpilibc/src/test/native/cpp/simulation/SimDeviceSimTest.cpp @@ -1,33 +1,31 @@ /*----------------------------------------------------------------------------*/ -/* 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 #include +#include "frc/simulation/SimDeviceSim.h" #include "gtest/gtest.h" -#include "hal/SimDevice.h" -#include "simulation/SimDeviceSim.h" using namespace frc::sim; -namespace hal { - TEST(SimDeviceSimTests, TestBasic) { - SimDevice dev{"test"}; - SimBoolean devBool = dev.CreateBoolean("bool", false, false); + hal::SimDevice dev{"test"}; + hal::SimBoolean devBool = dev.CreateBoolean("bool", false, false); SimDeviceSim sim{"test"}; - SimBoolean simBool = sim.GetBoolean("bool"); + hal::SimBoolean simBool = sim.GetBoolean("bool"); EXPECT_FALSE(simBool.Get()); simBool.Set(true); EXPECT_TRUE(devBool.Get()); } TEST(SimDeviceSimTests, TestEnumerateDevices) { - SimDevice dev{"test"}; + hal::SimDevice dev{"test"}; bool foundit = false; SimDeviceSim::EnumerateDevices( @@ -36,5 +34,3 @@ TEST(SimDeviceSimTests, TestEnumerateDevices) { }); EXPECT_TRUE(foundit); } - -} // namespace hal diff --git a/hal/src/test/native/cpp/sim/SimInitializationTest.cpp b/wpilibc/src/test/native/cpp/simulation/SimInitializationTest.cpp similarity index 57% rename from hal/src/test/native/cpp/sim/SimInitializationTest.cpp rename to wpilibc/src/test/native/cpp/simulation/SimInitializationTest.cpp index fdd34cd35c..da603b8942 100644 --- a/hal/src/test/native/cpp/sim/SimInitializationTest.cpp +++ b/wpilibc/src/test/native/cpp/simulation/SimInitializationTest.cpp @@ -1,32 +1,31 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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 + +#include "frc/simulation/AccelerometerSim.h" +#include "frc/simulation/AnalogGyroSim.h" +#include "frc/simulation/AnalogInSim.h" +#include "frc/simulation/AnalogOutSim.h" +#include "frc/simulation/AnalogTriggerSim.h" +#include "frc/simulation/DIOSim.h" +#include "frc/simulation/DigitalPWMSim.h" +#include "frc/simulation/DriverStationSim.h" +#include "frc/simulation/EncoderSim.h" +#include "frc/simulation/PCMSim.h" +#include "frc/simulation/PDPSim.h" +#include "frc/simulation/PWMSim.h" +#include "frc/simulation/RelaySim.h" +#include "frc/simulation/RoboRioSim.h" +#include "frc/simulation/SPIAccelerometerSim.h" #include "gtest/gtest.h" -#include "hal/HAL.h" -#include "simulation/AccelerometerSim.h" -#include "simulation/AnalogGyroSim.h" -#include "simulation/AnalogInSim.h" -#include "simulation/AnalogOutSim.h" -#include "simulation/AnalogTriggerSim.h" -#include "simulation/DIOSim.h" -#include "simulation/DigitalPWMSim.h" -#include "simulation/DriverStationSim.h" -#include "simulation/EncoderSim.h" -#include "simulation/PCMSim.h" -#include "simulation/PDPSim.h" -#include "simulation/PWMSim.h" -#include "simulation/RelaySim.h" -#include "simulation/RoboRioSim.h" -#include "simulation/SPIAccelerometerSim.h" using namespace frc::sim; -namespace hal { - TEST(SimInitializationTests, TestAllInitialize) { HAL_Initialize(500, 0); AccelerometerSim acsim{0}; @@ -46,4 +45,3 @@ TEST(SimInitializationTests, TestAllInitialize) { RoboRioSim rrsim{0}; SPIAccelerometerSim sasim{0}; } -} // namespace hal diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/AccelerometerSim.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AccelerometerSim.java similarity index 92% rename from hal/src/main/java/edu/wpi/first/hal/sim/AccelerometerSim.java rename to wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AccelerometerSim.java index d9c95aff0b..3acf1e9ae0 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/AccelerometerSim.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AccelerometerSim.java @@ -1,13 +1,14 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim; +package edu.wpi.first.wpilibj.simulation; -import edu.wpi.first.hal.sim.mockdata.AccelerometerDataJNI; +import edu.wpi.first.hal.simulation.AccelerometerDataJNI; +import edu.wpi.first.hal.simulation.NotifyCallback; public class AccelerometerSim { private final int m_index; diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/AddressableLEDSim.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AddressableLEDSim.java similarity index 91% rename from hal/src/main/java/edu/wpi/first/hal/sim/AddressableLEDSim.java rename to wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AddressableLEDSim.java index cc6eefa244..8369a0593a 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/AddressableLEDSim.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AddressableLEDSim.java @@ -1,13 +1,15 @@ /*----------------------------------------------------------------------------*/ -/* 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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim; +package edu.wpi.first.wpilibj.simulation; -import edu.wpi.first.hal.sim.mockdata.AddressableLEDDataJNI; +import edu.wpi.first.hal.simulation.AddressableLEDDataJNI; +import edu.wpi.first.hal.simulation.ConstBufferCallback; +import edu.wpi.first.hal.simulation.NotifyCallback; public class AddressableLEDSim { private final int m_index; diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/AnalogGyroSim.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AnalogGyroSim.java similarity index 90% rename from hal/src/main/java/edu/wpi/first/hal/sim/AnalogGyroSim.java rename to wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AnalogGyroSim.java index ddaa0ce6a9..539bac15c8 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/AnalogGyroSim.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AnalogGyroSim.java @@ -1,13 +1,14 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim; +package edu.wpi.first.wpilibj.simulation; -import edu.wpi.first.hal.sim.mockdata.AnalogGyroDataJNI; +import edu.wpi.first.hal.simulation.AnalogGyroDataJNI; +import edu.wpi.first.hal.simulation.NotifyCallback; public class AnalogGyroSim { private final int m_index; diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/AnalogInSim.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AnalogInSim.java similarity index 96% rename from hal/src/main/java/edu/wpi/first/hal/sim/AnalogInSim.java rename to wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AnalogInSim.java index f7f86bbfb7..0fee6d2855 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/AnalogInSim.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AnalogInSim.java @@ -1,13 +1,14 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim; +package edu.wpi.first.wpilibj.simulation; -import edu.wpi.first.hal.sim.mockdata.AnalogInDataJNI; +import edu.wpi.first.hal.simulation.AnalogInDataJNI; +import edu.wpi.first.hal.simulation.NotifyCallback; public class AnalogInSim { private final int m_index; diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/AnalogOutSim.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AnalogOutSim.java similarity index 88% rename from hal/src/main/java/edu/wpi/first/hal/sim/AnalogOutSim.java rename to wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AnalogOutSim.java index 4731b11c74..fc67b3187f 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/AnalogOutSim.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AnalogOutSim.java @@ -1,13 +1,14 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim; +package edu.wpi.first.wpilibj.simulation; -import edu.wpi.first.hal.sim.mockdata.AnalogOutDataJNI; +import edu.wpi.first.hal.simulation.AnalogOutDataJNI; +import edu.wpi.first.hal.simulation.NotifyCallback; public class AnalogOutSim { private final int m_index; diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/AnalogTriggerSim.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AnalogTriggerSim.java similarity index 91% rename from hal/src/main/java/edu/wpi/first/hal/sim/AnalogTriggerSim.java rename to wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AnalogTriggerSim.java index fd88d5fa41..d90ff3a117 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/AnalogTriggerSim.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AnalogTriggerSim.java @@ -1,13 +1,14 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim; +package edu.wpi.first.wpilibj.simulation; -import edu.wpi.first.hal.sim.mockdata.AnalogTriggerDataJNI; +import edu.wpi.first.hal.simulation.AnalogTriggerDataJNI; +import edu.wpi.first.hal.simulation.NotifyCallback; public class AnalogTriggerSim { private final int m_index; diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/CallbackStore.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/CallbackStore.java similarity index 95% rename from hal/src/main/java/edu/wpi/first/hal/sim/CallbackStore.java rename to wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/CallbackStore.java index 7564104d1e..3df142f7d5 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/CallbackStore.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/CallbackStore.java @@ -1,11 +1,11 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim; +package edu.wpi.first.wpilibj.simulation; public class CallbackStore implements AutoCloseable { interface CancelCallbackFunc { diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/DIOSim.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/DIOSim.java similarity index 93% rename from hal/src/main/java/edu/wpi/first/hal/sim/DIOSim.java rename to wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/DIOSim.java index cd7582219f..ef186a8e36 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/DIOSim.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/DIOSim.java @@ -1,13 +1,14 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim; +package edu.wpi.first.wpilibj.simulation; -import edu.wpi.first.hal.sim.mockdata.DIODataJNI; +import edu.wpi.first.hal.simulation.DIODataJNI; +import edu.wpi.first.hal.simulation.NotifyCallback; public class DIOSim { private final int m_index; diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/DigitalPWMSim.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/DigitalPWMSim.java similarity index 90% rename from hal/src/main/java/edu/wpi/first/hal/sim/DigitalPWMSim.java rename to wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/DigitalPWMSim.java index 314d9940d3..c934f87c76 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/DigitalPWMSim.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/DigitalPWMSim.java @@ -1,13 +1,14 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim; +package edu.wpi.first.wpilibj.simulation; -import edu.wpi.first.hal.sim.mockdata.DigitalPWMDataJNI; +import edu.wpi.first.hal.simulation.DigitalPWMDataJNI; +import edu.wpi.first.hal.simulation.NotifyCallback; public class DigitalPWMSim { private final int m_index; diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/DriverStationSim.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/DriverStationSim.java similarity index 94% rename from hal/src/main/java/edu/wpi/first/hal/sim/DriverStationSim.java rename to wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/DriverStationSim.java index d14af9fdb1..bc04608f19 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/DriverStationSim.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/DriverStationSim.java @@ -1,13 +1,14 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim; +package edu.wpi.first.wpilibj.simulation; -import edu.wpi.first.hal.sim.mockdata.DriverStationDataJNI; +import edu.wpi.first.hal.simulation.DriverStationDataJNI; +import edu.wpi.first.hal.simulation.NotifyCallback; public class DriverStationSim { public CallbackStore registerEnabledCallback(NotifyCallback callback, boolean initialNotify) { diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/DutyCycleSim.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/DutyCycleSim.java similarity index 90% rename from hal/src/main/java/edu/wpi/first/hal/sim/DutyCycleSim.java rename to wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/DutyCycleSim.java index 9b2806bfb1..47e2e637e2 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/DutyCycleSim.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/DutyCycleSim.java @@ -1,13 +1,14 @@ /*----------------------------------------------------------------------------*/ -/* 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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim; +package edu.wpi.first.wpilibj.simulation; -import edu.wpi.first.hal.sim.mockdata.DutyCycleDataJNI; +import edu.wpi.first.hal.simulation.DutyCycleDataJNI; +import edu.wpi.first.hal.simulation.NotifyCallback; public class DutyCycleSim { private final int m_index; diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/EncoderSim.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/EncoderSim.java similarity index 97% rename from hal/src/main/java/edu/wpi/first/hal/sim/EncoderSim.java rename to wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/EncoderSim.java index 853b86873c..2ea74ff5de 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/EncoderSim.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/EncoderSim.java @@ -5,9 +5,10 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim; +package edu.wpi.first.wpilibj.simulation; -import edu.wpi.first.hal.sim.mockdata.EncoderDataJNI; +import edu.wpi.first.hal.simulation.EncoderDataJNI; +import edu.wpi.first.hal.simulation.NotifyCallback; public class EncoderSim { private final int m_index; diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/I2CSim.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/I2CSim.java similarity index 82% rename from hal/src/main/java/edu/wpi/first/hal/sim/I2CSim.java rename to wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/I2CSim.java index 3a9aa02a4a..1252eeb87d 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/I2CSim.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/I2CSim.java @@ -1,13 +1,16 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim; +package edu.wpi.first.wpilibj.simulation; -import edu.wpi.first.hal.sim.mockdata.I2CDataJNI; +import edu.wpi.first.hal.simulation.BufferCallback; +import edu.wpi.first.hal.simulation.ConstBufferCallback; +import edu.wpi.first.hal.simulation.I2CDataJNI; +import edu.wpi.first.hal.simulation.NotifyCallback; public class I2CSim { private final int m_index; diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/NotifierSim.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/NotifierSim.java similarity index 80% rename from hal/src/main/java/edu/wpi/first/hal/sim/NotifierSim.java rename to wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/NotifierSim.java index f19a674a08..54958d81b9 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/NotifierSim.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/NotifierSim.java @@ -1,13 +1,13 @@ /*----------------------------------------------------------------------------*/ -/* 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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim; +package edu.wpi.first.wpilibj.simulation; -import edu.wpi.first.hal.sim.mockdata.NotifierDataJNI; +import edu.wpi.first.hal.simulation.NotifierDataJNI; public final class NotifierSim { private NotifierSim() { diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/PCMSim.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/PCMSim.java similarity index 95% rename from hal/src/main/java/edu/wpi/first/hal/sim/PCMSim.java rename to wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/PCMSim.java index f8cc327b81..4d458a4ea2 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/PCMSim.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/PCMSim.java @@ -1,13 +1,14 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim; +package edu.wpi.first.wpilibj.simulation; -import edu.wpi.first.hal.sim.mockdata.PCMDataJNI; +import edu.wpi.first.hal.simulation.NotifyCallback; +import edu.wpi.first.hal.simulation.PCMDataJNI; public class PCMSim { private final int m_index; diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/PDPSim.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/PDPSim.java similarity index 92% rename from hal/src/main/java/edu/wpi/first/hal/sim/PDPSim.java rename to wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/PDPSim.java index d44cf3a239..2696ef4050 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/PDPSim.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/PDPSim.java @@ -1,13 +1,14 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim; +package edu.wpi.first.wpilibj.simulation; -import edu.wpi.first.hal.sim.mockdata.PDPDataJNI; +import edu.wpi.first.hal.simulation.NotifyCallback; +import edu.wpi.first.hal.simulation.PDPDataJNI; public class PDPSim { private final int m_index; diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/PWMSim.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/PWMSim.java similarity index 94% rename from hal/src/main/java/edu/wpi/first/hal/sim/PWMSim.java rename to wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/PWMSim.java index dde38a4c8a..2326e9a5c1 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/PWMSim.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/PWMSim.java @@ -1,13 +1,14 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim; +package edu.wpi.first.wpilibj.simulation; -import edu.wpi.first.hal.sim.mockdata.PWMDataJNI; +import edu.wpi.first.hal.simulation.NotifyCallback; +import edu.wpi.first.hal.simulation.PWMDataJNI; public class PWMSim { private final int m_index; diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/RelaySim.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/RelaySim.java similarity index 92% rename from hal/src/main/java/edu/wpi/first/hal/sim/RelaySim.java rename to wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/RelaySim.java index 84059e80b8..140c6d76bb 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/RelaySim.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/RelaySim.java @@ -1,13 +1,14 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim; +package edu.wpi.first.wpilibj.simulation; -import edu.wpi.first.hal.sim.mockdata.RelayDataJNI; +import edu.wpi.first.hal.simulation.NotifyCallback; +import edu.wpi.first.hal.simulation.RelayDataJNI; public class RelaySim { private final int m_index; diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/RoboRioSim.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/RoboRioSim.java similarity index 97% rename from hal/src/main/java/edu/wpi/first/hal/sim/RoboRioSim.java rename to wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/RoboRioSim.java index 082f712b50..7b78ad5464 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/RoboRioSim.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/RoboRioSim.java @@ -1,13 +1,14 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim; +package edu.wpi.first.wpilibj.simulation; -import edu.wpi.first.hal.sim.mockdata.RoboRioDataJNI; +import edu.wpi.first.hal.simulation.NotifyCallback; +import edu.wpi.first.hal.simulation.RoboRioDataJNI; @SuppressWarnings({"PMD.ExcessivePublicCount", "PMD.TooManyMethods"}) public class RoboRioSim { diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/SPIAccelerometerSim.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/SPIAccelerometerSim.java similarity index 92% rename from hal/src/main/java/edu/wpi/first/hal/sim/SPIAccelerometerSim.java rename to wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/SPIAccelerometerSim.java index 94577bdc15..ce6b5c18ba 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/SPIAccelerometerSim.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/SPIAccelerometerSim.java @@ -1,13 +1,14 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim; +package edu.wpi.first.wpilibj.simulation; -import edu.wpi.first.hal.sim.mockdata.SPIAccelerometerDataJNI; +import edu.wpi.first.hal.simulation.NotifyCallback; +import edu.wpi.first.hal.simulation.SPIAccelerometerDataJNI; public class SPIAccelerometerSim { private final int m_index; diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/SPISim.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/SPISim.java similarity index 82% rename from hal/src/main/java/edu/wpi/first/hal/sim/SPISim.java rename to wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/SPISim.java index 5f43bcaa7f..6a7f548532 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/SPISim.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/SPISim.java @@ -1,13 +1,17 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim; +package edu.wpi.first.wpilibj.simulation; -import edu.wpi.first.hal.sim.mockdata.SPIDataJNI; +import edu.wpi.first.hal.simulation.BufferCallback; +import edu.wpi.first.hal.simulation.ConstBufferCallback; +import edu.wpi.first.hal.simulation.NotifyCallback; +import edu.wpi.first.hal.simulation.SPIDataJNI; +import edu.wpi.first.hal.simulation.SpiReadAutoReceiveBufferCallback; public class SPISim { private final int m_index; diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/SimDeviceSim.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/SimDeviceSim.java similarity index 92% rename from hal/src/main/java/edu/wpi/first/hal/sim/SimDeviceSim.java rename to wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/SimDeviceSim.java index e46c811167..49f57c43ac 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/SimDeviceSim.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/SimDeviceSim.java @@ -1,17 +1,19 @@ /*----------------------------------------------------------------------------*/ -/* 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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim; +package edu.wpi.first.wpilibj.simulation; import edu.wpi.first.hal.SimBoolean; import edu.wpi.first.hal.SimDouble; import edu.wpi.first.hal.SimEnum; import edu.wpi.first.hal.SimValue; -import edu.wpi.first.hal.sim.mockdata.SimDeviceDataJNI; +import edu.wpi.first.hal.simulation.SimDeviceCallback; +import edu.wpi.first.hal.simulation.SimDeviceDataJNI; +import edu.wpi.first.hal.simulation.SimValueCallback; public class SimDeviceSim { private final int m_handle; diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/MockHardwareExtension.java b/wpilibj/src/test/java/edu/wpi/first/wpilibj/MockHardwareExtension.java index d97b35237f..a53f41b276 100644 --- a/wpilibj/src/test/java/edu/wpi/first/wpilibj/MockHardwareExtension.java +++ b/wpilibj/src/test/java/edu/wpi/first/wpilibj/MockHardwareExtension.java @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2016-2019 FIRST. All Rights Reserved. */ +/* Copyright (c) 2016-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,7 +12,7 @@ import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ExtensionContext.Namespace; import edu.wpi.first.hal.HAL; -import edu.wpi.first.hal.sim.DriverStationSim; +import edu.wpi.first.wpilibj.simulation.DriverStationSim; public final class MockHardwareExtension implements BeforeAllCallback { private static ExtensionContext getRoot(ExtensionContext context) { diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/hal/MatchInfoDataTest.java b/wpilibj/src/test/java/edu/wpi/first/wpilibj/hal/MatchInfoDataTest.java index 98b8489ea2..3887d91f13 100644 --- a/wpilibj/src/test/java/edu/wpi/first/wpilibj/hal/MatchInfoDataTest.java +++ b/wpilibj/src/test/java/edu/wpi/first/wpilibj/hal/MatchInfoDataTest.java @@ -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. */ @@ -11,7 +11,7 @@ import org.junit.jupiter.api.Test; import edu.wpi.first.hal.HAL; import edu.wpi.first.hal.MatchInfoData; -import edu.wpi.first.hal.sim.mockdata.DriverStationDataJNI; +import edu.wpi.first.hal.simulation.DriverStationDataJNI; import edu.wpi.first.wpilibj.DriverStation.MatchType; import static org.junit.jupiter.api.Assertions.assertAll; diff --git a/hal/src/test/java/edu/wpi/first/hal/sim/AccelerometerSimTest.java b/wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/AccelerometerSimTest.java similarity index 92% rename from hal/src/test/java/edu/wpi/first/hal/sim/AccelerometerSimTest.java rename to wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/AccelerometerSimTest.java index 383165cfcd..991e267b59 100644 --- a/hal/src/test/java/edu/wpi/first/hal/sim/AccelerometerSimTest.java +++ b/wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/AccelerometerSimTest.java @@ -1,11 +1,11 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim; +package edu.wpi.first.wpilibj.simulation; import org.junit.jupiter.api.Test; diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/sim/AnalogInputSimTest.java b/wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/AnalogInputSimTest.java similarity index 94% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/sim/AnalogInputSimTest.java rename to wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/AnalogInputSimTest.java index a9d9cd974d..642b2f2fa5 100644 --- a/wpilibj/src/test/java/edu/wpi/first/wpilibj/sim/AnalogInputSimTest.java +++ b/wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/AnalogInputSimTest.java @@ -5,13 +5,12 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.sim; +package edu.wpi.first.wpilibj.simulation; import org.junit.jupiter.api.Test; import edu.wpi.first.wpilibj.AnalogInput; import edu.wpi.first.hal.HAL; -import edu.wpi.first.hal.sim.AnalogInSim; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/sim/AnalogOutputSimTest.java b/wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/AnalogOutputSimTest.java similarity index 94% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/sim/AnalogOutputSimTest.java rename to wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/AnalogOutputSimTest.java index a9848752f6..c8e095c3c5 100644 --- a/wpilibj/src/test/java/edu/wpi/first/wpilibj/sim/AnalogOutputSimTest.java +++ b/wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/AnalogOutputSimTest.java @@ -5,12 +5,10 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.sim; +package edu.wpi.first.wpilibj.simulation; import edu.wpi.first.wpilibj.AnalogOutput; import edu.wpi.first.hal.HAL; -import edu.wpi.first.hal.sim.AnalogOutSim; -import edu.wpi.first.hal.sim.CallbackStore; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/hal/src/test/java/edu/wpi/first/hal/sim/SimDeviceSimTest.java b/wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/SimDeviceSimTest.java similarity index 90% rename from hal/src/test/java/edu/wpi/first/hal/sim/SimDeviceSimTest.java rename to wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/SimDeviceSimTest.java index 29452a0c76..6b9fe61408 100644 --- a/hal/src/test/java/edu/wpi/first/hal/sim/SimDeviceSimTest.java +++ b/wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/SimDeviceSimTest.java @@ -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. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.hal.sim; +package edu.wpi.first.wpilibj.simulation; import org.junit.jupiter.api.Test; diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/trajectory/TrajectoryGeneratorTest.java b/wpilibj/src/test/java/edu/wpi/first/wpilibj/trajectory/TrajectoryGeneratorTest.java index 81fb5b4356..75323672f3 100644 --- a/wpilibj/src/test/java/edu/wpi/first/wpilibj/trajectory/TrajectoryGeneratorTest.java +++ b/wpilibj/src/test/java/edu/wpi/first/wpilibj/trajectory/TrajectoryGeneratorTest.java @@ -13,11 +13,11 @@ import java.util.List; import org.junit.jupiter.api.Test; -import edu.wpi.first.hal.sim.DriverStationSim; import edu.wpi.first.wpilibj.geometry.Pose2d; import edu.wpi.first.wpilibj.geometry.Rotation2d; import edu.wpi.first.wpilibj.geometry.Transform2d; import edu.wpi.first.wpilibj.geometry.Translation2d; +import edu.wpi.first.wpilibj.simulation.DriverStationSim; import edu.wpi.first.wpilibj.trajectory.constraint.TrajectoryConstraint; import static edu.wpi.first.wpilibj.util.Units.feetToMeters;