Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-29 02:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

SPI: Report port as instance for usage reporting (#1704)

Browse Source
This commit is contained in:
David Vo
2019-06-11 13:57:36 +10:00
committed by Peter Johnson
parent bc6f1e2469
commit eeb1025ac7
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wpilibc/src/main/native/cpp/SPI.cpp
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2008-2018 FIRST. All Rights Reserved. */
/* Copyright (c) 2008-2019 FIRST. All Rights Reserved. */
/* Open Source Software - may be modified and shared by FRC teams. The code */
/* must be accompanied by the FIRST BSD license file in the root directory of */
/* the project. */
@@ -157,9 +157,7 @@ SPI::SPI(Port port) : m_port(static_cast<HAL_SPIPort>(port)) {
HAL_InitializeSPI(m_port, &status);
wpi_setErrorWithContext(status, HAL_GetErrorMessage(status));
static int instances = 0;
instances++;
HAL_Report(HALUsageReporting::kResourceType_SPI, instances);
HAL_Report(HALUsageReporting::kResourceType_SPI, port);
}
SPI::~SPI() { HAL_CloseSPI(m_port); }

7
wpilibj/src/main/java/edu/wpi/first/wpilibj/SPI.java
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2016-2018 FIRST. All Rights Reserved. */
/* Copyright (c) 2016-2019 FIRST. All Rights Reserved. */
/* Open Source Software - may be modified and shared by FRC teams. The code */
/* must be accompanied by the FIRST BSD license file in the root directory of */
/* the project. */
@@ -32,8 +32,6 @@ public class SPI implements AutoCloseable {
}
}
private static int devices;
private int m_port;
private int m_msbFirst;
private int m_clockIdleHigh;
@@ -46,11 +44,10 @@ public class SPI implements AutoCloseable {
*/
public SPI(Port port) {
m_port = (byte) port.value;
devices++;
SPIJNI.spiInitialize(m_port);
HAL.report(tResourceType.kResourceType_SPI, devices);
HAL.report(tResourceType.kResourceType_SPI, port.value);
}