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] Shuffleboard: Keep duplicates on SelectTab() (#5198)

Browse Source
This commit is contained in:
Starlight220
2023-03-27 06:12:55 +03:00
committed by GitHub
parent 63512bbbb8
commit aa34aacf6e
4 changed files with 57 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/ShuffleboardInstance.java
View File

@@ -10,6 +10,7 @@ import edu.wpi.first.hal.FRCNetComm.tResourceType;
import edu.wpi.first.hal.HAL;
import edu.wpi.first.networktables.NetworkTable;
import edu.wpi.first.networktables.NetworkTableInstance;
import edu.wpi.first.networktables.PubSubOption;
import edu.wpi.first.networktables.StringPublisher;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -32,7 +33,8 @@ final class ShuffleboardInstance implements ShuffleboardRoot {
requireNonNullParam(ntInstance, "ntInstance", "ShuffleboardInstance");
m_rootTable = ntInstance.getTable(Shuffleboard.kBaseTableName);
m_rootMetaTable = m_rootTable.getSubTable(".metadata");
m_selectedTabPub = m_rootMetaTable.getStringTopic("Selected").publish();
m_selectedTabPub =
m_rootMetaTable.getStringTopic("Selected").publish(PubSubOption.keepDuplicates(true));
HAL.report(tResourceType.kResourceType_Shuffleboard, 0);
}

27
wpilibj/src/test/java/edu/wpi/first/wpilibj/shuffleboard/ShuffleboardInstanceTest.java
View File

@@ -11,7 +11,10 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import edu.wpi.first.networktables.GenericEntry;
import edu.wpi.first.networktables.NetworkTableEntry;
import edu.wpi.first.networktables.NetworkTableEvent.Kind;
import edu.wpi.first.networktables.NetworkTableInstance;
import java.util.EnumSet;
import java.util.concurrent.atomic.AtomicInteger;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -121,4 +124,28 @@ class ShuffleboardInstanceTest {
controllable = controllableEntry.getValue().getBoolean();
assertFalse(controllable, "The nested actuator widget should have been disabled");
}
@Test
void testDuplicateSelectTabs() {
int listener = 0;
AtomicInteger counter = new AtomicInteger();
try {
listener =
m_ntInstance.addListener(
m_ntInstance.getStringTopic("/Shuffleboard/.metadata/Selected"),
EnumSet.of(Kind.kValueAll, Kind.kImmediate),
event -> counter.incrementAndGet());
// There shouldn't be anything there
assertEquals(0, counter.get());
m_shuffleboardInstance.selectTab("tab1");
m_shuffleboardInstance.selectTab("tab1");
assertTrue(m_ntInstance.waitForListenerQueue(0.005), "Listener queue timed out!");
assertEquals(2, counter.get());
} finally {
m_ntInstance.removeListener(listener);
}
}
}