Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-02 02:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move subsystem command metadata to metadata key format (#863)

Browse Source
This commit is contained in:
Sam Carlberg
2018-01-01 17:05:03 -05:00
committed by bradamiller
parent 55b6764d50
commit 8346caed9c
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wpilibc/src/main/native/cpp/Commands/Subsystem.cpp
View File

@@ -207,12 +207,12 @@ void Subsystem::InitSendable(SendableBuilder& builder) {
builder.SetSmartDashboardType("Subsystem");
builder.AddBooleanProperty(
"hasDefault", [=]() { return m_defaultCommand != nullptr; }, nullptr);
builder.AddStringProperty("default",
".hasDefault", [=]() { return m_defaultCommand != nullptr; }, nullptr);
builder.AddStringProperty(".default",
[=]() { return GetDefaultCommandName(); }, nullptr);
builder.AddBooleanProperty(
"hasCommand", [=]() { return m_currentCommand != nullptr; }, nullptr);
builder.AddStringProperty("command",
".hasCommand", [=]() { return m_currentCommand != nullptr; }, nullptr);
builder.AddStringProperty(".command",
[=]() { return GetCurrentCommandName(); }, nullptr);
}

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

@@ -213,9 +213,9 @@ public abstract class Subsystem extends SendableBase implements Sendable {
public void initSendable(SendableBuilder builder) {
builder.setSmartDashboardType("Subsystem");
builder.addBooleanProperty("hasDefault", () -> m_defaultCommand != null, null);
builder.addStringProperty("default", this::getDefaultCommandName, null);
builder.addBooleanProperty("hasCommand", () -> m_currentCommand != null, null);
builder.addStringProperty("command", this::getCurrentCommandName, null);
builder.addBooleanProperty(".hasDefault", () -> m_defaultCommand != null, null);
builder.addStringProperty(".default", this::getDefaultCommandName, null);
builder.addBooleanProperty(".hasCommand", () -> m_currentCommand != null, null);
builder.addStringProperty(".command", this::getCurrentCommandName, null);
}
}