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

Merge "DigitalInputs are now automatically added the LiveWindow in both C++ and Java"

Browse Source
This commit is contained in:
Brad Miller (WPI)
2014-11-05 07:43:52 -08:00
committed by Gerrit Code Review
parent 2fa04c1750 345ceafa0d
commit 1f8a3d5bf3
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wpilibc/wpilibC++Devices/src/DigitalInput.cpp
View File

@@ -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);
}

2
wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/DigitalInput.java
View File

@@ -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);
}