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

rigol-ds1xx2: properly send frame begin/end packets

This commit is contained in:
Bert Vermeulen 2013-04-08 00:38:58 +02:00
parent 7991784841
commit 75d8a4e576
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hardware/rigol-ds1xx2/api.c
View File

@ -485,7 +485,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
devc = sdi->priv; devc = sdi->priv;
devc->num_frames = 0; devc->num_frames = devc->num_frame_samples = 0;
sr_source_add(devc->fd, G_IO_IN, 50, rigol_ds1xx2_receive_data, (void *)sdi); sr_source_add(devc->fd, G_IO_IN, 50, rigol_ds1xx2_receive_data, (void *)sdi);

21
hardware/rigol-ds1xx2/protocol.c
View File

@ -47,6 +47,13 @@ SR_PRIV int rigol_ds1xx2_receive_data(int fd, int revents, void *cb_data)
sr_dbg("Received %d bytes.", len); sr_dbg("Received %d bytes.", len);
if (len == -1) if (len == -1)
return TRUE; return TRUE;
if (devc->num_frame_samples == 0) {
/* Start of a new frame. */
packet.type = SR_DF_FRAME_BEGIN;
sr_session_send(sdi, &packet);
}
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
data[i] = devc->scale / 25.6 * (128 - buf[i]) - devc->offset; data[i] = devc->scale / 25.6 * (128 - buf[i]) - devc->offset;
analog.probes = devc->enabled_probes; analog.probes = devc->enabled_probes;
@ -59,10 +66,16 @@ SR_PRIV int rigol_ds1xx2_receive_data(int fd, int revents, void *cb_data)
packet.payload = &analog; packet.payload = &analog;
sr_session_send(cb_data, &packet); sr_session_send(cb_data, &packet);
if (++devc->num_frames == devc->limit_frames) if (len == WAVEFORM_SIZE) {
sdi->driver->dev_acquisition_stop(sdi, cb_data); /* End of the frame. */
else packet.type = SR_DF_FRAME_END;
rigol_ds1xx2_send_data(fd, ":WAV:DATA?\n"); sr_session_send(sdi, &packet);
if (++devc->num_frames == devc->limit_frames)
sdi->driver->dev_acquisition_stop(sdi, cb_data);
else
rigol_ds1xx2_send_data(fd, ":WAV:DATA?\n");
}
} }
return TRUE; return TRUE;

4
hardware/rigol-ds1xx2/protocol.h
View File

@ -52,8 +52,8 @@ struct dev_context {
/** The current number of already received frames. */ /** The current number of already received frames. */
uint64_t num_frames; uint64_t num_frames;
/** The current number of already received samples. */ /** The current number of samples received in this frame. */
uint64_t num_samples; uint64_t num_frame_samples;
/** Current scale setting. */ /** Current scale setting. */
float scale; float scale;