Add support for setting double ranges.

[sigrok-cli.git] / show.c

diff --git a/show.c b/show.c
index b91fa578c2cb5c6ac0e3632eeafba07840743add..d546376cd6b1275045183d1607bb934a3bde6b7b 100644 (file)
--- a/show.c
+++ b/show.c
@@ -130,10 +130,17 @@ void show_version(void)
 #endif
 }
 
+static gint sort_probes(gconstpointer a, gconstpointer b)
+{
+       const struct sr_probe *pa = a, *pb = b;
+
+       return pa->index - pb->index;
+}
+
 static void print_dev_line(const struct sr_dev_inst *sdi)
 {
        struct sr_probe *probe;
-       GSList *l;
+       GSList *sl, *l;
        GString *s;
        GVariant *gvar;
 
@@ -156,11 +163,13 @@ static void print_dev_line(const struct sr_dev_inst *sdi)
                        probe = sdi->probes->data;
                        g_string_append_printf(s, "with 1 probe: %s", probe->name);
                } else {
-                       g_string_append_printf(s, "with %d probes:", g_slist_length(sdi->probes));
-                       for (l = sdi->probes; l; l = l->next) {
+                       sl = g_slist_sort(g_slist_copy(sdi->probes), sort_probes);
+                       g_string_append_printf(s, "with %d probes:", g_slist_length(sl));
+                       for (l = sl; l; l = l->next) {
                                probe = l->data;
                                g_string_append_printf(s, " %s", probe->name);
                        }
+                       g_slist_free(sl);
                }
        }
        g_string_append_printf(s, "\n");
@@ -195,6 +204,7 @@ void show_dev_detail(void)
        GSList *devices, *pgl, *prl;
        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;
@@ -469,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, probe_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 */
@@ -485,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;
@@ -549,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 {