X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Fbits.c;h=f486803305ea58b4bddc29f0f1975d73cf06a1fb;hb=2f425a56edbe528ed4566ea6791009dad61ef56d;hp=a26424d5968913a33ed86f8a6339c3a20f8c6b72;hpb=3cd4b381744eb88fd4ba32565bd408c33b431629;p=libsigrok.git diff --git a/src/output/bits.c b/src/output/bits.c index a26424d5..f4868033 100644 --- a/src/output/bits.c +++ b/src/output/bits.c @@ -17,10 +17,11 @@ * along with this program. If not, see . */ +#include #include #include #include -#include "libsigrok.h" +#include #include "libsigrok-internal.h" #define LOG_PREFIX "output/bits" @@ -101,7 +102,7 @@ static GString *gen_header(const struct sr_output *o) } header = g_string_sized_new(512); - g_string_printf(header, "%s\n", PACKAGE_STRING); + g_string_printf(header, "%s %s\n", PACKAGE_NAME, SR_PACKAGE_VERSION_STRING); 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,7 @@ 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) { offset = ctx->trigger + ctx->trigger / 8; g_string_append_printf(*out, "T:%*s^ %d\n", offset, "", ctx->trigger); ctx->trigger = -1;