Fixups

wpilibsuite · Dec 24, 2024 · b1f5f6c · b1f5f6c
1 parent 0cbee59
commit b1f5f6c
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 27 deletions.
diff --git a/glass/src/lib/native/cpp/DataSource.cpp b/glass/src/lib/native/cpp/DataSource.cpp
@@ -4,6 +4,8 @@
 
 #include "glass/DataSource.h"
 
+#include <string>
+
 #include <fmt/format.h>
 
 #include "glass/ContextInternal.h"

diff --git a/glass/src/lib/native/include/glass/DataSource.h b/glass/src/lib/native/include/glass/DataSource.h
@@ -8,6 +8,7 @@
 
 #include <string>
 #include <string_view>
+#include <utility>
 
 #include <imgui.h>
 #include <wpi/SmallVector.h>

diff --git a/glass/src/libnt/native/cpp/NTFMS.cpp b/glass/src/libnt/native/cpp/NTFMS.cpp
@@ -6,6 +6,8 @@
 
 #include <stdint.h>
 
+#include <utility>
+
 #include <fmt/format.h>
 #include <wpi/SmallVector.h>
 #include <wpi/timestamp.h>

diff --git a/glass/src/libnt/native/cpp/NetworkTables.cpp b/glass/src/libnt/native/cpp/NetworkTables.cpp
@@ -6,7 +6,6 @@
 
 #include <algorithm>
 #include <cinttypes>
-#include <concepts>
 #include <cstring>
 #include <functional>
 #include <initializer_list>
@@ -631,33 +630,40 @@ static void UpdateJsonValueSource(NetworkTablesModel& model,
   }
 }
 
-template <typename T>
 void NetworkTablesModel::ValueSource::UpdateDiscreteSource(
-    std::string_view name, T value, int64_t time) {
+    std::string_view name, bool value, int64_t time) {
   valueChildren.clear();
-  if constexpr (std::same_as<T, bool>) {
-    if (!source || source->GetKind() != DataSource::kBoolean) {
-      source = std::make_unique<BooleanSource>(fmt::format("NT:{}", name));
-    }
-    static_cast<BooleanSource*>(source.get())->SetValue(value, time);
-  } else if constexpr (std::same_as<T, double>) {
-    if (!source || source->GetKind() != DataSource::kDouble) {
-      source = std::make_unique<DoubleSource>(fmt::format("NT:{}", name));
-    }
-    static_cast<DoubleSource*>(source.get())->SetValue(value, time);
-  } else if constexpr (std::same_as<T, float>) {
-    if (!source || source->GetKind() != DataSource::kFloat) {
-      source = std::make_unique<FloatSource>(fmt::format("NT:{}", name));
-    }
-    static_cast<FloatSource*>(source.get())->SetValue(value, time);
-  } else if constexpr (std::same_as<T, int64_t>) {
-    if (!source || source->GetKind() != DataSource::kInteger) {
-      source = std::make_unique<IntegerSource>(fmt::format("NT:{}", name));
-    }
-    static_cast<IntegerSource*>(source.get())->SetValue(value, time);
-  } else {
-    static_assert(false, "Unknown type");
+  if (!source || source->GetKind() != DataSource::kBoolean) {
+    source = std::make_unique<BooleanSource>(fmt::format("NT:{}", name));
+  }
+  static_cast<BooleanSource*>(source.get())->SetValue(value, time);
+}
+
+void NetworkTablesModel::ValueSource::UpdateDiscreteSource(
+    std::string_view name, float value, int64_t time) {
+  valueChildren.clear();
+  if (!source || source->GetKind() != DataSource::kFloat) {
+    source = std::make_unique<FloatSource>(fmt::format("NT:{}", name));
+  }
+  static_cast<FloatSource*>(source.get())->SetValue(value, time);
+}
+
+void NetworkTablesModel::ValueSource::UpdateDiscreteSource(
+    std::string_view name, double value, int64_t time) {
+  valueChildren.clear();
+  if (!source || source->GetKind() != DataSource::kDouble) {
+    source = std::make_unique<DoubleSource>(fmt::format("NT:{}", name));
+  }
+  static_cast<DoubleSource*>(source.get())->SetValue(value, time);
+}
+
+void NetworkTablesModel::ValueSource::UpdateDiscreteSource(
+    std::string_view name, int64_t value, int64_t time) {
+  valueChildren.clear();
+  if (!source || source->GetKind() != DataSource::kInteger) {
+    source = std::make_unique<IntegerSource>(fmt::format("NT:{}", name));
   }
+  static_cast<IntegerSource*>(source.get())->SetValue(value, time);
 }
 
 template <bool IsBoolean, typename T, typename MakeValue>

diff --git a/glass/src/libnt/native/include/glass/networktables/NetworkTables.h b/glass/src/libnt/native/include/glass/networktables/NetworkTables.h
@@ -58,8 +58,12 @@ class NetworkTablesModel : public Model {
     bool valueChildrenMap = false;
 
    private:
-    template <typename T>
-    void UpdateDiscreteSource(std::string_view name, T value, int64_t time);
+    void UpdateDiscreteSource(std::string_view name, bool value, int64_t time);
+    void UpdateDiscreteSource(std::string_view name, float value, int64_t time);
+    void UpdateDiscreteSource(std::string_view name, double value,
+                              int64_t time);
+    void UpdateDiscreteSource(std::string_view name, int64_t value,
+                              int64_t time);
 
     template <bool IsBoolean, typename T, typename MakeValue>
     void UpdateDiscreteArray(std::string_view name, std::span<const T> arr,