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

diff --git a/hardware/rigol-ds/api.c b/hardware/rigol-ds/api.c
index cdd9e0ff0d548a74f07ae2a4ed13140d7df2ae8d..584a4fd65f22d0e2452cf44cad02860257ab2a89 100644 (file)
--- a/hardware/rigol-ds/api.c
+++ b/hardware/rigol-ds/api.c
@@ -864,8 +864,12 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
                                        return SR_ERR;
                                if (set_cfg(sdi, ":STOP") != SR_OK)
                                        return SR_ERR;
-                       } else
-                               devc->analog_frame_size = DS2000_ANALOG_LIVE_WAVEFORM_SIZE;
+                       } else {
+                               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;
                        if (rigol_ds_capture_start(sdi) != SR_OK)
                                return SR_ERR;

diff --git a/hardware/rigol-ds/protocol.h b/hardware/rigol-ds/protocol.h
index 264ca8b2957374a00d9fe00da63f0064cc4d5947..1c658ec64207b2bf415d9cd66fefdcc42253eb08 100644 (file)
--- a/hardware/rigol-ds/protocol.h
+++ b/hardware/rigol-ds/protocol.h
@@ -31,6 +31,7 @@
 #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