X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Fhex.c;h=5d9e0f556eebe8e3a52401d3a47af148b466dd93;hb=HEAD;hp=8fcfcea456357c149fa80967356ef772b611383e;hpb=b20eb52055042a1a1dd61d928a3f3a4b706c7d01;p=libsigrok.git

diff --git a/src/output/hex.c b/src/output/hex.c
index 8fcfcea4..e557eb08 100644
--- a/src/output/hex.c
+++ b/src/output/hex.c
@@ -107,7 +107,7 @@ static GString *gen_header(const struct sr_output *o)
 	}
 
 	header = g_string_sized_new(512);
-	g_string_printf(header, "%s %s\n", PACKAGE_NAME, SR_PACKAGE_VERSION_STRING);
+	g_string_printf(header, "%s %s\n", PACKAGE_NAME, sr_package_version_string_get());
 	num_channels = g_slist_length(o->sdi->channels);
 	g_string_append_printf(header, "Acquisition with %d/%d channels",
 			ctx->num_enabled_channels, num_channels);
@@ -181,7 +181,12 @@ 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;
+						/*
+						 * 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;
 					}