diff --git a/wpilibc/src/main/native/cpp/ADXL362.cpp b/wpilibc/src/main/native/cpp/ADXL362.cpp index 2f97f1b2c7..7543c22a4c 100644 --- a/wpilibc/src/main/native/cpp/ADXL362.cpp +++ b/wpilibc/src/main/native/cpp/ADXL362.cpp @@ -72,7 +72,7 @@ ADXL362::ADXL362(SPI::Port port, Range range) commands[2] = kPowerCtl_Measure | kPowerCtl_UltraLowNoise; m_spi.Write(commands, 3); - HAL_Report(HALUsageReporting::kResourceType_ADXL362, port); + HAL_Report(HALUsageReporting::kResourceType_ADXL362, port + 1); SendableRegistry::GetInstance().AddLW(this, "ADXL362", port); } diff --git a/wpilibc/src/main/native/cpp/ADXRS450_Gyro.cpp b/wpilibc/src/main/native/cpp/ADXRS450_Gyro.cpp index 3dde23425e..b6a1d1d5e9 100644 --- a/wpilibc/src/main/native/cpp/ADXRS450_Gyro.cpp +++ b/wpilibc/src/main/native/cpp/ADXRS450_Gyro.cpp @@ -57,7 +57,7 @@ ADXRS450_Gyro::ADXRS450_Gyro(SPI::Port port) Calibrate(); } - HAL_Report(HALUsageReporting::kResourceType_ADXRS450, port); + HAL_Report(HALUsageReporting::kResourceType_ADXRS450, port + 1); SendableRegistry::GetInstance().AddLW(this, "ADXRS450_Gyro", port); } diff --git a/wpilibc/src/main/native/cpp/AnalogAccelerometer.cpp b/wpilibc/src/main/native/cpp/AnalogAccelerometer.cpp index 4436bcf746..b07737809e 100644 --- a/wpilibc/src/main/native/cpp/AnalogAccelerometer.cpp +++ b/wpilibc/src/main/native/cpp/AnalogAccelerometer.cpp @@ -58,7 +58,7 @@ void AnalogAccelerometer::InitSendable(SendableBuilder& builder) { void AnalogAccelerometer::InitAccelerometer() { HAL_Report(HALUsageReporting::kResourceType_Accelerometer, - m_analogInput->GetChannel()); + m_analogInput->GetChannel() + 1); SendableRegistry::GetInstance().AddLW(this, "Accelerometer", m_analogInput->GetChannel()); diff --git a/wpilibc/src/main/native/cpp/AnalogGyro.cpp b/wpilibc/src/main/native/cpp/AnalogGyro.cpp index 36cde8a13b..4fdcb340e2 100644 --- a/wpilibc/src/main/native/cpp/AnalogGyro.cpp +++ b/wpilibc/src/main/native/cpp/AnalogGyro.cpp @@ -148,7 +148,7 @@ void AnalogGyro::InitGyro() { return; } - HAL_Report(HALUsageReporting::kResourceType_Gyro, m_analog->GetChannel()); + HAL_Report(HALUsageReporting::kResourceType_Gyro, m_analog->GetChannel() + 1); SendableRegistry::GetInstance().AddLW(this, "AnalogGyro", m_analog->GetChannel()); diff --git a/wpilibc/src/main/native/cpp/AnalogInput.cpp b/wpilibc/src/main/native/cpp/AnalogInput.cpp index a200f4d947..8217be12bc 100644 --- a/wpilibc/src/main/native/cpp/AnalogInput.cpp +++ b/wpilibc/src/main/native/cpp/AnalogInput.cpp @@ -42,7 +42,7 @@ AnalogInput::AnalogInput(int channel) { return; } - HAL_Report(HALUsageReporting::kResourceType_AnalogChannel, channel); + HAL_Report(HALUsageReporting::kResourceType_AnalogChannel, channel + 1); SendableRegistry::GetInstance().AddLW(this, "AnalogInput", channel); } diff --git a/wpilibc/src/main/native/cpp/AnalogOutput.cpp b/wpilibc/src/main/native/cpp/AnalogOutput.cpp index 5e56efca94..08e2c0d8f2 100644 --- a/wpilibc/src/main/native/cpp/AnalogOutput.cpp +++ b/wpilibc/src/main/native/cpp/AnalogOutput.cpp @@ -42,7 +42,7 @@ AnalogOutput::AnalogOutput(int channel) { return; } - HAL_Report(HALUsageReporting::kResourceType_AnalogOutput, m_channel); + HAL_Report(HALUsageReporting::kResourceType_AnalogOutput, m_channel + 1); SendableRegistry::GetInstance().AddLW(this, "AnalogOutput", m_channel); } diff --git a/wpilibc/src/main/native/cpp/AnalogTrigger.cpp b/wpilibc/src/main/native/cpp/AnalogTrigger.cpp index 60ce04a53c..42fe3706fb 100644 --- a/wpilibc/src/main/native/cpp/AnalogTrigger.cpp +++ b/wpilibc/src/main/native/cpp/AnalogTrigger.cpp @@ -36,7 +36,7 @@ AnalogTrigger::AnalogTrigger(AnalogInput* input) { } m_index = index; - HAL_Report(HALUsageReporting::kResourceType_AnalogTrigger, input->m_channel); + HAL_Report(HALUsageReporting::kResourceType_AnalogTrigger, m_index + 1); SendableRegistry::GetInstance().AddLW(this, "AnalogTrigger", input->GetChannel()); } diff --git a/wpilibc/src/main/native/cpp/AnalogTriggerOutput.cpp b/wpilibc/src/main/native/cpp/AnalogTriggerOutput.cpp index c2c7265402..5dc30339ee 100644 --- a/wpilibc/src/main/native/cpp/AnalogTriggerOutput.cpp +++ b/wpilibc/src/main/native/cpp/AnalogTriggerOutput.cpp @@ -41,5 +41,5 @@ AnalogTriggerOutput::AnalogTriggerOutput(const AnalogTrigger& trigger, AnalogTriggerType outputType) : m_trigger(&trigger), m_outputType(outputType) { HAL_Report(HALUsageReporting::kResourceType_AnalogTriggerOutput, - trigger.GetIndex(), static_cast(outputType)); + trigger.GetIndex() + 1, static_cast(outputType) + 1); } diff --git a/wpilibc/src/main/native/cpp/CAN.cpp b/wpilibc/src/main/native/cpp/CAN.cpp index 35a926a3af..a1f394d145 100644 --- a/wpilibc/src/main/native/cpp/CAN.cpp +++ b/wpilibc/src/main/native/cpp/CAN.cpp @@ -27,7 +27,7 @@ CAN::CAN(int deviceId) { return; } - HAL_Report(HALUsageReporting::kResourceType_CAN, deviceId); + HAL_Report(HALUsageReporting::kResourceType_CAN, deviceId + 1); } CAN::CAN(int deviceId, int deviceManufacturer, int deviceType) { @@ -41,7 +41,7 @@ CAN::CAN(int deviceId, int deviceManufacturer, int deviceType) { return; } - HAL_Report(HALUsageReporting::kResourceType_CAN, deviceId); + HAL_Report(HALUsageReporting::kResourceType_CAN, deviceId + 1); } CAN::~CAN() { diff --git a/wpilibc/src/main/native/cpp/Compressor.cpp b/wpilibc/src/main/native/cpp/Compressor.cpp index 10d75f11da..7a49461f85 100644 --- a/wpilibc/src/main/native/cpp/Compressor.cpp +++ b/wpilibc/src/main/native/cpp/Compressor.cpp @@ -28,7 +28,7 @@ Compressor::Compressor(int pcmID) : m_module(pcmID) { } SetClosedLoopControl(true); - HAL_Report(HALUsageReporting::kResourceType_Compressor, pcmID); + HAL_Report(HALUsageReporting::kResourceType_Compressor, pcmID + 1); SendableRegistry::GetInstance().AddLW(this, "Compressor", pcmID); } diff --git a/wpilibc/src/main/native/cpp/Counter.cpp b/wpilibc/src/main/native/cpp/Counter.cpp index 1ef40fd7ad..e6e6fe4d22 100644 --- a/wpilibc/src/main/native/cpp/Counter.cpp +++ b/wpilibc/src/main/native/cpp/Counter.cpp @@ -26,7 +26,7 @@ Counter::Counter(Mode mode) { SetMaxPeriod(.5); - HAL_Report(HALUsageReporting::kResourceType_Counter, m_index, mode); + HAL_Report(HALUsageReporting::kResourceType_Counter, m_index + 1, mode + 1); SendableRegistry::GetInstance().AddLW(this, "Counter", m_index); } diff --git a/wpilibc/src/main/native/cpp/DMC60.cpp b/wpilibc/src/main/native/cpp/DMC60.cpp index d61bd400f4..1244724787 100644 --- a/wpilibc/src/main/native/cpp/DMC60.cpp +++ b/wpilibc/src/main/native/cpp/DMC60.cpp @@ -33,6 +33,6 @@ DMC60::DMC60(int channel) : PWMSpeedController(channel) { SetSpeed(0.0); SetZeroLatch(); - HAL_Report(HALUsageReporting::kResourceType_DigilentDMC60, GetChannel()); + HAL_Report(HALUsageReporting::kResourceType_DigilentDMC60, GetChannel() + 1); SendableRegistry::GetInstance().SetName(this, "DMC60", GetChannel()); } diff --git a/wpilibc/src/main/native/cpp/DigitalGlitchFilter.cpp b/wpilibc/src/main/native/cpp/DigitalGlitchFilter.cpp index 9e92da8afa..abc6299a16 100644 --- a/wpilibc/src/main/native/cpp/DigitalGlitchFilter.cpp +++ b/wpilibc/src/main/native/cpp/DigitalGlitchFilter.cpp @@ -38,7 +38,7 @@ DigitalGlitchFilter::DigitalGlitchFilter() { *index = true; HAL_Report(HALUsageReporting::kResourceType_DigitalGlitchFilter, - m_channelIndex); + m_channelIndex + 1); SendableRegistry::GetInstance().AddLW(this, "DigitalGlitchFilter", m_channelIndex); } @@ -87,9 +87,6 @@ void DigitalGlitchFilter::DoAdd(DigitalSource* input, int requestedIndex) { int actualIndex = HAL_GetFilterSelect(input->GetPortHandleForRouting(), &status); wpi_assertEqual(actualIndex, requestedIndex); - - HAL_Report(HALUsageReporting::kResourceType_DigitalInput, - input->GetChannel()); } } diff --git a/wpilibc/src/main/native/cpp/DigitalInput.cpp b/wpilibc/src/main/native/cpp/DigitalInput.cpp index d0fa41b9c0..e18f9436c4 100644 --- a/wpilibc/src/main/native/cpp/DigitalInput.cpp +++ b/wpilibc/src/main/native/cpp/DigitalInput.cpp @@ -40,7 +40,7 @@ DigitalInput::DigitalInput(int channel) { return; } - HAL_Report(HALUsageReporting::kResourceType_DigitalInput, channel); + HAL_Report(HALUsageReporting::kResourceType_DigitalInput, channel + 1); SendableRegistry::GetInstance().AddLW(this, "DigitalInput", channel); } diff --git a/wpilibc/src/main/native/cpp/DigitalOutput.cpp b/wpilibc/src/main/native/cpp/DigitalOutput.cpp index 2068b5dec0..a4c62ff32a 100644 --- a/wpilibc/src/main/native/cpp/DigitalOutput.cpp +++ b/wpilibc/src/main/native/cpp/DigitalOutput.cpp @@ -41,7 +41,7 @@ DigitalOutput::DigitalOutput(int channel) { return; } - HAL_Report(HALUsageReporting::kResourceType_DigitalOutput, channel); + HAL_Report(HALUsageReporting::kResourceType_DigitalOutput, channel + 1); SendableRegistry::GetInstance().AddLW(this, "DigitalOutput", channel); } diff --git a/wpilibc/src/main/native/cpp/DoubleSolenoid.cpp b/wpilibc/src/main/native/cpp/DoubleSolenoid.cpp index 0b35ff5322..5413134f75 100644 --- a/wpilibc/src/main/native/cpp/DoubleSolenoid.cpp +++ b/wpilibc/src/main/native/cpp/DoubleSolenoid.cpp @@ -72,10 +72,10 @@ DoubleSolenoid::DoubleSolenoid(int moduleNumber, int forwardChannel, m_forwardMask = 1 << m_forwardChannel; m_reverseMask = 1 << m_reverseChannel; - HAL_Report(HALUsageReporting::kResourceType_Solenoid, m_forwardChannel, - m_moduleNumber); - HAL_Report(HALUsageReporting::kResourceType_Solenoid, m_reverseChannel, - m_moduleNumber); + HAL_Report(HALUsageReporting::kResourceType_Solenoid, m_forwardChannel + 1, + m_moduleNumber + 1); + HAL_Report(HALUsageReporting::kResourceType_Solenoid, m_reverseChannel + 1, + m_moduleNumber + 1); SendableRegistry::GetInstance().AddLW(this, "DoubleSolenoid", m_moduleNumber, m_forwardChannel); diff --git a/wpilibc/src/main/native/cpp/Encoder.cpp b/wpilibc/src/main/native/cpp/Encoder.cpp index fb043ccd67..5c5145de75 100644 --- a/wpilibc/src/main/native/cpp/Encoder.cpp +++ b/wpilibc/src/main/native/cpp/Encoder.cpp @@ -254,7 +254,7 @@ void Encoder::InitEncoder(bool reverseDirection, EncodingType encodingType) { reverseDirection, (HAL_EncoderEncodingType)encodingType, &status); wpi_setErrorWithContext(status, HAL_GetErrorMessage(status)); - HAL_Report(HALUsageReporting::kResourceType_Encoder, GetFPGAIndex(), + HAL_Report(HALUsageReporting::kResourceType_Encoder, GetFPGAIndex() + 1, encodingType); SendableRegistry::GetInstance().AddLW(this, "Encoder", m_aSource->GetChannel()); diff --git a/wpilibc/src/main/native/cpp/Jaguar.cpp b/wpilibc/src/main/native/cpp/Jaguar.cpp index 487d4897bb..82a0fe5aeb 100644 --- a/wpilibc/src/main/native/cpp/Jaguar.cpp +++ b/wpilibc/src/main/native/cpp/Jaguar.cpp @@ -27,6 +27,6 @@ Jaguar::Jaguar(int channel) : PWMSpeedController(channel) { SetSpeed(0.0); SetZeroLatch(); - HAL_Report(HALUsageReporting::kResourceType_Jaguar, GetChannel()); + HAL_Report(HALUsageReporting::kResourceType_Jaguar, GetChannel() + 1); SendableRegistry::GetInstance().SetName(this, "Jaguar", GetChannel()); } diff --git a/wpilibc/src/main/native/cpp/Joystick.cpp b/wpilibc/src/main/native/cpp/Joystick.cpp index 34afd0ad2a..e07d1cbef2 100644 --- a/wpilibc/src/main/native/cpp/Joystick.cpp +++ b/wpilibc/src/main/native/cpp/Joystick.cpp @@ -24,7 +24,7 @@ Joystick::Joystick(int port) : GenericHID(port) { m_axes[Axis::kTwist] = kDefaultTwistChannel; m_axes[Axis::kThrottle] = kDefaultThrottleChannel; - HAL_Report(HALUsageReporting::kResourceType_Joystick, port); + HAL_Report(HALUsageReporting::kResourceType_Joystick, port + 1); } void Joystick::SetXChannel(int channel) { m_axes[Axis::kX] = channel; } diff --git a/wpilibc/src/main/native/cpp/NidecBrushless.cpp b/wpilibc/src/main/native/cpp/NidecBrushless.cpp index 90ce43e713..5d2bd5d84d 100644 --- a/wpilibc/src/main/native/cpp/NidecBrushless.cpp +++ b/wpilibc/src/main/native/cpp/NidecBrushless.cpp @@ -26,7 +26,7 @@ NidecBrushless::NidecBrushless(int pwmChannel, int dioChannel) m_dio.SetPWMRate(15625); m_dio.EnablePWM(0.5); - HAL_Report(HALUsageReporting::kResourceType_NidecBrushless, pwmChannel); + HAL_Report(HALUsageReporting::kResourceType_NidecBrushless, pwmChannel + 1); registry.AddLW(this, "Nidec Brushless", pwmChannel); } diff --git a/wpilibc/src/main/native/cpp/PWM.cpp b/wpilibc/src/main/native/cpp/PWM.cpp index c6b398f5cc..555dba5921 100644 --- a/wpilibc/src/main/native/cpp/PWM.cpp +++ b/wpilibc/src/main/native/cpp/PWM.cpp @@ -46,7 +46,7 @@ PWM::PWM(int channel) { HAL_SetPWMEliminateDeadband(m_handle, false, &status); wpi_setErrorWithContext(status, HAL_GetErrorMessage(status)); - HAL_Report(HALUsageReporting::kResourceType_PWM, channel); + HAL_Report(HALUsageReporting::kResourceType_PWM, channel + 1); SendableRegistry::GetInstance().AddLW(this, "PWM", channel); SetSafetyEnabled(false); diff --git a/wpilibc/src/main/native/cpp/PWMSparkMax.cpp b/wpilibc/src/main/native/cpp/PWMSparkMax.cpp index d8d3b2a43b..7df2e49942 100644 --- a/wpilibc/src/main/native/cpp/PWMSparkMax.cpp +++ b/wpilibc/src/main/native/cpp/PWMSparkMax.cpp @@ -27,6 +27,6 @@ PWMSparkMax::PWMSparkMax(int channel) : PWMSpeedController(channel) { SetSpeed(0.0); SetZeroLatch(); - HAL_Report(HALUsageReporting::kResourceType_RevSparkMaxPWM, GetChannel()); + HAL_Report(HALUsageReporting::kResourceType_RevSparkMaxPWM, GetChannel() + 1); SendableRegistry::GetInstance().SetName(this, "PWMSparkMax", GetChannel()); } diff --git a/wpilibc/src/main/native/cpp/PWMTalonSRX.cpp b/wpilibc/src/main/native/cpp/PWMTalonSRX.cpp index 0bbc5b9ced..0bf6d637fd 100644 --- a/wpilibc/src/main/native/cpp/PWMTalonSRX.cpp +++ b/wpilibc/src/main/native/cpp/PWMTalonSRX.cpp @@ -31,6 +31,6 @@ PWMTalonSRX::PWMTalonSRX(int channel) : PWMSpeedController(channel) { SetSpeed(0.0); SetZeroLatch(); - HAL_Report(HALUsageReporting::kResourceType_PWMTalonSRX, GetChannel()); + HAL_Report(HALUsageReporting::kResourceType_PWMTalonSRX, GetChannel() + 1); SendableRegistry::GetInstance().SetName(this, "PWMTalonSRX", GetChannel()); } diff --git a/wpilibc/src/main/native/cpp/PWMVictorSPX.cpp b/wpilibc/src/main/native/cpp/PWMVictorSPX.cpp index 122d2197bf..f8a9fc14d6 100644 --- a/wpilibc/src/main/native/cpp/PWMVictorSPX.cpp +++ b/wpilibc/src/main/native/cpp/PWMVictorSPX.cpp @@ -31,6 +31,6 @@ PWMVictorSPX::PWMVictorSPX(int channel) : PWMSpeedController(channel) { SetSpeed(0.0); SetZeroLatch(); - HAL_Report(HALUsageReporting::kResourceType_PWMVictorSPX, GetChannel()); + HAL_Report(HALUsageReporting::kResourceType_PWMVictorSPX, GetChannel() + 1); SendableRegistry::GetInstance().SetName(this, "PWMVictorSPX", GetChannel()); } diff --git a/wpilibc/src/main/native/cpp/PowerDistributionPanel.cpp b/wpilibc/src/main/native/cpp/PowerDistributionPanel.cpp index b3297ea986..dfe1d38bbc 100644 --- a/wpilibc/src/main/native/cpp/PowerDistributionPanel.cpp +++ b/wpilibc/src/main/native/cpp/PowerDistributionPanel.cpp @@ -34,7 +34,7 @@ PowerDistributionPanel::PowerDistributionPanel(int module) { return; } - HAL_Report(HALUsageReporting::kResourceType_PDP, module); + HAL_Report(HALUsageReporting::kResourceType_PDP, module + 1); SendableRegistry::GetInstance().AddLW(this, "PowerDistributionPanel", module); } diff --git a/wpilibc/src/main/native/cpp/Relay.cpp b/wpilibc/src/main/native/cpp/Relay.cpp index 3a3e7727e1..45033f2381 100644 --- a/wpilibc/src/main/native/cpp/Relay.cpp +++ b/wpilibc/src/main/native/cpp/Relay.cpp @@ -41,7 +41,7 @@ Relay::Relay(int channel, Relay::Direction direction) m_reverseHandle = HAL_kInvalidHandle; return; } - HAL_Report(HALUsageReporting::kResourceType_Relay, m_channel); + HAL_Report(HALUsageReporting::kResourceType_Relay, m_channel + 1); } if (m_direction == kBothDirections || m_direction == kReverseOnly) { int32_t status = 0; diff --git a/wpilibc/src/main/native/cpp/SD540.cpp b/wpilibc/src/main/native/cpp/SD540.cpp index 93733b2fbf..ab9c8ecfef 100644 --- a/wpilibc/src/main/native/cpp/SD540.cpp +++ b/wpilibc/src/main/native/cpp/SD540.cpp @@ -32,6 +32,7 @@ SD540::SD540(int channel) : PWMSpeedController(channel) { SetSpeed(0.0); SetZeroLatch(); - HAL_Report(HALUsageReporting::kResourceType_MindsensorsSD540, GetChannel()); + HAL_Report(HALUsageReporting::kResourceType_MindsensorsSD540, + GetChannel() + 1); SendableRegistry::GetInstance().SetName(this, "SD540", GetChannel()); } diff --git a/wpilibc/src/main/native/cpp/SPI.cpp b/wpilibc/src/main/native/cpp/SPI.cpp index 54cf82b196..d55f37e69c 100644 --- a/wpilibc/src/main/native/cpp/SPI.cpp +++ b/wpilibc/src/main/native/cpp/SPI.cpp @@ -157,7 +157,8 @@ SPI::SPI(Port port) : m_port(static_cast(port)) { HAL_InitializeSPI(m_port, &status); wpi_setErrorWithContext(status, HAL_GetErrorMessage(status)); - HAL_Report(HALUsageReporting::kResourceType_SPI, port); + HAL_Report(HALUsageReporting::kResourceType_SPI, + static_cast(port) + 1); } SPI::~SPI() { HAL_CloseSPI(m_port); } diff --git a/wpilibc/src/main/native/cpp/SerialPort.cpp b/wpilibc/src/main/native/cpp/SerialPort.cpp index 46e02c8ae2..76f180a3d8 100644 --- a/wpilibc/src/main/native/cpp/SerialPort.cpp +++ b/wpilibc/src/main/native/cpp/SerialPort.cpp @@ -41,7 +41,8 @@ SerialPort::SerialPort(int baudRate, Port port, int dataBits, DisableTermination(); - HAL_Report(HALUsageReporting::kResourceType_SerialPort, 0); + HAL_Report(HALUsageReporting::kResourceType_SerialPort, + static_cast(port) + 1); } SerialPort::SerialPort(int baudRate, const wpi::Twine& portName, Port port, @@ -74,7 +75,8 @@ SerialPort::SerialPort(int baudRate, const wpi::Twine& portName, Port port, DisableTermination(); - HAL_Report(HALUsageReporting::kResourceType_SerialPort, 0); + HAL_Report(HALUsageReporting::kResourceType_SerialPort, + static_cast(port) + 1); } SerialPort::~SerialPort() { diff --git a/wpilibc/src/main/native/cpp/Servo.cpp b/wpilibc/src/main/native/cpp/Servo.cpp index 09e482b260..cd30f8f57d 100644 --- a/wpilibc/src/main/native/cpp/Servo.cpp +++ b/wpilibc/src/main/native/cpp/Servo.cpp @@ -27,7 +27,7 @@ Servo::Servo(int channel) : PWM(channel) { // Assign defaults for period multiplier for the servo PWM control signal SetPeriodMultiplier(kPeriodMultiplier_4X); - HAL_Report(HALUsageReporting::kResourceType_Servo, channel); + HAL_Report(HALUsageReporting::kResourceType_Servo, channel + 1); SendableRegistry::GetInstance().SetName(this, "Servo", channel); } diff --git a/wpilibc/src/main/native/cpp/Solenoid.cpp b/wpilibc/src/main/native/cpp/Solenoid.cpp index c860c44106..30ad4e898c 100644 --- a/wpilibc/src/main/native/cpp/Solenoid.cpp +++ b/wpilibc/src/main/native/cpp/Solenoid.cpp @@ -46,8 +46,8 @@ Solenoid::Solenoid(int moduleNumber, int channel) return; } - HAL_Report(HALUsageReporting::kResourceType_Solenoid, m_channel, - m_moduleNumber); + HAL_Report(HALUsageReporting::kResourceType_Solenoid, m_channel + 1, + m_moduleNumber + 1); SendableRegistry::GetInstance().AddLW(this, "Solenoid", m_moduleNumber, m_channel); } diff --git a/wpilibc/src/main/native/cpp/Spark.cpp b/wpilibc/src/main/native/cpp/Spark.cpp index 18f8ee65d3..943333f707 100644 --- a/wpilibc/src/main/native/cpp/Spark.cpp +++ b/wpilibc/src/main/native/cpp/Spark.cpp @@ -32,6 +32,6 @@ Spark::Spark(int channel) : PWMSpeedController(channel) { SetSpeed(0.0); SetZeroLatch(); - HAL_Report(HALUsageReporting::kResourceType_RevSPARK, GetChannel()); + HAL_Report(HALUsageReporting::kResourceType_RevSPARK, GetChannel() + 1); SendableRegistry::GetInstance().SetName(this, "Spark", GetChannel()); } diff --git a/wpilibc/src/main/native/cpp/Talon.cpp b/wpilibc/src/main/native/cpp/Talon.cpp index 8dc1928d08..3cc55e9bf5 100644 --- a/wpilibc/src/main/native/cpp/Talon.cpp +++ b/wpilibc/src/main/native/cpp/Talon.cpp @@ -32,6 +32,6 @@ Talon::Talon(int channel) : PWMSpeedController(channel) { SetSpeed(0.0); SetZeroLatch(); - HAL_Report(HALUsageReporting::kResourceType_Talon, GetChannel()); + HAL_Report(HALUsageReporting::kResourceType_Talon, GetChannel() + 1); SendableRegistry::GetInstance().SetName(this, "Talon", GetChannel()); } diff --git a/wpilibc/src/main/native/cpp/Victor.cpp b/wpilibc/src/main/native/cpp/Victor.cpp index 49dcd574cd..46c2cfc347 100644 --- a/wpilibc/src/main/native/cpp/Victor.cpp +++ b/wpilibc/src/main/native/cpp/Victor.cpp @@ -33,6 +33,6 @@ Victor::Victor(int channel) : PWMSpeedController(channel) { SetSpeed(0.0); SetZeroLatch(); - HAL_Report(HALUsageReporting::kResourceType_Victor, GetChannel()); + HAL_Report(HALUsageReporting::kResourceType_Victor, GetChannel() + 1); SendableRegistry::GetInstance().SetName(this, "Victor", GetChannel()); } diff --git a/wpilibc/src/main/native/cpp/VictorSP.cpp b/wpilibc/src/main/native/cpp/VictorSP.cpp index 82e966f62e..55de9dc9e5 100644 --- a/wpilibc/src/main/native/cpp/VictorSP.cpp +++ b/wpilibc/src/main/native/cpp/VictorSP.cpp @@ -32,6 +32,6 @@ VictorSP::VictorSP(int channel) : PWMSpeedController(channel) { SetSpeed(0.0); SetZeroLatch(); - HAL_Report(HALUsageReporting::kResourceType_VictorSP, GetChannel()); + HAL_Report(HALUsageReporting::kResourceType_VictorSP, GetChannel() + 1); SendableRegistry::GetInstance().SetName(this, "VictorSP", GetChannel()); } diff --git a/wpilibc/src/main/native/cpp/XboxController.cpp b/wpilibc/src/main/native/cpp/XboxController.cpp index fa54980980..0ac9b66d63 100644 --- a/wpilibc/src/main/native/cpp/XboxController.cpp +++ b/wpilibc/src/main/native/cpp/XboxController.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2016-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2016-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -12,7 +12,7 @@ using namespace frc; XboxController::XboxController(int port) : GenericHID(port) { - HAL_Report(HALUsageReporting::kResourceType_XboxController, port); + HAL_Report(HALUsageReporting::kResourceType_XboxController, port + 1); } double XboxController::GetX(JoystickHand hand) const { 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 06daf85e6e..54583ea89d 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL362.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL362.java @@ -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); } 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 76580729b8..549a91a696 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 @@ -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); } 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 4a4c675fed..41c5b387fc 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogAccelerometer.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogAccelerometer.java @@ -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()); } 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 f7e3f2f0b9..c688b55959 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogGyro.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogGyro.java @@ -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()); } 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 0e1260e0d7..308be6b1b1 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogInput.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogInput.java @@ -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); } 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 902bec6ca3..ae03463bf8 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogOutput.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogOutput.java @@ -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); } 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 5bff3ea481..52f4003918 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogTrigger.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogTrigger.java @@ -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()); } 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 049beb3739..8217f54a39 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogTriggerOutput.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogTriggerOutput.java @@ -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); } /** 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 759056f872..7b188e552f 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/CAN.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/CAN.java @@ -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); } /** 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 cddf2ef488..9d8a8dd4b1 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Compressor.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Compressor.java @@ -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); } 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 bdb81fd107..a982f66fef 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Counter.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Counter.java @@ -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); } 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 f414773ba7..8efbfbbd2c 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/DMC60.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/DMC60.java @@ -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()); } } 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 777f2f9346..10155cc34f 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/DigitalGlitchFilter.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/DigitalGlitchFilter.java @@ -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); } } 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 433e3fd6c6..7cbd1ed204 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/DigitalInput.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/DigitalInput.java @@ -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); } 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 ede25f25b3..d66603ff70 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/DigitalOutput.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/DigitalOutput.java @@ -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); } 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 10029456e5..d612d24ff3 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/DoubleSolenoid.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/DoubleSolenoid.java @@ -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); } 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 a6ea302b84..125f769d1c 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Encoder.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Encoder.java @@ -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); } 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 80b58045c5..41f9d09763 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/GearTooth.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/GearTooth.java @@ -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()); } 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 b863f2eaa0..a6414512bf 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Jaguar.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Jaguar.java @@ -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()); } } 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 06a4cdc13a..60a60bbd73 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Joystick.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Joystick.java @@ -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); } /** 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 4bfee487b6..9d1011beaf 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/NidecBrushless.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/NidecBrushless.java @@ -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); } 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 0647291764..22eed18557 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/PWM.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/PWM.java @@ -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); diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/PWMSparkMax.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/PWMSparkMax.java index 29b28f2e62..fb834a59f6 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/PWMSparkMax.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/PWMSparkMax.java @@ -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()); } } 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 691210ed39..c139f27b8e 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/PWMTalonSRX.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/PWMTalonSRX.java @@ -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()); } } 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 06076302dd..ee5d9a9688 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/PWMVictorSPX.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/PWMVictorSPX.java @@ -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()); } } 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 8030daa515..e30be1be4b 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/PowerDistributionPanel.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/PowerDistributionPanel.java @@ -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); } 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 bea2491598..fde4ef16c4 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Relay.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Relay.java @@ -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); 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 fa6263a933..bc8b8516e2 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java @@ -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 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 cf81df65b3..c05d1836b9 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/SD540.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/SD540.java @@ -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()); } 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 a76ebb1fc1..97d9b27fa2 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/SPI.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/SPI.java @@ -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 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 9cf0dcb818..86bd941da8 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/SerialPort.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/SerialPort.java @@ -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); } /** 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 dee705130a..b577413f77 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Servo.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Servo.java @@ -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()); } 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 dc9b9209dc..163415c724 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Solenoid.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Solenoid.java @@ -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); } 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 ea2a8a7204..9e6c36a685 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Spark.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Spark.java @@ -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()); } 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 861fca6587..84db704d0d 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Talon.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Talon.java @@ -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()); } } 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 fa9dc1731f..0af2bd38b6 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Victor.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Victor.java @@ -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()); } } 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 019153e523..7220968211 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/VictorSP.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/VictorSP.java @@ -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()); } } 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 7f8dc63244..fd6161a8aa 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/XboxController.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/XboxController.java @@ -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); } /**