Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-23 01:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix usage reporting indices (#2009)

Browse Source 
According to NI, 0 is unspecified, and all the indices need to be
index + 1, so the first index becomes 1.
This commit is contained in:
Thad House
2019-10-29 21:34:10 -07:00
committed by Peter Johnson
parent f6b844ea30
commit 9dc30797e4
74 changed files with 95 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL362.java
View File

@@ -129,7 +129,7 @@ public class ADXL362 implements Accelerometer, Sendable, AutoCloseable {
transferBuffer.put(2, (byte) (kPowerCtl_Measure | kPowerCtl_UltraLowNoise));
m_spi.write(transferBuffer, 3);
HAL.report(tResourceType.kResourceType_ADXL362, port.value);
HAL.report(tResourceType.kResourceType_ADXL362, port.value + 1);
SendableRegistry.addLW(this, "ADXL362", port.value);
}

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXRS450_Gyro.java
View File

@@ -95,7 +95,7 @@ public class ADXRS450_Gyro extends GyroBase implements Gyro, PIDSource, Sendable
calibrate();
}
HAL.report(tResourceType.kResourceType_ADXRS450, port.value);
HAL.report(tResourceType.kResourceType_ADXRS450, port.value + 1);
SendableRegistry.addLW(this, "ADXRS450_Gyro", port.value);
}

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogAccelerometer.java
View File

@@ -31,7 +31,7 @@ public class AnalogAccelerometer implements PIDSource, Sendable, AutoCloseable {
*/
private void initAccelerometer() {
HAL.report(tResourceType.kResourceType_Accelerometer,
m_analogChannel.getChannel());
m_analogChannel.getChannel() + 1);
SendableRegistry.addLW(this, "Accelerometer", m_analogChannel.getChannel());
}

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogGyro.java
View File

@@ -41,7 +41,7 @@ public class AnalogGyro extends GyroBase implements Gyro, PIDSource, Sendable, A
AnalogGyroJNI.setupAnalogGyro(m_gyroHandle);
HAL.report(tResourceType.kResourceType_Gyro, m_analog.getChannel());
HAL.report(tResourceType.kResourceType_Gyro, m_analog.getChannel() + 1);
SendableRegistry.addLW(this, "AnalogGyro", m_analog.getChannel());
}

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogInput.java
View File

@@ -49,7 +49,7 @@ public class AnalogInput implements PIDSource, Sendable, AutoCloseable {
final int portHandle = HAL.getPort((byte) channel);
m_port = AnalogJNI.initializeAnalogInputPort(portHandle);
HAL.report(tResourceType.kResourceType_AnalogChannel, channel);
HAL.report(tResourceType.kResourceType_AnalogChannel, channel + 1);
SendableRegistry.addLW(this, "AnalogInput", channel);
}

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogOutput.java
View File

@@ -33,7 +33,7 @@ public class AnalogOutput implements Sendable, AutoCloseable {
final int portHandle = HAL.getPort((byte) channel);
m_port = AnalogJNI.initializeAnalogOutputPort(portHandle);
HAL.report(tResourceType.kResourceType_AnalogOutput, channel);
HAL.report(tResourceType.kResourceType_AnalogOutput, channel + 1);
SendableRegistry.addLW(this, "AnalogOutput", channel);
}

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogTrigger.java
View File

@@ -72,7 +72,7 @@ public class AnalogTrigger implements Sendable, AutoCloseable {
AnalogJNI.initializeAnalogTrigger(channel.m_port, index.asIntBuffer());
m_index = index.asIntBuffer().get(0);
HAL.report(tResourceType.kResourceType_AnalogTrigger, channel.getChannel());
HAL.report(tResourceType.kResourceType_AnalogTrigger, m_index + 1);
SendableRegistry.addLW(this, "AnalogTrigger", channel.getChannel());
}

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogTriggerOutput.java
View File

@@ -74,7 +74,7 @@ public class AnalogTriggerOutput extends DigitalSource implements Sendable {
m_trigger = trigger;
m_outputType = outputType;
HAL.report(tResourceType.kResourceType_AnalogTriggerOutput,
trigger.getIndex(), outputType.value);
trigger.getIndex() + 1, outputType.value + 1);
}
/**

4
wpilibj/src/main/java/edu/wpi/first/wpilibj/CAN.java
View File

@@ -40,7 +40,7 @@ public class CAN implements Closeable {
*/
public CAN(int deviceId) {
m_handle = CANAPIJNI.initializeCAN(kTeamManufacturer, deviceId, kTeamDeviceType);
HAL.report(tResourceType.kResourceType_CAN, deviceId);
HAL.report(tResourceType.kResourceType_CAN, deviceId + 1);
}
/**
@@ -54,7 +54,7 @@ public class CAN implements Closeable {
*/
public CAN(int deviceId, int deviceManufacturer, int deviceType) {
m_handle = CANAPIJNI.initializeCAN(deviceManufacturer, deviceId, deviceType);
HAL.report(tResourceType.kResourceType_CAN, deviceId);
HAL.report(tResourceType.kResourceType_CAN, deviceId + 1);
}
/**

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/Compressor.java
View File

@@ -39,7 +39,7 @@ public class Compressor implements Sendable, AutoCloseable {
m_compressorHandle = CompressorJNI.initializeCompressor((byte) module);
HAL.report(tResourceType.kResourceType_Compressor, module);
HAL.report(tResourceType.kResourceType_Compressor, module + 1);
SendableRegistry.addLW(this, "Compressor", module);
}

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/Counter.java
View File

@@ -86,7 +86,7 @@ public class Counter implements CounterBase, PIDSource, Sendable, AutoCloseable
setMaxPeriod(.5);
HAL.report(tResourceType.kResourceType_Counter, m_index, mode.value);
HAL.report(tResourceType.kResourceType_Counter, m_index + 1, mode.value + 1);
SendableRegistry.addLW(this, "Counter", m_index);
}

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/DMC60.java
View File

@@ -39,7 +39,7 @@ public class DMC60 extends PWMSpeedController {
setSpeed(0.0);
setZeroLatch();
HAL.report(tResourceType.kResourceType_DigilentDMC60, getChannel());
HAL.report(tResourceType.kResourceType_DigilentDMC60, getChannel() + 1);
SendableRegistry.setName(this, "DMC60", getChannel());
}
}

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/DigitalGlitchFilter.java
View File

@@ -35,7 +35,7 @@ public class DigitalGlitchFilter implements Sendable, AutoCloseable {
m_channelIndex = index;
m_filterAllocated[index] = true;
HAL.report(tResourceType.kResourceType_DigitalGlitchFilter,
m_channelIndex, 0);
m_channelIndex + 1, 0);
SendableRegistry.addLW(this, "DigitalGlitchFilter", index);
}
}

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/DigitalInput.java
View File

@@ -35,7 +35,7 @@ public class DigitalInput extends DigitalSource implements Sendable, AutoCloseab
m_handle = DIOJNI.initializeDIOPort(HAL.getPort((byte) channel), true);
HAL.report(tResourceType.kResourceType_DigitalInput, channel);
HAL.report(tResourceType.kResourceType_DigitalInput, channel + 1);
SendableRegistry.addLW(this, "DigitalInput", channel);
}

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/DigitalOutput.java
View File

@@ -38,7 +38,7 @@ public class DigitalOutput implements Sendable, AutoCloseable {
m_handle = DIOJNI.initializeDIOPort(HAL.getPort((byte) channel), false);
HAL.report(tResourceType.kResourceType_DigitalOutput, channel);
HAL.report(tResourceType.kResourceType_DigitalOutput, channel + 1);
SendableRegistry.addLW(this, "DigitalOutput", channel);
}

8
wpilibj/src/main/java/edu/wpi/first/wpilibj/DoubleSolenoid.java
View File

@@ -77,10 +77,10 @@ public class DoubleSolenoid extends SolenoidBase implements Sendable, AutoClosea
m_forwardMask = (byte) (1 << forwardChannel);
m_reverseMask = (byte) (1 << reverseChannel);
HAL.report(tResourceType.kResourceType_Solenoid, forwardChannel,
m_moduleNumber);
HAL.report(tResourceType.kResourceType_Solenoid, reverseChannel,
m_moduleNumber);
HAL.report(tResourceType.kResourceType_Solenoid, forwardChannel + 1,
m_moduleNumber + 1);
HAL.report(tResourceType.kResourceType_Solenoid, reverseChannel + 1,
m_moduleNumber + 1);
SendableRegistry.addLW(this, "DoubleSolenoid", m_moduleNumber, forwardChannel);
}

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/Encoder.java
View File

@@ -80,7 +80,7 @@ public class Encoder implements CounterBase, PIDSource, Sendable, AutoCloseable
m_pidSource = PIDSourceType.kDisplacement;
int fpgaIndex = getFPGAIndex();
HAL.report(tResourceType.kResourceType_Encoder, fpgaIndex, type.value);
HAL.report(tResourceType.kResourceType_Encoder, fpgaIndex + 1, type.value + 1);
SendableRegistry.addLW(this, "Encoder", fpgaIndex);
}

8
wpilibj/src/main/java/edu/wpi/first/wpilibj/GearTooth.java
View File

@@ -56,9 +56,9 @@ public class GearTooth extends Counter {
super(channel);
enableDirectionSensing(directionSensitive);
if (directionSensitive) {
HAL.report(tResourceType.kResourceType_GearTooth, channel, 0, "D");
HAL.report(tResourceType.kResourceType_GearTooth, channel + 1, 0, "D");
} else {
HAL.report(tResourceType.kResourceType_GearTooth, channel, 0);
HAL.report(tResourceType.kResourceType_GearTooth, channel + 1, 0);
}
SendableRegistry.setName(this, "GearTooth", channel);
}
@@ -75,9 +75,9 @@ public class GearTooth extends Counter {
super(source);
enableDirectionSensing(directionSensitive);
if (directionSensitive) {
HAL.report(tResourceType.kResourceType_GearTooth, source.getChannel(), 0, "D");
HAL.report(tResourceType.kResourceType_GearTooth, source.getChannel() + 1, 0, "D");
} else {
HAL.report(tResourceType.kResourceType_GearTooth, source.getChannel(), 0);
HAL.report(tResourceType.kResourceType_GearTooth, source.getChannel() + 1, 0);
}
SendableRegistry.setName(this, "GearTooth", source.getChannel());
}

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/Jaguar.java
View File

@@ -37,7 +37,7 @@ public class Jaguar extends PWMSpeedController {
setSpeed(0.0);
setZeroLatch();
HAL.report(tResourceType.kResourceType_Jaguar, getChannel());
HAL.report(tResourceType.kResourceType_Jaguar, getChannel() + 1);
SendableRegistry.setName(this, "Jaguar", getChannel());
}
}

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/Joystick.java
View File

@@ -97,7 +97,7 @@ public class Joystick extends GenericHID {
m_axes[Axis.kTwist.value] = kDefaultTwistChannel;
m_axes[Axis.kThrottle.value] = kDefaultThrottleChannel;
HAL.report(tResourceType.kResourceType_Joystick, port);
HAL.report(tResourceType.kResourceType_Joystick, port + 1);
}
/**

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/NidecBrushless.java
View File

@@ -44,7 +44,7 @@ public class NidecBrushless extends MotorSafety implements SpeedController, Send
m_pwm = new PWM(pwmChannel);
SendableRegistry.addChild(this, m_pwm);
HAL.report(tResourceType.kResourceType_NidecBrushless, pwmChannel);
HAL.report(tResourceType.kResourceType_NidecBrushless, pwmChannel + 1);
SendableRegistry.addLW(this, "Nidec Brushless", pwmChannel);
}

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/PWM.java
View File

@@ -63,7 +63,7 @@ public class PWM extends MotorSafety implements Sendable, AutoCloseable {
PWMJNI.setPWMEliminateDeadband(m_handle, false);
HAL.report(tResourceType.kResourceType_PWM, channel);
HAL.report(tResourceType.kResourceType_PWM, channel + 1);
SendableRegistry.addLW(this, "PWM", channel);
setSafetyEnabled(false);

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/PWMSparkMax.java
View File

@@ -36,7 +36,7 @@ public class PWMSparkMax extends PWMSpeedController {
setSpeed(0.0);
setZeroLatch();
HAL.report(tResourceType.kResourceType_RevSparkMaxPWM, getChannel());
HAL.report(tResourceType.kResourceType_RevSparkMaxPWM, getChannel() + 1);
SendableRegistry.setName(this, "PWMSparkMax", getChannel());
}
}

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/PWMTalonSRX.java
View File

@@ -40,7 +40,7 @@ public class PWMTalonSRX extends PWMSpeedController {
setSpeed(0.0);
setZeroLatch();
HAL.report(tResourceType.kResourceType_PWMTalonSRX, getChannel());
HAL.report(tResourceType.kResourceType_PWMTalonSRX, getChannel() + 1);
SendableRegistry.setName(this, "PWMTalonSRX", getChannel());
}
}

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/PWMVictorSPX.java
View File

@@ -40,7 +40,7 @@ public class PWMVictorSPX extends PWMSpeedController {
setSpeed(0.0);
setZeroLatch();
HAL.report(tResourceType.kResourceType_PWMVictorSPX, getChannel());
HAL.report(tResourceType.kResourceType_PWMVictorSPX, getChannel() + 1);
SendableRegistry.setName(this, "PWMVictorSPX", getChannel());
}
}

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/PowerDistributionPanel.java
View File

@@ -29,7 +29,7 @@ public class PowerDistributionPanel implements Sendable, AutoCloseable {
SensorUtil.checkPDPModule(module);
m_handle = PDPJNI.initializePDP(module);
HAL.report(tResourceType.kResourceType_PDP, module);
HAL.report(tResourceType.kResourceType_PDP, module + 1);
SendableRegistry.addLW(this, "PowerDistributionPanel", module);
}

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/Relay.java
View File

@@ -105,7 +105,7 @@ public class Relay extends MotorSafety implements Sendable, AutoCloseable {
int portHandle = HAL.getPort((byte) m_channel);
if (m_direction == Direction.kBoth || m_direction == Direction.kForward) {
m_forwardHandle = RelayJNI.initializeRelayPort(portHandle, true);
HAL.report(tResourceType.kResourceType_Relay, m_channel);
HAL.report(tResourceType.kResourceType_Relay, m_channel + 1);
}
if (m_direction == Direction.kBoth || m_direction == Direction.kReverse) {
m_reverseHandle = RelayJNI.initializeRelayPort(portHandle, false);

6
wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java
View File

@@ -45,12 +45,12 @@ public abstract class RobotBase implements AutoCloseable {
@Override
public void reportVideoServer(int id) {
HAL.report(tResourceType.kResourceType_PCVideoServer, id);
HAL.report(tResourceType.kResourceType_PCVideoServer, id + 1);
}
@Override
public void reportUsbCamera(int id) {
HAL.report(tResourceType.kResourceType_UsbCamera, id);
HAL.report(tResourceType.kResourceType_UsbCamera, id + 1);
}
@Override
@@ -60,7 +60,7 @@ public abstract class RobotBase implements AutoCloseable {
@Override
public void reportAxisCamera(int id) {
HAL.report(tResourceType.kResourceType_AxisCamera, id);
HAL.report(tResourceType.kResourceType_AxisCamera, id + 1);
}
@Override

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/SD540.java
View File

@@ -34,7 +34,7 @@ public class SD540 extends PWMSpeedController {
setSpeed(0.0);
setZeroLatch();
HAL.report(tResourceType.kResourceType_MindsensorsSD540, getChannel());
HAL.report(tResourceType.kResourceType_MindsensorsSD540, getChannel() + 1);
SendableRegistry.setName(this, "SD540", getChannel());
}

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/SPI.java
View File

@@ -47,7 +47,7 @@ public class SPI implements AutoCloseable {
SPIJNI.spiInitialize(m_port);
HAL.report(tResourceType.kResourceType_SPI, port.value);
HAL.report(tResourceType.kResourceType_SPI, port.value + 1);
}
@Override

4
wpilibj/src/main/java/edu/wpi/first/wpilibj/SerialPort.java
View File

@@ -120,7 +120,7 @@ public class SerialPort implements AutoCloseable {
disableTermination();
HAL.report(tResourceType.kResourceType_SerialPort, 0);
HAL.report(tResourceType.kResourceType_SerialPort, port.value + 1);
}
/**
@@ -151,7 +151,7 @@ public class SerialPort implements AutoCloseable {
disableTermination();
HAL.report(tResourceType.kResourceType_SerialPort, 0);
HAL.report(tResourceType.kResourceType_SerialPort, port.value + 1);
}
/**

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/Servo.java
View File

@@ -39,7 +39,7 @@ public class Servo extends PWM {
setBounds(kDefaultMaxServoPWM, 0, 0, 0, kDefaultMinServoPWM);
setPeriodMultiplier(PeriodMultiplier.k4X);
HAL.report(tResourceType.kResourceType_Servo, getChannel());
HAL.report(tResourceType.kResourceType_Servo, getChannel() + 1);
SendableRegistry.setName(this, "Servo", getChannel());
}

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/Solenoid.java
View File

@@ -48,7 +48,7 @@ public class Solenoid extends SolenoidBase implements Sendable, AutoCloseable {
int portHandle = HAL.getPortWithModule((byte) m_moduleNumber, (byte) m_channel);
m_solenoidHandle = SolenoidJNI.initializeSolenoidPort(portHandle);
HAL.report(tResourceType.kResourceType_Solenoid, m_channel, m_moduleNumber);
HAL.report(tResourceType.kResourceType_Solenoid, m_channel + 1, m_moduleNumber + 1);
SendableRegistry.addLW(this, "Solenoid", m_moduleNumber, m_channel);
}

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/Spark.java
View File

@@ -34,7 +34,7 @@ public class Spark extends PWMSpeedController {
setSpeed(0.0);
setZeroLatch();
HAL.report(tResourceType.kResourceType_RevSPARK, getChannel());
HAL.report(tResourceType.kResourceType_RevSPARK, getChannel() + 1);
SendableRegistry.setName(this, "Spark", getChannel());
}

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/Talon.java
View File

@@ -39,7 +39,7 @@ public class Talon extends PWMSpeedController {
setSpeed(0.0);
setZeroLatch();
HAL.report(tResourceType.kResourceType_Talon, getChannel());
HAL.report(tResourceType.kResourceType_Talon, getChannel() + 1);
SendableRegistry.setName(this, "Talon", getChannel());
}
}

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/Victor.java
View File

@@ -41,7 +41,7 @@ public class Victor extends PWMSpeedController {
setSpeed(0.0);
setZeroLatch();
HAL.report(tResourceType.kResourceType_Victor, getChannel());
HAL.report(tResourceType.kResourceType_Victor, getChannel() + 1);
SendableRegistry.setName(this, "Victor", getChannel());
}
}

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/VictorSP.java
View File

@@ -39,7 +39,7 @@ public class VictorSP extends PWMSpeedController {
setSpeed(0.0);
setZeroLatch();
HAL.report(tResourceType.kResourceType_VictorSP, getChannel());
HAL.report(tResourceType.kResourceType_VictorSP, getChannel() + 1);
SendableRegistry.setName(this, "VictorSP", getChannel());
}
}

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/XboxController.java
View File

@@ -50,7 +50,7 @@ public class XboxController extends GenericHID {
public XboxController(final int port) {
super(port);
HAL.report(tResourceType.kResourceType_XboxController, port);
HAL.report(tResourceType.kResourceType_XboxController, port + 1);
}
/**