X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Fascii.c;h=c956b075159df16d82658e683d80a29df3d9923f;hb=2868bca35b321ad922326a213146c648ffa3410e;hp=d0d40b6f25089efb35b42e4464131a0bdb65afcc;hpb=b20eb52055042a1a1dd61d928a3f3a4b706c7d01;p=libsigrok.git

diff --git a/src/output/ascii.c b/src/output/ascii.c
index d0d40b6f..c956b075 100644
--- a/src/output/ascii.c
+++ b/src/output/ascii.c
@@ -124,7 +124,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);
@@ -199,7 +199,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 bit and
+						 * no separator between bytes. Align trigger marker
+						 * to this layout.
+						 */
+						offset = ctx->trigger;
 						g_string_append_printf(*out, "T:%*s^ %d\n", offset, "", ctx->trigger);
 						ctx->trigger = -1;
 					}