ngscopeclient · Sep 2, 2019
Showing with 21 additions and 8 deletions.

+8 −1 scopehal/Instrument.h

+0 −7 scopehal/Oscilloscope.h

+3 −0 scopehal/PowerSupply.h

+8 −0 scopehal/RohdeSchwarzHMC804xPowerSupply.cpp

+2 −0 scopehal/RohdeSchwarzHMC804xPowerSupply.h
diff --git a/scopehal/Instrument.h b/scopehal/Instrument.h
@@ -2,7 +2,7 @@
 *                                                                                                                      *
 * ANTIKERNEL v0.1                                                                                                      *
 *                                                                                                                      *
-* Copyright (c) 2012-2017 Andrew D. Zonenberg                                                                          *
+* Copyright (c) 2012-2019 Andrew D. Zonenberg                                                                          *
 * All rights reserved.                                                                                                 *
 *                                                                                                                      *
 * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the     *
@@ -75,6 +75,13 @@ class Instrument
 	virtual std::string GetName() =0;
 	virtual std::string GetVendor() =0;
 	virtual std::string GetSerial() =0;
+
+	/**
+		@brief Optional user-selected nickname of the instrument
+
+		(for display purposes if multiple similar devices are in use)
+	 */
+	std::string m_nickname;
 };
 
 #endif
diff --git a/scopehal/Oscilloscope.h b/scopehal/Oscilloscope.h
@@ -346,13 +346,6 @@ class Oscilloscope : public virtual Instrument
 	 */
 	virtual bool IsTriggerArmed() =0;
 
-	/**
-		@brief Optional application-selected nickname of the scope
-
-		(for display purposes if multiple scopes are in use)
-	 */
-	std::string m_nickname;
-
 public:
 	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	// Memory depth / sample rate control.

diff --git a/scopehal/PowerSupply.h b/scopehal/PowerSupply.h
@@ -62,6 +62,9 @@ class PowerSupply : public virtual Instrument
 
 	virtual bool GetMasterPowerEnable() =0;
 	virtual void SetMasterPowerEnable(bool enable) = 0;
+
+	//Soft start
+	virtual bool IsSoftStartEnabled(int chan) =0;
 };
 
 #endif
diff --git a/scopehal/RohdeSchwarzHMC804xPowerSupply.cpp b/scopehal/RohdeSchwarzHMC804xPowerSupply.cpp
@@ -147,6 +147,14 @@ bool RohdeSchwarzHMC804xPowerSupply::GetPowerChannelActive(int chan)
 	return atoi(ret.c_str()) ? true : false;
 }
 
+bool RohdeSchwarzHMC804xPowerSupply::IsSoftStartEnabled(int chan)
+{
+	SelectChannel(chan);
+	m_transport->SendCommand("volt:ramp?");
+	string ret = m_transport->ReadReply();
+	return atoi(ret.c_str()) ? true : false;
+}
+
 void RohdeSchwarzHMC804xPowerSupply::SetPowerOvercurrentShutdownEnabled(int chan, bool enable)
 {
 	SelectChannel(chan);

diff --git a/scopehal/RohdeSchwarzHMC804xPowerSupply.h b/scopehal/RohdeSchwarzHMC804xPowerSupply.h
@@ -72,6 +72,8 @@ class RohdeSchwarzHMC804xPowerSupply
 	virtual bool GetMasterPowerEnable();
 	virtual void SetMasterPowerEnable(bool enable);
 
+	virtual bool IsSoftStartEnabled(int chan);
+
 protected:
 	int GetStatusRegister(int chan);