diff --git a/glass/src/libnt/native/cpp/NetworkTables.cpp b/glass/src/libnt/native/cpp/NetworkTables.cpp index 63cf180e5a..be400e9267 100644 --- a/glass/src/libnt/native/cpp/NetworkTables.cpp +++ b/glass/src/libnt/native/cpp/NetworkTables.cpp @@ -616,9 +616,9 @@ static void DecodeSubscriberOptions( for (uint32_t j = 0; j < numMapElem; ++j) { std::string key; mpack_expect_str(&r, &key); - if (key == "immediate") { - options->immediate = mpack_expect_bool(&r); - } else if (key == "sendAll") { + if (key == "topicsonly") { + options->topicsOnly = mpack_expect_bool(&r); + } else if (key == "all") { options->sendAll = mpack_expect_bool(&r); } else if (key == "periodic") { options->periodic = mpack_expect_float(&r); @@ -1454,7 +1454,7 @@ static void DisplayClient(const NetworkTablesModel::Client& client) { ImGui::TableSetupColumn("Topics", ImGuiTableColumnFlags_WidthStretch, 6.0f); ImGui::TableSetupColumn("Periodic", ImGuiTableColumnFlags_WidthStretch, 1.0f); - ImGui::TableSetupColumn("Immediate", ImGuiTableColumnFlags_WidthStretch, + ImGui::TableSetupColumn("Topics Only", ImGuiTableColumnFlags_WidthStretch, 1.0f); ImGui::TableSetupColumn("Send All", ImGuiTableColumnFlags_WidthStretch, 1.0f); @@ -1470,7 +1470,7 @@ static void DisplayClient(const NetworkTablesModel::Client& client) { ImGui::TableNextColumn(); ImGui::Text("%0.3f", sub.options.periodic); ImGui::TableNextColumn(); - ImGui::Text(sub.options.immediate ? "Yes" : "No"); + ImGui::Text(sub.options.topicsOnly ? "Yes" : "No"); ImGui::TableNextColumn(); ImGui::Text(sub.options.sendAll ? "Yes" : "No"); ImGui::TableNextColumn(); diff --git a/glass/src/libnt/native/include/glass/networktables/NetworkTables.h b/glass/src/libnt/native/include/glass/networktables/NetworkTables.h index 66f5fceb14..35444f65c1 100644 --- a/glass/src/libnt/native/include/glass/networktables/NetworkTables.h +++ b/glass/src/libnt/native/include/glass/networktables/NetworkTables.h @@ -30,7 +30,7 @@ class NetworkTablesModel : public Model { public: struct SubscriberOptions { float periodic = 0.1f; - bool immediate = false; + bool topicsOnly = false; bool sendAll = false; bool prefixMatch = false; // std::string otherStr;