X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Fbits.c;h=f29d57fa17aae4bb448e987eaf89e9f1da2e4b90;hb=18baeeed7bb99f5470f04caa60e1b624207728b7;hp=379f019be4ed038db70e514afecc8890d379ae3b;hpb=67b345b981a581731435f490dfbf7b13d8b1d5a9;p=libsigrok.git

diff --git a/src/output/bits.c b/src/output/bits.c
index 379f019b..f29d57fa 100644
--- a/src/output/bits.c
+++ b/src/output/bits.c
@@ -102,7 +102,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);
@@ -169,13 +169,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 8 bit positions
-						 * 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 bit,
+						 * plus one separator per byte. Align trigger marker
+						 * to this layout.
 						 */
-						offset = ctx->trigger / 8 * (8 + 1);
-						offset += ctx->trigger % 8;
+						offset = ctx->trigger + ctx->trigger / 8;
 						g_string_append_printf(*out, "T:%*s^ %d\n", offset, "", ctx->trigger);
 						ctx->trigger = -1;
 					}