X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Fhex.c;h=8fcfcea456357c149fa80967356ef772b611383e;hb=cbc656e45f18065517416566566860c8d156b3ae;hp=bad607513f653f385352faf954f7cb8903951521;hpb=1beccaed464a4d92a070988a0331fe399f9f7a7a;p=libsigrok.git diff --git a/src/output/hex.c b/src/output/hex.c index bad60751..8fcfcea4 100644 --- a/src/output/hex.c +++ b/src/output/hex.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/hex" @@ -106,7 +107,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); @@ -179,7 +180,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; @@ -251,8 +252,9 @@ static const struct sr_option *get_options(void) SR_PRIV struct sr_output_module output_hex = { .id = "hex", .name = "Hexadecimal", - .desc = "Hexadecimal digits", + .desc = "Hexadecimal digits logic data", .exts = (const char*[]){"txt", NULL}, + .flags = 0, .options = get_options, .init = init, .receive = receive,