From 2e4685964663534690767812b902e14f844257b3 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Thu, 28 Sep 2023 10:47:52 -0700 Subject: [PATCH] Use motor shaft instead of output shaft (#524) --- sysid-application/src/main/native/cpp/view/Analyzer.cpp | 4 ++-- sysid-application/src/main/native/cpp/view/Logger.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sysid-application/src/main/native/cpp/view/Analyzer.cpp b/sysid-application/src/main/native/cpp/view/Analyzer.cpp index b11ca4bb..2b6b1884 100644 --- a/sysid-application/src/main/native/cpp/view/Analyzer.cpp +++ b/sysid-application/src/main/native/cpp/view/Analyzer.cpp @@ -764,8 +764,8 @@ void Analyzer::DisplayFeedbackGains() { UpdateFeedbackGains(); } sysid::CreateTooltip( - "The gearing between the encoder and the output shaft (# of " - "encoder turns / # of output shaft turns)."); + "The gearing between the encoder and the motor shaft (# of encoder " + "turns / # of motor shaft turns)."); ImGui::SetNextItemWidth(ImGui::GetFontSize() * 5); if (ImGui::InputInt("CPR", &m_settings.cpr, 0, 0, diff --git a/sysid-application/src/main/native/cpp/view/Logger.cpp b/sysid-application/src/main/native/cpp/view/Logger.cpp index 4f1afeec..5e7773db 100644 --- a/sysid-application/src/main/native/cpp/view/Logger.cpp +++ b/sysid-application/src/main/native/cpp/view/Logger.cpp @@ -98,7 +98,7 @@ void Logger::Display() { m_isRotationalUnits ? ImGuiInputTextFlags_ReadOnly : ImGuiInputTextFlags_None); sysid::CreateTooltip( - "The logger assumes that the code will be sending recorded output shaft " + "The logger assumes that the code will be sending recorded motor shaft " "rotations over NetworkTables. This value will then be multiplied by the " "units per rotation to get the measurement in the units you " "specified.\n\nFor non-rotational units (e.g. meters), this value is "