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

[sim] Fix ADXRS450_GyroSim and DutyCycleEncoderSim (#2963)

Browse Source 
These were broken by #2952.

Also fix Java ADXRS450_Gyro angle/rate SimValue names.
This commit is contained in:
Peter Johnson
2020-12-24 12:23:38 -08:00
committed by GitHub
parent 240c629cda
commit a8bb2ef1c3
8 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,6 +60,8 @@ void DutyCycleEncoder::Init() {
if (m_simDevice) {
m_simPosition =
m_simDevice.CreateDouble("position", hal::SimDevice::kInput, 0.0);
m_simDistancePerRotation = m_simDevice.CreateDouble(
"distance_per_rot", hal::SimDevice::kOutput, 1.0);
m_simIsConnected =
m_simDevice.CreateBoolean("connected", hal::SimDevice::kInput, true);
} else {
@@ -101,6 +103,7 @@ units::turn_t DutyCycleEncoder::Get() const {
void DutyCycleEncoder::SetDistancePerRotation(double distancePerRotation) {
m_distancePerRotation = distancePerRotation;
m_simDistancePerRotation.Set(distancePerRotation);
}
double DutyCycleEncoder::GetDistancePerRotation() const {

6
wpilibc/src/main/native/cpp/simulation/ADXRS450_GyroSim.cpp
View File

@@ -18,10 +18,10 @@ using namespace frc::sim;
ADXRS450_GyroSim::ADXRS450_GyroSim(const frc::ADXRS450_Gyro& gyro) {
wpi::SmallString<128> fullname;
wpi::raw_svector_ostream os(fullname);
os << "ADXRS450_Gyro" << '[' << gyro.GetPort() << ']';
os << "Gyro:ADXRS450" << '[' << gyro.GetPort() << ']';
frc::sim::SimDeviceSim deviceSim{fullname.c_str()};
m_simAngle = deviceSim.GetDouble("Angle");
m_simRate = deviceSim.GetDouble("Rate");
m_simAngle = deviceSim.GetDouble("angle_x");
m_simRate = deviceSim.GetDouble("rate_x");
}
void ADXRS450_GyroSim::SetAngle(units::degree_t angle) {

7
wpilibc/src/main/native/cpp/simulation/DutyCycleEncoderSim.cpp
View File

@@ -18,10 +18,11 @@ using namespace frc::sim;
DutyCycleEncoderSim::DutyCycleEncoderSim(const frc::DutyCycleEncoder& encoder) {
wpi::SmallString<128> fullname;
wpi::raw_svector_ostream os(fullname);
os << "DutyCycleEncoder" << '[' << encoder.GetFPGAIndex() << ']';
os << "DutyCycle:DutyCycleEncoder" << '[' << encoder.GetSourceChannel()
<< ']';
frc::sim::SimDeviceSim deviceSim{fullname.c_str()};
m_simPosition = deviceSim.GetDouble("Position");
m_simDistancePerRotation = deviceSim.GetDouble("DistancePerRotation");
m_simPosition = deviceSim.GetDouble("position");
m_simDistancePerRotation = deviceSim.GetDouble("distance_per_rot");
}
void DutyCycleEncoderSim::Set(units::turn_t turns) {