From 105deaddb030e4de424ef27a4f025ef078b3697d Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Fri, 7 Nov 2025 19:56:29 -0500 Subject: [PATCH] HAND FIXES: Fixup java and python compilation --- wpilibj/src/main/java/org/wpilib/ExpansionHub.java | 1 + wpilibj/src/main/java/org/wpilib/ExpansionHubMotor.java | 1 + .../src/main/java/org/wpilib/ExpansionHubPidConstants.java | 1 + wpilibj/src/main/java/org/wpilib/ExpansionHubServo.java | 1 + .../main/java/org/wpilib/driverstation/DSControlWord.java | 1 + .../main/java/org/wpilib/driverstation/DriverStation.java | 1 + .../java/org/wpilib/hardware/accelerometer/ADXL345_I2C.java | 1 + .../wpilib/hardware/accelerometer/AnalogAccelerometer.java | 1 + .../java/org/wpilib/hardware/discrete/DigitalInput.java | 1 + .../java/org/wpilib/hardware/discrete/DigitalOutput.java | 1 + wpilibj/src/main/java/org/wpilib/hardware/discrete/PWM.java | 1 + .../src/main/java/org/wpilib/hardware/led/LEDPattern.java | 2 ++ .../main/java/org/wpilib/hardware/motor/MotorSafety.java | 3 +++ .../java/org/wpilib/hardware/pneumatic/PneumaticHub.java | 1 + .../java/org/wpilib/hardware/pneumatic/PneumaticsBase.java | 2 ++ .../wpilib/hardware/pneumatic/PneumaticsControlModule.java | 1 + .../src/main/java/org/wpilib/hardware/range/SharpIR.java | 1 + .../java/org/wpilib/hardware/rotation/AnalogEncoder.java | 2 ++ .../org/wpilib/hardware/rotation/AnalogPotentiometer.java | 2 ++ .../src/main/java/org/wpilib/hardware/rotation/Encoder.java | 1 + .../src/main/java/org/wpilib/opmode/IterativeRobotBase.java | 3 +++ wpilibj/src/main/java/org/wpilib/opmode/RobotBase.java | 6 +++++- wpilibj/src/main/java/org/wpilib/opmode/RobotState.java | 2 ++ wpilibj/src/main/java/org/wpilib/opmode/TimedRobot.java | 1 + wpilibj/src/main/java/org/wpilib/system/DataLogManager.java | 2 ++ wpilibj/src/main/java/org/wpilib/system/Filesystem.java | 1 + wpilibj/src/main/java/org/wpilib/system/Notifier.java | 2 ++ wpilibj/src/main/java/org/wpilib/system/Timer.java | 1 + wpilibj/src/main/java/org/wpilib/system/Tracer.java | 1 + wpilibj/src/main/java/org/wpilib/system/Watchdog.java | 1 + wpilibj/src/main/java/org/wpilib/util/Alert.java | 1 + .../test/java/org/wpilib/hardware/led/LEDPatternTest.java | 1 + .../wpilib/hardware/rotation/AnalogPotentiometerTest.java | 1 + .../test/java/org/wpilib/system/RobotControllerTest.java | 2 ++ wpimath/src/dev/java/org/wpilib/math/DevMain.java | 2 ++ .../math/interpolation/InterpolatingMatrixTreeMap.java | 2 ++ wpimath/src/main/java/org/wpilib/math/linalg/DARE.java | 1 + .../src/main/java/org/wpilib/math/linalg/MatBuilder.java | 2 ++ wpimath/src/main/java/org/wpilib/math/linalg/Matrix.java | 2 ++ .../src/main/java/org/wpilib/math/linalg/VecBuilder.java | 2 ++ wpimath/src/main/java/org/wpilib/math/linalg/Vector.java | 2 ++ wpimath/src/main/java/org/wpilib/math/util/MathUtil.java | 1 + .../src/main/java/org/wpilib/math/util/StateSpaceUtil.java | 2 ++ wpimath/src/test/java/org/wpilib/math/linalg/DARETest.java | 2 ++ .../src/test/java/org/wpilib/math/linalg/MatrixTest.java | 1 + .../src/test/java/org/wpilib/math/util/MathUtilTest.java | 1 + .../test/java/org/wpilib/math/util/StateSpaceUtilTest.java | 3 +++ wpiutil/src/dev/java/org/wpilib/util/DevMain.java | 2 ++ wpiutil/src/main/java/org/wpilib/util/WPIUtilJNI.java | 1 + .../main/java/org/wpilib/util/concurrent/EventVector.java | 1 + wpiutil/src/main/native/cpp/jni/WPIUtilJNI.cpp | 2 +- 51 files changed, 78 insertions(+), 2 deletions(-) diff --git a/wpilibj/src/main/java/org/wpilib/ExpansionHub.java b/wpilibj/src/main/java/org/wpilib/ExpansionHub.java index d99003566d..4b58366aaf 100644 --- a/wpilibj/src/main/java/org/wpilib/ExpansionHub.java +++ b/wpilibj/src/main/java/org/wpilib/ExpansionHub.java @@ -7,6 +7,7 @@ package org.wpilib; import org.wpilib.hardware.hal.HAL; import org.wpilib.networktables.BooleanSubscriber; import org.wpilib.networktables.NetworkTableInstance; +import org.wpilib.system.SystemServer; /** This class controls a REV ExpansionHub plugged in over USB to Systemcore. */ public class ExpansionHub implements AutoCloseable { diff --git a/wpilibj/src/main/java/org/wpilib/ExpansionHubMotor.java b/wpilibj/src/main/java/org/wpilib/ExpansionHubMotor.java index 95a90f025a..2228c730d0 100644 --- a/wpilibj/src/main/java/org/wpilib/ExpansionHubMotor.java +++ b/wpilibj/src/main/java/org/wpilib/ExpansionHubMotor.java @@ -15,6 +15,7 @@ import org.wpilib.networktables.DoubleSubscriber; import org.wpilib.networktables.IntegerPublisher; import org.wpilib.networktables.NetworkTableInstance; import org.wpilib.networktables.PubSubOption; +import org.wpilib.system.SystemServer; import org.wpilib.units.measure.Current; import org.wpilib.units.measure.Voltage; diff --git a/wpilibj/src/main/java/org/wpilib/ExpansionHubPidConstants.java b/wpilibj/src/main/java/org/wpilib/ExpansionHubPidConstants.java index c95faecd92..0cbcd2bb9b 100644 --- a/wpilibj/src/main/java/org/wpilib/ExpansionHubPidConstants.java +++ b/wpilibj/src/main/java/org/wpilib/ExpansionHubPidConstants.java @@ -8,6 +8,7 @@ import org.wpilib.networktables.BooleanPublisher; import org.wpilib.networktables.DoublePublisher; import org.wpilib.networktables.NetworkTableInstance; import org.wpilib.networktables.PubSubOption; +import org.wpilib.system.SystemServer; /** This class contains PID constants for an ExpansionHub motor. */ public class ExpansionHubPidConstants { diff --git a/wpilibj/src/main/java/org/wpilib/ExpansionHubServo.java b/wpilibj/src/main/java/org/wpilib/ExpansionHubServo.java index 59aec0cc36..50aa495287 100644 --- a/wpilibj/src/main/java/org/wpilib/ExpansionHubServo.java +++ b/wpilibj/src/main/java/org/wpilib/ExpansionHubServo.java @@ -12,6 +12,7 @@ import org.wpilib.networktables.BooleanPublisher; import org.wpilib.networktables.IntegerPublisher; import org.wpilib.networktables.NetworkTableInstance; import org.wpilib.networktables.PubSubOption; +import org.wpilib.system.SystemServer; import org.wpilib.units.measure.Angle; import org.wpilib.units.measure.Time; diff --git a/wpilibj/src/main/java/org/wpilib/driverstation/DSControlWord.java b/wpilibj/src/main/java/org/wpilib/driverstation/DSControlWord.java index 0b68001c0f..0a70aacfd4 100644 --- a/wpilibj/src/main/java/org/wpilib/driverstation/DSControlWord.java +++ b/wpilibj/src/main/java/org/wpilib/driverstation/DSControlWord.java @@ -4,6 +4,7 @@ package org.wpilib.driverstation; +import org.wpilib.driverstation.DriverStation; import org.wpilib.hardware.hal.ControlWord; /** A wrapper around Driver Station control word. */ diff --git a/wpilibj/src/main/java/org/wpilib/driverstation/DriverStation.java b/wpilibj/src/main/java/org/wpilib/driverstation/DriverStation.java index e78fd086eb..fcb94c391e 100644 --- a/wpilibj/src/main/java/org/wpilib/driverstation/DriverStation.java +++ b/wpilibj/src/main/java/org/wpilib/driverstation/DriverStation.java @@ -21,6 +21,7 @@ import org.wpilib.networktables.NetworkTableInstance; import org.wpilib.networktables.StringPublisher; import org.wpilib.networktables.StringTopic; import org.wpilib.util.concurrent.EventVector; +import org.wpilib.system.Timer; import org.wpilib.util.WPIUtilJNI; import java.util.Map; import java.util.Optional; diff --git a/wpilibj/src/main/java/org/wpilib/hardware/accelerometer/ADXL345_I2C.java b/wpilibj/src/main/java/org/wpilib/hardware/accelerometer/ADXL345_I2C.java index ccb36cee51..2aae25ff2b 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/accelerometer/ADXL345_I2C.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/accelerometer/ADXL345_I2C.java @@ -4,6 +4,7 @@ package org.wpilib.hardware.accelerometer; +import org.wpilib.hardware.bus.I2C; import org.wpilib.hardware.hal.HAL; import org.wpilib.hardware.hal.SimDevice; import org.wpilib.hardware.hal.SimDouble; diff --git a/wpilibj/src/main/java/org/wpilib/hardware/accelerometer/AnalogAccelerometer.java b/wpilibj/src/main/java/org/wpilib/hardware/accelerometer/AnalogAccelerometer.java index 30a6a78fe8..1dbc46b4c9 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/accelerometer/AnalogAccelerometer.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/accelerometer/AnalogAccelerometer.java @@ -6,6 +6,7 @@ package org.wpilib.hardware.accelerometer; import static org.wpilib.util.ErrorMessages.requireNonNullParam; +import org.wpilib.hardware.discrete.AnalogInput; import org.wpilib.hardware.hal.HAL; import org.wpilib.util.sendable.Sendable; import org.wpilib.util.sendable.SendableBuilder; diff --git a/wpilibj/src/main/java/org/wpilib/hardware/discrete/DigitalInput.java b/wpilibj/src/main/java/org/wpilib/hardware/discrete/DigitalInput.java index 5438273e82..73efff3b04 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/discrete/DigitalInput.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/discrete/DigitalInput.java @@ -4,6 +4,7 @@ package org.wpilib.hardware.discrete; +import org.wpilib.system.SensorUtil; import org.wpilib.hardware.hal.DIOJNI; import org.wpilib.hardware.hal.HAL; import org.wpilib.hardware.hal.SimDevice; diff --git a/wpilibj/src/main/java/org/wpilib/hardware/discrete/DigitalOutput.java b/wpilibj/src/main/java/org/wpilib/hardware/discrete/DigitalOutput.java index 73b017d904..ff90b81e92 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/discrete/DigitalOutput.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/discrete/DigitalOutput.java @@ -4,6 +4,7 @@ package org.wpilib.hardware.discrete; +import org.wpilib.system.SensorUtil; import org.wpilib.hardware.hal.DIOJNI; import org.wpilib.hardware.hal.HAL; import org.wpilib.hardware.hal.SimDevice; diff --git a/wpilibj/src/main/java/org/wpilib/hardware/discrete/PWM.java b/wpilibj/src/main/java/org/wpilib/hardware/discrete/PWM.java index 6b3df259e5..1638e3cf90 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/discrete/PWM.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/discrete/PWM.java @@ -4,6 +4,7 @@ package org.wpilib.hardware.discrete; +import org.wpilib.system.SensorUtil; import org.wpilib.hardware.hal.HAL; import org.wpilib.hardware.hal.PWMJNI; import org.wpilib.hardware.hal.SimDevice; diff --git a/wpilibj/src/main/java/org/wpilib/hardware/led/LEDPattern.java b/wpilibj/src/main/java/org/wpilib/hardware/led/LEDPattern.java index f6adb95ef6..04f068b907 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/led/LEDPattern.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/led/LEDPattern.java @@ -9,6 +9,8 @@ import static org.wpilib.units.Units.Microsecond; import static org.wpilib.units.Units.Microseconds; import static org.wpilib.units.Units.Value; +import org.wpilib.driverstation.DriverStation; +import org.wpilib.system.RobotController; import org.wpilib.units.collections.LongToObjectHashMap; import org.wpilib.units.measure.Dimensionless; import org.wpilib.units.measure.Distance; diff --git a/wpilibj/src/main/java/org/wpilib/hardware/motor/MotorSafety.java b/wpilibj/src/main/java/org/wpilib/hardware/motor/MotorSafety.java index 8c69bcbccf..b08499611f 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/motor/MotorSafety.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/motor/MotorSafety.java @@ -4,8 +4,11 @@ package org.wpilib.hardware.motor; +import org.wpilib.driverstation.DriverStation; import org.wpilib.hardware.hal.ControlWord; import org.wpilib.hardware.hal.DriverStationJNI; +import org.wpilib.opmode.RobotState; +import org.wpilib.system.Timer; import org.wpilib.util.WPIUtilJNI; import java.util.LinkedHashSet; import java.util.Set; diff --git a/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticHub.java b/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticHub.java index 119b77155a..a95cfd9296 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticHub.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticHub.java @@ -4,6 +4,7 @@ package org.wpilib.hardware.pneumatic; +import org.wpilib.system.SensorUtil; import org.wpilib.hardware.hal.HAL; import org.wpilib.hardware.hal.PortsJNI; import org.wpilib.hardware.hal.REVPHFaults; diff --git a/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticsBase.java b/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticsBase.java index 238d829bf0..3016266936 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticsBase.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticsBase.java @@ -4,6 +4,8 @@ package org.wpilib.hardware.pneumatic; +import org.wpilib.system.SensorUtil; + /** Interface for pneumatics devices. */ public interface PneumaticsBase extends AutoCloseable { /** diff --git a/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticsControlModule.java b/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticsControlModule.java index 18cdced328..61b4607bcc 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticsControlModule.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticsControlModule.java @@ -4,6 +4,7 @@ package org.wpilib.hardware.pneumatic; +import org.wpilib.system.SensorUtil; import org.wpilib.hardware.hal.CTREPCMJNI; import org.wpilib.hardware.hal.HAL; import org.wpilib.hardware.hal.PortsJNI; diff --git a/wpilibj/src/main/java/org/wpilib/hardware/range/SharpIR.java b/wpilibj/src/main/java/org/wpilib/hardware/range/SharpIR.java index 2ff50acad5..311b3e08a6 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/range/SharpIR.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/range/SharpIR.java @@ -4,6 +4,7 @@ package org.wpilib.hardware.range; +import org.wpilib.hardware.discrete.AnalogInput; import org.wpilib.hardware.hal.HAL; import org.wpilib.hardware.hal.SimDevice; import org.wpilib.hardware.hal.SimDevice.Direction; diff --git a/wpilibj/src/main/java/org/wpilib/hardware/rotation/AnalogEncoder.java b/wpilibj/src/main/java/org/wpilib/hardware/rotation/AnalogEncoder.java index 5c3cd834c1..ab50915913 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/rotation/AnalogEncoder.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/rotation/AnalogEncoder.java @@ -4,11 +4,13 @@ package org.wpilib.hardware.rotation; +import org.wpilib.hardware.discrete.AnalogInput; import org.wpilib.hardware.hal.HAL; import org.wpilib.hardware.hal.SimDevice; import org.wpilib.hardware.hal.SimDevice.Direction; import org.wpilib.hardware.hal.SimDouble; import org.wpilib.math.util.MathUtil; +import org.wpilib.system.RobotController; import org.wpilib.util.sendable.Sendable; import org.wpilib.util.sendable.SendableBuilder; import org.wpilib.util.sendable.SendableRegistry; diff --git a/wpilibj/src/main/java/org/wpilib/hardware/rotation/AnalogPotentiometer.java b/wpilibj/src/main/java/org/wpilib/hardware/rotation/AnalogPotentiometer.java index 1dc366d9dc..8c4fea2fc2 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/rotation/AnalogPotentiometer.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/rotation/AnalogPotentiometer.java @@ -4,6 +4,8 @@ package org.wpilib.hardware.rotation; +import org.wpilib.hardware.discrete.AnalogInput; +import org.wpilib.system.RobotController; import org.wpilib.util.sendable.Sendable; import org.wpilib.util.sendable.SendableBuilder; import org.wpilib.util.sendable.SendableRegistry; diff --git a/wpilibj/src/main/java/org/wpilib/hardware/rotation/Encoder.java b/wpilibj/src/main/java/org/wpilib/hardware/rotation/Encoder.java index 11b690f3ae..b1935080b1 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/rotation/Encoder.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/rotation/Encoder.java @@ -6,6 +6,7 @@ package org.wpilib.hardware.rotation; import static org.wpilib.util.ErrorMessages.requireNonNullParam; +import org.wpilib.hardware.discrete.CounterBase; import org.wpilib.hardware.hal.EncoderJNI; import org.wpilib.hardware.hal.HAL; import org.wpilib.hardware.hal.SimDevice; diff --git a/wpilibj/src/main/java/org/wpilib/opmode/IterativeRobotBase.java b/wpilibj/src/main/java/org/wpilib/opmode/IterativeRobotBase.java index b39912323d..2fddd0295f 100644 --- a/wpilibj/src/main/java/org/wpilib/opmode/IterativeRobotBase.java +++ b/wpilibj/src/main/java/org/wpilib/opmode/IterativeRobotBase.java @@ -4,10 +4,13 @@ package org.wpilib.opmode; +import org.wpilib.driverstation.DSControlWord; +import org.wpilib.driverstation.DriverStation; import org.wpilib.hardware.hal.DriverStationJNI; import org.wpilib.hardware.hal.HAL; import org.wpilib.networktables.NetworkTableInstance; import org.wpilib.smartdashboard.SmartDashboard; +import org.wpilib.system.Watchdog; /** * IterativeRobotBase implements a specific type of robot program framework, extending the RobotBase diff --git a/wpilibj/src/main/java/org/wpilib/opmode/RobotBase.java b/wpilibj/src/main/java/org/wpilib/opmode/RobotBase.java index 2cf19c6005..5f72ab655d 100644 --- a/wpilibj/src/main/java/org/wpilib/opmode/RobotBase.java +++ b/wpilibj/src/main/java/org/wpilib/opmode/RobotBase.java @@ -6,6 +6,9 @@ package org.wpilib.opmode; import org.wpilib.vision.stream.CameraServerShared; import org.wpilib.vision.stream.CameraServerSharedStore; +import org.wpilib.system.Notifier; +import org.wpilib.system.RuntimeType; +import org.wpilib.driverstation.DriverStation; import org.wpilib.hardware.hal.HAL; import org.wpilib.hardware.hal.HALUtil; import org.wpilib.math.util.MathShared; @@ -13,8 +16,9 @@ import org.wpilib.math.util.MathSharedStore; import org.wpilib.networktables.MultiSubscriber; import org.wpilib.networktables.NetworkTableEvent; import org.wpilib.networktables.NetworkTableInstance; +import org.wpilib.system.Timer; import org.wpilib.util.WPIUtilJNI; -import org.wpilib.util.WPILibVersion; +import org.wpilib.system.WPILibVersion; import java.util.concurrent.locks.ReentrantLock; import java.util.function.Supplier; diff --git a/wpilibj/src/main/java/org/wpilib/opmode/RobotState.java b/wpilibj/src/main/java/org/wpilib/opmode/RobotState.java index 978ed5bf22..568721af60 100644 --- a/wpilibj/src/main/java/org/wpilib/opmode/RobotState.java +++ b/wpilibj/src/main/java/org/wpilib/opmode/RobotState.java @@ -4,6 +4,8 @@ package org.wpilib.opmode; +import org.wpilib.driverstation.DriverStation; + /** Robot state utility functions. */ public final class RobotState { /** diff --git a/wpilibj/src/main/java/org/wpilib/opmode/TimedRobot.java b/wpilibj/src/main/java/org/wpilib/opmode/TimedRobot.java index eb7ba305fa..72f14ce6e0 100644 --- a/wpilibj/src/main/java/org/wpilib/opmode/TimedRobot.java +++ b/wpilibj/src/main/java/org/wpilib/opmode/TimedRobot.java @@ -9,6 +9,7 @@ import static org.wpilib.units.Units.Seconds; import org.wpilib.hardware.hal.DriverStationJNI; import org.wpilib.hardware.hal.HAL; import org.wpilib.hardware.hal.NotifierJNI; +import org.wpilib.system.RobotController; import org.wpilib.units.measure.Frequency; import org.wpilib.units.measure.Time; import java.util.PriorityQueue; diff --git a/wpilibj/src/main/java/org/wpilib/system/DataLogManager.java b/wpilibj/src/main/java/org/wpilib/system/DataLogManager.java index c6d844661c..606b5ef28c 100644 --- a/wpilibj/src/main/java/org/wpilib/system/DataLogManager.java +++ b/wpilibj/src/main/java/org/wpilib/system/DataLogManager.java @@ -9,8 +9,10 @@ import org.wpilib.datalog.DataLogBackgroundWriter; import org.wpilib.datalog.FileLogger; import org.wpilib.datalog.IntegerLogEntry; import org.wpilib.datalog.StringLogEntry; +import org.wpilib.driverstation.DriverStation; import org.wpilib.hardware.hal.HAL; import org.wpilib.networktables.NetworkTableInstance; +import org.wpilib.opmode.RobotBase; import org.wpilib.util.WPIUtilJNI; import org.wpilib.util.concurrent.Event; import java.io.File; diff --git a/wpilibj/src/main/java/org/wpilib/system/Filesystem.java b/wpilibj/src/main/java/org/wpilib/system/Filesystem.java index f413d3764c..2167a63ad2 100644 --- a/wpilibj/src/main/java/org/wpilib/system/Filesystem.java +++ b/wpilibj/src/main/java/org/wpilib/system/Filesystem.java @@ -5,6 +5,7 @@ package org.wpilib.system; import java.io.File; +import org.wpilib.opmode.RobotBase; /** * Class for interacting with the Filesystem, particularly, interacting with FRC-related paths on diff --git a/wpilibj/src/main/java/org/wpilib/system/Notifier.java b/wpilibj/src/main/java/org/wpilib/system/Notifier.java index 54e147b56d..4602917e50 100644 --- a/wpilibj/src/main/java/org/wpilib/system/Notifier.java +++ b/wpilibj/src/main/java/org/wpilib/system/Notifier.java @@ -7,9 +7,11 @@ package org.wpilib.system; import static org.wpilib.units.Units.Seconds; import static org.wpilib.util.ErrorMessages.requireNonNullParam; +import org.wpilib.driverstation.DriverStation; import org.wpilib.hardware.hal.NotifierJNI; import org.wpilib.units.measure.Frequency; import org.wpilib.units.measure.Time; +import org.wpilib.system.RobotController; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.ReentrantLock; diff --git a/wpilibj/src/main/java/org/wpilib/system/Timer.java b/wpilibj/src/main/java/org/wpilib/system/Timer.java index d583347dfd..7f5b47ffc1 100644 --- a/wpilibj/src/main/java/org/wpilib/system/Timer.java +++ b/wpilibj/src/main/java/org/wpilib/system/Timer.java @@ -7,6 +7,7 @@ package org.wpilib.system; import static org.wpilib.units.Units.Seconds; import org.wpilib.units.measure.Time; +import org.wpilib.driverstation.DriverStation; /** * A timer class. diff --git a/wpilibj/src/main/java/org/wpilib/system/Tracer.java b/wpilibj/src/main/java/org/wpilib/system/Tracer.java index 234d85104f..b28387a374 100644 --- a/wpilibj/src/main/java/org/wpilib/system/Tracer.java +++ b/wpilibj/src/main/java/org/wpilib/system/Tracer.java @@ -7,6 +7,7 @@ package org.wpilib.system; import java.util.HashMap; import java.util.Map; import java.util.function.Consumer; +import org.wpilib.driverstation.DriverStation; /** * A class for keeping track of how much time it takes for different parts of code to execute. This diff --git a/wpilibj/src/main/java/org/wpilib/system/Watchdog.java b/wpilibj/src/main/java/org/wpilib/system/Watchdog.java index 568c4e3452..63c1068359 100644 --- a/wpilibj/src/main/java/org/wpilib/system/Watchdog.java +++ b/wpilibj/src/main/java/org/wpilib/system/Watchdog.java @@ -6,6 +6,7 @@ package org.wpilib.system; import static org.wpilib.units.Units.Seconds; +import org.wpilib.driverstation.DriverStation; import org.wpilib.hardware.hal.NotifierJNI; import org.wpilib.units.measure.Time; import java.io.Closeable; diff --git a/wpilibj/src/main/java/org/wpilib/util/Alert.java b/wpilibj/src/main/java/org/wpilib/util/Alert.java index f38a478da6..3b3bbcfa91 100644 --- a/wpilibj/src/main/java/org/wpilib/util/Alert.java +++ b/wpilibj/src/main/java/org/wpilib/util/Alert.java @@ -4,6 +4,7 @@ package org.wpilib.util; +import org.wpilib.system.RobotController; import org.wpilib.util.sendable.Sendable; import org.wpilib.util.sendable.SendableBuilder; import org.wpilib.smartdashboard.SmartDashboard; diff --git a/wpilibj/src/test/java/org/wpilib/hardware/led/LEDPatternTest.java b/wpilibj/src/test/java/org/wpilib/hardware/led/LEDPatternTest.java index e1da19afd1..68a9df80e1 100644 --- a/wpilibj/src/test/java/org/wpilib/hardware/led/LEDPatternTest.java +++ b/wpilibj/src/test/java/org/wpilib/hardware/led/LEDPatternTest.java @@ -27,6 +27,7 @@ import static org.wpilib.util.Color.kYellow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; +import org.wpilib.system.RobotController; import org.wpilib.util.Color; import org.wpilib.util.Color8Bit; import java.util.Map; diff --git a/wpilibj/src/test/java/org/wpilib/hardware/rotation/AnalogPotentiometerTest.java b/wpilibj/src/test/java/org/wpilib/hardware/rotation/AnalogPotentiometerTest.java index d28de281b9..51b7945eab 100644 --- a/wpilibj/src/test/java/org/wpilib/hardware/rotation/AnalogPotentiometerTest.java +++ b/wpilibj/src/test/java/org/wpilib/hardware/rotation/AnalogPotentiometerTest.java @@ -6,6 +6,7 @@ package org.wpilib.hardware.rotation; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.wpilib.hardware.discrete.AnalogInput; import org.wpilib.hardware.hal.HAL; import org.wpilib.simulation.AnalogInputSim; import org.wpilib.simulation.RoboRioSim; diff --git a/wpilibj/src/test/java/org/wpilib/system/RobotControllerTest.java b/wpilibj/src/test/java/org/wpilib/system/RobotControllerTest.java index 4b297ec720..cb9ac73777 100644 --- a/wpilibj/src/test/java/org/wpilib/system/RobotControllerTest.java +++ b/wpilibj/src/test/java/org/wpilib/system/RobotControllerTest.java @@ -4,6 +4,8 @@ package org.wpilib.system; +import org.wpilib.UtilityClassTest; + @SuppressWarnings("PMD.TestClassWithoutTestCases") class RobotControllerTest extends UtilityClassTest { RobotControllerTest() { diff --git a/wpimath/src/dev/java/org/wpilib/math/DevMain.java b/wpimath/src/dev/java/org/wpilib/math/DevMain.java index 78f2f9edb8..743bdc2c7f 100644 --- a/wpimath/src/dev/java/org/wpilib/math/DevMain.java +++ b/wpimath/src/dev/java/org/wpilib/math/DevMain.java @@ -4,6 +4,8 @@ package org.wpilib.math; +import org.wpilib.math.util.MathUtil; + public final class DevMain { /** Main entry point. */ public static void main(String[] args) { diff --git a/wpimath/src/main/java/org/wpilib/math/interpolation/InterpolatingMatrixTreeMap.java b/wpimath/src/main/java/org/wpilib/math/interpolation/InterpolatingMatrixTreeMap.java index 88ed520c85..d220fbd4a9 100644 --- a/wpimath/src/main/java/org/wpilib/math/interpolation/InterpolatingMatrixTreeMap.java +++ b/wpimath/src/main/java/org/wpilib/math/interpolation/InterpolatingMatrixTreeMap.java @@ -5,6 +5,8 @@ package org.wpilib.math.interpolation; import java.util.TreeMap; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Num; /** * Interpolating Tree Maps are used to get values at points that are not defined by making a guess diff --git a/wpimath/src/main/java/org/wpilib/math/linalg/DARE.java b/wpimath/src/main/java/org/wpilib/math/linalg/DARE.java index 6edaa64fca..cdb7b42d5d 100644 --- a/wpimath/src/main/java/org/wpilib/math/linalg/DARE.java +++ b/wpimath/src/main/java/org/wpilib/math/linalg/DARE.java @@ -6,6 +6,7 @@ package org.wpilib.math.linalg; import org.wpilib.math.jni.DAREJNI; import org.ejml.simple.SimpleMatrix; +import org.wpilib.math.util.Num; /** DARE solver utility functions. */ public final class DARE { diff --git a/wpimath/src/main/java/org/wpilib/math/linalg/MatBuilder.java b/wpimath/src/main/java/org/wpilib/math/linalg/MatBuilder.java index 75c619e1d6..89690a36e1 100644 --- a/wpimath/src/main/java/org/wpilib/math/linalg/MatBuilder.java +++ b/wpimath/src/main/java/org/wpilib/math/linalg/MatBuilder.java @@ -6,6 +6,8 @@ package org.wpilib.math.linalg; import java.util.Objects; import org.ejml.simple.SimpleMatrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; /** A class for constructing arbitrary RxC matrices. */ public final class MatBuilder { diff --git a/wpimath/src/main/java/org/wpilib/math/linalg/Matrix.java b/wpimath/src/main/java/org/wpilib/math/linalg/Matrix.java index c2c7e77db0..d88d145a79 100644 --- a/wpimath/src/main/java/org/wpilib/math/linalg/Matrix.java +++ b/wpimath/src/main/java/org/wpilib/math/linalg/Matrix.java @@ -8,6 +8,8 @@ import org.wpilib.math.jni.EigenJNI; import org.wpilib.math.numbers.N1; import org.wpilib.math.linalg.proto.MatrixProto; import org.wpilib.math.linalg.struct.MatrixStruct; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; import org.wpilib.util.protobuf.Protobuf; import org.wpilib.util.protobuf.ProtobufSerializable; import org.wpilib.util.struct.Struct; diff --git a/wpimath/src/main/java/org/wpilib/math/linalg/VecBuilder.java b/wpimath/src/main/java/org/wpilib/math/linalg/VecBuilder.java index e0290c35c2..9f7240f332 100644 --- a/wpimath/src/main/java/org/wpilib/math/linalg/VecBuilder.java +++ b/wpimath/src/main/java/org/wpilib/math/linalg/VecBuilder.java @@ -14,6 +14,8 @@ import org.wpilib.math.numbers.N6; import org.wpilib.math.numbers.N7; import org.wpilib.math.numbers.N8; import org.wpilib.math.numbers.N9; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; import java.util.Objects; import org.ejml.simple.SimpleMatrix; diff --git a/wpimath/src/main/java/org/wpilib/math/linalg/Vector.java b/wpimath/src/main/java/org/wpilib/math/linalg/Vector.java index 364cfcbd2f..2e5e849e8f 100644 --- a/wpimath/src/main/java/org/wpilib/math/linalg/Vector.java +++ b/wpimath/src/main/java/org/wpilib/math/linalg/Vector.java @@ -8,6 +8,8 @@ import org.wpilib.math.numbers.N1; import org.wpilib.math.numbers.N3; import org.wpilib.math.linalg.proto.VectorProto; import org.wpilib.math.linalg.struct.VectorStruct; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; import org.wpilib.util.protobuf.Protobuf; import org.wpilib.util.protobuf.ProtobufSerializable; import org.wpilib.util.struct.Struct; diff --git a/wpimath/src/main/java/org/wpilib/math/util/MathUtil.java b/wpimath/src/main/java/org/wpilib/math/util/MathUtil.java index e9a1eb6459..fd4df6e3ff 100644 --- a/wpimath/src/main/java/org/wpilib/math/util/MathUtil.java +++ b/wpimath/src/main/java/org/wpilib/math/util/MathUtil.java @@ -6,6 +6,7 @@ package org.wpilib.math.util; import org.wpilib.math.geometry.Translation2d; import org.wpilib.math.geometry.Translation3d; +import org.wpilib.math.linalg.Vector; /** Math utility functions. */ public final class MathUtil { diff --git a/wpimath/src/main/java/org/wpilib/math/util/StateSpaceUtil.java b/wpimath/src/main/java/org/wpilib/math/util/StateSpaceUtil.java index ddf239fae0..3209c0e6dc 100644 --- a/wpimath/src/main/java/org/wpilib/math/util/StateSpaceUtil.java +++ b/wpimath/src/main/java/org/wpilib/math/util/StateSpaceUtil.java @@ -6,6 +6,8 @@ package org.wpilib.math.util; import org.wpilib.math.geometry.Pose2d; import org.wpilib.math.jni.StateSpaceUtilJNI; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.linalg.VecBuilder; import org.wpilib.math.numbers.N1; import org.wpilib.math.numbers.N3; import org.wpilib.math.numbers.N4; diff --git a/wpimath/src/test/java/org/wpilib/math/linalg/DARETest.java b/wpimath/src/test/java/org/wpilib/math/linalg/DARETest.java index f0c2758488..7a2b12b186 100644 --- a/wpimath/src/test/java/org/wpilib/math/linalg/DARETest.java +++ b/wpimath/src/test/java/org/wpilib/math/linalg/DARETest.java @@ -11,6 +11,8 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import org.wpilib.UtilityClassTest; import org.ejml.simple.SimpleMatrix; import org.junit.jupiter.api.Test; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; class DARETest extends UtilityClassTest { DARETest() { diff --git a/wpimath/src/test/java/org/wpilib/math/linalg/MatrixTest.java b/wpimath/src/test/java/org/wpilib/math/linalg/MatrixTest.java index b54c82883a..7c04c97353 100644 --- a/wpimath/src/test/java/org/wpilib/math/linalg/MatrixTest.java +++ b/wpimath/src/test/java/org/wpilib/math/linalg/MatrixTest.java @@ -12,6 +12,7 @@ import org.wpilib.math.numbers.N1; import org.wpilib.math.numbers.N2; import org.wpilib.math.numbers.N3; import org.wpilib.math.numbers.N4; +import org.wpilib.math.util.Nat; import org.ejml.data.SingularMatrixException; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/util/MathUtilTest.java b/wpimath/src/test/java/org/wpilib/math/util/MathUtilTest.java index 039effa5c4..cdfcab78ef 100644 --- a/wpimath/src/test/java/org/wpilib/math/util/MathUtilTest.java +++ b/wpimath/src/test/java/org/wpilib/math/util/MathUtilTest.java @@ -12,6 +12,7 @@ import org.wpilib.math.geometry.Translation2d; import org.wpilib.math.geometry.Translation3d; import org.wpilib.UtilityClassTest; import org.junit.jupiter.api.Test; +import org.wpilib.math.linalg.VecBuilder; class MathUtilTest extends UtilityClassTest { MathUtilTest() { diff --git a/wpimath/src/test/java/org/wpilib/math/util/StateSpaceUtilTest.java b/wpimath/src/test/java/org/wpilib/math/util/StateSpaceUtilTest.java index a9d0b8efb9..189474e049 100644 --- a/wpimath/src/test/java/org/wpilib/math/util/StateSpaceUtilTest.java +++ b/wpimath/src/test/java/org/wpilib/math/util/StateSpaceUtilTest.java @@ -10,6 +10,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.wpilib.math.geometry.Pose2d; import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.linalg.MatBuilder; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.linalg.VecBuilder; import org.wpilib.math.numbers.N1; import org.wpilib.math.numbers.N2; import org.wpilib.UtilityClassTest; diff --git a/wpiutil/src/dev/java/org/wpilib/util/DevMain.java b/wpiutil/src/dev/java/org/wpilib/util/DevMain.java index 00fd245996..58da26088b 100644 --- a/wpiutil/src/dev/java/org/wpilib/util/DevMain.java +++ b/wpiutil/src/dev/java/org/wpilib/util/DevMain.java @@ -4,6 +4,8 @@ package org.wpilib.util; +import org.wpilib.util.runtime.CombinedRuntimeLoader; + public final class DevMain { /** Main entry point. */ public static void main(String[] args) { diff --git a/wpiutil/src/main/java/org/wpilib/util/WPIUtilJNI.java b/wpiutil/src/main/java/org/wpilib/util/WPIUtilJNI.java index 0560785875..de473521a4 100644 --- a/wpiutil/src/main/java/org/wpilib/util/WPIUtilJNI.java +++ b/wpiutil/src/main/java/org/wpilib/util/WPIUtilJNI.java @@ -7,6 +7,7 @@ package org.wpilib.util; import java.io.IOException; import java.nio.ByteBuffer; import java.util.concurrent.atomic.AtomicBoolean; +import org.wpilib.util.runtime.RuntimeLoader; /** WPIUtil JNI. */ public class WPIUtilJNI { diff --git a/wpiutil/src/main/java/org/wpilib/util/concurrent/EventVector.java b/wpiutil/src/main/java/org/wpilib/util/concurrent/EventVector.java index 94afa96e24..7c4b4d2b1f 100644 --- a/wpiutil/src/main/java/org/wpilib/util/concurrent/EventVector.java +++ b/wpiutil/src/main/java/org/wpilib/util/concurrent/EventVector.java @@ -7,6 +7,7 @@ package org.wpilib.util.concurrent; import java.util.ArrayList; import java.util.List; import java.util.concurrent.locks.ReentrantLock; +import org.wpilib.util.WPIUtilJNI; /** A thread-safe container for handling events. */ public class EventVector { diff --git a/wpiutil/src/main/native/cpp/jni/WPIUtilJNI.cpp b/wpiutil/src/main/native/cpp/jni/WPIUtilJNI.cpp index 58e619ff2f..9d0c20874a 100644 --- a/wpiutil/src/main/native/cpp/jni/WPIUtilJNI.cpp +++ b/wpiutil/src/main/native/cpp/jni/WPIUtilJNI.cpp @@ -32,7 +32,7 @@ static const JExceptionInit exceptions[] = { {"java/lang/InterruptedException", &interruptedEx}, {"java/io/IOException", &ioEx}, {"java/lang/NullPointerException", &nullPointerEx}, - {"org/wpilib/util/MsvcRuntimeException", &msvcRuntimeEx}}; + {"org/wpilib/util/runtime/MsvcRuntimeException", &msvcRuntimeEx}}; void wpi::ThrowIllegalArgumentException(JNIEnv* env, std::string_view msg) { illegalArgEx.Throw(env, msg);