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

Merge "artf4175: Fixes FakeEncoderFixture encoder type error"

Browse Source
This commit is contained in:
Peter Johnson (294)
2015-11-30 23:10:12 -08:00
committed by Gerrit Code Review
parent c3c35c604c 2f8562c238
commit 6d00b77ef3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/fixtures/FakeEncoderFixture.java
View File

@@ -41,7 +41,7 @@ public class FakeEncoderFixture implements ITestFixture {
this.m_dio2 = dio2;
m_allocated = false;
m_source = new FakeEncoderSource(dio1.getOutput(), dio2.getOutput());
m_encoder = new Encoder(dio1.getInput(), dio2.getOutput());
m_encoder = new Encoder(dio1.getInput(), dio2.getInput());
}
/**
@@ -67,7 +67,7 @@ public class FakeEncoderFixture implements ITestFixture {
m_encoderPort[0] = inputA;
m_encoderPort[1] = inputB;
m_source = new FakeEncoderSource(m_dio1.getOutput(), m_dio2.getOutput());
m_encoder = new Encoder(m_dio1.getInput(), m_dio2.getOutput());
m_encoder = new Encoder(m_dio1.getInput(), m_dio2.getInput());
}
public FakeEncoderSource getFakeEncoderSource() {