output: fixup trigger marker position in ascii/bits/hex output modules

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

diff --git a/src/output/hex.c b/src/output/hex.c
index 8fcfcea456357c149fa80967356ef772b611383e..89111446c65001c503329796802582cf40be0d8e 100644 (file)
--- a/src/output/hex.c
+++ b/src/output/hex.c
@@ -181,7 +181,14 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
                                        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;
+                                               /*
+                                                * Each group of 8 bits occupies 2 hex digits plus
+                                                * 1 separator. Calculate the position of the byte
+                                                * which contains the trigger, then adjust for the
+                                                * trigger's bit position within that byte.
+                                                */
+                                               offset = ctx->trigger / 8 * (2 + 1);
+                                               offset += (ctx->trigger % 8) / 4;
                                                g_string_append_printf(*out, "T:%*s^ %d\n", offset, "", ctx->trigger);
                                                ctx->trigger = -1;
                                        }