From 9e183305864704c8656362bad8bdacaf2a8162e2 Mon Sep 17 00:00:00 2001
From: Peter Johnson <johnson.peter@gmail.com>
Date: Sun, 13 Dec 2015 17:40:34 -0800
Subject: [PATCH] Report usage for ADXL362 and ADRXS450.

Change-Id: I31c6b76923923606ea2838f346b24375b97b01ef
---
 hal/include/HAL/HAL.hpp                       | 10 ++++++---
 wpilibc/Athena/src/ADXL362.cpp                |  2 +-
 wpilibc/Athena/src/ADXRS450_Gyro.cpp          |  2 +-
 .../java/edu/wpi/first/wpilibj/ADXL362.java   |  2 +-
 .../edu/wpi/first/wpilibj/ADXRS450_Gyro.java  |  2 +-
 .../FRCNetworkCommunicationsLibrary.java      | 22 ++++++++++++++++++-
 6 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/hal/include/HAL/HAL.hpp b/hal/include/HAL/HAL.hpp
index 4d08f8303c..4ea9adc4a9 100644
--- a/hal/include/HAL/HAL.hpp
+++ b/hal/include/HAL/HAL.hpp
@@ -92,9 +92,12 @@ namespace HALUsageReporting
 		kResourceType_HiTechnicCompass,
 		kResourceType_SRF08,
 		kResourceType_AnalogOutput,
-        kResourceType_VictorSP,
-        kResourceType_TalonSRX,
-        kResourceType_CANTalonSRX,
+		kResourceType_VictorSP,
+		kResourceType_TalonSRX,
+		kResourceType_CANTalonSRX,
+		kResourceType_ADXL362,
+		kResourceType_ADXRS450,
+		kResourceType_RevSPARK,
 		kResourceType_DigitalGlitchFilter,
 	};
 
@@ -110,6 +113,7 @@ namespace HALUsageReporting
 
 		kFramework_Iterative = 1,
 		kFramework_Sample = 2,
+		kFramework_CommandControl = 3,
 
 		kRobotDrive_ArcadeStandard = 1,
 		kRobotDrive_ArcadeButtonSpin = 2,
diff --git a/wpilibc/Athena/src/ADXL362.cpp b/wpilibc/Athena/src/ADXL362.cpp
index 0bd990efad..3c70b9b20f 100644
--- a/wpilibc/Athena/src/ADXL362.cpp
+++ b/wpilibc/Athena/src/ADXL362.cpp
@@ -68,7 +68,7 @@ ADXL362::ADXL362(SPI::Port port, Range range) : m_spi(port) {
   commands[2] = kPowerCtl_Measure | kPowerCtl_UltraLowNoise;
   m_spi.Write(commands, 3);
 
-  //HALReport(HALUsageReporting::kResourceType_ADXL362, 0);
+  HALReport(HALUsageReporting::kResourceType_ADXL362, port);
 
   LiveWindow::GetInstance()->AddSensor("ADXL362", port, this);
 }
diff --git a/wpilibc/Athena/src/ADXRS450_Gyro.cpp b/wpilibc/Athena/src/ADXRS450_Gyro.cpp
index 2c9917690b..6b111cf5f5 100644
--- a/wpilibc/Athena/src/ADXRS450_Gyro.cpp
+++ b/wpilibc/Athena/src/ADXRS450_Gyro.cpp
@@ -74,7 +74,7 @@ ADXRS450_Gyro::ADXRS450_Gyro(SPI::Port port) : m_spi(port) {
 
   Calibrate();
 
-  //HALReport(HALUsageReporting::kResourceType_ADXRS450, port);
+  HALReport(HALUsageReporting::kResourceType_ADXRS450, port);
   LiveWindow::GetInstance()->AddSensor("ADXRS450_Gyro", port, this);
 }
 
diff --git a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/ADXL362.java b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/ADXL362.java
index d451e8eaf7..ef50e14f82 100644
--- a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/ADXL362.java
+++ b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/ADXL362.java
@@ -108,7 +108,7 @@ public class ADXL362 extends SensorBase implements Accelerometer, LiveWindowSend
     transferBuffer.put(2, (byte) (kPowerCtl_Measure | kPowerCtl_UltraLowNoise));
     m_spi.write(transferBuffer, 3);
 
-    //UsageReporting.report(tResourceType.kResourceType_ADXL362, 0);
+    UsageReporting.report(tResourceType.kResourceType_ADXL362, port.getValue());
     LiveWindow.addSensor("ADXL362", port.getValue(), this);
   }
 
diff --git a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/ADXRS450_Gyro.java b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/ADXRS450_Gyro.java
index f05844c833..5ec7962fbd 100644
--- a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/ADXRS450_Gyro.java
+++ b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/ADXRS450_Gyro.java
@@ -78,7 +78,7 @@ public class ADXRS450_Gyro extends GyroBase implements Gyro, PIDSource, LiveWind
 
     calibrate();
 
-    //UsageReporting.report(tResourceType.kResourceType_ADXRS450, port.getValue());
+    UsageReporting.report(tResourceType.kResourceType_ADXRS450, port.getValue());
     LiveWindow.addSensor("ADXRS450_Gyro", port.getValue(), this);
   }
 
diff --git a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/communication/FRCNetworkCommunicationsLibrary.java b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/communication/FRCNetworkCommunicationsLibrary.java
index 57de7a906c..7ed601dcc4 100644
--- a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/communication/FRCNetworkCommunicationsLibrary.java
+++ b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/communication/FRCNetworkCommunicationsLibrary.java
@@ -383,7 +383,22 @@ public class FRCNetworkCommunicationsLibrary extends JNIWrapper {
      * <i>native declaration :
      * src\main\include\NetworkCommunication\UsageReporting.h:63</i>
      */
-    public static final int kResourceType_DigitalGlitchFilter = 53;
+    public static final int kResourceType_ADXL362 = 53;
+    /**
+     * <i>native declaration :
+     * src\main\include\NetworkCommunication\UsageReporting.h:64</i>
+     */
+    public static final int kResourceType_ADXRS450 = 54;
+    /**
+     * <i>native declaration :
+     * src\main\include\NetworkCommunication\UsageReporting.h:65</i>
+     */
+    public static final int kResourceType_RevSPARK = 55;
+    /**
+     * <i>native declaration :
+     * src\main\include\NetworkCommunication\UsageReporting.h:66</i>
+     */
+    public static final int kResourceType_DigitalGlitchFilter = 56;
   };
   /**
    * <i>native declaration :
@@ -431,6 +446,11 @@ public class FRCNetworkCommunicationsLibrary extends JNIWrapper {
      * src\main\include\NetworkCommunication\UsageReporting.h:72</i>
      */
     public static final int kFramework_Sample = 2;
+    /**
+     * <i>native declaration :
+     * src\main\include\NetworkCommunication\UsageReporting.h:73</i>
+     */
+    public static final int kFramework_CommandControl = 3;
     /**
      * <i>native declaration :
      * src\main\include\NetworkCommunication\UsageReporting.h:74</i>