X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Fbits.c;h=f29d57fa17aae4bb448e987eaf89e9f1da2e4b90;hb=edb13f41631dbb41714bfca9d9ed286eecea78a8;hp=768a985ed84efe134cfedd091cd2810f3fb633a7;hpb=b20eb52055042a1a1dd61d928a3f3a4b706c7d01;p=libsigrok.git diff --git a/src/output/bits.c b/src/output/bits.c index 768a985e..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); @@ -168,6 +168,11 @@ 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) { + /* + * Sample data lines have one character per bit, + * plus one separator per byte. Align trigger marker + * to this layout. + */ offset = ctx->trigger + ctx->trigger / 8; g_string_append_printf(*out, "T:%*s^ %d\n", offset, "", ctx->trigger); ctx->trigger = -1;