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

Correctly set smart dashboard type for AnalogGyro and ADXRS450_Gyro.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
wpilibc/Athena/include/ADXRS450_Gyro.h
View File

@@ -36,8 +36,6 @@ class ADXRS450_Gyro : public GyroBase {
void Reset() override;
void Calibrate() override;
std::string GetSmartDashboardType() const override;
private:
SPI m_spi;

2
wpilibc/Athena/include/AnalogGyro.h
View File

@@ -54,8 +54,6 @@ class AnalogGyro : public GyroBase {
virtual void InitGyro();
void Calibrate() override;
std::string GetSmartDashboardType() const override;
protected:
std::shared_ptr<AnalogInput> m_analog;

4
wpilibc/Athena/src/ADXRS450_Gyro.cpp
View File

@@ -151,7 +151,3 @@ float ADXRS450_Gyro::GetAngle() const {
double ADXRS450_Gyro::GetRate() const {
return (double)m_spi.GetAccumulatorLastValue() * kDegreePerSecondPerLSB;
}
std::string ADXRS450_Gyro::GetSmartDashboardType() const {
return "ADXRS450_Gyro";
}

4
wpilibc/Athena/src/AnalogGyro.cpp
View File

@@ -132,7 +132,7 @@ void AnalogGyro::InitGyro() {
SetPIDSourceType(PIDSourceType::kDisplacement);
HALReport(HALUsageReporting::kResourceType_Gyro, m_analog->GetChannel());
LiveWindow::GetInstance()->AddSensor("Gyro", m_analog->GetChannel(), this);
LiveWindow::GetInstance()->AddSensor("AnalogGyro", m_analog->GetChannel(), this);
}
/**
@@ -251,5 +251,3 @@ void AnalogGyro::SetDeadband(float volts) {
(1 << m_analog->GetOversampleBits());
m_analog->SetAccumulatorDeadband(deadband);
}
std::string AnalogGyro::GetSmartDashboardType() const { return "AnalogGyro"; }

4
wpilibj/src/athena/java/edu/wpi/first/wpilibj/ADXRS450_Gyro.java
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";
}
}

8
wpilibj/src/athena/java/edu/wpi/first/wpilibj/AnalogGyro.java
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";
}
}