Skip to content
Snippets Groups Projects
Commit 5c7edf81 authored by Elisabetta Pianori's avatar Elisabetta Pianori
Browse files

Merge branch 'dantrim_virtual_setCom' into 'devel'

Make setCom methods virtual

See merge request !227
parents 2047f4b0 1db53f3e
No related branches found
No related tags found
6 merge requests!308Bring main and devel back in sync,!300playing with fixing divergence between devel and main,!287Updates for Julabo Chiller,!285Julabo Chiller Added with Fixed Pipeline Compatibility,!269Merge devel into main: largest change is code formatting checker and enforcement in CI,!227Make setCom methods virtual
Pipeline #2596759 passed
...@@ -25,7 +25,7 @@ class IChiller { ...@@ -25,7 +25,7 @@ class IChiller {
* *
* \param com ICom instance for communicating with the chiller * \param com ICom instance for communicating with the chiller
*/ */
void setCom(std::shared_ptr<ICom> com); virtual void setCom(std::shared_ptr<ICom> com);
//! Turn the chiller on //! Turn the chiller on
virtual void turnOn() = 0; virtual void turnOn() = 0;
//! Turn the chiller off //! Turn the chiller off
......
...@@ -23,7 +23,7 @@ class IMeter { ...@@ -23,7 +23,7 @@ class IMeter {
*/ */
IMeter(const std::string& name, std::vector<std::string> models = {}); IMeter(const std::string& name, std::vector<std::string> models = {});
void setCom(std::shared_ptr<ICom> com); virtual void setCom(std::shared_ptr<ICom> com);
/** ping the device /** ping the device
* @param dev: index of the device to ping (if there are multiple parts * @param dev: index of the device to ping (if there are multiple parts
......
...@@ -53,7 +53,7 @@ class IPowerSupply { ...@@ -53,7 +53,7 @@ class IPowerSupply {
* *
* \param com ICom instance for communicating with the power supply * \param com ICom instance for communicating with the power supply
*/ */
void setCom(std::shared_ptr<ICom> com); virtual void setCom(std::shared_ptr<ICom> com);
/** Store JSON hardware configuration /** Store JSON hardware configuration
* @param config JSON configuration for the given power supply only * @param config JSON configuration for the given power supply only
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment