Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-24 01:31:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[glass, wpilib] Replace remaining references to Speed Controller with Motor Controller (#4769)

Browse Source
This commit is contained in:
Jordan McMichael
2022-12-05 23:06:43 -05:00
committed by GitHub
parent 72e21a1ed1
commit 8618dd4160
20 changed files with 63 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
glass/src/libnt/native/cpp/NTSpeedController.cpp → glass/src/libnt/native/cpp/NTMotorController.cpp
View File

@@ -2,17 +2,17 @@
// Open Source Software; you can modify and/or share it under the terms of
// the WPILib BSD license file in the root directory of this project.
#include "glass/networktables/NTSpeedController.h"
#include "glass/networktables/NTMotorController.h"
#include <fmt/format.h>
#include <wpi/StringExtras.h>
using namespace glass;
NTSpeedControllerModel::NTSpeedControllerModel(std::string_view path)
: NTSpeedControllerModel(nt::NetworkTableInstance::GetDefault(), path) {}
NTMotorControllerModel::NTMotorControllerModel(std::string_view path)
: NTMotorControllerModel(nt::NetworkTableInstance::GetDefault(), path) {}
NTSpeedControllerModel::NTSpeedControllerModel(nt::NetworkTableInstance inst,
NTMotorControllerModel::NTMotorControllerModel(nt::NetworkTableInstance inst,
std::string_view path)
: m_inst{inst},
m_value{inst.GetDoubleTopic(fmt::format("{}/Value", path))
@@ -23,11 +23,11 @@ NTSpeedControllerModel::NTSpeedControllerModel(nt::NetworkTableInstance inst,
m_valueData{fmt::format("NT_SpdCtrl:{}", path)},
m_nameValue{wpi::rsplit(path, '/').second} {}
void NTSpeedControllerModel::SetPercent(double value) {
void NTMotorControllerModel::SetPercent(double value) {
m_value.Set(value);
}
void NTSpeedControllerModel::Update() {
void NTMotorControllerModel::Update() {
for (auto&& v : m_value.ReadQueue()) {
m_valueData.SetValue(v.value, v.time);
}
@@ -39,6 +39,6 @@ void NTSpeedControllerModel::Update() {
}
}
bool NTSpeedControllerModel::Exists() {
bool NTMotorControllerModel::Exists() {
return m_value.Exists();
}

8
glass/src/libnt/native/cpp/StandardNetworkTables.cpp
View File

@@ -12,8 +12,8 @@
#include "glass/networktables/NTGyro.h"
#include "glass/networktables/NTMecanumDrive.h"
#include "glass/networktables/NTMechanism2D.h"
#include "glass/networktables/NTMotorController.h"
#include "glass/networktables/NTPIDController.h"
#include "glass/networktables/NTSpeedController.h"
#include "glass/networktables/NTStringChooser.h"
#include "glass/networktables/NTSubsystem.h"
#include "glass/networktables/NetworkTablesProvider.h"
@@ -142,14 +142,14 @@ void glass::AddStandardNetworkTablesViews(NetworkTablesProvider& provider) {
});
});
provider.Register(
NTSpeedControllerModel::kType,
NTMotorControllerModel::kType,
[](nt::NetworkTableInstance inst, const char* path) {
return std::make_unique<NTSpeedControllerModel>(inst, path);
return std::make_unique<NTMotorControllerModel>(inst, path);
},
[](Window* win, Model* model, const char* path) {
win->SetFlags(ImGuiWindowFlags_AlwaysAutoResize);
return MakeFunctionView([=] {
DisplaySpeedController(static_cast<NTSpeedControllerModel*>(model));
DisplayMotorController(static_cast<NTMotorControllerModel*>(model));
});
});
provider.Register(