X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=show.c;h=0b6d8f4fd5a9e2f9a824187fc6410338c94c6f11;hp=0e865f8dbfe51faee9726b8b97a4778e1cd0eae4;hb=029d73fe03db2656ceb2ca0f5a3fea57393fdfda;hpb=dd2f206a287e1b13abf4307c940f874668d30113

diff --git a/show.c b/show.c
index 0e865f8..0b6d8f4 100644
--- a/show.c
+++ b/show.c
@@ -130,16 +130,16 @@ void show_version(void)
 #endif
 }
 
-static gint sort_probes(gconstpointer a, gconstpointer b)
+static gint sort_channels(gconstpointer a, gconstpointer b)
 {
-	const struct sr_probe *pa = a, *pb = b;
+	const struct sr_channel *pa = a, *pb = b;
 
 	return pa->index - pb->index;
 }
 
 static void print_dev_line(const struct sr_dev_inst *sdi)
 {
-	struct sr_probe *probe;
+	struct sr_channel *ch;
 	GSList *sl, *l;
 	GString *s;
 	GVariant *gvar;
@@ -158,16 +158,16 @@ static void print_dev_line(const struct sr_dev_inst *sdi)
 		g_string_append_printf(s, "%s ", sdi->model);
 	if (sdi->version && sdi->version[0])
 		g_string_append_printf(s, "%s ", sdi->version);
-	if (sdi->probes) {
-		if (g_slist_length(sdi->probes) == 1) {
-			probe = sdi->probes->data;
-			g_string_append_printf(s, "with 1 probe: %s", probe->name);
+	if (sdi->channels) {
+		if (g_slist_length(sdi->channels) == 1) {
+			ch = sdi->channels->data;
+			g_string_append_printf(s, "with 1 channel: %s", ch->name);
 		} else {
-			sl = g_slist_sort(g_slist_copy(sdi->probes), sort_probes);
-			g_string_append_printf(s, "with %d probes:", g_slist_length(sl));
+			sl = g_slist_sort(g_slist_copy(sdi->channels), sort_channels);
+			g_string_append_printf(s, "with %d channels:", g_slist_length(sl));
 			for (l = sl; l; l = l->next) {
-				probe = l->data;
-				g_string_append_printf(s, " %s", probe->name);
+				ch = l->data;
+				g_string_append_printf(s, " %s", ch->name);
 			}
 			g_slist_free(sl);
 		}
@@ -199,11 +199,12 @@ void show_dev_detail(void)
 {
 	struct sr_dev_inst *sdi;
 	const struct sr_config_info *srci;
-	struct sr_probe *probe;
-	struct sr_probe_group *probe_group, *pg;
-	GSList *devices, *pgl, *prl;
+	struct sr_channel *ch;
+	struct sr_channel_group *channel_group, *cg;
+	GSList *devices, *cgl, *chl;
 	GVariant *gvar_opts, *gvar_dict, *gvar_list, *gvar;
 	gsize num_opts, num_elements;
+	double dlow, dhigh, dcur_low, dcur_high;
 	const uint64_t *uint64, p, q, low, high;
 	uint64_t cur_low, cur_high;
 	const int32_t *opts;
@@ -245,36 +246,36 @@ void show_dev_detail(void)
 		g_variant_unref(gvar_opts);
 	}
 
-	/* Selected probes and probe group may affect which options are
+	/* Selected channels and channel group may affect which options are
 	 * returned, or which values for them. */
-	select_probes(sdi);
-	probe_group = select_probe_group(sdi);
+	select_channels(sdi);
+	channel_group = select_channel_group(sdi);
 
-	if ((sr_config_list(sdi->driver, sdi, probe_group, SR_CONF_DEVICE_OPTIONS,
+	if ((sr_config_list(sdi->driver, sdi, channel_group, SR_CONF_DEVICE_OPTIONS,
 			&gvar_opts)) != SR_OK)
 		/* Driver supports no device instance options. */
 		return;
 
-	if (sdi->probe_groups) {
-		printf("Probe groups:\n");
-		for (pgl = sdi->probe_groups; pgl; pgl = pgl->next) {
-			pg = pgl->data;
-			printf("    %s: channel%s", pg->name,
-					g_slist_length(pg->probes) > 1 ? "s" : "");
-			for (prl = pg->probes; prl; prl = prl->next) {
-				probe = prl->data;
-				printf(" %s", probe->name);
+	if (sdi->channel_groups) {
+		printf("Channel groups:\n");
+		for (cgl = sdi->channel_groups; cgl; cgl = cgl->next) {
+			cg = cgl->data;
+			printf("    %s: channel%s", cg->name,
+					g_slist_length(cg->channels) > 1 ? "s" : "");
+			for (chl = cg->channels; chl; chl = chl->next) {
+				ch = chl->data;
+				printf(" %s", ch->name);
 			}
 			printf("\n");
 		}
 	}
 
 	printf("Supported configuration options");
-	if (sdi->probe_groups) {
-		if (!probe_group)
-			printf(" across all probe groups");
+	if (sdi->channel_groups) {
+		if (!channel_group)
+			printf(" across all channel groups");
 		else
-			printf(" on probe group %s", probe_group->name);
+			printf(" on channel group %s", channel_group->name);
 	}
 	printf(":\n");
 	opts = g_variant_get_fixed_array(gvar_opts, &num_opts, sizeof(int32_t));
@@ -283,7 +284,7 @@ void show_dev_detail(void)
 			continue;
 
 		if (srci->key == SR_CONF_TRIGGER_TYPE) {
-			if (sr_config_list(sdi->driver, sdi, probe_group, srci->key,
+			if (sr_config_list(sdi->driver, sdi, channel_group, srci->key,
 					&gvar) != SR_OK) {
 				printf("\n");
 				continue;
@@ -304,7 +305,7 @@ void show_dev_detail(void)
 			 * only to those that don't support compression, or
 			 * have it turned off by default. The values returned
 			 * are the low/high limits. */
-			if (sr_config_list(sdi->driver, sdi, probe_group, srci->key,
+			if (sr_config_list(sdi->driver, sdi, channel_group, srci->key,
 					&gvar) != SR_OK) {
 				continue;
 			}
@@ -315,7 +316,7 @@ void show_dev_detail(void)
 		} else if (srci->key == SR_CONF_SAMPLERATE) {
 			/* Supported samplerates */
 			printf("    %s", srci->id);
-			if (sr_config_list(sdi->driver, sdi, probe_group, SR_CONF_SAMPLERATE,
+			if (sr_config_list(sdi->driver, sdi, channel_group, SR_CONF_SAMPLERATE,
 					&gvar_dict) != SR_OK) {
 				printf("\n");
 				continue;
@@ -358,7 +359,7 @@ void show_dev_detail(void)
 		} else if (srci->key == SR_CONF_BUFFERSIZE) {
 			/* Supported buffer sizes */
 			printf("    %s", srci->id);
-			if (sr_config_list(sdi->driver, sdi, probe_group,
+			if (sr_config_list(sdi->driver, sdi, channel_group,
 					SR_CONF_BUFFERSIZE, &gvar_list) != SR_OK) {
 				printf("\n");
 				continue;
@@ -373,7 +374,7 @@ void show_dev_detail(void)
 		} else if (srci->key == SR_CONF_TIMEBASE) {
 			/* Supported time bases */
 			printf("    %s", srci->id);
-			if (sr_config_list(sdi->driver, sdi, probe_group,
+			if (sr_config_list(sdi->driver, sdi, channel_group,
 					SR_CONF_TIMEBASE, &gvar_list) != SR_OK) {
 				printf("\n");
 				continue;
@@ -392,7 +393,7 @@ void show_dev_detail(void)
 		} else if (srci->key == SR_CONF_VDIV) {
 			/* Supported volts/div values */
 			printf("    %s", srci->id);
-			if (sr_config_list(sdi->driver, sdi, probe_group,
+			if (sr_config_list(sdi->driver, sdi, channel_group,
 					SR_CONF_VDIV, &gvar_list) != SR_OK) {
 				printf("\n");
 				continue;
@@ -410,14 +411,14 @@ void show_dev_detail(void)
 
 		} else if (srci->datatype == SR_T_CHAR) {
 			printf("    %s: ", srci->id);
-			if (sr_config_get(sdi->driver, sdi, probe_group, srci->key,
+			if (sr_config_get(sdi->driver, sdi, channel_group, srci->key,
 					&gvar) == SR_OK) {
 				tmp_str = g_strdup(g_variant_get_string(gvar, NULL));
 				g_variant_unref(gvar);
 			} else
 				tmp_str = NULL;
 
-			if (sr_config_list(sdi->driver, sdi, probe_group, srci->key,
+			if (sr_config_list(sdi->driver, sdi, channel_group, srci->key,
 					&gvar) != SR_OK) {
 				printf("\n");
 				continue;
@@ -438,7 +439,7 @@ void show_dev_detail(void)
 
 		} else if (srci->datatype == SR_T_UINT64_RANGE) {
 			printf("    %s: ", srci->id);
-			if (sr_config_list(sdi->driver, sdi, probe_group, srci->key,
+			if (sr_config_list(sdi->driver, sdi, channel_group, srci->key,
 					&gvar_list) != SR_OK) {
 				printf("\n");
 				continue;
@@ -478,6 +479,36 @@ void show_dev_detail(void)
 			} else
 				printf("on, off\n");
 
+		} else if (srci->datatype == SR_T_DOUBLE_RANGE) {
+			printf("    %s: ", srci->id);
+			if (sr_config_list(sdi->driver, sdi, channel_group, srci->key,
+					&gvar_list) != SR_OK) {
+				printf("\n");
+				continue;
+			}
+
+			if (sr_config_get(sdi->driver, sdi, NULL, srci->key, &gvar) == SR_OK) {
+				g_variant_get(gvar, "(dd)", &dcur_low, &dcur_high);
+				g_variant_unref(gvar);
+			} else {
+				dcur_low = 0;
+				dcur_high = 0;
+			}
+
+			num_elements = g_variant_n_children(gvar_list);
+			for (i = 0; i < num_elements; i++) {
+				gvar = g_variant_get_child_value(gvar_list, i);
+				g_variant_get(gvar, "(dd)", &dlow, &dhigh);
+				g_variant_unref(gvar);
+				if (i)
+					printf(", ");
+				printf("%.1f-%.1f", dlow, dhigh);
+				if (dlow == dcur_low && dhigh == dcur_high)
+					printf(" (current)");
+			}
+			printf("\n");
+			g_variant_unref(gvar_list);
+
 		} else {
 
 			/* Everything else */
@@ -494,7 +525,7 @@ void show_dev_detail(void)
 #ifdef HAVE_SRD
 void show_pd_detail(void)
 {
-	GSList *l, *ll;
+	GSList *l, *ll, *ol;
 	struct srd_decoder *dec;
 	struct srd_decoder_option *o;
 	char **pdtokens, **pdtok, *optsep, **ann, *val, *doc;
@@ -558,9 +589,14 @@ void show_pd_detail(void)
 		if (dec->options) {
 			for (l = dec->options; l; l = l->next) {
 				o = l->data;
+				printf("- %s: %s (", o->id, o->desc);
+				for (ol = o->values; ol; ol = ol->next) {
+					val = g_variant_print(ol->data, FALSE);
+					printf("%s, ", val);
+					g_free(val);
+				}
 				val = g_variant_print(o->def, FALSE);
-				printf("- %s: %s (default %s)\n", o->id,
-					o->desc, val);
+				printf("default %s)\n", val);
 				g_free(val);
 			}
 		} else {