Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wpilib] Sendable: Don't call setter for getter changes

Browse Source
This commit is contained in:
Peter Johnson
2022-12-05 23:08:40 -08:00
parent 342c375a71
commit b9772214d9
2 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wpilibc/src/main/native/cpp/smartdashboard/SendableBuilderImpl.cpp
View File

@@ -130,7 +130,8 @@ void SendableBuilderImpl::AddPropertyImpl(Topic topic, Getter getter,
};
}
if (setter) {
prop->sub = topic.Subscribe({});
prop->sub = topic.Subscribe(
{}, {{nt::PubSubOption::ExcludePublisher(prop->pub.GetHandle())}});
prop->updateLocal = [=](auto& sub) {
for (auto&& val : sub.ReadQueue()) {
setter(val.value);
@@ -223,7 +224,9 @@ void SendableBuilderImpl::AddRawProperty(
};
}
if (setter) {
prop->sub = topic.Subscribe(typeString, {});
prop->sub = topic.Subscribe(
typeString, {},
{{nt::PubSubOption::ExcludePublisher(prop->pub.GetHandle())}});
prop->updateLocal = [=](auto& sub) {
for (auto&& val : sub.ReadQueue()) {
setter(val.value);
@@ -246,7 +249,8 @@ void SendableBuilderImpl::AddSmallPropertyImpl(Topic topic, Getter getter,
};
}
if (setter) {
prop->sub = topic.Subscribe({});
prop->sub = topic.Subscribe(
{}, {{nt::PubSubOption::ExcludePublisher(prop->pub.GetHandle())}});
prop->updateLocal = [=](auto& sub) {
for (auto&& val : sub.ReadQueue()) {
setter(val.value);
@@ -324,7 +328,9 @@ void SendableBuilderImpl::AddSmallRawProperty(
};
}
if (setter) {
prop->sub = topic.Subscribe(typeString, {});
prop->sub = topic.Subscribe(
typeString, {},
{{nt::PubSubOption::ExcludePublisher(prop->pub.GetHandle())}});
prop->updateLocal = [=](auto& sub) {
for (auto&& val : sub.ReadQueue()) {
setter(val.value);