Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[cmd] Revert "Call wrapped command initSendable (#6471)" #7353

Merged
merged 1 commit into from
Nov 6, 2024
Merged

[cmd] Revert "Call wrapped command initSendable (#6471)" #7353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 0 additions & 6 deletions wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/WrapperCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

package edu.wpi.first.wpilibj2.command;

import edu.wpi.first.util.sendable.SendableBuilder;
import java.util.Set;

/**
Expand Down Expand Up @@ -101,9 +100,4 @@ public boolean runsWhenDisabled() {
public InterruptionBehavior getInterruptionBehavior() {
return m_command.getInterruptionBehavior();
}

@Override
public void initSendable(SendableBuilder builder) {
m_command.initSendable(builder);
}
}
4 changes: 0 additions & 4 deletions wpilibNewCommands/src/main/native/cpp/frc2/command/WrapperCommand.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,3 @@ Command::InterruptionBehavior WrapperCommand::GetInterruptionBehavior() const {
wpi::SmallSet<Subsystem*, 4> WrapperCommand::GetRequirements() const {
return m_command->GetRequirements();
}

void WrapperCommand::InitSendable(wpi::SendableBuilder& builder) {
m_command->InitSendable(builder);
}
2 changes: 0 additions & 2 deletions wpilibNewCommands/src/main/native/include/frc2/command/WrapperCommand.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ class WrapperCommand : public CommandHelper<Command, WrapperCommand> {

wpi::SmallSet<Subsystem*, 4> GetRequirements() const override;

void InitSendable(wpi::SendableBuilder& builder) override;

protected:
/// Command being wrapped.
std::unique_ptr<Command> m_command;
Expand Down
Loading