Skip to content

Commit bb70f93

Browse files
committed
Partial Doxygen coverage of AgilentOscilloscope, not complete yet but better than nothing
1 parent 4253e09 commit bb70f93

File tree

2 files changed

+39
-5
lines changed

2 files changed

+39
-5
lines changed

scopehal/AgilentOscilloscope.cpp

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/***********************************************************************************************************************
22
* *
3-
* libscopehal v0.1 *
3+
* libscopehal *
44
* *
5-
* Copyright (c) 2012-2023 Andrew D. Zonenberg and contributors *
5+
* Copyright (c) 2012-2024 Andrew D. Zonenberg and contributors *
66
* All rights reserved. *
77
* *
88
* Redistribution and use in source and binary forms, with or without modification, are permitted provided that the *
@@ -27,6 +27,12 @@
2727
* *
2828
***********************************************************************************************************************/
2929

30+
/**
31+
@file
32+
@brief Implementation of AgilentOscilloscope
33+
@ingroup scopedrivers
34+
*/
35+
3036
#include "scopehal.h"
3137
#include "AgilentOscilloscope.h"
3238
#include "EdgeTrigger.h"
@@ -40,6 +46,11 @@ using namespace std;
4046
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
4147
// Construction / destruction
4248

49+
/**
50+
@brief Connect to an oscilloscope
51+
52+
@param transport SCPITransport connected to the scope
53+
*/
4354
AgilentOscilloscope::AgilentOscilloscope(SCPITransport* transport)
4455
: SCPIDevice(transport)
4556
, SCPIInstrument(transport)

scopehal/AgilentOscilloscope.h

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,23 @@
2727
* *
2828
***********************************************************************************************************************/
2929

30+
/**
31+
@file
32+
@brief Declaration of AgilentOscilloscope
33+
@ingroup scopedrivers
34+
*/
35+
3036
#ifndef AgilentOscilloscope_h
3137
#define AgilentOscilloscope_h
3238

3339
#include "EdgeTrigger.h"
3440
#include "PulseWidthTrigger.h"
3541
#include "NthEdgeBurstTrigger.h"
3642

43+
/**
44+
@brief Driver for Agilent (and some Keysight) oscilloscopes
45+
@ingroup scopedrivers
46+
*/
3747
class AgilentOscilloscope : public virtual SCPIOscilloscope
3848
{
3949
public:
@@ -96,17 +106,30 @@ class AgilentOscilloscope : public virtual SCPIOscilloscope
96106
virtual bool SetInterleaving(bool combine) override;
97107

98108
protected:
109+
110+
///@brief External trigger
99111
OscilloscopeChannel* m_extTrigChannel;
100112

101-
//hardware analog channel count, independent of LA option etc
113+
///@brief Hardware analog channel count, independent of LA option etc
102114
unsigned int m_analogChannelCount;
115+
116+
///@brief Number of digital channels supported
103117
unsigned int m_digitalChannelCount;
118+
119+
///@brief Index of the first digital channel (if any)
104120
unsigned int m_digitalChannelBase;
105121

106-
enum ProbeType {
122+
///@brief Type of probe connected to a channel
123+
enum ProbeType
124+
{
125+
///@brief No probe, or no ID ring present
107126
None,
127+
128+
///@brief Passive probe with ID resistor for detecting attenuation
108129
AutoProbe,
109-
SmartProbe,
130+
131+
///@brief Active probe
132+
SmartProbe
110133
};
111134

112135
//config cache

0 commit comments

Comments
 (0)