From 2f8562c238381085f1aee58b9943b5faa5610832 Mon Sep 17 00:00:00 2001 From: Thad House Date: Fri, 27 Nov 2015 11:02:06 -0800 Subject: [PATCH] artf4175: Fixes FakeEncoderFixture encoder type error Change-Id: Icb2f472acdc7ef9144f96677c84cdcc3128030cd --- .../edu/wpi/first/wpilibj/fixtures/FakeEncoderFixture.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/fixtures/FakeEncoderFixture.java b/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/fixtures/FakeEncoderFixture.java index 38e78e72a9..c27b7dc54f 100644 --- a/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/fixtures/FakeEncoderFixture.java +++ b/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/fixtures/FakeEncoderFixture.java @@ -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() {