X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhameg-hmo%2Fprotocol.c;h=12e79c47393ec342cd0719fa8634cfd6aea3f911;hb=e66d1892d0dd16ed166fc8f13493f95de0607362;hp=8c5589bd37f489a8c4b79bff129dc4221373158d;hpb=329733d92c5004f0fe308eff26b9537fded2cdf3;p=libsigrok.git
diff --git a/src/hardware/hameg-hmo/protocol.c b/src/hardware/hameg-hmo/protocol.c
index 8c5589bd..12e79c47 100644
--- a/src/hardware/hameg-hmo/protocol.c
+++ b/src/hardware/hameg-hmo/protocol.c
@@ -17,17 +17,28 @@
* along with this program. If not, see .
*/
+#include
+#include
+#include
+#include "scpi.h"
#include "protocol.h"
+SR_PRIV void hmo_queue_logic_data(struct dev_context *devc,
+ size_t group, GByteArray *pod_data);
+SR_PRIV void hmo_send_logic_packet(struct sr_dev_inst *sdi,
+ struct dev_context *devc);
+SR_PRIV void hmo_cleanup_logic_data(struct dev_context *devc);
+
static const char *hameg_scpi_dialect[] = {
- [SCPI_CMD_GET_DIG_DATA] = ":POD%d:DATA?",
+ [SCPI_CMD_GET_DIG_DATA] = ":FORM UINT,8;:POD%d:DATA?",
[SCPI_CMD_GET_TIMEBASE] = ":TIM:SCAL?",
[SCPI_CMD_SET_TIMEBASE] = ":TIM:SCAL %s",
[SCPI_CMD_GET_COUPLING] = ":CHAN%d:COUP?",
[SCPI_CMD_SET_COUPLING] = ":CHAN%d:COUP %s",
[SCPI_CMD_GET_SAMPLE_RATE] = ":ACQ:SRAT?",
[SCPI_CMD_GET_SAMPLE_RATE_LIVE] = ":%s:DATA:POINTS?",
- [SCPI_CMD_GET_ANALOG_DATA] = ":CHAN%d:DATA?",
+ [SCPI_CMD_GET_ANALOG_DATA] = ":FORM:BORD %s;" \
+ ":FORM REAL,32;:CHAN%d:DATA?",
[SCPI_CMD_GET_VERTICAL_DIV] = ":CHAN%d:SCAL?",
[SCPI_CMD_SET_VERTICAL_DIV] = ":CHAN%d:SCAL %s",
[SCPI_CMD_GET_DIG_POD_STATE] = ":POD%d:STAT?",
@@ -43,30 +54,31 @@ static const char *hameg_scpi_dialect[] = {
[SCPI_CMD_SET_HORIZ_TRIGGERPOS] = ":TIM:POS %s",
[SCPI_CMD_GET_ANALOG_CHAN_STATE] = ":CHAN%d:STAT?",
[SCPI_CMD_SET_ANALOG_CHAN_STATE] = ":CHAN%d:STAT %d",
+ [SCPI_CMD_GET_PROBE_UNIT] = ":PROB%d:SET:ATT:UNIT?",
};
static const uint32_t hmo_devopts[] = {
SR_CONF_OSCILLOSCOPE,
SR_CONF_LIMIT_FRAMES | SR_CONF_GET | SR_CONF_SET,
- SR_CONF_TRIGGER_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+ SR_CONF_SAMPLERATE | SR_CONF_GET,
SR_CONF_TIMEBASE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
SR_CONF_NUM_HDIV | SR_CONF_GET,
- SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
SR_CONF_HORIZ_TRIGGERPOS | SR_CONF_GET | SR_CONF_SET,
- SR_CONF_SAMPLERATE | SR_CONF_GET,
+ SR_CONF_TRIGGER_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+ SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
};
static const uint32_t hmo_analog_devopts[] = {
SR_CONF_NUM_VDIV | SR_CONF_GET,
- SR_CONF_COUPLING | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
SR_CONF_VDIV | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+ SR_CONF_COUPLING | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
};
static const char *hmo_coupling_options[] = {
- "AC",
- "ACL",
- "DC",
- "DCL",
+ "AC", // AC with 50 Ohm termination (152x, 202x, 30xx, 1202)
+ "ACL", // AC with 1 MOhm termination
+ "DC", // DC with 50 Ohm termination
+ "DCL", // DC with 1 MOhm termination
"GND",
NULL,
};
@@ -74,6 +86,7 @@ static const char *hmo_coupling_options[] = {
static const char *scope_trigger_slopes[] = {
"POS",
"NEG",
+ "EITH",
NULL,
};
@@ -82,6 +95,9 @@ static const char *hmo_compact2_trigger_sources[] = {
"CH2",
"LINE",
"EXT",
+ "PATT",
+ "BUS1",
+ "BUS2",
"D0",
"D1",
"D2",
@@ -100,6 +116,30 @@ static const char *hmo_compact4_trigger_sources[] = {
"CH4",
"LINE",
"EXT",
+ "PATT",
+ "BUS1",
+ "BUS2",
+ "D0",
+ "D1",
+ "D2",
+ "D3",
+ "D4",
+ "D5",
+ "D6",
+ "D7",
+ NULL,
+};
+
+static const char *hmo_compact4_dig16_trigger_sources[] = {
+ "CH1",
+ "CH2",
+ "CH3",
+ "CH4",
+ "LINE",
+ "EXT",
+ "PATT",
+ "BUS1",
+ "BUS2",
"D0",
"D1",
"D2",
@@ -108,6 +148,14 @@ static const char *hmo_compact4_trigger_sources[] = {
"D5",
"D6",
"D7",
+ "D8",
+ "D9",
+ "D10",
+ "D11",
+ "D12",
+ "D13",
+ "D14",
+ "D15",
NULL,
};
@@ -166,6 +214,8 @@ static const uint64_t hmo_vdivs[][2] = {
{ 2, 1 },
{ 5, 1 },
{ 10, 1 },
+ { 20, 1 },
+ { 50, 1 },
};
static const char *scope_analog_channel_names[] = {
@@ -196,7 +246,9 @@ static const char *scope_digital_channel_names[] = {
static const struct scope_config scope_models[] = {
{
- .name = {"HMO722", "HMO1022", "HMO1522", "HMO2022", NULL},
+ /* HMO2522/3032/3042/3052 support 16 digital channels but they're not supported yet. */
+ .name = {"HMO1002", "HMO722", "HMO1022", "HMO1522", "HMO2022", "HMO2522",
+ "HMO3032", "HMO3042", "HMO3052", NULL},
.analog_channels = 2,
.digital_channels = 8,
.digital_pods = 1,
@@ -253,6 +305,36 @@ static const struct scope_config scope_models[] = {
.num_xdivs = 12,
.num_ydivs = 8,
+ .scpi_dialect = &hameg_scpi_dialect,
+ },
+ {
+ .name = {"HMO2524", "HMO3034", "HMO3044", "HMO3054", "HMO3524", NULL},
+ .analog_channels = 4,
+ .digital_channels = 16,
+ .digital_pods = 2,
+
+ .analog_names = &scope_analog_channel_names,
+ .digital_names = &scope_digital_channel_names,
+
+ .devopts = &hmo_devopts,
+ .num_devopts = ARRAY_SIZE(hmo_devopts),
+
+ .analog_devopts = &hmo_analog_devopts,
+ .num_analog_devopts = ARRAY_SIZE(hmo_analog_devopts),
+
+ .coupling_options = &hmo_coupling_options,
+ .trigger_sources = &hmo_compact4_dig16_trigger_sources,
+ .trigger_slopes = &scope_trigger_slopes,
+
+ .timebases = &hmo_timebases,
+ .num_timebases = ARRAY_SIZE(hmo_timebases),
+
+ .vdivs = &hmo_vdivs,
+ .num_vdivs = ARRAY_SIZE(hmo_vdivs),
+
+ .num_xdivs = 12,
+ .num_ydivs = 8,
+
.scpi_dialect = &hameg_scpi_dialect,
},
};
@@ -263,26 +345,26 @@ static void scope_state_dump(const struct scope_config *config,
unsigned int i;
char *tmp;
- for (i = 0; i < config->analog_channels; ++i) {
+ for (i = 0; i < config->analog_channels; i++) {
tmp = sr_voltage_string((*config->vdivs)[state->analog_channels[i].vdiv][0],
(*config->vdivs)[state->analog_channels[i].vdiv][1]);
- sr_info("State of analog channel %d -> %s : %s (coupling) %s (vdiv) %2.2e (offset)",
+ sr_info("State of analog channel %d -> %s : %s (coupling) %s (vdiv) %2.2e (offset)",
i + 1, state->analog_channels[i].state ? "On" : "Off",
(*config->coupling_options)[state->analog_channels[i].coupling],
tmp, state->analog_channels[i].vertical_offset);
}
- for (i = 0; i < config->digital_channels; ++i) {
+ for (i = 0; i < config->digital_channels; i++) {
sr_info("State of digital channel %d -> %s", i,
state->digital_channels[i] ? "On" : "Off");
}
- for (i = 0; i < config->digital_pods; ++i) {
+ for (i = 0; i < config->digital_pods; i++) {
sr_info("State of digital POD %d -> %s", i,
state->digital_pods[i] ? "On" : "Off");
}
- tmp = sr_period_string((*config->timebases)[state->timebase][0] *
+ tmp = sr_period_string((*config->timebases)[state->timebase][0],
(*config->timebases)[state->timebase][1]);
sr_info("Current timebase: %s", tmp);
g_free(tmp);
@@ -308,7 +390,7 @@ static int scope_state_get_array_option(struct sr_scpi_dev_inst *scpi,
return SR_ERR;
}
- for (i = 0; (*array)[i]; ++i) {
+ for (i = 0; (*array)[i]; i++) {
if (!g_strcmp0(tmp, (*array)[i])) {
*result = i;
g_free(tmp);
@@ -325,15 +407,46 @@ static int scope_state_get_array_option(struct sr_scpi_dev_inst *scpi,
return SR_OK;
}
+/**
+ * This function takes a value of the form "2.000E-03" and returns the index
+ * of an array where a matching pair was found.
+ *
+ * @param value The string to be parsed.
+ * @param array The array of s/f pairs.
+ * @param array_len The number of pairs in the array.
+ * @param result The index at which a matching pair was found.
+ *
+ * @return SR_ERR on any parsing error, SR_OK otherwise.
+ */
+static int array_float_get(gchar *value, const uint64_t array[][2],
+ int array_len, unsigned int *result)
+{
+ struct sr_rational rval;
+ struct sr_rational aval;
+
+ if (sr_parse_rational(value, &rval) != SR_OK)
+ return SR_ERR;
+
+ for (int i = 0; i < array_len; i++) {
+ sr_rational_set(&aval, array[i][0], array[i][1]);
+ if (sr_rational_eq(&rval, &aval)) {
+ *result = i;
+ return SR_OK;
+ }
+ }
+
+ return SR_ERR;
+}
+
static int analog_channel_state_get(struct sr_scpi_dev_inst *scpi,
const struct scope_config *config,
struct scope_state *state)
{
unsigned int i, j;
- float tmp_float;
char command[MAX_COMMAND_SIZE];
+ char *tmp_str;
- for (i = 0; i < config->analog_channels; ++i) {
+ for (i = 0; i < config->analog_channels; i++) {
g_snprintf(command, sizeof(command),
(*config->scpi_dialect)[SCPI_CMD_GET_ANALOG_CHAN_STATE],
i + 1);
@@ -346,20 +459,19 @@ static int analog_channel_state_get(struct sr_scpi_dev_inst *scpi,
(*config->scpi_dialect)[SCPI_CMD_GET_VERTICAL_DIV],
i + 1);
- if (sr_scpi_get_float(scpi, command, &tmp_float) != SR_OK)
+ if (sr_scpi_get_string(scpi, command, &tmp_str) != SR_OK)
return SR_ERR;
- for (j = 0; j < config->num_vdivs; j++) {
- if (tmp_float == ((float) (*config->vdivs)[j][0] /
- (*config->vdivs)[j][1])) {
- state->analog_channels[i].vdiv = j;
- break;
- }
- }
- if (j == config->num_vdivs) {
+
+ if (array_float_get(tmp_str, hmo_vdivs, ARRAY_SIZE(hmo_vdivs),
+ &j) != SR_OK) {
+ g_free(tmp_str);
sr_err("Could not determine array index for vertical div scale.");
return SR_ERR;
}
+ g_free(tmp_str);
+ state->analog_channels[i].vdiv = j;
+
g_snprintf(command, sizeof(command),
(*config->scpi_dialect)[SCPI_CMD_GET_VERTICAL_OFFSET],
i + 1);
@@ -375,6 +487,19 @@ static int analog_channel_state_get(struct sr_scpi_dev_inst *scpi,
if (scope_state_get_array_option(scpi, command, config->coupling_options,
&state->analog_channels[i].coupling) != SR_OK)
return SR_ERR;
+
+ g_snprintf(command, sizeof(command),
+ (*config->scpi_dialect)[SCPI_CMD_GET_PROBE_UNIT],
+ i + 1);
+
+ if (sr_scpi_get_string(scpi, command, &tmp_str) != SR_OK)
+ return SR_ERR;
+
+ if (tmp_str[0] == 'A')
+ state->analog_channels[i].probe_unit = 'A';
+ else
+ state->analog_channels[i].probe_unit = 'V';
+ g_free(tmp_str);
}
return SR_OK;
@@ -387,7 +512,7 @@ static int digital_channel_state_get(struct sr_scpi_dev_inst *scpi,
unsigned int i;
char command[MAX_COMMAND_SIZE];
- for (i = 0; i < config->digital_channels; ++i) {
+ for (i = 0; i < config->digital_channels; i++) {
g_snprintf(command, sizeof(command),
(*config->scpi_dialect)[SCPI_CMD_GET_DIG_CHAN_STATE],
i);
@@ -397,7 +522,7 @@ static int digital_channel_state_get(struct sr_scpi_dev_inst *scpi,
return SR_ERR;
}
- for (i = 0; i < config->digital_pods; ++i) {
+ for (i = 0; i < config->digital_pods; i++) {
g_snprintf(command, sizeof(command),
(*config->scpi_dialect)[SCPI_CMD_GET_DIG_POD_STATE],
i + 1);
@@ -428,7 +553,7 @@ SR_PRIV int hmo_update_sample_rate(const struct sr_dev_inst *sdi)
state = devc->model_state;
channel_found = FALSE;
- for (i = 0; i < config->analog_channels; ++i) {
+ for (i = 0; i < config->analog_channels; i++) {
if (state->analog_channels[i].state) {
g_snprintf(chan_name, sizeof(chan_name), "CHAN%d", i + 1);
g_snprintf(tmp_str, sizeof(tmp_str),
@@ -479,6 +604,7 @@ SR_PRIV int hmo_scope_state_get(struct sr_dev_inst *sdi)
const struct scope_config *config;
float tmp_float;
unsigned int i;
+ char *tmp_str;
devc = sdi->priv;
config = devc->model_config;
@@ -497,17 +623,20 @@ SR_PRIV int hmo_scope_state_get(struct sr_dev_inst *sdi)
&tmp_float) != SR_OK)
return SR_ERR;
- for (i = 0; i < config->num_timebases; i++) {
- if (tmp_float == ((float) (*config->timebases)[i][0] /
- (*config->timebases)[i][1])) {
- state->timebase = i;
- break;
- }
- }
- if (i == config->num_timebases) {
+ if (sr_scpi_get_string(sdi->conn,
+ (*config->scpi_dialect)[SCPI_CMD_GET_TIMEBASE],
+ &tmp_str) != SR_OK)
+ return SR_ERR;
+
+ if (array_float_get(tmp_str, hmo_timebases, ARRAY_SIZE(hmo_timebases),
+ &i) != SR_OK) {
+ g_free(tmp_str);
sr_err("Could not determine array index for time base.");
return SR_ERR;
}
+ g_free(tmp_str);
+
+ state->timebase = i;
if (sr_scpi_get_float(sdi->conn,
(*config->scpi_dialect)[SCPI_CMD_GET_HORIZ_TRIGGERPOS],
@@ -543,33 +672,15 @@ static struct scope_state *scope_state_new(const struct scope_config *config)
{
struct scope_state *state;
- if (!(state = g_try_malloc0(sizeof(struct scope_state))))
- return NULL;
-
- if (!(state->analog_channels = g_try_malloc0_n(config->analog_channels,
- sizeof(struct analog_channel_state))))
- goto fail;
-
- if (!(state->digital_channels = g_try_malloc0_n(
- config->digital_channels, sizeof(gboolean))))
- goto fail;
-
- if (!(state->digital_pods = g_try_malloc0_n(config->digital_pods,
- sizeof(gboolean))))
- goto fail;
+ state = g_malloc0(sizeof(struct scope_state));
+ state->analog_channels = g_malloc0_n(config->analog_channels,
+ sizeof(struct analog_channel_state));
+ state->digital_channels = g_malloc0_n(
+ config->digital_channels, sizeof(gboolean));
+ state->digital_pods = g_malloc0_n(config->digital_pods,
+ sizeof(gboolean));
return state;
-
-fail:
- if (state->analog_channels)
- g_free(state->analog_channels);
- if (state->digital_channels)
- g_free(state->digital_channels);
- if (state->digital_pods)
- g_free(state->digital_pods);
- g_free(state);
-
- return NULL;
}
SR_PRIV void hmo_scope_state_free(struct scope_state *state)
@@ -584,7 +695,7 @@ SR_PRIV int hmo_init_device(struct sr_dev_inst *sdi)
{
char tmp[25];
int model_index;
- unsigned int i, j;
+ unsigned int i, j, group;
struct sr_channel *ch;
struct dev_context *devc;
@@ -630,14 +741,14 @@ SR_PRIV int hmo_init_device(struct sr_dev_inst *sdi)
}
/* Add digital channel groups. */
- for (i = 0; i < scope_models[model_index].digital_pods; ++i) {
+ for (i = 0; i < scope_models[model_index].digital_pods; i++) {
g_snprintf(tmp, 25, "POD%d", i);
devc->digital_groups[i] = g_malloc0(sizeof(struct sr_channel_group));
devc->digital_groups[i]->name = g_strdup(tmp);
sdi->channel_groups = g_slist_append(sdi->channel_groups,
- devc->digital_groups[i < 8 ? 0 : 1]);
+ devc->digital_groups[i]);
}
/* Add digital channels. */
@@ -645,8 +756,9 @@ SR_PRIV int hmo_init_device(struct sr_dev_inst *sdi)
ch = sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE,
(*scope_models[model_index].digital_names)[i]);
- devc->digital_groups[i < 8 ? 0 : 1]->channels = g_slist_append(
- devc->digital_groups[i < 8 ? 0 : 1]->channels, ch);
+ group = i / 8;
+ devc->digital_groups[group]->channels = g_slist_append(
+ devc->digital_groups[group]->channels, ch);
}
devc->model_config = &scope_models[model_index];
@@ -658,17 +770,106 @@ SR_PRIV int hmo_init_device(struct sr_dev_inst *sdi)
return SR_OK;
}
+/* Queue data of one channel group, for later submission. */
+SR_PRIV void hmo_queue_logic_data(struct dev_context *devc,
+ size_t group, GByteArray *pod_data)
+{
+ size_t size;
+ GByteArray *store;
+ uint8_t *logic_data;
+ size_t idx, logic_step;
+
+ /*
+ * Upon first invocation, allocate the array which can hold the
+ * combined logic data for all channels. Assume that each channel
+ * will yield an identical number of samples per receive call.
+ *
+ * As a poor man's safety measure: (Silently) skip processing
+ * for unexpected sample counts, and ignore samples for
+ * unexpected channel groups. Don't bother with complicated
+ * resize logic, considering that many models only support one
+ * pod, and the most capable supported models have two pods of
+ * identical size. We haven't yet seen any "odd" configuration.
+ */
+ if (!devc->logic_data) {
+ size = pod_data->len * devc->pod_count;
+ store = g_byte_array_sized_new(size);
+ memset(store->data, 0, size);
+ store = g_byte_array_set_size(store, size);
+ devc->logic_data = store;
+ } else {
+ store = devc->logic_data;
+ size = store->len / devc->pod_count;
+ if (size != pod_data->len)
+ return;
+ if (group >= devc->pod_count)
+ return;
+ }
+
+ /*
+ * Fold the data of the most recently received channel group into
+ * the storage, where data resides for all channels combined.
+ */
+ logic_data = store->data;
+ logic_data += group;
+ logic_step = devc->pod_count;
+ for (idx = 0; idx < pod_data->len; idx++) {
+ *logic_data = pod_data->data[idx];
+ logic_data += logic_step;
+ }
+}
+
+/* Submit data for all channels, after the individual groups got collected. */
+SR_PRIV void hmo_send_logic_packet(struct sr_dev_inst *sdi,
+ struct dev_context *devc)
+{
+ struct sr_datafeed_packet packet;
+ struct sr_datafeed_logic logic;
+
+ if (!devc->logic_data)
+ return;
+
+ logic.data = devc->logic_data->data;
+ logic.length = devc->logic_data->len;
+ logic.unitsize = devc->pod_count;
+
+ packet.type = SR_DF_LOGIC;
+ packet.payload = &logic;
+
+ sr_session_send(sdi, &packet);
+}
+
+/* Undo previous resource allocation. */
+SR_PRIV void hmo_cleanup_logic_data(struct dev_context *devc)
+{
+
+ if (devc->logic_data) {
+ g_byte_array_free(devc->logic_data, TRUE);
+ devc->logic_data = NULL;
+ }
+ /*
+ * Keep 'pod_count'! It's required when more frames will be
+ * received, and does not harm when kept after acquisition.
+ */
+}
+
SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data)
{
struct sr_channel *ch;
struct sr_dev_inst *sdi;
struct dev_context *devc;
+ struct scope_state *state;
struct sr_datafeed_packet packet;
- GArray *data;
+ GByteArray *data;
struct sr_datafeed_analog analog;
+ struct sr_analog_encoding encoding;
+ struct sr_analog_meaning meaning;
+ struct sr_analog_spec spec;
struct sr_datafeed_logic logic;
+ size_t group;
(void)fd;
+ (void)revents;
data = NULL;
@@ -678,70 +879,150 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data)
if (!(devc = sdi->priv))
return TRUE;
- if (revents == G_IO_IN) {
- ch = devc->current_channel->data;
+ /* Although this is correct in general, the USBTMC libusb implementation
+ * currently does not generate an event prior to the first read. Often
+ * it is ok to start reading just after the 50ms timeout. See bug #785.
+ if (revents != G_IO_IN)
+ return TRUE;
+ */
- switch (ch->type) {
- case SR_CHANNEL_ANALOG:
- if (sr_scpi_get_floatv(sdi->conn, NULL, &data) != SR_OK) {
- if (data)
- g_array_free(data, TRUE);
+ ch = devc->current_channel->data;
+ state = devc->model_state;
- return TRUE;
- }
+ /*
+ * Send "frame begin" packet upon reception of data for the
+ * first enabled channel.
+ */
+ if (devc->current_channel == devc->enabled_channels) {
+ packet.type = SR_DF_FRAME_BEGIN;
+ sr_session_send(sdi, &packet);
+ }
- packet.type = SR_DF_FRAME_BEGIN;
- sr_session_send(sdi, &packet);
+ /*
+ * Pass on the received data of the channel(s).
+ */
+ switch (ch->type) {
+ case SR_CHANNEL_ANALOG:
+ if (sr_scpi_get_block(sdi->conn, NULL, &data) != SR_OK) {
+ if (data)
+ g_byte_array_free(data, TRUE);
- analog.channels = g_slist_append(NULL, ch);
- analog.num_samples = data->len;
- analog.data = (float *) data->data;
- analog.mq = SR_MQ_VOLTAGE;
- analog.unit = SR_UNIT_VOLT;
- analog.mqflags = 0;
- packet.type = SR_DF_ANALOG;
- packet.payload = &analog;
- sr_session_send(cb_data, &packet);
- g_slist_free(analog.channels);
- g_array_free(data, TRUE);
- data = NULL;
- break;
- case SR_CHANNEL_LOGIC:
- if (sr_scpi_get_uint8v(sdi->conn, NULL, &data) != SR_OK) {
- if (data)
- g_free(data);
- return TRUE;
- }
+ return TRUE;
+ }
- packet.type = SR_DF_FRAME_BEGIN;
- sr_session_send(sdi, &packet);
+ packet.type = SR_DF_ANALOG;
+
+ analog.data = data->data;
+ analog.num_samples = data->len / sizeof(float);
+ analog.encoding = &encoding;
+ analog.meaning = &meaning;
+ analog.spec = &spec;
+
+ encoding.unitsize = sizeof(float);
+ encoding.is_signed = TRUE;
+ encoding.is_float = TRUE;
+#ifdef WORDS_BIGENDIAN
+ encoding.is_bigendian = TRUE;
+#else
+ encoding.is_bigendian = FALSE;
+#endif
+ /* TODO: Use proper 'digits' value for this device (and its modes). */
+ encoding.digits = 2;
+ encoding.is_digits_decimal = FALSE;
+ encoding.scale.p = 1;
+ encoding.scale.q = 1;
+ encoding.offset.p = 0;
+ encoding.offset.q = 1;
+ if (state->analog_channels[ch->index].probe_unit == 'V') {
+ meaning.mq = SR_MQ_VOLTAGE;
+ meaning.unit = SR_UNIT_VOLT;
+ } else {
+ meaning.mq = SR_MQ_CURRENT;
+ meaning.unit = SR_UNIT_AMPERE;
+ }
+ meaning.mqflags = 0;
+ meaning.channels = g_slist_append(NULL, ch);
+ /* TODO: Use proper 'digits' value for this device (and its modes). */
+ spec.spec_digits = 2;
+ packet.payload = &analog;
+ sr_session_send(sdi, &packet);
+ g_slist_free(meaning.channels);
+ g_byte_array_free(data, TRUE);
+ data = NULL;
+ break;
+ case SR_CHANNEL_LOGIC:
+ if (sr_scpi_get_block(sdi->conn, NULL, &data) != SR_OK) {
+ g_free(data);
+ return TRUE;
+ }
+ /*
+ * If only data from the first pod is involved in the
+ * acquisition, then the raw input bytes can get passed
+ * forward for performance reasons. When the second pod
+ * is involved (either alone, or in combination with the
+ * first pod), then the received bytes need to be put
+ * into memory in such a layout that all channel groups
+ * get combined, and a unitsize larger than a single byte
+ * applies. The "queue" logic transparently copes with
+ * any such configuration. This works around the lack
+ * of support for "meaning" to logic data, which is used
+ * above for analog data.
+ */
+ if (devc->pod_count == 1) {
+ packet.type = SR_DF_LOGIC;
+ logic.data = data->data;
logic.length = data->len;
logic.unitsize = 1;
- logic.data = data->data;
- packet.type = SR_DF_LOGIC;
packet.payload = &logic;
- sr_session_send(cb_data, &packet);
- g_array_free(data, TRUE);
- data = NULL;
- break;
- default:
- sr_err("Invalid channel type.");
- break;
+ sr_session_send(sdi, &packet);
+ } else {
+ group = ch->index / 8;
+ hmo_queue_logic_data(devc, group, data);
}
- packet.type = SR_DF_FRAME_END;
- sr_session_send(sdi, &packet);
+ g_byte_array_free(data, TRUE);
+ data = NULL;
+ break;
+ default:
+ sr_err("Invalid channel type.");
+ break;
+ }
- if (devc->current_channel->next) {
- devc->current_channel = devc->current_channel->next;
- hmo_request_data(sdi);
- } else if (++devc->num_frames == devc->frame_limit) {
- sdi->driver->dev_acquisition_stop(sdi, cb_data);
- } else {
- devc->current_channel = devc->enabled_channels;
- hmo_request_data(sdi);
- }
+ /*
+ * Advance to the next enabled channel. When data for all enabled
+ * channels was received, then flush potentially queued logic data,
+ * and send the "frame end" packet.
+ */
+ if (devc->current_channel->next) {
+ devc->current_channel = devc->current_channel->next;
+ hmo_request_data(sdi);
+ return TRUE;
+ }
+ hmo_send_logic_packet(sdi, devc);
+
+ /*
+ * Release the logic data storage after each frame. This copes
+ * with sample counts that differ in length per frame. -- Is
+ * this a real constraint when acquiring multiple frames with
+ * identical device settings?
+ */
+ hmo_cleanup_logic_data(devc);
+
+ packet.type = SR_DF_FRAME_END;
+ sr_session_send(sdi, &packet);
+
+ /*
+ * End of frame was reached. Stop acquisition after the specified
+ * number of frames, or continue reception by starting over at
+ * the first enabled channel.
+ */
+ if (++devc->num_frames == devc->frame_limit) {
+ sr_dev_acquisition_stop(sdi);
+ hmo_cleanup_logic_data(devc);
+ } else {
+ devc->current_channel = devc->enabled_channels;
+ hmo_request_data(sdi);
}
return TRUE;