Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51: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
wpilibc/src/main/native/cpp/ADXL362.cpp
View File

@@ -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);
}

2
wpilibc/src/main/native/cpp/ADXRS450_Gyro.cpp
View File

@@ -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);
}

2
wpilibc/src/main/native/cpp/AnalogAccelerometer.cpp
View File

@@ -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());

2
wpilibc/src/main/native/cpp/AnalogGyro.cpp
View File

@@ -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());

2
wpilibc/src/main/native/cpp/AnalogInput.cpp
View File

@@ -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);
}

2
wpilibc/src/main/native/cpp/AnalogOutput.cpp
View File

@@ -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);
}

2
wpilibc/src/main/native/cpp/AnalogTrigger.cpp
View File

@@ -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());
}

2
wpilibc/src/main/native/cpp/AnalogTriggerOutput.cpp
View File

@@ -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<uint8_t>(outputType));
trigger.GetIndex() + 1, static_cast<uint8_t>(outputType) + 1);
}

4
wpilibc/src/main/native/cpp/CAN.cpp
View File

@@ -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() {

2
wpilibc/src/main/native/cpp/Compressor.cpp
View File

@@ -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);
}

2
wpilibc/src/main/native/cpp/Counter.cpp
View File

@@ -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);
}

2
wpilibc/src/main/native/cpp/DMC60.cpp
View File

@@ -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());
}

5
wpilibc/src/main/native/cpp/DigitalGlitchFilter.cpp
View File

@@ -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());
}
}

2
wpilibc/src/main/native/cpp/DigitalInput.cpp
View File

@@ -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);
}

2
wpilibc/src/main/native/cpp/DigitalOutput.cpp
View File

@@ -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);
}

8
wpilibc/src/main/native/cpp/DoubleSolenoid.cpp
View File

@@ -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);

2
wpilibc/src/main/native/cpp/Encoder.cpp
View File

@@ -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());

2
wpilibc/src/main/native/cpp/Jaguar.cpp
View File

@@ -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());
}

2
wpilibc/src/main/native/cpp/Joystick.cpp
View File

@@ -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; }

2
wpilibc/src/main/native/cpp/NidecBrushless.cpp
View File

@@ -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);
}

2
wpilibc/src/main/native/cpp/PWM.cpp
View File

@@ -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);

2
wpilibc/src/main/native/cpp/PWMSparkMax.cpp
View File

@@ -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());
}

2
wpilibc/src/main/native/cpp/PWMTalonSRX.cpp
View File

@@ -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());
}

2
wpilibc/src/main/native/cpp/PWMVictorSPX.cpp
View File

@@ -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());
}

2
wpilibc/src/main/native/cpp/PowerDistributionPanel.cpp
View File

@@ -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);
}

2
wpilibc/src/main/native/cpp/Relay.cpp
View File

@@ -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;

3
wpilibc/src/main/native/cpp/SD540.cpp
View File

@@ -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());
}

3
wpilibc/src/main/native/cpp/SPI.cpp
View File

@@ -157,7 +157,8 @@ SPI::SPI(Port port) : m_port(static_cast<HAL_SPIPort>(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<uint8_t>(port) + 1);
}
SPI::~SPI() { HAL_CloseSPI(m_port); }

6
wpilibc/src/main/native/cpp/SerialPort.cpp
View File

@@ -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<uint8_t>(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<uint8_t>(port) + 1);
}
SerialPort::~SerialPort() {

2
wpilibc/src/main/native/cpp/Servo.cpp
View File

@@ -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);
}

4
wpilibc/src/main/native/cpp/Solenoid.cpp
View File

@@ -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);
}

2
wpilibc/src/main/native/cpp/Spark.cpp
View File

@@ -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());
}

2
wpilibc/src/main/native/cpp/Talon.cpp
View File

@@ -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());
}

2
wpilibc/src/main/native/cpp/Victor.cpp
View File

@@ -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());
}

2
wpilibc/src/main/native/cpp/VictorSP.cpp
View File

@@ -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());
}

4
wpilibc/src/main/native/cpp/XboxController.cpp
View File

@@ -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 {