Implement StructArray GetLastValue

wpilibsuite · Jun 2, 2024 · e666e60 · e666e60
1 parent a6ca861
commit e666e60
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/wpiutil/src/main/native/include/wpi/DataLog.h b/wpiutil/src/main/native/include/wpi/DataLog.h
@@ -1424,9 +1424,19 @@ class StructArrayLogEntry : public DataLogEntry {
     if (m_lastValue.empty()) {
       return std::nullopt;
     }
-    // FIXME
-    return std::apply(
-        [&](const I&... info) { m_buf.Read(m_lastValue, info...); }, m_info);
+    size_t size = std::apply(S::GetSize, m_info);
+    std::vector<T> rv;
+    rv.value.reserve(m_lastValue.size() / size);
+    for (auto in = m_lastValue.begin(), end = m_lastValue.end(); in < end;
+         in += size) {
+      std::apply(
+          [&](const I&... info) {
+            rv.value.emplace_back(S::Unpack(
+                std::span<const uint8_t>{std::to_address(in), size}, info...));
+          },
+          m_info);
+    }
+    return rv;
   }
 
  private: