Correctly set smart dashboard type for AnalogGyro and ADXRS450_Gyro.

The GetSmartDashboardType() function defined by GyroBase was returning the
correct "Gyro", but the overrides in AnalogGyro and ADXRS450_Gyro were
incorrectly changing this, resulting in SmartDashboard not recognizing these
as being gyros.

Additionally, AddSensor in the C++ AnalogGyro was setting the name to Gyro
rather than AnalogGyro.

Change-Id: Ib2e31cd2712cc2bc26c8082ed760175d0ee80fb6
This commit is contained in:
Peter Johnson
2016-01-06 20:45:47 -08:00
parent c57e749a94
commit 628811ed03
6 changed files with 1 additions and 23 deletions

View File

@@ -163,8 +163,4 @@ public class ADXRS450_Gyro extends GyroBase implements Gyro, PIDSource, LiveWind
if (m_spi == null) return 0.0;
return m_spi.getAccumulatorLastValue() * kDegreePerSecondPerLSB;
}
public String getSmartDashboardType() {
return "ADXRS450_Gyro";
}
}

View File

@@ -238,12 +238,4 @@ public class AnalogGyro extends GyroBase implements Gyro, PIDSource, LiveWindowS
(int) (volts * 1e9 / m_analog.getLSBWeight() * (1 << m_analog.getOversampleBits()));
m_analog.setAccumulatorDeadband(deadband);
}
/*
* Live Window code, only does anything if live window is activated.
*/
@Override
public String getSmartDashboardType() {
return "AnalogGyro";
}
}