Merge branch 'agilent_dual_channel' into 'master'

implementation for AgilentE3648A PS

See merge request berkeleylab/labRemote!126

src/libPS/AgilentE3648APs.cpp

+#include "AgilentE3648APs.h"
+
+//Register power supply
+#include "PowerSupplyRegistry.h"
+REGISTER_POWERSUPPLY(AgilentE3648APs)
+
+AgilentE3648APs::AgilentE3648APs(const std::string& name) :
+AgilentPs(name, {"E3648A"}, 2)
+{ }

src/libPS/AgilentE3648APs.h

+#ifndef AGILENTE3648APS_H
+#define AGILENTE3648APS_H
+
+#include <string>
+
+#include "AgilentPs.h"
+
+/**
+ * Implementation for the [Agilent E364xA Dual Channel Output DC Power Supplies](https://www.mouser.com/new/keysight/keysight-e364xa-dc-power-supplies-eu/#TextLinks-5).
+ * The dual-channel Agilent power supplies appear to support the same programming
+ * model as the single-chanenl E364xA power supplies, but this has not been checked.
+ */
+class AgilentE3648APs : public AgilentPs
+{
+    public:
+        AgilentE3648APs(const std::string& name);
+        ~AgilentE3648APs() = default;
+};
+
+#endif // AGILENTE3648APS_H

src/libPS/CMakeLists.txt

@@ -9,6 +9,7 @@ target_sources(PS
   AgilentE364xAPs.cpp
   AgilentE3631APs.cpp
   AgilentE3634APs.cpp
+  AgilentE3648APs.cpp
   DT54xxPs.cpp  
   SorensenPs.cpp
   RigolDP832.cpp

src/libPS/python.cpp

@@ -9,6 +9,7 @@
 #include "AgilentE3631APs.h"
 #include "AgilentE364xAPs.h"
 #include "AgilentE3634APs.h"
+#include "AgilentE3648APs.h"
 
 #include "Bk16XXPs.h"
 #include "DT54xxPs.h"
@@ -362,6 +363,9 @@ void register_ps(py::module& m){
   py::class_<AgilentE3634APs, AgilentPs, std::shared_ptr<AgilentE3634APs>>(m, "AgilentE3634APs")
     .def(py::init<const std::string &>());
 
+  py::class_<AgilentE3648APs, AgilentPs, std::shared_ptr<AgilentE3648APs>>(m, "AgilentE3648APs")
+    .def(py::init<const std::string &>());
+
   py::class_<Bk16XXPs, PyPS<Bk16XXPs>, IPowerSupply, std::shared_ptr<Bk16XXPs>>(m, "Bk16XXPs")
     .def(py::init<const std::string &>());