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

[sysid] Update JSON library usage (#5765)

Browse Source
This commit is contained in:
Tyler Veness
2023-10-14 23:52:50 -07:00
committed by GitHub
parent 638f04f626
commit 1f6492e3d8
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sysid/src/main/native/cpp/analysis/AnalysisManager.cpp
View File

@@ -12,9 +12,9 @@
#include <fmt/format.h>
#include <units/angle.h>
#include <units/math.h>
#include <wpi/MemoryBuffer.h>
#include <wpi/StringExtras.h>
#include <wpi/StringMap.h>
#include <wpi/raw_istream.h>
#include "sysid/Util.h"
#include "sysid/analysis/FilteringUtils.h"
@@ -451,13 +451,13 @@ AnalysisManager::AnalysisManager(std::string_view path, Settings& settings,
{
// Read JSON from the specified path
std::error_code ec;
wpi::raw_fd_istream is{path, ec};
if (ec) {
std::unique_ptr<wpi::MemoryBuffer> fileBuffer =
wpi::MemoryBuffer::GetFile(path, ec);
if (fileBuffer == nullptr || ec) {
throw FileReadingError(path);
}
is >> m_json;
m_json = wpi::json::parse(fileBuffer->begin(), fileBuffer->end());
WPI_INFO(m_logger, "Read {}", path);
}
@@ -469,13 +469,13 @@ AnalysisManager::AnalysisManager(std::string_view path, Settings& settings,
// Read JSON from the specified path
std::error_code ec;
wpi::raw_fd_istream is{newPath, ec};
if (ec) {
std::unique_ptr<wpi::MemoryBuffer> fileBuffer =
wpi::MemoryBuffer::GetFile(path, ec);
if (fileBuffer == nullptr || ec) {
throw FileReadingError(newPath);
}
is >> m_json;
m_json = wpi::json::parse(fileBuffer->begin(), fileBuffer->end());
WPI_INFO(m_logger, "Read {}", newPath);
}

11
sysid/src/main/native/cpp/analysis/JSONConverter.cpp
View File

@@ -10,9 +10,9 @@
#include <fmt/core.h>
#include <fmt/format.h>
#include <wpi/Logger.h>
#include <wpi/MemoryBuffer.h>
#include <wpi/fmt/raw_ostream.h>
#include <wpi/json.h>
#include <wpi/raw_istream.h>
#include <wpi/raw_ostream.h>
#include "sysid/Util.h"
@@ -34,14 +34,13 @@ static constexpr size_t kRVelCol = 8;
static wpi::json GetJSON(std::string_view path, wpi::Logger& logger) {
std::error_code ec;
wpi::raw_fd_istream input{path, ec};
if (ec) {
std::unique_ptr<wpi::MemoryBuffer> fileBuffer =
wpi::MemoryBuffer::GetFile(path, ec);
if (fileBuffer == nullptr || ec) {
throw std::runtime_error(fmt::format("Unable to read: {}", path));
}
wpi::json json;
input >> json;
wpi::json json = wpi::json::parse(fileBuffer->begin(), fileBuffer->end());
WPI_INFO(logger, "Read frc-characterization JSON from {}", path);
return json;
}