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

Merge "HALUsageReporting::kFramework_Simple was renamed to match the corresponding robot framework's name"

Browse Source
This commit is contained in:
Brad Miller (WPI)
2015-11-03 08:10:14 -08:00
committed by Gerrit Code Review
parent bb52c2441e 231178c26a
commit a34f3f238b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,7 +108,7 @@ namespace HALUsageReporting
kCANPlugin_2CAN = 2,
kFramework_Iterative = 1,
kFramework_Simple = 2,
kFramework_Sample = 2,
kRobotDrive_ArcadeStandard = 1,
kRobotDrive_ArcadeButtonSpin = 2,

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

@@ -104,7 +104,7 @@ void SampleRobot::StartCompetition() {
LiveWindow *lw = LiveWindow::GetInstance();
HALReport(HALUsageReporting::kResourceType_Framework,
HALUsageReporting::kFramework_Simple);
HALUsageReporting::kFramework_Sample);
SmartDashboard::init();
NetworkTable::GetTable("LiveWindow")