X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Foutput%2Fbits.c;h=f29d57fa17aae4bb448e987eaf89e9f1da2e4b90;hb=208fcedc872a4c03e0ffb790460cf92449aae1ed;hp=79146adf9aba35736c5a7376185dae20ecc0309b;hpb=b9eb8e1a8cdb4ac6449cfa881da96bcf9bc687ad;p=libsigrok.git
diff --git a/src/output/bits.c b/src/output/bits.c
index 79146adf..f29d57fa 100644
--- a/src/output/bits.c
+++ b/src/output/bits.c
@@ -17,6 +17,7 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include
@@ -101,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);
@@ -166,7 +167,12 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
/* Flush line buffers. */
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) {
+ 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;
@@ -237,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,