X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Fhex.c;h=a1c09f81b4c4e4abe31f1ed4a13ddc8d877d49ef;hb=712f981dffbcb19291e86f41d565bf4627f3a5f4;hp=89111446c65001c503329796802582cf40be0d8e;hpb=67b345b981a581731435f490dfbf7b13d8b1d5a9;p=libsigrok.git diff --git a/src/output/hex.c b/src/output/hex.c index 89111446..a1c09f81 100644 --- a/src/output/hex.c +++ b/src/output/hex.c @@ -182,13 +182,11 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p g_string_append_c(*out, '\n'); if (j == ctx->num_enabled_channels - 1 && ctx->trigger > -1) { /* - * 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. + * Sample data lines have one character per nibble, + * plus one separator per byte. Align trigger marker + * to this layout. */ - offset = ctx->trigger / 8 * (2 + 1); - offset += (ctx->trigger % 8) / 4; + offset = ctx->trigger / 4 + ctx->trigger / 8; g_string_append_printf(*out, "T:%*s^ %d\n", offset, "", ctx->trigger); ctx->trigger = -1; }