Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-28 02:11:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix subsystem LiveWindow usage (#2202)

Browse Source
This commit is contained in:
Peter Johnson
2019-12-29 21:28:38 -06:00
committed by GitHub
parent 8b4508ad53
commit 9abce8eb06
4 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/SubsystemBase.java
View File

@@ -76,7 +76,6 @@ public abstract class SubsystemBase implements Subsystem, Sendable {
*/
public void addChild(String name, Sendable child) {
SendableRegistry.addLW(child, getSubsystem(), name);
SendableRegistry.addChild(this, child);
}
@Override

1
wpilibNewCommands/src/main/native/cpp/frc2/command/SubsystemBase.cpp
View File

@@ -63,5 +63,4 @@ void SubsystemBase::SetSubsystem(const wpi::Twine& name) {
void SubsystemBase::AddChild(std::string name, frc::Sendable* child) {
auto& registry = frc::SendableRegistry::GetInstance();
registry.AddLW(child, GetSubsystem(), name);
registry.AddChild(this, child);
}

2
wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/Subsystem.java
View File

@@ -184,7 +184,6 @@ public abstract class Subsystem implements Sendable, AutoCloseable {
*/
public void addChild(String name, Sendable child) {
SendableRegistry.addLW(child, getSubsystem(), name);
SendableRegistry.addChild(this, child);
}
/**
@@ -195,7 +194,6 @@ public abstract class Subsystem implements Sendable, AutoCloseable {
public void addChild(Sendable child) {
SendableRegistry.setSubsystem(child, getSubsystem());
SendableRegistry.enableLiveWindow(child);
SendableRegistry.addChild(this, child);
}
/**

2
wpilibOldCommands/src/main/native/cpp/commands/Subsystem.cpp
View File

@@ -101,7 +101,6 @@ void Subsystem::AddChild(const wpi::Twine& name, Sendable* child) {
void Subsystem::AddChild(const wpi::Twine& name, Sendable& child) {
auto& registry = SendableRegistry::GetInstance();
registry.AddLW(&child, registry.GetSubsystem(this), name);
registry.AddChild(this, &child);
}
void Subsystem::AddChild(std::shared_ptr<Sendable> child) { AddChild(*child); }
@@ -112,7 +111,6 @@ void Subsystem::AddChild(Sendable& child) {
auto& registry = SendableRegistry::GetInstance();
registry.SetSubsystem(&child, registry.GetSubsystem(this));
registry.EnableLiveWindow(&child);
registry.AddChild(this, &child);
}
void Subsystem::ConfirmCommand() {