X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=show.c;h=608698723c6426977d1dd91a17c14ede1599036c;hp=c93a6be4c8c397bf7096857880bb17b9c6963f3e;hb=adf8d7a9de5da50b7ee9c9d601c0258c830b38f0;hpb=b5e7f00b51b0cf5dfda10717202f6fa12611d0d9

diff --git a/show.c b/show.c
index c93a6be..6086987 100644
--- a/show.c
+++ b/show.c
@@ -94,6 +94,7 @@ void show_version(void)
 	printf("  - SCPI backends: %s.\n", str);
 	g_free(str);
 
+#ifdef HAVE_SRD
 	printf("- libsigrokdecode %s/%s (rt: %s/%s).\n",
 		SRD_PACKAGE_VERSION_STRING, SRD_LIB_VERSION_STRING,
 		srd_package_version_string_get(), srd_lib_version_string_get());
@@ -116,6 +117,7 @@ void show_version(void)
 	str = srd_buildinfo_host_get();
 	printf("  - Host: %s.\n", str);
 	g_free(str);
+#endif
 }
 
 void show_supported(void)
@@ -202,6 +204,74 @@ void show_supported(void)
 #endif
 }
 
+void show_supported_wiki(void)
+{
+#ifndef HAVE_SRD
+	printf("Error, libsigrokdecode support not compiled in.");
+#else
+	const GSList *l;
+	GSList *sl;
+	struct srd_decoder *dec;
+
+	if (srd_init(NULL) != SRD_OK)
+		return;
+
+	srd_decoder_load_all();
+	sl = g_slist_copy((GSList *)srd_decoder_list());
+	sl = g_slist_sort(sl, sort_pds);
+
+	printf("== Supported protocol decoders ==\n\n");
+
+	printf("<!-- Generated via sigrok-cli --list-supported-wiki. -->\n\n");
+
+	printf("Number of currently supported protocol decoders: "
+		"'''%d'''.\n\n", g_slist_length(sl));
+
+	printf("{| border=\"0\" style=\"font-size: smaller\" "
+		"class=\"alternategrey sortable sigroktable\"\n"
+		"|-\n!Protocol\n!Tags\n!Input IDs\n!Output IDs\n!Status\n"
+		"!Full name\n!Description\n\n");
+
+	for (l = sl; l; l = l->next) {
+		dec = l->data;
+
+		GString *tags = g_string_new(NULL);
+		for (GSList *t = dec->tags; t; t = t->next)
+			g_string_append_printf(tags, "%s, ", (char *)t->data);
+		if (tags->len != 0)
+			g_string_truncate(tags, tags->len - 2);
+
+		GString *in = g_string_new(NULL);
+		for (GSList *t = dec->inputs; t; t = t->next)
+			g_string_append_printf(in, "%s, ", (char *)t->data);
+		if (in->len == 0)
+			g_string_append_printf(in, "&mdash;");
+		else
+			g_string_truncate(in, in->len - 2);
+
+		GString *out = g_string_new(NULL);
+		for (GSList *t = dec->outputs; t; t = t->next)
+			g_string_append_printf(out, "%s, ", (char *)t->data);
+		if (out->len == 0)
+			g_string_append_printf(out, "&mdash;");
+		else
+			g_string_truncate(out, out->len - 2);
+
+		printf("{{pd|%s|%s|%s|%s|%s|%s|%s|supported}}\n",
+			dec->id, dec->name, dec->longname, dec->desc,
+			tags->str, in->str, out->str);
+
+		g_string_free(tags, TRUE);
+		g_string_free(in, TRUE);
+		g_string_free(out, TRUE);
+	}
+	g_slist_free(sl);
+	srd_exit();
+
+	printf("\n|}\n");
+#endif
+}
+
 static gint sort_channels(gconstpointer a, gconstpointer b)
 {
 	const struct sr_channel *pa = a, *pb = b;
@@ -319,7 +389,8 @@ void show_dev_detail(void)
 	GVariant *gvar_dict, *gvar_list, *gvar;
 	gsize num_elements;
 	double dlow, dhigh, dcur_low, dcur_high;
-	const uint64_t *uint64, p, q, low, high;
+	const uint64_t *uint64;
+	uint64_t p = 0, q = 0, low = 0, high = 0;
 	uint64_t tmp_uint64, mask, cur_low, cur_high, cur_p, cur_q;
 	GArray *opts;
 	const int32_t *int32;
@@ -328,6 +399,8 @@ void show_dev_detail(void)
 	unsigned int num_devices, i, j;
 	char *tmp_str, *s, c;
 	const char **stropts;
+	double tmp_flt;
+	const double *fltopts;
 
 	if (parse_driver(opt_drv, &driver_from_opt, NULL)) {
 		/* A driver was specified, report driver-wide options now. */
@@ -635,12 +708,32 @@ void show_dev_detail(void)
 
 		} else if (srci->datatype == SR_T_FLOAT) {
 			printf("    %s: ", srci->id);
+			tmp_flt = 0.0;
 			if (maybe_config_get(driver, sdi, channel_group, key,
 					&gvar) == SR_OK) {
-				printf("%f\n", g_variant_get_double(gvar));
+				tmp_flt = g_variant_get_double(gvar);
 				g_variant_unref(gvar);
-			} else
+			}
+			if (maybe_config_list(driver, sdi, channel_group, key,
+					&gvar) != SR_OK) {
+				if (tmp_flt) {
+					/* Can't list, but got a value to show. */
+					printf("%f (current)", tmp_flt);
+				}
 				printf("\n");
+				continue;
+			}
+			fltopts = g_variant_get_fixed_array(gvar,
+				&num_elements, sizeof(tmp_flt));
+			for (i = 0; i < num_elements; i++) {
+				if (i)
+					printf(", ");
+				printf("%f", fltopts[i]);
+				if (tmp_flt && fltopts[i] == tmp_flt)
+					printf(" (current)");
+			}
+			printf("\n");
+			g_variant_unref(gvar);
 
 		} else if (srci->datatype == SR_T_RATIONAL_PERIOD
 				|| srci->datatype == SR_T_RATIONAL_VOLT) {
@@ -767,6 +860,15 @@ static void show_pd_detail_single(const char *pd)
 		} else {
 			printf("None.\n");
 		}
+		printf("Decoder tags:\n");
+		if (dec->tags) {
+			for (l = dec->tags; l; l = l->next) {
+				str = l->data;
+				printf("- %s\n", str);
+			}
+		} else {
+			printf("None.\n");
+		}
 		printf("Annotation classes:\n");
 		if (dec->annotations) {
 			for (l = dec->annotations; l; l = l->next) {
@@ -975,3 +1077,25 @@ void show_transform(void)
 	}
 	g_strfreev(tok);
 }
+
+static void print_serial_port(gpointer data, gpointer user_data)
+{
+	struct sr_serial_port *port;
+
+	port = (void *)data;
+	(void)user_data;
+	printf("  %s\t%s\n", port->name, port->description);
+}
+
+void show_serial_ports(void)
+{
+	GSList *serial_ports;
+
+	serial_ports = sr_serial_list(NULL);
+	if (!serial_ports)
+		return;
+
+	printf("Available serial/HID/BT/BLE ports:\n");
+	g_slist_foreach(serial_ports, print_serial_port, NULL);
+	g_slist_free_full(serial_ports, (GDestroyNotify)sr_serial_free);
+}