BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rigol-ds: Use correct live waveform size for Agilent DSO1000 series.

This commit is contained in:
Martin Ling 2013-12-29 00:35:09 +01:00
parent 10afee13a3
commit 0d9f5a12cb
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hardware/rigol-ds/api.c
View File

@ -864,8 +864,12 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
return SR_ERR; return SR_ERR;
if (set_cfg(sdi, ":STOP") != SR_OK) if (set_cfg(sdi, ":STOP") != SR_OK)
return SR_ERR; return SR_ERR;
} else } else {
devc->analog_frame_size = DS2000_ANALOG_LIVE_WAVEFORM_SIZE; if (devc->model->series == AGILENT_DSO1000)
devc->analog_frame_size = DSO1000_ANALOG_LIVE_WAVEFORM_SIZE;
else
devc->analog_frame_size = DS2000_ANALOG_LIVE_WAVEFORM_SIZE;
}
devc->channel = devc->enabled_analog_probes->data; devc->channel = devc->enabled_analog_probes->data;
if (rigol_ds_capture_start(sdi) != SR_OK) if (rigol_ds_capture_start(sdi) != SR_OK)
return SR_ERR; return SR_ERR;

1
hardware/rigol-ds/protocol.h
View File

@ -31,6 +31,7 @@
#define DS1000_ANALOG_LIVE_WAVEFORM_SIZE 600 #define DS1000_ANALOG_LIVE_WAVEFORM_SIZE 600
#define DS2000_ANALOG_LIVE_WAVEFORM_SIZE 1400 #define DS2000_ANALOG_LIVE_WAVEFORM_SIZE 1400
#define VS5000_ANALOG_LIVE_WAVEFORM_SIZE 2048 #define VS5000_ANALOG_LIVE_WAVEFORM_SIZE 2048
#define DSO1000_ANALOG_LIVE_WAVEFORM_SIZE 600
/* Needs to be made configurable later */ /* Needs to be made configurable later */
#define DS2000_ANALOG_MEM_WAVEFORM_SIZE_1C 14000 #define DS2000_ANALOG_MEM_WAVEFORM_SIZE_1C 14000
#define DS2000_ANALOG_MEM_WAVEFORM_SIZE_2C 7000 #define DS2000_ANALOG_MEM_WAVEFORM_SIZE_2C 7000