show: use getter result to determine "current" presence (voltage range)

[sigrok-cli.git] / decode.c

diff --git a/decode.c b/decode.c
index e0b27fd2938636350a4ab9b70e8b709f6ab3a8e8..4ddf34afbbaf00db414a041f4ef2e61ddc27bc0f 100644 (file)
--- a/decode.c
+++ b/decode.c
@@ -139,7 +139,7 @@ static int register_pd(char *opt_pds, char *opt_pd_annotations)
 
        pdtokens = g_strsplit(opt_pds, ",", 0);
        for (pdtok = pdtokens; *pdtok; pdtok++) {
-               if (!(pd_opthash = parse_generic_arg(*pdtok, TRUE))) {
+               if (!(pd_opthash = parse_generic_arg(*pdtok, TRUE, NULL))) {
                        g_critical("Invalid protocol decoder option '%s'.", *pdtok);
                        break;
                }
@@ -591,38 +591,32 @@ static void jsontrace_annotation(struct srd_decoder *dec,
         * annotation row's description. The 'ts' (timestamp) is in
         * microseconds. Set 'name' to the longest annotation text.
         *
-        * BEWARE of the unfortunate JSON format comma limitation. And
-        * some of the output formatting is motivated by the desire to
-        * further reduce text size, by eliminating some of the spaces.
+        * BEWARE of the unfortunate JSON format limitation, which
+        * clutters data output calls with format helper calls.
         * TODO Want to introduce a cJSON dependency to delegate the
         * construction of output text?
-        *
-        * This implementation is strictly compatible to the initial
-        * implementation. Which might change in the future to increase
-        * readability of the output to humans, by generating a layout
-        * which is closer to other output modes.
         */
        jsontrace_open_close(FALSE, TRUE, FALSE);
-       printf("\"%s\": \"%s\"", "name", pda->ann_text[0]);
-       jsontrace_open_close(FALSE, FALSE, FALSE);
        printf("\"%s\": \"%s\"", "ph", "B");
        jsontrace_open_close(FALSE, FALSE, FALSE);
+       printf("\"%s\": %lf", "ts", jsontrace_ts_usec(pdata->start_sample));
+       jsontrace_open_close(FALSE, FALSE, FALSE);
        printf("\"%s\": \"%s\"", "pid", pdata->pdo->proto_id);
        jsontrace_open_close(FALSE, FALSE, FALSE);
        printf("\"%s\": \"%s\"", "tid", row_text);
        jsontrace_open_close(FALSE, FALSE, FALSE);
-       printf("\"%s\": %lf", "ts", jsontrace_ts_usec(pdata->start_sample));
+       printf("\"%s\": \"%s\"", "name", pda->ann_text[0]);
 
        jsontrace_open_close(FALSE, TRUE, FALSE);
-       printf("\"%s\": \"%s\"", "name", pda->ann_text[0]);
-       jsontrace_open_close(FALSE, FALSE, FALSE);
        printf("\"%s\": \"%s\"", "ph", "E");
        jsontrace_open_close(FALSE, FALSE, FALSE);
+       printf("\"%s\": %lf", "ts", jsontrace_ts_usec(pdata->end_sample));
+       jsontrace_open_close(FALSE, FALSE, FALSE);
        printf("\"%s\": \"%s\"", "pid", pdata->pdo->proto_id);
        jsontrace_open_close(FALSE, FALSE, FALSE);
        printf("\"%s\": \"%s\"", "tid", row_text);
        jsontrace_open_close(FALSE, FALSE, FALSE);
-       printf("\"%s\": %lf", "ts", jsontrace_ts_usec(pdata->end_sample));
+       printf("\"%s\": \"%s\"", "name", pda->ann_text[0]);
 
        jsontrace_open_close(FALSE, FALSE, TRUE);
 }