From beeefa235623aa8abff7baabd52aa52ed1058cd0 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Tue, 3 Nov 2015 10:38:19 -0800 Subject: [PATCH] kFramework_Simple was renamed to match the corresponding robot framework's name Change-Id: I0123e71e0bb56526fe187cd17cb71a8278739cd5 --- .../src/main/java/edu/wpi/first/wpilibj/SampleRobot.java | 2 +- .../wpilibj/communication/FRCNetworkCommunicationsLibrary.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/SampleRobot.java b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/SampleRobot.java index 38280fe478..99c8c54658 100644 --- a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/SampleRobot.java +++ b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/SampleRobot.java @@ -114,7 +114,7 @@ public class SampleRobot extends RobotBase { * wait for the robot to be enabled again. */ public void startCompetition() { - UsageReporting.report(tResourceType.kResourceType_Framework, tInstances.kFramework_Simple); + UsageReporting.report(tResourceType.kResourceType_Framework, tInstances.kFramework_Sample); robotMain(); if (!m_robotMainOverridden) { diff --git a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/communication/FRCNetworkCommunicationsLibrary.java b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/communication/FRCNetworkCommunicationsLibrary.java index 38fb281438..016a059399 100644 --- a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/communication/FRCNetworkCommunicationsLibrary.java +++ b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/communication/FRCNetworkCommunicationsLibrary.java @@ -425,7 +425,7 @@ public class FRCNetworkCommunicationsLibrary extends JNIWrapper { * native declaration : * src\main\include\NetworkCommunication\UsageReporting.h:72 */ - public static final int kFramework_Simple = 2; + public static final int kFramework_Sample = 2; /** * native declaration : * src\main\include\NetworkCommunication\UsageReporting.h:74