Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-04 03:11:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to latest UsageReporting.h.

Browse Source 
Also fix DigitalGlitchFilter usage reporting for C++ (only report on
construction rather than on each call) and add for Java.

Change-Id: I73758b16d81c40442c4acec43e0aa6804b2ba250
This commit is contained in:
Peter Johnson
2015-12-15 20:47:21 -08:00
parent ec69c6a866
commit c2ecffe708
5 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hal/include/HAL/HAL.hpp
View File

@@ -99,7 +99,7 @@ namespace HALUsageReporting
kResourceType_ADXRS450, kResourceType_ADXRS450,
kResourceType_RevSPARK, kResourceType_RevSPARK,
kResourceType_MindsensorsSD540, kResourceType_MindsensorsSD540,
kResourceType_DigitalGlitchFilter, kResourceType_DigitalFilter,
}; };
enum tInstances enum tInstances

2
hal/lib/Athena/FRC_NetworkCommunication/UsageReporting.h
View File

@@ -77,7 +77,7 @@ namespace nUsageReporting
kResourceType_ADXRS450, kResourceType_ADXRS450,
kResourceType_RevSPARK, kResourceType_RevSPARK,
kResourceType_MindsensorsSD540, kResourceType_MindsensorsSD540,
kResourceType_DigitalGlitchFilter, kResourceType_DigitalFilter,
} tResourceType; } tResourceType;
typedef enum typedef enum

12
wpilibc/Athena/src/DigitalGlitchFilter.cpp
View File

@@ -26,6 +26,8 @@ DigitalGlitchFilter::DigitalGlitchFilter() {
m_channelIndex = std::distance(m_filterAllocated.begin(), index); m_channelIndex = std::distance(m_filterAllocated.begin(), index);
*index = true; *index = true;
HALReport(HALUsageReporting::kResourceType_DigitalFilter, m_channelIndex);
} }
DigitalGlitchFilter::~DigitalGlitchFilter() { DigitalGlitchFilter::~DigitalGlitchFilter() {
@@ -142,9 +144,6 @@ void DigitalGlitchFilter::SetPeriodCycles(uint32_t fpga_cycles) {
int32_t status = 0; int32_t status = 0;
setFilterPeriod(m_channelIndex, fpga_cycles, &status); setFilterPeriod(m_channelIndex, fpga_cycles, &status);
wpi_setErrorWithContext(status, getHALErrorMessage(status)); wpi_setErrorWithContext(status, getHALErrorMessage(status));
HALReport(HALUsageReporting::kResourceType_DigitalGlitchFilter,
m_channelIndex);
} }
/** /**
@@ -159,9 +158,6 @@ void DigitalGlitchFilter::SetPeriodNanoSeconds(uint64_t nanoseconds) {
setFilterPeriod(m_channelIndex, fpga_cycles, &status); setFilterPeriod(m_channelIndex, fpga_cycles, &status);
wpi_setErrorWithContext(status, getHALErrorMessage(status)); wpi_setErrorWithContext(status, getHALErrorMessage(status));
HALReport(HALUsageReporting::kResourceType_DigitalGlitchFilter,
m_channelIndex);
} }
/** /**
@@ -175,8 +171,6 @@ uint32_t DigitalGlitchFilter::GetPeriodCycles() {
wpi_setErrorWithContext(status, getHALErrorMessage(status)); wpi_setErrorWithContext(status, getHALErrorMessage(status));
HALReport(HALUsageReporting::kResourceType_DigitalGlitchFilter,
m_channelIndex);
return fpga_cycles; return fpga_cycles;
} }
@@ -191,8 +185,6 @@ uint64_t DigitalGlitchFilter::GetPeriodNanoSeconds() {
wpi_setErrorWithContext(status, getHALErrorMessage(status)); wpi_setErrorWithContext(status, getHALErrorMessage(status));
HALReport(HALUsageReporting::kResourceType_DigitalGlitchFilter,
m_channelIndex);
return static_cast<uint64_t>(fpga_cycles) * 1000L / return static_cast<uint64_t>(fpga_cycles) * 1000L /
static_cast<uint64_t>(kSystemClockTicksPerMicrosecond / 4); static_cast<uint64_t>(kSystemClockTicksPerMicrosecond / 4);
} }

5
wpilibj/src/athena/java/edu/wpi/first/wpilibj/DigitalGlitchFilter.java
View File

@@ -13,6 +13,9 @@ import edu.wpi.first.wpilibj.DigitalSource;
import edu.wpi.first.wpilibj.Encoder; import edu.wpi.first.wpilibj.Encoder;
import edu.wpi.first.wpilibj.Counter; import edu.wpi.first.wpilibj.Counter;
import edu.wpi.first.wpilibj.communication.FRCNetworkCommunicationsLibrary.tResourceType;
import edu.wpi.first.wpilibj.communication.UsageReporting;
import edu.wpi.first.wpilibj.hal.DigitalGlitchFilterJNI; import edu.wpi.first.wpilibj.hal.DigitalGlitchFilterJNI;
/** /**
@@ -31,6 +34,8 @@ public class DigitalGlitchFilter extends SensorBase {
if (i != m_filterAllocated.length) { if (i != m_filterAllocated.length) {
m_channelIndex = i; m_channelIndex = i;
m_filterAllocated[i] = true; m_filterAllocated[i] = true;
UsageReporting.report(tResourceType.kResourceType_DigitalFilter,
m_channelIndex, 0);
} }
} }
} }

2
wpilibj/src/athena/java/edu/wpi/first/wpilibj/communication/FRCNetworkCommunicationsLibrary.java
View File

@@ -403,7 +403,7 @@ public class FRCNetworkCommunicationsLibrary extends JNIWrapper {
* <i>native declaration : * <i>native declaration :
* src\main\include\NetworkCommunication\UsageReporting.h:67</i> * src\main\include\NetworkCommunication\UsageReporting.h:67</i>
*/ */
public static final int kResourceType_DigitalGlitchFilter = 57; public static final int kResourceType_DigitalFilter = 57;
}; };
/** /**
* <i>native declaration : * <i>native declaration :