diff --git a/hal/build.gradle b/hal/build.gradle index bbcb06bc92..3523716120 100644 --- a/hal/build.gradle +++ b/hal/build.gradle @@ -1,4 +1,4 @@ -def javaResourceFile = file("$buildDir/generated/java/edu/wpi/first/wpilibj/hal/FRCNetComm.java") +def javaResourceFile = file("$buildDir/generated/java/edu/wpi/first/hal/FRCNetComm.java") def cppResourceFile = file("$buildDir/generated/headers/hal/FRCUsageReporting.h") def generateUsageReporting = tasks.register('generateUsageReporting') { diff --git a/hal/src/generate/FRCNetComm.java.in b/hal/src/generate/FRCNetComm.java.in index 1d02804486..af49407b2d 100644 --- a/hal/src/generate/FRCNetComm.java.in +++ b/hal/src/generate/FRCNetComm.java.in @@ -2,7 +2,7 @@ * Autogenerated file! Do not manually edit this file. */ -package edu.wpi.first.wpilibj.hal; +package edu.wpi.first.hal; /** * JNI wrapper for library FRC_NetworkCommunication
. diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/hal/AccelerometerJNI.java b/hal/src/main/java/edu/wpi/first/hal/AccelerometerJNI.java similarity index 95% rename from hal/src/main/java/edu/wpi/first/wpilibj/hal/AccelerometerJNI.java rename to hal/src/main/java/edu/wpi/first/hal/AccelerometerJNI.java index 763f26a0f9..e1e3750335 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/hal/AccelerometerJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/AccelerometerJNI.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.hal; +package edu.wpi.first.hal; public class AccelerometerJNI extends JNIWrapper { public static native void setAccelerometerActive(boolean active); diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/AccumulatorResult.java b/hal/src/main/java/edu/wpi/first/hal/AccumulatorResult.java similarity index 96% rename from hal/src/main/java/edu/wpi/first/wpilibj/AccumulatorResult.java rename to hal/src/main/java/edu/wpi/first/hal/AccumulatorResult.java index 7921637957..d3aa8c8dc3 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/AccumulatorResult.java +++ b/hal/src/main/java/edu/wpi/first/hal/AccumulatorResult.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj; +package edu.wpi.first.hal; /** * Structure for holding the values stored in an accumulator. diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/hal/AllianceStationID.java b/hal/src/main/java/edu/wpi/first/hal/AllianceStationID.java similarity index 94% rename from hal/src/main/java/edu/wpi/first/wpilibj/hal/AllianceStationID.java rename to hal/src/main/java/edu/wpi/first/hal/AllianceStationID.java index 5f4bea9a57..148dd76b04 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/hal/AllianceStationID.java +++ b/hal/src/main/java/edu/wpi/first/hal/AllianceStationID.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.hal; +package edu.wpi.first.hal; public enum AllianceStationID { Red1, Red2, Red3, Blue1, Blue2, Blue3 diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/hal/AnalogGyroJNI.java b/hal/src/main/java/edu/wpi/first/hal/AnalogGyroJNI.java similarity index 97% rename from hal/src/main/java/edu/wpi/first/wpilibj/hal/AnalogGyroJNI.java rename to hal/src/main/java/edu/wpi/first/hal/AnalogGyroJNI.java index df8553632a..332be791f7 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/hal/AnalogGyroJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/AnalogGyroJNI.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.hal; +package edu.wpi.first.hal; public class AnalogGyroJNI extends JNIWrapper { public static native int initializeAnalogGyro(int halAnalogInputHandle); diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/hal/AnalogJNI.java b/hal/src/main/java/edu/wpi/first/hal/AnalogJNI.java similarity index 98% rename from hal/src/main/java/edu/wpi/first/wpilibj/hal/AnalogJNI.java rename to hal/src/main/java/edu/wpi/first/hal/AnalogJNI.java index 2c26dd026d..3e78039b87 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/hal/AnalogJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/AnalogJNI.java @@ -5,12 +5,10 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.hal; +package edu.wpi.first.hal; import java.nio.IntBuffer; -import edu.wpi.first.wpilibj.AccumulatorResult; - public class AnalogJNI extends JNIWrapper { /** * native declaration : AthenaJava\target\native\include\HAL\Analog.h:58
enum values diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/hal/CANAPIJNI.java b/hal/src/main/java/edu/wpi/first/hal/CANAPIJNI.java similarity index 95% rename from hal/src/main/java/edu/wpi/first/wpilibj/hal/CANAPIJNI.java rename to hal/src/main/java/edu/wpi/first/hal/CANAPIJNI.java index 9085653c09..1ac3ca7365 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/hal/CANAPIJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/CANAPIJNI.java @@ -5,9 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.hal; - -import edu.wpi.first.wpilibj.CANData; +package edu.wpi.first.hal; @SuppressWarnings("AbbreviationAsWordInName") public class CANAPIJNI extends JNIWrapper { diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/CANData.java b/hal/src/main/java/edu/wpi/first/hal/CANData.java similarity index 96% rename from hal/src/main/java/edu/wpi/first/wpilibj/CANData.java rename to hal/src/main/java/edu/wpi/first/hal/CANData.java index bbe4eaa968..23d37c9cde 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/CANData.java +++ b/hal/src/main/java/edu/wpi/first/hal/CANData.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj; +package edu.wpi.first.hal; public class CANData { @SuppressWarnings("MemberName") diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/hal/CompressorJNI.java b/hal/src/main/java/edu/wpi/first/hal/CompressorJNI.java similarity index 97% rename from hal/src/main/java/edu/wpi/first/wpilibj/hal/CompressorJNI.java rename to hal/src/main/java/edu/wpi/first/hal/CompressorJNI.java index 756a23d8eb..64e9e1d302 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/hal/CompressorJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/CompressorJNI.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.hal; +package edu.wpi.first.hal; public class CompressorJNI extends JNIWrapper { public static native int initializeCompressor(byte module); diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/hal/ConstantsJNI.java b/hal/src/main/java/edu/wpi/first/hal/ConstantsJNI.java similarity index 94% rename from hal/src/main/java/edu/wpi/first/wpilibj/hal/ConstantsJNI.java rename to hal/src/main/java/edu/wpi/first/hal/ConstantsJNI.java index 44b86ecf62..3db75f57fb 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/hal/ConstantsJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/ConstantsJNI.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.hal; +package edu.wpi.first.hal; public class ConstantsJNI extends JNIWrapper { public static native int getSystemClockTicksPerMicrosecond(); diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/hal/ControlWord.java b/hal/src/main/java/edu/wpi/first/hal/ControlWord.java similarity index 97% rename from hal/src/main/java/edu/wpi/first/wpilibj/hal/ControlWord.java rename to hal/src/main/java/edu/wpi/first/hal/ControlWord.java index a821ba415b..83536067bc 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/hal/ControlWord.java +++ b/hal/src/main/java/edu/wpi/first/hal/ControlWord.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.hal; +package edu.wpi.first.hal; /** * A wrapper for the HALControlWord bitfield. diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/hal/CounterJNI.java b/hal/src/main/java/edu/wpi/first/hal/CounterJNI.java similarity index 98% rename from hal/src/main/java/edu/wpi/first/wpilibj/hal/CounterJNI.java rename to hal/src/main/java/edu/wpi/first/hal/CounterJNI.java index 6f9faa8c47..b7935d6c70 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/hal/CounterJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/CounterJNI.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.hal; +package edu.wpi.first.hal; import java.nio.IntBuffer; diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/hal/DIOJNI.java b/hal/src/main/java/edu/wpi/first/hal/DIOJNI.java similarity index 97% rename from hal/src/main/java/edu/wpi/first/wpilibj/hal/DIOJNI.java rename to hal/src/main/java/edu/wpi/first/hal/DIOJNI.java index 206addab09..b9c11a56ee 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/hal/DIOJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/DIOJNI.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.hal; +package edu.wpi.first.hal; @SuppressWarnings("AbbreviationAsWordInName") public class DIOJNI extends JNIWrapper { diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/hal/DigitalGlitchFilterJNI.java b/hal/src/main/java/edu/wpi/first/hal/DigitalGlitchFilterJNI.java similarity index 96% rename from hal/src/main/java/edu/wpi/first/wpilibj/hal/DigitalGlitchFilterJNI.java rename to hal/src/main/java/edu/wpi/first/hal/DigitalGlitchFilterJNI.java index 83eedef567..aa818cfad2 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/hal/DigitalGlitchFilterJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/DigitalGlitchFilterJNI.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.hal; +package edu.wpi.first.hal; public class DigitalGlitchFilterJNI extends JNIWrapper { public static native void setFilterSelect(int digitalPortHandle, int filterIndex); diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/hal/EncoderJNI.java b/hal/src/main/java/edu/wpi/first/hal/EncoderJNI.java similarity index 98% rename from hal/src/main/java/edu/wpi/first/wpilibj/hal/EncoderJNI.java rename to hal/src/main/java/edu/wpi/first/hal/EncoderJNI.java index f8318b43f4..082b6d9196 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/hal/EncoderJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/EncoderJNI.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.hal; +package edu.wpi.first.hal; public class EncoderJNI extends JNIWrapper { public static native int initializeEncoder(int digitalSourceHandleA, int analogTriggerTypeA, diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/hal/HAL.java b/hal/src/main/java/edu/wpi/first/hal/HAL.java similarity index 99% rename from hal/src/main/java/edu/wpi/first/wpilibj/hal/HAL.java rename to hal/src/main/java/edu/wpi/first/hal/HAL.java index 9be5a503c6..a298ff65f6 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/hal/HAL.java +++ b/hal/src/main/java/edu/wpi/first/hal/HAL.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.hal; +package edu.wpi.first.hal; import java.nio.ByteBuffer; diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/hal/HALUtil.java b/hal/src/main/java/edu/wpi/first/hal/HALUtil.java similarity index 97% rename from hal/src/main/java/edu/wpi/first/wpilibj/hal/HALUtil.java rename to hal/src/main/java/edu/wpi/first/hal/HALUtil.java index 05f6f4ceb3..0e5fe21a20 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/hal/HALUtil.java +++ b/hal/src/main/java/edu/wpi/first/hal/HALUtil.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.hal; +package edu.wpi.first.hal; @SuppressWarnings("AbbreviationAsWordInName") public final class HALUtil extends JNIWrapper { diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/hal/I2CJNI.java b/hal/src/main/java/edu/wpi/first/hal/I2CJNI.java similarity index 97% rename from hal/src/main/java/edu/wpi/first/wpilibj/hal/I2CJNI.java rename to hal/src/main/java/edu/wpi/first/hal/I2CJNI.java index 8aeac2759c..12a9af0872 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/hal/I2CJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/I2CJNI.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.hal; +package edu.wpi.first.hal; import java.nio.ByteBuffer; diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/hal/InterruptJNI.java b/hal/src/main/java/edu/wpi/first/hal/InterruptJNI.java similarity index 98% rename from hal/src/main/java/edu/wpi/first/wpilibj/hal/InterruptJNI.java rename to hal/src/main/java/edu/wpi/first/hal/InterruptJNI.java index 6973c630c0..9fe0c6e43c 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/hal/InterruptJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/InterruptJNI.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.hal; +package edu.wpi.first.hal; public class InterruptJNI extends JNIWrapper { public static final int HalInvalidHandle = 0; diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/hal/JNIWrapper.java b/hal/src/main/java/edu/wpi/first/hal/JNIWrapper.java similarity index 96% rename from hal/src/main/java/edu/wpi/first/wpilibj/hal/JNIWrapper.java rename to hal/src/main/java/edu/wpi/first/hal/JNIWrapper.java index e49705cee1..705e65c93b 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/hal/JNIWrapper.java +++ b/hal/src/main/java/edu/wpi/first/hal/JNIWrapper.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.hal; +package edu.wpi.first.hal; import java.io.IOException; diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/hal/MatchInfoData.java b/hal/src/main/java/edu/wpi/first/hal/MatchInfoData.java similarity index 97% rename from hal/src/main/java/edu/wpi/first/wpilibj/hal/MatchInfoData.java rename to hal/src/main/java/edu/wpi/first/hal/MatchInfoData.java index 79a3cf9783..2f11515294 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/hal/MatchInfoData.java +++ b/hal/src/main/java/edu/wpi/first/hal/MatchInfoData.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.hal; +package edu.wpi.first.hal; /** * Structure for holding the match info data request. diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/hal/NotifierJNI.java b/hal/src/main/java/edu/wpi/first/hal/NotifierJNI.java similarity index 98% rename from hal/src/main/java/edu/wpi/first/wpilibj/hal/NotifierJNI.java rename to hal/src/main/java/edu/wpi/first/hal/NotifierJNI.java index 43e218a790..bf92c37c1a 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/hal/NotifierJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/NotifierJNI.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.hal; +package edu.wpi.first.hal; /** * The NotifierJNI class directly wraps the C++ HAL Notifier. diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/hal/PDPJNI.java b/hal/src/main/java/edu/wpi/first/hal/PDPJNI.java similarity index 97% rename from hal/src/main/java/edu/wpi/first/wpilibj/hal/PDPJNI.java rename to hal/src/main/java/edu/wpi/first/hal/PDPJNI.java index 4799c05f66..c45a053c9d 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/hal/PDPJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/PDPJNI.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.hal; +package edu.wpi.first.hal; @SuppressWarnings("AbbreviationAsWordInName") public class PDPJNI extends JNIWrapper { diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/PWMConfigDataResult.java b/hal/src/main/java/edu/wpi/first/hal/PWMConfigDataResult.java similarity index 97% rename from hal/src/main/java/edu/wpi/first/wpilibj/PWMConfigDataResult.java rename to hal/src/main/java/edu/wpi/first/hal/PWMConfigDataResult.java index 9373d91f55..d29b0df1cb 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/PWMConfigDataResult.java +++ b/hal/src/main/java/edu/wpi/first/hal/PWMConfigDataResult.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj; +package edu.wpi.first.hal; /** * Structure for holding the config data result for PWM. diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/hal/PWMJNI.java b/hal/src/main/java/edu/wpi/first/hal/PWMJNI.java similarity index 96% rename from hal/src/main/java/edu/wpi/first/wpilibj/hal/PWMJNI.java rename to hal/src/main/java/edu/wpi/first/hal/PWMJNI.java index 33eb91eb3f..3af6f96551 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/hal/PWMJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/PWMJNI.java @@ -5,9 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.hal; - -import edu.wpi.first.wpilibj.PWMConfigDataResult; +package edu.wpi.first.hal; @SuppressWarnings("AbbreviationAsWordInName") public class PWMJNI extends DIOJNI { diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/hal/PortsJNI.java b/hal/src/main/java/edu/wpi/first/hal/PortsJNI.java similarity index 97% rename from hal/src/main/java/edu/wpi/first/wpilibj/hal/PortsJNI.java rename to hal/src/main/java/edu/wpi/first/hal/PortsJNI.java index aadf3f3939..a2ac60b4a3 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/hal/PortsJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/PortsJNI.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.hal; +package edu.wpi.first.hal; public class PortsJNI extends JNIWrapper { public static native int getNumAccumulators(); diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/hal/PowerJNI.java b/hal/src/main/java/edu/wpi/first/hal/PowerJNI.java similarity index 97% rename from hal/src/main/java/edu/wpi/first/wpilibj/hal/PowerJNI.java rename to hal/src/main/java/edu/wpi/first/hal/PowerJNI.java index 887b9143ab..7a0a376a6e 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/hal/PowerJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/PowerJNI.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.hal; +package edu.wpi.first.hal; public class PowerJNI extends JNIWrapper { public static native double getVinVoltage(); diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/hal/RelayJNI.java b/hal/src/main/java/edu/wpi/first/hal/RelayJNI.java similarity index 96% rename from hal/src/main/java/edu/wpi/first/wpilibj/hal/RelayJNI.java rename to hal/src/main/java/edu/wpi/first/hal/RelayJNI.java index aa2bf7ac7a..1b507dc698 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/hal/RelayJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/RelayJNI.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.hal; +package edu.wpi.first.hal; public class RelayJNI extends DIOJNI { public static native int initializeRelayPort(int halPortHandle, boolean forward); diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/hal/SPIJNI.java b/hal/src/main/java/edu/wpi/first/hal/SPIJNI.java similarity index 98% rename from hal/src/main/java/edu/wpi/first/wpilibj/hal/SPIJNI.java rename to hal/src/main/java/edu/wpi/first/hal/SPIJNI.java index 9bcca724c5..164c6d149b 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/hal/SPIJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/SPIJNI.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.hal; +package edu.wpi.first.hal; import java.nio.ByteBuffer; diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/hal/SerialPortJNI.java b/hal/src/main/java/edu/wpi/first/hal/SerialPortJNI.java similarity index 98% rename from hal/src/main/java/edu/wpi/first/wpilibj/hal/SerialPortJNI.java rename to hal/src/main/java/edu/wpi/first/hal/SerialPortJNI.java index 7d9c6d5f05..db98b9c547 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/hal/SerialPortJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/SerialPortJNI.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.hal; +package edu.wpi.first.hal; public class SerialPortJNI extends JNIWrapper { public static native void serialInitializePort(byte port); diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/hal/SolenoidJNI.java b/hal/src/main/java/edu/wpi/first/hal/SolenoidJNI.java similarity index 97% rename from hal/src/main/java/edu/wpi/first/wpilibj/hal/SolenoidJNI.java rename to hal/src/main/java/edu/wpi/first/hal/SolenoidJNI.java index fcde112f11..66acbeafed 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/hal/SolenoidJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/SolenoidJNI.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.hal; +package edu.wpi.first.hal; public class SolenoidJNI extends JNIWrapper { public static native int initializeSolenoidPort(int halPortHandle); diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/hal/ThreadsJNI.java b/hal/src/main/java/edu/wpi/first/hal/ThreadsJNI.java similarity index 95% rename from hal/src/main/java/edu/wpi/first/wpilibj/hal/ThreadsJNI.java rename to hal/src/main/java/edu/wpi/first/hal/ThreadsJNI.java index 2667d3aadc..e320eb5960 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/hal/ThreadsJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/ThreadsJNI.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.hal; +package edu.wpi.first.hal; public class ThreadsJNI extends JNIWrapper { public static native int getCurrentThreadPriority(); diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/can/CANExceptionFactory.java b/hal/src/main/java/edu/wpi/first/hal/can/CANExceptionFactory.java similarity index 93% rename from hal/src/main/java/edu/wpi/first/wpilibj/can/CANExceptionFactory.java rename to hal/src/main/java/edu/wpi/first/hal/can/CANExceptionFactory.java index b05b5e019e..132dae1827 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/can/CANExceptionFactory.java +++ b/hal/src/main/java/edu/wpi/first/hal/can/CANExceptionFactory.java @@ -5,10 +5,10 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.can; +package edu.wpi.first.hal.can; -import edu.wpi.first.wpilibj.communication.NIRioStatus; -import edu.wpi.first.wpilibj.util.UncleanStatusException; +import edu.wpi.first.hal.communication.NIRioStatus; +import edu.wpi.first.hal.util.UncleanStatusException; public final class CANExceptionFactory { // FRC Error codes diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/can/CANInvalidBufferException.java b/hal/src/main/java/edu/wpi/first/hal/can/CANInvalidBufferException.java similarity index 96% rename from hal/src/main/java/edu/wpi/first/wpilibj/can/CANInvalidBufferException.java rename to hal/src/main/java/edu/wpi/first/hal/can/CANInvalidBufferException.java index ed7b22960e..8ea718bc17 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/can/CANInvalidBufferException.java +++ b/hal/src/main/java/edu/wpi/first/hal/can/CANInvalidBufferException.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.can; +package edu.wpi.first.hal.can; /** * Exception indicating that a CAN driver library entry-point was passed an invalid buffer. diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/can/CANJNI.java b/hal/src/main/java/edu/wpi/first/hal/can/CANJNI.java similarity index 94% rename from hal/src/main/java/edu/wpi/first/wpilibj/can/CANJNI.java rename to hal/src/main/java/edu/wpi/first/hal/can/CANJNI.java index 24307762e1..754157bcc2 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/can/CANJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/can/CANJNI.java @@ -5,12 +5,12 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.can; +package edu.wpi.first.hal.can; import java.nio.ByteBuffer; import java.nio.IntBuffer; -import edu.wpi.first.wpilibj.hal.JNIWrapper; +import edu.wpi.first.hal.JNIWrapper; @SuppressWarnings("AbbreviationAsWordInName") public class CANJNI extends JNIWrapper { diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/can/CANMessageNotAllowedException.java b/hal/src/main/java/edu/wpi/first/hal/can/CANMessageNotAllowedException.java similarity index 95% rename from hal/src/main/java/edu/wpi/first/wpilibj/can/CANMessageNotAllowedException.java rename to hal/src/main/java/edu/wpi/first/hal/can/CANMessageNotAllowedException.java index c983bdde51..f4ba6a8aa6 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/can/CANMessageNotAllowedException.java +++ b/hal/src/main/java/edu/wpi/first/hal/can/CANMessageNotAllowedException.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.can; +package edu.wpi.first.hal.can; /** * Exception indicating that the Jaguar CAN Driver layer refused to send a restricted message ID to diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/can/CANMessageNotFoundException.java b/hal/src/main/java/edu/wpi/first/hal/can/CANMessageNotFoundException.java similarity index 96% rename from hal/src/main/java/edu/wpi/first/wpilibj/can/CANMessageNotFoundException.java rename to hal/src/main/java/edu/wpi/first/hal/can/CANMessageNotFoundException.java index aa30ab448b..083869136e 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/can/CANMessageNotFoundException.java +++ b/hal/src/main/java/edu/wpi/first/hal/can/CANMessageNotFoundException.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.can; +package edu.wpi.first.hal.can; /** * Exception indicating that a can message is not available from Network Communications. This diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/can/CANNotInitializedException.java b/hal/src/main/java/edu/wpi/first/hal/can/CANNotInitializedException.java similarity index 96% rename from hal/src/main/java/edu/wpi/first/wpilibj/can/CANNotInitializedException.java rename to hal/src/main/java/edu/wpi/first/hal/can/CANNotInitializedException.java index e148c54922..119b59df42 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/can/CANNotInitializedException.java +++ b/hal/src/main/java/edu/wpi/first/hal/can/CANNotInitializedException.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.can; +package edu.wpi.first.hal.can; /** * Exception indicating that the CAN driver layer has not been initialized. This happens when an diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/can/CANStatus.java b/hal/src/main/java/edu/wpi/first/hal/can/CANStatus.java similarity index 97% rename from hal/src/main/java/edu/wpi/first/wpilibj/can/CANStatus.java rename to hal/src/main/java/edu/wpi/first/hal/can/CANStatus.java index d9c2920f93..492d999ef9 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/can/CANStatus.java +++ b/hal/src/main/java/edu/wpi/first/hal/can/CANStatus.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.can; +package edu.wpi.first.hal.can; /** * Structure for holding the result of a CAN Status request. diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/communication/NIRioStatus.java b/hal/src/main/java/edu/wpi/first/hal/communication/NIRioStatus.java similarity index 95% rename from hal/src/main/java/edu/wpi/first/wpilibj/communication/NIRioStatus.java rename to hal/src/main/java/edu/wpi/first/hal/communication/NIRioStatus.java index 5b2335512c..f49f34e1c0 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/communication/NIRioStatus.java +++ b/hal/src/main/java/edu/wpi/first/hal/communication/NIRioStatus.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.communication; +package edu.wpi.first.hal.communication; public class NIRioStatus { public static final int kRioStatusOffset = -63000; diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/sim/AccelerometerSim.java b/hal/src/main/java/edu/wpi/first/hal/sim/AccelerometerSim.java similarity index 98% rename from hal/src/main/java/edu/wpi/first/wpilibj/sim/AccelerometerSim.java rename to hal/src/main/java/edu/wpi/first/hal/sim/AccelerometerSim.java index ff011d7bf2..d9c95aff0b 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/sim/AccelerometerSim.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/AccelerometerSim.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.sim; +package edu.wpi.first.hal.sim; import edu.wpi.first.hal.sim.mockdata.AccelerometerDataJNI; diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/sim/AnalogGyroSim.java b/hal/src/main/java/edu/wpi/first/hal/sim/AnalogGyroSim.java similarity index 98% rename from hal/src/main/java/edu/wpi/first/wpilibj/sim/AnalogGyroSim.java rename to hal/src/main/java/edu/wpi/first/hal/sim/AnalogGyroSim.java index 72f30007a7..ddaa0ce6a9 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/sim/AnalogGyroSim.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/AnalogGyroSim.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.sim; +package edu.wpi.first.hal.sim; import edu.wpi.first.hal.sim.mockdata.AnalogGyroDataJNI; diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/sim/AnalogInSim.java b/hal/src/main/java/edu/wpi/first/hal/sim/AnalogInSim.java similarity index 99% rename from hal/src/main/java/edu/wpi/first/wpilibj/sim/AnalogInSim.java rename to hal/src/main/java/edu/wpi/first/hal/sim/AnalogInSim.java index ca3bd7154f..f7f86bbfb7 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/sim/AnalogInSim.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/AnalogInSim.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.sim; +package edu.wpi.first.hal.sim; import edu.wpi.first.hal.sim.mockdata.AnalogInDataJNI; diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/sim/AnalogOutSim.java b/hal/src/main/java/edu/wpi/first/hal/sim/AnalogOutSim.java similarity index 97% rename from hal/src/main/java/edu/wpi/first/wpilibj/sim/AnalogOutSim.java rename to hal/src/main/java/edu/wpi/first/hal/sim/AnalogOutSim.java index 980d5a17b5..4731b11c74 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/sim/AnalogOutSim.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/AnalogOutSim.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.sim; +package edu.wpi.first.hal.sim; import edu.wpi.first.hal.sim.mockdata.AnalogOutDataJNI; diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/sim/AnalogTriggerSim.java b/hal/src/main/java/edu/wpi/first/hal/sim/AnalogTriggerSim.java similarity index 98% rename from hal/src/main/java/edu/wpi/first/wpilibj/sim/AnalogTriggerSim.java rename to hal/src/main/java/edu/wpi/first/hal/sim/AnalogTriggerSim.java index b445671341..fd88d5fa41 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/sim/AnalogTriggerSim.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/AnalogTriggerSim.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.sim; +package edu.wpi.first.hal.sim; import edu.wpi.first.hal.sim.mockdata.AnalogTriggerDataJNI; diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/sim/BufferCallback.java b/hal/src/main/java/edu/wpi/first/hal/sim/BufferCallback.java similarity index 94% rename from hal/src/main/java/edu/wpi/first/wpilibj/sim/BufferCallback.java rename to hal/src/main/java/edu/wpi/first/hal/sim/BufferCallback.java index 3478aba362..0f7b2d9c20 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/sim/BufferCallback.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/BufferCallback.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.sim; +package edu.wpi.first.hal.sim; public interface BufferCallback { void callback(String name, byte[] buffer, int count); diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/sim/CallbackStore.java b/hal/src/main/java/edu/wpi/first/hal/sim/CallbackStore.java similarity index 98% rename from hal/src/main/java/edu/wpi/first/wpilibj/sim/CallbackStore.java rename to hal/src/main/java/edu/wpi/first/hal/sim/CallbackStore.java index 2697fc13f4..7564104d1e 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/sim/CallbackStore.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/CallbackStore.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.sim; +package edu.wpi.first.hal.sim; public class CallbackStore implements AutoCloseable { interface CancelCallbackFunc { diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/sim/ConstBufferCallback.java b/hal/src/main/java/edu/wpi/first/hal/sim/ConstBufferCallback.java similarity index 94% rename from hal/src/main/java/edu/wpi/first/wpilibj/sim/ConstBufferCallback.java rename to hal/src/main/java/edu/wpi/first/hal/sim/ConstBufferCallback.java index 2a942b1d77..a4251c2b32 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/sim/ConstBufferCallback.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/ConstBufferCallback.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.sim; +package edu.wpi.first.hal.sim; public interface ConstBufferCallback { void callback(String name, byte[] buffer, int count); diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/sim/DIOSim.java b/hal/src/main/java/edu/wpi/first/hal/sim/DIOSim.java similarity index 98% rename from hal/src/main/java/edu/wpi/first/wpilibj/sim/DIOSim.java rename to hal/src/main/java/edu/wpi/first/hal/sim/DIOSim.java index 11320c5358..cd7582219f 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/sim/DIOSim.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/DIOSim.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.sim; +package edu.wpi.first.hal.sim; import edu.wpi.first.hal.sim.mockdata.DIODataJNI; diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/sim/DigitalPWMSim.java b/hal/src/main/java/edu/wpi/first/hal/sim/DigitalPWMSim.java similarity index 98% rename from hal/src/main/java/edu/wpi/first/wpilibj/sim/DigitalPWMSim.java rename to hal/src/main/java/edu/wpi/first/hal/sim/DigitalPWMSim.java index 6eb89a7284..314d9940d3 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/sim/DigitalPWMSim.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/DigitalPWMSim.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.sim; +package edu.wpi.first.hal.sim; import edu.wpi.first.hal.sim.mockdata.DigitalPWMDataJNI; diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/sim/DriverStationSim.java b/hal/src/main/java/edu/wpi/first/hal/sim/DriverStationSim.java similarity index 98% rename from hal/src/main/java/edu/wpi/first/wpilibj/sim/DriverStationSim.java rename to hal/src/main/java/edu/wpi/first/hal/sim/DriverStationSim.java index 64a3b05b2b..15a773ef21 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/sim/DriverStationSim.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/DriverStationSim.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.sim; +package edu.wpi.first.hal.sim; import edu.wpi.first.hal.sim.mockdata.DriverStationDataJNI; diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/sim/EncoderSim.java b/hal/src/main/java/edu/wpi/first/hal/sim/EncoderSim.java similarity index 99% rename from hal/src/main/java/edu/wpi/first/wpilibj/sim/EncoderSim.java rename to hal/src/main/java/edu/wpi/first/hal/sim/EncoderSim.java index f2161163e2..408ca847ec 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/sim/EncoderSim.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/EncoderSim.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.sim; +package edu.wpi.first.hal.sim; import edu.wpi.first.hal.sim.mockdata.EncoderDataJNI; diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/sim/I2CSim.java b/hal/src/main/java/edu/wpi/first/hal/sim/I2CSim.java similarity index 97% rename from hal/src/main/java/edu/wpi/first/wpilibj/sim/I2CSim.java rename to hal/src/main/java/edu/wpi/first/hal/sim/I2CSim.java index 4f4502afd7..3a9aa02a4a 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/sim/I2CSim.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/I2CSim.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.sim; +package edu.wpi.first.hal.sim; import edu.wpi.first.hal.sim.mockdata.I2CDataJNI; diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/sim/NotifyCallback.java b/hal/src/main/java/edu/wpi/first/hal/sim/NotifyCallback.java similarity index 97% rename from hal/src/main/java/edu/wpi/first/wpilibj/sim/NotifyCallback.java rename to hal/src/main/java/edu/wpi/first/hal/sim/NotifyCallback.java index 860bee7a0b..8781f759bf 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/sim/NotifyCallback.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/NotifyCallback.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.sim; +package edu.wpi.first.hal.sim; public interface NotifyCallback { void callback(String name, SimValue value); diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/sim/PCMSim.java b/hal/src/main/java/edu/wpi/first/hal/sim/PCMSim.java similarity index 99% rename from hal/src/main/java/edu/wpi/first/wpilibj/sim/PCMSim.java rename to hal/src/main/java/edu/wpi/first/hal/sim/PCMSim.java index f3790d4707..f8cc327b81 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/sim/PCMSim.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/PCMSim.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.sim; +package edu.wpi.first.hal.sim; import edu.wpi.first.hal.sim.mockdata.PCMDataJNI; diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/sim/PDPSim.java b/hal/src/main/java/edu/wpi/first/hal/sim/PDPSim.java similarity index 98% rename from hal/src/main/java/edu/wpi/first/wpilibj/sim/PDPSim.java rename to hal/src/main/java/edu/wpi/first/hal/sim/PDPSim.java index aa40137e02..d44cf3a239 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/sim/PDPSim.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/PDPSim.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.sim; +package edu.wpi.first.hal.sim; import edu.wpi.first.hal.sim.mockdata.PDPDataJNI; diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/sim/PWMSim.java b/hal/src/main/java/edu/wpi/first/hal/sim/PWMSim.java similarity index 98% rename from hal/src/main/java/edu/wpi/first/wpilibj/sim/PWMSim.java rename to hal/src/main/java/edu/wpi/first/hal/sim/PWMSim.java index 81ede7e6d0..dde38a4c8a 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/sim/PWMSim.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/PWMSim.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.sim; +package edu.wpi.first.hal.sim; import edu.wpi.first.hal.sim.mockdata.PWMDataJNI; diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/sim/RelaySim.java b/hal/src/main/java/edu/wpi/first/hal/sim/RelaySim.java similarity index 98% rename from hal/src/main/java/edu/wpi/first/wpilibj/sim/RelaySim.java rename to hal/src/main/java/edu/wpi/first/hal/sim/RelaySim.java index e6aff38262..84059e80b8 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/sim/RelaySim.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/RelaySim.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.sim; +package edu.wpi.first.hal.sim; import edu.wpi.first.hal.sim.mockdata.RelayDataJNI; diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/sim/RoboRioSim.java b/hal/src/main/java/edu/wpi/first/hal/sim/RoboRioSim.java similarity index 99% rename from hal/src/main/java/edu/wpi/first/wpilibj/sim/RoboRioSim.java rename to hal/src/main/java/edu/wpi/first/hal/sim/RoboRioSim.java index 45012fee19..082f712b50 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/sim/RoboRioSim.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/RoboRioSim.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.sim; +package edu.wpi.first.hal.sim; import edu.wpi.first.hal.sim.mockdata.RoboRioDataJNI; diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/sim/SPIAccelerometerSim.java b/hal/src/main/java/edu/wpi/first/hal/sim/SPIAccelerometerSim.java similarity index 98% rename from hal/src/main/java/edu/wpi/first/wpilibj/sim/SPIAccelerometerSim.java rename to hal/src/main/java/edu/wpi/first/hal/sim/SPIAccelerometerSim.java index 103928135a..94577bdc15 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/sim/SPIAccelerometerSim.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/SPIAccelerometerSim.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.sim; +package edu.wpi.first.hal.sim; import edu.wpi.first.hal.sim.mockdata.SPIAccelerometerDataJNI; diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/sim/SPISim.java b/hal/src/main/java/edu/wpi/first/hal/sim/SPISim.java similarity index 98% rename from hal/src/main/java/edu/wpi/first/wpilibj/sim/SPISim.java rename to hal/src/main/java/edu/wpi/first/hal/sim/SPISim.java index 0a6d3bbe65..5f43bcaa7f 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/sim/SPISim.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/SPISim.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.sim; +package edu.wpi.first.hal.sim; import edu.wpi.first.hal.sim.mockdata.SPIDataJNI; diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/sim/SimHooks.java b/hal/src/main/java/edu/wpi/first/hal/sim/SimHooks.java similarity index 96% rename from hal/src/main/java/edu/wpi/first/wpilibj/sim/SimHooks.java rename to hal/src/main/java/edu/wpi/first/hal/sim/SimHooks.java index f8d5950485..6c46111a61 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/sim/SimHooks.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/SimHooks.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.sim; +package edu.wpi.first.hal.sim; import edu.wpi.first.hal.sim.mockdata.SimulatorJNI; diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/sim/SimValue.java b/hal/src/main/java/edu/wpi/first/hal/sim/SimValue.java similarity index 97% rename from hal/src/main/java/edu/wpi/first/wpilibj/sim/SimValue.java rename to hal/src/main/java/edu/wpi/first/hal/sim/SimValue.java index 4b30c9ff53..3dbb7c9477 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/sim/SimValue.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/SimValue.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.sim; +package edu.wpi.first.hal.sim; public final class SimValue { private boolean m_boolean; diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/sim/SpiReadAutoReceiveBufferCallback.java b/hal/src/main/java/edu/wpi/first/hal/sim/SpiReadAutoReceiveBufferCallback.java similarity index 94% rename from hal/src/main/java/edu/wpi/first/wpilibj/sim/SpiReadAutoReceiveBufferCallback.java rename to hal/src/main/java/edu/wpi/first/hal/sim/SpiReadAutoReceiveBufferCallback.java index 59b58dbc87..d14531aa4a 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/sim/SpiReadAutoReceiveBufferCallback.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/SpiReadAutoReceiveBufferCallback.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.sim; +package edu.wpi.first.hal.sim; public interface SpiReadAutoReceiveBufferCallback { int callback(String name, byte[] buffer, int numToRead); diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AccelerometerDataJNI.java b/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AccelerometerDataJNI.java index 9fe3e8b51d..22276d42f0 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AccelerometerDataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AccelerometerDataJNI.java @@ -7,8 +7,8 @@ package edu.wpi.first.hal.sim.mockdata; -import edu.wpi.first.wpilibj.sim.NotifyCallback; -import edu.wpi.first.wpilibj.hal.JNIWrapper; +import edu.wpi.first.hal.sim.NotifyCallback; +import edu.wpi.first.hal.JNIWrapper; public class AccelerometerDataJNI extends JNIWrapper { public static native int registerActiveCallback(int index, NotifyCallback callback, boolean initialNotify); diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AnalogGyroDataJNI.java b/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AnalogGyroDataJNI.java index f9794e979a..4995df203b 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AnalogGyroDataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AnalogGyroDataJNI.java @@ -7,8 +7,8 @@ package edu.wpi.first.hal.sim.mockdata; -import edu.wpi.first.wpilibj.sim.NotifyCallback; -import edu.wpi.first.wpilibj.hal.JNIWrapper; +import edu.wpi.first.hal.sim.NotifyCallback; +import edu.wpi.first.hal.JNIWrapper; public class AnalogGyroDataJNI extends JNIWrapper { public static native int registerAngleCallback(int index, NotifyCallback callback, boolean initialNotify); diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AnalogInDataJNI.java b/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AnalogInDataJNI.java index 0e5bfaf0da..ed4fbac7cb 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AnalogInDataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AnalogInDataJNI.java @@ -7,8 +7,8 @@ package edu.wpi.first.hal.sim.mockdata; -import edu.wpi.first.wpilibj.sim.NotifyCallback; -import edu.wpi.first.wpilibj.hal.JNIWrapper; +import edu.wpi.first.hal.sim.NotifyCallback; +import edu.wpi.first.hal.JNIWrapper; public class AnalogInDataJNI extends JNIWrapper { public static native int registerInitializedCallback(int index, NotifyCallback callback, boolean initialNotify); diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AnalogOutDataJNI.java b/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AnalogOutDataJNI.java index 1f9f9b337d..2f7596ca82 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AnalogOutDataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AnalogOutDataJNI.java @@ -7,8 +7,8 @@ package edu.wpi.first.hal.sim.mockdata; -import edu.wpi.first.wpilibj.sim.NotifyCallback; -import edu.wpi.first.wpilibj.hal.JNIWrapper; +import edu.wpi.first.hal.sim.NotifyCallback; +import edu.wpi.first.hal.JNIWrapper; public class AnalogOutDataJNI extends JNIWrapper { public static native int registerVoltageCallback(int index, NotifyCallback callback, boolean initialNotify); diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AnalogTriggerDataJNI.java b/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AnalogTriggerDataJNI.java index 19d59116af..cf4187f586 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AnalogTriggerDataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AnalogTriggerDataJNI.java @@ -7,8 +7,8 @@ package edu.wpi.first.hal.sim.mockdata; -import edu.wpi.first.wpilibj.sim.NotifyCallback; -import edu.wpi.first.wpilibj.hal.JNIWrapper; +import edu.wpi.first.hal.sim.NotifyCallback; +import edu.wpi.first.hal.JNIWrapper; public class AnalogTriggerDataJNI extends JNIWrapper { public static native int registerInitializedCallback(int index, NotifyCallback callback, boolean initialNotify); diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/DIODataJNI.java b/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/DIODataJNI.java index e49f35b95d..55de7debb0 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/DIODataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/DIODataJNI.java @@ -7,8 +7,8 @@ package edu.wpi.first.hal.sim.mockdata; -import edu.wpi.first.wpilibj.sim.NotifyCallback; -import edu.wpi.first.wpilibj.hal.JNIWrapper; +import edu.wpi.first.hal.sim.NotifyCallback; +import edu.wpi.first.hal.JNIWrapper; public class DIODataJNI extends JNIWrapper { public static native int registerInitializedCallback(int index, NotifyCallback callback, boolean initialNotify); diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/DigitalPWMDataJNI.java b/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/DigitalPWMDataJNI.java index 6ca30b0b37..69bee073e3 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/DigitalPWMDataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/DigitalPWMDataJNI.java @@ -7,8 +7,8 @@ package edu.wpi.first.hal.sim.mockdata; -import edu.wpi.first.wpilibj.sim.NotifyCallback; -import edu.wpi.first.wpilibj.hal.JNIWrapper; +import edu.wpi.first.hal.sim.NotifyCallback; +import edu.wpi.first.hal.JNIWrapper; public class DigitalPWMDataJNI extends JNIWrapper { public static native int registerInitializedCallback(int index, NotifyCallback callback, boolean initialNotify); diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/DriverStationDataJNI.java b/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/DriverStationDataJNI.java index ee5487b12c..2d41ca7419 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/DriverStationDataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/DriverStationDataJNI.java @@ -7,8 +7,8 @@ package edu.wpi.first.hal.sim.mockdata; -import edu.wpi.first.wpilibj.hal.JNIWrapper; -import edu.wpi.first.wpilibj.sim.NotifyCallback; +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/EncoderDataJNI.java b/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/EncoderDataJNI.java index 762c51f294..17e242e7fd 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/EncoderDataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/EncoderDataJNI.java @@ -7,8 +7,8 @@ package edu.wpi.first.hal.sim.mockdata; -import edu.wpi.first.wpilibj.sim.NotifyCallback; -import edu.wpi.first.wpilibj.hal.JNIWrapper; +import edu.wpi.first.hal.sim.NotifyCallback; +import edu.wpi.first.hal.JNIWrapper; public class EncoderDataJNI extends JNIWrapper { public static native int registerInitializedCallback(int index, NotifyCallback callback, boolean initialNotify); diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/I2CDataJNI.java b/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/I2CDataJNI.java index ed2f65578f..33d78f8ffb 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/I2CDataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/I2CDataJNI.java @@ -7,10 +7,10 @@ package edu.wpi.first.hal.sim.mockdata; -import edu.wpi.first.wpilibj.sim.BufferCallback; -import edu.wpi.first.wpilibj.sim.ConstBufferCallback; -import edu.wpi.first.wpilibj.sim.NotifyCallback; -import edu.wpi.first.wpilibj.hal.JNIWrapper; +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 { public static native int registerInitializedCallback(int index, NotifyCallback callback, boolean initialNotify); diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/PCMDataJNI.java b/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/PCMDataJNI.java index 1ab5426f6b..c5de287cdd 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/PCMDataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/PCMDataJNI.java @@ -7,8 +7,8 @@ package edu.wpi.first.hal.sim.mockdata; -import edu.wpi.first.wpilibj.sim.NotifyCallback; -import edu.wpi.first.wpilibj.hal.JNIWrapper; +import edu.wpi.first.hal.sim.NotifyCallback; +import edu.wpi.first.hal.JNIWrapper; public class PCMDataJNI extends JNIWrapper { public static native int registerSolenoidInitializedCallback(int index, int channel, NotifyCallback callback, boolean initialNotify); diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/PDPDataJNI.java b/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/PDPDataJNI.java index 6f7bc437c2..581a727ced 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/PDPDataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/PDPDataJNI.java @@ -7,8 +7,8 @@ package edu.wpi.first.hal.sim.mockdata; -import edu.wpi.first.wpilibj.sim.NotifyCallback; -import edu.wpi.first.wpilibj.hal.JNIWrapper; +import edu.wpi.first.hal.sim.NotifyCallback; +import edu.wpi.first.hal.JNIWrapper; public class PDPDataJNI extends JNIWrapper { public static native int registerInitializedCallback(int index, NotifyCallback callback, boolean initialNotify); diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/PWMDataJNI.java b/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/PWMDataJNI.java index 1a8e2cbc13..e36990e212 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/PWMDataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/PWMDataJNI.java @@ -7,8 +7,8 @@ package edu.wpi.first.hal.sim.mockdata; -import edu.wpi.first.wpilibj.sim.NotifyCallback; -import edu.wpi.first.wpilibj.hal.JNIWrapper; +import edu.wpi.first.hal.sim.NotifyCallback; +import edu.wpi.first.hal.JNIWrapper; public class PWMDataJNI extends JNIWrapper { public static native int registerInitializedCallback(int index, NotifyCallback callback, boolean initialNotify); diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/RelayDataJNI.java b/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/RelayDataJNI.java index ccee830727..320a86d2fd 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/RelayDataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/RelayDataJNI.java @@ -7,8 +7,8 @@ package edu.wpi.first.hal.sim.mockdata; -import edu.wpi.first.wpilibj.sim.NotifyCallback; -import edu.wpi.first.wpilibj.hal.JNIWrapper; +import edu.wpi.first.hal.sim.NotifyCallback; +import edu.wpi.first.hal.JNIWrapper; public class RelayDataJNI extends JNIWrapper { public static native int registerInitializedForwardCallback(int index, NotifyCallback callback, boolean initialNotify); diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/RoboRioDataJNI.java b/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/RoboRioDataJNI.java index b56c6f24ee..a13845c113 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/RoboRioDataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/RoboRioDataJNI.java @@ -7,8 +7,8 @@ package edu.wpi.first.hal.sim.mockdata; -import edu.wpi.first.wpilibj.sim.NotifyCallback; -import edu.wpi.first.wpilibj.hal.JNIWrapper; +import edu.wpi.first.hal.sim.NotifyCallback; +import edu.wpi.first.hal.JNIWrapper; public class RoboRioDataJNI extends JNIWrapper { public static native int registerFPGAButtonCallback(int index, NotifyCallback callback, boolean initialNotify); diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/SPIAccelerometerDataJNI.java b/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/SPIAccelerometerDataJNI.java index 5b266235d8..d8e735375b 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/SPIAccelerometerDataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/SPIAccelerometerDataJNI.java @@ -7,8 +7,8 @@ package edu.wpi.first.hal.sim.mockdata; -import edu.wpi.first.wpilibj.sim.NotifyCallback; -import edu.wpi.first.wpilibj.hal.JNIWrapper; +import edu.wpi.first.hal.sim.NotifyCallback; +import edu.wpi.first.hal.JNIWrapper; public class SPIAccelerometerDataJNI extends JNIWrapper { public static native int registerActiveCallback(int index, NotifyCallback callback, boolean initialNotify); diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/SPIDataJNI.java b/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/SPIDataJNI.java index 40d070db84..a12ec66902 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/SPIDataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/SPIDataJNI.java @@ -7,11 +7,11 @@ package edu.wpi.first.hal.sim.mockdata; -import edu.wpi.first.wpilibj.sim.BufferCallback; -import edu.wpi.first.wpilibj.sim.ConstBufferCallback; -import edu.wpi.first.wpilibj.sim.NotifyCallback; -import edu.wpi.first.wpilibj.sim.SpiReadAutoReceiveBufferCallback; -import edu.wpi.first.wpilibj.hal.JNIWrapper; +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 { public static native int registerInitializedCallback(int index, NotifyCallback callback, boolean initialNotify); diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/SimulatorJNI.java b/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/SimulatorJNI.java index bfc2293fe5..bb86005582 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/SimulatorJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/SimulatorJNI.java @@ -7,7 +7,7 @@ package edu.wpi.first.hal.sim.mockdata; -import edu.wpi.first.wpilibj.hal.JNIWrapper; +import edu.wpi.first.hal.JNIWrapper; public class SimulatorJNI extends JNIWrapper { public static native void waitForProgramStart(); diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/util/AllocationException.java b/hal/src/main/java/edu/wpi/first/hal/util/AllocationException.java similarity index 95% rename from hal/src/main/java/edu/wpi/first/wpilibj/util/AllocationException.java rename to hal/src/main/java/edu/wpi/first/hal/util/AllocationException.java index 54112a0044..6f789d8640 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/util/AllocationException.java +++ b/hal/src/main/java/edu/wpi/first/hal/util/AllocationException.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.util; +package edu.wpi.first.hal.util; /** * Exception indicating that the resource is already allocated. diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/util/BoundaryException.java b/hal/src/main/java/edu/wpi/first/hal/util/BoundaryException.java similarity index 98% rename from hal/src/main/java/edu/wpi/first/wpilibj/util/BoundaryException.java rename to hal/src/main/java/edu/wpi/first/hal/util/BoundaryException.java index e348c28227..8f21e60417 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/util/BoundaryException.java +++ b/hal/src/main/java/edu/wpi/first/hal/util/BoundaryException.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.util; +package edu.wpi.first.hal.util; /** * This exception represents an error in which a lower limit was set as higher than an upper limit. diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/util/CheckedAllocationException.java b/hal/src/main/java/edu/wpi/first/hal/util/CheckedAllocationException.java similarity index 95% rename from hal/src/main/java/edu/wpi/first/wpilibj/util/CheckedAllocationException.java rename to hal/src/main/java/edu/wpi/first/hal/util/CheckedAllocationException.java index 8f201aca22..f17e381ffd 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/util/CheckedAllocationException.java +++ b/hal/src/main/java/edu/wpi/first/hal/util/CheckedAllocationException.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.util; +package edu.wpi.first.hal.util; /** * Exception indicating that the resource is already allocated This is meant to be thrown by the diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/util/HalHandleException.java b/hal/src/main/java/edu/wpi/first/hal/util/HalHandleException.java similarity index 95% rename from hal/src/main/java/edu/wpi/first/wpilibj/util/HalHandleException.java rename to hal/src/main/java/edu/wpi/first/hal/util/HalHandleException.java index 12e5a70abc..874b07ab45 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/util/HalHandleException.java +++ b/hal/src/main/java/edu/wpi/first/hal/util/HalHandleException.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.util; +package edu.wpi.first.hal.util; /** * Exception indicating that an error has occured with a HAL Handle. diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/util/UncleanStatusException.java b/hal/src/main/java/edu/wpi/first/hal/util/UncleanStatusException.java similarity index 97% rename from hal/src/main/java/edu/wpi/first/wpilibj/util/UncleanStatusException.java rename to hal/src/main/java/edu/wpi/first/hal/util/UncleanStatusException.java index 1a91b82a7e..3a3e217d02 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/util/UncleanStatusException.java +++ b/hal/src/main/java/edu/wpi/first/hal/util/UncleanStatusException.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.util; +package edu.wpi.first.hal.util; /** * Exception for bad status codes from the chip object. diff --git a/hal/src/main/native/cpp/jni/AccelerometerJNI.cpp b/hal/src/main/native/cpp/jni/AccelerometerJNI.cpp index 5cbd752b7a..6d0d256fc0 100644 --- a/hal/src/main/native/cpp/jni/AccelerometerJNI.cpp +++ b/hal/src/main/native/cpp/jni/AccelerometerJNI.cpp @@ -7,66 +7,66 @@ #include -#include "edu_wpi_first_wpilibj_hal_AccelerometerJNI.h" +#include "edu_wpi_first_hal_AccelerometerJNI.h" #include "hal/Accelerometer.h" extern "C" { /* - * Class: edu_wpi_first_wpilibj_hal_AccelerometerJNI + * Class: edu_wpi_first_hal_AccelerometerJNI * Method: setAccelerometerActive * Signature: (Z)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_AccelerometerJNI_setAccelerometerActive +Java_edu_wpi_first_hal_AccelerometerJNI_setAccelerometerActive (JNIEnv*, jclass, jboolean active) { HAL_SetAccelerometerActive(active); } /* - * Class: edu_wpi_first_wpilibj_hal_AccelerometerJNI + * Class: edu_wpi_first_hal_AccelerometerJNI * Method: setAccelerometerRange * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_AccelerometerJNI_setAccelerometerRange +Java_edu_wpi_first_hal_AccelerometerJNI_setAccelerometerRange (JNIEnv*, jclass, jint range) { HAL_SetAccelerometerRange((HAL_AccelerometerRange)range); } /* - * Class: edu_wpi_first_wpilibj_hal_AccelerometerJNI + * Class: edu_wpi_first_hal_AccelerometerJNI * Method: getAccelerometerX * Signature: ()D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_wpilibj_hal_AccelerometerJNI_getAccelerometerX +Java_edu_wpi_first_hal_AccelerometerJNI_getAccelerometerX (JNIEnv*, jclass) { return HAL_GetAccelerometerX(); } /* - * Class: edu_wpi_first_wpilibj_hal_AccelerometerJNI + * Class: edu_wpi_first_hal_AccelerometerJNI * Method: getAccelerometerY * Signature: ()D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_wpilibj_hal_AccelerometerJNI_getAccelerometerY +Java_edu_wpi_first_hal_AccelerometerJNI_getAccelerometerY (JNIEnv*, jclass) { return HAL_GetAccelerometerY(); } /* - * Class: edu_wpi_first_wpilibj_hal_AccelerometerJNI + * Class: edu_wpi_first_hal_AccelerometerJNI * Method: getAccelerometerZ * Signature: ()D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_wpilibj_hal_AccelerometerJNI_getAccelerometerZ +Java_edu_wpi_first_hal_AccelerometerJNI_getAccelerometerZ (JNIEnv*, jclass) { return HAL_GetAccelerometerZ(); diff --git a/hal/src/main/native/cpp/jni/AnalogGyroJNI.cpp b/hal/src/main/native/cpp/jni/AnalogGyroJNI.cpp index 91d75409a6..74c1b49b30 100644 --- a/hal/src/main/native/cpp/jni/AnalogGyroJNI.cpp +++ b/hal/src/main/native/cpp/jni/AnalogGyroJNI.cpp @@ -10,7 +10,7 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_wpilibj_hal_AnalogGyroJNI.h" +#include "edu_wpi_first_hal_AnalogGyroJNI.h" #include "hal/AnalogGyro.h" #include "hal/cpp/Log.h" #include "hal/handles/HandlesInternal.h" @@ -28,12 +28,12 @@ TLogLevel analogGyroJNILogLevel = logWARNING; extern "C" { /* - * Class: edu_wpi_first_wpilibj_hal_AnalogGyroJNI + * Class: edu_wpi_first_hal_AnalogGyroJNI * Method: initializeAnalogGyro * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_initializeAnalogGyro +Java_edu_wpi_first_hal_AnalogGyroJNI_initializeAnalogGyro (JNIEnv* env, jclass, jint id) { ANALOGGYROJNI_LOG(logDEBUG) << "Calling ANALOGGYROJNI initializeAnalogGyro"; @@ -50,12 +50,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_initializeAnalogGyro } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogGyroJNI + * Class: edu_wpi_first_hal_AnalogGyroJNI * Method: setupAnalogGyro * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_setupAnalogGyro +Java_edu_wpi_first_hal_AnalogGyroJNI_setupAnalogGyro (JNIEnv* env, jclass, jint id) { ANALOGGYROJNI_LOG(logDEBUG) << "Calling ANALOGGYROJNI setupAnalogGyro"; @@ -67,12 +67,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_setupAnalogGyro } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogGyroJNI + * Class: edu_wpi_first_hal_AnalogGyroJNI * Method: freeAnalogGyro * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_freeAnalogGyro +Java_edu_wpi_first_hal_AnalogGyroJNI_freeAnalogGyro (JNIEnv* env, jclass, jint id) { ANALOGGYROJNI_LOG(logDEBUG) << "Calling ANALOGGYROJNI freeAnalogGyro"; @@ -81,12 +81,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_freeAnalogGyro } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogGyroJNI + * Class: edu_wpi_first_hal_AnalogGyroJNI * Method: setAnalogGyroParameters * Signature: (IDDI)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_setAnalogGyroParameters +Java_edu_wpi_first_hal_AnalogGyroJNI_setAnalogGyroParameters (JNIEnv* env, jclass, jint id, jdouble vPDPS, jdouble offset, jint center) { ANALOGGYROJNI_LOG(logDEBUG) @@ -100,12 +100,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_setAnalogGyroParameters } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogGyroJNI + * Class: edu_wpi_first_hal_AnalogGyroJNI * Method: setAnalogGyroVoltsPerDegreePerSecond * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_setAnalogGyroVoltsPerDegreePerSecond +Java_edu_wpi_first_hal_AnalogGyroJNI_setAnalogGyroVoltsPerDegreePerSecond (JNIEnv* env, jclass, jint id, jdouble vPDPS) { ANALOGGYROJNI_LOG(logDEBUG) @@ -119,12 +119,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_setAnalogGyroVoltsPerDegreePerSecon } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogGyroJNI + * Class: edu_wpi_first_hal_AnalogGyroJNI * Method: resetAnalogGyro * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_resetAnalogGyro +Java_edu_wpi_first_hal_AnalogGyroJNI_resetAnalogGyro (JNIEnv* env, jclass, jint id) { ANALOGGYROJNI_LOG(logDEBUG) << "Calling ANALOGGYROJNI resetAnalogGyro"; @@ -136,12 +136,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_resetAnalogGyro } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogGyroJNI + * Class: edu_wpi_first_hal_AnalogGyroJNI * Method: calibrateAnalogGyro * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_calibrateAnalogGyro +Java_edu_wpi_first_hal_AnalogGyroJNI_calibrateAnalogGyro (JNIEnv* env, jclass, jint id) { ANALOGGYROJNI_LOG(logDEBUG) << "Calling ANALOGGYROJNI calibrateAnalogGyro"; @@ -153,12 +153,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_calibrateAnalogGyro } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogGyroJNI + * Class: edu_wpi_first_hal_AnalogGyroJNI * Method: setAnalogGyroDeadband * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_setAnalogGyroDeadband +Java_edu_wpi_first_hal_AnalogGyroJNI_setAnalogGyroDeadband (JNIEnv* env, jclass, jint id, jdouble deadband) { ANALOGGYROJNI_LOG(logDEBUG) << "Calling ANALOGGYROJNI setAnalogGyroDeadband"; @@ -170,12 +170,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_setAnalogGyroDeadband } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogGyroJNI + * Class: edu_wpi_first_hal_AnalogGyroJNI * Method: getAnalogGyroAngle * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_getAnalogGyroAngle +Java_edu_wpi_first_hal_AnalogGyroJNI_getAnalogGyroAngle (JNIEnv* env, jclass, jint id) { ANALOGGYROJNI_LOG(logDEBUG) << "Calling ANALOGGYROJNI getAnalogGyroAngle"; @@ -189,12 +189,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_getAnalogGyroAngle } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogGyroJNI + * Class: edu_wpi_first_hal_AnalogGyroJNI * Method: getAnalogGyroRate * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_getAnalogGyroRate +Java_edu_wpi_first_hal_AnalogGyroJNI_getAnalogGyroRate (JNIEnv* env, jclass, jint id) { ANALOGGYROJNI_LOG(logDEBUG) << "Calling ANALOGGYROJNI getAnalogGyroRate"; @@ -208,12 +208,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_getAnalogGyroRate } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogGyroJNI + * Class: edu_wpi_first_hal_AnalogGyroJNI * Method: getAnalogGyroOffset * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_getAnalogGyroOffset +Java_edu_wpi_first_hal_AnalogGyroJNI_getAnalogGyroOffset (JNIEnv* env, jclass, jint id) { ANALOGGYROJNI_LOG(logDEBUG) << "Calling ANALOGGYROJNI getAnalogGyroOffset"; @@ -227,12 +227,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_getAnalogGyroOffset } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogGyroJNI + * Class: edu_wpi_first_hal_AnalogGyroJNI * Method: getAnalogGyroCenter * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_getAnalogGyroCenter +Java_edu_wpi_first_hal_AnalogGyroJNI_getAnalogGyroCenter (JNIEnv* env, jclass, jint id) { ANALOGGYROJNI_LOG(logDEBUG) << "Calling ANALOGGYROJNI getAnalogGyroCenter"; diff --git a/hal/src/main/native/cpp/jni/AnalogJNI.cpp b/hal/src/main/native/cpp/jni/AnalogJNI.cpp index b4cc8b9a07..3b2aa2d522 100644 --- a/hal/src/main/native/cpp/jni/AnalogJNI.cpp +++ b/hal/src/main/native/cpp/jni/AnalogJNI.cpp @@ -10,7 +10,7 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_wpilibj_hal_AnalogJNI.h" +#include "edu_wpi_first_hal_AnalogJNI.h" #include "hal/AnalogAccumulator.h" #include "hal/AnalogInput.h" #include "hal/AnalogOutput.h" @@ -33,12 +33,12 @@ TLogLevel analogJNILogLevel = logWARNING; extern "C" { /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: initializeAnalogInputPort * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_initializeAnalogInputPort +Java_edu_wpi_first_hal_AnalogJNI_initializeAnalogInputPort (JNIEnv* env, jclass, jint id) { ANALOGJNI_LOG(logDEBUG) << "Port Handle = " << (HAL_PortHandle)id; @@ -52,12 +52,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_initializeAnalogInputPort } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: freeAnalogInputPort * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_freeAnalogInputPort +Java_edu_wpi_first_hal_AnalogJNI_freeAnalogInputPort (JNIEnv* env, jclass, jint id) { ANALOGJNI_LOG(logDEBUG) << "Port Handle = " << (HAL_AnalogInputHandle)id; @@ -65,12 +65,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_freeAnalogInputPort } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: initializeAnalogOutputPort * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_initializeAnalogOutputPort +Java_edu_wpi_first_hal_AnalogJNI_initializeAnalogOutputPort (JNIEnv* env, jclass, jint id) { ANALOGJNI_LOG(logDEBUG) << "Port Handle = " << (HAL_PortHandle)id; @@ -85,12 +85,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_initializeAnalogOutputPort } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: freeAnalogOutputPort * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_freeAnalogOutputPort +Java_edu_wpi_first_hal_AnalogJNI_freeAnalogOutputPort (JNIEnv* env, jclass, jint id) { ANALOGJNI_LOG(logDEBUG) << "Port Handle = " << id; @@ -98,12 +98,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_freeAnalogOutputPort } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: checkAnalogModule * Signature: (B)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_checkAnalogModule +Java_edu_wpi_first_hal_AnalogJNI_checkAnalogModule (JNIEnv*, jclass, jbyte value) { // ANALOGJNI_LOG(logDEBUG) << "Module = " << (jint)value; @@ -114,12 +114,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_checkAnalogModule } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: checkAnalogInputChannel * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_checkAnalogInputChannel +Java_edu_wpi_first_hal_AnalogJNI_checkAnalogInputChannel (JNIEnv*, jclass, jint value) { // ANALOGJNI_LOG(logDEBUG) << "Channel = " << value; @@ -130,12 +130,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_checkAnalogInputChannel } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: checkAnalogOutputChannel * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_checkAnalogOutputChannel +Java_edu_wpi_first_hal_AnalogJNI_checkAnalogOutputChannel (JNIEnv*, jclass, jint value) { // ANALOGJNI_LOG(logDEBUG) << "Channel = " << value; @@ -146,12 +146,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_checkAnalogOutputChannel } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: setAnalogOutput * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogOutput +Java_edu_wpi_first_hal_AnalogJNI_setAnalogOutput (JNIEnv* env, jclass, jint id, jdouble voltage) { ANALOGJNI_LOG(logDEBUG) << "Calling setAnalogOutput"; @@ -163,12 +163,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogOutput } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: getAnalogOutput * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogOutput +Java_edu_wpi_first_hal_AnalogJNI_getAnalogOutput (JNIEnv* env, jclass, jint id) { int32_t status = 0; @@ -178,12 +178,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogOutput } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: setAnalogSampleRate * Signature: (D)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogSampleRate +Java_edu_wpi_first_hal_AnalogJNI_setAnalogSampleRate (JNIEnv* env, jclass, jdouble value) { ANALOGJNI_LOG(logDEBUG) << "SampleRate = " << value; @@ -194,12 +194,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogSampleRate } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: getAnalogSampleRate * Signature: ()D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogSampleRate +Java_edu_wpi_first_hal_AnalogJNI_getAnalogSampleRate (JNIEnv* env, jclass) { int32_t status = 0; @@ -211,12 +211,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogSampleRate } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: setAnalogAverageBits * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogAverageBits +Java_edu_wpi_first_hal_AnalogJNI_setAnalogAverageBits (JNIEnv* env, jclass, jint id, jint value) { ANALOGJNI_LOG(logDEBUG) << "AverageBits = " << value; @@ -228,12 +228,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogAverageBits } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: getAnalogAverageBits * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogAverageBits +Java_edu_wpi_first_hal_AnalogJNI_getAnalogAverageBits (JNIEnv* env, jclass, jint id) { ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id; @@ -247,12 +247,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogAverageBits } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: setAnalogOversampleBits * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogOversampleBits +Java_edu_wpi_first_hal_AnalogJNI_setAnalogOversampleBits (JNIEnv* env, jclass, jint id, jint value) { ANALOGJNI_LOG(logDEBUG) << "OversampleBits = " << value; @@ -264,12 +264,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogOversampleBits } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: getAnalogOversampleBits * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogOversampleBits +Java_edu_wpi_first_hal_AnalogJNI_getAnalogOversampleBits (JNIEnv* env, jclass, jint id) { ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id; @@ -283,12 +283,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogOversampleBits } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: getAnalogValue * Signature: (I)S */ JNIEXPORT jshort JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogValue +Java_edu_wpi_first_hal_AnalogJNI_getAnalogValue (JNIEnv* env, jclass, jint id) { // ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (void*)id; @@ -301,12 +301,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogValue } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: getAnalogAverageValue * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogAverageValue +Java_edu_wpi_first_hal_AnalogJNI_getAnalogAverageValue (JNIEnv* env, jclass, jint id) { ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id; @@ -320,12 +320,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogAverageValue } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: getAnalogVoltsToValue * Signature: (ID)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogVoltsToValue +Java_edu_wpi_first_hal_AnalogJNI_getAnalogVoltsToValue (JNIEnv* env, jclass, jint id, jdouble voltageValue) { ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id; @@ -340,12 +340,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogVoltsToValue } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: getAnalogVoltage * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogVoltage +Java_edu_wpi_first_hal_AnalogJNI_getAnalogVoltage (JNIEnv* env, jclass, jint id) { // ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (void*)id; @@ -359,12 +359,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogVoltage } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: getAnalogAverageVoltage * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogAverageVoltage +Java_edu_wpi_first_hal_AnalogJNI_getAnalogAverageVoltage (JNIEnv* env, jclass, jint id) { ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id; @@ -378,12 +378,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogAverageVoltage } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: getAnalogLSBWeight * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogLSBWeight +Java_edu_wpi_first_hal_AnalogJNI_getAnalogLSBWeight (JNIEnv* env, jclass, jint id) { ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id; @@ -397,12 +397,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogLSBWeight } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: getAnalogOffset * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogOffset +Java_edu_wpi_first_hal_AnalogJNI_getAnalogOffset (JNIEnv* env, jclass, jint id) { ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id; @@ -416,12 +416,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogOffset } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: isAccumulatorChannel * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_isAccumulatorChannel +Java_edu_wpi_first_hal_AnalogJNI_isAccumulatorChannel (JNIEnv* env, jclass, jint id) { ANALOGJNI_LOG(logDEBUG) << "isAccumulatorChannel"; @@ -437,12 +437,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_isAccumulatorChannel } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: initAccumulator * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_initAccumulator +Java_edu_wpi_first_hal_AnalogJNI_initAccumulator (JNIEnv* env, jclass, jint id) { ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id; @@ -453,12 +453,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_initAccumulator } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: resetAccumulator * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_resetAccumulator +Java_edu_wpi_first_hal_AnalogJNI_resetAccumulator (JNIEnv* env, jclass, jint id) { ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id; @@ -469,12 +469,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_resetAccumulator } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: setAccumulatorCenter * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAccumulatorCenter +Java_edu_wpi_first_hal_AnalogJNI_setAccumulatorCenter (JNIEnv* env, jclass, jint id, jint center) { ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id; @@ -485,12 +485,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAccumulatorCenter } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: setAccumulatorDeadband * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAccumulatorDeadband +Java_edu_wpi_first_hal_AnalogJNI_setAccumulatorDeadband (JNIEnv* env, jclass, jint id, jint deadband) { ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id; @@ -501,12 +501,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAccumulatorDeadband } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: getAccumulatorValue * Signature: (I)J */ JNIEXPORT jlong JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAccumulatorValue +Java_edu_wpi_first_hal_AnalogJNI_getAccumulatorValue (JNIEnv* env, jclass, jint id) { ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id; @@ -521,12 +521,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAccumulatorValue } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: getAccumulatorCount * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAccumulatorCount +Java_edu_wpi_first_hal_AnalogJNI_getAccumulatorCount (JNIEnv* env, jclass, jint id) { ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id; @@ -540,12 +540,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAccumulatorCount } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: getAccumulatorOutput * Signature: (ILjava/lang/Object;)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAccumulatorOutput +Java_edu_wpi_first_hal_AnalogJNI_getAccumulatorOutput (JNIEnv* env, jclass, jint id, jobject accumulatorResult) { ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id; @@ -561,12 +561,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAccumulatorOutput } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: initializeAnalogTrigger * Signature: (ILjava/lang/Object;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_initializeAnalogTrigger +Java_edu_wpi_first_hal_AnalogJNI_initializeAnalogTrigger (JNIEnv* env, jclass, jint id, jobject index) { ANALOGJNI_LOG(logDEBUG) << "Port Handle = " << (HAL_AnalogInputHandle)id; @@ -584,12 +584,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_initializeAnalogTrigger } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: cleanAnalogTrigger * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_cleanAnalogTrigger +Java_edu_wpi_first_hal_AnalogJNI_cleanAnalogTrigger (JNIEnv* env, jclass, jint id) { ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = " @@ -600,12 +600,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_cleanAnalogTrigger } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: setAnalogTriggerLimitsRaw * Signature: (III)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogTriggerLimitsRaw +Java_edu_wpi_first_hal_AnalogJNI_setAnalogTriggerLimitsRaw (JNIEnv* env, jclass, jint id, jint lower, jint upper) { ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = " @@ -617,12 +617,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogTriggerLimitsRaw } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: setAnalogTriggerLimitsVoltage * Signature: (IDD)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogTriggerLimitsVoltage +Java_edu_wpi_first_hal_AnalogJNI_setAnalogTriggerLimitsVoltage (JNIEnv* env, jclass, jint id, jdouble lower, jdouble upper) { ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = " @@ -634,12 +634,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogTriggerLimitsVoltage } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: setAnalogTriggerAveraged * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogTriggerAveraged +Java_edu_wpi_first_hal_AnalogJNI_setAnalogTriggerAveraged (JNIEnv* env, jclass, jint id, jboolean averaged) { ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = " @@ -650,12 +650,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogTriggerAveraged } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: setAnalogTriggerFiltered * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogTriggerFiltered +Java_edu_wpi_first_hal_AnalogJNI_setAnalogTriggerFiltered (JNIEnv* env, jclass, jint id, jboolean filtered) { ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = " @@ -666,12 +666,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogTriggerFiltered } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: getAnalogTriggerInWindow * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogTriggerInWindow +Java_edu_wpi_first_hal_AnalogJNI_getAnalogTriggerInWindow (JNIEnv* env, jclass, jint id) { ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = " @@ -684,12 +684,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogTriggerInWindow } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: getAnalogTriggerTriggerState * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogTriggerTriggerState +Java_edu_wpi_first_hal_AnalogJNI_getAnalogTriggerTriggerState (JNIEnv* env, jclass, jint id) { ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = " @@ -702,12 +702,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogTriggerTriggerState } /* - * Class: edu_wpi_first_wpilibj_hal_AnalogJNI + * Class: edu_wpi_first_hal_AnalogJNI * Method: getAnalogTriggerOutput * Signature: (II)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogTriggerOutput +Java_edu_wpi_first_hal_AnalogJNI_getAnalogTriggerOutput (JNIEnv* env, jclass, jint id, jint type) { ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = " diff --git a/hal/src/main/native/cpp/jni/CANAPIJNI.cpp b/hal/src/main/native/cpp/jni/CANAPIJNI.cpp index db163b20c8..bcb285c20d 100644 --- a/hal/src/main/native/cpp/jni/CANAPIJNI.cpp +++ b/hal/src/main/native/cpp/jni/CANAPIJNI.cpp @@ -14,7 +14,7 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_wpilibj_hal_CANAPIJNI.h" +#include "edu_wpi_first_hal_CANAPIJNI.h" #include "hal/CAN.h" #include "hal/CANAPI.h" #include "hal/Errors.h" @@ -25,12 +25,12 @@ using namespace wpi::java; extern "C" { /* - * Class: edu_wpi_first_wpilibj_hal_CANAPIJNI + * Class: edu_wpi_first_hal_CANAPIJNI * Method: initializeCAN * Signature: (III)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_CANAPIJNI_initializeCAN +Java_edu_wpi_first_hal_CANAPIJNI_initializeCAN (JNIEnv* env, jclass, jint manufacturer, jint deviceId, jint deviceType) { int32_t status = 0; @@ -44,24 +44,24 @@ Java_edu_wpi_first_wpilibj_hal_CANAPIJNI_initializeCAN } /* - * Class: edu_wpi_first_wpilibj_hal_CANAPIJNI + * Class: edu_wpi_first_hal_CANAPIJNI * Method: cleanCAN * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_CANAPIJNI_cleanCAN +Java_edu_wpi_first_hal_CANAPIJNI_cleanCAN (JNIEnv* env, jclass, jint handle) { HAL_CleanCAN(static_cast(handle)); } /* - * Class: edu_wpi_first_wpilibj_hal_CANAPIJNI + * Class: edu_wpi_first_hal_CANAPIJNI * Method: writeCANPacket * Signature: (I[BI)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_CANAPIJNI_writeCANPacket +Java_edu_wpi_first_hal_CANAPIJNI_writeCANPacket (JNIEnv* env, jclass, jint handle, jbyteArray data, jint apiId) { auto halHandle = static_cast(handle); @@ -74,12 +74,12 @@ Java_edu_wpi_first_wpilibj_hal_CANAPIJNI_writeCANPacket } /* - * Class: edu_wpi_first_wpilibj_hal_CANAPIJNI + * Class: edu_wpi_first_hal_CANAPIJNI * Method: writeCANPacketRepeating * Signature: (I[BII)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_CANAPIJNI_writeCANPacketRepeating +Java_edu_wpi_first_hal_CANAPIJNI_writeCANPacketRepeating (JNIEnv* env, jclass, jint handle, jbyteArray data, jint apiId, jint timeoutMs) { @@ -94,12 +94,12 @@ Java_edu_wpi_first_wpilibj_hal_CANAPIJNI_writeCANPacketRepeating } /* - * Class: edu_wpi_first_wpilibj_hal_CANAPIJNI + * Class: edu_wpi_first_hal_CANAPIJNI * Method: stopCANPacketRepeating * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_CANAPIJNI_stopCANPacketRepeating +Java_edu_wpi_first_hal_CANAPIJNI_stopCANPacketRepeating (JNIEnv* env, jclass, jint handle, jint apiId) { auto halHandle = static_cast(handle); @@ -109,12 +109,12 @@ Java_edu_wpi_first_wpilibj_hal_CANAPIJNI_stopCANPacketRepeating } /* - * Class: edu_wpi_first_wpilibj_hal_CANAPIJNI + * Class: edu_wpi_first_hal_CANAPIJNI * Method: readCANPacketNew * Signature: (IILjava/lang/Object;)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_CANAPIJNI_readCANPacketNew +Java_edu_wpi_first_hal_CANAPIJNI_readCANPacketNew (JNIEnv* env, jclass, jint handle, jint apiId, jobject data) { auto halHandle = static_cast(handle); @@ -141,12 +141,12 @@ Java_edu_wpi_first_wpilibj_hal_CANAPIJNI_readCANPacketNew } /* - * Class: edu_wpi_first_wpilibj_hal_CANAPIJNI + * Class: edu_wpi_first_hal_CANAPIJNI * Method: readCANPacketLatest * Signature: (IILjava/lang/Object;)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_CANAPIJNI_readCANPacketLatest +Java_edu_wpi_first_hal_CANAPIJNI_readCANPacketLatest (JNIEnv* env, jclass, jint handle, jint apiId, jobject data) { auto halHandle = static_cast(handle); @@ -173,12 +173,12 @@ Java_edu_wpi_first_wpilibj_hal_CANAPIJNI_readCANPacketLatest } /* - * Class: edu_wpi_first_wpilibj_hal_CANAPIJNI + * Class: edu_wpi_first_hal_CANAPIJNI * Method: readCANPacketTimeout * Signature: (IIILjava/lang/Object;)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_CANAPIJNI_readCANPacketTimeout +Java_edu_wpi_first_hal_CANAPIJNI_readCANPacketTimeout (JNIEnv* env, jclass, jint handle, jint apiId, jint timeoutMs, jobject data) { auto halHandle = static_cast(handle); @@ -206,12 +206,12 @@ Java_edu_wpi_first_wpilibj_hal_CANAPIJNI_readCANPacketTimeout } /* - * Class: edu_wpi_first_wpilibj_hal_CANAPIJNI + * Class: edu_wpi_first_hal_CANAPIJNI * Method: readCANPeriodicPacket * Signature: (IIIILjava/lang/Object;)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_CANAPIJNI_readCANPeriodicPacket +Java_edu_wpi_first_hal_CANAPIJNI_readCANPeriodicPacket (JNIEnv* env, jclass, jint handle, jint apiId, jint timeoutMs, jint periodMs, jobject data) { diff --git a/hal/src/main/native/cpp/jni/CANJNI.cpp b/hal/src/main/native/cpp/jni/CANJNI.cpp index 6d2cf3e04b..0f46d15a17 100644 --- a/hal/src/main/native/cpp/jni/CANJNI.cpp +++ b/hal/src/main/native/cpp/jni/CANJNI.cpp @@ -14,7 +14,7 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_wpilibj_can_CANJNI.h" +#include "edu_wpi_first_hal_can_CANJNI.h" #include "hal/CAN.h" #include "hal/cpp/Log.h" @@ -34,12 +34,12 @@ TLogLevel canJNILogLevel = logERROR; extern "C" { /* - * Class: edu_wpi_first_wpilibj_can_CANJNI + * Class: edu_wpi_first_hal_can_CANJNI * Method: FRCNetCommCANSessionMuxSendMessage * Signature: (I[BI)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_can_CANJNI_FRCNetCommCANSessionMuxSendMessage +Java_edu_wpi_first_hal_can_CANJNI_FRCNetCommCANSessionMuxSendMessage (JNIEnv* env, jclass, jint messageID, jbyteArray data, jint periodMs) { CANJNI_LOG(logDEBUG) << "Calling CANJNI FRCNetCommCANSessionMuxSendMessage"; @@ -77,12 +77,12 @@ Java_edu_wpi_first_wpilibj_can_CANJNI_FRCNetCommCANSessionMuxSendMessage } /* - * Class: edu_wpi_first_wpilibj_can_CANJNI + * Class: edu_wpi_first_hal_can_CANJNI * Method: FRCNetCommCANSessionMuxReceiveMessage * Signature: (Ljava/lang/Object;ILjava/lang/Object;)[B */ JNIEXPORT jbyteArray JNICALL -Java_edu_wpi_first_wpilibj_can_CANJNI_FRCNetCommCANSessionMuxReceiveMessage +Java_edu_wpi_first_hal_can_CANJNI_FRCNetCommCANSessionMuxReceiveMessage (JNIEnv* env, jclass, jobject messageID, jint messageIDMask, jobject timeStamp) { @@ -130,12 +130,12 @@ Java_edu_wpi_first_wpilibj_can_CANJNI_FRCNetCommCANSessionMuxReceiveMessage } /* - * Class: edu_wpi_first_wpilibj_can_CANJNI + * Class: edu_wpi_first_hal_can_CANJNI * Method: GetCANStatus * Signature: (Ljava/lang/Object;)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_can_CANJNI_GetCANStatus +Java_edu_wpi_first_hal_can_CANJNI_GetCANStatus (JNIEnv* env, jclass, jobject canStatus) { CANJNI_LOG(logDEBUG) << "Calling CANJNI HAL_CAN_GetCANStatus"; diff --git a/hal/src/main/native/cpp/jni/CompressorJNI.cpp b/hal/src/main/native/cpp/jni/CompressorJNI.cpp index 5e02d46138..e38abb5874 100644 --- a/hal/src/main/native/cpp/jni/CompressorJNI.cpp +++ b/hal/src/main/native/cpp/jni/CompressorJNI.cpp @@ -6,7 +6,7 @@ /*----------------------------------------------------------------------------*/ #include "HALUtil.h" -#include "edu_wpi_first_wpilibj_hal_CompressorJNI.h" +#include "edu_wpi_first_hal_CompressorJNI.h" #include "hal/Compressor.h" #include "hal/Ports.h" #include "hal/Solenoid.h" @@ -17,12 +17,12 @@ using namespace frc; extern "C" { /* - * Class: edu_wpi_first_wpilibj_hal_CompressorJNI + * Class: edu_wpi_first_hal_CompressorJNI * Method: initializeCompressor * Signature: (B)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_CompressorJNI_initializeCompressor +Java_edu_wpi_first_hal_CompressorJNI_initializeCompressor (JNIEnv* env, jclass, jbyte module) { int32_t status = 0; @@ -33,24 +33,24 @@ Java_edu_wpi_first_wpilibj_hal_CompressorJNI_initializeCompressor } /* - * Class: edu_wpi_first_wpilibj_hal_CompressorJNI + * Class: edu_wpi_first_hal_CompressorJNI * Method: checkCompressorModule * Signature: (B)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_CompressorJNI_checkCompressorModule +Java_edu_wpi_first_hal_CompressorJNI_checkCompressorModule (JNIEnv* env, jclass, jbyte module) { return HAL_CheckCompressorModule(module); } /* - * Class: edu_wpi_first_wpilibj_hal_CompressorJNI + * Class: edu_wpi_first_hal_CompressorJNI * Method: getCompressor * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressor +Java_edu_wpi_first_hal_CompressorJNI_getCompressor (JNIEnv* env, jclass, jint compressorHandle) { int32_t status = 0; @@ -60,12 +60,12 @@ Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressor } /* - * Class: edu_wpi_first_wpilibj_hal_CompressorJNI + * Class: edu_wpi_first_hal_CompressorJNI * Method: setCompressorClosedLoopControl * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_CompressorJNI_setCompressorClosedLoopControl +Java_edu_wpi_first_hal_CompressorJNI_setCompressorClosedLoopControl (JNIEnv* env, jclass, jint compressorHandle, jboolean value) { int32_t status = 0; @@ -75,12 +75,12 @@ Java_edu_wpi_first_wpilibj_hal_CompressorJNI_setCompressorClosedLoopControl } /* - * Class: edu_wpi_first_wpilibj_hal_CompressorJNI + * Class: edu_wpi_first_hal_CompressorJNI * Method: getCompressorClosedLoopControl * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressorClosedLoopControl +Java_edu_wpi_first_hal_CompressorJNI_getCompressorClosedLoopControl (JNIEnv* env, jclass, jint compressorHandle) { int32_t status = 0; @@ -91,12 +91,12 @@ Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressorClosedLoopControl } /* - * Class: edu_wpi_first_wpilibj_hal_CompressorJNI + * Class: edu_wpi_first_hal_CompressorJNI * Method: getCompressorPressureSwitch * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressorPressureSwitch +Java_edu_wpi_first_hal_CompressorJNI_getCompressorPressureSwitch (JNIEnv* env, jclass, jint compressorHandle) { int32_t status = 0; @@ -107,12 +107,12 @@ Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressorPressureSwitch } /* - * Class: edu_wpi_first_wpilibj_hal_CompressorJNI + * Class: edu_wpi_first_hal_CompressorJNI * Method: getCompressorCurrent * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressorCurrent +Java_edu_wpi_first_hal_CompressorJNI_getCompressorCurrent (JNIEnv* env, jclass, jint compressorHandle) { int32_t status = 0; @@ -123,12 +123,12 @@ Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressorCurrent } /* - * Class: edu_wpi_first_wpilibj_hal_CompressorJNI + * Class: edu_wpi_first_hal_CompressorJNI * Method: getCompressorCurrentTooHighFault * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressorCurrentTooHighFault +Java_edu_wpi_first_hal_CompressorJNI_getCompressorCurrentTooHighFault (JNIEnv* env, jclass, jint compressorHandle) { int32_t status = 0; @@ -139,12 +139,12 @@ Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressorCurrentTooHighFault } /* - * Class: edu_wpi_first_wpilibj_hal_CompressorJNI + * Class: edu_wpi_first_hal_CompressorJNI * Method: getCompressorCurrentTooHighStickyFault * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressorCurrentTooHighStickyFault +Java_edu_wpi_first_hal_CompressorJNI_getCompressorCurrentTooHighStickyFault (JNIEnv* env, jclass, jint compressorHandle) { int32_t status = 0; @@ -155,12 +155,12 @@ Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressorCurrentTooHighStickyFa } /* - * Class: edu_wpi_first_wpilibj_hal_CompressorJNI + * Class: edu_wpi_first_hal_CompressorJNI * Method: getCompressorShortedStickyFault * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressorShortedStickyFault +Java_edu_wpi_first_hal_CompressorJNI_getCompressorShortedStickyFault (JNIEnv* env, jclass, jint compressorHandle) { int32_t status = 0; @@ -171,12 +171,12 @@ Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressorShortedStickyFault } /* - * Class: edu_wpi_first_wpilibj_hal_CompressorJNI + * Class: edu_wpi_first_hal_CompressorJNI * Method: getCompressorShortedFault * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressorShortedFault +Java_edu_wpi_first_hal_CompressorJNI_getCompressorShortedFault (JNIEnv* env, jclass, jint compressorHandle) { int32_t status = 0; @@ -187,12 +187,12 @@ Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressorShortedFault } /* - * Class: edu_wpi_first_wpilibj_hal_CompressorJNI + * Class: edu_wpi_first_hal_CompressorJNI * Method: getCompressorNotConnectedStickyFault * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressorNotConnectedStickyFault +Java_edu_wpi_first_hal_CompressorJNI_getCompressorNotConnectedStickyFault (JNIEnv* env, jclass, jint compressorHandle) { int32_t status = 0; @@ -203,12 +203,12 @@ Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressorNotConnectedStickyFaul } /* - * Class: edu_wpi_first_wpilibj_hal_CompressorJNI + * Class: edu_wpi_first_hal_CompressorJNI * Method: getCompressorNotConnectedFault * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressorNotConnectedFault +Java_edu_wpi_first_hal_CompressorJNI_getCompressorNotConnectedFault (JNIEnv* env, jclass, jint compressorHandle) { int32_t status = 0; @@ -218,12 +218,12 @@ Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressorNotConnectedFault return val; } /* - * Class: edu_wpi_first_wpilibj_hal_CompressorJNI + * Class: edu_wpi_first_hal_CompressorJNI * Method: clearAllPCMStickyFaults * Signature: (B)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_CompressorJNI_clearAllPCMStickyFaults +Java_edu_wpi_first_hal_CompressorJNI_clearAllPCMStickyFaults (JNIEnv* env, jclass, jbyte module) { int32_t status = 0; diff --git a/hal/src/main/native/cpp/jni/ConstantsJNI.cpp b/hal/src/main/native/cpp/jni/ConstantsJNI.cpp index f6b09231d6..3db8f5a6d4 100644 --- a/hal/src/main/native/cpp/jni/ConstantsJNI.cpp +++ b/hal/src/main/native/cpp/jni/ConstantsJNI.cpp @@ -10,7 +10,7 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_wpilibj_hal_ConstantsJNI.h" +#include "edu_wpi_first_hal_ConstantsJNI.h" #include "hal/Constants.h" #include "hal/cpp/Log.h" @@ -27,12 +27,12 @@ TLogLevel constantsJNILogLevel = logWARNING; extern "C" { /* - * Class: edu_wpi_first_wpilibj_hal_ConstantsJNI + * Class: edu_wpi_first_hal_ConstantsJNI * Method: getSystemClockTicksPerMicrosecond * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_ConstantsJNI_getSystemClockTicksPerMicrosecond +Java_edu_wpi_first_hal_ConstantsJNI_getSystemClockTicksPerMicrosecond (JNIEnv* env, jclass) { CONSTANTSJNI_LOG(logDEBUG) diff --git a/hal/src/main/native/cpp/jni/CounterJNI.cpp b/hal/src/main/native/cpp/jni/CounterJNI.cpp index 5956d9b830..70ec5be4c2 100644 --- a/hal/src/main/native/cpp/jni/CounterJNI.cpp +++ b/hal/src/main/native/cpp/jni/CounterJNI.cpp @@ -10,7 +10,7 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_wpilibj_hal_CounterJNI.h" +#include "edu_wpi_first_hal_CounterJNI.h" #include "hal/Counter.h" #include "hal/Errors.h" #include "hal/cpp/Log.h" @@ -29,12 +29,12 @@ TLogLevel counterJNILogLevel = logWARNING; extern "C" { /* - * Class: edu_wpi_first_wpilibj_hal_CounterJNI + * Class: edu_wpi_first_hal_CounterJNI * Method: initializeCounter * Signature: (ILjava/lang/Object;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_CounterJNI_initializeCounter +Java_edu_wpi_first_hal_CounterJNI_initializeCounter (JNIEnv* env, jclass, jint mode, jobject index) { COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI initializeCounter"; @@ -53,12 +53,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_initializeCounter } /* - * Class: edu_wpi_first_wpilibj_hal_CounterJNI + * Class: edu_wpi_first_hal_CounterJNI * Method: freeCounter * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_CounterJNI_freeCounter +Java_edu_wpi_first_hal_CounterJNI_freeCounter (JNIEnv* env, jclass, jint id) { COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI freeCounter"; @@ -70,12 +70,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_freeCounter } /* - * Class: edu_wpi_first_wpilibj_hal_CounterJNI + * Class: edu_wpi_first_hal_CounterJNI * Method: setCounterAverageSize * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterAverageSize +Java_edu_wpi_first_hal_CounterJNI_setCounterAverageSize (JNIEnv* env, jclass, jint id, jint value) { COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI setCounterAverageSize"; @@ -88,12 +88,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterAverageSize } /* - * Class: edu_wpi_first_wpilibj_hal_CounterJNI + * Class: edu_wpi_first_hal_CounterJNI * Method: setCounterUpSource * Signature: (III)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterUpSource +Java_edu_wpi_first_hal_CounterJNI_setCounterUpSource (JNIEnv* env, jclass, jint id, jint digitalSourceHandle, jint analogTriggerType) { @@ -109,12 +109,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterUpSource } /* - * Class: edu_wpi_first_wpilibj_hal_CounterJNI + * Class: edu_wpi_first_hal_CounterJNI * Method: setCounterUpSourceEdge * Signature: (IZZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterUpSourceEdge +Java_edu_wpi_first_hal_CounterJNI_setCounterUpSourceEdge (JNIEnv* env, jclass, jint id, jboolean valueRise, jboolean valueFall) { COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI setCounterUpSourceEdge"; @@ -129,12 +129,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterUpSourceEdge } /* - * Class: edu_wpi_first_wpilibj_hal_CounterJNI + * Class: edu_wpi_first_hal_CounterJNI * Method: clearCounterUpSource * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_CounterJNI_clearCounterUpSource +Java_edu_wpi_first_hal_CounterJNI_clearCounterUpSource (JNIEnv* env, jclass, jint id) { COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI clearCounterUpSource"; @@ -146,12 +146,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_clearCounterUpSource } /* - * Class: edu_wpi_first_wpilibj_hal_CounterJNI + * Class: edu_wpi_first_hal_CounterJNI * Method: setCounterDownSource * Signature: (III)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterDownSource +Java_edu_wpi_first_hal_CounterJNI_setCounterDownSource (JNIEnv* env, jclass, jint id, jint digitalSourceHandle, jint analogTriggerType) { @@ -174,12 +174,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterDownSource } /* - * Class: edu_wpi_first_wpilibj_hal_CounterJNI + * Class: edu_wpi_first_hal_CounterJNI * Method: setCounterDownSourceEdge * Signature: (IZZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterDownSourceEdge +Java_edu_wpi_first_hal_CounterJNI_setCounterDownSourceEdge (JNIEnv* env, jclass, jint id, jboolean valueRise, jboolean valueFall) { COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI setCounterDownSourceEdge"; @@ -194,12 +194,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterDownSourceEdge } /* - * Class: edu_wpi_first_wpilibj_hal_CounterJNI + * Class: edu_wpi_first_hal_CounterJNI * Method: clearCounterDownSource * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_CounterJNI_clearCounterDownSource +Java_edu_wpi_first_hal_CounterJNI_clearCounterDownSource (JNIEnv* env, jclass, jint id) { COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI clearCounterDownSource"; @@ -211,12 +211,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_clearCounterDownSource } /* - * Class: edu_wpi_first_wpilibj_hal_CounterJNI + * Class: edu_wpi_first_hal_CounterJNI * Method: setCounterUpDownMode * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterUpDownMode +Java_edu_wpi_first_hal_CounterJNI_setCounterUpDownMode (JNIEnv* env, jclass, jint id) { COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI setCounterUpDownMode"; @@ -228,12 +228,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterUpDownMode } /* - * Class: edu_wpi_first_wpilibj_hal_CounterJNI + * Class: edu_wpi_first_hal_CounterJNI * Method: setCounterExternalDirectionMode * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterExternalDirectionMode +Java_edu_wpi_first_hal_CounterJNI_setCounterExternalDirectionMode (JNIEnv* env, jclass, jint id) { COUNTERJNI_LOG(logDEBUG) @@ -246,12 +246,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterExternalDirectionMode } /* - * Class: edu_wpi_first_wpilibj_hal_CounterJNI + * Class: edu_wpi_first_hal_CounterJNI * Method: setCounterSemiPeriodMode * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterSemiPeriodMode +Java_edu_wpi_first_hal_CounterJNI_setCounterSemiPeriodMode (JNIEnv* env, jclass, jint id, jboolean value) { COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI setCounterSemiPeriodMode"; @@ -264,12 +264,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterSemiPeriodMode } /* - * Class: edu_wpi_first_wpilibj_hal_CounterJNI + * Class: edu_wpi_first_hal_CounterJNI * Method: setCounterPulseLengthMode * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterPulseLengthMode +Java_edu_wpi_first_hal_CounterJNI_setCounterPulseLengthMode (JNIEnv* env, jclass, jint id, jdouble value) { COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI setCounterPulseLengthMode"; @@ -282,12 +282,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterPulseLengthMode } /* - * Class: edu_wpi_first_wpilibj_hal_CounterJNI + * Class: edu_wpi_first_hal_CounterJNI * Method: getCounterSamplesToAverage * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_CounterJNI_getCounterSamplesToAverage +Java_edu_wpi_first_hal_CounterJNI_getCounterSamplesToAverage (JNIEnv* env, jclass, jint id) { COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI getCounterSamplesToAverage"; @@ -303,12 +303,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_getCounterSamplesToAverage } /* - * Class: edu_wpi_first_wpilibj_hal_CounterJNI + * Class: edu_wpi_first_hal_CounterJNI * Method: setCounterSamplesToAverage * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterSamplesToAverage +Java_edu_wpi_first_hal_CounterJNI_setCounterSamplesToAverage (JNIEnv* env, jclass, jint id, jint value) { COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI setCounterSamplesToAverage"; @@ -325,12 +325,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterSamplesToAverage } /* - * Class: edu_wpi_first_wpilibj_hal_CounterJNI + * Class: edu_wpi_first_hal_CounterJNI * Method: resetCounter * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_CounterJNI_resetCounter +Java_edu_wpi_first_hal_CounterJNI_resetCounter (JNIEnv* env, jclass, jint id) { COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI resetCounter"; @@ -342,12 +342,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_resetCounter } /* - * Class: edu_wpi_first_wpilibj_hal_CounterJNI + * Class: edu_wpi_first_hal_CounterJNI * Method: getCounter * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_CounterJNI_getCounter +Java_edu_wpi_first_hal_CounterJNI_getCounter (JNIEnv* env, jclass, jint id) { // COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI getCounter"; @@ -361,12 +361,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_getCounter } /* - * Class: edu_wpi_first_wpilibj_hal_CounterJNI + * Class: edu_wpi_first_hal_CounterJNI * Method: getCounterPeriod * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_wpilibj_hal_CounterJNI_getCounterPeriod +Java_edu_wpi_first_hal_CounterJNI_getCounterPeriod (JNIEnv* env, jclass, jint id) { COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI getCounterPeriod"; @@ -380,12 +380,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_getCounterPeriod } /* - * Class: edu_wpi_first_wpilibj_hal_CounterJNI + * Class: edu_wpi_first_hal_CounterJNI * Method: setCounterMaxPeriod * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterMaxPeriod +Java_edu_wpi_first_hal_CounterJNI_setCounterMaxPeriod (JNIEnv* env, jclass, jint id, jdouble value) { COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI setCounterMaxPeriod"; @@ -398,12 +398,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterMaxPeriod } /* - * Class: edu_wpi_first_wpilibj_hal_CounterJNI + * Class: edu_wpi_first_hal_CounterJNI * Method: setCounterUpdateWhenEmpty * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterUpdateWhenEmpty +Java_edu_wpi_first_hal_CounterJNI_setCounterUpdateWhenEmpty (JNIEnv* env, jclass, jint id, jboolean value) { COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI setCounterMaxPeriod"; @@ -416,12 +416,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterUpdateWhenEmpty } /* - * Class: edu_wpi_first_wpilibj_hal_CounterJNI + * Class: edu_wpi_first_hal_CounterJNI * Method: getCounterStopped * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_CounterJNI_getCounterStopped +Java_edu_wpi_first_hal_CounterJNI_getCounterStopped (JNIEnv* env, jclass, jint id) { COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI getCounterStopped"; @@ -435,12 +435,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_getCounterStopped } /* - * Class: edu_wpi_first_wpilibj_hal_CounterJNI + * Class: edu_wpi_first_hal_CounterJNI * Method: getCounterDirection * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_CounterJNI_getCounterDirection +Java_edu_wpi_first_hal_CounterJNI_getCounterDirection (JNIEnv* env, jclass, jint id) { COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI getCounterDirection"; @@ -456,12 +456,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_getCounterDirection } /* - * Class: edu_wpi_first_wpilibj_hal_CounterJNI + * Class: edu_wpi_first_hal_CounterJNI * Method: setCounterReverseDirection * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterReverseDirection +Java_edu_wpi_first_hal_CounterJNI_setCounterReverseDirection (JNIEnv* env, jclass, jint id, jboolean value) { COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI setCounterReverseDirection"; diff --git a/hal/src/main/native/cpp/jni/DIOJNI.cpp b/hal/src/main/native/cpp/jni/DIOJNI.cpp index e52775a276..e21edcfc52 100644 --- a/hal/src/main/native/cpp/jni/DIOJNI.cpp +++ b/hal/src/main/native/cpp/jni/DIOJNI.cpp @@ -10,7 +10,7 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_wpilibj_hal_DIOJNI.h" +#include "edu_wpi_first_hal_DIOJNI.h" #include "hal/DIO.h" #include "hal/PWM.h" #include "hal/Ports.h" @@ -31,12 +31,12 @@ TLogLevel dioJNILogLevel = logWARNING; extern "C" { /* - * Class: edu_wpi_first_wpilibj_hal_DIOJNI + * Class: edu_wpi_first_hal_DIOJNI * Method: initializeDIOPort * Signature: (IZ)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_DIOJNI_initializeDIOPort +Java_edu_wpi_first_hal_DIOJNI_initializeDIOPort (JNIEnv* env, jclass, jint id, jboolean input) { DIOJNI_LOG(logDEBUG) << "Calling DIOJNI initializeDIOPort"; @@ -53,12 +53,12 @@ Java_edu_wpi_first_wpilibj_hal_DIOJNI_initializeDIOPort } /* - * Class: edu_wpi_first_wpilibj_hal_DIOJNI + * Class: edu_wpi_first_hal_DIOJNI * Method: checkDIOChannel * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_DIOJNI_checkDIOChannel +Java_edu_wpi_first_hal_DIOJNI_checkDIOChannel (JNIEnv* env, jclass, jint channel) { DIOJNI_LOG(logDEBUG) << "Calling DIOJNI checkDIOChannel"; @@ -67,12 +67,12 @@ Java_edu_wpi_first_wpilibj_hal_DIOJNI_checkDIOChannel } /* - * Class: edu_wpi_first_wpilibj_hal_DIOJNI + * Class: edu_wpi_first_hal_DIOJNI * Method: freeDIOPort * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_DIOJNI_freeDIOPort +Java_edu_wpi_first_hal_DIOJNI_freeDIOPort (JNIEnv* env, jclass, jint id) { DIOJNI_LOG(logDEBUG) << "Calling DIOJNI freeDIOPort"; @@ -81,12 +81,12 @@ Java_edu_wpi_first_wpilibj_hal_DIOJNI_freeDIOPort } /* - * Class: edu_wpi_first_wpilibj_hal_DIOJNI + * Class: edu_wpi_first_hal_DIOJNI * Method: setDIO * Signature: (IS)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_DIOJNI_setDIO +Java_edu_wpi_first_hal_DIOJNI_setDIO (JNIEnv* env, jclass, jint id, jshort value) { // DIOJNI_LOG(logDEBUG) << "Calling DIOJNI setDIO"; @@ -99,12 +99,12 @@ Java_edu_wpi_first_wpilibj_hal_DIOJNI_setDIO } /* - * Class: edu_wpi_first_wpilibj_hal_DIOJNI + * Class: edu_wpi_first_hal_DIOJNI * Method: setDIODirection * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_DIOJNI_setDIODirection +Java_edu_wpi_first_hal_DIOJNI_setDIODirection (JNIEnv* env, jclass, jint id, jboolean input) { // DIOJNI_LOG(logDEBUG) << "Calling DIOJNI setDIO"; @@ -117,12 +117,12 @@ Java_edu_wpi_first_wpilibj_hal_DIOJNI_setDIODirection } /* - * Class: edu_wpi_first_wpilibj_hal_DIOJNI + * Class: edu_wpi_first_hal_DIOJNI * Method: getDIO * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_DIOJNI_getDIO +Java_edu_wpi_first_hal_DIOJNI_getDIO (JNIEnv* env, jclass, jint id) { // DIOJNI_LOG(logDEBUG) << "Calling DIOJNI getDIO"; @@ -136,12 +136,12 @@ Java_edu_wpi_first_wpilibj_hal_DIOJNI_getDIO } /* - * Class: edu_wpi_first_wpilibj_hal_DIOJNI + * Class: edu_wpi_first_hal_DIOJNI * Method: getDIODirection * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_DIOJNI_getDIODirection +Java_edu_wpi_first_hal_DIOJNI_getDIODirection (JNIEnv* env, jclass, jint id) { DIOJNI_LOG(logDEBUG) << "Calling DIOJNI getDIODirection (RR upd)"; @@ -155,12 +155,12 @@ Java_edu_wpi_first_wpilibj_hal_DIOJNI_getDIODirection } /* - * Class: edu_wpi_first_wpilibj_hal_DIOJNI + * Class: edu_wpi_first_hal_DIOJNI * Method: pulse * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_DIOJNI_pulse +Java_edu_wpi_first_hal_DIOJNI_pulse (JNIEnv* env, jclass, jint id, jdouble value) { DIOJNI_LOG(logDEBUG) << "Calling DIOJNI pulse (RR upd)"; @@ -173,12 +173,12 @@ Java_edu_wpi_first_wpilibj_hal_DIOJNI_pulse } /* - * Class: edu_wpi_first_wpilibj_hal_DIOJNI + * Class: edu_wpi_first_hal_DIOJNI * Method: isPulsing * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_DIOJNI_isPulsing +Java_edu_wpi_first_hal_DIOJNI_isPulsing (JNIEnv* env, jclass, jint id) { DIOJNI_LOG(logDEBUG) << "Calling DIOJNI isPulsing (RR upd)"; @@ -192,12 +192,12 @@ Java_edu_wpi_first_wpilibj_hal_DIOJNI_isPulsing } /* - * Class: edu_wpi_first_wpilibj_hal_DIOJNI + * Class: edu_wpi_first_hal_DIOJNI * Method: isAnyPulsing * Signature: ()Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_DIOJNI_isAnyPulsing +Java_edu_wpi_first_hal_DIOJNI_isAnyPulsing (JNIEnv* env, jclass) { DIOJNI_LOG(logDEBUG) << "Calling DIOJNI isAnyPulsing (RR upd)"; @@ -210,12 +210,12 @@ Java_edu_wpi_first_wpilibj_hal_DIOJNI_isAnyPulsing } /* - * Class: edu_wpi_first_wpilibj_hal_DIOJNI + * Class: edu_wpi_first_hal_DIOJNI * Method: getLoopTiming * Signature: ()S */ JNIEXPORT jshort JNICALL -Java_edu_wpi_first_wpilibj_hal_DIOJNI_getLoopTiming +Java_edu_wpi_first_hal_DIOJNI_getLoopTiming (JNIEnv* env, jclass) { DIOJNI_LOG(logDEBUG) << "Calling DIOJNI getLoopTimeing"; @@ -228,12 +228,12 @@ Java_edu_wpi_first_wpilibj_hal_DIOJNI_getLoopTiming } /* - * Class: edu_wpi_first_wpilibj_hal_DIOJNI + * Class: edu_wpi_first_hal_DIOJNI * Method: allocateDigitalPWM * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_DIOJNI_allocateDigitalPWM +Java_edu_wpi_first_hal_DIOJNI_allocateDigitalPWM (JNIEnv* env, jclass) { DIOJNI_LOG(logDEBUG) << "Calling DIOJNI allocateDigitalPWM"; @@ -246,12 +246,12 @@ Java_edu_wpi_first_wpilibj_hal_DIOJNI_allocateDigitalPWM } /* - * Class: edu_wpi_first_wpilibj_hal_DIOJNI + * Class: edu_wpi_first_hal_DIOJNI * Method: freeDigitalPWM * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_DIOJNI_freeDigitalPWM +Java_edu_wpi_first_hal_DIOJNI_freeDigitalPWM (JNIEnv* env, jclass, jint id) { DIOJNI_LOG(logDEBUG) << "Calling DIOJNI freeDigitalPWM"; @@ -263,12 +263,12 @@ Java_edu_wpi_first_wpilibj_hal_DIOJNI_freeDigitalPWM } /* - * Class: edu_wpi_first_wpilibj_hal_DIOJNI + * Class: edu_wpi_first_hal_DIOJNI * Method: setDigitalPWMRate * Signature: (D)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_DIOJNI_setDigitalPWMRate +Java_edu_wpi_first_hal_DIOJNI_setDigitalPWMRate (JNIEnv* env, jclass, jdouble value) { DIOJNI_LOG(logDEBUG) << "Calling DIOJNI setDigitalPWMRate"; @@ -280,12 +280,12 @@ Java_edu_wpi_first_wpilibj_hal_DIOJNI_setDigitalPWMRate } /* - * Class: edu_wpi_first_wpilibj_hal_DIOJNI + * Class: edu_wpi_first_hal_DIOJNI * Method: setDigitalPWMDutyCycle * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_DIOJNI_setDigitalPWMDutyCycle +Java_edu_wpi_first_hal_DIOJNI_setDigitalPWMDutyCycle (JNIEnv* env, jclass, jint id, jdouble value) { DIOJNI_LOG(logDEBUG) << "Calling DIOJNI setDigitalPWMDutyCycle"; @@ -298,12 +298,12 @@ Java_edu_wpi_first_wpilibj_hal_DIOJNI_setDigitalPWMDutyCycle } /* - * Class: edu_wpi_first_wpilibj_hal_DIOJNI + * Class: edu_wpi_first_hal_DIOJNI * Method: setDigitalPWMOutputChannel * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_DIOJNI_setDigitalPWMOutputChannel +Java_edu_wpi_first_hal_DIOJNI_setDigitalPWMOutputChannel (JNIEnv* env, jclass, jint id, jint value) { DIOJNI_LOG(logDEBUG) << "Calling DIOJNI setDigitalPWMOutputChannel"; diff --git a/hal/src/main/native/cpp/jni/DigitalGlitchFilterJNI.cpp b/hal/src/main/native/cpp/jni/DigitalGlitchFilterJNI.cpp index 231fc92daa..3e39ac031a 100644 --- a/hal/src/main/native/cpp/jni/DigitalGlitchFilterJNI.cpp +++ b/hal/src/main/native/cpp/jni/DigitalGlitchFilterJNI.cpp @@ -8,18 +8,18 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_wpilibj_hal_DigitalGlitchFilterJNI.h" +#include "edu_wpi_first_hal_DigitalGlitchFilterJNI.h" #include "hal/DIO.h" using namespace frc; /* - * Class: edu_wpi_first_wpilibj_hal_DigitalGlitchFilterJNI + * Class: edu_wpi_first_hal_DigitalGlitchFilterJNI * Method: setFilterSelect * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_DigitalGlitchFilterJNI_setFilterSelect +Java_edu_wpi_first_hal_DigitalGlitchFilterJNI_setFilterSelect (JNIEnv* env, jclass, jint id, jint filter_index) { int32_t status = 0; @@ -30,12 +30,12 @@ Java_edu_wpi_first_wpilibj_hal_DigitalGlitchFilterJNI_setFilterSelect } /* - * Class: edu_wpi_first_wpilibj_hal_DigitalGlitchFilterJNI + * Class: edu_wpi_first_hal_DigitalGlitchFilterJNI * Method: getFilterSelect * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_DigitalGlitchFilterJNI_getFilterSelect +Java_edu_wpi_first_hal_DigitalGlitchFilterJNI_getFilterSelect (JNIEnv* env, jclass, jint id) { int32_t status = 0; @@ -47,12 +47,12 @@ Java_edu_wpi_first_wpilibj_hal_DigitalGlitchFilterJNI_getFilterSelect } /* - * Class: edu_wpi_first_wpilibj_hal_DigitalGlitchFilterJNI + * Class: edu_wpi_first_hal_DigitalGlitchFilterJNI * Method: setFilterPeriod * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_DigitalGlitchFilterJNI_setFilterPeriod +Java_edu_wpi_first_hal_DigitalGlitchFilterJNI_setFilterPeriod (JNIEnv* env, jclass, jint filter_index, jint fpga_cycles) { int32_t status = 0; @@ -62,12 +62,12 @@ Java_edu_wpi_first_wpilibj_hal_DigitalGlitchFilterJNI_setFilterPeriod } /* - * Class: edu_wpi_first_wpilibj_hal_DigitalGlitchFilterJNI + * Class: edu_wpi_first_hal_DigitalGlitchFilterJNI * Method: getFilterPeriod * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_DigitalGlitchFilterJNI_getFilterPeriod +Java_edu_wpi_first_hal_DigitalGlitchFilterJNI_getFilterPeriod (JNIEnv* env, jclass, jint filter_index) { int32_t status = 0; diff --git a/hal/src/main/native/cpp/jni/EncoderJNI.cpp b/hal/src/main/native/cpp/jni/EncoderJNI.cpp index 06f612d569..10c4332050 100644 --- a/hal/src/main/native/cpp/jni/EncoderJNI.cpp +++ b/hal/src/main/native/cpp/jni/EncoderJNI.cpp @@ -10,7 +10,7 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_wpilibj_hal_EncoderJNI.h" +#include "edu_wpi_first_hal_EncoderJNI.h" #include "hal/Encoder.h" #include "hal/Errors.h" #include "hal/cpp/Log.h" @@ -29,12 +29,12 @@ TLogLevel encoderJNILogLevel = logWARNING; extern "C" { /* - * Class: edu_wpi_first_wpilibj_hal_EncoderJNI + * Class: edu_wpi_first_hal_EncoderJNI * Method: initializeEncoder * Signature: (IIIIZI)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_EncoderJNI_initializeEncoder +Java_edu_wpi_first_hal_EncoderJNI_initializeEncoder (JNIEnv* env, jclass, jint digitalSourceHandleA, jint analogTriggerTypeA, jint digitalSourceHandleB, jint analogTriggerTypeB, jboolean reverseDirection, jint encodingType) @@ -61,12 +61,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_initializeEncoder } /* - * Class: edu_wpi_first_wpilibj_hal_EncoderJNI + * Class: edu_wpi_first_hal_EncoderJNI * Method: freeEncoder * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_EncoderJNI_freeEncoder +Java_edu_wpi_first_hal_EncoderJNI_freeEncoder (JNIEnv* env, jclass, jint id) { ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI freeEncoder"; @@ -78,12 +78,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_freeEncoder } /* - * Class: edu_wpi_first_wpilibj_hal_EncoderJNI + * Class: edu_wpi_first_hal_EncoderJNI * Method: getEncoder * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoder +Java_edu_wpi_first_hal_EncoderJNI_getEncoder (JNIEnv* env, jclass, jint id) { ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoder"; @@ -97,12 +97,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoder } /* - * Class: edu_wpi_first_wpilibj_hal_EncoderJNI + * Class: edu_wpi_first_hal_EncoderJNI * Method: getEncoderRaw * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderRaw +Java_edu_wpi_first_hal_EncoderJNI_getEncoderRaw (JNIEnv* env, jclass, jint id) { ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoderRaw"; @@ -116,12 +116,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderRaw } /* - * Class: edu_wpi_first_wpilibj_hal_EncoderJNI + * Class: edu_wpi_first_hal_EncoderJNI * Method: getEncodingScaleFactor * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncodingScaleFactor +Java_edu_wpi_first_hal_EncoderJNI_getEncodingScaleFactor (JNIEnv* env, jclass, jint id) { ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncodingScaleFactor"; @@ -136,12 +136,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncodingScaleFactor } /* - * Class: edu_wpi_first_wpilibj_hal_EncoderJNI + * Class: edu_wpi_first_hal_EncoderJNI * Method: resetEncoder * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_EncoderJNI_resetEncoder +Java_edu_wpi_first_hal_EncoderJNI_resetEncoder (JNIEnv* env, jclass, jint id) { ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI resetEncoder"; @@ -153,12 +153,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_resetEncoder } /* - * Class: edu_wpi_first_wpilibj_hal_EncoderJNI + * Class: edu_wpi_first_hal_EncoderJNI * Method: getEncoderPeriod * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderPeriod +Java_edu_wpi_first_hal_EncoderJNI_getEncoderPeriod (JNIEnv* env, jclass, jint id) { ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoderPeriod"; @@ -172,12 +172,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderPeriod } /* - * Class: edu_wpi_first_wpilibj_hal_EncoderJNI + * Class: edu_wpi_first_hal_EncoderJNI * Method: setEncoderMaxPeriod * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_EncoderJNI_setEncoderMaxPeriod +Java_edu_wpi_first_hal_EncoderJNI_setEncoderMaxPeriod (JNIEnv* env, jclass, jint id, jdouble value) { ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI setEncoderMaxPeriod"; @@ -189,12 +189,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_setEncoderMaxPeriod } /* - * Class: edu_wpi_first_wpilibj_hal_EncoderJNI + * Class: edu_wpi_first_hal_EncoderJNI * Method: getEncoderStopped * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderStopped +Java_edu_wpi_first_hal_EncoderJNI_getEncoderStopped (JNIEnv* env, jclass, jint id) { ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoderStopped"; @@ -208,12 +208,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderStopped } /* - * Class: edu_wpi_first_wpilibj_hal_EncoderJNI + * Class: edu_wpi_first_hal_EncoderJNI * Method: getEncoderDirection * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderDirection +Java_edu_wpi_first_hal_EncoderJNI_getEncoderDirection (JNIEnv* env, jclass, jint id) { ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoderDirection"; @@ -228,12 +228,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderDirection } /* - * Class: edu_wpi_first_wpilibj_hal_EncoderJNI + * Class: edu_wpi_first_hal_EncoderJNI * Method: getEncoderDistance * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderDistance +Java_edu_wpi_first_hal_EncoderJNI_getEncoderDistance (JNIEnv* env, jclass, jint id) { ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoderDistance"; @@ -247,12 +247,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderDistance } /* - * Class: edu_wpi_first_wpilibj_hal_EncoderJNI + * Class: edu_wpi_first_hal_EncoderJNI * Method: getEncoderRate * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderRate +Java_edu_wpi_first_hal_EncoderJNI_getEncoderRate (JNIEnv* env, jclass, jint id) { ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoderRate"; @@ -266,12 +266,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderRate } /* - * Class: edu_wpi_first_wpilibj_hal_EncoderJNI + * Class: edu_wpi_first_hal_EncoderJNI * Method: setEncoderMinRate * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_EncoderJNI_setEncoderMinRate +Java_edu_wpi_first_hal_EncoderJNI_setEncoderMinRate (JNIEnv* env, jclass, jint id, jdouble value) { ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI setEncoderMinRate"; @@ -283,12 +283,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_setEncoderMinRate } /* - * Class: edu_wpi_first_wpilibj_hal_EncoderJNI + * Class: edu_wpi_first_hal_EncoderJNI * Method: setEncoderDistancePerPulse * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_EncoderJNI_setEncoderDistancePerPulse +Java_edu_wpi_first_hal_EncoderJNI_setEncoderDistancePerPulse (JNIEnv* env, jclass, jint id, jdouble value) { ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI setEncoderDistancePerPulse"; @@ -300,12 +300,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_setEncoderDistancePerPulse } /* - * Class: edu_wpi_first_wpilibj_hal_EncoderJNI + * Class: edu_wpi_first_hal_EncoderJNI * Method: setEncoderReverseDirection * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_EncoderJNI_setEncoderReverseDirection +Java_edu_wpi_first_hal_EncoderJNI_setEncoderReverseDirection (JNIEnv* env, jclass, jint id, jboolean value) { ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI setEncoderReverseDirection"; @@ -317,12 +317,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_setEncoderReverseDirection } /* - * Class: edu_wpi_first_wpilibj_hal_EncoderJNI + * Class: edu_wpi_first_hal_EncoderJNI * Method: setEncoderSamplesToAverage * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_EncoderJNI_setEncoderSamplesToAverage +Java_edu_wpi_first_hal_EncoderJNI_setEncoderSamplesToAverage (JNIEnv* env, jclass, jint id, jint value) { ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI setEncoderSamplesToAverage"; @@ -338,12 +338,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_setEncoderSamplesToAverage } /* - * Class: edu_wpi_first_wpilibj_hal_EncoderJNI + * Class: edu_wpi_first_hal_EncoderJNI * Method: getEncoderSamplesToAverage * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderSamplesToAverage +Java_edu_wpi_first_hal_EncoderJNI_getEncoderSamplesToAverage (JNIEnv* env, jclass, jint id) { ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoderSamplesToAverage"; @@ -359,12 +359,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderSamplesToAverage } /* - * Class: edu_wpi_first_wpilibj_hal_EncoderJNI + * Class: edu_wpi_first_hal_EncoderJNI * Method: setEncoderIndexSource * Signature: (IIII)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_EncoderJNI_setEncoderIndexSource +Java_edu_wpi_first_hal_EncoderJNI_setEncoderIndexSource (JNIEnv* env, jclass, jint id, jint digitalSourceHandle, jint analogTriggerType, jint type) { @@ -383,12 +383,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_setEncoderIndexSource } /* - * Class: edu_wpi_first_wpilibj_hal_EncoderJNI + * Class: edu_wpi_first_hal_EncoderJNI * Method: getEncoderFPGAIndex * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderFPGAIndex +Java_edu_wpi_first_hal_EncoderJNI_getEncoderFPGAIndex (JNIEnv* env, jclass, jint id) { ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoderSamplesToAverage"; @@ -403,12 +403,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderFPGAIndex } /* - * Class: edu_wpi_first_wpilibj_hal_EncoderJNI + * Class: edu_wpi_first_hal_EncoderJNI * Method: getEncoderEncodingScale * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderEncodingScale +Java_edu_wpi_first_hal_EncoderJNI_getEncoderEncodingScale (JNIEnv* env, jclass, jint id) { ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoderSamplesToAverage"; @@ -424,12 +424,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderEncodingScale } /* - * Class: edu_wpi_first_wpilibj_hal_EncoderJNI + * Class: edu_wpi_first_hal_EncoderJNI * Method: getEncoderDecodingScaleFactor * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderDecodingScaleFactor +Java_edu_wpi_first_hal_EncoderJNI_getEncoderDecodingScaleFactor (JNIEnv* env, jclass, jint id) { ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoderSamplesToAverage"; @@ -445,12 +445,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderDecodingScaleFactor } /* - * Class: edu_wpi_first_wpilibj_hal_EncoderJNI + * Class: edu_wpi_first_hal_EncoderJNI * Method: getEncoderDistancePerPulse * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderDistancePerPulse +Java_edu_wpi_first_hal_EncoderJNI_getEncoderDistancePerPulse (JNIEnv* env, jclass, jint id) { ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoderSamplesToAverage"; @@ -466,12 +466,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderDistancePerPulse } /* - * Class: edu_wpi_first_wpilibj_hal_EncoderJNI + * Class: edu_wpi_first_hal_EncoderJNI * Method: getEncoderEncodingType * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderEncodingType +Java_edu_wpi_first_hal_EncoderJNI_getEncoderEncodingType (JNIEnv* env, jclass, jint id) { ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoderSamplesToAverage"; diff --git a/hal/src/main/native/cpp/jni/HAL.cpp b/hal/src/main/native/cpp/jni/HAL.cpp index 1b68254ec0..4aee750bf2 100644 --- a/hal/src/main/native/cpp/jni/HAL.cpp +++ b/hal/src/main/native/cpp/jni/HAL.cpp @@ -15,7 +15,7 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_wpilibj_hal_HAL.h" +#include "edu_wpi_first_hal_HAL.h" #include "hal/DriverStation.h" #include "hal/cpp/Log.h" @@ -34,84 +34,84 @@ static TLogLevel netCommLogLevel = logWARNING; extern "C" { /* - * Class: edu_wpi_first_wpilibj_hal_HAL + * Class: edu_wpi_first_hal_HAL * Method: initialize * Signature: (II)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_HAL_initialize +Java_edu_wpi_first_hal_HAL_initialize (JNIEnv*, jclass, jint timeout, jint mode) { return HAL_Initialize(timeout, mode); } /* - * Class: edu_wpi_first_wpilibj_hal_HAL + * Class: edu_wpi_first_hal_HAL * Method: observeUserProgramStarting * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_HAL_observeUserProgramStarting +Java_edu_wpi_first_hal_HAL_observeUserProgramStarting (JNIEnv*, jclass) { HAL_ObserveUserProgramStarting(); } /* - * Class: edu_wpi_first_wpilibj_hal_HAL + * Class: edu_wpi_first_hal_HAL * Method: observeUserProgramDisabled * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_HAL_observeUserProgramDisabled +Java_edu_wpi_first_hal_HAL_observeUserProgramDisabled (JNIEnv*, jclass) { HAL_ObserveUserProgramDisabled(); } /* - * Class: edu_wpi_first_wpilibj_hal_HAL + * Class: edu_wpi_first_hal_HAL * Method: observeUserProgramAutonomous * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_HAL_observeUserProgramAutonomous +Java_edu_wpi_first_hal_HAL_observeUserProgramAutonomous (JNIEnv*, jclass) { HAL_ObserveUserProgramAutonomous(); } /* - * Class: edu_wpi_first_wpilibj_hal_HAL + * Class: edu_wpi_first_hal_HAL * Method: observeUserProgramTeleop * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_HAL_observeUserProgramTeleop +Java_edu_wpi_first_hal_HAL_observeUserProgramTeleop (JNIEnv*, jclass) { HAL_ObserveUserProgramTeleop(); } /* - * Class: edu_wpi_first_wpilibj_hal_HAL + * Class: edu_wpi_first_hal_HAL * Method: observeUserProgramTest * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_HAL_observeUserProgramTest +Java_edu_wpi_first_hal_HAL_observeUserProgramTest (JNIEnv*, jclass) { HAL_ObserveUserProgramTest(); } /* - * Class: edu_wpi_first_wpilibj_hal_HAL + * Class: edu_wpi_first_hal_HAL * Method: report * Signature: (IIILjava/lang/String;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_HAL_report +Java_edu_wpi_first_hal_HAL_report (JNIEnv* paramEnv, jclass, jint paramResource, jint paramInstanceNumber, jint paramContext, jstring paramFeature) { @@ -127,12 +127,12 @@ Java_edu_wpi_first_wpilibj_hal_HAL_report } /* - * Class: edu_wpi_first_wpilibj_hal_HAL + * Class: edu_wpi_first_hal_HAL * Method: nativeGetControlWord * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_HAL_nativeGetControlWord +Java_edu_wpi_first_hal_HAL_nativeGetControlWord (JNIEnv*, jclass) { NETCOMM_LOG(logDEBUG) << "Calling HAL Control Word"; @@ -147,12 +147,12 @@ Java_edu_wpi_first_wpilibj_hal_HAL_nativeGetControlWord } /* - * Class: edu_wpi_first_wpilibj_hal_HAL + * Class: edu_wpi_first_hal_HAL * Method: nativeGetAllianceStation * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_HAL_nativeGetAllianceStation +Java_edu_wpi_first_hal_HAL_nativeGetAllianceStation (JNIEnv*, jclass) { NETCOMM_LOG(logDEBUG) << "Calling HAL Alliance Station"; @@ -162,12 +162,12 @@ Java_edu_wpi_first_wpilibj_hal_HAL_nativeGetAllianceStation } /* - * Class: edu_wpi_first_wpilibj_hal_HAL + * Class: edu_wpi_first_hal_HAL * Method: getJoystickAxes * Signature: (B[F)S */ JNIEXPORT jshort JNICALL -Java_edu_wpi_first_wpilibj_hal_HAL_getJoystickAxes +Java_edu_wpi_first_hal_HAL_getJoystickAxes (JNIEnv* env, jclass, jbyte joystickNum, jfloatArray axesArray) { NETCOMM_LOG(logDEBUG) << "Calling HALJoystickAxes"; @@ -186,12 +186,12 @@ Java_edu_wpi_first_wpilibj_hal_HAL_getJoystickAxes } /* - * Class: edu_wpi_first_wpilibj_hal_HAL + * Class: edu_wpi_first_hal_HAL * Method: getJoystickPOVs * Signature: (B[S)S */ JNIEXPORT jshort JNICALL -Java_edu_wpi_first_wpilibj_hal_HAL_getJoystickPOVs +Java_edu_wpi_first_hal_HAL_getJoystickPOVs (JNIEnv* env, jclass, jbyte joystickNum, jshortArray povsArray) { NETCOMM_LOG(logDEBUG) << "Calling HALJoystickPOVs"; @@ -210,12 +210,12 @@ Java_edu_wpi_first_wpilibj_hal_HAL_getJoystickPOVs } /* - * Class: edu_wpi_first_wpilibj_hal_HAL + * Class: edu_wpi_first_hal_HAL * Method: getJoystickButtons * Signature: (BLjava/lang/Object;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_HAL_getJoystickButtons +Java_edu_wpi_first_hal_HAL_getJoystickButtons (JNIEnv* env, jclass, jbyte joystickNum, jobject count) { NETCOMM_LOG(logDEBUG) << "Calling HALJoystickButtons"; @@ -231,12 +231,12 @@ Java_edu_wpi_first_wpilibj_hal_HAL_getJoystickButtons } /* - * Class: edu_wpi_first_wpilibj_hal_HAL + * Class: edu_wpi_first_hal_HAL * Method: setJoystickOutputs * Signature: (BISS)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_HAL_setJoystickOutputs +Java_edu_wpi_first_hal_HAL_setJoystickOutputs (JNIEnv*, jclass, jbyte port, jint outputs, jshort leftRumble, jshort rightRumble) { @@ -248,12 +248,12 @@ Java_edu_wpi_first_wpilibj_hal_HAL_setJoystickOutputs } /* - * Class: edu_wpi_first_wpilibj_hal_HAL + * Class: edu_wpi_first_hal_HAL * Method: getJoystickIsXbox * Signature: (B)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_HAL_getJoystickIsXbox +Java_edu_wpi_first_hal_HAL_getJoystickIsXbox (JNIEnv*, jclass, jbyte port) { NETCOMM_LOG(logDEBUG) << "Calling HAL_GetJoystickIsXbox"; @@ -261,12 +261,12 @@ Java_edu_wpi_first_wpilibj_hal_HAL_getJoystickIsXbox } /* - * Class: edu_wpi_first_wpilibj_hal_HAL + * Class: edu_wpi_first_hal_HAL * Method: getJoystickType * Signature: (B)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_HAL_getJoystickType +Java_edu_wpi_first_hal_HAL_getJoystickType (JNIEnv*, jclass, jbyte port) { NETCOMM_LOG(logDEBUG) << "Calling HAL_GetJoystickType"; @@ -274,12 +274,12 @@ Java_edu_wpi_first_wpilibj_hal_HAL_getJoystickType } /* - * Class: edu_wpi_first_wpilibj_hal_HAL + * Class: edu_wpi_first_hal_HAL * Method: getJoystickName * Signature: (B)Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_first_wpilibj_hal_HAL_getJoystickName +Java_edu_wpi_first_hal_HAL_getJoystickName (JNIEnv* env, jclass, jbyte port) { NETCOMM_LOG(logDEBUG) << "Calling HAL_GetJoystickName"; @@ -290,12 +290,12 @@ Java_edu_wpi_first_wpilibj_hal_HAL_getJoystickName } /* - * Class: edu_wpi_first_wpilibj_hal_HAL + * Class: edu_wpi_first_hal_HAL * Method: getJoystickAxisType * Signature: (BB)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_HAL_getJoystickAxisType +Java_edu_wpi_first_hal_HAL_getJoystickAxisType (JNIEnv*, jclass, jbyte joystickNum, jbyte axis) { NETCOMM_LOG(logDEBUG) << "Calling HAL_GetJoystickAxisType"; @@ -303,60 +303,60 @@ Java_edu_wpi_first_wpilibj_hal_HAL_getJoystickAxisType } /* - * Class: edu_wpi_first_wpilibj_hal_HAL + * Class: edu_wpi_first_hal_HAL * Method: isNewControlData * Signature: ()Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_HAL_isNewControlData +Java_edu_wpi_first_hal_HAL_isNewControlData (JNIEnv*, jclass) { return static_cast(HAL_IsNewControlData()); } /* - * Class: edu_wpi_first_wpilibj_hal_HAL + * Class: edu_wpi_first_hal_HAL * Method: waitForDSData * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_HAL_waitForDSData +Java_edu_wpi_first_hal_HAL_waitForDSData (JNIEnv* env, jclass) { HAL_WaitForDSData(); } /* - * Class: edu_wpi_first_wpilibj_hal_HAL + * Class: edu_wpi_first_hal_HAL * Method: releaseDSMutex * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_HAL_releaseDSMutex +Java_edu_wpi_first_hal_HAL_releaseDSMutex (JNIEnv* env, jclass) { HAL_ReleaseDSMutex(); } /* - * Class: edu_wpi_first_wpilibj_hal_HAL + * Class: edu_wpi_first_hal_HAL * Method: waitForDSDataTimeout * Signature: (D)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_HAL_waitForDSDataTimeout +Java_edu_wpi_first_hal_HAL_waitForDSDataTimeout (JNIEnv*, jclass, jdouble timeout) { return static_cast(HAL_WaitForDSDataTimeout(timeout)); } /* - * Class: edu_wpi_first_wpilibj_hal_HAL + * Class: edu_wpi_first_hal_HAL * Method: getMatchTime * Signature: ()D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_wpilibj_hal_HAL_getMatchTime +Java_edu_wpi_first_hal_HAL_getMatchTime (JNIEnv* env, jclass) { int32_t status = 0; @@ -364,12 +364,12 @@ Java_edu_wpi_first_wpilibj_hal_HAL_getMatchTime } /* - * Class: edu_wpi_first_wpilibj_hal_HAL + * Class: edu_wpi_first_hal_HAL * Method: getSystemActive * Signature: ()Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_HAL_getSystemActive +Java_edu_wpi_first_hal_HAL_getSystemActive (JNIEnv* env, jclass) { int32_t status = 0; @@ -379,12 +379,12 @@ Java_edu_wpi_first_wpilibj_hal_HAL_getSystemActive } /* - * Class: edu_wpi_first_wpilibj_hal_HAL + * Class: edu_wpi_first_hal_HAL * Method: getBrownedOut * Signature: ()Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_HAL_getBrownedOut +Java_edu_wpi_first_hal_HAL_getBrownedOut (JNIEnv* env, jclass) { int32_t status = 0; @@ -394,12 +394,12 @@ Java_edu_wpi_first_wpilibj_hal_HAL_getBrownedOut } /* - * Class: edu_wpi_first_wpilibj_hal_HAL + * Class: edu_wpi_first_hal_HAL * Method: getMatchInfo * Signature: (Ljava/lang/Object;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_HAL_getMatchInfo +Java_edu_wpi_first_hal_HAL_getMatchInfo (JNIEnv* env, jclass, jobject info) { HAL_MatchInfo matchInfo; @@ -411,12 +411,12 @@ Java_edu_wpi_first_wpilibj_hal_HAL_getMatchInfo } /* - * Class: edu_wpi_first_wpilibj_hal_HAL + * Class: edu_wpi_first_hal_HAL * Method: sendError * Signature: (ZIZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_HAL_sendError +Java_edu_wpi_first_hal_HAL_sendError (JNIEnv* env, jclass, jboolean isError, jint errorCode, jboolean isLVCode, jstring details, jstring location, jstring callStack, jboolean printMsg) { @@ -434,12 +434,12 @@ Java_edu_wpi_first_wpilibj_hal_HAL_sendError } /* - * Class: edu_wpi_first_wpilibj_hal_HAL + * Class: edu_wpi_first_hal_HAL * Method: getPortWithModule * Signature: (BB)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_HAL_getPortWithModule +Java_edu_wpi_first_hal_HAL_getPortWithModule (JNIEnv* env, jclass, jbyte module, jbyte channel) { // FILE_LOG(logDEBUG) << "Calling HAL getPortWithModlue"; @@ -451,12 +451,12 @@ Java_edu_wpi_first_wpilibj_hal_HAL_getPortWithModule } /* - * Class: edu_wpi_first_wpilibj_hal_HAL + * Class: edu_wpi_first_hal_HAL * Method: getPort * Signature: (B)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_HAL_getPort +Java_edu_wpi_first_hal_HAL_getPort (JNIEnv* env, jclass, jbyte channel) { // FILE_LOG(logDEBUG) << "Calling HAL getPortWithModlue"; diff --git a/hal/src/main/native/cpp/jni/HALUtil.cpp b/hal/src/main/native/cpp/jni/HALUtil.cpp index 7cef9a9049..5c86561030 100644 --- a/hal/src/main/native/cpp/jni/HALUtil.cpp +++ b/hal/src/main/native/cpp/jni/HALUtil.cpp @@ -19,7 +19,7 @@ #include #include -#include "edu_wpi_first_wpilibj_hal_HALUtil.h" +#include "edu_wpi_first_hal_HALUtil.h" #include "hal/CAN.h" #include "hal/DriverStation.h" #include "hal/Errors.h" @@ -61,26 +61,25 @@ static JClass accumulatorResultCls; static JClass canDataCls; static const JClassInit classes[] = { - {"edu/wpi/first/wpilibj/PWMConfigDataResult", &pwmConfigDataResultCls}, - {"edu/wpi/first/wpilibj/can/CANStatus", &canStatusCls}, - {"edu/wpi/first/wpilibj/hal/MatchInfoData", &matchInfoDataCls}, - {"edu/wpi/first/wpilibj/AccumulatorResult", &accumulatorResultCls}, - {"edu/wpi/first/wpilibj/CANData", &canDataCls}}; + {"edu/wpi/first/hal/PWMConfigDataResult", &pwmConfigDataResultCls}, + {"edu/wpi/first/hal/can/CANStatus", &canStatusCls}, + {"edu/wpi/first/hal/MatchInfoData", &matchInfoDataCls}, + {"edu/wpi/first/hal/AccumulatorResult", &accumulatorResultCls}, + {"edu/wpi/first/hal/CANData", &canDataCls}}; static const JExceptionInit exceptions[] = { {"java/lang/IllegalArgumentException", &illegalArgExCls}, - {"edu/wpi/first/wpilibj/util/BoundaryException", &boundaryExCls}, - {"edu/wpi/first/wpilibj/util/AllocationException", &allocationExCls}, - {"edu/wpi/first/wpilibj/util/HalHandleException", &halHandleExCls}, - {"edu/wpi/first/wpilibj/can/CANInvalidBufferException", - &canInvalidBufferExCls}, - {"edu/wpi/first/wpilibj/can/CANMessageNotFoundException", + {"edu/wpi/first/hal/util/BoundaryException", &boundaryExCls}, + {"edu/wpi/first/hal/util/AllocationException", &allocationExCls}, + {"edu/wpi/first/hal/util/HalHandleException", &halHandleExCls}, + {"edu/wpi/first/hal/can/CANInvalidBufferException", &canInvalidBufferExCls}, + {"edu/wpi/first/hal/can/CANMessageNotFoundException", &canMessageNotFoundExCls}, - {"edu/wpi/first/wpilibj/can/CANMessageNotAllowedException", + {"edu/wpi/first/hal/can/CANMessageNotAllowedException", &canMessageNotAllowedExCls}, - {"edu/wpi/first/wpilibj/can/CANNotInitializedException", + {"edu/wpi/first/hal/can/CANNotInitializedException", &canNotInitializedExCls}, - {"edu/wpi/first/wpilibj/util/UncleanStatusException", &uncleanStatusExCls}}; + {"edu/wpi/first/hal/util/UncleanStatusException", &uncleanStatusExCls}}; namespace frc { @@ -339,12 +338,12 @@ JNIEXPORT void JNICALL JNI_OnUnload(JavaVM* vm, void* reserved) { } /* - * Class: edu_wpi_first_wpilibj_hal_HALUtil + * Class: edu_wpi_first_hal_HALUtil * Method: getFPGAVersion * Signature: ()S */ JNIEXPORT jshort JNICALL -Java_edu_wpi_first_wpilibj_hal_HALUtil_getFPGAVersion +Java_edu_wpi_first_hal_HALUtil_getFPGAVersion (JNIEnv* env, jclass) { HALUTIL_LOG(logDEBUG) << "Calling HALUtil getFPGAVersion"; @@ -357,12 +356,12 @@ Java_edu_wpi_first_wpilibj_hal_HALUtil_getFPGAVersion } /* - * Class: edu_wpi_first_wpilibj_hal_HALUtil + * Class: edu_wpi_first_hal_HALUtil * Method: getFPGARevision * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_HALUtil_getFPGARevision +Java_edu_wpi_first_hal_HALUtil_getFPGARevision (JNIEnv* env, jclass) { HALUTIL_LOG(logDEBUG) << "Calling HALUtil getFPGARevision"; @@ -375,12 +374,12 @@ Java_edu_wpi_first_wpilibj_hal_HALUtil_getFPGARevision } /* - * Class: edu_wpi_first_wpilibj_hal_HALUtil + * Class: edu_wpi_first_hal_HALUtil * Method: getFPGATime * Signature: ()J */ JNIEXPORT jlong JNICALL -Java_edu_wpi_first_wpilibj_hal_HALUtil_getFPGATime +Java_edu_wpi_first_hal_HALUtil_getFPGATime (JNIEnv* env, jclass) { // HALUTIL_LOG(logDEBUG) << "Calling HALUtil getFPGATime"; @@ -393,12 +392,12 @@ Java_edu_wpi_first_wpilibj_hal_HALUtil_getFPGATime } /* - * Class: edu_wpi_first_wpilibj_hal_HALUtil + * Class: edu_wpi_first_hal_HALUtil * Method: getHALRuntimeType * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_HALUtil_getHALRuntimeType +Java_edu_wpi_first_hal_HALUtil_getHALRuntimeType (JNIEnv* env, jclass) { // HALUTIL_LOG(logDEBUG) << "Calling HALUtil getHALRuntimeType"; @@ -408,12 +407,12 @@ Java_edu_wpi_first_wpilibj_hal_HALUtil_getHALRuntimeType } /* - * Class: edu_wpi_first_wpilibj_hal_HALUtil + * Class: edu_wpi_first_hal_HALUtil * Method: getFPGAButton * Signature: ()Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_HALUtil_getFPGAButton +Java_edu_wpi_first_hal_HALUtil_getFPGAButton (JNIEnv* env, jclass) { // HALUTIL_LOG(logDEBUG) << "Calling HALUtil getFPGATime"; @@ -426,12 +425,12 @@ Java_edu_wpi_first_wpilibj_hal_HALUtil_getFPGAButton } /* - * Class: edu_wpi_first_wpilibj_hal_HALUtil + * Class: edu_wpi_first_hal_HALUtil * Method: getHALErrorMessage * Signature: (I)Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_first_wpilibj_hal_HALUtil_getHALErrorMessage +Java_edu_wpi_first_hal_HALUtil_getHALErrorMessage (JNIEnv* paramEnv, jclass, jint paramId) { const char* msg = HAL_GetErrorMessage(paramId); @@ -441,24 +440,24 @@ Java_edu_wpi_first_wpilibj_hal_HALUtil_getHALErrorMessage } /* - * Class: edu_wpi_first_wpilibj_hal_HALUtil + * Class: edu_wpi_first_hal_HALUtil * Method: getHALErrno * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_HALUtil_getHALErrno +Java_edu_wpi_first_hal_HALUtil_getHALErrno (JNIEnv*, jclass) { return errno; } /* - * Class: edu_wpi_first_wpilibj_hal_HALUtil + * Class: edu_wpi_first_hal_HALUtil * Method: getHALstrerror * Signature: (I)Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_first_wpilibj_hal_HALUtil_getHALstrerror +Java_edu_wpi_first_hal_HALUtil_getHALstrerror (JNIEnv* env, jclass, jint errorCode) { const char* msg = std::strerror(errno); diff --git a/hal/src/main/native/cpp/jni/I2CJNI.cpp b/hal/src/main/native/cpp/jni/I2CJNI.cpp index 3c3056b8dc..9dafd4ae09 100644 --- a/hal/src/main/native/cpp/jni/I2CJNI.cpp +++ b/hal/src/main/native/cpp/jni/I2CJNI.cpp @@ -12,7 +12,7 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_wpilibj_hal_I2CJNI.h" +#include "edu_wpi_first_hal_I2CJNI.h" #include "hal/I2C.h" #include "hal/cpp/Log.h" @@ -31,12 +31,12 @@ TLogLevel i2cJNILogLevel = logWARNING; extern "C" { /* - * Class: edu_wpi_first_wpilibj_hal_I2CJNI + * Class: edu_wpi_first_hal_I2CJNI * Method: i2CInitialize * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_I2CJNI_i2CInitialize +Java_edu_wpi_first_hal_I2CJNI_i2CInitialize (JNIEnv* env, jclass, jint port) { I2CJNI_LOG(logDEBUG) << "Calling I2CJNI i2CInititalize"; @@ -48,12 +48,12 @@ Java_edu_wpi_first_wpilibj_hal_I2CJNI_i2CInitialize } /* - * Class: edu_wpi_first_wpilibj_hal_I2CJNI + * Class: edu_wpi_first_hal_I2CJNI * Method: i2CTransaction * Signature: (IBLjava/lang/Object;BLjava/lang/Object;B)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_I2CJNI_i2CTransaction +Java_edu_wpi_first_hal_I2CJNI_i2CTransaction (JNIEnv* env, jclass, jint port, jbyte address, jobject dataToSend, jbyte sendSize, jobject dataReceived, jbyte receiveSize) { @@ -81,12 +81,12 @@ Java_edu_wpi_first_wpilibj_hal_I2CJNI_i2CTransaction } /* - * Class: edu_wpi_first_wpilibj_hal_I2CJNI + * Class: edu_wpi_first_hal_I2CJNI * Method: i2CTransactionB * Signature: (IB[BB[BB)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_I2CJNI_i2CTransactionB +Java_edu_wpi_first_hal_I2CJNI_i2CTransactionB (JNIEnv* env, jclass, jint port, jbyte address, jbyteArray dataToSend, jbyte sendSize, jbyteArray dataReceived, jbyte receiveSize) { @@ -109,12 +109,12 @@ Java_edu_wpi_first_wpilibj_hal_I2CJNI_i2CTransactionB } /* - * Class: edu_wpi_first_wpilibj_hal_I2CJNI + * Class: edu_wpi_first_hal_I2CJNI * Method: i2CWrite * Signature: (IBLjava/lang/Object;B)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_I2CJNI_i2CWrite +Java_edu_wpi_first_hal_I2CJNI_i2CWrite (JNIEnv* env, jclass, jint port, jbyte address, jobject dataToSend, jbyte sendSize) { @@ -136,12 +136,12 @@ Java_edu_wpi_first_wpilibj_hal_I2CJNI_i2CWrite } /* - * Class: edu_wpi_first_wpilibj_hal_I2CJNI + * Class: edu_wpi_first_hal_I2CJNI * Method: i2CWriteB * Signature: (IB[BB)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_I2CJNI_i2CWriteB +Java_edu_wpi_first_hal_I2CJNI_i2CWriteB (JNIEnv* env, jclass, jint port, jbyte address, jbyteArray dataToSend, jbyte sendSize) { @@ -159,12 +159,12 @@ Java_edu_wpi_first_wpilibj_hal_I2CJNI_i2CWriteB } /* - * Class: edu_wpi_first_wpilibj_hal_I2CJNI + * Class: edu_wpi_first_hal_I2CJNI * Method: i2CRead * Signature: (IBLjava/lang/Object;B)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_I2CJNI_i2CRead +Java_edu_wpi_first_hal_I2CJNI_i2CRead (JNIEnv* env, jclass, jint port, jbyte address, jobject dataReceived, jbyte receiveSize) { @@ -182,12 +182,12 @@ Java_edu_wpi_first_wpilibj_hal_I2CJNI_i2CRead } /* - * Class: edu_wpi_first_wpilibj_hal_I2CJNI + * Class: edu_wpi_first_hal_I2CJNI * Method: i2CReadB * Signature: (IB[BB)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_I2CJNI_i2CReadB +Java_edu_wpi_first_hal_I2CJNI_i2CReadB (JNIEnv* env, jclass, jint port, jbyte address, jbyteArray dataReceived, jbyte receiveSize) { @@ -206,12 +206,12 @@ Java_edu_wpi_first_wpilibj_hal_I2CJNI_i2CReadB } /* - * Class: edu_wpi_first_wpilibj_hal_I2CJNI + * Class: edu_wpi_first_hal_I2CJNI * Method: i2CClose * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_I2CJNI_i2CClose +Java_edu_wpi_first_hal_I2CJNI_i2CClose (JNIEnv*, jclass, jint port) { I2CJNI_LOG(logDEBUG) << "Calling I2CJNI i2CClose"; diff --git a/hal/src/main/native/cpp/jni/InterruptJNI.cpp b/hal/src/main/native/cpp/jni/InterruptJNI.cpp index 1716a2c4da..e1c67489c3 100644 --- a/hal/src/main/native/cpp/jni/InterruptJNI.cpp +++ b/hal/src/main/native/cpp/jni/InterruptJNI.cpp @@ -15,7 +15,7 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_wpilibj_hal_InterruptJNI.h" +#include "edu_wpi_first_hal_InterruptJNI.h" #include "hal/Interrupts.h" #include "hal/cpp/Log.h" @@ -121,12 +121,12 @@ void interruptHandler(uint32_t mask, void* param) { extern "C" { /* - * Class: edu_wpi_first_wpilibj_hal_InterruptJNI + * Class: edu_wpi_first_hal_InterruptJNI * Method: initializeInterrupts * Signature: (Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_InterruptJNI_initializeInterrupts +Java_edu_wpi_first_hal_InterruptJNI_initializeInterrupts (JNIEnv* env, jclass, jboolean watcher) { INTERRUPTJNI_LOG(logDEBUG) << "Calling INTERRUPTJNI initializeInterrupts"; @@ -143,12 +143,12 @@ Java_edu_wpi_first_wpilibj_hal_InterruptJNI_initializeInterrupts } /* - * Class: edu_wpi_first_wpilibj_hal_InterruptJNI + * Class: edu_wpi_first_hal_InterruptJNI * Method: cleanInterrupts * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_InterruptJNI_cleanInterrupts +Java_edu_wpi_first_hal_InterruptJNI_cleanInterrupts (JNIEnv* env, jclass, jint interruptHandle) { INTERRUPTJNI_LOG(logDEBUG) << "Calling INTERRUPTJNI cleanInterrupts"; @@ -168,12 +168,12 @@ Java_edu_wpi_first_wpilibj_hal_InterruptJNI_cleanInterrupts } /* - * Class: edu_wpi_first_wpilibj_hal_InterruptJNI + * Class: edu_wpi_first_hal_InterruptJNI * Method: waitForInterrupt * Signature: (IDZ)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_InterruptJNI_waitForInterrupt +Java_edu_wpi_first_hal_InterruptJNI_waitForInterrupt (JNIEnv* env, jclass, jint interruptHandle, jdouble timeout, jboolean ignorePrevious) { @@ -192,12 +192,12 @@ Java_edu_wpi_first_wpilibj_hal_InterruptJNI_waitForInterrupt } /* - * Class: edu_wpi_first_wpilibj_hal_InterruptJNI + * Class: edu_wpi_first_hal_InterruptJNI * Method: enableInterrupts * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_InterruptJNI_enableInterrupts +Java_edu_wpi_first_hal_InterruptJNI_enableInterrupts (JNIEnv* env, jclass, jint interruptHandle) { INTERRUPTJNI_LOG(logDEBUG) << "Calling INTERRUPTJNI enableInterrupts"; @@ -213,12 +213,12 @@ Java_edu_wpi_first_wpilibj_hal_InterruptJNI_enableInterrupts } /* - * Class: edu_wpi_first_wpilibj_hal_InterruptJNI + * Class: edu_wpi_first_hal_InterruptJNI * Method: disableInterrupts * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_InterruptJNI_disableInterrupts +Java_edu_wpi_first_hal_InterruptJNI_disableInterrupts (JNIEnv* env, jclass, jint interruptHandle) { INTERRUPTJNI_LOG(logDEBUG) << "Calling INTERRUPTJNI disableInterrupts"; @@ -234,12 +234,12 @@ Java_edu_wpi_first_wpilibj_hal_InterruptJNI_disableInterrupts } /* - * Class: edu_wpi_first_wpilibj_hal_InterruptJNI + * Class: edu_wpi_first_hal_InterruptJNI * Method: readInterruptRisingTimestamp * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_wpilibj_hal_InterruptJNI_readInterruptRisingTimestamp +Java_edu_wpi_first_hal_InterruptJNI_readInterruptRisingTimestamp (JNIEnv* env, jclass, jint interruptHandle) { INTERRUPTJNI_LOG(logDEBUG) @@ -257,12 +257,12 @@ Java_edu_wpi_first_wpilibj_hal_InterruptJNI_readInterruptRisingTimestamp } /* - * Class: edu_wpi_first_wpilibj_hal_InterruptJNI + * Class: edu_wpi_first_hal_InterruptJNI * Method: readInterruptFallingTimestamp * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_wpilibj_hal_InterruptJNI_readInterruptFallingTimestamp +Java_edu_wpi_first_hal_InterruptJNI_readInterruptFallingTimestamp (JNIEnv* env, jclass, jint interruptHandle) { INTERRUPTJNI_LOG(logDEBUG) @@ -280,12 +280,12 @@ Java_edu_wpi_first_wpilibj_hal_InterruptJNI_readInterruptFallingTimestamp } /* - * Class: edu_wpi_first_wpilibj_hal_InterruptJNI + * Class: edu_wpi_first_hal_InterruptJNI * Method: requestInterrupts * Signature: (III)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_InterruptJNI_requestInterrupts +Java_edu_wpi_first_hal_InterruptJNI_requestInterrupts (JNIEnv* env, jclass, jint interruptHandle, jint digitalSourceHandle, jint analogTriggerType) { @@ -305,12 +305,12 @@ Java_edu_wpi_first_wpilibj_hal_InterruptJNI_requestInterrupts } /* - * Class: edu_wpi_first_wpilibj_hal_InterruptJNI + * Class: edu_wpi_first_hal_InterruptJNI * Method: attachInterruptHandler * Signature: (ILjava/lang/Object;Ljava/lang/Object;)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_InterruptJNI_attachInterruptHandler +Java_edu_wpi_first_hal_InterruptJNI_attachInterruptHandler (JNIEnv* env, jclass, jint interruptHandle, jobject handler, jobject param) { INTERRUPTJNI_LOG(logDEBUG) << "Calling INTERRUPTJNI attachInterruptHandler"; @@ -347,12 +347,12 @@ Java_edu_wpi_first_wpilibj_hal_InterruptJNI_attachInterruptHandler } /* - * Class: edu_wpi_first_wpilibj_hal_InterruptJNI + * Class: edu_wpi_first_hal_InterruptJNI * Method: setInterruptUpSourceEdge * Signature: (IZZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_InterruptJNI_setInterruptUpSourceEdge +Java_edu_wpi_first_hal_InterruptJNI_setInterruptUpSourceEdge (JNIEnv* env, jclass, jint interruptHandle, jboolean risingEdge, jboolean fallingEdge) { diff --git a/hal/src/main/native/cpp/jni/NotifierJNI.cpp b/hal/src/main/native/cpp/jni/NotifierJNI.cpp index 020d44a38e..61fe32f52a 100644 --- a/hal/src/main/native/cpp/jni/NotifierJNI.cpp +++ b/hal/src/main/native/cpp/jni/NotifierJNI.cpp @@ -11,7 +11,7 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_wpilibj_hal_NotifierJNI.h" +#include "edu_wpi_first_hal_NotifierJNI.h" #include "hal/Notifier.h" #include "hal/cpp/Log.h" @@ -29,12 +29,12 @@ TLogLevel notifierJNILogLevel = logWARNING; extern "C" { /* - * Class: edu_wpi_first_wpilibj_hal_NotifierJNI + * Class: edu_wpi_first_hal_NotifierJNI * Method: initializeNotifier * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_NotifierJNI_initializeNotifier +Java_edu_wpi_first_hal_NotifierJNI_initializeNotifier (JNIEnv* env, jclass) { NOTIFIERJNI_LOG(logDEBUG) << "Calling NOTIFIERJNI initializeNotifier"; @@ -53,12 +53,12 @@ Java_edu_wpi_first_wpilibj_hal_NotifierJNI_initializeNotifier } /* - * Class: edu_wpi_first_wpilibj_hal_NotifierJNI + * Class: edu_wpi_first_hal_NotifierJNI * Method: stopNotifier * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_NotifierJNI_stopNotifier +Java_edu_wpi_first_hal_NotifierJNI_stopNotifier (JNIEnv* env, jclass cls, jint notifierHandle) { NOTIFIERJNI_LOG(logDEBUG) << "Calling NOTIFIERJNI stopNotifier"; @@ -72,12 +72,12 @@ Java_edu_wpi_first_wpilibj_hal_NotifierJNI_stopNotifier } /* - * Class: edu_wpi_first_wpilibj_hal_NotifierJNI + * Class: edu_wpi_first_hal_NotifierJNI * Method: cleanNotifier * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_NotifierJNI_cleanNotifier +Java_edu_wpi_first_hal_NotifierJNI_cleanNotifier (JNIEnv* env, jclass, jint notifierHandle) { NOTIFIERJNI_LOG(logDEBUG) << "Calling NOTIFIERJNI cleanNotifier"; @@ -91,12 +91,12 @@ Java_edu_wpi_first_wpilibj_hal_NotifierJNI_cleanNotifier } /* - * Class: edu_wpi_first_wpilibj_hal_NotifierJNI + * Class: edu_wpi_first_hal_NotifierJNI * Method: updateNotifierAlarm * Signature: (IJ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_NotifierJNI_updateNotifierAlarm +Java_edu_wpi_first_hal_NotifierJNI_updateNotifierAlarm (JNIEnv* env, jclass cls, jint notifierHandle, jlong triggerTime) { NOTIFIERJNI_LOG(logDEBUG) << "Calling NOTIFIERJNI updateNotifierAlarm"; @@ -113,12 +113,12 @@ Java_edu_wpi_first_wpilibj_hal_NotifierJNI_updateNotifierAlarm } /* - * Class: edu_wpi_first_wpilibj_hal_NotifierJNI + * Class: edu_wpi_first_hal_NotifierJNI * Method: cancelNotifierAlarm * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_NotifierJNI_cancelNotifierAlarm +Java_edu_wpi_first_hal_NotifierJNI_cancelNotifierAlarm (JNIEnv* env, jclass cls, jint notifierHandle) { NOTIFIERJNI_LOG(logDEBUG) << "Calling NOTIFIERJNI cancelNotifierAlarm"; @@ -132,12 +132,12 @@ Java_edu_wpi_first_wpilibj_hal_NotifierJNI_cancelNotifierAlarm } /* - * Class: edu_wpi_first_wpilibj_hal_NotifierJNI + * Class: edu_wpi_first_hal_NotifierJNI * Method: waitForNotifierAlarm * Signature: (I)J */ JNIEXPORT jlong JNICALL -Java_edu_wpi_first_wpilibj_hal_NotifierJNI_waitForNotifierAlarm +Java_edu_wpi_first_hal_NotifierJNI_waitForNotifierAlarm (JNIEnv* env, jclass cls, jint notifierHandle) { NOTIFIERJNI_LOG(logDEBUG) << "Calling NOTIFIERJNI waitForNotifierAlarm"; diff --git a/hal/src/main/native/cpp/jni/PDPJNI.cpp b/hal/src/main/native/cpp/jni/PDPJNI.cpp index be665269bb..e8173be3d3 100644 --- a/hal/src/main/native/cpp/jni/PDPJNI.cpp +++ b/hal/src/main/native/cpp/jni/PDPJNI.cpp @@ -6,7 +6,7 @@ /*----------------------------------------------------------------------------*/ #include "HALUtil.h" -#include "edu_wpi_first_wpilibj_hal_PDPJNI.h" +#include "edu_wpi_first_hal_PDPJNI.h" #include "hal/PDP.h" #include "hal/Ports.h" @@ -15,12 +15,12 @@ using namespace frc; extern "C" { /* - * Class: edu_wpi_first_wpilibj_hal_PDPJNI + * Class: edu_wpi_first_hal_PDPJNI * Method: initializePDP * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_PDPJNI_initializePDP +Java_edu_wpi_first_hal_PDPJNI_initializePDP (JNIEnv* env, jclass, jint module) { int32_t status = 0; @@ -30,36 +30,36 @@ Java_edu_wpi_first_wpilibj_hal_PDPJNI_initializePDP } /* - * Class: edu_wpi_first_wpilibj_hal_PDPJNI + * Class: edu_wpi_first_hal_PDPJNI * Method: checkPDPChannel * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_PDPJNI_checkPDPChannel +Java_edu_wpi_first_hal_PDPJNI_checkPDPChannel (JNIEnv* env, jclass, jint channel) { return HAL_CheckPDPChannel(channel); } /* - * Class: edu_wpi_first_wpilibj_hal_PDPJNI + * Class: edu_wpi_first_hal_PDPJNI * Method: checkPDPModule * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_PDPJNI_checkPDPModule +Java_edu_wpi_first_hal_PDPJNI_checkPDPModule (JNIEnv* env, jclass, jint module) { return HAL_CheckPDPModule(module); } /* - * Class: edu_wpi_first_wpilibj_hal_PDPJNI + * Class: edu_wpi_first_hal_PDPJNI * Method: getPDPTemperature * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_wpilibj_hal_PDPJNI_getPDPTemperature +Java_edu_wpi_first_hal_PDPJNI_getPDPTemperature (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -69,12 +69,12 @@ Java_edu_wpi_first_wpilibj_hal_PDPJNI_getPDPTemperature } /* - * Class: edu_wpi_first_wpilibj_hal_PDPJNI + * Class: edu_wpi_first_hal_PDPJNI * Method: getPDPVoltage * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_wpilibj_hal_PDPJNI_getPDPVoltage +Java_edu_wpi_first_hal_PDPJNI_getPDPVoltage (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -84,12 +84,12 @@ Java_edu_wpi_first_wpilibj_hal_PDPJNI_getPDPVoltage } /* - * Class: edu_wpi_first_wpilibj_hal_PDPJNI + * Class: edu_wpi_first_hal_PDPJNI * Method: getPDPChannelCurrent * Signature: (BI)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_wpilibj_hal_PDPJNI_getPDPChannelCurrent +Java_edu_wpi_first_hal_PDPJNI_getPDPChannelCurrent (JNIEnv* env, jclass, jbyte channel, jint handle) { int32_t status = 0; @@ -99,12 +99,12 @@ Java_edu_wpi_first_wpilibj_hal_PDPJNI_getPDPChannelCurrent } /* - * Class: edu_wpi_first_wpilibj_hal_PDPJNI + * Class: edu_wpi_first_hal_PDPJNI * Method: getPDPTotalCurrent * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_wpilibj_hal_PDPJNI_getPDPTotalCurrent +Java_edu_wpi_first_hal_PDPJNI_getPDPTotalCurrent (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -114,12 +114,12 @@ Java_edu_wpi_first_wpilibj_hal_PDPJNI_getPDPTotalCurrent } /* - * Class: edu_wpi_first_wpilibj_hal_PDPJNI + * Class: edu_wpi_first_hal_PDPJNI * Method: getPDPTotalPower * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_wpilibj_hal_PDPJNI_getPDPTotalPower +Java_edu_wpi_first_hal_PDPJNI_getPDPTotalPower (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -129,12 +129,12 @@ Java_edu_wpi_first_wpilibj_hal_PDPJNI_getPDPTotalPower } /* - * Class: edu_wpi_first_wpilibj_hal_PDPJNI + * Class: edu_wpi_first_hal_PDPJNI * Method: getPDPTotalEnergy * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_wpilibj_hal_PDPJNI_getPDPTotalEnergy +Java_edu_wpi_first_hal_PDPJNI_getPDPTotalEnergy (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -144,12 +144,12 @@ Java_edu_wpi_first_wpilibj_hal_PDPJNI_getPDPTotalEnergy } /* - * Class: edu_wpi_first_wpilibj_hal_PDPJNI + * Class: edu_wpi_first_hal_PDPJNI * Method: resetPDPTotalEnergy * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_PDPJNI_resetPDPTotalEnergy +Java_edu_wpi_first_hal_PDPJNI_resetPDPTotalEnergy (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -158,12 +158,12 @@ Java_edu_wpi_first_wpilibj_hal_PDPJNI_resetPDPTotalEnergy } /* - * Class: edu_wpi_first_wpilibj_hal_PDPJNI + * Class: edu_wpi_first_hal_PDPJNI * Method: clearPDPStickyFaults * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_PDPJNI_clearPDPStickyFaults +Java_edu_wpi_first_hal_PDPJNI_clearPDPStickyFaults (JNIEnv* env, jclass, jint handle) { int32_t status = 0; diff --git a/hal/src/main/native/cpp/jni/PWMJNI.cpp b/hal/src/main/native/cpp/jni/PWMJNI.cpp index 036983f118..1509f9476c 100644 --- a/hal/src/main/native/cpp/jni/PWMJNI.cpp +++ b/hal/src/main/native/cpp/jni/PWMJNI.cpp @@ -10,7 +10,7 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_wpilibj_hal_PWMJNI.h" +#include "edu_wpi_first_hal_PWMJNI.h" #include "hal/DIO.h" #include "hal/PWM.h" #include "hal/Ports.h" @@ -31,12 +31,12 @@ TLogLevel pwmJNILogLevel = logWARNING; extern "C" { /* - * Class: edu_wpi_first_wpilibj_hal_PWMJNI + * Class: edu_wpi_first_hal_PWMJNI * Method: initializePWMPort * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_PWMJNI_initializePWMPort +Java_edu_wpi_first_hal_PWMJNI_initializePWMPort (JNIEnv* env, jclass, jint id) { PWMJNI_LOG(logDEBUG) << "Calling PWMJNI initializePWMPort"; @@ -51,12 +51,12 @@ Java_edu_wpi_first_wpilibj_hal_PWMJNI_initializePWMPort } /* - * Class: edu_wpi_first_wpilibj_hal_PWMJNI + * Class: edu_wpi_first_hal_PWMJNI * Method: checkPWMChannel * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_PWMJNI_checkPWMChannel +Java_edu_wpi_first_hal_PWMJNI_checkPWMChannel (JNIEnv* env, jclass, jint channel) { PWMJNI_LOG(logDEBUG) << "Calling PWMJNI checkPWMChannel"; @@ -65,12 +65,12 @@ Java_edu_wpi_first_wpilibj_hal_PWMJNI_checkPWMChannel } /* - * Class: edu_wpi_first_wpilibj_hal_PWMJNI + * Class: edu_wpi_first_hal_PWMJNI * Method: freePWMPort * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_PWMJNI_freePWMPort +Java_edu_wpi_first_hal_PWMJNI_freePWMPort (JNIEnv* env, jclass, jint id) { PWMJNI_LOG(logDEBUG) << "Calling PWMJNI freePWMPort"; @@ -81,12 +81,12 @@ Java_edu_wpi_first_wpilibj_hal_PWMJNI_freePWMPort } /* - * Class: edu_wpi_first_wpilibj_hal_PWMJNI + * Class: edu_wpi_first_hal_PWMJNI * Method: setPWMConfigRaw * Signature: (IIIIII)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_PWMJNI_setPWMConfigRaw +Java_edu_wpi_first_hal_PWMJNI_setPWMConfigRaw (JNIEnv* env, jclass, jint id, jint maxPwm, jint deadbandMaxPwm, jint centerPwm, jint deadbandMinPwm, jint minPwm) { @@ -99,12 +99,12 @@ Java_edu_wpi_first_wpilibj_hal_PWMJNI_setPWMConfigRaw } /* - * Class: edu_wpi_first_wpilibj_hal_PWMJNI + * Class: edu_wpi_first_hal_PWMJNI * Method: setPWMConfig * Signature: (IDDDDD)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_PWMJNI_setPWMConfig +Java_edu_wpi_first_hal_PWMJNI_setPWMConfig (JNIEnv* env, jclass, jint id, jdouble maxPwm, jdouble deadbandMaxPwm, jdouble centerPwm, jdouble deadbandMinPwm, jdouble minPwm) { @@ -117,12 +117,12 @@ Java_edu_wpi_first_wpilibj_hal_PWMJNI_setPWMConfig } /* - * Class: edu_wpi_first_wpilibj_hal_PWMJNI + * Class: edu_wpi_first_hal_PWMJNI * Method: getPWMConfigRaw * Signature: (I)Ljava/lang/Object; */ JNIEXPORT jobject JNICALL -Java_edu_wpi_first_wpilibj_hal_PWMJNI_getPWMConfigRaw +Java_edu_wpi_first_hal_PWMJNI_getPWMConfigRaw (JNIEnv* env, jclass, jint id) { PWMJNI_LOG(logDEBUG) << "Calling PWMJNI getPWMConfigRaw"; @@ -141,12 +141,12 @@ Java_edu_wpi_first_wpilibj_hal_PWMJNI_getPWMConfigRaw } /* - * Class: edu_wpi_first_wpilibj_hal_PWMJNI + * Class: edu_wpi_first_hal_PWMJNI * Method: setPWMEliminateDeadband * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_PWMJNI_setPWMEliminateDeadband +Java_edu_wpi_first_hal_PWMJNI_setPWMEliminateDeadband (JNIEnv* env, jclass, jint id, jboolean value) { PWMJNI_LOG(logDEBUG) << "PWM Handle = " << (HAL_DigitalHandle)id; @@ -157,12 +157,12 @@ Java_edu_wpi_first_wpilibj_hal_PWMJNI_setPWMEliminateDeadband } /* - * Class: edu_wpi_first_wpilibj_hal_PWMJNI + * Class: edu_wpi_first_hal_PWMJNI * Method: getPWMEliminateDeadband * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_PWMJNI_getPWMEliminateDeadband +Java_edu_wpi_first_hal_PWMJNI_getPWMEliminateDeadband (JNIEnv* env, jclass, jint id) { PWMJNI_LOG(logDEBUG) << "PWM Handle = " << (HAL_DigitalHandle)id; @@ -174,12 +174,12 @@ Java_edu_wpi_first_wpilibj_hal_PWMJNI_getPWMEliminateDeadband } /* - * Class: edu_wpi_first_wpilibj_hal_PWMJNI + * Class: edu_wpi_first_hal_PWMJNI * Method: setPWMRaw * Signature: (IS)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_PWMJNI_setPWMRaw +Java_edu_wpi_first_hal_PWMJNI_setPWMRaw (JNIEnv* env, jclass, jint id, jshort value) { PWMJNI_LOG(logDEBUG) << "PWM Handle = " << (HAL_DigitalHandle)id; @@ -191,12 +191,12 @@ Java_edu_wpi_first_wpilibj_hal_PWMJNI_setPWMRaw } /* - * Class: edu_wpi_first_wpilibj_hal_PWMJNI + * Class: edu_wpi_first_hal_PWMJNI * Method: setPWMSpeed * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_PWMJNI_setPWMSpeed +Java_edu_wpi_first_hal_PWMJNI_setPWMSpeed (JNIEnv* env, jclass, jint id, jdouble value) { PWMJNI_LOG(logDEBUG) << "PWM Handle = " << (HAL_DigitalHandle)id; @@ -208,12 +208,12 @@ Java_edu_wpi_first_wpilibj_hal_PWMJNI_setPWMSpeed } /* - * Class: edu_wpi_first_wpilibj_hal_PWMJNI + * Class: edu_wpi_first_hal_PWMJNI * Method: setPWMPosition * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_PWMJNI_setPWMPosition +Java_edu_wpi_first_hal_PWMJNI_setPWMPosition (JNIEnv* env, jclass, jint id, jdouble value) { PWMJNI_LOG(logDEBUG) << "PWM Handle = " << (HAL_DigitalHandle)id; @@ -225,12 +225,12 @@ Java_edu_wpi_first_wpilibj_hal_PWMJNI_setPWMPosition } /* - * Class: edu_wpi_first_wpilibj_hal_PWMJNI + * Class: edu_wpi_first_hal_PWMJNI * Method: getPWMRaw * Signature: (I)S */ JNIEXPORT jshort JNICALL -Java_edu_wpi_first_wpilibj_hal_PWMJNI_getPWMRaw +Java_edu_wpi_first_hal_PWMJNI_getPWMRaw (JNIEnv* env, jclass, jint id) { PWMJNI_LOG(logDEBUG) << "PWM Handle = " << (HAL_DigitalHandle)id; @@ -243,12 +243,12 @@ Java_edu_wpi_first_wpilibj_hal_PWMJNI_getPWMRaw } /* - * Class: edu_wpi_first_wpilibj_hal_PWMJNI + * Class: edu_wpi_first_hal_PWMJNI * Method: getPWMSpeed * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_wpilibj_hal_PWMJNI_getPWMSpeed +Java_edu_wpi_first_hal_PWMJNI_getPWMSpeed (JNIEnv* env, jclass, jint id) { PWMJNI_LOG(logDEBUG) << "PWM Handle = " << (HAL_DigitalHandle)id; @@ -261,12 +261,12 @@ Java_edu_wpi_first_wpilibj_hal_PWMJNI_getPWMSpeed } /* - * Class: edu_wpi_first_wpilibj_hal_PWMJNI + * Class: edu_wpi_first_hal_PWMJNI * Method: getPWMPosition * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_wpilibj_hal_PWMJNI_getPWMPosition +Java_edu_wpi_first_hal_PWMJNI_getPWMPosition (JNIEnv* env, jclass, jint id) { PWMJNI_LOG(logDEBUG) << "PWM Handle = " << (HAL_DigitalHandle)id; @@ -279,12 +279,12 @@ Java_edu_wpi_first_wpilibj_hal_PWMJNI_getPWMPosition } /* - * Class: edu_wpi_first_wpilibj_hal_PWMJNI + * Class: edu_wpi_first_hal_PWMJNI * Method: setPWMDisabled * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_PWMJNI_setPWMDisabled +Java_edu_wpi_first_hal_PWMJNI_setPWMDisabled (JNIEnv* env, jclass, jint id) { PWMJNI_LOG(logDEBUG) << "PWM Handle = " << (HAL_DigitalHandle)id; @@ -295,12 +295,12 @@ Java_edu_wpi_first_wpilibj_hal_PWMJNI_setPWMDisabled } /* - * Class: edu_wpi_first_wpilibj_hal_PWMJNI + * Class: edu_wpi_first_hal_PWMJNI * Method: latchPWMZero * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_PWMJNI_latchPWMZero +Java_edu_wpi_first_hal_PWMJNI_latchPWMZero (JNIEnv* env, jclass, jint id) { PWMJNI_LOG(logDEBUG) << "PWM Handle = " << (HAL_DigitalHandle)id; @@ -311,12 +311,12 @@ Java_edu_wpi_first_wpilibj_hal_PWMJNI_latchPWMZero } /* - * Class: edu_wpi_first_wpilibj_hal_PWMJNI + * Class: edu_wpi_first_hal_PWMJNI * Method: setPWMPeriodScale * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_PWMJNI_setPWMPeriodScale +Java_edu_wpi_first_hal_PWMJNI_setPWMPeriodScale (JNIEnv* env, jclass, jint id, jint value) { PWMJNI_LOG(logDEBUG) << "PWM Handle = " << (HAL_DigitalHandle)id; diff --git a/hal/src/main/native/cpp/jni/PortsJNI.cpp b/hal/src/main/native/cpp/jni/PortsJNI.cpp index a90c1ddcef..4e149842d3 100644 --- a/hal/src/main/native/cpp/jni/PortsJNI.cpp +++ b/hal/src/main/native/cpp/jni/PortsJNI.cpp @@ -10,7 +10,7 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_wpilibj_hal_PortsJNI.h" +#include "edu_wpi_first_hal_PortsJNI.h" #include "hal/Ports.h" #include "hal/cpp/Log.h" @@ -27,12 +27,12 @@ TLogLevel portsJNILogLevel = logWARNING; extern "C" { /* - * Class: edu_wpi_first_wpilibj_hal_PortsJNI + * Class: edu_wpi_first_hal_PortsJNI * Method: getNumAccumulators * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumAccumulators +Java_edu_wpi_first_hal_PortsJNI_getNumAccumulators (JNIEnv* env, jclass) { PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumAccumulators"; @@ -42,12 +42,12 @@ Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumAccumulators } /* - * Class: edu_wpi_first_wpilibj_hal_PortsJNI + * Class: edu_wpi_first_hal_PortsJNI * Method: getNumAnalogTriggers * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumAnalogTriggers +Java_edu_wpi_first_hal_PortsJNI_getNumAnalogTriggers (JNIEnv* env, jclass) { PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumAnalogTriggers"; @@ -57,12 +57,12 @@ Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumAnalogTriggers } /* - * Class: edu_wpi_first_wpilibj_hal_PortsJNI + * Class: edu_wpi_first_hal_PortsJNI * Method: getNumAnalogInputs * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumAnalogInputs +Java_edu_wpi_first_hal_PortsJNI_getNumAnalogInputs (JNIEnv* env, jclass) { PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumAnalogInputs"; @@ -72,12 +72,12 @@ Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumAnalogInputs } /* - * Class: edu_wpi_first_wpilibj_hal_PortsJNI + * Class: edu_wpi_first_hal_PortsJNI * Method: getNumAnalogOutputs * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumAnalogOutputs +Java_edu_wpi_first_hal_PortsJNI_getNumAnalogOutputs (JNIEnv* env, jclass) { PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumAnalogOutputs"; @@ -87,12 +87,12 @@ Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumAnalogOutputs } /* - * Class: edu_wpi_first_wpilibj_hal_PortsJNI + * Class: edu_wpi_first_hal_PortsJNI * Method: getNumCounters * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumCounters +Java_edu_wpi_first_hal_PortsJNI_getNumCounters (JNIEnv* env, jclass) { PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumCounters"; @@ -102,12 +102,12 @@ Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumCounters } /* - * Class: edu_wpi_first_wpilibj_hal_PortsJNI + * Class: edu_wpi_first_hal_PortsJNI * Method: getNumDigitalHeaders * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumDigitalHeaders +Java_edu_wpi_first_hal_PortsJNI_getNumDigitalHeaders (JNIEnv* env, jclass) { PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumDigitalHeaders"; @@ -117,12 +117,12 @@ Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumDigitalHeaders } /* - * Class: edu_wpi_first_wpilibj_hal_PortsJNI + * Class: edu_wpi_first_hal_PortsJNI * Method: getNumPWMHeaders * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumPWMHeaders +Java_edu_wpi_first_hal_PortsJNI_getNumPWMHeaders (JNIEnv* env, jclass) { PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumPWMHeaders"; @@ -132,12 +132,12 @@ Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumPWMHeaders } /* - * Class: edu_wpi_first_wpilibj_hal_PortsJNI + * Class: edu_wpi_first_hal_PortsJNI * Method: getNumDigitalChannels * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumDigitalChannels +Java_edu_wpi_first_hal_PortsJNI_getNumDigitalChannels (JNIEnv* env, jclass) { PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumDigitalChannels"; @@ -147,12 +147,12 @@ Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumDigitalChannels } /* - * Class: edu_wpi_first_wpilibj_hal_PortsJNI + * Class: edu_wpi_first_hal_PortsJNI * Method: getNumPWMChannels * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumPWMChannels +Java_edu_wpi_first_hal_PortsJNI_getNumPWMChannels (JNIEnv* env, jclass) { PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumPWMChannels"; @@ -162,12 +162,12 @@ Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumPWMChannels } /* - * Class: edu_wpi_first_wpilibj_hal_PortsJNI + * Class: edu_wpi_first_hal_PortsJNI * Method: getNumDigitalPWMOutputs * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumDigitalPWMOutputs +Java_edu_wpi_first_hal_PortsJNI_getNumDigitalPWMOutputs (JNIEnv* env, jclass) { PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumDigitalPWMOutputs"; @@ -177,12 +177,12 @@ Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumDigitalPWMOutputs } /* - * Class: edu_wpi_first_wpilibj_hal_PortsJNI + * Class: edu_wpi_first_hal_PortsJNI * Method: getNumEncoders * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumEncoders +Java_edu_wpi_first_hal_PortsJNI_getNumEncoders (JNIEnv* env, jclass) { PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumEncoders"; @@ -192,12 +192,12 @@ Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumEncoders } /* - * Class: edu_wpi_first_wpilibj_hal_PortsJNI + * Class: edu_wpi_first_hal_PortsJNI * Method: getNumInterrupts * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumInterrupts +Java_edu_wpi_first_hal_PortsJNI_getNumInterrupts (JNIEnv* env, jclass) { PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumInterrupts"; @@ -207,12 +207,12 @@ Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumInterrupts } /* - * Class: edu_wpi_first_wpilibj_hal_PortsJNI + * Class: edu_wpi_first_hal_PortsJNI * Method: getNumRelayChannels * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumRelayChannels +Java_edu_wpi_first_hal_PortsJNI_getNumRelayChannels (JNIEnv* env, jclass) { PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumRelayChannels"; @@ -222,12 +222,12 @@ Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumRelayChannels } /* - * Class: edu_wpi_first_wpilibj_hal_PortsJNI + * Class: edu_wpi_first_hal_PortsJNI * Method: getNumRelayHeaders * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumRelayHeaders +Java_edu_wpi_first_hal_PortsJNI_getNumRelayHeaders (JNIEnv* env, jclass) { PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumRelayHeaders"; @@ -237,12 +237,12 @@ Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumRelayHeaders } /* - * Class: edu_wpi_first_wpilibj_hal_PortsJNI + * Class: edu_wpi_first_hal_PortsJNI * Method: getNumPCMModules * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumPCMModules +Java_edu_wpi_first_hal_PortsJNI_getNumPCMModules (JNIEnv* env, jclass) { PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumPCMModules"; @@ -252,12 +252,12 @@ Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumPCMModules } /* - * Class: edu_wpi_first_wpilibj_hal_PortsJNI + * Class: edu_wpi_first_hal_PortsJNI * Method: getNumSolenoidChannels * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumSolenoidChannels +Java_edu_wpi_first_hal_PortsJNI_getNumSolenoidChannels (JNIEnv* env, jclass) { PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumSolenoidChannels"; @@ -267,12 +267,12 @@ Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumSolenoidChannels } /* - * Class: edu_wpi_first_wpilibj_hal_PortsJNI + * Class: edu_wpi_first_hal_PortsJNI * Method: getNumPDPModules * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumPDPModules +Java_edu_wpi_first_hal_PortsJNI_getNumPDPModules (JNIEnv* env, jclass) { PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumPDPModules"; @@ -282,12 +282,12 @@ Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumPDPModules } /* - * Class: edu_wpi_first_wpilibj_hal_PortsJNI + * Class: edu_wpi_first_hal_PortsJNI * Method: getNumPDPChannels * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumPDPChannels +Java_edu_wpi_first_hal_PortsJNI_getNumPDPChannels (JNIEnv* env, jclass) { PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumPDPChannels"; diff --git a/hal/src/main/native/cpp/jni/PowerJNI.cpp b/hal/src/main/native/cpp/jni/PowerJNI.cpp index bdc9d6baeb..9184e9e3da 100644 --- a/hal/src/main/native/cpp/jni/PowerJNI.cpp +++ b/hal/src/main/native/cpp/jni/PowerJNI.cpp @@ -8,7 +8,7 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_wpilibj_hal_PowerJNI.h" +#include "edu_wpi_first_hal_PowerJNI.h" #include "hal/Power.h" using namespace frc; @@ -16,12 +16,12 @@ using namespace frc; extern "C" { /* - * Class: edu_wpi_first_wpilibj_hal_PowerJNI + * Class: edu_wpi_first_hal_PowerJNI * Method: getVinVoltage * Signature: ()D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_wpilibj_hal_PowerJNI_getVinVoltage +Java_edu_wpi_first_hal_PowerJNI_getVinVoltage (JNIEnv* env, jclass) { int32_t status = 0; @@ -31,12 +31,12 @@ Java_edu_wpi_first_wpilibj_hal_PowerJNI_getVinVoltage } /* - * Class: edu_wpi_first_wpilibj_hal_PowerJNI + * Class: edu_wpi_first_hal_PowerJNI * Method: getVinCurrent * Signature: ()D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_wpilibj_hal_PowerJNI_getVinCurrent +Java_edu_wpi_first_hal_PowerJNI_getVinCurrent (JNIEnv* env, jclass) { int32_t status = 0; @@ -46,12 +46,12 @@ Java_edu_wpi_first_wpilibj_hal_PowerJNI_getVinCurrent } /* - * Class: edu_wpi_first_wpilibj_hal_PowerJNI + * Class: edu_wpi_first_hal_PowerJNI * Method: getUserVoltage6V * Signature: ()D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserVoltage6V +Java_edu_wpi_first_hal_PowerJNI_getUserVoltage6V (JNIEnv* env, jclass) { int32_t status = 0; @@ -61,12 +61,12 @@ Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserVoltage6V } /* - * Class: edu_wpi_first_wpilibj_hal_PowerJNI + * Class: edu_wpi_first_hal_PowerJNI * Method: getUserCurrent6V * Signature: ()D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserCurrent6V +Java_edu_wpi_first_hal_PowerJNI_getUserCurrent6V (JNIEnv* env, jclass) { int32_t status = 0; @@ -76,12 +76,12 @@ Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserCurrent6V } /* - * Class: edu_wpi_first_wpilibj_hal_PowerJNI + * Class: edu_wpi_first_hal_PowerJNI * Method: getUserActive6V * Signature: ()Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserActive6V +Java_edu_wpi_first_hal_PowerJNI_getUserActive6V (JNIEnv* env, jclass) { int32_t status = 0; @@ -91,12 +91,12 @@ Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserActive6V } /* - * Class: edu_wpi_first_wpilibj_hal_PowerJNI + * Class: edu_wpi_first_hal_PowerJNI * Method: getUserCurrentFaults6V * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserCurrentFaults6V +Java_edu_wpi_first_hal_PowerJNI_getUserCurrentFaults6V (JNIEnv* env, jclass) { int32_t status = 0; @@ -106,12 +106,12 @@ Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserCurrentFaults6V } /* - * Class: edu_wpi_first_wpilibj_hal_PowerJNI + * Class: edu_wpi_first_hal_PowerJNI * Method: getUserVoltage5V * Signature: ()D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserVoltage5V +Java_edu_wpi_first_hal_PowerJNI_getUserVoltage5V (JNIEnv* env, jclass) { int32_t status = 0; @@ -121,12 +121,12 @@ Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserVoltage5V } /* - * Class: edu_wpi_first_wpilibj_hal_PowerJNI + * Class: edu_wpi_first_hal_PowerJNI * Method: getUserCurrent5V * Signature: ()D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserCurrent5V +Java_edu_wpi_first_hal_PowerJNI_getUserCurrent5V (JNIEnv* env, jclass) { int32_t status = 0; @@ -136,12 +136,12 @@ Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserCurrent5V } /* - * Class: edu_wpi_first_wpilibj_hal_PowerJNI + * Class: edu_wpi_first_hal_PowerJNI * Method: getUserActive5V * Signature: ()Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserActive5V +Java_edu_wpi_first_hal_PowerJNI_getUserActive5V (JNIEnv* env, jclass) { int32_t status = 0; @@ -151,12 +151,12 @@ Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserActive5V } /* - * Class: edu_wpi_first_wpilibj_hal_PowerJNI + * Class: edu_wpi_first_hal_PowerJNI * Method: getUserCurrentFaults5V * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserCurrentFaults5V +Java_edu_wpi_first_hal_PowerJNI_getUserCurrentFaults5V (JNIEnv* env, jclass) { int32_t status = 0; @@ -166,12 +166,12 @@ Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserCurrentFaults5V } /* - * Class: edu_wpi_first_wpilibj_hal_PowerJNI + * Class: edu_wpi_first_hal_PowerJNI * Method: getUserVoltage3V3 * Signature: ()D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserVoltage3V3 +Java_edu_wpi_first_hal_PowerJNI_getUserVoltage3V3 (JNIEnv* env, jclass) { int32_t status = 0; @@ -181,12 +181,12 @@ Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserVoltage3V3 } /* - * Class: edu_wpi_first_wpilibj_hal_PowerJNI + * Class: edu_wpi_first_hal_PowerJNI * Method: getUserCurrent3V3 * Signature: ()D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserCurrent3V3 +Java_edu_wpi_first_hal_PowerJNI_getUserCurrent3V3 (JNIEnv* env, jclass) { int32_t status = 0; @@ -196,12 +196,12 @@ Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserCurrent3V3 } /* - * Class: edu_wpi_first_wpilibj_hal_PowerJNI + * Class: edu_wpi_first_hal_PowerJNI * Method: getUserActive3V3 * Signature: ()Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserActive3V3 +Java_edu_wpi_first_hal_PowerJNI_getUserActive3V3 (JNIEnv* env, jclass) { int32_t status = 0; @@ -211,12 +211,12 @@ Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserActive3V3 } /* - * Class: edu_wpi_first_wpilibj_hal_PowerJNI + * Class: edu_wpi_first_hal_PowerJNI * Method: getUserCurrentFaults3V3 * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserCurrentFaults3V3 +Java_edu_wpi_first_hal_PowerJNI_getUserCurrentFaults3V3 (JNIEnv* env, jclass) { int32_t status = 0; diff --git a/hal/src/main/native/cpp/jni/RelayJNI.cpp b/hal/src/main/native/cpp/jni/RelayJNI.cpp index cd185cb2ee..0cc70fbde2 100644 --- a/hal/src/main/native/cpp/jni/RelayJNI.cpp +++ b/hal/src/main/native/cpp/jni/RelayJNI.cpp @@ -10,7 +10,7 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_wpilibj_hal_RelayJNI.h" +#include "edu_wpi_first_hal_RelayJNI.h" #include "hal/Ports.h" #include "hal/Relay.h" #include "hal/cpp/Log.h" @@ -30,12 +30,12 @@ TLogLevel relayJNILogLevel = logWARNING; extern "C" { /* - * Class: edu_wpi_first_wpilibj_hal_RelayJNI + * Class: edu_wpi_first_hal_RelayJNI * Method: initializeRelayPort * Signature: (IZ)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_RelayJNI_initializeRelayPort +Java_edu_wpi_first_hal_RelayJNI_initializeRelayPort (JNIEnv* env, jclass, jint id, jboolean fwd) { RELAYJNI_LOG(logDEBUG) << "Calling RELAYJNI initializeRelayPort"; @@ -52,12 +52,12 @@ Java_edu_wpi_first_wpilibj_hal_RelayJNI_initializeRelayPort } /* - * Class: edu_wpi_first_wpilibj_hal_RelayJNI + * Class: edu_wpi_first_hal_RelayJNI * Method: freeRelayPort * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_RelayJNI_freeRelayPort +Java_edu_wpi_first_hal_RelayJNI_freeRelayPort (JNIEnv* env, jclass, jint id) { RELAYJNI_LOG(logDEBUG) << "Calling RELAYJNI freeRelayPort"; @@ -66,12 +66,12 @@ Java_edu_wpi_first_wpilibj_hal_RelayJNI_freeRelayPort } /* - * Class: edu_wpi_first_wpilibj_hal_RelayJNI + * Class: edu_wpi_first_hal_RelayJNI * Method: checkRelayChannel * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_RelayJNI_checkRelayChannel +Java_edu_wpi_first_hal_RelayJNI_checkRelayChannel (JNIEnv* env, jclass, jint channel) { RELAYJNI_LOG(logDEBUG) << "Calling RELAYJNI checkRelayChannel"; @@ -80,12 +80,12 @@ Java_edu_wpi_first_wpilibj_hal_RelayJNI_checkRelayChannel } /* - * Class: edu_wpi_first_wpilibj_hal_RelayJNI + * Class: edu_wpi_first_hal_RelayJNI * Method: setRelay * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_RelayJNI_setRelay +Java_edu_wpi_first_hal_RelayJNI_setRelay (JNIEnv* env, jclass, jint id, jboolean value) { RELAYJNI_LOG(logDEBUG) << "Calling RELAYJNI setRelay"; @@ -98,12 +98,12 @@ Java_edu_wpi_first_wpilibj_hal_RelayJNI_setRelay } /* - * Class: edu_wpi_first_wpilibj_hal_RelayJNI + * Class: edu_wpi_first_hal_RelayJNI * Method: getRelay * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_RelayJNI_getRelay +Java_edu_wpi_first_hal_RelayJNI_getRelay (JNIEnv* env, jclass, jint id) { RELAYJNI_LOG(logDEBUG) << "Calling RELAYJNI getRelay"; diff --git a/hal/src/main/native/cpp/jni/SPIJNI.cpp b/hal/src/main/native/cpp/jni/SPIJNI.cpp index b960573f61..d75f710f83 100644 --- a/hal/src/main/native/cpp/jni/SPIJNI.cpp +++ b/hal/src/main/native/cpp/jni/SPIJNI.cpp @@ -12,7 +12,7 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_wpilibj_hal_SPIJNI.h" +#include "edu_wpi_first_hal_SPIJNI.h" #include "hal/SPI.h" #include "hal/cpp/Log.h" @@ -31,12 +31,12 @@ TLogLevel spiJNILogLevel = logWARNING; extern "C" { /* - * Class: edu_wpi_first_wpilibj_hal_SPIJNI + * Class: edu_wpi_first_hal_SPIJNI * Method: spiInitialize * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiInitialize +Java_edu_wpi_first_hal_SPIJNI_spiInitialize (JNIEnv* env, jclass, jint port) { SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiInitialize"; @@ -48,12 +48,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiInitialize } /* - * Class: edu_wpi_first_wpilibj_hal_SPIJNI + * Class: edu_wpi_first_hal_SPIJNI * Method: spiTransaction * Signature: (ILjava/lang/Object;Ljava/lang/Object;B)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiTransaction +Java_edu_wpi_first_hal_SPIJNI_spiTransaction (JNIEnv* env, jclass, jint port, jobject dataToSend, jobject dataReceived, jbyte size) { @@ -76,12 +76,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiTransaction } /* - * Class: edu_wpi_first_wpilibj_hal_SPIJNI + * Class: edu_wpi_first_hal_SPIJNI * Method: spiTransactionB * Signature: (I[B[BB)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiTransactionB +Java_edu_wpi_first_hal_SPIJNI_spiTransactionB (JNIEnv* env, jclass, jint port, jbyteArray dataToSend, jbyteArray dataReceived, jbyte size) { @@ -102,12 +102,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiTransactionB } /* - * Class: edu_wpi_first_wpilibj_hal_SPIJNI + * Class: edu_wpi_first_hal_SPIJNI * Method: spiWrite * Signature: (ILjava/lang/Object;B)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiWrite +Java_edu_wpi_first_hal_SPIJNI_spiWrite (JNIEnv* env, jclass, jint port, jobject dataToSend, jbyte size) { SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiWrite"; @@ -126,12 +126,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiWrite } /* - * Class: edu_wpi_first_wpilibj_hal_SPIJNI + * Class: edu_wpi_first_hal_SPIJNI * Method: spiWriteB * Signature: (I[BB)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiWriteB +Java_edu_wpi_first_hal_SPIJNI_spiWriteB (JNIEnv* env, jclass, jint port, jbyteArray dataToSend, jbyte size) { SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiWriteB"; @@ -146,12 +146,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiWriteB } /* - * Class: edu_wpi_first_wpilibj_hal_SPIJNI + * Class: edu_wpi_first_hal_SPIJNI * Method: spiRead * Signature: (IZLjava/lang/Object;B)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiRead +Java_edu_wpi_first_hal_SPIJNI_spiRead (JNIEnv* env, jclass, jint port, jboolean initiate, jobject dataReceived, jbyte size) { @@ -177,12 +177,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiRead } /* - * Class: edu_wpi_first_wpilibj_hal_SPIJNI + * Class: edu_wpi_first_hal_SPIJNI * Method: spiReadB * Signature: (IZ[BB)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiReadB +Java_edu_wpi_first_hal_SPIJNI_spiReadB (JNIEnv* env, jclass, jint port, jboolean initiate, jbyteArray dataReceived, jbyte size) { @@ -208,12 +208,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiReadB } /* - * Class: edu_wpi_first_wpilibj_hal_SPIJNI + * Class: edu_wpi_first_hal_SPIJNI * Method: spiClose * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiClose +Java_edu_wpi_first_hal_SPIJNI_spiClose (JNIEnv*, jclass, jint port) { SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiClose"; @@ -222,12 +222,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiClose } /* - * Class: edu_wpi_first_wpilibj_hal_SPIJNI + * Class: edu_wpi_first_hal_SPIJNI * Method: spiSetSpeed * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiSetSpeed +Java_edu_wpi_first_hal_SPIJNI_spiSetSpeed (JNIEnv*, jclass, jint port, jint speed) { SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiSetSpeed"; @@ -237,12 +237,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiSetSpeed } /* - * Class: edu_wpi_first_wpilibj_hal_SPIJNI + * Class: edu_wpi_first_hal_SPIJNI * Method: spiSetOpts * Signature: (IIII)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiSetOpts +Java_edu_wpi_first_hal_SPIJNI_spiSetOpts (JNIEnv*, jclass, jint port, jint msb_first, jint sample_on_trailing, jint clk_idle_high) { @@ -256,12 +256,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiSetOpts } /* - * Class: edu_wpi_first_wpilibj_hal_SPIJNI + * Class: edu_wpi_first_hal_SPIJNI * Method: spiSetChipSelectActiveHigh * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiSetChipSelectActiveHigh +Java_edu_wpi_first_hal_SPIJNI_spiSetChipSelectActiveHigh (JNIEnv* env, jclass, jint port) { SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiSetCSActiveHigh"; @@ -273,12 +273,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiSetChipSelectActiveHigh } /* - * Class: edu_wpi_first_wpilibj_hal_SPIJNI + * Class: edu_wpi_first_hal_SPIJNI * Method: spiSetChipSelectActiveLow * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiSetChipSelectActiveLow +Java_edu_wpi_first_hal_SPIJNI_spiSetChipSelectActiveLow (JNIEnv* env, jclass, jint port) { SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiSetCSActiveLow"; @@ -290,12 +290,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiSetChipSelectActiveLow } /* - * Class: edu_wpi_first_wpilibj_hal_SPIJNI + * Class: edu_wpi_first_hal_SPIJNI * Method: spiInitAuto * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiInitAuto +Java_edu_wpi_first_hal_SPIJNI_spiInitAuto (JNIEnv* env, jclass, jint port, jint bufferSize) { SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiInitAuto"; @@ -308,12 +308,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiInitAuto } /* - * Class: edu_wpi_first_wpilibj_hal_SPIJNI + * Class: edu_wpi_first_hal_SPIJNI * Method: spiFreeAuto * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiFreeAuto +Java_edu_wpi_first_hal_SPIJNI_spiFreeAuto (JNIEnv* env, jclass, jint port) { SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiFreeAuto"; @@ -325,12 +325,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiFreeAuto } /* - * Class: edu_wpi_first_wpilibj_hal_SPIJNI + * Class: edu_wpi_first_hal_SPIJNI * Method: spiStartAutoRate * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiStartAutoRate +Java_edu_wpi_first_hal_SPIJNI_spiStartAutoRate (JNIEnv* env, jclass, jint port, jdouble period) { SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiStartAutoRate"; @@ -343,12 +343,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiStartAutoRate } /* - * Class: edu_wpi_first_wpilibj_hal_SPIJNI + * Class: edu_wpi_first_hal_SPIJNI * Method: spiStartAutoTrigger * Signature: (IIIZZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiStartAutoTrigger +Java_edu_wpi_first_hal_SPIJNI_spiStartAutoTrigger (JNIEnv* env, jclass, jint port, jint digitalSourceHandle, jint analogTriggerType, jboolean triggerRising, jboolean triggerFalling) { @@ -367,12 +367,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiStartAutoTrigger } /* - * Class: edu_wpi_first_wpilibj_hal_SPIJNI + * Class: edu_wpi_first_hal_SPIJNI * Method: spiStopAuto * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiStopAuto +Java_edu_wpi_first_hal_SPIJNI_spiStopAuto (JNIEnv* env, jclass, jint port) { SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiStopAuto"; @@ -384,12 +384,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiStopAuto } /* - * Class: edu_wpi_first_wpilibj_hal_SPIJNI + * Class: edu_wpi_first_hal_SPIJNI * Method: spiSetAutoTransmitData * Signature: (I[BI)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiSetAutoTransmitData +Java_edu_wpi_first_hal_SPIJNI_spiSetAutoTransmitData (JNIEnv* env, jclass, jint port, jbyteArray dataToSend, jint zeroSize) { SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiSetAutoTransmitData"; @@ -406,12 +406,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiSetAutoTransmitData } /* - * Class: edu_wpi_first_wpilibj_hal_SPIJNI + * Class: edu_wpi_first_hal_SPIJNI * Method: spiForceAutoRead * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiForceAutoRead +Java_edu_wpi_first_hal_SPIJNI_spiForceAutoRead (JNIEnv* env, jclass, jint port) { SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiForceAutoRead"; @@ -423,12 +423,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiForceAutoRead } /* - * Class: edu_wpi_first_wpilibj_hal_SPIJNI + * Class: edu_wpi_first_hal_SPIJNI * Method: spiReadAutoReceivedData * Signature: (ILjava/lang/Object;ID)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiReadAutoReceivedData__ILjava_nio_ByteBuffer_2ID +Java_edu_wpi_first_hal_SPIJNI_spiReadAutoReceivedData__ILjava_nio_ByteBuffer_2ID (JNIEnv* env, jclass, jint port, jobject buffer, jint numToRead, jdouble timeout) { @@ -448,12 +448,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiReadAutoReceivedData__ILjava_nio_ByteBu } /* - * Class: edu_wpi_first_wpilibj_hal_SPIJNI + * Class: edu_wpi_first_hal_SPIJNI * Method: spiReadAutoReceivedData * Signature: (I[BID)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiReadAutoReceivedData__I_3BID +Java_edu_wpi_first_hal_SPIJNI_spiReadAutoReceivedData__I_3BID (JNIEnv* env, jclass, jint port, jbyteArray buffer, jint numToRead, jdouble timeout) { @@ -478,12 +478,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiReadAutoReceivedData__I_3BID } /* - * Class: edu_wpi_first_wpilibj_hal_SPIJNI + * Class: edu_wpi_first_hal_SPIJNI * Method: spiGetAutoDroppedCount * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiGetAutoDroppedCount +Java_edu_wpi_first_hal_SPIJNI_spiGetAutoDroppedCount (JNIEnv* env, jclass, jint port) { SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiGetAutoDroppedCount"; diff --git a/hal/src/main/native/cpp/jni/SerialPortJNI.cpp b/hal/src/main/native/cpp/jni/SerialPortJNI.cpp index b9ac46749a..4524fe6143 100644 --- a/hal/src/main/native/cpp/jni/SerialPortJNI.cpp +++ b/hal/src/main/native/cpp/jni/SerialPortJNI.cpp @@ -12,7 +12,7 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_wpilibj_hal_SerialPortJNI.h" +#include "edu_wpi_first_hal_SerialPortJNI.h" #include "hal/SerialPort.h" #include "hal/cpp/Log.h" @@ -31,12 +31,12 @@ TLogLevel serialJNILogLevel = logWARNING; extern "C" { /* - * Class: edu_wpi_first_wpilibj_hal_SerialPortJNI + * Class: edu_wpi_first_hal_SerialPortJNI * Method: serialInitializePort * Signature: (B)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialInitializePort +Java_edu_wpi_first_hal_SerialPortJNI_serialInitializePort (JNIEnv* env, jclass, jbyte port) { SERIALJNI_LOG(logDEBUG) << "Calling Serial Initialize"; @@ -48,12 +48,12 @@ Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialInitializePort } /* - * Class: edu_wpi_first_wpilibj_hal_SerialPortJNI + * Class: edu_wpi_first_hal_SerialPortJNI * Method: serialInitializePortDirect * Signature: (BLjava/lang/String;)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialInitializePortDirect +Java_edu_wpi_first_hal_SerialPortJNI_serialInitializePortDirect (JNIEnv* env, jclass, jbyte port, jstring portName) { SERIALJNI_LOG(logDEBUG) << "Calling Serial Initialize Direct"; @@ -68,12 +68,12 @@ Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialInitializePortDirect } /* - * Class: edu_wpi_first_wpilibj_hal_SerialPortJNI + * Class: edu_wpi_first_hal_SerialPortJNI * Method: serialSetBaudRate * Signature: (BI)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialSetBaudRate +Java_edu_wpi_first_hal_SerialPortJNI_serialSetBaudRate (JNIEnv* env, jclass, jbyte port, jint rate) { SERIALJNI_LOG(logDEBUG) << "Setting Serial Baud Rate"; @@ -85,12 +85,12 @@ Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialSetBaudRate } /* - * Class: edu_wpi_first_wpilibj_hal_SerialPortJNI + * Class: edu_wpi_first_hal_SerialPortJNI * Method: serialSetDataBits * Signature: (BB)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialSetDataBits +Java_edu_wpi_first_hal_SerialPortJNI_serialSetDataBits (JNIEnv* env, jclass, jbyte port, jbyte bits) { SERIALJNI_LOG(logDEBUG) << "Setting Serial Data Bits"; @@ -102,12 +102,12 @@ Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialSetDataBits } /* - * Class: edu_wpi_first_wpilibj_hal_SerialPortJNI + * Class: edu_wpi_first_hal_SerialPortJNI * Method: serialSetParity * Signature: (BB)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialSetParity +Java_edu_wpi_first_hal_SerialPortJNI_serialSetParity (JNIEnv* env, jclass, jbyte port, jbyte parity) { SERIALJNI_LOG(logDEBUG) << "Setting Serial Parity"; @@ -119,12 +119,12 @@ Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialSetParity } /* - * Class: edu_wpi_first_wpilibj_hal_SerialPortJNI + * Class: edu_wpi_first_hal_SerialPortJNI * Method: serialSetStopBits * Signature: (BB)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialSetStopBits +Java_edu_wpi_first_hal_SerialPortJNI_serialSetStopBits (JNIEnv* env, jclass, jbyte port, jbyte bits) { SERIALJNI_LOG(logDEBUG) << "Setting Serial Stop Bits"; @@ -136,12 +136,12 @@ Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialSetStopBits } /* - * Class: edu_wpi_first_wpilibj_hal_SerialPortJNI + * Class: edu_wpi_first_hal_SerialPortJNI * Method: serialSetWriteMode * Signature: (BB)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialSetWriteMode +Java_edu_wpi_first_hal_SerialPortJNI_serialSetWriteMode (JNIEnv* env, jclass, jbyte port, jbyte mode) { SERIALJNI_LOG(logDEBUG) << "Setting Serial Write Mode"; @@ -153,12 +153,12 @@ Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialSetWriteMode } /* - * Class: edu_wpi_first_wpilibj_hal_SerialPortJNI + * Class: edu_wpi_first_hal_SerialPortJNI * Method: serialSetFlowControl * Signature: (BB)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialSetFlowControl +Java_edu_wpi_first_hal_SerialPortJNI_serialSetFlowControl (JNIEnv* env, jclass, jbyte port, jbyte flow) { SERIALJNI_LOG(logDEBUG) << "Setting Serial Flow Control"; @@ -170,12 +170,12 @@ Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialSetFlowControl } /* - * Class: edu_wpi_first_wpilibj_hal_SerialPortJNI + * Class: edu_wpi_first_hal_SerialPortJNI * Method: serialSetTimeout * Signature: (BD)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialSetTimeout +Java_edu_wpi_first_hal_SerialPortJNI_serialSetTimeout (JNIEnv* env, jclass, jbyte port, jdouble timeout) { SERIALJNI_LOG(logDEBUG) << "Setting Serial Timeout"; @@ -187,12 +187,12 @@ Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialSetTimeout } /* - * Class: edu_wpi_first_wpilibj_hal_SerialPortJNI + * Class: edu_wpi_first_hal_SerialPortJNI * Method: serialEnableTermination * Signature: (BC)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialEnableTermination +Java_edu_wpi_first_hal_SerialPortJNI_serialEnableTermination (JNIEnv* env, jclass, jbyte port, jchar terminator) { SERIALJNI_LOG(logDEBUG) << "Setting Serial Enable Termination"; @@ -205,12 +205,12 @@ Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialEnableTermination } /* - * Class: edu_wpi_first_wpilibj_hal_SerialPortJNI + * Class: edu_wpi_first_hal_SerialPortJNI * Method: serialDisableTermination * Signature: (B)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialDisableTermination +Java_edu_wpi_first_hal_SerialPortJNI_serialDisableTermination (JNIEnv* env, jclass, jbyte port) { SERIALJNI_LOG(logDEBUG) << "Setting Serial Disable termination"; @@ -221,12 +221,12 @@ Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialDisableTermination } /* - * Class: edu_wpi_first_wpilibj_hal_SerialPortJNI + * Class: edu_wpi_first_hal_SerialPortJNI * Method: serialSetReadBufferSize * Signature: (BI)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialSetReadBufferSize +Java_edu_wpi_first_hal_SerialPortJNI_serialSetReadBufferSize (JNIEnv* env, jclass, jbyte port, jint size) { SERIALJNI_LOG(logDEBUG) << "Setting Serial Read Buffer Size"; @@ -238,12 +238,12 @@ Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialSetReadBufferSize } /* - * Class: edu_wpi_first_wpilibj_hal_SerialPortJNI + * Class: edu_wpi_first_hal_SerialPortJNI * Method: serialSetWriteBufferSize * Signature: (BI)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialSetWriteBufferSize +Java_edu_wpi_first_hal_SerialPortJNI_serialSetWriteBufferSize (JNIEnv* env, jclass, jbyte port, jint size) { SERIALJNI_LOG(logDEBUG) << "Setting Serial Write Buffer Size"; @@ -256,12 +256,12 @@ Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialSetWriteBufferSize } /* - * Class: edu_wpi_first_wpilibj_hal_SerialPortJNI + * Class: edu_wpi_first_hal_SerialPortJNI * Method: serialGetBytesReceived * Signature: (B)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialGetBytesReceived +Java_edu_wpi_first_hal_SerialPortJNI_serialGetBytesReceived (JNIEnv* env, jclass, jbyte port) { SERIALJNI_LOG(logDEBUG) << "Serial Get Bytes Received"; @@ -274,12 +274,12 @@ Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialGetBytesReceived } /* - * Class: edu_wpi_first_wpilibj_hal_SerialPortJNI + * Class: edu_wpi_first_hal_SerialPortJNI * Method: serialRead * Signature: (B[BI)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialRead +Java_edu_wpi_first_hal_SerialPortJNI_serialRead (JNIEnv* env, jclass, jbyte port, jbyteArray dataReceived, jint size) { SERIALJNI_LOG(logDEBUG) << "Serial Read"; @@ -297,12 +297,12 @@ Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialRead } /* - * Class: edu_wpi_first_wpilibj_hal_SerialPortJNI + * Class: edu_wpi_first_hal_SerialPortJNI * Method: serialWrite * Signature: (B[BI)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialWrite +Java_edu_wpi_first_hal_SerialPortJNI_serialWrite (JNIEnv* env, jclass, jbyte port, jbyteArray dataToSend, jint size) { SERIALJNI_LOG(logDEBUG) << "Serial Write"; @@ -319,12 +319,12 @@ Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialWrite } /* - * Class: edu_wpi_first_wpilibj_hal_SerialPortJNI + * Class: edu_wpi_first_hal_SerialPortJNI * Method: serialFlush * Signature: (B)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialFlush +Java_edu_wpi_first_hal_SerialPortJNI_serialFlush (JNIEnv* env, jclass, jbyte port) { SERIALJNI_LOG(logDEBUG) << "Serial Flush"; @@ -335,12 +335,12 @@ Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialFlush } /* - * Class: edu_wpi_first_wpilibj_hal_SerialPortJNI + * Class: edu_wpi_first_hal_SerialPortJNI * Method: serialClear * Signature: (B)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialClear +Java_edu_wpi_first_hal_SerialPortJNI_serialClear (JNIEnv* env, jclass, jbyte port) { SERIALJNI_LOG(logDEBUG) << "Serial Clear"; @@ -351,12 +351,12 @@ Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialClear } /* - * Class: edu_wpi_first_wpilibj_hal_SerialPortJNI + * Class: edu_wpi_first_hal_SerialPortJNI * Method: serialClose * Signature: (B)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialClose +Java_edu_wpi_first_hal_SerialPortJNI_serialClose (JNIEnv* env, jclass, jbyte port) { SERIALJNI_LOG(logDEBUG) << "Serial Close"; diff --git a/hal/src/main/native/cpp/jni/SolenoidJNI.cpp b/hal/src/main/native/cpp/jni/SolenoidJNI.cpp index 4a036385bd..524b70ed9b 100644 --- a/hal/src/main/native/cpp/jni/SolenoidJNI.cpp +++ b/hal/src/main/native/cpp/jni/SolenoidJNI.cpp @@ -8,7 +8,7 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_wpilibj_hal_SolenoidJNI.h" +#include "edu_wpi_first_hal_SolenoidJNI.h" #include "hal/Ports.h" #include "hal/Solenoid.h" #include "hal/cpp/Log.h" @@ -27,12 +27,12 @@ TLogLevel solenoidJNILogLevel = logERROR; extern "C" { /* - * Class: edu_wpi_first_wpilibj_hal_SolenoidJNI + * Class: edu_wpi_first_hal_SolenoidJNI * Method: initializeSolenoidPort * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_initializeSolenoidPort +Java_edu_wpi_first_hal_SolenoidJNI_initializeSolenoidPort (JNIEnv* env, jclass, jint id) { SOLENOIDJNI_LOG(logDEBUG) << "Calling SolenoidJNI initializeSolenoidPort"; @@ -53,12 +53,12 @@ Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_initializeSolenoidPort } /* - * Class: edu_wpi_first_wpilibj_hal_SolenoidJNI + * Class: edu_wpi_first_hal_SolenoidJNI * Method: checkSolenoidChannel * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_checkSolenoidChannel +Java_edu_wpi_first_hal_SolenoidJNI_checkSolenoidChannel (JNIEnv* env, jclass, jint channel) { SOLENOIDJNI_LOG(logDEBUG) << "Calling SolenoidJNI checkSolenoidChannel"; @@ -67,12 +67,12 @@ Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_checkSolenoidChannel } /* - * Class: edu_wpi_first_wpilibj_hal_SolenoidJNI + * Class: edu_wpi_first_hal_SolenoidJNI * Method: checkSolenoidModule * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_checkSolenoidModule +Java_edu_wpi_first_hal_SolenoidJNI_checkSolenoidModule (JNIEnv* env, jclass, jint module) { SOLENOIDJNI_LOG(logDEBUG) << "Calling SolenoidJNI checkSolenoidModule"; @@ -81,12 +81,12 @@ Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_checkSolenoidModule } /* - * Class: edu_wpi_first_wpilibj_hal_SolenoidJNI + * Class: edu_wpi_first_hal_SolenoidJNI * Method: freeSolenoidPort * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_freeSolenoidPort +Java_edu_wpi_first_hal_SolenoidJNI_freeSolenoidPort (JNIEnv* env, jclass, jint id) { SOLENOIDJNI_LOG(logDEBUG) << "Calling SolenoidJNI initializeSolenoidPort"; @@ -96,12 +96,12 @@ Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_freeSolenoidPort } /* - * Class: edu_wpi_first_wpilibj_hal_SolenoidJNI + * Class: edu_wpi_first_hal_SolenoidJNI * Method: setSolenoid * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_setSolenoid +Java_edu_wpi_first_hal_SolenoidJNI_setSolenoid (JNIEnv* env, jclass, jint solenoid_port, jboolean value) { SOLENOIDJNI_LOG(logDEBUG) << "Calling SolenoidJNI SetSolenoid"; @@ -115,12 +115,12 @@ Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_setSolenoid } /* - * Class: edu_wpi_first_wpilibj_hal_SolenoidJNI + * Class: edu_wpi_first_hal_SolenoidJNI * Method: getSolenoid * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_getSolenoid +Java_edu_wpi_first_hal_SolenoidJNI_getSolenoid (JNIEnv* env, jclass, jint solenoid_port) { int32_t status = 0; @@ -130,12 +130,12 @@ Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_getSolenoid } /* - * Class: edu_wpi_first_wpilibj_hal_SolenoidJNI + * Class: edu_wpi_first_hal_SolenoidJNI * Method: getAllSolenoids * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_getAllSolenoids +Java_edu_wpi_first_hal_SolenoidJNI_getAllSolenoids (JNIEnv* env, jclass, jint module) { int32_t status = 0; @@ -145,12 +145,12 @@ Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_getAllSolenoids } /* - * Class: edu_wpi_first_wpilibj_hal_SolenoidJNI + * Class: edu_wpi_first_hal_SolenoidJNI * Method: getPCMSolenoidBlackList * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_getPCMSolenoidBlackList +Java_edu_wpi_first_hal_SolenoidJNI_getPCMSolenoidBlackList (JNIEnv* env, jclass, jint module) { int32_t status = 0; @@ -159,12 +159,12 @@ Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_getPCMSolenoidBlackList return val; } /* - * Class: edu_wpi_first_wpilibj_hal_SolenoidJNI + * Class: edu_wpi_first_hal_SolenoidJNI * Method: getPCMSolenoidVoltageStickyFault * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_getPCMSolenoidVoltageStickyFault +Java_edu_wpi_first_hal_SolenoidJNI_getPCMSolenoidVoltageStickyFault (JNIEnv* env, jclass, jint module) { int32_t status = 0; @@ -173,12 +173,12 @@ Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_getPCMSolenoidVoltageStickyFault return val; } /* - * Class: edu_wpi_first_wpilibj_hal_SolenoidJNI + * Class: edu_wpi_first_hal_SolenoidJNI * Method: getPCMSolenoidVoltageFault * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_getPCMSolenoidVoltageFault +Java_edu_wpi_first_hal_SolenoidJNI_getPCMSolenoidVoltageFault (JNIEnv* env, jclass, jint module) { int32_t status = 0; @@ -187,12 +187,12 @@ Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_getPCMSolenoidVoltageFault return val; } /* - * Class: edu_wpi_first_wpilibj_hal_SolenoidJNI + * Class: edu_wpi_first_hal_SolenoidJNI * Method: clearAllPCMStickyFaults * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_clearAllPCMStickyFaults +Java_edu_wpi_first_hal_SolenoidJNI_clearAllPCMStickyFaults (JNIEnv* env, jclass, jint module) { int32_t status = 0; @@ -201,12 +201,12 @@ Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_clearAllPCMStickyFaults } /* - * Class: edu_wpi_first_wpilibj_hal_SolenoidJNI + * Class: edu_wpi_first_hal_SolenoidJNI * Method: setOneShotDuration * Signature: (IJ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_setOneShotDuration +Java_edu_wpi_first_hal_SolenoidJNI_setOneShotDuration (JNIEnv* env, jclass, jint solenoid_port, jlong durationMS) { SOLENOIDJNI_LOG(logDEBUG) << "Calling SolenoidJNI SetOneShotDuration"; @@ -222,12 +222,12 @@ Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_setOneShotDuration } /* - * Class: edu_wpi_first_wpilibj_hal_SolenoidJNI + * Class: edu_wpi_first_hal_SolenoidJNI * Method: fireOneShot * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_fireOneShot +Java_edu_wpi_first_hal_SolenoidJNI_fireOneShot (JNIEnv* env, jclass, jint solenoid_port) { SOLENOIDJNI_LOG(logDEBUG) << "Calling SolenoidJNI fireOneShot"; diff --git a/hal/src/main/native/cpp/jni/ThreadsJNI.cpp b/hal/src/main/native/cpp/jni/ThreadsJNI.cpp index 7a5eccb597..ea3cac68b8 100644 --- a/hal/src/main/native/cpp/jni/ThreadsJNI.cpp +++ b/hal/src/main/native/cpp/jni/ThreadsJNI.cpp @@ -10,7 +10,7 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_wpilibj_hal_ThreadsJNI.h" +#include "edu_wpi_first_hal_ThreadsJNI.h" #include "hal/Threads.h" #include "hal/cpp/Log.h" @@ -27,12 +27,12 @@ TLogLevel threadsJNILogLevel = logWARNING; extern "C" { /* - * Class: edu_wpi_first_wpilibj_hal_ThreadsJNI + * Class: edu_wpi_first_hal_ThreadsJNI * Method: getCurrentThreadPriority * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_wpilibj_hal_ThreadsJNI_getCurrentThreadPriority +Java_edu_wpi_first_hal_ThreadsJNI_getCurrentThreadPriority (JNIEnv* env, jclass) { THREADSJNI_LOG(logDEBUG) << "Callling GetCurrentThreadPriority"; @@ -44,12 +44,12 @@ Java_edu_wpi_first_wpilibj_hal_ThreadsJNI_getCurrentThreadPriority } /* - * Class: edu_wpi_first_wpilibj_hal_ThreadsJNI + * Class: edu_wpi_first_hal_ThreadsJNI * Method: getCurrentThreadIsRealTime * Signature: ()Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_ThreadsJNI_getCurrentThreadIsRealTime +Java_edu_wpi_first_hal_ThreadsJNI_getCurrentThreadIsRealTime (JNIEnv* env, jclass) { THREADSJNI_LOG(logDEBUG) << "Callling GetCurrentThreadIsRealTime"; @@ -61,12 +61,12 @@ Java_edu_wpi_first_wpilibj_hal_ThreadsJNI_getCurrentThreadIsRealTime } /* - * Class: edu_wpi_first_wpilibj_hal_ThreadsJNI + * Class: edu_wpi_first_hal_ThreadsJNI * Method: setCurrentThreadPriority * Signature: (ZI)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_wpilibj_hal_ThreadsJNI_setCurrentThreadPriority +Java_edu_wpi_first_hal_ThreadsJNI_setCurrentThreadPriority (JNIEnv* env, jclass, jboolean realTime, jint priority) { THREADSJNI_LOG(logDEBUG) << "Callling SetCurrentThreadPriority"; diff --git a/hal/src/main/native/sim/jni/SimulatorJNI.cpp b/hal/src/main/native/sim/jni/SimulatorJNI.cpp index a2b99660b2..8a0a005e55 100644 --- a/hal/src/main/native/sim/jni/SimulatorJNI.cpp +++ b/hal/src/main/native/sim/jni/SimulatorJNI.cpp @@ -38,17 +38,17 @@ jint SimOnLoad(JavaVM* vm, void* reserved) { if (vm->GetEnv(reinterpret_cast(&env), JNI_VERSION_1_6) != JNI_OK) return JNI_ERR; - simValueCls = JClass(env, "edu/wpi/first/wpilibj/sim/SimValue"); + simValueCls = JClass(env, "edu/wpi/first/hal/sim/SimValue"); if (!simValueCls) return JNI_ERR; - notifyCallbackCls = JClass(env, "edu/wpi/first/wpilibj/sim/NotifyCallback"); + notifyCallbackCls = JClass(env, "edu/wpi/first/hal/sim/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/wpilibj/sim/BufferCallback"); + bufferCallbackCls = JClass(env, "edu/wpi/first/hal/sim/BufferCallback"); if (!bufferCallbackCls) return JNI_ERR; bufferCallbackCallback = env->GetMethodID(bufferCallbackCls, "callback", @@ -56,7 +56,7 @@ jint SimOnLoad(JavaVM* vm, void* reserved) { if (!bufferCallbackCallback) return JNI_ERR; constBufferCallbackCls = - JClass(env, "edu/wpi/first/wpilibj/sim/ConstBufferCallback"); + JClass(env, "edu/wpi/first/hal/sim/ConstBufferCallback"); if (!constBufferCallbackCls) return JNI_ERR; constBufferCallbackCallback = env->GetMethodID( @@ -64,7 +64,7 @@ jint SimOnLoad(JavaVM* vm, void* reserved) { if (!constBufferCallbackCallback) return JNI_ERR; spiReadAutoReceiveBufferCallbackCls = - JClass(env, "edu/wpi/first/wpilibj/sim/SpiReadAutoReceiveBufferCallback"); + JClass(env, "edu/wpi/first/hal/sim/SpiReadAutoReceiveBufferCallback"); if (!spiReadAutoReceiveBufferCallbackCls) return JNI_ERR; spiReadAutoReceiveBufferCallbackCallback = diff --git a/hal/src/test/java/edu/wpi/first/hal/sim/AccelerometerSimTest.java b/hal/src/test/java/edu/wpi/first/hal/sim/AccelerometerSimTest.java index 98236dd859..383165cfcd 100644 --- a/hal/src/test/java/edu/wpi/first/hal/sim/AccelerometerSimTest.java +++ b/hal/src/test/java/edu/wpi/first/hal/sim/AccelerometerSimTest.java @@ -9,10 +9,8 @@ package edu.wpi.first.hal.sim; import org.junit.jupiter.api.Test; -import edu.wpi.first.wpilibj.hal.AccelerometerJNI; -import edu.wpi.first.wpilibj.hal.HAL; -import edu.wpi.first.wpilibj.sim.AccelerometerSim; -import edu.wpi.first.wpilibj.sim.CallbackStore; +import edu.wpi.first.hal.AccelerometerJNI; +import edu.wpi.first.hal.HAL; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/wpilibj/src/dev/java/edu/wpi/first/wpilibj/DevMain.java b/wpilibj/src/dev/java/edu/wpi/first/wpilibj/DevMain.java index 450665119f..2c08b179c5 100644 --- a/wpilibj/src/dev/java/edu/wpi/first/wpilibj/DevMain.java +++ b/wpilibj/src/dev/java/edu/wpi/first/wpilibj/DevMain.java @@ -7,8 +7,8 @@ package edu.wpi.first.wpilibj; +import edu.wpi.first.hal.HALUtil; import edu.wpi.first.networktables.NetworkTablesJNI; -import edu.wpi.first.wpilibj.hal.HALUtil; import edu.wpi.first.wpiutil.RuntimeDetector; public final class DevMain { diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL345_I2C.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL345_I2C.java index c084e9a5c0..e91b8d2859 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL345_I2C.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL345_I2C.java @@ -10,10 +10,10 @@ package edu.wpi.first.wpilibj; import java.nio.ByteBuffer; import java.nio.ByteOrder; +import edu.wpi.first.hal.FRCNetComm.tInstances; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; import edu.wpi.first.networktables.NetworkTableEntry; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tInstances; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; import edu.wpi.first.wpilibj.interfaces.Accelerometer; import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL345_SPI.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL345_SPI.java index 8dbfa3ad15..b5d3618fa1 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL345_SPI.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL345_SPI.java @@ -10,10 +10,10 @@ package edu.wpi.first.wpilibj; import java.nio.ByteBuffer; import java.nio.ByteOrder; +import edu.wpi.first.hal.FRCNetComm.tInstances; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; import edu.wpi.first.networktables.NetworkTableEntry; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tInstances; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; import edu.wpi.first.wpilibj.interfaces.Accelerometer; import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL362.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL362.java index 2f8fa00070..5324b63ef3 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL362.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL362.java @@ -10,9 +10,9 @@ package edu.wpi.first.wpilibj; import java.nio.ByteBuffer; import java.nio.ByteOrder; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; import edu.wpi.first.networktables.NetworkTableEntry; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; import edu.wpi.first.wpilibj.interfaces.Accelerometer; import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXRS450_Gyro.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXRS450_Gyro.java index a27db2a04f..a5a862d7f6 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXRS450_Gyro.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXRS450_Gyro.java @@ -10,8 +10,8 @@ package edu.wpi.first.wpilibj; import java.nio.ByteBuffer; import java.nio.ByteOrder; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; import edu.wpi.first.wpilibj.interfaces.Gyro; /** diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AccumulatorResult.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AccumulatorResult.java deleted file mode 100644 index 7921637957..0000000000 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AccumulatorResult.java +++ /dev/null @@ -1,32 +0,0 @@ -/*----------------------------------------------------------------------------*/ -/* Copyright (c) 2008-2018 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.wpilibj; - -/** - * Structure for holding the values stored in an accumulator. - */ -public class AccumulatorResult { - /** - * The total value accumulated. - */ - @SuppressWarnings("MemberName") - public long value; - /** - * The number of sample value was accumulated over. - */ - @SuppressWarnings("MemberName") - public long count; - - /** - * Set the value and count. - */ - public void set(long value, long count) { - this.value = value; - this.count = count; - } -} diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogAccelerometer.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogAccelerometer.java index 582c9f70b0..cd64dc82cc 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogAccelerometer.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogAccelerometer.java @@ -7,8 +7,8 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder; import static java.util.Objects.requireNonNull; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogGyro.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogGyro.java index 6c7442fd9b..4283aa0ce4 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogGyro.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogGyro.java @@ -7,9 +7,9 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.AnalogGyroJNI; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; +import edu.wpi.first.hal.AnalogGyroJNI; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; import edu.wpi.first.wpilibj.interfaces.Gyro; import static java.util.Objects.requireNonNull; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogInput.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogInput.java index fe3ce6ac89..74eb866b9b 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogInput.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogInput.java @@ -7,12 +7,13 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.AnalogJNI; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; -import edu.wpi.first.wpilibj.sim.AnalogInSim; +import edu.wpi.first.hal.AccumulatorResult; +import edu.wpi.first.hal.AnalogJNI; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; +import edu.wpi.first.hal.sim.AnalogInSim; +import edu.wpi.first.hal.util.AllocationException; import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder; -import edu.wpi.first.wpilibj.util.AllocationException; /** * Analog channel class. diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogOutput.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogOutput.java index 0aae1d5ae7..ff81e9ea58 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogOutput.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogOutput.java @@ -7,10 +7,10 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.AnalogJNI; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; -import edu.wpi.first.wpilibj.sim.AnalogOutSim; +import edu.wpi.first.hal.AnalogJNI; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; +import edu.wpi.first.hal.sim.AnalogOutSim; import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder; /** diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogTrigger.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogTrigger.java index 0a60eb3269..e429246754 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogTrigger.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogTrigger.java @@ -10,12 +10,13 @@ package edu.wpi.first.wpilibj; import java.nio.ByteBuffer; import java.nio.ByteOrder; +import edu.wpi.first.hal.AnalogJNI; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; +import edu.wpi.first.hal.util.BoundaryException; import edu.wpi.first.wpilibj.AnalogTriggerOutput.AnalogTriggerType; -import edu.wpi.first.wpilibj.hal.AnalogJNI; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder; -import edu.wpi.first.wpilibj.util.BoundaryException; + /** * Class for creating and configuring Analog Triggers. diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogTriggerOutput.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogTriggerOutput.java index af4dfb81a0..04971c887f 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogTriggerOutput.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogTriggerOutput.java @@ -7,9 +7,9 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.AnalogJNI; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; +import edu.wpi.first.hal.AnalogJNI; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder; import static java.util.Objects.requireNonNull; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/BuiltInAccelerometer.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/BuiltInAccelerometer.java index 8b0d8ccf74..d8dbafe3bc 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/BuiltInAccelerometer.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/BuiltInAccelerometer.java @@ -7,11 +7,11 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.AccelerometerJNI; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; +import edu.wpi.first.hal.AccelerometerJNI; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; +import edu.wpi.first.hal.sim.AccelerometerSim; import edu.wpi.first.wpilibj.interfaces.Accelerometer; -import edu.wpi.first.wpilibj.sim.AccelerometerSim; import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder; /** diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/CAN.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/CAN.java index 1fe6fa95e7..c6eac3ac81 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/CAN.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/CAN.java @@ -9,9 +9,10 @@ package edu.wpi.first.wpilibj; import java.io.Closeable; -import edu.wpi.first.wpilibj.hal.CANAPIJNI; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; +import edu.wpi.first.hal.CANAPIJNI; +import edu.wpi.first.hal.CANData; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; /** * High level class for interfacing with CAN devices conforming to diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Compressor.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Compressor.java index a3b3b3c2f0..e95e8a7360 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Compressor.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Compressor.java @@ -7,9 +7,9 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.CompressorJNI; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; +import edu.wpi.first.hal.CompressorJNI; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder; /** diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/ControllerPower.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/ControllerPower.java index 7dc379fee6..3a03c6026f 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/ControllerPower.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/ControllerPower.java @@ -7,7 +7,7 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.PowerJNI; +import edu.wpi.first.hal.PowerJNI; /** * Old Controller PR class. diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Counter.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Counter.java index cd73cfba22..dca332a16a 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Counter.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Counter.java @@ -10,10 +10,10 @@ package edu.wpi.first.wpilibj; import java.nio.ByteBuffer; import java.nio.ByteOrder; +import edu.wpi.first.hal.CounterJNI; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; import edu.wpi.first.wpilibj.AnalogTriggerOutput.AnalogTriggerType; -import edu.wpi.first.wpilibj.hal.CounterJNI; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder; import static java.util.Objects.requireNonNull; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/DMC60.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/DMC60.java index 14fd83d125..c2f4c9cdcd 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/DMC60.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/DMC60.java @@ -7,8 +7,8 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; /** * Digilent DMC 60 Speed Controller. diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/DigitalGlitchFilter.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/DigitalGlitchFilter.java index 436d3edf7a..ad92f48a3b 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/DigitalGlitchFilter.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/DigitalGlitchFilter.java @@ -10,9 +10,9 @@ package edu.wpi.first.wpilibj; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import edu.wpi.first.wpilibj.hal.DigitalGlitchFilterJNI; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; +import edu.wpi.first.hal.DigitalGlitchFilterJNI; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder; /** diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/DigitalInput.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/DigitalInput.java index 402860c21a..03a0f21351 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/DigitalInput.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/DigitalInput.java @@ -7,9 +7,9 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.DIOJNI; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; +import edu.wpi.first.hal.DIOJNI; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder; /** diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/DigitalOutput.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/DigitalOutput.java index 85dc91c8bf..f375ccb76e 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/DigitalOutput.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/DigitalOutput.java @@ -7,9 +7,9 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.DIOJNI; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; +import edu.wpi.first.hal.DIOJNI; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder; /** diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/DoubleSolenoid.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/DoubleSolenoid.java index 691bc66df2..8cd60ec476 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/DoubleSolenoid.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/DoubleSolenoid.java @@ -7,11 +7,11 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; -import edu.wpi.first.wpilibj.hal.SolenoidJNI; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; +import edu.wpi.first.hal.SolenoidJNI; +import edu.wpi.first.hal.util.UncleanStatusException; import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder; -import edu.wpi.first.wpilibj.util.UncleanStatusException; /** * DoubleSolenoid class for running 2 channels of high voltage Digital Output on the PCM. diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/DriverStation.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/DriverStation.java index aa0fcc895d..fb67ca0c6f 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/DriverStation.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/DriverStation.java @@ -13,14 +13,14 @@ import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; +import edu.wpi.first.hal.AllianceStationID; +import edu.wpi.first.hal.ControlWord; +import edu.wpi.first.hal.HAL; +import edu.wpi.first.hal.MatchInfoData; +import edu.wpi.first.hal.PowerJNI; import edu.wpi.first.networktables.NetworkTable; import edu.wpi.first.networktables.NetworkTableEntry; import edu.wpi.first.networktables.NetworkTableInstance; -import edu.wpi.first.wpilibj.hal.AllianceStationID; -import edu.wpi.first.wpilibj.hal.ControlWord; -import edu.wpi.first.wpilibj.hal.HAL; -import edu.wpi.first.wpilibj.hal.MatchInfoData; -import edu.wpi.first.wpilibj.hal.PowerJNI; /** * Provide access to the network communication data to / from the Driver Station. diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Encoder.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Encoder.java index 52ef0622d9..594fe0a135 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Encoder.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Encoder.java @@ -7,11 +7,11 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.EncoderJNI; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; +import edu.wpi.first.hal.EncoderJNI; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; +import edu.wpi.first.hal.util.AllocationException; import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder; -import edu.wpi.first.wpilibj.util.AllocationException; import static java.util.Objects.requireNonNull; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/GearTooth.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/GearTooth.java index d0ccef7c7c..e937c260a3 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/GearTooth.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/GearTooth.java @@ -7,8 +7,8 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder; /** diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/GenericHID.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/GenericHID.java index 43eee587e2..0f884b90da 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/GenericHID.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/GenericHID.java @@ -10,7 +10,7 @@ package edu.wpi.first.wpilibj; import java.util.HashMap; import java.util.Map; -import edu.wpi.first.wpilibj.hal.HAL; +import edu.wpi.first.hal.HAL; /** * GenericHID Interface. diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/I2C.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/I2C.java index ff658a36d7..67a171c55c 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/I2C.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/I2C.java @@ -9,10 +9,10 @@ package edu.wpi.first.wpilibj; import java.nio.ByteBuffer; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; -import edu.wpi.first.wpilibj.hal.I2CJNI; -import edu.wpi.first.wpilibj.util.BoundaryException; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; +import edu.wpi.first.hal.I2CJNI; +import edu.wpi.first.hal.util.BoundaryException; import static java.util.Objects.requireNonNull; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/InterruptHandlerFunction.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/InterruptHandlerFunction.java index ed9048e284..6fd807b965 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/InterruptHandlerFunction.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/InterruptHandlerFunction.java @@ -7,7 +7,7 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.InterruptJNI.InterruptJNIHandlerFunction; +import edu.wpi.first.hal.InterruptJNI.InterruptJNIHandlerFunction; /** diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/InterruptableSensorBase.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/InterruptableSensorBase.java index b4c0631b39..a0d3ef2da6 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/InterruptableSensorBase.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/InterruptableSensorBase.java @@ -7,8 +7,8 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.InterruptJNI; -import edu.wpi.first.wpilibj.util.AllocationException; +import edu.wpi.first.hal.InterruptJNI; +import edu.wpi.first.hal.util.AllocationException; /** diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/IterativeRobot.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/IterativeRobot.java index 1f69951256..e5bc4b69e1 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/IterativeRobot.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/IterativeRobot.java @@ -7,9 +7,9 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tInstances; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; +import edu.wpi.first.hal.FRCNetComm.tInstances; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; /** * IterativeRobot implements the IterativeRobotBase robot program framework. diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/IterativeRobotBase.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/IterativeRobotBase.java index 11a9b17c07..2df5ac782c 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/IterativeRobotBase.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/IterativeRobotBase.java @@ -7,7 +7,7 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.HAL; +import edu.wpi.first.hal.HAL; import edu.wpi.first.wpilibj.livewindow.LiveWindow; import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Jaguar.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Jaguar.java index c83cf018de..934e70b6a1 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Jaguar.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Jaguar.java @@ -7,8 +7,8 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; /** * Texas Instruments / Vex Robotics Jaguar Speed Controller as a PWM device. diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Joystick.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Joystick.java index 951fa44d95..bb7ef816dd 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Joystick.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Joystick.java @@ -7,8 +7,8 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; /** * Handle input from standard Joysticks connected to the Driver Station. diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/NidecBrushless.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/NidecBrushless.java index f27a22e918..57ea7ff555 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/NidecBrushless.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/NidecBrushless.java @@ -7,8 +7,8 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder; /** diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Notifier.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Notifier.java index d962d5018b..45b7d94b46 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Notifier.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Notifier.java @@ -10,7 +10,7 @@ package edu.wpi.first.wpilibj; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.ReentrantLock; -import edu.wpi.first.wpilibj.hal.NotifierJNI; +import edu.wpi.first.hal.NotifierJNI; public class Notifier implements AutoCloseable { // The thread waiting on the HAL alarm. diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/PIDBase.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/PIDBase.java index 4c8807b20e..780a5c2c15 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/PIDBase.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/PIDBase.java @@ -9,11 +9,11 @@ package edu.wpi.first.wpilibj; import java.util.concurrent.locks.ReentrantLock; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; +import edu.wpi.first.hal.util.BoundaryException; import edu.wpi.first.wpilibj.filters.LinearDigitalFilter; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder; -import edu.wpi.first.wpilibj.util.BoundaryException; import static java.util.Objects.requireNonNull; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/PWM.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/PWM.java index 91ce4af4d5..4eab6ebab4 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/PWM.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/PWM.java @@ -7,9 +7,10 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; -import edu.wpi.first.wpilibj.hal.PWMJNI; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; +import edu.wpi.first.hal.PWMConfigDataResult; +import edu.wpi.first.hal.PWMJNI; import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder; /** diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/PWMConfigDataResult.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/PWMConfigDataResult.java deleted file mode 100644 index 9373d91f55..0000000000 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/PWMConfigDataResult.java +++ /dev/null @@ -1,51 +0,0 @@ -/*----------------------------------------------------------------------------*/ -/* Copyright (c) 2008-2018 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.wpilibj; - -/** - * Structure for holding the config data result for PWM. - */ -public class PWMConfigDataResult { - PWMConfigDataResult(int max, int deadbandMax, int center, int deadbandMin, int min) { - this.max = max; - this.deadbandMax = deadbandMax; - this.center = center; - this.deadbandMin = deadbandMin; - this.min = min; - } - - /** - * The maximum PWM value. - */ - @SuppressWarnings("MemberName") - public int max; - - /** - * The deadband maximum PWM value. - */ - @SuppressWarnings("MemberName") - public int deadbandMax; - - /** - * The center PWM value. - */ - @SuppressWarnings("MemberName") - public int center; - - /** - * The deadband minimum PWM value. - */ - @SuppressWarnings("MemberName") - public int deadbandMin; - - /** - * The minimum PWM value. - */ - @SuppressWarnings("MemberName") - public int min; -} diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/PWMTalonSRX.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/PWMTalonSRX.java index c461bc0fe1..2b42ed478b 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/PWMTalonSRX.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/PWMTalonSRX.java @@ -7,8 +7,8 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; /** * Cross the Road Electronics (CTRE) Talon SRX Speed Controller with PWM control. diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/PWMVictorSPX.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/PWMVictorSPX.java index 3cd6449505..f1acb4332f 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/PWMVictorSPX.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/PWMVictorSPX.java @@ -7,8 +7,8 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; /** * Cross the Road Electronics (CTRE) Victor SPX Speed Controller with PWM control. diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/PowerDistributionPanel.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/PowerDistributionPanel.java index d53b1b4caa..dd175eb2df 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/PowerDistributionPanel.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/PowerDistributionPanel.java @@ -7,9 +7,9 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; -import edu.wpi.first.wpilibj.hal.PDPJNI; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; +import edu.wpi.first.hal.PDPJNI; import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder; /** diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Preferences.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Preferences.java index d519ca024d..45d9e0e1f1 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Preferences.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Preferences.java @@ -9,12 +9,12 @@ package edu.wpi.first.wpilibj; import java.util.Vector; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; import edu.wpi.first.networktables.EntryListenerFlags; import edu.wpi.first.networktables.NetworkTable; import edu.wpi.first.networktables.NetworkTableEntry; import edu.wpi.first.networktables.NetworkTableInstance; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; import static java.util.Objects.requireNonNull; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Relay.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Relay.java index 849c340885..a4df2f145b 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Relay.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Relay.java @@ -10,11 +10,11 @@ package edu.wpi.first.wpilibj; import java.util.Arrays; import java.util.Optional; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; -import edu.wpi.first.wpilibj.hal.RelayJNI; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; +import edu.wpi.first.hal.RelayJNI; +import edu.wpi.first.hal.util.UncleanStatusException; import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder; -import edu.wpi.first.wpilibj.util.UncleanStatusException; import static java.util.Objects.requireNonNull; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Resource.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Resource.java index aa82bbc35d..39a0eacf8b 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Resource.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Resource.java @@ -7,8 +7,8 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.util.AllocationException; -import edu.wpi.first.wpilibj.util.CheckedAllocationException; +import edu.wpi.first.hal.util.AllocationException; +import edu.wpi.first.hal.util.CheckedAllocationException; /** * Track resources in the program. The Resource class is a convenient way of keeping track of diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java index 34e1ccc7d8..304595a090 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java @@ -15,11 +15,11 @@ import java.nio.file.Files; import java.util.function.Supplier; import edu.wpi.cscore.CameraServerJNI; +import edu.wpi.first.hal.FRCNetComm.tInstances; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; +import edu.wpi.first.hal.HALUtil; import edu.wpi.first.networktables.NetworkTableInstance; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tInstances; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; -import edu.wpi.first.wpilibj.hal.HALUtil; import edu.wpi.first.wpilibj.livewindow.LiveWindow; import edu.wpi.first.wpilibj.util.WPILibVersion; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotController.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotController.java index 7883b38467..06238124fd 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotController.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotController.java @@ -7,11 +7,11 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.can.CANJNI; -import edu.wpi.first.wpilibj.can.CANStatus; -import edu.wpi.first.wpilibj.hal.HAL; -import edu.wpi.first.wpilibj.hal.HALUtil; -import edu.wpi.first.wpilibj.hal.PowerJNI; +import edu.wpi.first.hal.HAL; +import edu.wpi.first.hal.HALUtil; +import edu.wpi.first.hal.PowerJNI; +import edu.wpi.first.hal.can.CANJNI; +import edu.wpi.first.hal.can.CANStatus; /** * Contains functions for roboRIO functionality. diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotDrive.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotDrive.java index 114592d40a..5aa9e43ca2 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotDrive.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotDrive.java @@ -7,9 +7,9 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tInstances; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; +import edu.wpi.first.hal.FRCNetComm.tInstances; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; import static java.util.Objects.requireNonNull; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/SD540.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/SD540.java index 0da8839f92..8f9ce0d9b8 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/SD540.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/SD540.java @@ -7,8 +7,8 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; /** * Mindsensors SD540 Speed Controller. diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/SPI.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/SPI.java index abdc54a0af..2b309e4486 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/SPI.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/SPI.java @@ -9,9 +9,10 @@ package edu.wpi.first.wpilibj; import java.nio.ByteBuffer; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; -import edu.wpi.first.wpilibj.hal.SPIJNI; +import edu.wpi.first.hal.AccumulatorResult; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; +import edu.wpi.first.hal.SPIJNI; /** * Represents a SPI bus port. diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/SampleRobot.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/SampleRobot.java index d35ee19dd7..feec9c2124 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/SampleRobot.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/SampleRobot.java @@ -7,9 +7,9 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tInstances; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; +import edu.wpi.first.hal.FRCNetComm.tInstances; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; import edu.wpi.first.wpilibj.livewindow.LiveWindow; /** diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/SensorUtil.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/SensorUtil.java index 265719b8f5..4f2b8b5bb8 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/SensorUtil.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/SensorUtil.java @@ -7,14 +7,14 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.AnalogJNI; -import edu.wpi.first.wpilibj.hal.ConstantsJNI; -import edu.wpi.first.wpilibj.hal.DIOJNI; -import edu.wpi.first.wpilibj.hal.PDPJNI; -import edu.wpi.first.wpilibj.hal.PWMJNI; -import edu.wpi.first.wpilibj.hal.PortsJNI; -import edu.wpi.first.wpilibj.hal.RelayJNI; -import edu.wpi.first.wpilibj.hal.SolenoidJNI; +import edu.wpi.first.hal.AnalogJNI; +import edu.wpi.first.hal.ConstantsJNI; +import edu.wpi.first.hal.DIOJNI; +import edu.wpi.first.hal.PDPJNI; +import edu.wpi.first.hal.PWMJNI; +import edu.wpi.first.hal.PortsJNI; +import edu.wpi.first.hal.RelayJNI; +import edu.wpi.first.hal.SolenoidJNI; /** * Stores most recent status information as well as containing utility functions for checking diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/SerialPort.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/SerialPort.java index 7b3bfbd83d..019a490f50 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/SerialPort.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/SerialPort.java @@ -10,9 +10,9 @@ package edu.wpi.first.wpilibj; import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; -import edu.wpi.first.wpilibj.hal.SerialPortJNI; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; +import edu.wpi.first.hal.SerialPortJNI; /** * Driver for the RS-232 serial port on the roboRIO. diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Servo.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Servo.java index 5f8b88a1e8..1abe6bb7f5 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Servo.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Servo.java @@ -7,8 +7,8 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder; /** diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Solenoid.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Solenoid.java index fd886c6e09..014ec1028d 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Solenoid.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Solenoid.java @@ -7,9 +7,9 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; -import edu.wpi.first.wpilibj.hal.SolenoidJNI; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; +import edu.wpi.first.hal.SolenoidJNI; import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder; /** diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/SolenoidBase.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/SolenoidBase.java index ff70dcd40c..59c6c3d81f 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/SolenoidBase.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/SolenoidBase.java @@ -7,7 +7,7 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.SolenoidJNI; +import edu.wpi.first.hal.SolenoidJNI; /** * SolenoidBase class is the common base class for the {@link Solenoid} and {@link DoubleSolenoid} diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Spark.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Spark.java index 1deefe5476..aa7953ab9d 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Spark.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Spark.java @@ -7,8 +7,8 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; /** * REV Robotics SPARK Speed Controller. diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Talon.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Talon.java index 9e42a56c55..334d9e3257 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Talon.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Talon.java @@ -7,8 +7,8 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; /** * Cross the Road Electronics (CTRE) Talon and Talon SR Speed Controller. diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Threads.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Threads.java index 6a396a633a..7b49d4d109 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Threads.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Threads.java @@ -7,7 +7,7 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.ThreadsJNI; +import edu.wpi.first.hal.ThreadsJNI; public final class Threads { /** diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/TimedRobot.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/TimedRobot.java index 36f053e0e6..9575bf1d96 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/TimedRobot.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/TimedRobot.java @@ -7,10 +7,10 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tInstances; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; -import edu.wpi.first.wpilibj.hal.NotifierJNI; +import edu.wpi.first.hal.FRCNetComm.tInstances; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; +import edu.wpi.first.hal.NotifierJNI; /** * TimedRobot implements the IterativeRobotBase robot program framework. diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Ultrasonic.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Ultrasonic.java index a9ae6cb35d..72c26d6cd2 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Ultrasonic.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Ultrasonic.java @@ -7,8 +7,8 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder; import static java.util.Objects.requireNonNull; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Utility.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Utility.java index 26c9e691d1..47035b4680 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Utility.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Utility.java @@ -7,7 +7,7 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.HALUtil; +import edu.wpi.first.hal.HALUtil; /** * Contains global utility functions. diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Victor.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Victor.java index 886e07dbf8..b1aeeab178 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Victor.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Victor.java @@ -7,8 +7,8 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; /** * VEX Robotics Victor 888 Speed Controller The Vex Robotics Victor 884 Speed Controller can also diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/VictorSP.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/VictorSP.java index 88e6414b88..3de2a0a36b 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/VictorSP.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/VictorSP.java @@ -7,8 +7,8 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; /** * VEX Robotics Victor SP Speed Controller. diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/XboxController.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/XboxController.java index 99b9f9513e..79d80e6165 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/XboxController.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/XboxController.java @@ -7,8 +7,8 @@ package edu.wpi.first.wpilibj; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; /** * Handle input from Xbox 360 or Xbox One controllers connected to the Driver Station. diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/Scheduler.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/Scheduler.java index a384f7e239..8302e22330 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/Scheduler.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/Scheduler.java @@ -11,12 +11,12 @@ import java.util.Enumeration; import java.util.Hashtable; import java.util.Vector; +import edu.wpi.first.hal.FRCNetComm.tInstances; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; import edu.wpi.first.networktables.NetworkTableEntry; import edu.wpi.first.wpilibj.SendableBase; import edu.wpi.first.wpilibj.buttons.Trigger.ButtonScheduler; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tInstances; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder; /** diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/drive/DifferentialDrive.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/drive/DifferentialDrive.java index a9589ea8e0..102caaca1e 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/drive/DifferentialDrive.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/drive/DifferentialDrive.java @@ -7,11 +7,11 @@ package edu.wpi.first.wpilibj.drive; +import edu.wpi.first.hal.FRCNetComm.tInstances; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; import edu.wpi.first.wpilibj.SpeedController; import edu.wpi.first.wpilibj.SpeedControllerGroup; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tInstances; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder; /** diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/drive/KilloughDrive.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/drive/KilloughDrive.java index 876aef1585..5d00aa1b7f 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/drive/KilloughDrive.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/drive/KilloughDrive.java @@ -7,10 +7,10 @@ package edu.wpi.first.wpilibj.drive; +import edu.wpi.first.hal.FRCNetComm.tInstances; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; import edu.wpi.first.wpilibj.SpeedController; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tInstances; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder; /** diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/drive/MecanumDrive.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/drive/MecanumDrive.java index 7cdc31978c..a45657aacd 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/drive/MecanumDrive.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/drive/MecanumDrive.java @@ -7,10 +7,10 @@ package edu.wpi.first.wpilibj.drive; +import edu.wpi.first.hal.FRCNetComm.tInstances; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; import edu.wpi.first.wpilibj.SpeedController; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tInstances; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder; /** diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/filters/LinearDigitalFilter.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/filters/LinearDigitalFilter.java index 57ec9ee23d..65e84b5f78 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/filters/LinearDigitalFilter.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/filters/LinearDigitalFilter.java @@ -9,10 +9,10 @@ package edu.wpi.first.wpilibj.filters; import java.util.Arrays; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; import edu.wpi.first.wpilibj.CircularBuffer; import edu.wpi.first.wpilibj.PIDSource; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; /** * This class implements a linear, digital filter. All types of FIR and IIR filters are supported. diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/SmartDashboard.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/SmartDashboard.java index f52b48b58d..290fe331f1 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/SmartDashboard.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/SmartDashboard.java @@ -12,13 +12,13 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; import edu.wpi.first.networktables.NetworkTable; import edu.wpi.first.networktables.NetworkTableEntry; import edu.wpi.first.networktables.NetworkTableInstance; import edu.wpi.first.wpilibj.NamedSendable; import edu.wpi.first.wpilibj.Sendable; -import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; -import edu.wpi.first.wpilibj.hal.HAL; /** * The {@link SmartDashboard} class is the bridge between robot programs and the SmartDashboard on 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 2d9d460926..6990b50ab5 100644 --- a/wpilibj/src/test/java/edu/wpi/first/wpilibj/MockHardwareExtension.java +++ b/wpilibj/src/test/java/edu/wpi/first/wpilibj/MockHardwareExtension.java @@ -11,8 +11,8 @@ import org.junit.jupiter.api.extension.BeforeAllCallback; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ExtensionContext.Namespace; -import edu.wpi.first.wpilibj.hal.HAL; -import edu.wpi.first.wpilibj.sim.DriverStationSim; +import edu.wpi.first.hal.HAL; +import edu.wpi.first.hal.sim.DriverStationSim; public final class MockHardwareExtension implements BeforeAllCallback { private static ExtensionContext getRoot(ExtensionContext context) { diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/can/CANStatusTest.java b/wpilibj/src/test/java/edu/wpi/first/wpilibj/can/CANStatusTest.java index b1417c6dad..e804d0cad4 100644 --- a/wpilibj/src/test/java/edu/wpi/first/wpilibj/can/CANStatusTest.java +++ b/wpilibj/src/test/java/edu/wpi/first/wpilibj/can/CANStatusTest.java @@ -9,7 +9,9 @@ package edu.wpi.first.wpilibj.can; import org.junit.jupiter.api.Test; -import edu.wpi.first.wpilibj.hal.HAL; +import edu.wpi.first.hal.HAL; +import edu.wpi.first.hal.can.CANJNI; +import edu.wpi.first.hal.can.CANStatus; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/hal/JNITest.java b/wpilibj/src/test/java/edu/wpi/first/wpilibj/hal/JNITest.java index f214a78727..f70f3f8360 100644 --- a/wpilibj/src/test/java/edu/wpi/first/wpilibj/hal/JNITest.java +++ b/wpilibj/src/test/java/edu/wpi/first/wpilibj/hal/JNITest.java @@ -9,6 +9,8 @@ package edu.wpi.first.wpilibj.hal; import org.junit.jupiter.api.Test; +import edu.wpi.first.hal.HAL; +import edu.wpi.first.hal.HALUtil; import edu.wpi.first.networktables.NetworkTablesJNI; class JNITest { 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 8b082c93a6..98b8489ea2 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 @@ -9,6 +9,8 @@ package edu.wpi.first.wpilibj.hal; 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.wpilibj.DriverStation.MatchType; diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/sim/AnalogInputSimTest.java b/wpilibj/src/test/java/edu/wpi/first/wpilibj/sim/AnalogInputSimTest.java index 7eb7c809a0..b739a92104 100644 --- a/wpilibj/src/test/java/edu/wpi/first/wpilibj/sim/AnalogInputSimTest.java +++ b/wpilibj/src/test/java/edu/wpi/first/wpilibj/sim/AnalogInputSimTest.java @@ -10,7 +10,8 @@ package edu.wpi.first.wpilibj.sim; import org.junit.jupiter.api.Test; import edu.wpi.first.wpilibj.AnalogInput; -import edu.wpi.first.wpilibj.hal.HAL; +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/sim/AnalogOutputSimTest.java index 8d85ad93f6..258b2538c0 100644 --- a/wpilibj/src/test/java/edu/wpi/first/wpilibj/sim/AnalogOutputSimTest.java +++ b/wpilibj/src/test/java/edu/wpi/first/wpilibj/sim/AnalogOutputSimTest.java @@ -8,7 +8,9 @@ package edu.wpi.first.wpilibj.sim; import edu.wpi.first.wpilibj.AnalogOutput; -import edu.wpi.first.wpilibj.hal.HAL; +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/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/PDPTest.java b/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/PDPTest.java index 3d3bc571eb..7c49f810a5 100644 --- a/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/PDPTest.java +++ b/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/PDPTest.java @@ -19,7 +19,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -import edu.wpi.first.wpilibj.can.CANMessageNotFoundException; +import edu.wpi.first.hal.can.CANMessageNotFoundException; import edu.wpi.first.wpilibj.fixtures.MotorEncoderFixture; import edu.wpi.first.wpilibj.test.AbstractComsSetup; import edu.wpi.first.wpilibj.test.TestBench; diff --git a/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/can/CANStatusTest.java b/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/can/CANStatusTest.java index c501ebca06..6aa6c8e2ae 100644 --- a/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/can/CANStatusTest.java +++ b/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/can/CANStatusTest.java @@ -9,6 +9,9 @@ package edu.wpi.first.wpilibj.can; import org.junit.Test; +import edu.wpi.first.hal.can.CANJNI; +import edu.wpi.first.hal.can.CANStatus; + public class CANStatusTest { @Test public void canStatusGetDoesntThrow() { diff --git a/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/test/AbstractComsSetup.java b/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/test/AbstractComsSetup.java index e089f7dff7..28f4d2b0fe 100644 --- a/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/test/AbstractComsSetup.java +++ b/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/test/AbstractComsSetup.java @@ -16,10 +16,10 @@ import org.junit.rules.TestWatcher; import org.junit.runner.Description; import org.junit.runners.model.MultipleFailureException; +import edu.wpi.first.hal.HAL; import edu.wpi.first.wpilibj.DriverStation; import edu.wpi.first.wpilibj.MockDS; import edu.wpi.first.wpilibj.Timer; -import edu.wpi.first.wpilibj.hal.HAL; import edu.wpi.first.wpilibj.livewindow.LiveWindow; /**