diff --git a/hal/src/generate/Instances.txt b/hal/src/generate/Instances.txt index 93b09f78e4..3211479de1 100644 --- a/hal/src/generate/Instances.txt +++ b/hal/src/generate/Instances.txt @@ -70,7 +70,7 @@ kDashboard_Shuffleboard = 4 kDashboard_Elastic = 5 kDashboard_LabVIEW = 6 kDashboard_AdvantageScope = 7 -kDashboard_QFRCDashboard = 8 +kDashboard_QDash = 8 kDashboard_FRCWebComponents = 9 kDataLogLocation_Onboard = 1 kDataLogLocation_USB = 2 diff --git a/hal/src/generated/main/java/edu/wpi/first/hal/FRCNetComm.java b/hal/src/generated/main/java/edu/wpi/first/hal/FRCNetComm.java index d2b5ebd93a..8931ffde21 100644 --- a/hal/src/generated/main/java/edu/wpi/first/hal/FRCNetComm.java +++ b/hal/src/generated/main/java/edu/wpi/first/hal/FRCNetComm.java @@ -447,8 +447,8 @@ public final class FRCNetComm { public static final int kDashboard_LabVIEW = 6; /** kDashboard_AdvantageScope = 7. */ public static final int kDashboard_AdvantageScope = 7; - /** kDashboard_QFRCDashboard = 8. */ - public static final int kDashboard_QFRCDashboard = 8; + /** kDashboard_QDash = 8. */ + public static final int kDashboard_QDash = 8; /** kDashboard_FRCWebComponents = 9. */ public static final int kDashboard_FRCWebComponents = 9; /** kDataLogLocation_Onboard = 1. */ diff --git a/hal/src/generated/main/native/include/hal/FRCUsageReporting.h b/hal/src/generated/main/native/include/hal/FRCUsageReporting.h index 6d6c2b01b3..06707a4235 100644 --- a/hal/src/generated/main/native/include/hal/FRCUsageReporting.h +++ b/hal/src/generated/main/native/include/hal/FRCUsageReporting.h @@ -262,7 +262,7 @@ namespace HALUsageReporting { kDashboard_Elastic = 5, kDashboard_LabVIEW = 6, kDashboard_AdvantageScope = 7, - kDashboard_QFRCDashboard = 8, + kDashboard_QDash = 8, kDashboard_FRCWebComponents = 9, kDataLogLocation_Onboard = 1, kDataLogLocation_USB = 2, diff --git a/hal/src/generated/main/native/include/hal/UsageReporting.h b/hal/src/generated/main/native/include/hal/UsageReporting.h index 1230e187f6..c9f7a0dcc7 100644 --- a/hal/src/generated/main/native/include/hal/UsageReporting.h +++ b/hal/src/generated/main/native/include/hal/UsageReporting.h @@ -235,7 +235,7 @@ typedef enum kDashboard_Elastic = 5, kDashboard_LabVIEW = 6, kDashboard_AdvantageScope = 7, - kDashboard_QFRCDashboard = 8, + kDashboard_QDash = 8, kDashboard_FRCWebComponents = 9, kDataLogLocation_Onboard = 1, kDataLogLocation_USB = 2, diff --git a/wpilibc/src/main/native/cppcs/RobotBase.cpp b/wpilibc/src/main/native/cppcs/RobotBase.cpp index 69dc19e9b4..fe4cd3f866 100644 --- a/wpilibc/src/main/native/cppcs/RobotBase.cpp +++ b/wpilibc/src/main/native/cppcs/RobotBase.cpp @@ -306,10 +306,11 @@ RobotBase::RobotBase() { HAL_Report(HALUsageReporting::kResourceType_Dashboard, HALUsageReporting::kDashboard_AdvantageScope); m_dashboardDetected = true; - } else if (event.GetConnectionInfo()->remote_id.starts_with( + } else if (event.GetConnectionInfo()->remote_id.starts_with("QDash") || + event.GetConnectionInfo()->remote_id.starts_with( "QFRCDashboard")) { HAL_Report(HALUsageReporting::kResourceType_Dashboard, - HALUsageReporting::kDashboard_QFRCDashboard); + HALUsageReporting::kDashboard_QDash); m_dashboardDetected = true; } else if (event.GetConnectionInfo()->remote_id.starts_with( "FRC Web Components")) { diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java index 02b9c84137..aa927f3e32 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java @@ -211,9 +211,9 @@ public abstract class RobotBase implements AutoCloseable { HAL.report( tResourceType.kResourceType_Dashboard, tInstances.kDashboard_AdvantageScope); m_dashboardDetected = true; - } else if (event.connInfo.remote_id.startsWith("QFRCDashboard")) { - HAL.report( - tResourceType.kResourceType_Dashboard, tInstances.kDashboard_QFRCDashboard); + } else if (event.connInfo.remote_id.startsWith("QDash") + || event.connInfo.remote_id.startsWith("QFRCDashboard")) { + HAL.report(tResourceType.kResourceType_Dashboard, tInstances.kDashboard_QDash); m_dashboardDetected = true; } else if (event.connInfo.remote_id.startsWith("FRC Web Components")) { HAL.report(