Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5f7b241e1f88
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 56fe4f3a9350
Choose a head ref
  • 1 commit
  • 5 files changed
  • 1 contributor

Commits on Sep 2, 2019

  1. Copy the full SHA
    56fe4f3 View commit details
Showing with 21 additions and 8 deletions.
  1. +8 −1 scopehal/Instrument.h
  2. +0 −7 scopehal/Oscilloscope.h
  3. +3 −0 scopehal/PowerSupply.h
  4. +8 −0 scopehal/RohdeSchwarzHMC804xPowerSupply.cpp
  5. +2 −0 scopehal/RohdeSchwarzHMC804xPowerSupply.h
9 changes: 8 additions & 1 deletion scopehal/Instrument.h
Original file line number Diff line number Diff line change
@@ -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
7 changes: 0 additions & 7 deletions scopehal/Oscilloscope.h
Original file line number Diff line number Diff line change
@@ -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.
3 changes: 3 additions & 0 deletions scopehal/PowerSupply.h
Original file line number Diff line number Diff line change
@@ -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
8 changes: 8 additions & 0 deletions scopehal/RohdeSchwarzHMC804xPowerSupply.cpp
Original file line number Diff line number Diff line change
@@ -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);
2 changes: 2 additions & 0 deletions scopehal/RohdeSchwarzHMC804xPowerSupply.h
Original file line number Diff line number Diff line change
@@ -72,6 +72,8 @@ class RohdeSchwarzHMC804xPowerSupply
virtual bool GetMasterPowerEnable();
virtual void SetMasterPowerEnable(bool enable);

virtual bool IsSoftStartEnabled(int chan);

protected:
int GetStatusRegister(int chan);