Backport recent changes from mainline.

[libsigrok.git] / src / output / hex.c

diff --git a/src/output/hex.c b/src/output/hex.c
index 5d9e0f556eebe8e3a52401d3a47af148b466dd93..a1c09f81b4c4e4abe31f1ed4a13ddc8d877d49ef 100644 (file)
--- a/src/output/hex.c
+++ b/src/output/hex.c
@@ -180,8 +180,13 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
                                        /* Flush line buffers. */
                                        g_string_append_len(*out, ctx->lines[j]->str, ctx->lines[j]->len);
                                        g_string_append_c(*out, '\n');
-                                       if (j == ctx->num_enabled_channels  - 1 && ctx->trigger > -1) {
-                                               offset = ctx->trigger + ctx->trigger / 8;
+                                       if (j == ctx->num_enabled_channels - 1 && ctx->trigger > -1) {
+                                               /*
+                                                * Sample data lines have one character per nibble,
+                                                * plus one separator per byte. Align trigger marker
+                                                * to this layout.
+                                                */
+                                               offset = ctx->trigger / 4 + ctx->trigger / 8;
                                                g_string_append_printf(*out, "T:%*s^ %d\n", offset, "", ctx->trigger);
                                                ctx->trigger = -1;
                                        }
@@ -252,7 +257,7 @@ static const struct sr_option *get_options(void)
 SR_PRIV struct sr_output_module output_hex = {
        .id = "hex",
        .name = "Hexadecimal",
-       .desc = "Hexadecimal digits",
+       .desc = "Hexadecimal digits logic data",
        .exts = (const char*[]){"txt", NULL},
        .flags = 0,
        .options = get_options,