Skip to content

Commit c894012

Browse files
authored
[hal, wpilib] Usage Reporting: QFRCDashboard -> QDash (#8571)
1 parent 8be7720 commit c894012

File tree

6 files changed

+11
-10
lines changed

6 files changed

+11
-10
lines changed

hal/src/generate/Instances.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ kDashboard_Shuffleboard = 4
7070
kDashboard_Elastic = 5
7171
kDashboard_LabVIEW = 6
7272
kDashboard_AdvantageScope = 7
73-
kDashboard_QFRCDashboard = 8
73+
kDashboard_QDash = 8
7474
kDashboard_FRCWebComponents = 9
7575
kDataLogLocation_Onboard = 1
7676
kDataLogLocation_USB = 2

hal/src/generated/main/java/edu/wpi/first/hal/FRCNetComm.java

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

hal/src/generated/main/native/include/hal/FRCUsageReporting.h

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

hal/src/generated/main/native/include/hal/UsageReporting.h

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wpilibc/src/main/native/cppcs/RobotBase.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,10 +306,11 @@ RobotBase::RobotBase() {
306306
HAL_Report(HALUsageReporting::kResourceType_Dashboard,
307307
HALUsageReporting::kDashboard_AdvantageScope);
308308
m_dashboardDetected = true;
309-
} else if (event.GetConnectionInfo()->remote_id.starts_with(
309+
} else if (event.GetConnectionInfo()->remote_id.starts_with("QDash") ||
310+
event.GetConnectionInfo()->remote_id.starts_with(
310311
"QFRCDashboard")) {
311312
HAL_Report(HALUsageReporting::kResourceType_Dashboard,
312-
HALUsageReporting::kDashboard_QFRCDashboard);
313+
HALUsageReporting::kDashboard_QDash);
313314
m_dashboardDetected = true;
314315
} else if (event.GetConnectionInfo()->remote_id.starts_with(
315316
"FRC Web Components")) {

wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,9 +211,9 @@ protected RobotBase() {
211211
HAL.report(
212212
tResourceType.kResourceType_Dashboard, tInstances.kDashboard_AdvantageScope);
213213
m_dashboardDetected = true;
214-
} else if (event.connInfo.remote_id.startsWith("QFRCDashboard")) {
215-
HAL.report(
216-
tResourceType.kResourceType_Dashboard, tInstances.kDashboard_QFRCDashboard);
214+
} else if (event.connInfo.remote_id.startsWith("QDash")
215+
|| event.connInfo.remote_id.startsWith("QFRCDashboard")) {
216+
HAL.report(tResourceType.kResourceType_Dashboard, tInstances.kDashboard_QDash);
217217
m_dashboardDetected = true;
218218
} else if (event.connInfo.remote_id.startsWith("FRC Web Components")) {
219219
HAL.report(

0 commit comments

Comments
 (0)