From 7bc0380694916fdb0082c6a746d1d937d6258c03 Mon Sep 17 00:00:00 2001 From: DeltaDizzy Date: Sun, 21 Apr 2024 22:30:43 -0500 Subject: [PATCH] [commands] WrappedCommand: Call wrapped command initSendable (#6471) --- .../java/edu/wpi/first/wpilibj2/command/WrapperCommand.java | 6 ++++++ .../src/main/native/cpp/frc2/command/WrapperCommand.cpp | 4 ++++ .../src/main/native/include/frc2/command/WrapperCommand.h | 2 ++ 3 files changed, 12 insertions(+) diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/WrapperCommand.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/WrapperCommand.java index 5e6ccaef82b..00a1d887728 100644 --- a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/WrapperCommand.java +++ b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/WrapperCommand.java @@ -4,6 +4,7 @@ package edu.wpi.first.wpilibj2.command; +import edu.wpi.first.util.sendable.SendableBuilder; import java.util.Set; /** @@ -100,4 +101,9 @@ public boolean runsWhenDisabled() { public InterruptionBehavior getInterruptionBehavior() { return m_command.getInterruptionBehavior(); } + + @Override + public void initSendable(SendableBuilder builder) { + m_command.initSendable(builder); + } } diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/WrapperCommand.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/WrapperCommand.cpp index 6391294f307..2e1b280d693 100644 --- a/wpilibNewCommands/src/main/native/cpp/frc2/command/WrapperCommand.cpp +++ b/wpilibNewCommands/src/main/native/cpp/frc2/command/WrapperCommand.cpp @@ -43,3 +43,7 @@ Command::InterruptionBehavior WrapperCommand::GetInterruptionBehavior() const { wpi::SmallSet WrapperCommand::GetRequirements() const { return m_command->GetRequirements(); } + +void WrapperCommand::InitSendable(wpi::SendableBuilder& builder) { + m_command->InitSendable(builder); +} diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/WrapperCommand.h b/wpilibNewCommands/src/main/native/include/frc2/command/WrapperCommand.h index 97a8693dc0b..e6a2b9ffa73 100644 --- a/wpilibNewCommands/src/main/native/include/frc2/command/WrapperCommand.h +++ b/wpilibNewCommands/src/main/native/include/frc2/command/WrapperCommand.h @@ -68,6 +68,8 @@ class WrapperCommand : public CommandHelper { wpi::SmallSet GetRequirements() const override; + void InitSendable(wpi::SendableBuilder& builder) override; + protected: /// Command being wrapped. std::unique_ptr m_command;