From 295f212c8ee1ff654161a4747b5ab4154edf41bf Mon Sep 17 00:00:00 2001 From: Brad Miller Date: Thu, 25 Sep 2014 18:35:25 -0400 Subject: [PATCH] Change digital input to return boolean values to match Java Change-Id: I5cfa1d300b8185ef7a32413b7f9626229d309cac --- wpilibc/wpilibC++Devices/include/DigitalInput.h | 2 +- wpilibc/wpilibC++Devices/src/DigitalInput.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wpilibc/wpilibC++Devices/include/DigitalInput.h b/wpilibc/wpilibC++Devices/include/DigitalInput.h index 13b4de4558..030de412f2 100644 --- a/wpilibc/wpilibC++Devices/include/DigitalInput.h +++ b/wpilibc/wpilibC++Devices/include/DigitalInput.h @@ -20,7 +20,7 @@ class DigitalInput : public DigitalSource, public LiveWindowSendable public: explicit DigitalInput(uint32_t channel); virtual ~DigitalInput(); - uint32_t Get(); + bool Get(); uint32_t GetChannel(); // Digital Source Interface diff --git a/wpilibc/wpilibC++Devices/src/DigitalInput.cpp b/wpilibc/wpilibC++Devices/src/DigitalInput.cpp index 9eb0fb6ef7..917062b918 100644 --- a/wpilibc/wpilibC++Devices/src/DigitalInput.cpp +++ b/wpilibc/wpilibC++Devices/src/DigitalInput.cpp @@ -69,7 +69,7 @@ DigitalInput::~DigitalInput() * Get the value from a digital input channel. * Retrieve the value of a single digital input channel from the FPGA. */ -uint32_t DigitalInput::Get() +bool DigitalInput::Get() { int32_t status = 0; bool value = getDIO(m_digital_ports[m_channel], &status);