Skip to content
This repository has been archived by the owner on Oct 1, 2023. It is now read-only.

Use motor shaft instead of output shaft #524

Merged
merged 1 commit into from
Sep 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sysid-application/src/main/native/cpp/view/Analyzer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion sysid-application/src/main/native/cpp/view/Logger.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 "
Expand Down