From f21e4a9da528f714f29358c2147053ad91d6ade4 Mon Sep 17 00:00:00 2001 From: Thomas Clark Date: Thu, 8 Jan 2015 00:31:36 -0500 Subject: [PATCH] Miscellaneous AnalogTrigger fixes AnalogTrigger.createOutput is now public. It was mistakenly made package local before. The AnalogTriggerType enum now uses the same naming convension as other enumerations in WPILib. There's no way that this breaks existing code, since AnalogTrigger.createOutput wasn't public before this commit. Change-Id: I9a2b921a996012f61dac0e395602f8cc429d7611 --- .../java/edu/wpi/first/wpilibj/AnalogTrigger.java | 11 ++++++----- .../edu/wpi/first/wpilibj/AnalogTriggerOutput.java | 12 ++++++------ .../src/main/java/edu/wpi/first/wpilibj/Counter.java | 2 +- .../wpi/first/wpilibj/AnalogCrossConnectTest.java | 2 +- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/AnalogTrigger.java b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/AnalogTrigger.java index 79c23149b4..3fa915ca2b 100644 --- a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/AnalogTrigger.java +++ b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/AnalogTrigger.java @@ -7,16 +7,17 @@ package edu.wpi.first.wpilibj; -import java.nio.ByteBuffer; -import java.nio.IntBuffer; - +import edu.wpi.first.wpilibj.AnalogTriggerOutput.AnalogTriggerType; import edu.wpi.first.wpilibj.communication.FRCNetworkCommunicationsLibrary.tResourceType; import edu.wpi.first.wpilibj.communication.UsageReporting; import edu.wpi.first.wpilibj.hal.AnalogJNI; import edu.wpi.first.wpilibj.hal.HALUtil; import edu.wpi.first.wpilibj.util.BoundaryException; + +import java.nio.ByteBuffer; +import java.nio.IntBuffer; + //import com.sun.jna.Pointer; -import edu.wpi.first.wpilibj.AnalogTriggerOutput.AnalogTriggerType; /** * Class for creating and configuring Analog Triggers @@ -217,7 +218,7 @@ public class AnalogTrigger { * An enum of the type of output object to create. * @return A pointer to a new AnalogTriggerOutput object. */ - AnalogTriggerOutput createOutput(AnalogTriggerType type) { + public AnalogTriggerOutput createOutput(AnalogTriggerType type) { return new AnalogTriggerOutput(this, type); } } diff --git a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/AnalogTriggerOutput.java b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/AnalogTriggerOutput.java index b79c1820f5..3c9a431a61 100644 --- a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/AnalogTriggerOutput.java +++ b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/AnalogTriggerOutput.java @@ -7,13 +7,13 @@ package edu.wpi.first.wpilibj; -import java.nio.IntBuffer; - import edu.wpi.first.wpilibj.communication.FRCNetworkCommunicationsLibrary.tResourceType; import edu.wpi.first.wpilibj.communication.UsageReporting; import edu.wpi.first.wpilibj.hal.AnalogJNI; import edu.wpi.first.wpilibj.hal.HALUtil; +import java.nio.IntBuffer; + /** * Class to represent a specific output from an analog trigger. This class is * used to get the current output value and also as a DigitalSource to provide @@ -128,10 +128,10 @@ public class AnalogTriggerOutput extends DigitalSource { * @author jonathanleitschuh */ public enum AnalogTriggerType{ - IN_WINDOW(AnalogJNI.AnalogTriggerType.kInWindow), - STATE(AnalogJNI.AnalogTriggerType.kState), - RISING_PULSE(AnalogJNI.AnalogTriggerType.kRisingPulse), - FALLING_PULSE(AnalogJNI.AnalogTriggerType.kFallingPulse); + kInWindow(AnalogJNI.AnalogTriggerType.kInWindow), + kState(AnalogJNI.AnalogTriggerType.kState), + kRisingPulse(AnalogJNI.AnalogTriggerType.kRisingPulse), + kFallingPulse(AnalogJNI.AnalogTriggerType.kFallingPulse); private final int value; diff --git a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/Counter.java b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/Counter.java index ffb895d6cc..6331806e53 100644 --- a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/Counter.java +++ b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/Counter.java @@ -196,7 +196,7 @@ public class Counter extends SensorBase implements CounterBase, throw new NullPointerException("The Analog Trigger given was null"); } initCounter(Mode.kTwoPulse); - setUpSource(trigger.createOutput(AnalogTriggerType.STATE)); + setUpSource(trigger.createOutput(AnalogTriggerType.kState)); } @Override diff --git a/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/AnalogCrossConnectTest.java b/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/AnalogCrossConnectTest.java index 9ad2ae14c1..89c82f05ea 100644 --- a/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/AnalogCrossConnectTest.java +++ b/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/AnalogCrossConnectTest.java @@ -165,7 +165,7 @@ public class AnalogCrossConnectTest extends AbstractInterruptTest { InterruptableSensorBase giveInterruptableSensorBase() { interruptTrigger = new AnalogTrigger(analogIO.getInput()); interruptTrigger.setLimitsVoltage(2.0f, 3.0f); - interruptTriggerOutput = new AnalogTriggerOutput(interruptTrigger, AnalogTriggerType.STATE); + interruptTriggerOutput = new AnalogTriggerOutput(interruptTrigger, AnalogTriggerType.kState); return interruptTriggerOutput; }