ScpiClient: add calibration date query

BloomyControls · May 13, 2024 · 58e5c96 · 58e5c96
1 parent f608bb9
commit 58e5c96
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 0 deletions.
diff --git a/include/bci/abs/ScpiClient.h b/include/bci/abs/ScpiClient.h
@@ -27,6 +27,8 @@ class ScpiClient {
 
   Result<std::uint8_t> GetDeviceId() const;
 
+  Result<std::string> GetCalibrationDate() const;
+
   Result<int> GetErrorCount() const;
 
   Result<ScpiError> GetNextError() const;

diff --git a/src/ScpiClient_System.cpp b/src/ScpiClient_System.cpp
@@ -34,6 +34,10 @@ Result<std::uint8_t> ScpiClient::GetDeviceId() const {
       .and_then(scpi::ParseIntResponse<std::uint8_t>);
 }
 
+Result<std::string> ScpiClient::GetCalibrationDate() const {
+  return SendAndRecv("CAL:DATE?\r\n").and_then(scpi::ParseStringResponse);
+}
+
 Result<int> ScpiClient::GetErrorCount() const {
   return SendAndRecv("SYST:ERR:COUN?\r\n")
       .and_then(scpi::ParseIntResponse<int>);

diff --git a/src/ScpiUtil.cpp b/src/ScpiUtil.cpp
@@ -54,6 +54,15 @@ std::optional<std::string> ParseQuotedString(std::string_view str) {
   return ret;
 }
 
+Result<std::string> ParseStringResponse(std::string_view str) {
+  auto e = ParseQuotedString(util::Trim(str));
+  if (e) {
+    return *std::move(e);
+  } else {
+    return Err(ec::kInvalidResponse);
+  }
+}
+
 Result<ScpiError> ParseScpiError(std::string_view str) {
   str = util::Trim(str);
 

diff --git a/src/ScpiUtil.h b/src/ScpiUtil.h
@@ -318,6 +318,8 @@ constexpr Result<std::array<CellMode, kLen>> ParseCellOperatingModeArray(
 // Parse quoted SCPI <String> data.
 std::optional<std::string> ParseQuotedString(std::string_view str);
 
+Result<std::string> ParseStringResponse(std::string_view str);
+
 Result<ScpiError> ParseScpiError(std::string_view str);
 
 }  // namespace bci::abs::scpi