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

hp-3457a: Do not retrigger new measurement after the last sample 

Due to a PEBKAC error, after the last sample was sent, a new
measurement was triggered, but its value was never sent down the
session bus. This is easily fixed by incrementing devc->num_samples
right after a measurement is sent instead of when a measurement is
retriggered.
This commit is contained in:
Alexandru Gagniuc 2016-04-09 10:07:55 -07:00 committed by Uwe Hermann
parent cee6d3fa0c
commit e2626373b7
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/hardware/hp-3457a/protocol.c
View File

@ -315,8 +315,10 @@ SR_PRIV int hp_3457a_receive_data(int fd, int revents, void *cb_data)
return FALSE; return FALSE;
} }
if (devc->acq_state == ACQ_GOT_MEASUREMENT) if (devc->acq_state == ACQ_GOT_MEASUREMENT) {
acq_send_measurement(sdi); acq_send_measurement(sdi);
devc->num_samples++;
}
if (devc->limit_samples && (devc->num_samples >= devc->limit_samples)) { if (devc->limit_samples && (devc->num_samples >= devc->limit_samples)) {
sdi->driver->dev_acquisition_stop(sdi, cb_data); sdi->driver->dev_acquisition_stop(sdi, cb_data);
@ -326,7 +328,6 @@ SR_PRIV int hp_3457a_receive_data(int fd, int revents, void *cb_data)
/* Got more to go. */ /* Got more to go. */
if (devc->acq_state == ACQ_GOT_MEASUREMENT) { if (devc->acq_state == ACQ_GOT_MEASUREMENT) {
/* Retrigger */ /* Retrigger */
devc->num_samples++;
retrigger_measurement(scpi, devc); retrigger_measurement(scpi, devc);
} }