ScpiClient: getters/setters/CTORs/assignment

BloomyControls · May 14, 2024 · 02f6b14 · 02f6b14
1 parent dd8eae6
commit 02f6b14
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 6 deletions.
diff --git a/include/bci/abs/ScpiClient.h b/include/bci/abs/ScpiClient.h
@@ -15,11 +15,29 @@ namespace bci::abs {
 
 class ScpiClient {
  public:
-  ScpiClient(std::shared_ptr<drivers::CommDriver> driver);
+  ScpiClient() = default;
 
-  ScpiClient(std::nullptr_t) = delete;
+  explicit ScpiClient(std::shared_ptr<drivers::CommDriver> driver) noexcept;
 
-  ~ScpiClient();
+  ScpiClient(ScpiClient&& other) noexcept;
+
+  ScpiClient(const ScpiClient&) = delete;
+
+  ScpiClient& operator=(ScpiClient&& rhs) noexcept;
+
+  ScpiClient& operator=(const ScpiClient&) = delete;
+
+  ~ScpiClient() = default;
+
+  std::shared_ptr<drivers::CommDriver> GetDriver() noexcept;
+
+  std::shared_ptr<const drivers::CommDriver> GetDriver() const noexcept;
+
+  void SetDriver(std::shared_ptr<drivers::CommDriver> driver) noexcept;
+
+  void SetDeviceID(unsigned int id);
+
+  unsigned int GetDeviceID() const;
 
   /* System */
 

diff --git a/src/ScpiClient.cpp b/src/ScpiClient.cpp
@@ -16,10 +16,43 @@ static constexpr unsigned int kReadTimeoutMs = 500;
 using util::Err;
 using ec = ErrorCode;
 
-ScpiClient::ScpiClient(std::shared_ptr<drivers::CommDriver> driver)
-    : driver_(std::move(driver)) {}
+ScpiClient::ScpiClient(std::shared_ptr<drivers::CommDriver> driver) noexcept
+    : driver_{std::move(driver)} {}
 
-ScpiClient::~ScpiClient() {}
+ScpiClient::ScpiClient(ScpiClient&& other) noexcept
+    : driver_{std::move(other.driver_)} {}
+
+ScpiClient& ScpiClient::operator=(ScpiClient&& rhs) noexcept {
+  driver_ = std::move(rhs.driver_);
+  return *this;
+}
+
+std::shared_ptr<drivers::CommDriver> ScpiClient::GetDriver() noexcept {
+  return driver_;
+}
+
+std::shared_ptr<const drivers::CommDriver> ScpiClient::GetDriver()
+    const noexcept {
+  return driver_;
+}
+
+void ScpiClient::SetDriver(
+    std::shared_ptr<drivers::CommDriver> driver) noexcept {
+  driver_ = std::move(driver);
+}
+
+void ScpiClient::SetDeviceID(unsigned int id) {
+  if (driver_) {
+    driver_->SetDeviceID(id);
+  }
+}
+
+unsigned int ScpiClient::GetDeviceID() const {
+  if (!driver_) {
+    return 0;
+  }
+  return driver_->GetDeviceID();
+}
 
 ErrorCode ScpiClient::Send(std::string_view buf) const {
   if (!driver_) {