#define DS1000_ANALOG_LIVE_WAVEFORM_SIZE 600
#define DS2000_ANALOG_LIVE_WAVEFORM_SIZE 1400
#define VS5000_ANALOG_LIVE_WAVEFORM_SIZE 2048
+#define DSO1000_ANALOG_LIVE_WAVEFORM_SIZE 600
/* Needs to be made configurable later */
#define DS2000_ANALOG_MEM_WAVEFORM_SIZE_1C 14000
#define DS2000_ANALOG_MEM_WAVEFORM_SIZE_2C 7000
/* Size of acquisition buffers */
#define ACQ_BUFFER_SIZE 32768
+#define MAX_ANALOG_PROBES 4
+#define MAX_DIGITAL_PROBES 16
+
enum rigol_ds_series {
RIGOL_DS1000,
RIGOL_DS1000Z,
RIGOL_DS4000,
RIGOL_DS6000,
RIGOL_VS5000,
+ AGILENT_DSO1000,
};
enum rigol_protocol_flavor {
};
struct rigol_ds_model {
+ char *vendor;
char *name;
enum rigol_ds_series series;
enum rigol_protocol_flavor protocol;
uint64_t min_timebase[2];
uint64_t max_timebase[2];
uint64_t min_vdiv[2];
+ unsigned int analog_channels;
bool has_digital;
int num_horizontal_divs;
};
uint64_t num_vdivs;
/* Probe groups */
- struct sr_probe_group analog_groups[2];
+ struct sr_probe_group analog_groups[MAX_ANALOG_PROBES];
struct sr_probe_group digital_group;
/* Acquisition settings */
uint64_t analog_frame_size;
/* Device settings */
- gboolean analog_channels[2];
- gboolean digital_channels[16];
+ gboolean analog_channels[MAX_ANALOG_PROBES];
+ gboolean digital_channels[MAX_DIGITAL_PROBES];
float timebase;
- float vdiv[2];
- int vert_reference[2];
- float vert_offset[2];
+ float vdiv[MAX_ANALOG_PROBES];
+ int vert_reference[MAX_ANALOG_PROBES];
+ float vert_offset[MAX_ANALOG_PROBES];
char *trigger_source;
float horiz_triggerpos;
char *trigger_slope;
- char *coupling[2];
+ char *coupling[MAX_ANALOG_PROBES];
/* Operational state */
/* Number of frames received in total. */
uint64_t num_frames;
- /* The channel we are currently receiving data for. */
- struct sr_probe *channel;
+ /* GSList entry for the current channel. */
+ GSList *channel_entry;
/* Number of samples received in current frame. */
uint64_t num_frame_samples;
/* Number of bytes in current data block, if 0 block header expected */