X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Fbits.c;h=f29d57fa17aae4bb448e987eaf89e9f1da2e4b90;hb=d8fbfcd9d6d66bffcb8607e9de7706ce322d42c7;hp=f486803305ea58b4bddc29f0f1975d73cf06a1fb;hpb=d9251a2c9f1ca4380c27240ccca90c9f9ed46d3f;p=libsigrok.git diff --git a/src/output/bits.c b/src/output/bits.c index f4868033..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; @@ -238,7 +243,7 @@ static const struct sr_option *get_options(void) SR_PRIV struct sr_output_module output_bits = { .id = "bits", .name = "Bits", - .desc = "0/1 digits", + .desc = "0/1 digits logic data", .exts = (const char*[]){"txt", NULL}, .flags = 0, .options = get_options,