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

[wpilib] Fix Shuffleboard SuppliedValueWidget (#4559)

Browse Source 
It was creating duplicate publishers.
This commit is contained in:
Peter Johnson
2022-11-02 22:49:52 -07:00
committed by GitHub
parent a9606ce870
commit 1831ef3e19
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wpilibc/src/main/native/include/frc/shuffleboard/SuppliedValueWidget.h
View File

@@ -36,12 +36,16 @@ class SuppliedValueWidget : public ShuffleboardWidget<SuppliedValueWidget<T>> {
void BuildInto(std::shared_ptr<nt::NetworkTable> parentTable,
std::shared_ptr<nt::NetworkTable> metaTable) override {
this->BuildMetadata(metaTable);
m_controllablePub =
nt::BooleanTopic{metaTable->GetTopic("Controllable")}.Publish();
m_controllablePub.Set(false);
if (!m_controllablePub) {
m_controllablePub =
nt::BooleanTopic{metaTable->GetTopic("Controllable")}.Publish();
m_controllablePub.Set(false);
}
m_entry =
parentTable->GetTopic(this->GetTitle()).GenericPublish(m_typeString);
if (!m_entry) {
m_entry =
parentTable->GetTopic(this->GetTitle()).GenericPublish(m_typeString);
}
m_setter(m_entry, m_supplier());
}

10
wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/SuppliedValueWidget.java
View File

@@ -48,10 +48,14 @@ public final class SuppliedValueWidget<T> extends ShuffleboardWidget<SuppliedVal
@Override
public void buildInto(NetworkTable parentTable, NetworkTable metaTable) {
buildMetadata(metaTable);
m_controllablePub = new BooleanTopic(metaTable.getTopic("Controllable")).publish();
m_controllablePub.set(false);
if (m_controllablePub == null) {
m_controllablePub = new BooleanTopic(metaTable.getTopic("Controllable")).publish();
m_controllablePub.set(false);
}
m_entry = parentTable.getTopic(getTitle()).genericPublish(m_typeString);
if (m_entry == null) {
m_entry = parentTable.getTopic(getTitle()).genericPublish(m_typeString);
}
m_setter.accept(m_entry, m_supplier.get());
}