add 2020 and move XXXX to 4040

src/libPS/CMakeLists.txt

@@ -11,12 +11,13 @@ target_sources(PS
   AgilentE3631APs.cpp
   AgilentE3634APs.cpp
   AgilentE36300APs.cpp
-  DT54xxPs.cpp  
+  DT54xxPs.cpp
   SorensenPs.cpp
   RigolDP832.cpp
   Keithley24XX.cpp
   Keithley22XX.cpp
-  RS_HMPXXXX.cpp
+  RS_HMP4040.cpp
+  RS_HMP2020.cpp
   TTIPs.cpp
   TTIXXXTPPs.cpp
   TTIXXXDPPs.cpp

src/libPS/RS_HMP2020.cpp

+#include "RS_HMP2020.h"
+
+#include <algorithm>
+#include <thread>
+
+#include "Logger.h"
+
+//Register power supply
+#include "PowerSupplyRegistry.h"
+REGISTER_POWERSUPPLY(RS_HMP2020)
+
+RS_HMP2020::RS_HMP2020(const std::string& name) :
+SCPIPs(name, {"HMP2020"})
+{ }
+

src/libPS/RS_HMPXXXX.h → src/libPS/RS_HMP2020.h

-#ifndef RS_HMPXXXX_H
-#define RS_HMPXXXX_H
+#ifndef RS_HMP2020_H
+#define RS_HMP2020_H
 
 #include <chrono>
 #include <memory>
@@ -17,11 +17,11 @@
  * Others in the HMP series (HMP2020, HMP2030, HMP4030 and HMP4040) might
  * be also supported, but have not been tested.
  */
-class RS_HMPXXXX : public SCPIPs
+class RS_HMP2020 : public SCPIPs
 {
 public:
-  RS_HMPXXXX(const std::string& name);
-  ~RS_HMPXXXX() =default;
+  RS_HMP2020(const std::string& name);
+  ~RS_HMP2020() =default;
 
 };
 

src/libPS/RS_HMPXXXX.cpp → src/libPS/RS_HMP4040.cpp

-#include "RS_HMPXXXX.h"
+#include "RS_HMP4040.h"
 
 #include <algorithm>
 #include <thread>
@@ -7,9 +7,9 @@
 
 //Register power supply
 #include "PowerSupplyRegistry.h"
-REGISTER_POWERSUPPLY(RS_HMPXXXX)
+REGISTER_POWERSUPPLY(RS_HMP4040)
 
-RS_HMPXXXX::RS_HMPXXXX(const std::string& name) :
+RS_HMP4040::RS_HMP4040(const std::string& name) :
 SCPIPs(name, {"HMP4040"})
 { }
 

src/libPS/RS_HMP4040.h

+#ifndef RS_HMP4040_H
+#define RS_HMP4040_H
+
+#include <chrono>
+#include <memory>
+#include <string>
+
+#include "SCPIPs.h"
+
+#include "SerialCom.h"
+
+/** \brief ROHDE&SWARZ HMP4040
+ * Implementation for the ROHDE&SWARZ HMP4040 power supply.
+ *
+ * [Programming Manual](https://cdn.rohde-schwarz.com/pws/dl_downloads/dl_common_library/dl_manuals/gb_1/h/hmp_serie/HMP_SCPI_ProgrammersManual_en_01.pdf)
+ *
+ * Others in the HMP series (HMP2020, HMP2030, HMP4030 and HMP4040) might
+ * be also supported, but have not been tested.
+ */
+class RS_HMP4040 : public SCPIPs
+{
+public:
+  RS_HMP4040(const std::string& name);
+  ~RS_HMP4040() =default;
+
+};
+
+#endif
+

src/libPS/python.cpp

@@ -15,7 +15,8 @@
 #include "Keithley22XX.h"
 #include "Keithley24XX.h"
 #include "PowerSupplyChannel.h"
-#include "RS_HMPXXXX.h"
+#include "RS_HMP4040.h"
+#include "RS_HMP2020.h"
 #include "RigolDP832.h"
 #include "SorensenPs.h"
 #include "TTIXXXSPPs.h"
@@ -395,7 +396,10 @@ void register_ps(py::module& m){
     .def(py::init<const std::string &>());
 
 
-  py::class_<RS_HMPXXXX, SCPIPs, std::shared_ptr<RS_HMPXXXX>>(m, "RS_HMPXXXX")
+  py::class_<RS_HMP4040, SCPIPs, std::shared_ptr<RS_HMP4040>>(m, "RS_HMP4040")
+    .def(py::init<const std::string &>());
+
+  py::class_<RS_HMP2020, SCPIPs, std::shared_ptr<RS_HMP2020>>(m, "RS_HMP2020")
     .def(py::init<const std::string &>());