show: do print floating point results even if value is zero master
authorGerhard Sittig <gerhard.sittig@gmx.net>
Sat, 23 May 2020 14:14:48 +0000 (16:14 +0200)
committerGerhard Sittig <gerhard.sittig@gmx.net>
Sat, 23 May 2020 14:23:46 +0000 (16:23 +0200)
The availability of a configuration value with floating point data type
was determined by checking its value for being zero. Which prevents the
display of valid data. See the 'offset' in this example:

  $ sigrok-cli -d demo -g Analog --show

Track the current value's availability in a boolean variable. Do print
values even if they are zero.

show.c

diff --git a/show.c b/show.c
index 41474b3decfcc7cdea7cdfd92a15129f68998e39..8fbd0af157a028e959dec593f235c58b0ca4f399 100644 (file)
--- a/show.c
+++ b/show.c
@@ -404,6 +404,7 @@ void show_dev_detail(void)
        char *tmp_str, *s, c;
        const char **stropts;
        double tmp_flt;
+       gboolean have_tmp_flt;
        const double *fltopts;
 
        if (parse_driver(opt_drv, &driver_from_opt, NULL)) {
@@ -725,14 +726,16 @@ void show_dev_detail(void)
                } else if (srci->datatype == SR_T_FLOAT) {
                        printf("    %s: ", srci->id);
                        tmp_flt = 0.0;
+                       have_tmp_flt = FALSE;
                        if (maybe_config_get(driver, sdi, channel_group, key,
                                        &gvar) == SR_OK) {
                                tmp_flt = g_variant_get_double(gvar);
+                               have_tmp_flt = TRUE;
                                g_variant_unref(gvar);
                        }
                        if (maybe_config_list(driver, sdi, channel_group, key,
                                        &gvar) != SR_OK) {
-                               if (tmp_flt) {
+                               if (have_tmp_flt) {
                                        /* Can't list, but got a value to show. */
                                        printf("%f (current)", tmp_flt);
                                }
@@ -745,7 +748,7 @@ void show_dev_detail(void)
                                if (i)
                                        printf(", ");
                                printf("%f", fltopts[i]);
-                               if (tmp_flt && fltopts[i] == tmp_flt)
+                               if (have_tmp_flt && fltopts[i] == tmp_flt)
                                        printf(" (current)");
                        }
                        printf("\n");