struct sr_analog_encoding encoding;
struct sr_analog_meaning meaning;
struct sr_analog_spec spec;
- const struct sr_dev_inst *sdi;
+ struct sr_dev_inst *sdi;
int channel_group_cmd;
- char *channel_group_name;
+ const char *channel_group_name;
struct pps_channel *pch;
const struct channel_spec *ch_spec;
int ret;
if (!(devc = sdi->priv))
return TRUE;
+ pch = devc->cur_acquisition_channel->priv;
+
channel_group_cmd = 0;
channel_group_name = NULL;
if (g_slist_length(sdi->channel_groups) > 1) {
channel_group_cmd = SCPI_CMD_SELECT_CHANNEL;
- channel_group_name = g_strdup(devc->cur_acquisition_channel->name);
+ channel_group_name = pch->hwname;
}
- pch = devc->cur_acquisition_channel->priv;
if (pch->mq == SR_MQ_VOLTAGE) {
gvtype = G_VARIANT_TYPE_DOUBLE;
cmd = SCPI_CMD_GET_MEAS_VOLTAGE;
ret = sr_scpi_cmd_resp(sdi, devc->device->commands,
channel_group_cmd, channel_group_name, &gvdata, gvtype, cmd);
- g_free(channel_group_name);
if (ret != SR_OK)
return ret;
}
analog.meaning->mqflags = SR_MQFLAG_DC;
f = (float)g_variant_get_double(gvdata);
+ g_variant_unref(gvdata);
analog.data = &f;
sr_session_send(sdi, &packet);
g_slist_free(analog.meaning->channels);
sr_next_enabled_channel(sdi, devc->cur_acquisition_channel);
}
+ if (devc->cur_acquisition_channel == sr_next_enabled_channel(sdi, NULL))
+ /* First enabled channel, so each channel has been sampled */
+ sr_sw_limits_update_samples_read(&devc->limits, 1);
+
+ /* Stop if limits have been hit. */
+ if (sr_sw_limits_check(&devc->limits))
+ sr_dev_acquisition_stop(sdi);
+
return TRUE;
}