From 345ceafa0df08d017e110dc90a17bf1d51dc0ee9 Mon Sep 17 00:00:00 2001 From: Fredric Silberberg Date: Thu, 30 Oct 2014 14:42:51 -0400 Subject: [PATCH] DigitalInputs are now automatically added the LiveWindow in both C++ and Java Change-Id: Ic3520737841f2901becfdc99e3900e4e63da8822 --- wpilibc/wpilibC++Devices/src/DigitalInput.cpp | 2 ++ .../src/main/java/edu/wpi/first/wpilibj/DigitalInput.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/wpilibc/wpilibC++Devices/src/DigitalInput.cpp b/wpilibc/wpilibC++Devices/src/DigitalInput.cpp index b4d6a44bd4..0bade1931e 100644 --- a/wpilibc/wpilibC++Devices/src/DigitalInput.cpp +++ b/wpilibc/wpilibC++Devices/src/DigitalInput.cpp @@ -8,6 +8,7 @@ //#include "NetworkCommunication/UsageReporting.h" #include "Resource.h" #include "WPIErrors.h" +#include "LiveWindow/LiveWindow.h" /** * Create an instance of a DigitalInput. @@ -31,6 +32,7 @@ void DigitalInput::InitDigitalInput(uint32_t channel) allocateDIO(m_digital_ports[channel], true, &status); wpi_setErrorWithContext(status, getHALErrorMessage(status)); + LiveWindow::GetInstance()->AddSensor("DigitalInput", channel, this); HALReport(HALUsageReporting::kResourceType_DigitalInput, channel); } diff --git a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/DigitalInput.java b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/DigitalInput.java index f1f610e285..0cc3ed3eaf 100644 --- a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/DigitalInput.java +++ b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/DigitalInput.java @@ -14,6 +14,7 @@ import edu.wpi.first.wpilibj.communication.FRCNetworkCommunicationsLibrary.tReso import edu.wpi.first.wpilibj.communication.UsageReporting; import edu.wpi.first.wpilibj.hal.DIOJNI; import edu.wpi.first.wpilibj.hal.HALUtil; +import edu.wpi.first.wpilibj.livewindow.LiveWindow; import edu.wpi.first.wpilibj.livewindow.LiveWindowSendable; import edu.wpi.first.wpilibj.tables.ITable; @@ -36,6 +37,7 @@ public class DigitalInput extends DigitalSource implements LiveWindowSendable { public DigitalInput(int channel) { initDigitalPort(channel, true); + LiveWindow.addSensor("DigitalInput", channel, this); UsageReporting.report(tResourceType.kResourceType_DigitalInput, channel); }