At the moment only the maximum number of frames to be acquired can be
configured for the Hameg/Rohde&Schwarz HMO mixed-signal oscilloscope
series driver (hameg-hmo).
This patch adds support to configure the number of samples to acquire
in both analog and digital (logic) mode.
It has been tested with up to 8 digital (logic) channels (only 1 POD):
it might need testing with more than 8 digital (logic) channels (2
PODs).
Signed-off-by: Guido Trentalancia <gu...@trentalancia.com>
---
src/hardware/hameg-hmo/api.c | 8 ++++++++
src/hardware/hameg-hmo/protocol.c | 16 +++++++++++++---
src/hardware/hameg-hmo/protocol.h | 2 ++
3 files changed, 23 insertions(+), 3 deletions(-)
diff -pru libsigrok-git-20102018-orig/src/hardware/hameg-hmo/api.c
libsigrok-git-20102018/src/hardware/hameg-hmo/api.c
--- libsigrok-git-20102018-orig/src/hardware/hameg-hmo/api.c 2018-10-20
13:12:30.894966966 +0200
+++ libsigrok-git-20102018/src/hardware/hameg-hmo/api.c 2018-10-22
00:59:11.952617966 +0200
@@ -247,6 +247,10 @@ static int config_set(uint32_t key, GVar
update_sample_rate = FALSE;
switch (key) {
+ case SR_CONF_LIMIT_SAMPLES:
+ devc->samples_limit = g_variant_get_uint64(data);
+ ret = SR_OK;
+ break;
case SR_CONF_LIMIT_FRAMES:
devc->frame_limit = g_variant_get_uint64(data);
ret = SR_OK;
@@ -601,6 +605,9 @@ static int dev_acquisition_start(const s
scpi = sdi->conn;
devc = sdi->priv;
+ devc->num_samples = 0;
+ devc->num_frames = 0;
+
/* Preset empty results. */
for (group = 0; group < ARRAY_SIZE(digital_added); group++)
digital_added[group] = FALSE;
@@ -681,6 +688,7 @@ static int dev_acquisition_stop(struct s
devc = sdi->priv;
+ devc->num_samples = 0;
devc->num_frames = 0;
g_slist_free(devc->enabled_channels);
devc->enabled_channels = NULL;
diff -pru libsigrok-git-20102018-orig/src/hardware/hameg-hmo/protocol.c
libsigrok-git-20102018/src/hardware/hameg-hmo/protocol.c
--- libsigrok-git-20102018-orig/src/hardware/hameg-hmo/protocol.c
2018-10-20 13:12:30.895966966 +0200
+++ libsigrok-git-20102018/src/hardware/hameg-hmo/protocol.c 2018-10-22
01:20:52.556546625 +0200
@@ -59,6 +59,7 @@ static const char *hameg_scpi_dialect[]
static const uint32_t devopts[] = {
SR_CONF_OSCILLOSCOPE,
+ SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
SR_CONF_LIMIT_FRAMES | SR_CONF_GET | SR_CONF_SET,
SR_CONF_SAMPLERATE | SR_CONF_GET,
SR_CONF_TIMEBASE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
@@ -737,6 +738,7 @@ SR_PRIV int hmo_init_device(struct sr_de
}
devc->model_config = &scope_models[model_index];
+ devc->samples_limit = 0;
devc->frame_limit = 0;
if (!(devc->model_state = scope_state_new(devc->model_config)))
@@ -889,6 +891,9 @@ SR_PRIV int hmo_receive_data(int fd, int
analog.data = data->data;
analog.num_samples = data->len / sizeof(float);
+ /* Truncate acquisition if a smaller number of samples has been
requested. */
+ if (analog.num_samples > devc->samples_limit)
+ analog.num_samples = devc->samples_limit;
analog.encoding = &encoding;
analog.meaning = &meaning;
analog.spec = &spec;
@@ -921,6 +926,7 @@ SR_PRIV int hmo_receive_data(int fd, int
spec.spec_digits = 2;
packet.payload = &analog;
sr_session_send(sdi, &packet);
+ devc->num_samples = data->len / sizeof(float);
g_slist_free(meaning.channels);
g_byte_array_free(data, TRUE);
data = NULL;
@@ -948,6 +954,9 @@ SR_PRIV int hmo_receive_data(int fd, int
packet.type = SR_DF_LOGIC;
logic.data = data->data;
logic.length = data->len;
+ /* Truncate acquisition if a smaller number of samples
has been requested. */
+ if (logic.length > devc->samples_limit)
+ logic.length = devc->samples_limit;
logic.unitsize = 1;
packet.payload = &logic;
sr_session_send(sdi, &packet);
@@ -956,6 +965,7 @@ SR_PRIV int hmo_receive_data(int fd, int
hmo_queue_logic_data(devc, group, data);
}
+ devc->num_samples = data->len;
g_byte_array_free(data, TRUE);
data = NULL;
break;
@@ -989,10 +999,10 @@ SR_PRIV int hmo_receive_data(int fd, int
/*
* End of frame was reached. Stop acquisition after the specified
- * number of frames, or continue reception by starting over at
- * the first enabled channel.
+ * number of frames or after the specified number of samples, or
+ * continue reception by starting over at the first enabled channel.
*/
- if (++devc->num_frames == devc->frame_limit) {
+ if (++devc->num_frames >= devc->frame_limit || devc->num_samples >=
devc->samples_limit) {
sr_dev_acquisition_stop(sdi);
hmo_cleanup_logic_data(devc);
} else {
diff -pru libsigrok-git-20102018-orig/src/hardware/hameg-hmo/protocol.h
libsigrok-git-20102018/src/hardware/hameg-hmo/protocol.h
--- libsigrok-git-20102018-orig/src/hardware/hameg-hmo/protocol.h
2018-10-20 13:12:30.895966966 +0200
+++ libsigrok-git-20102018/src/hardware/hameg-hmo/protocol.h 2018-10-21
23:15:32.813642035 +0200
@@ -102,8 +102,10 @@ struct dev_context {
GSList *enabled_channels;
GSList *current_channel;
+ uint64_t num_samples;
uint64_t num_frames;
+ uint64_t samples_limit;
uint64_t frame_limit;
size_t pod_count;
_______________________________________________
sigrok-devel mailing list
sigrok-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/sigrok-devel
