X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhwdriver.c;h=1a502ca8cc37146b7409bf1f22d07ad4ba69eac6;hb=88a0265ebcb265ba839c02cc5bcd39e359c9f60f;hp=81a86a7998a5de184f5411a37b42d7c8b8793846;hpb=2fe1011f1daf66279424bd20722c2c80e0b593a9;p=libsigrok.git diff --git a/src/hwdriver.c b/src/hwdriver.c index 81a86a79..1a502ca8 100644 --- a/src/hwdriver.c +++ b/src/hwdriver.c @@ -189,6 +189,8 @@ static struct sr_key_info sr_key_info_config[] = { "Data source", NULL}, {SR_CONF_PROBE_FACTOR, SR_T_UINT64, "probe_factor", "Probe factor", NULL}, + {SR_CONF_ADC_POWERLINE_CYCLES, SR_T_FLOAT, "nplc", + "Number of ADC powerline cycles", NULL}, /* Acquisition modes, sample limiting */ {SR_CONF_LIMIT_MSEC, SR_T_UINT64, "limit_time", @@ -276,6 +278,7 @@ static struct sr_key_info sr_key_info_mqflag[] = { {SR_MQFLAG_AVG, 0, "average", "Average", NULL}, {SR_MQFLAG_REFERENCE, 0, "reference", "Reference", NULL}, {SR_MQFLAG_UNSTABLE, 0, "unstable", "Unstable", NULL}, + {SR_MQFLAG_FOUR_WIRE, 0, "four_wire", "4-Wire", NULL}, ALL_ZERO }; @@ -584,6 +587,7 @@ static void log_key(const struct sr_dev_inst *sdi, { const char *opstr; const struct sr_key_info *srci; + gchar *tmp_str; /* Don't log SR_CONF_DEVICE_OPTIONS, it's verbose and not too useful. */ if (key == SR_CONF_DEVICE_OPTIONS) @@ -592,9 +596,11 @@ static void log_key(const struct sr_dev_inst *sdi, opstr = op == SR_CONF_GET ? "get" : op == SR_CONF_SET ? "set" : "list"; srci = sr_key_info_get(SR_KEY_CONFIG, key); + tmp_str = g_variant_print(data, TRUE); sr_spew("sr_config_%s(): key %d (%s) sdi %p cg %s -> %s", opstr, key, srci ? srci->id : "NULL", sdi, cg ? cg->name : "NULL", - data ? g_variant_print(data, TRUE) : "NULL"); + data ? tmp_str : "NULL"); + g_free(tmp_str); } static int check_key(const struct sr_dev_driver *driver,