struct dev_context *devc;
struct sr_channel *ch;
const struct channel_spec *ch_spec;
- GVariant *gvar;
- GVariantBuilder gvb;
int i;
const char *s[16];
* specification for use in series or parallel mode.
*/
ch = cg->channels->data;
+ ch_spec = &(devc->device->channels[ch->index]);
switch (key) {
case SR_CONF_DEVICE_OPTIONS:
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
- devc->device->devopts_cg, devc->device->num_devopts_cg,
- sizeof(uint32_t));
+ *data = std_gvar_array_u32(devc->device->devopts_cg, devc->device->num_devopts_cg);
break;
case SR_CONF_VOLTAGE_TARGET:
- ch_spec = &(devc->device->channels[ch->index]);
- g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
- /* Min, max, write resolution. */
- for (i = 0; i < 3; i++) {
- gvar = g_variant_new_double(ch_spec->voltage[i]);
- g_variant_builder_add_value(&gvb, gvar);
- }
- *data = g_variant_builder_end(&gvb);
+ *data = std_gvar_min_max_step_array(ch_spec->voltage);
break;
case SR_CONF_OUTPUT_FREQUENCY_TARGET:
- ch_spec = &(devc->device->channels[ch->index]);
- g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
- /* Min, max, write resolution. */
- for (i = 0; i < 3; i++) {
- gvar = g_variant_new_double(ch_spec->frequency[i]);
- g_variant_builder_add_value(&gvb, gvar);
- }
- *data = g_variant_builder_end(&gvb);
+ *data = std_gvar_min_max_step_array(ch_spec->frequency);
break;
case SR_CONF_CURRENT_LIMIT:
- g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
- /* Min, max, step. */
- for (i = 0; i < 3; i++) {
- ch_spec = &(devc->device->channels[ch->index]);
- gvar = g_variant_new_double(ch_spec->current[i]);
- g_variant_builder_add_value(&gvb, gvar);
- }
- *data = g_variant_builder_end(&gvb);
+ *data = std_gvar_min_max_step_array(ch_spec->current);
break;
default:
return SR_ERR_NA;
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
{
struct sr_scpi_dev_inst *scpi;
- float f;
+ double d;
scpi = sdi->conn;
* to avoid leaving the device in a state where it's not expecting
* commands.
*/
- sr_scpi_get_float(scpi, NULL, &f);
+ sr_scpi_get_double(scpi, NULL, &d);
sr_scpi_source_remove(sdi->session, scpi);
std_session_send_df_end(sdi);